add paginator

lib/pages/package/model/package_model.dart

@@ -18,72 +18,55 @@ class PackageModel extends BaseModel {
   final log = Logger('PackageModel');
 
   StreamSubscription<QuerySnapshot> listener;
-  StreamSubscription<QuerySnapshot> customerPackageListener;
 
-  List<Package> get packages =>
-      _selectedIndex == 1 ? _packages : List<Package>.from(_delivered.values);
-  List<Package> get customerPackages => _selectedIndex == 1
-      ? _customerPackages
-      : List<Package>.from(_customerDelivered.values);
+  List<Package> get packages => _menuSelectedIndex == 1
+      ? _packages
+      : List<Package>.from(_delivered.values);
 
   List<Package> _packages = [];
-  List<Package> _customerPackages = [];
 
   Paginator _delivered;
-  Paginator _customerDelivered;
   bool isLoading = false;
-  bool isPackagesEnded = false;
-  bool isCustomerPackagesEnded = false;
-  int _selectedIndex = 1;
-  set selectedIndex(int index) {
-    _selectedIndex = index;
+  int _menuSelectedIndex = 1;
+
+  set menuSelectedIndex(int index) {
+    _menuSelectedIndex = index;
     notifyListeners();
   }
 
-  get selectedIndex => _selectedIndex;
+  get menuSelectedIndex => _menuSelectedIndex;
 
-  @override
-  void privilegeChanged() {
-    super.privilegeChanged();
-    _loadPackages();
-    _loadCustomerPackages();
-
-    if (_delivered != null) _delivered.close();
-    _delivered = _getDeliveredExample(false);
-    loadMore(isCustomer: false);
-    if (_customerDelivered != null) _customerDelivered.close();
-    _customerDelivered = _getDeliveredExample(false);
-    loadMore(isCustomer: true);
+  initData(bool forCustomer) {
+    logout();
+    _menuSelectedIndex = 1;
+    _loadPackages(forCustomer);
+    _delivered = _getDeliveredExample(forCustomer);
+    _delivered.load();
   }
 
   @override
   logout() async {
     if (_delivered != null) _delivered.close();
-    if (_customerDelivered != null) _customerDelivered.close();
     if (listener != null) await listener.cancel();
-    if (customerPackageListener != null) await customerPackageListener.cancel();
     _packages = [];
-    _customerPackages = [];
   }
 
   Future<void> loadMore({bool isCustomer}) async {
-    if (selectedIndex == 1)
+    if (menuSelectedIndex == 1)
       return; // when delivered menu is not selected return
-    var p = isCustomer ? _customerDelivered : _delivered;
-    if (p.ended) return;
+    if (_delivered.ended) return;
     isLoading = true;
     notifyListeners();
-    await p.load(onFinished: () {
+    await _delivered.load(onFinished: () {
       isLoading = false;
       notifyListeners();
     });
   }
 
   Future<void> refresh({bool isCustomer}) async {
-    if (selectedIndex == 1)
+    if (menuSelectedIndex == 1)
       return; // when delivered menu is not selected return
-    var p = isCustomer ? _customerDelivered : _delivered;
-    await p.refresh(onFinished: () {
+    await _delivered.refresh(onFinished: () {
       notifyListeners();
     });
   }
@@ -129,8 +112,9 @@ class PackageModel extends BaseModel {
     return paginator;
   }
 
-  Future<void> _loadPackages() async {
-    if (user == null ||
+  Future<void> _loadPackages(bool forCustomer) async {
+    if (user == null) return;
+    if (!forCustomer &&
         !((user.hasPackages() || user.hasReceiving() || user.hasProcessing())))
       return;
     String path = "/$packages_collection";
@@ -143,6 +127,10 @@ class PackageModel extends BaseModel {
           .where("is_delivered", isEqualTo: false)
           .where("is_deleted", isEqualTo: false);
 
+      if (forCustomer) {
+        q = q.where("user_id", isEqualTo: user.id);
+      }
+
       listener = q.snapshots().listen((QuerySnapshot snapshot) {
         _packages.clear();
         _packages = snapshot.documents.map((documentSnapshot) {
@@ -157,33 +145,6 @@ class PackageModel extends BaseModel {
     }
   }
 
-  Future<void> _loadCustomerPackages() async {
-    if (user == null) return;
-    String path = "/$packages_collection";
-    if (customerPackageListener != null) customerPackageListener.cancel();
-    _customerPackages = [];
-
-    try {
-      var q = Firestore.instance
-          .collection("$path")
-          .where("is_delivered", isEqualTo: false)
-          .where("is_deleted", isEqualTo: false)
-          .where("user_id", isEqualTo: user.id);
-
-      customerPackageListener = q.snapshots().listen((QuerySnapshot snapshot) {
-        _customerPackages.clear();
-        _customerPackages = snapshot.documents.map((documentSnapshot) {
-          var package = Package.fromMap(
-              documentSnapshot.data, documentSnapshot.documentID);
-          return package;
-        }).toList();
-        notifyListeners();
-      });
-    } catch (e) {
-      log.warning("Error!! $e");
-    }
-  }
-
   Future<Package> getPackage(String id) async {
     if (user == null) return null;
     String path = "/$packages_collection";

lib/pages/package/package_list.dart

@@ -1,5 +1,4 @@
 import 'package:fcs/domain/entities/package.dart';
-import 'package:fcs/helpers/paginator.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/package/package_info.dart';
@@ -14,9 +13,9 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 class PackageList extends StatefulWidget {
-  final bool onlyFcs;
+  final bool forCustomer;
 
-  const PackageList({Key key, this.onlyFcs = false}) : super(key: key);
+  const PackageList({Key key, this.forCustomer = true}) : super(key: key);
   @override
   _PackageListState createState() => _PackageListState();
 }
@@ -32,31 +31,31 @@ class _PackageListState extends State<PackageList> {
     _controller.addListener(() async {
       if (_controller.position.pixels == _controller.position.maxScrollExtent) {
         Provider.of<PackageModel>(context, listen: false)
-            .loadMore(isCustomer: !widget.onlyFcs);
+            .loadMore(isCustomer: widget.forCustomer);
       }
     });
+    Provider.of<PackageModel>(context, listen: false)
+        .initData(widget.forCustomer);
   }
 
   @override
   Widget build(BuildContext context) {
     var packageModel = Provider.of<PackageModel>(context);
-    bool onlyFcs = widget.onlyFcs;
-    var packages =
-        onlyFcs ? packageModel.packages : packageModel.customerPackages;
+    var packages = packageModel.packages;
 
     final popupMenu = LocalPopupMenuButton(
       popmenus: [
         LocalPopupMenu(
             id: 1,
             textKey: "package.popupmenu.active",
-            selected: packageModel.selectedIndex == 1),
+            selected: packageModel.menuSelectedIndex == 1),
         LocalPopupMenu(
             id: 2,
             textKey: "package.popupmenu.delivered",
-            selected: packageModel.selectedIndex == 2)
+            selected: packageModel.menuSelectedIndex == 2)
       ],
       popupMenuCallback: (p) => this.setState(() {
-        packageModel.selectedIndex = p.id;
+        packageModel.menuSelectedIndex = p.id;
       }),
     );
 
@@ -77,8 +76,9 @@ class _PackageListState extends State<PackageList> {
               color: Colors.white,
             ),
             actions: <Widget>[
-              onlyFcs
-                  ? IconButton(
+              widget.forCustomer
+                  ? Container()
+                  : IconButton(
                       icon: Icon(
                         Icons.search,
                         color: Colors.white,
@@ -86,8 +86,7 @@ class _PackageListState extends State<PackageList> {
                       iconSize: 30,
                       onPressed: () => searchPackage(context,
                           callbackPackageSelect: _searchCallback),
-                    )
-                  : Container(),
+                    ),
               popupMenu
             ],
           ),
@@ -111,7 +110,7 @@ class _PackageListState extends State<PackageList> {
                         );
                       }),
                   onRefresh: () =>
-                      packageModel.refresh(isCustomer: !widget.onlyFcs),
+                      packageModel.refresh(isCustomer: widget.forCustomer),
                 ),
               ),
               packageModel.isLoading