sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update pagination listener

Browse Source
This commit is contained in:
tzw
2024-01-23 17:48:34 +06:30
parent f3f75a80c6
commit 5ec51c31fd
13 changed files with 186 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/domain/entities/pickup.dart
View File

@@ -80,20 +80,20 @@ class Pickup {
return Pickup( return Pickup(
id: id, id: id,
pickupDate: _pickupDate.toDate().toLocal(), pickupDate: _pickupDate.toDate().toLocal(),
pickupNumber: map['pickup_number'], pickupNumber: map['pickup_number'] ?? "",
pickupAddress: _da, pickupAddress: _da,
fromTime: _fromTime?.toDate().toLocal() ?? null, fromTime: _fromTime?.toDate().toLocal() ?? null,
toTime: _toTime?.toDate().toLocal() ?? null, toTime: _toTime?.toDate().toLocal() ?? null,
staffId: map['pickup_staff_id'], staffId: map['pickup_staff_id'] ?? "",
staffName: map['pickup_staff_name'], staffName: map['pickup_staff_name'] ?? "",
customerID: map['customer_id'], customerID: map['customer_id'] ?? "",
customerName: map['customer_name'], customerName: map['customer_name'] ?? "",
customerRemark: map['customer_remark'] ?? "", customerRemark: map['customer_remark'] ?? "",
completeRemark: map['complete_remark'] ?? "", completeRemark: map['complete_remark'] ?? "",
rescheduleRemark: map['reschedule_remark'], rescheduleRemark: map['reschedule_remark'] ?? "",
zoneID: map['zone_id'], zoneID: map['zone_id'] ?? "",
zoneName: map['zone_name'], zoneName: map['zone_name'] ?? "",
status: map['status'], status: map['status'] ?? "",
photoUrls: _photoUrls); photoUrls: _photoUrls);
} }

28
lib/pages/carton/model/carton_model.dart
View File

