null safety

This commit is contained in:
phyothandar
2021-09-10 16:48:21 +06:30
parent 03c5fc5016
commit bb4f4ad7c2
40 changed files with 393 additions and 352 deletions

View File

@@ -16,9 +16,9 @@ import 'package:path/path.dart' as Path;
class PackageModel extends BaseModel {
final log = Logger('PackageModel');
PaginatorListener? packages;
PaginatorListener? customerPackages;
PaginatorListener? activePackages;
late PaginatorListener<Package> packages;
late PaginatorListener<Package> customerPackages;
late PaginatorListener<Package> activePackages;
bool isLoading = false;
int _menuSelectedIndex = 1;
@@ -63,15 +63,16 @@ class PackageModel extends BaseModel {
@override
logout() async {
if (customerPackages != null) customerPackages!.close();
if (packages != null) packages!.close();
if (activePackages != null) activePackages!.close();
if (customerPackages != null) customerPackages.close();
if (packages != null) packages.close();
if (activePackages != null) activePackages.close();
}
Future<void> _loadPackages(bool isDelivered) async {
if (user == null) return;
if (!((user!.hasPackages() || user!.hasReceiving() || user!.hasProcessing())))
return;
if (!((user!.hasPackages() ||
user!.hasReceiving() ||
user!.hasProcessing()))) return;
String path = "/$packages_collection";
try {
@@ -83,7 +84,7 @@ class PackageModel extends BaseModel {
.where("is_delivered", isEqualTo: isDelivered);
pageQuery = pageQuery.orderBy("update_time", descending: true);
packages!.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
packages.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
} catch (e) {
log.warning("Error!! $e");
}
@@ -104,7 +105,7 @@ class PackageModel extends BaseModel {
.where("user_id", isEqualTo: user!.id)
.orderBy("update_time", descending: true);
customerPackages!.refresh(
customerPackages.refresh(
listeningQuery: listenerQuery, pageQuery: pageQuery);
} catch (e) {
log.warning("Error!! $e");
@@ -113,8 +114,9 @@ class PackageModel extends BaseModel {
Future<void> _loadActivePackages() async {
if (user == null) return;
if (!((user!.hasPackages() || user!.hasReceiving() || user!.hasProcessing())))
return;
if (!((user!.hasPackages() ||
user!.hasReceiving() ||
user!.hasProcessing()))) return;
String path = "/$packages_collection";
try {
@@ -126,7 +128,7 @@ class PackageModel extends BaseModel {
.where("is_delivered", isEqualTo: false);
pageQuery = pageQuery.orderBy("update_time", descending: true);
activePackages!.refresh(
activePackages.refresh(
listeningQuery: listenerQuery, pageQuery: pageQuery);
} catch (e) {
log.warning("Error!! $e");
@@ -161,7 +163,8 @@ class PackageModel extends BaseModel {
.get(const GetOptions(source: Source.server));
if (snaps.docs.length == 1) {
var snap = snaps.docs[0];
var package = Package.fromMap(snap.data as Map<String, dynamic>, snap.id);
var package =
Package.fromMap(snap.data as Map<String, dynamic>, snap.id);
return package;
}
} catch (e) {
@@ -184,7 +187,8 @@ class PackageModel extends BaseModel {
if (qsnap.docs.length > 0) {
var snap = qsnap.docs[0];
if (snap.exists) {
var package = Package.fromMap(snap.data as Map<String, dynamic>, snap.id);
var package =
Package.fromMap(snap.data as Map<String, dynamic>, snap.id);
return package;
}
}
@@ -198,7 +202,8 @@ class PackageModel extends BaseModel {
if (qsnap.docs.length > 0) {
var snap = qsnap.docs[0];
if (snap.exists) {
var package = Package.fromMap(snap.data as Map<String, dynamic>, snap.id);
var package =
Package.fromMap(snap.data as Map<String, dynamic>, snap.id);
return package;
}
}
@@ -218,8 +223,8 @@ class PackageModel extends BaseModel {
.where("is_deleted", isEqualTo: false)
.get(const GetOptions(source: Source.server));
packages = snaps.docs.map((documentSnapshot) {
var p =
Package.fromMap(documentSnapshot.data as Map<String, dynamic>, documentSnapshot.id);
var p = Package.fromMap(
documentSnapshot.data as Map<String, dynamic>, documentSnapshot.id);
return p;
}).toList();
} catch (e) {