Merge remote-tracking branch 'upstream/master'

assets/local/localization_en.json

@@ -511,14 +511,14 @@
     "receiving.info":"Receiving",
     "receiving.new":"New receiving",
     "receiving.create":"New Receiving",
-    "receiving.update":"Update Reveiving",
+    "receiving.update":"Update Receiving",
     "receiving.tracking.id":"Tracking ID",
     "receiving.remark":"Remark",
     "receiving.fcs.id":"FCS ID",
     "receiving.name":"Customer name",
     "receiving.phone":"Phone number",
     "receiving.create_btn":"Complete receiving",
-    "receiving.update_btn":"Update reveiving",
+    "receiving.update_btn":"Update receiving",
     "receiving.delete.confirm":"Delete this receiving?",
     "receiving.return.btn":"Return package",
     "receiving.return.confirm":"Return package?",

lib/data/provider/auth_fb.dart

@@ -88,7 +88,6 @@ class AuthFb {
   }
 
   Future<fcs.AuthResult> signInWithPhoneNumber(String smsCode) async {
-    User user;
     try {
       final AuthCredential credential = PhoneAuthProvider.getCredential(
         verificationId: _verificationId,
@@ -102,7 +101,6 @@ class AuthFb {
     } on Exception catch (e) {
       return Future.error(SigninException(e.toString()));
     }
-    if (user == null) Future.error(SigninException("No current user!"));
     return Future.value(fcs.AuthResult(authStatus: AuthStatus.AUTH_VERIFIED));
   }
 

lib/domain/constants.dart

@@ -1,3 +1,5 @@
+const uploadPhotoLimit = 10;
+
 const config_collection = "configs";
 const user_collection = "users";
 const invitations_collection = "invitations";

lib/domain/entities/package.dart

@@ -96,8 +96,9 @@ class Package {
         desc: map['desc'],
         status: map['status'],
         deliveryAddress: _da,
-        currentStatusDate:
+        currentStatusDate: _currentStatusDate != null
-            _currentStatusDate != null ? _currentStatusDate.toDate() : null,
+            ? _currentStatusDate.toDate().toLocal()
+            : null,
         photoUrls: _photoUrls,
         shipmentHistory: _shipmentStatus);
   }

lib/helpers/firebase_helper.dart

@@ -23,6 +23,17 @@ Future<Map> getClaims({bool refreshIdToken = false}) async {
   return idToken.claims;
 }
 
+// returns list of url
+Future<List<String>> uploadFiles(String path, List<File> files,
+    {String fileName}) async {
+  List<Future<String>> fu = [];
+  for (File f in files) {
+    Future<String> u = uploadStorage(path, f);
+    fu.add(u);
+  }
+  return Future.wait(fu);
+}
+
 Future<String> uploadStorage(String path, File file, {String fileName}) async {
   if (fileName == null) {
     fileName = Uuid().v4();

lib/pages/main/home_page.dart

@@ -204,6 +204,7 @@ class _HomePageState extends State<HomePage> {
   @override
   Widget build(BuildContext context) {
     User user = Provider.of<MainModel>(context).user;
+
     if (user == null) {
       Future.microtask(
           () => Navigator.pushNamedAndRemoveUntil(context, "/", (r) => false));

lib/pages/main/model/base_model.dart

@@ -20,6 +20,10 @@ abstract class BaseModel extends ChangeNotifier {
     this.setting = setting;
   }
 
+  void notify() {
+    notifyListeners();
+  }
+
   void logout() {}
 
 // request makes http request

lib/pages/main/splash_page.dart

@@ -66,9 +66,12 @@ class _SplashScreenState extends State<SplashScreen> {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: <Widget>[
-            new Image.asset(
+            Container(
-              "assets/logo.jpg",
+              height: 180,
               width: 180,
+              child: new Image.asset(
+                "assets/logo.jpg",
+              ),
             ),
             SizedBox(height: 50),
             Column(

lib/pages/package/model/package_model.dart

@@ -8,116 +8,126 @@ import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/domain/entities/user.dart';
 import 'package:fcs/domain/vo/delivery_address.dart';
 import 'package:fcs/helpers/firebase_helper.dart';
-import 'package:fcs/helpers/paginator.dart';
 import 'package:fcs/pages/main/model/base_model.dart';
+import 'package:fcs/pagination/paginator_listener.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as Path;
 
 class PackageModel extends BaseModel {
   final log = Logger('PackageModel');
 
-  StreamSubscription<QuerySnapshot> listener;
+  PaginatorListener packages;
+  PaginatorListener customerPackages;
+  PaginatorListener activePackages;
 
-  List<Package> get packages => _menuSelectedIndex == 1
-      ? _packages
-      : List<Package>.from(_delivered.values);
-
-  List<Package> _packages = [];
-
-  Paginator _delivered;
   bool isLoading = false;
   int _menuSelectedIndex = 1;
 
   set menuSelectedIndex(int index) {
     _menuSelectedIndex = index;
+
+    _loadPackages(_menuSelectedIndex == 2);
+    _loadCustomerPackages(_menuSelectedIndex == 2);
+
     notifyListeners();
   }
 
   get menuSelectedIndex => _menuSelectedIndex;
 
-  initData(bool forCustomer) {
+  void privilegeChanged() {
+    if (user != null) {
+      _initData();
+    }
+  }
+
+  Future<void> _initData() async {
     logout();
     _menuSelectedIndex = 1;
-    _loadPackages(forCustomer);
+    packages = PaginatorListener<Package>(
-    _delivered = _getDelivered(forCustomer);
+        (data, id) => Package.fromMap(data, id), onChange: () {
-    _delivered.load();
+      notifyListeners();
+    }, rowPerLoad: 30, insertNewByListener: true);
+    customerPackages = PaginatorListener<Package>(
+        (data, id) => Package.fromMap(data, id), onChange: () {
+      notifyListeners();
+    }, rowPerLoad: 30, insertNewByListener: true);
+    activePackages = PaginatorListener<Package>(
+        (data, id) => Package.fromMap(data, id), onChange: () {
+      notifyListeners();
+    }, rowPerLoad: 30, insertNewByListener: true);
+
+    _loadPackages(_menuSelectedIndex == 2);
+    _loadCustomerPackages(_menuSelectedIndex == 2);
+    _loadActivePackages();
   }
 
   @override
   logout() async {
-    if (_delivered != null) _delivered.close();
+    if (customerPackages != null) customerPackages.close();
-    if (listener != null) await listener.cancel();
+    if (packages != null) packages.close();
-    _packages = [];
+    if (activePackages != null) activePackages.close();
   }
 
-  Future<void> loadMore({bool isCustomer}) async {
+  Future<void> _loadPackages(bool isDelivered) async {
-    if (_delivered.ended || menuSelectedIndex == 1)
-      return; // when delivered menu is not selected return
-    isLoading = true;
-    notifyListeners();
-    await _delivered.load(onFinished: () {
-      isLoading = false;
-      notifyListeners();
-    });
-  }
-
-  Future<void> refresh({bool isCustomer}) async {
-    if (menuSelectedIndex == 1)
-      return; // when delivered menu is not selected return
-    await _delivered.refresh(onFinished: () {
-      notifyListeners();
-    });
-  }
-
-  Paginator _getDelivered(bool isCustomer) {
-    if (!isCustomer) {
-      if (user == null ||
-          !((user.hasPackages() ||
-              user.hasReceiving() ||
-              user.hasProcessing()))) throw "No privilege";
-    }
-    var pageQuery = Firestore.instance
-        .collection("/$packages_collection")
-        .where("is_delivered", isEqualTo: true)
-        .where("is_deleted", isEqualTo: false);
-    if (isCustomer) {
-      pageQuery = pageQuery.where("user_id", isEqualTo: user.id);
-    }
-    pageQuery = pageQuery.orderBy("status_date", descending: true);
-    var paginator = new Paginator(pageQuery, rowPerLoad: 20, toObj: (data, id) {
-      return Package.fromMap(data, id);
-    });
-    return paginator;
-  }
-
-  Future<void> _loadPackages(bool forCustomer) async {
     if (user == null) return;
-    if (!forCustomer &&
+    if (!((user.hasPackages() || user.hasReceiving() || user.hasProcessing())))
-        !((user.hasPackages() || user.hasReceiving() || user.hasProcessing())))
       return;
     String path = "/$packages_collection";
-    if (listener != null) listener.cancel();
-    _packages = [];
 
     try {
-      var q = Firestore.instance
+      Query listenerQuery = Firestore.instance
-          .collection("$path")
+          .collection(path)
-          .where("is_delivered", isEqualTo: false)
+          .where("is_delivered", isEqualTo: isDelivered);
-          .where("is_deleted", isEqualTo: false);
+      Query pageQuery = Firestore.instance
+          .collection(path)
+          .where("is_delivered", isEqualTo: isDelivered);
 
-      if (forCustomer) {
+      pageQuery = pageQuery.orderBy("update_time", descending: true);
-        q = q.where("user_id", isEqualTo: user.id);
+      packages.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
-      }
+    } catch (e) {
-      q = q.orderBy("tracking_id", descending: false);
+      log.warning("Error!! $e");
-      listener = q.snapshots().listen((QuerySnapshot snapshot) {
+    }
-        _packages.clear();
+  }
-        _packages = snapshot.documents.map((documentSnapshot) {
+
-          var package = Package.fromMap(
+  Future<void> _loadCustomerPackages(bool isDelivered) async {
-              documentSnapshot.data, documentSnapshot.documentID);
+    if (user == null) return;
-          return package;
+    String path = "/$packages_collection";
-        }).toList();
+
-        notifyListeners();
+    try {
-      });
+      Query listenerQuery = Firestore.instance
+          .collection(path)
+          .where("is_delivered", isEqualTo: isDelivered)
+          .where("user_id", isEqualTo: user.id);
+      Query pageQuery = Firestore.instance
+          .collection(path)
+          .where("is_delivered", isEqualTo: isDelivered)
+          .where("user_id", isEqualTo: user.id)
+          .orderBy("update_time", descending: true);
+
+      customerPackages.refresh(
+          listeningQuery: listenerQuery, pageQuery: pageQuery);
+    } catch (e) {
+      log.warning("Error!! $e");
+    }
+  }
+
+  Future<void> _loadActivePackages() async {
+    if (user == null) return;
+    if (!((user.hasPackages() || user.hasReceiving() || user.hasProcessing())))
+      return;
+    String path = "/$packages_collection";
+
+    try {
+      Query listenerQuery = Firestore.instance
+          .collection(path)
+          .where("is_delivered", isEqualTo: false);
+      Query pageQuery = Firestore.instance
+          .collection(path)
+          .where("is_delivered", isEqualTo: false);
+
+      pageQuery = pageQuery.orderBy("update_time", descending: true);
+      activePackages.refresh(
+          listeningQuery: listenerQuery, pageQuery: pageQuery);
     } catch (e) {
       log.warning("Error!! $e");
     }
@@ -139,6 +149,25 @@ class PackageModel extends BaseModel {
     return null;
   }
 
+  Future<Package> getPackageByTrackingID(String trackingID) async {
+    if (user == null) return null;
+    String path = "/$packages_collection";
+    try {
+      var snaps = await Firestore.instance
+          .collection("$path")
+          .where("tracking_id", isEqualTo: trackingID)
+          .getDocuments(source: Source.server);
+      if (snaps.documents.length == 1) {
+        var snap = snaps.documents[0];
+        var package = Package.fromMap(snap.data, snap.documentID);
+        return package;
+      }
+    } catch (e) {
+      log.warning("Error!! $e");
+    }
+    return null;
+  }
+
   Future<Package> lookupPackage(String trackingID) async {
     if (user == null) return null;
     String path = "/$packages_collection";
@@ -201,8 +230,15 @@ class PackageModel extends BaseModel {
     return Services.instance.userService.searchUser(term);
   }
 
-  Future<List<Package>> searchPackage(String term) {
+  Future<List<Package>> searchPackage(String term) async {
-    return Services.instance.packageService.searchPackage(term);
+    List<Package> packages =
+        await Services.instance.packageService.searchPackage(term);
+
+    Package pkg = await getPackageByTrackingID(term);
+    if (pkg != null && !packages.contains(pkg)) {
+      packages.insert(0, pkg);
+    }
+    return packages;
   }
 
   Future<void> createPackages(User user, List<Package> packages) {
@@ -216,13 +252,14 @@ class PackageModel extends BaseModel {
       package.fcsID = user.fcsID;
     }
     if (files != null) {
-      if (files.length > 5) throw Exception("Exceed number of file upload");
+      if (files.length > uploadPhotoLimit)
+        throw Exception("Exceed number of file upload");
       package.photoUrls = package.photoUrls == null ? [] : package.photoUrls;
-      for (File f in files) {
+      String path = Path.join(pkg_files_path);
-        String path = Path.join(pkg_files_path);
+      List<String> urls = await uploadFiles(path, files);
-        String url = await uploadStorage(path, f);
+      urls.forEach((url) {
         package.photoUrls.add(url);
-      }
+      });
     }
     return Services.instance.packageService.createReceiving(package);
   }
@@ -240,13 +277,18 @@ class PackageModel extends BaseModel {
     }
 
     if (files != null) {
-      if (files.length > 5) throw Exception("Exceed number of file upload");
+      var count = (package.photoUrls?.length ?? 0) +
+          files.length -
+          (deletedUrls?.length ?? 0);
+
+      if (count > uploadPhotoLimit)
+        throw Exception("Exceed number of file upload");
       package.photoUrls = package.photoUrls == null ? [] : package.photoUrls;
-      for (File f in files) {
+      String path = Path.join(pkg_files_path);
-        String path = Path.join(pkg_files_path);
+      List<String> urls = await uploadFiles(path, files);
-        String url = await uploadStorage(path, f);
+      urls.forEach((url) {
         package.photoUrls.add(url);
-      }
+      });
     }
     await Services.instance.packageService.updateReceiving(package);
   }
@@ -265,13 +307,18 @@ class PackageModel extends BaseModel {
     }
 
     if (files != null) {
-      if (files.length > 5) throw Exception("Exceed number of file upload");
+      var count = (package.photoUrls?.length ?? 0) +
+          files.length -
+          (deletedUrls?.length ?? 0);
+
+      if (count > uploadPhotoLimit)
+        throw Exception("Exceed number of file upload");
       package.photoUrls = package.photoUrls == null ? [] : package.photoUrls;
-      for (File f in files) {
+      String path = Path.join(pkg_files_path);
-        String path = Path.join(pkg_files_path);
+      List<String> urls = await uploadFiles(path, files);
-        String url = await uploadStorage(path, f);
+      urls.forEach((url) {
         package.photoUrls.add(url);
-      }
+      });
       package.photoUrls.removeWhere((e) => deletedUrls.contains(e));
     }
     await Services.instance.packageService.updateProcessing(package);

lib/pages/package/package_list.dart

@@ -8,6 +8,7 @@ import 'package:fcs/pages/widgets/local_popup_menu_button.dart';
 import 'package:fcs/pages/widgets/local_popupmenu.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:fcs/pagination/paginator_listview.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -22,26 +23,18 @@ class PackageList extends StatefulWidget {
 
 class _PackageListState extends State<PackageList> {
   bool _isLoading = false;
-  var _controller = ScrollController();
 
   @override
   void initState() {
     super.initState();
-
-    _controller.addListener(() async {
-      if (_controller.position.pixels == _controller.position.maxScrollExtent) {
-        Provider.of<PackageModel>(context, listen: false)
-            .loadMore(isCustomer: widget.forCustomer);
-      }
-    });
-    Provider.of<PackageModel>(context, listen: false)
-        .initData(widget.forCustomer);
   }
 
   @override
   Widget build(BuildContext context) {
     var packageModel = Provider.of<PackageModel>(context);
-    var packages = packageModel.packages;
+    var packages = widget.forCustomer
+        ? packageModel.customerPackages
+        : packageModel.packages;
 
     final popupMenu = LocalPopupMenuButton(
       popmenus: [
@@ -90,43 +83,14 @@ class _PackageListState extends State<PackageList> {
               popupMenu
             ],
           ),
-          body: Column(
+          body: PaginatorListView<Package>(
-            children: [
+            paginatorListener: packages,
-              Expanded(
+            rowBuilder: (p) => PackageListRow(
-                child: RefreshIndicator(
+              key: ValueKey(p.id),
-                  child: ListView.separated(
+              package: p,
-                      controller: _controller,
+              isCustomer: widget.forCustomer,
-                      separatorBuilder: (context, index) => Divider(
+            ),
-                            color: Colors.grey,
+            color: primaryColor,
-                            height: 1,
-                          ),
-                      scrollDirection: Axis.vertical,
-                      itemCount: packages.length,
-                      itemBuilder: (BuildContext context, int index) {
-                        return PackageListRow(
-                          key: ValueKey(packages[index].id),
-                          package: packages[index],
-                          isCustomer: widget.forCustomer,
-                        );
-                      }),
-                  onRefresh: () =>
-                      packageModel.refresh(isCustomer: widget.forCustomer),
-                ),
-              ),
-              packageModel.isLoading
-                  ? Container(
-                      padding: EdgeInsets.all(8),
-                      color: primaryColor,
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Text("Loading...",
-                              style: TextStyle(color: Colors.white)),
-                        ],
-                      ),
-                    )
-                  : Container(),
-            ],
           )),
     );
   }

lib/pages/processing/processing_list.dart

@@ -5,6 +5,7 @@ import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/package_search/package_serach.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:fcs/pagination/paginator_listview.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -33,7 +34,7 @@ class _ProcessingListState extends State<ProcessingList> {
   @override
   Widget build(BuildContext context) {
     var packageModel = Provider.of<PackageModel>(context);
-    bool isCustomer = context.select((MainModel m) => m.isCustomer());
+    var packages = packageModel.activePackages;
 
     return LocalProgress(
       inAsyncCall: _isLoading,
@@ -52,33 +53,25 @@ class _ProcessingListState extends State<ProcessingList> {
               color: Colors.white,
             ),
             actions: <Widget>[
-              isCustomer
+              IconButton(
-                  ? Container()
+                icon: Icon(
-                  : IconButton(
+                  Icons.search,
-                      icon: Icon(
+                  color: Colors.white,
-                        Icons.search,
+                ),
-                        color: Colors.white,
+                iconSize: 30,
-                      ),
+                onPressed: () => searchPackage(context,
-                      iconSize: 30,
+                    callbackPackageSelect: _searchCallback),
-                      onPressed: () => searchPackage(context,
+              ),
-                          callbackPackageSelect: _searchCallback),
-                    ),
             ],
           ),
-          body: new ListView.separated(
+          body: PaginatorListView<Package>(
-              separatorBuilder: (context, index) => Divider(
+            paginatorListener: packages,
-                    color: Colors.black,
+            rowBuilder: (p) => ProcessingListRow(
-                    height: 1,
+              key: ValueKey(p.id),
-                  ),
+              package: p,
-              scrollDirection: Axis.vertical,
+            ),
-              shrinkWrap: true,
+            color: primaryColor,
-              itemCount: packageModel.packages.length,
+          )),
-              itemBuilder: (BuildContext context, int index) {
-                return ProcessingListRow(
-                  key: ValueKey(packageModel.packages[index].id),
-                  package: packageModel.packages[index],
-                );
-              })),
     );
   }
 

lib/pages/receiving/receiving_editor.dart

@@ -52,6 +52,17 @@ class _ReceivingEditorState extends State<ReceivingEditor> {
     } else {
       package = new Package();
     }
+    _trackingIDCtl.addListener(() {
+      var text = _trackingIDCtl.text;
+      if (text.contains(RegExp(r'[a-z ]'))) {
+        text = text.toUpperCase().replaceAll(" ", "");
+        _trackingIDCtl.value = _trackingIDCtl.value.copyWith(
+          text: text,
+          selection:
+              TextSelection(baseOffset: text.length, extentOffset: text.length),
+        );
+      }
+    });
   }
 
   @override
@@ -158,7 +169,9 @@ class _ReceivingEditorState extends State<ReceivingEditor> {
                   height: 10,
                 ),
                 remarkBox,
+                Divider(),
                 img,
+                Divider(),
                 SizedBox(
                   height: 10,
                 ),

lib/pages/receiving/receiving_list.dart

@@ -6,6 +6,7 @@ import 'package:fcs/pages/package_search/package_serach.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:fcs/pagination/paginator_listview.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -25,7 +26,6 @@ class _ReceivingListState extends State<ReceivingList> {
   @override
   void initState() {
     super.initState();
-    Provider.of<PackageModel>(context, listen: false).initData(false);
   }
 
   @override
@@ -36,7 +36,7 @@ class _ReceivingListState extends State<ReceivingList> {
   @override
   Widget build(BuildContext context) {
     var packageModel = Provider.of<PackageModel>(context);
-    bool isCustomer = context.select((MainModel m) => m.isCustomer());
+    var packages = packageModel.activePackages;
 
     return LocalProgress(
       inAsyncCall: _isLoading,
@@ -55,44 +55,33 @@ class _ReceivingListState extends State<ReceivingList> {
               color: Colors.white,
             ),
             actions: <Widget>[
-              isCustomer
+              IconButton(
-                  ? Container()
+                icon: Icon(
-                  : IconButton(
+                  Icons.search,
-                      icon: Icon(
+                  color: Colors.white,
-                        Icons.search,
+                ),
-                        color: Colors.white,
+                iconSize: 30,
-                      ),
+                onPressed: () => searchPackage(context,
-                      iconSize: 30,
+                    callbackPackageSelect: _searchCallback),
-                      onPressed: () => searchPackage(context,
+              ),
-                          callbackPackageSelect: _searchCallback),
-                    ),
             ],
           ),
-          floatingActionButton: isCustomer
+          floatingActionButton: FloatingActionButton.extended(
-              ? Container()
+            onPressed: () {
-              : FloatingActionButton.extended(
+              _newReceiving();
-                  onPressed: () {
+            },
-                    _newReceiving();
+            icon: Icon(Icons.add),
-                  },
+            label: LocalText(context, "receiving.new", color: Colors.white),
-                  icon: Icon(Icons.add),
+            backgroundColor: primaryColor,
-                  label:
+          ),
-                      LocalText(context, "receiving.new", color: Colors.white),
+          body: PaginatorListView<Package>(
-                  backgroundColor: primaryColor,
+            paginatorListener: packages,
-                ),
+            rowBuilder: (p) => ReceivingListRow(
-          body: new ListView.separated(
+              key: ValueKey(p.id),
-              separatorBuilder: (context, index) => Divider(
+              package: p,
-                    color: Colors.black,
+            ),
-                    height: 1,
+            color: primaryColor,
-                  ),
+          )),
-              scrollDirection: Axis.vertical,
-              shrinkWrap: true,
-              itemCount: packageModel.packages.length,
-              itemBuilder: (BuildContext context, int index) {
-                return ReceivingListRow(
-                  key: ValueKey(packageModel.packages[index].id),
-                  package: packageModel.packages[index],
-                );
-              })),
     );
   }
 

lib/pages/widgets/barcode_scanner.dart

@@ -9,6 +9,14 @@ Future<String> scanBarcode() async {
     if (barcode.contains(gs)) {
       var codes = barcode.split(gs);
       barcode = codes.length >= 2 ? codes[1] : barcode;
+    } else if (barcode.startsWith("96")) {
+      if (barcode.length == 34) {
+        int start = barcode.length - 12;
+        barcode = barcode.substring(start);
+      } else if (barcode.length == 22) {
+        int start = barcode.length - 15;
+        barcode = barcode.substring(start);
+      }
     }
     return barcode;
   } catch (e) {

lib/pages/widgets/bottom_widgets.dart

@@ -1,32 +1,46 @@
 import 'package:fcs/pages/contact/contact_page.dart';
+import 'package:fcs/pages/main/model/main_model.dart';
 import 'package:fcs/pages/term/term_page.dart';
-import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_icons/flutter_icons.dart';
+import 'package:provider/provider.dart';
 
 class BottomWidgets extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return Row(
+    var pkgInfo = Provider.of<MainModel>(context).packageInfo;
-      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+    final versionBox = Text(
-      children: <Widget>[
+      "v${pkgInfo.version}+${pkgInfo.buildNumber}",
-        InkWell(
+      style: TextStyle(color: Colors.white30),
-          onTap: () {
+    );
-            Navigator.of(context)
+    return Column(
-                .push(CupertinoPageRoute(builder: (context) => ContactPage()));
+      children: [
-          },
+        Row(
-          child: _buildSmallButton(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-              context, "contact.btn", SimpleLineIcons.support),
+          children: <Widget>[
+            InkWell(
+              onTap: () {
+                Navigator.of(context).push(
+                    CupertinoPageRoute(builder: (context) => ContactPage()));
+              },
+              child: _buildSmallButton(
+                  context, "contact.btn", SimpleLineIcons.support),
+            ),
+            InkWell(
+              onTap: () {
+                Navigator.of(context)
+                    .push(CupertinoPageRoute(builder: (context) => TermPage()));
+              },
+              child: _buildSmallButton(context, "term.btn", Icons.info_outline),
+            ),
+          ],
         ),
-        InkWell(
+        Padding(
-          onTap: () {
+          padding: const EdgeInsets.only(bottom: 8.0),
-            Navigator.of(context)
+          child: versionBox,
-                .push(CupertinoPageRoute(builder: (context) => TermPage()));
-          },
-          child: _buildSmallButton(context, "term.btn", Icons.info_outline),
         ),
       ],
     );

lib/pages/widgets/multi_img_file.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:fcs/helpers/theme.dart';
+import 'package:fcs/pages/widgets/callbacks.dart';
 import 'package:fcs/pages/widgets/right_left_page_rout.dart';
 import 'package:fcs/pages/widgets/show_img.dart';
 import 'package:fcs/pages/widgets/show_multiple_img.dart';
@@ -48,117 +49,142 @@ class _MultiImageFileState extends State<MultiImageFile> {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return Column(
-      height: 130,
+      children: [
-      width: 500,
+        widget.enabled
-      child: ListView.separated(
+            ? Row(
-        separatorBuilder: (context, index) => Divider(
+                mainAxisAlignment: MainAxisAlignment.end,
-          color: Colors.black,
+                children: [
-        ),
+                  InkWell(
-        itemCount:
+                    onTap: () => {_openImagePicker(false)},
-            widget.enabled ? fileContainers.length + 1 : fileContainers.length,
+                    child: Stack(
-        scrollDirection: Axis.horizontal,
+                      children: [
-        itemBuilder: (context, index) {
+                        Container(
-          if (index == fileContainers.length) {
-            return InkWell(
-              onTap: () async {
-                bool camera = false, gallery = false;
-                await _dialog(
-                    context, () => camera = true, () => gallery = true);
-                if (camera || gallery) {
-                  var selectedFile = await ImagePicker().getImage(
-                      source: camera ? ImageSource.camera : ImageSource.gallery,
-                      imageQuality: 80,
-                      maxWidth: 1000);
-                  if (selectedFile != null) {
-                    _fileAdded(DisplayImageSource(), File(selectedFile.path));
-                  }
-                }
-              },
-              child: Padding(
-                padding: const EdgeInsets.all(8.0),
-                child: Container(
-                  width: 200,
-                  height: 130,
-                  decoration: BoxDecoration(
-                    border: Border.all(
-                      color: primaryColor,
-                      width: 2.0,
-                    ),
-                  ),
-                  child: Icon(SimpleLineIcons.plus),
-                ),
-              ),
-            );
-          } else {
-            return InkWell(
-              onTap: () => Navigator.push(
-                  context,
-                  RightLeftPageRoute(ShowMultiImage(
-                    displayImageSources: fileContainers,
-                    initialPage: index,
-                  ))),
-              child: Stack(alignment: Alignment.topLeft, children: <Widget>[
-                Padding(
-                  padding: const EdgeInsets.all(8.0),
-                  child: Container(
-                    width: 200,
-                    height: 130,
-                    decoration: BoxDecoration(
-                      border: Border.all(
-                        color: primaryColor,
-                        width: 2.0,
-                      ),
-                    ),
-                    child: fileContainers[index].file == null
-                        ? CachedNetworkImage(
-                            width: 50,
-                            height: 50,
-                            imageUrl: fileContainers[index].url,
-                            placeholder: (context, url) => Column(
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                SizedBox(
-                                    width: 30,
-                                    height: 30,
-                                    child: CircularProgressIndicator()),
-                              ],
-                            ),
-                            errorWidget: (context, url, error) =>
-                                Icon(Icons.error),
-                          )
-                        // Image.network(fileContainers[index].url,
-                        //     width: 50, height: 50)
-                        : Image.file(fileContainers[index].file,
-                            width: 50, height: 50),
-                  ),
-                ),
-                widget.enabled
-                    ? Positioned(
-                        top: 0,
-                        right: 0,
-                        child: Container(
-                          height: 50,
                           width: 50,
-                          child: IconButton(
+                          height: 50,
-                              icon: Icon(
+                          child: Icon(
-                                Icons.close,
+                            MaterialCommunityIcons.image,
-                                color: primaryColor,
+                            color: primaryColor,
-                              ),
+                            size: 35,
-                              onPressed: () =>
+                          ),
-                                  {_fileRemove(fileContainers[index])}),
                         ),
-                      )
+                        Positioned(
-                    : Container(),
+                            right: 0,
-              ]),
+                            top: 0,
-            );
+                            child: actionIcon(
-          }
+                                color: Colors.green, iconData: Icons.add))
-        },
+                      ],
-      ),
+                    ),
+                  ),
+                  InkWell(
+                    onTap: () => {_openImagePicker(true)},
+                    child: Stack(
+                      children: [
+                        Container(
+                          width: 50,
+                          height: 50,
+                          child: Icon(
+                            MaterialCommunityIcons.camera,
+                            color: primaryColor,
+                            size: 35,
+                          ),
+                        ),
+                        Positioned(
+                            right: 0,
+                            top: 0,
+                            child: actionIcon(
+                                color: Colors.green, iconData: Icons.add))
+                      ],
+                    ),
+                  ),
+                ],
+              )
+            : Container(),
+        Container(
+          height: 100,
+          child: ListView.separated(
+            separatorBuilder: (context, index) => Divider(
+              color: Colors.black,
+            ),
+            itemCount: fileContainers.length,
+            scrollDirection: Axis.horizontal,
+            itemBuilder: (context, index) {
+              return InkWell(
+                onTap: () => Navigator.push(
+                    context,
+                    RightLeftPageRoute(ShowMultiImage(
+                      displayImageSources: fileContainers,
+                      initialPage: index,
+                    ))),
+                child: Stack(alignment: Alignment.topLeft, children: <Widget>[
+                  Padding(
+                    padding: const EdgeInsets.all(8.0),
+                    child: Container(
+                      width: 100,
+                      height: 100,
+                      decoration: BoxDecoration(
+                        border: Border.all(
+                          color: primaryColor,
+                          width: 1.0,
+                        ),
+                      ),
+                      child: fileContainers[index].file == null
+                          ? CachedNetworkImage(
+                              fit: BoxFit.cover,
+                              width: 50,
+                              height: 50,
+                              imageUrl: fileContainers[index].url,
+                              placeholder: (context, url) => Column(
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  SizedBox(
+                                      width: 30,
+                                      height: 30,
+                                      child: CircularProgressIndicator()),
+                                ],
+                              ),
+                              errorWidget: (context, url, error) =>
+                                  Icon(Icons.error),
+                            )
+                          : FittedBox(
+                              fit: BoxFit.cover,
+                              child: Image.file(
+                                fileContainers[index].file,
+                              ),
+                            ),
+                    ),
+                  ),
+                  widget.enabled
+                      ? Positioned(
+                          top: 10,
+                          right: 0,
+                          child: actionIcon(
+                              color: Colors.red,
+                              iconData: Icons.remove,
+                              onTap: () =>
+                                  {_fileRemove(fileContainers[index])}),
+                        )
+                      : Container(),
+                ]),
+              );
+            },
+          ),
+        ),
+      ],
     );
   }
 
+  _openImagePicker(bool camera) async {
+    var selectedFile = await ImagePicker().getImage(
+        source: camera ? ImageSource.camera : ImageSource.gallery,
+        imageQuality: 80,
+        maxWidth: 1000);
+    if (selectedFile != null) {
+      _fileAdded(DisplayImageSource(), File(selectedFile.path));
+    }
+  }
+
   _fileAdded(DisplayImageSource fileContainer, File selectedFile) {
     fileContainer.file = selectedFile;
     setState(() {
@@ -281,4 +307,21 @@ class _MultiImageFileState extends State<MultiImageFile> {
       },
     );
   }
+
+  Widget actionIcon({OnTap onTap, Color color, IconData iconData}) {
+    return InkWell(
+      onTap: onTap,
+      child: ClipOval(
+        child: Container(
+            color: color,
+            height: 20,
+            width: 20,
+            child: Icon(
+              iconData,
+              color: Colors.white,
+              size: 15,
+            )),
+      ),
+    );
+  }
 }

lib/pagination/paginator_listener.dart

@@ -0,0 +1,163 @@
+import 'dart:async';
+
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:fcs/pages/widgets/callbacks.dart';
+import 'package:logging/logging.dart';
+
+typedef ToObj = Function(Map<String, dynamic> data, String id);
+
+/*
+ * PaginatorListener load data in page 
+ * and listen to document change based on 'update_time' and 'delete_time' fields
+ * of the document
+ */
+class PaginatorListener<T> {
+  final log = Logger('PaginatorListener');
+
+  List<String> ids = [];
+  List<T> data = [];
+  DocumentSnapshot prev;
+  int rowPerLoad = 10;
+  bool ended = false;
+  bool isLoading = false;
+  bool insertNewByListener = false;
+  ToObj toObj;
+  CallBack onChange;
+
+  StreamSubscription<QuerySnapshot> listener;
+  Query listeningQuery;
+  Query pageQuery;
+
+  PaginatorListener(this.toObj,
+      {this.onChange, this.rowPerLoad = 10, this.insertNewByListener = false});
+
+  Future<bool> refresh({Query listeningQuery, Query pageQuery}) {
+    this.listeningQuery = listeningQuery ?? this.listeningQuery;
+    this.pageQuery = pageQuery ?? this.pageQuery;
+    _clearState();
+    _initListener();
+    return _load();
+  }
+
+  void _clearState() {
+    prev = null;
+    ids = [];
+    data = [];
+    ended = false;
+    isLoading = false;
+    if (listener != null) listener.cancel();
+    listener = null;
+  }
+
+  void close() {
+    _clearState();
+  }
+
+  final String updateTimeField = 'update_time';
+  final String deleteTimeField = 'delete_time';
+  final String isDeletedField = 'is_deleted';
+  void _initListener() {
+    Query _query =
+        listeningQuery.orderBy(updateTimeField, descending: true).limit(1);
+    _query.getDocuments(source: Source.server).then((QuerySnapshot snapshot) {
+      int count = snapshot.documents.length;
+      int updateTime = 0;
+      if (count == 1) {
+        updateTime = snapshot.documents[0].data[updateTimeField];
+      }
+
+      Query _queryListener = listeningQuery
+          .where(updateTimeField, isGreaterThan: updateTime)
+          .orderBy(updateTimeField, descending: true);
+
+      if (listener != null) listener.cancel();
+      listener =
+          _queryListener.snapshots(includeMetadataChanges: true).listen((qs) {
+        qs.documentChanges.forEach((c) {
+          switch (c.type) {
+            case DocumentChangeType.added:
+              _update(c.document.documentID, c.document.data);
+              break;
+            case DocumentChangeType.modified:
+              _update(c.document.documentID, c.document.data);
+              break;
+            case DocumentChangeType.removed:
+              _remove(c.document.documentID, c.document.data);
+              break;
+            default:
+          }
+          if (onChange != null) onChange();
+        });
+      });
+    });
+  }
+
+  void _update(String id, Map<String, dynamic> map) {
+    T t = toObj(map, id);
+    if (ids.contains(id)) {
+      var deleted = map[deleteTimeField];
+      var isDeleted = map[isDeletedField];
+      if ((deleted ?? 0) > 0 || (isDeleted ?? false)) {
+        data.removeAt(ids.indexOf(id));
+        ids.remove(id);
+      } else {
+        data.removeAt(ids.indexOf(id));
+        data.insert(ids.indexOf(id), t);
+      }
+    } else if (insertNewByListener) {
+      data.insert(0, t);
+      ids.insert(0, id);
+    }
+  }
+
+  void _add(String id, Map<String, dynamic> map) {
+    T t = toObj(map, id);
+    if (!ids.contains(id)) {
+      data.add(t);
+      ids.add(id);
+    }
+  }
+
+  void _remove(String id, Map<String, dynamic> map) {
+    if (ids.contains(id)) {
+      data.removeAt(ids.indexOf(id));
+      ids.remove(id);
+    }
+  }
+
+  Future<bool> loadMore() {
+    return this._load();
+  }
+
+  Future<bool> _load({CallBack onStarted, CallBack onFinished}) async {
+    if (ended) return ended;
+    Query _query =
+        prev != null ? pageQuery.startAfterDocument(prev) : pageQuery;
+    try {
+      isLoading = true;
+      if (onStarted != null) {
+        onStarted();
+      }
+      if (onChange != null) onChange();
+      await _query
+          .where(isDeletedField, isEqualTo: false)
+          .limit(rowPerLoad)
+          .getDocuments(source: Source.server)
+          .then((QuerySnapshot snapshot) {
+        int count = snapshot.documents.length;
+        ended = count < rowPerLoad;
+        prev = count > 0 ? snapshot.documents[count - 1] : prev;
+        snapshot.documents.forEach((e) {
+          _add(e.documentID, e.data);
+        });
+      });
+    } catch (e) {
+      log.warning("Error!! $e");
+    } finally {
+      isLoading = false;
+      if (onFinished != null) onFinished();
+      if (onChange != null) onChange();
+    }
+    return ended;
+  }
+}

lib/pagination/paginator_listview.dart

@@ -0,0 +1,99 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+
+import 'paginator_listener.dart';
+
+typedef RowBuilder = Widget Function(dynamic);
+typedef OnScroll = void Function(bool down);
+
+class PaginatorListView<T> extends StatelessWidget {
+  final PaginatorListener<T> paginatorListener;
+  final RowBuilder rowBuilder;
+  final OnScroll onScroll;
+  final ScrollController _scrollController;
+  final Color color;
+
+  PaginatorListView(
+      {Key key,
+      this.paginatorListener,
+      this.rowBuilder,
+      this.onScroll,
+      this.color = Colors.blueAccent})
+      : _scrollController = ScrollController(),
+        assert(paginatorListener != null),
+        assert(rowBuilder != null),
+        super(key: key) {
+    _scrollController.addListener(() async {
+      if (_scrollController.position.pixels ==
+          _scrollController.position.maxScrollExtent) {
+        paginatorListener.loadMore();
+      }
+      if (onScroll != null) {
+        var down = _scrollController.position.userScrollDirection ==
+            ScrollDirection.forward;
+        onScroll(down);
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    bool ended = paginatorListener.ended;
+    int count = paginatorListener.data.length;
+    if (ended) count++;
+
+    return Column(
+      children: [
+        Expanded(
+          child: RefreshIndicator(
+            onRefresh: () {
+              return paginatorListener.refresh();
+            },
+            child: ListView.separated(
+                separatorBuilder: (context, index) =>
+                    Divider(height: 1, color: Colors.black),
+                controller: _scrollController,
+                scrollDirection: Axis.vertical,
+                physics: const AlwaysScrollableScrollPhysics(),
+                shrinkWrap: true,
+                itemCount: count,
+                itemBuilder: (BuildContext context, int index) {
+                  if (ended && index == count - 1) {
+                    return Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: Center(child: Text("No more data")),
+                    );
+                  }
+                  T t = paginatorListener.data[index];
+                  return rowBuilder(t);
+                }),
+          ),
+        ),
+        paginatorListener.isLoading ? _loadingRow() : Container()
+      ],
+    );
+  }
+
+  Widget _loadingRow() {
+    return Container(
+      padding: EdgeInsets.all(8),
+      color: Colors.transparent,
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Column(
+            children: [
+              CircularProgressIndicator(
+                  valueColor: new AlwaysStoppedAnimation<Color>(color)),
+              Text(
+                "Loading...",
+                style: TextStyle(color: color),
+              )
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}

pubspec.yaml

@@ -2,7 +2,7 @@ name: fcs
 description: FCS Logistics
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.0+4
+version: 1.0.5+7
 
 environment:
   sdk: ">=2.7.0 <3.0.0"