@@ -81,7 +81,7 @@ class CartonModel extends BaseModel {
set selectedIndexFilter(int index) { set selectedIndexFilter(int index) {
_selectedIndexFilter = index; _selectedIndexFilter = index;
_loadCartonsByFilter( _loadPaginationCartons(
_selectedIndexFilter == 1 ? "carton_weight" : "user_name"); _selectedIndexFilter == 1 ? "carton_weight" : "user_name");
notifyListeners(); notifyListeners();
} }
@@ -109,12 +109,8 @@ class CartonModel extends BaseModel {
Future<void> _initData() async { Future<void> _initData() async {
logout(); logout();
_selectedIndexFilter = 1; _selectedIndexFilter = 1;
cartonsByFilter = PaginatorListener<Carton>(
(data, id) => Carton.fromMap(data, id), onChange: () {
notifyListeners();
}, rowPerLoad: 30, insertNewByListener: true);
_loadCartonsByFilter( _loadPaginationCartons(
_selectedIndexFilter == 1 ? "carton_weight" : "user_name"); _selectedIndexFilter == 1 ? "carton_weight" : "user_name");
} }
@@ -146,30 +142,26 @@ class CartonModel extends BaseModel {
} }
} }
Future<void> _loadCartonsByFilter(String orderName) async { _loadPaginationCartons(String orderName) {
if (user == null || !user!.hasCarton()) return null; if (user == null || !user!.hasCarton()) return null;
String path = "/$cartons_collection"; String path = "/$cartons_collection";
try { Query col = FirebaseFirestore.instance.collection(path).where("carton_type",
Query listenerQuery = FirebaseFirestore.instance whereIn: [
.collection("$path")
.where("carton_type", whereIn: [
carton_from_packages, carton_from_packages,
carton_from_cartons carton_from_cartons
]).where("status", isEqualTo: carton_packed_status); ]).where("status", isEqualTo: carton_packed_status);
Query pageQuery = FirebaseFirestore.instance Query pageQuery = FirebaseFirestore.instance
.collection("$path") .collection(path)
.where("carton_type", .where("carton_type",
whereIn: [carton_from_packages, carton_from_cartons]) whereIn: [carton_from_packages, carton_from_cartons])
.where("status", isEqualTo: carton_packed_status) .where("status", isEqualTo: carton_packed_status)
.orderBy(orderName, descending: true); .orderBy(orderName, descending: true);
cartonsByFilter! cartonsByFilter?.close();
.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery); cartonsByFilter = PaginatorListener<Carton>(
} catch (e) { col, pageQuery, (data, id) => Carton.fromMap(data, id),
log.warning("Error!! $e"); rowPerLoad: 30);
}
} }
Paginator? _getDelivered() { Paginator? _getDelivered() {

6
lib/pages/customer/model/customer_model.dart
View File

@@ -7,8 +7,11 @@ import 'package:fcs/domain/entities/user.dart';
import 'package:fcs/pages/main/model/base_model.dart'; import 'package:fcs/pages/main/model/base_model.dart';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import '../../../pagination/paginator_listener.dart';
class CustomerModel extends BaseModel { class CustomerModel extends BaseModel {
final log = Logger('CustomerModel'); final log = Logger('CustomerModel');
PaginatorListener<User>? getCustomers;
List<User> customers = []; List<User> customers = [];
List<User> invitations = []; List<User> invitations = [];
@@ -28,8 +31,11 @@ class CustomerModel extends BaseModel {
if (invitationListener != null) invitationListener!.cancel(); if (invitationListener != null) invitationListener!.cancel();
customers = []; customers = [];
invitations = []; invitations = [];
getCustomers?.close();
} }
Future<void> inviteUser(String userName, String phoneNumber) { Future<void> inviteUser(String userName, String phoneNumber) {
return Services.instance.userService.inviteUser(userName, phoneNumber); return Services.instance.userService.inviteUser(userName, phoneNumber);
} }

78
lib/pages/package/model/package_model.dart
View File

@@ -26,8 +26,8 @@ class PackageModel extends BaseModel {
set menuSelectedIndex(int index) { set menuSelectedIndex(int index) {
_menuSelectedIndex = index; _menuSelectedIndex = index;
_loadPackages(_menuSelectedIndex == 2); _loadPaginationPackages(_menuSelectedIndex == 2);
_loadCustomerPackages(_menuSelectedIndex == 2); _loadPaginationCustomerPackages(_menuSelectedIndex == 2);
notifyListeners(); notifyListeners();
} }
@@ -41,24 +41,11 @@ class PackageModel extends BaseModel {
} }
Future<void> _initData() async { Future<void> _initData() async {
logout();
_menuSelectedIndex = 1; _menuSelectedIndex = 1;
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); _loadPaginationPackages(_menuSelectedIndex == 2);
_loadCustomerPackages(_menuSelectedIndex == 2); _loadPaginationCustomerPackages(_menuSelectedIndex == 2);
_loadActivePackages(); _loadPaginationActivePackages();
} }
@override @override
@@ -68,71 +55,68 @@ class PackageModel extends BaseModel {
if (activePackages != null) activePackages!.close(); if (activePackages != null) activePackages!.close();
} }
Future<void> _loadPackages(bool isDelivered) async { _loadPaginationPackages(bool isDelivered) {
if (user == null) return; if (user == null) return;
if (!((user!.hasPackages() || if (!((user!.hasPackages() ||
user!.hasReceiving() || user!.hasReceiving() ||
user!.hasProcessing()))) return; user!.hasProcessing()))) return;
String path = "/$packages_collection"; String path = "/$packages_collection";
try { Query col = FirebaseFirestore.instance
Query listenerQuery = FirebaseFirestore.instance
.collection(path) .collection(path)
.where("is_delivered", isEqualTo: isDelivered); .where("is_delivered", isEqualTo: isDelivered);
Query pageQuery = FirebaseFirestore.instance Query pageQuery = FirebaseFirestore.instance
.collection(path) .collection(path)
.where("is_delivered", isEqualTo: isDelivered); .where("is_delivered", isEqualTo: isDelivered)
.orderBy("update_time", descending: true);
pageQuery = pageQuery.orderBy("update_time", descending: true); packages?.close();
packages!.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery); packages = PaginatorListener<Package>(
} catch (e) { col, pageQuery, (data, id) => Package.fromMap(data, id),
log.warning("Error!! $e"); rowPerLoad: 30);
}
} }
Future<void> _loadCustomerPackages(bool isDelivered) async { _loadPaginationCustomerPackages(bool isDelivered) {
if (user == null) return; if (user == null) return;
String path = "/$packages_collection"; String path = "/$packages_collection";
try { Query col = FirebaseFirestore.instance
Query listenerQuery = FirebaseFirestore.instance
.collection(path) .collection(path)
.where("is_delivered", isEqualTo: isDelivered) .where("is_delivered", isEqualTo: isDelivered)
.where("user_id", isEqualTo: user!.id); .where("user_id", isEqualTo: user!.id);
Query pageQuery = FirebaseFirestore.instance Query pageQuery = FirebaseFirestore.instance
.collection(path) .collection(path)
.where("is_delivered", isEqualTo: isDelivered) .where("is_delivered", isEqualTo: isDelivered)
.where("user_id", isEqualTo: user!.id) .where("user_id", isEqualTo: user!.id)
.orderBy("update_time", descending: true); .orderBy("update_time", descending: true);
customerPackages! customerPackages?.close();
.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery); customerPackages = PaginatorListener<Package>(
} catch (e) { col, pageQuery, (data, id) => Package.fromMap(data, id),
log.warning("Error!! $e"); rowPerLoad: 30);
}
} }
Future<void> _loadActivePackages() async { _loadPaginationActivePackages() {
if (user == null) return; if (user == null) return;
if (!((user!.hasPackages() || if (!((user!.hasPackages() ||
user!.hasReceiving() || user!.hasReceiving() ||
user!.hasProcessing()))) return; user!.hasProcessing()))) return;
String path = "/$packages_collection"; String path = "/$packages_collection";
try { Query col = FirebaseFirestore.instance
Query listenerQuery = FirebaseFirestore.instance
.collection(path)
.where("is_delivered", isEqualTo: false);
Query pageQuery = FirebaseFirestore.instance
.collection(path) .collection(path)
.where("is_delivered", isEqualTo: false); .where("is_delivered", isEqualTo: false);
pageQuery = pageQuery.orderBy("update_time", descending: true); Query pageQuery = FirebaseFirestore.instance
activePackages! .collection(path)
.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery); .where("is_delivered", isEqualTo: false)
} catch (e) { .orderBy("update_time", descending: true);
log.warning("Error!! $e");
} activePackages?.close();
activePackages = PaginatorListener<Package>(
col, pageQuery, (data, id) => Package.fromMap(data, id),
rowPerLoad: 30);
} }
Future<Package?> getPackage(String id) async { Future<Package?> getPackage(String id) async {

7
lib/pages/package/package_list.dart
View File

@@ -85,11 +85,8 @@ class _PackageListState extends State<PackageList> {
), ),
body: PaginatorListView<Package>( body: PaginatorListView<Package>(
paginatorListener: packages!, paginatorListener: packages!,
rowBuilder: (p) => PackageListRow( rowBuilder: (p) =>
key: ValueKey(p.id), PackageListRow(package: p, isCustomer: widget.forCustomer),
package: p,
isCustomer: widget.forCustomer,
),
color: primaryColor, color: primaryColor,
)), )),
); );

