null safety

lib/pages/delivery/model/delivery_model.dart

@@ -12,9 +12,9 @@ import 'package:logging/logging.dart';
 class DeliveryModel extends BaseModel {
   final log = Logger('DeliveryModel');
   List<Carton> get cartons =>
-      _selectedIndex == 1 ? _cartons : List<Carton>.from(_delivered.values);
+      _selectedIndex == 1 ? _cartons : List<Carton>.from(_delivered?.values ?? []);
 
-  late Paginator _delivered;
+   Paginator? _delivered;
   int _selectedIndex = 1;
   bool isLoading = false;
   List<Carton> _cartons = [];
@@ -31,9 +31,9 @@ class DeliveryModel extends BaseModel {
     _selectedIndex = 1;
     _loadCartons();
 
-    if (_delivered != null) _delivered.close();
+    if (_delivered != null) _delivered!.close();
     _delivered = _getDelivered();
-    _delivered.load();
+    _delivered!.load();
   }
 
   Future<void> _loadCartons() async {
@@ -82,10 +82,10 @@ class DeliveryModel extends BaseModel {
   }
 
   Future<void> loadMore() async {
-    if (_delivered.ended || _selectedIndex == 1) return;
+    if (_delivered!.ended || _selectedIndex == 1) return;
     isLoading = true;
     notifyListeners();
-    await _delivered.load(onFinished: () {
+    await _delivered!.load(onFinished: () {
       isLoading = false;
       notifyListeners();
     });
@@ -94,7 +94,7 @@ class DeliveryModel extends BaseModel {
   Future<void> refresh() async {
     if (_selectedIndex == 1) return;
 
-    await _delivered.refresh(onFinished: () {
+    await _delivered!.refresh(onFinished: () {
       notifyListeners();
     });
   }
@@ -106,7 +106,7 @@ class DeliveryModel extends BaseModel {
   @override
   logout() async {
     if (listener != null) await listener!.cancel();
-    if (_delivered != null) _delivered.close();
+    if (_delivered != null) _delivered!.close();
     _cartons = [];
   }
 

lib/pages/delivery_address/model/delivery_address_model.dart

@@ -95,7 +95,7 @@ class DeliveryAddressModel extends BaseModel {
         .collection("$path")
         .orderBy("full_name")
         .get();
-    return querySnap.docs
+    return querySnap.docs                              
         .map((e) =>
             DeliveryAddress.fromMap(e.data as Map<String, dynamic>, e.id))
         .toList();

lib/pages/main/util.dart

@@ -42,7 +42,7 @@ Future<void> showConfirmDialog(
             child: LocalText(
               context,
               translationKey,
-              translationVariables: translationVariables!,
+              translationVariables: translationVariables,
               color: primaryColor,
             ),
           ),