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

fix null safety

Browse Source
This commit is contained in:
sainw
2021-09-11 16:56:20 +06:30
parent a4d3777e8a
commit fe799ad820
32 changed files with 125 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/pages/shipment/model/shipment_model.dart
View File

@@ -15,11 +15,11 @@ class ShipmentModel extends BaseModel {
List<Shipment> get shipments => _menuSelectedIndex == 1
? _shipments
: List<Shipment>.from(_delivered.values);
: List<Shipment>.from(_delivered!.values);
List<Shipment> _shipments = [];
late Paginator _delivered;
Paginator? _delivered;
bool isLoading = false;
int _menuSelectedIndex = 1;
@@ -34,7 +34,7 @@ class ShipmentModel extends BaseModel {
logout();
_loadShipments(forCustomer, myPickup);
_delivered = _getDelivered(forCustomer);
_delivered.load(onFinished: () {
_delivered!.load(onFinished: () {
isLoading = false;
notifyListeners();
});
@@ -42,7 +42,7 @@ class ShipmentModel extends BaseModel {
@override
logout() async {
if (_delivered != null) _delivered.close();
if (_delivered != null) _delivered!.close();
if (listener != null) await listener!.cancel();
_shipments = [];
}
@@ -50,10 +50,10 @@ class ShipmentModel extends BaseModel {
Future<void> loadMore({bool? isCustomer}) async {
if (menuSelectedIndex == 1)
return; // when delivered menu is not selected return
if (_delivered.ended) return;
if (_delivered!.ended) return;
isLoading = true;
notifyListeners();
await _delivered.load(onFinished: () {
await _delivered!.load(onFinished: () {
isLoading = false;
notifyListeners();
});
@@ -62,7 +62,7 @@ class ShipmentModel extends BaseModel {
Future<void> refresh({bool? isCustomer}) async {
if (menuSelectedIndex == 1)
return; // when delivered menu is not selected return
await _delivered.refresh(onFinished: () {
await _delivered!.refresh(onFinished: () {
notifyListeners();
});
}