21
lib/pages/pickup/model/pickup_model.dart
View File

@@ -27,12 +27,7 @@ class PickupModel extends BaseModel {
} }
Future<void> _initData() async { Future<void> _initData() async {
logout(); _loadPaginationPickups();
pickups = PaginatorListener<Pickup>((data, id) => Pickup.fromMap(data, id),
onChange: () {
notifyListeners();
}, rowPerLoad: 30, insertNewByListener: true);
_loadPickups();
} }
@override @override
@@ -40,20 +35,18 @@ class PickupModel extends BaseModel {
if (pickups != null) pickups!.close(); if (pickups != null) pickups!.close();
} }
Future<void> _loadPickups() async { _loadPaginationPickups() {
if (user == null) return; if (user == null) return;
String path = "/$pickup_collection"; String path = "/$pickup_collection";
Query col = FirebaseFirestore.instance.collection(path);
try {
Query listenerQuery = FirebaseFirestore.instance.collection(path);
Query pageQuery = FirebaseFirestore.instance Query pageQuery = FirebaseFirestore.instance
.collection(path) .collection(path)
.orderBy("update_time", descending: true); .orderBy("update_time", descending: true);
pickups!.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery); pickups?.close();
} catch (e) { pickups = PaginatorListener<Pickup>(
log.warning("Error!! $e"); col, pageQuery, (data, id) => Pickup.fromMap(data, id),
} rowPerLoad: 30);
} }
Future<void> complete( Future<void> complete(

2
lib/pages/pickup/pickup_list.dart
View File

@@ -65,7 +65,7 @@ class _PickupListState extends State<PickupList> {
), ),
body: PaginatorListView<Pickup>( body: PaginatorListView<Pickup>(
paginatorListener: pickups!, paginatorListener: pickups!,
rowBuilder: (p) => PickupListRow(key: ValueKey(p.id), pickup: p), rowBuilder: (p) => PickupListRow(pickup: p),
color: primaryColor, color: primaryColor,
)), )),
); );

