add packages, receiving & processing

lib/pages/package/package_info.dart

@@ -1,28 +1,24 @@
 import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/main/model/main_model.dart';
-import 'package:fcs/pages/package/package_editor.dart';
-import 'package:fcs/pages/main/util.dart';
-import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/multi_img_controller.dart';
 import 'package:fcs/pages/widgets/multi_img_file.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:fcs/pages/widgets/status_tree.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
-import 'package:timeline_list/timeline.dart';
 import 'package:timeline_list/timeline_model.dart';
 
-import 'model/package_model.dart';
-
 final DateFormat dateFormat = DateFormat("d MMM yyyy");
 
 class PackageInfo extends StatefulWidget {
+  final isSearchResult;
   final Package package;
-  PackageInfo({this.package});
+  PackageInfo({this.package, this.isSearchResult = false});
 
   @override
   _PackageInfoState createState() => _PackageInfoState();
@@ -54,8 +50,6 @@ class _PackageInfoState extends State<PackageInfo> {
 
   @override
   Widget build(BuildContext context) {
-    bool isCustomer = Provider.of<MainModel>(context).isCustomer();
-
     final trackingIdBox = DisplayText(
       text: _package.trackingID,
       labelTextKey: "package.tracking.id",
@@ -109,14 +103,6 @@ class _PackageInfoState extends State<PackageInfo> {
             fontSize: 20,
             color: primaryColor,
           ),
-          actions: <Widget>[
-            isCustomer
-                ? Container()
-                : IconButton(
-                    icon: Icon(Icons.edit, color: primaryColor),
-                    onPressed: _gotoEditor,
-                  )
-          ],
         ),
         body: Card(
           child: Column(
@@ -126,29 +112,15 @@ class _PackageInfoState extends State<PackageInfo> {
                 padding: const EdgeInsets.all(10.0),
                 child: ListView(children: <Widget>[
                   trackingIdBox,
-                  customerNameBox,
-                  marketBox,
+                  widget.isSearchResult ? Container() : customerNameBox,
+                  widget.isSearchResult ? Container() : marketBox,
                   statusBox,
                   _package.photoUrls.length == 0 ? Container() : img,
-                  descBox,
+                  widget.isSearchResult ? Container() : descBox,
                   remarkBox,
-                  ExpansionTile(
-                    initiallyExpanded: true,
-                    title: Text(
-                      'Status',
-                      style: TextStyle(
-                          color: primaryColor, fontWeight: FontWeight.bold),
-                    ),
-                    children: <Widget>[
-                      Container(
-                        padding: EdgeInsets.only(left: 20),
-                        height: 400,
-                        child: Timeline(
-                            children: _models(),
-                            position: TimelinePosition.Left),
-                      ),
-                    ],
-                  ),
+                  StatusTree(
+                      shipmentHistory: _package.shipmentHistory,
+                      currentStatus: _package.currentStatus),
                   SizedBox(
                     height: 20,
                   )
@@ -194,20 +166,4 @@ class _PackageInfoState extends State<PackageInfo> {
             )))
         .toList();
   }
-
-  _gotoEditor() async {
-    bool deleted = await Navigator.push<bool>(
-        context,
-        BottomUpPageRoute(PackageEditorPage(
-          package: widget.package,
-        )));
-    if (deleted ?? false) {
-      Navigator.pop(context);
-    } else {
-      PackageModel packageModel =
-          Provider.of<PackageModel>(context, listen: false);
-      Package p = await packageModel.getPackage(_package.id);
-      initPackage(p);
-    }
-  }
 }