add pagination

2020-11-13 02:38:16 +06:30
parent 08c90fce74
commit ca21f48dab
7 changed files with 412 additions and 190 deletions
--- a/lib/pages/main/model/base_model.dart
+++ b/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
--- a/lib/pages/package/model/package_model.dart
+++ b/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);
-    _delivered = _getDelivered(forCustomer);
-    _delivered.load();
+    packages = PaginatorListener<Package>(
+        (data, id) => Package.fromMap(data, id), onChange: () {
+      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 (listener != null) await listener.cancel();
-    _packages = [];
+    if (customerPackages != null) customerPackages.close();
+    if (packages != null) packages.close();
+    if (activePackages != null) activePackages.close();
  }

-  Future<void> loadMore({bool isCustomer}) 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 {
+  Future<void> _loadPackages(bool isDelivered) async {
    if (user == null) return;
-    if (!forCustomer &&
-        !((user.hasPackages() || user.hasReceiving() || user.hasProcessing())))
+    if (!((user.hasPackages() || user.hasReceiving() || user.hasProcessing())))
      return;
    String path = "/$packages_collection";
-    if (listener != null) listener.cancel();
-    _packages = [];

    try {
-      var q = Firestore.instance
-          .collection("$path")
-          .where("is_delivered", isEqualTo: false)
-          .where("is_deleted", isEqualTo: false);
+      Query listenerQuery = Firestore.instance
+          .collection(path)
+          .where("is_delivered", isEqualTo: isDelivered);
+      Query pageQuery = Firestore.instance
+          .collection(path)
+          .where("is_delivered", isEqualTo: isDelivered);

-      if (forCustomer) {
-        q = q.where("user_id", isEqualTo: user.id);
-      }
-      q = q.orderBy("update_time", descending: true);
-      listener = q.snapshots().listen((QuerySnapshot snapshot) {
-        _packages.clear();
-        _packages = snapshot.documents.map((documentSnapshot) {
-          var package = Package.fromMap(
-              documentSnapshot.data, documentSnapshot.documentID);
-          return package;
-        }).toList();
-        notifyListeners();
-      });
+      pageQuery = pageQuery.orderBy("update_time", descending: true);
+      packages.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
+    } catch (e) {
+      log.warning("Error!! $e");
+    }
+  }
+
+  Future<void> _loadCustomerPackages(bool isDelivered) async {
+    if (user == null) return;
+    String path = "/$packages_collection";
+
+    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");
    }
--- a/lib/pages/package/package_list.dart
+++ b/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(
-            children: [
-              Expanded(
-                child: RefreshIndicator(
-                  child: ListView.separated(
-                      controller: _controller,
-                      separatorBuilder: (context, index) => Divider(
-                            color: Colors.grey,
-                            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(),
-            ],
+          body: PaginatorListView<Package>(
+            paginatorListener: packages,
+            rowBuilder: (p) => PackageListRow(
+              key: ValueKey(p.id),
+              package: p,
+              isCustomer: widget.forCustomer,
+            ),
+            color: primaryColor,
          )),
    );
  }
--- a/lib/pages/processing/processing_list.dart
+++ b/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
-                  ? Container()
-                  : IconButton(
-                      icon: Icon(
-                        Icons.search,
-                        color: Colors.white,
-                      ),
-                      iconSize: 30,
-                      onPressed: () => searchPackage(context,
-                          callbackPackageSelect: _searchCallback),
-                    ),
+              IconButton(
+                icon: Icon(
+                  Icons.search,
+                  color: Colors.white,
+                ),
+                iconSize: 30,
+                onPressed: () => searchPackage(context,
+                    callbackPackageSelect: _searchCallback),
+              ),
            ],
          ),
-          body: new ListView.separated(
-              separatorBuilder: (context, index) => Divider(
-                    color: Colors.black,
-                    height: 1,
-                  ),
-              scrollDirection: Axis.vertical,
-              shrinkWrap: true,
-              itemCount: packageModel.packages.length,
-              itemBuilder: (BuildContext context, int index) {
-                return ProcessingListRow(
-                  key: ValueKey(packageModel.packages[index].id),
-                  package: packageModel.packages[index],
-                );
-              })),
+          body: PaginatorListView<Package>(
+            paginatorListener: packages,
+            rowBuilder: (p) => ProcessingListRow(
+              key: ValueKey(p.id),
+              package: p,
+            ),
+            color: primaryColor,
+          )),
    );
  }

--- a/lib/pages/receiving/receiving_list.dart
+++ b/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
-                  ? Container()
-                  : IconButton(
-                      icon: Icon(
-                        Icons.search,
-                        color: Colors.white,
-                      ),
-                      iconSize: 30,
-                      onPressed: () => searchPackage(context,
-                          callbackPackageSelect: _searchCallback),
-                    ),
+              IconButton(
+                icon: Icon(
+                  Icons.search,
+                  color: Colors.white,
+                ),
+                iconSize: 30,
+                onPressed: () => searchPackage(context,
+                    callbackPackageSelect: _searchCallback),
+              ),
            ],
          ),
-          floatingActionButton: isCustomer
-              ? Container()
-              : FloatingActionButton.extended(
-                  onPressed: () {
-                    _newReceiving();
-                  },
-                  icon: Icon(Icons.add),
-                  label:
-                      LocalText(context, "receiving.new", color: Colors.white),
-                  backgroundColor: primaryColor,
-                ),
-          body: new ListView.separated(
-              separatorBuilder: (context, index) => Divider(
-                    color: Colors.black,
-                    height: 1,
-                  ),
-              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],
-                );
-              })),
+          floatingActionButton: FloatingActionButton.extended(
+            onPressed: () {
+              _newReceiving();
+            },
+            icon: Icon(Icons.add),
+            label: LocalText(context, "receiving.new", color: Colors.white),
+            backgroundColor: primaryColor,
+          ),
+          body: PaginatorListView<Package>(
+            paginatorListener: packages,
+            rowBuilder: (p) => ReceivingListRow(
+              key: ValueKey(p.id),
+              package: p,
+            ),
+            color: primaryColor,
+          )),
    );
  }