5
lib/pages/processing/processing_list.dart
View File

@@ -74,10 +74,7 @@ class _ProcessingListState extends State<ProcessingList> {
), ),
body: PaginatorListView<Package>( body: PaginatorListView<Package>(
paginatorListener: packages!, paginatorListener: packages!,
rowBuilder: (p) => ProcessingListRow( rowBuilder: (p) => ProcessingListRow(package: p),
key: ValueKey(p.id),
package: p,
),
color: primaryColor, color: primaryColor,
)), )),
); );

5
lib/pages/processing_old/processing_list.dart
View File

@@ -65,10 +65,7 @@ class _ProcessingListState extends State<ProcessingList> {
), ),
body: PaginatorListView<Package>( body: PaginatorListView<Package>(
paginatorListener: packages!, paginatorListener: packages!,
rowBuilder: (p) => ProcessingListRow( rowBuilder: (p) => ProcessingListRow(package: p),
key: ValueKey(p.id),
package: p,
),
color: primaryColor, color: primaryColor,
)), )),
); );

8
lib/pages/receiving/receiving_list.dart
View File

@@ -74,12 +74,8 @@ class _ReceivingListState extends State<ReceivingList> {
), ),
body: PaginatorListView<Package>( body: PaginatorListView<Package>(
paginatorListener: packages!, paginatorListener: packages!,
rowBuilder: (p) => ReceivingListRow( rowBuilder: (p) => ReceivingListRow(package: p),
key: ValueKey(p.id), color: primaryColor)),
package: p,
),
color: primaryColor,
)),
); );
} }

1
lib/pages/widgets/local_dropdown.dart
View File

@@ -1,5 +1,4 @@
import 'package:fcs/helpers/theme.dart'; import 'package:fcs/helpers/theme.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'local_text.dart'; import 'local_text.dart';

67
lib/pagination/paginator_listener.dart
View File

