add pickups

lib/pages/buying_online.dart

@@ -1,3 +1,5 @@
+import 'package:fcs/pages/util.dart';
+import 'package:fcs/vo/manual.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/main_model.dart';
@@ -7,6 +9,7 @@ import 'package:fcs/widget/progress.dart';
 import '../theme/theme.dart';
 import '../widget/label_widgets.dart';
 import '../widget/local_text.dart';
+import 'instruction.dart';
 import 'manual/manual_page.dart';
 
 class BuyingOnlinePage extends StatefulWidget {
@@ -36,7 +39,7 @@ class _BuyingOnlinePagetate extends State<BuyingOnlinePage> {
             "user.deliveryAddress"));
 
     final instructionBox = Container(
-      padding: EdgeInsets.only(top: 30),
+      padding: EdgeInsets.only(left: 10, top: 30, bottom: 10),
       child: Center(
         child: Wrap(
           children: <Widget>[
@@ -56,9 +59,10 @@ class _BuyingOnlinePagetate extends State<BuyingOnlinePage> {
       child: Container(
         height: 45.0,
         decoration: BoxDecoration(
-            color: primaryColor,
-            shape: BoxShape.rectangle,
-            borderRadius: BorderRadius.all(Radius.circular(10.0))),
+          color: primaryColor,
+          shape: BoxShape.rectangle,
+          // borderRadius: BorderRadius.all(Radius.circular(10.0))
+        ),
         child: ButtonTheme(
           minWidth: 900.0,
           height: 100.0,
@@ -67,8 +71,9 @@ class _BuyingOnlinePagetate extends State<BuyingOnlinePage> {
               Navigator.push(
                   context,
                   MaterialPageRoute(
-                      builder: (context) => ManualPage(
-                            marketplace: 'Amazon',
+                      builder: (context) => InstructionPage(
+                            name: 'Amazon',
+                            image: "assets/amazon_ins.png",
                           )));
             },
             child: LocalText(
@@ -88,9 +93,10 @@ class _BuyingOnlinePagetate extends State<BuyingOnlinePage> {
       child: Container(
         height: 45.0,
         decoration: BoxDecoration(
-            color: primaryColor,
-            shape: BoxShape.rectangle,
-            borderRadius: BorderRadius.all(Radius.circular(10.0))),
+          color: primaryColor,
+          shape: BoxShape.rectangle,
+          // borderRadius: BorderRadius.all(Radius.circular(10.0))
+        ),
         child: ButtonTheme(
           minWidth: 900.0,
           height: 100.0,
@@ -120,9 +126,10 @@ class _BuyingOnlinePagetate extends State<BuyingOnlinePage> {
       child: Container(
         height: 45.0,
         decoration: BoxDecoration(
-            color: primaryColor,
-            shape: BoxShape.rectangle,
-            borderRadius: BorderRadius.all(Radius.circular(10.0))),
+          color: primaryColor,
+          shape: BoxShape.rectangle,
+          // borderRadius: BorderRadius.all(Radius.circular(10.0))
+        ),
         child: ButtonTheme(
           minWidth: 900.0,
           height: 100.0,
@@ -151,9 +158,14 @@ class _BuyingOnlinePagetate extends State<BuyingOnlinePage> {
       inAsyncCall: _isLoading,
       child: Scaffold(
         appBar: AppBar(
+          centerTitle: true,
+          leading: new IconButton(
+            icon: new Icon(Icons.close),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
           title: LocalText(
             context,
-            "buy_online",
+            "buy_online.title",
             fontSize: 20,
             color: Colors.white,
           ),
@@ -163,36 +175,42 @@ class _BuyingOnlinePagetate extends State<BuyingOnlinePage> {
           shrinkWrap: true,
           padding: EdgeInsets.only(top: 10, left: 10, right: 10),
           children: <Widget>[
-            Center(
-                child: Text(
-              mainModel.customer.name,
-              style: TextStyle(
-                  color: secondaryColor,
-                  fontSize: 16,
-                  fontWeight: FontWeight.bold),
-            )),
-            Container(
-              padding: EdgeInsets.only(top: 15),
-              child: Row(
-                children: <Widget>[
-                  Padding(
-                    padding: const EdgeInsets.only(right: 8.0),
-                    child: phoneBox,
+            nameWidget(mainModel.customer.name),
+            phoneWidget(context, mainModel.customer.phoneNumber),
+            Row(
+              children: <Widget>[
+                SizedBox(
+                  width: 25,
+                  height: 25,
+                  child: FittedBox(
+                    child: Image.asset("assets/logo.jpg"),
+                    fit: BoxFit.fill,
                   ),
-                  InkWell(
-                    onTap: () {},
-                    child: Icon(
-                      Icons.open_in_new,
-                      color: Colors.grey,
-                      size: 15,
-                    ),
+                ),
+                fcsIdBox,
+                Padding(
+                  padding: const EdgeInsets.only(left: 7.0, top: 50),
+                  child: Icon(
+                    Icons.content_copy,
+                    color: Colors.grey,
                   ),
-                ],
-              ),
+                )
+              ],
             ),
-            fcsIdBox,
-            shippingAddressBox,
-            deliveryAddressBox,
+            Row(
+              children: <Widget>[
+                Icon(Icons.location_on),
+                shippingAddressBox,
+                Padding(
+                  padding: const EdgeInsets.only(left: 7.0, top: 50),
+                  child: Icon(
+                    Icons.content_copy,
+                    color: Colors.grey,
+                  ),
+                )
+              ],
+            ),
+            // deliveryAddressBox,
             instructionBox,
             amazonbutton,
             neweggbutton,