@@ -1,9 +1,11 @@
import 'dart:async'; import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/pages/widgets/callbacks.dart'; import 'package:flutter/foundation.dart';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import '../pages/widgets/callbacks.dart';
typedef ToObj = Function(Map<String, dynamic> data, String id); typedef ToObj = Function(Map<String, dynamic> data, String id);
/* /*
@@ -11,7 +13,7 @@ typedef ToObj = Function(Map<String, dynamic> data, String id);
* and listen to document change based on 'update_time' and 'delete_time' fields * and listen to document change based on 'update_time' and 'delete_time' fields
* of the document * of the document
*/ */
class PaginatorListener<T> { class PaginatorListener<T> extends ChangeNotifier {
final log = Logger('PaginatorListener'); final log = Logger('PaginatorListener');
List<String> ids = []; List<String> ids = [];
@@ -25,15 +27,18 @@ class PaginatorListener<T> {
CallBack? onChange; CallBack? onChange;
StreamSubscription<QuerySnapshot>? listener; StreamSubscription<QuerySnapshot>? listener;
Query? listeningQuery; Query listeningQuery;
Query? pageQuery; Query pageQuery;
bool Function(T obj)? removeOnDataChange;
PaginatorListener(this.toObj, PaginatorListener(this.listeningQuery, this.pageQuery, this.toObj,
{this.onChange, this.rowPerLoad = 10, this.insertNewByListener = false}); {this.rowPerLoad = 10,
this.insertNewByListener = true,
this.removeOnDataChange}) {
refresh();
}
Future<bool> refresh({Query? listeningQuery, Query? pageQuery}) { Future<bool> refresh() {
this.listeningQuery = listeningQuery ?? this.listeningQuery;
this.pageQuery = pageQuery ?? this.pageQuery;
_clearState(); _clearState();
_initListener(); _initListener();
return _load(); return _load();
@@ -45,8 +50,9 @@ class PaginatorListener<T> {
data = []; data = [];
ended = false; ended = false;
isLoading = false; isLoading = false;
if (listener != null) listener!.cancel(); listener?.cancel();
listener = null; listener = null;
notifyListeners();
} }
void close() { void close() {
@@ -58,26 +64,25 @@ class PaginatorListener<T> {
final String isDeletedField = 'is_deleted'; final String isDeletedField = 'is_deleted';
void _initListener() { void _initListener() {
Query _query = Query _query =
listeningQuery!.orderBy(updateTimeField, descending: true).limit(1); listeningQuery.orderBy(updateTimeField, descending: true).limit(1);
_query _query
.get(GetOptions(source: Source.server)) .get(const GetOptions(source: Source.server))
.then((QuerySnapshot snapshot) { .then((QuerySnapshot snapshot) {
int count = snapshot.docs.length; int count = snapshot.docs.length;
int updateTime = 0; int updateTime = 0;
if (count == 1) { if (count == 1) {
Map<String, dynamic> data = updateTime =
snapshot.docs[0].data()! as Map<String, dynamic>; (snapshot.docs[0].data() as Map<String, dynamic>)[updateTimeField];
updateTime = data[updateTimeField];
} }
Query _queryListener = listeningQuery! Query _queryListener = listeningQuery
.where(updateTimeField, isGreaterThan: updateTime) .where(updateTimeField, isGreaterThan: updateTime)
// .where(deleteTimeField, isEqualTo: 0)
.orderBy(updateTimeField, descending: true); .orderBy(updateTimeField, descending: true);
if (listener != null) listener!.cancel();
listener = listener =
_queryListener.snapshots(includeMetadataChanges: true).listen((qs) { _queryListener.snapshots(includeMetadataChanges: true).listen((qs) {
qs.docChanges.forEach((c) { for (var c in qs.docChanges) {
switch (c.type) { switch (c.type) {
case DocumentChangeType.added: case DocumentChangeType.added:
_update(c.doc.id, c.doc.data() as Map<String, dynamic>); _update(c.doc.id, c.doc.data() as Map<String, dynamic>);
@@ -91,7 +96,8 @@ class PaginatorListener<T> {
default: default:
} }
if (onChange != null) onChange!(); if (onChange != null) onChange!();
}); notifyListeners();
}
}); });
}); });
} }
@@ -104,11 +110,15 @@ class PaginatorListener<T> {
if ((deleted ?? 0) > 0 || (isDeleted ?? false)) { if ((deleted ?? 0) > 0 || (isDeleted ?? false)) {
data.removeAt(ids.indexOf(id)); data.removeAt(ids.indexOf(id));
ids.remove(id); ids.remove(id);
} else if (removeOnDataChange != null && removeOnDataChange!(t)) {
data.removeAt(ids.indexOf(id));
ids.remove(id);
} else { } else {
data.removeAt(ids.indexOf(id)); data.removeAt(ids.indexOf(id));
data.insert(ids.indexOf(id), t); data.insert(ids.indexOf(id), t);
} }
} else if (insertNewByListener) { } else if (insertNewByListener) {
if (removeOnDataChange != null && removeOnDataChange!(t)) return;
data.insert(0, t); data.insert(0, t);
ids.insert(0, id); ids.insert(0, id);
} }
@@ -130,37 +140,38 @@ class PaginatorListener<T> {
} }
Future<bool> loadMore() { Future<bool> loadMore() {
return this._load(); return _load();
} }
Future<bool> _load({CallBack? onStarted, CallBack? onFinished}) async { Future<bool> _load({CallBack? onStarted, CallBack? onFinished}) async {
if (ended) return ended; if (ended) return ended;
Query _query = Query _query =
prev != null ? pageQuery!.startAfterDocument(prev!) : pageQuery!; prev != null ? pageQuery.startAfterDocument(prev!) : pageQuery;
try { try {
isLoading = true; isLoading = true;
if (onStarted != null) { if (onStarted != null) {
onStarted(); onStarted();
} }
if (onChange != null) onChange!(); if (onChange != null) onChange!();
await _query notifyListeners();
.where(isDeletedField, isEqualTo: false) QuerySnapshot snapshot = await _query
.where(deleteTimeField, isEqualTo: 0)
.limit(rowPerLoad) .limit(rowPerLoad)
.get(GetOptions(source: Source.server)) .get(const GetOptions(source: Source.server));
.then((QuerySnapshot snapshot) {
int count = snapshot.docs.length; int count = snapshot.docs.length;
ended = count < rowPerLoad; ended = count < rowPerLoad;
prev = count > 0 ? snapshot.docs[count - 1] : prev; prev = count > 0 ? snapshot.docs[count - 1] : prev;
snapshot.docs.forEach((e) { for (var e in snapshot.docs) {
_add(e.id, e.data() as Map<String, dynamic>); _add(e.id, e.data() as Map<String, dynamic>);
}); }
});
} catch (e) { } catch (e) {
log.warning("Error!! $e"); log.warning("Error!! $e");
} finally { } finally {
isLoading = false; isLoading = false;
if (onFinished != null) onFinished(); if (onFinished != null) onFinished();
if (onChange != null) onChange!(); if (onChange != null) onChange!();
notifyListeners();
} }
return ended; return ended;
} }

61
lib/pagination/paginator_listview.dart
View File

@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
@@ -6,20 +5,25 @@ import 'paginator_listener.dart';
typedef RowBuilder = Widget Function(dynamic); typedef RowBuilder = Widget Function(dynamic);
typedef OnScroll = void Function(bool down); typedef OnScroll = void Function(bool down);
typedef OnRemove = Function(dynamic t);
class PaginatorListView<T> extends StatelessWidget { class PaginatorListView<T> extends StatefulWidget {
final PaginatorListener<T> paginatorListener; final PaginatorListener<T> paginatorListener;
final RowBuilder rowBuilder; final RowBuilder rowBuilder;
final OnScroll? onScroll; final OnScroll? onScroll;
final ScrollController _scrollController; final ScrollController _scrollController;
final Color color; final Color color;
final OnRemove? onRemove;
final Widget? noMoreData;
PaginatorListView( PaginatorListView(
{Key? key, {Key? key,
required this.paginatorListener, required this.paginatorListener,
required this.rowBuilder, required this.rowBuilder,
this.onScroll, this.onScroll,
this.color = Colors.blueAccent}) this.color = Colors.blueAccent,
this.noMoreData,
this.onRemove})
: _scrollController = ScrollController(), : _scrollController = ScrollController(),
super(key: key) { super(key: key) {
_scrollController.addListener(() async { _scrollController.addListener(() async {
@@ -35,10 +39,37 @@ class PaginatorListView<T> extends StatelessWidget {
}); });
} }
@override
State<PaginatorListView<T>> createState() => _PaginatorListViewState<T>();
}
class _PaginatorListViewState<T> extends State<PaginatorListView<T>> {
late PaginatorListener<T> _paginatorListener;
@override
initState() {
super.initState();
initListener();
}
@override
void didUpdateWidget(covariant PaginatorListView<T> oldWidget) {
super.didUpdateWidget(oldWidget);
initListener();
}
initListener() {
_paginatorListener = widget.paginatorListener;
widget.paginatorListener.addListener(() {
if (mounted) {
setState(() {});
}
});
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
bool ended = paginatorListener.ended; bool ended = _paginatorListener.ended;
int count = paginatorListener.data.length; int count = _paginatorListener.data.length;
if (ended) count++; if (ended) count++;
return Column( return Column(
@@ -46,12 +77,12 @@ class PaginatorListView<T> extends StatelessWidget {
Expanded( Expanded(
child: RefreshIndicator( child: RefreshIndicator(
onRefresh: () { onRefresh: () {
return paginatorListener.refresh(); return _paginatorListener.refresh();
}, },
child: ListView.separated( child: ListView.separated(
separatorBuilder: (context, index) => separatorBuilder: (context, index) =>
Divider(height: 1, color: Colors.black), Divider(height: 1, color: Colors.black),
controller: _scrollController, controller: widget._scrollController,
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
physics: const AlwaysScrollableScrollPhysics(), physics: const AlwaysScrollableScrollPhysics(),
shrinkWrap: true, shrinkWrap: true,
@@ -60,22 +91,24 @@ class PaginatorListView<T> extends StatelessWidget {
if (ended && index == count - 1) { if (ended && index == count - 1) {
return Padding( return Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Center(child: Text("No more data")), child: Center(
child:
widget.noMoreData ?? const Text("No more data")),
); );
} }
T t = paginatorListener.data[index]; T t = _paginatorListener.data[index];
return rowBuilder(t); return widget.rowBuilder(t);
}), }),
), ),
), ),
paginatorListener.isLoading ? _loadingRow() : Container() _paginatorListener.isLoading ? _loadingRow() : Container()
], ],
); );
} }
Widget _loadingRow() { Widget _loadingRow() {
return Container( return Container(
padding: EdgeInsets.all(8), padding: const EdgeInsets.all(8),
color: Colors.transparent, color: Colors.transparent,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@@ -83,10 +116,10 @@ class PaginatorListView<T> extends StatelessWidget {
Column( Column(
children: [ children: [
CircularProgressIndicator( CircularProgressIndicator(
valueColor: new AlwaysStoppedAnimation<Color>(color)), valueColor: AlwaysStoppedAnimation<Color>(widget.color)),
Text( Text(
"Loading...", "Loading...",
style: TextStyle(color: color), style: TextStyle(color: widget.color),
) )
], ],
), ),