Merge branch 'master' of phyothandar/fcs.kl into master

lib/data/provider/auth_fb.dart

@@ -9,7 +9,7 @@ import 'package:fcs/domain/entities/user.dart';
 import 'package:fcs/domain/exceiptions/signin_exception.dart';
 import 'package:fcs/helpers/api_helper.dart';
 import 'package:fcs/helpers/firebase_helper.dart';
-import 'package:firebase_auth/firebase_auth.dart';
+import 'package:firebase_auth/firebase_auth.dart' as fb;
 import 'package:logging/logging.dart';
 
 class AuthFb {
@@ -18,17 +18,17 @@ class AuthFb {
   static final AuthFb instance = AuthFb._();
   AuthFb._();
 
-  StreamController<User> controller;
-  static final FirebaseAuth _fb = FirebaseAuth.instance;
-  static String _verificationId;
+  late StreamController<User?> controller;
+  static final fb.FirebaseAuth _fb = fb.FirebaseAuth.instance;
+  static String _verificationId = '';
 
   Future<fcs.AuthResult> sendSmsCodeToPhoneNumber(String phoneNumber) {
     Completer<fcs.AuthResult> completer = Completer();
     bool codeSentCompleted = false;
 
-    final PhoneVerificationCompleted verificationCompleted =
-        (AuthCredential credential) async {
-      AuthResult _authResult;
+    final fb.PhoneVerificationCompleted verificationCompleted =
+        (fb.AuthCredential credential) async {
+      fb.UserCredential _authResult;
       try {
         _authResult = await _fb.signInWithCredential(credential);
         print("PhoneVerificationCompleted :$_authResult");
@@ -48,23 +48,23 @@ class AuthFb {
           'Inside _sendCodeToPhoneNumber: signInWithPhoneNumber auto succeeded: ${_authResult.user}');
     };
 
-    final PhoneVerificationFailed verificationFailed =
-        (AuthException authException) async {
+    final fb.PhoneVerificationFailed verificationFailed =
+        (fb.FirebaseAuthException authException) async {
       print(
           'Phone number verification failed. Code: ${authException.code}. Message: ${authException.message}');
       completer.completeError(SigninException(
           "Phone number verification failed:${authException.message}"));
     };
 
-    final PhoneCodeSent codeSent =
-        (String verificationId, [int forceResendingToken]) async {
+    final fb.PhoneCodeSent codeSent =
+        (String verificationId, [int? forceResendingToken]) async {
       _verificationId = verificationId;
       print("codeSent  " + phoneNumber);
       codeSentCompleted = true;
       completer.complete(fcs.AuthResult(authStatus: AuthStatus.SMS_SENT));
     };
 
-    final PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout =
+    final fb.PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout =
         (String verificationId) {
       print("codeAutoRetrievalTimeout $verificationId ");
 
@@ -89,11 +89,11 @@ class AuthFb {
 
   Future<fcs.AuthResult> signInWithPhoneNumber(String smsCode) async {
     try {
-      final AuthCredential credential = PhoneAuthProvider.getCredential(
-        verificationId: _verificationId,
-        smsCode: smsCode,
-      );
-      AuthResult _authResult = await _fb.signInWithCredential(credential);
+      final fb.AuthCredential credential = fb.PhoneAuthProvider.credential(
+          verificationId: _verificationId, smsCode: smsCode);
+
+      fb.UserCredential _authResult =
+          await _fb.signInWithCredential(credential);
       if (_authResult == null) {
         throw SigninException("Sigin error!");
       }
@@ -105,19 +105,21 @@ class AuthFb {
   }
 
   Future<void> signout() async {
-    if (userListener != null) await userListener.cancel();
+    if (userListener != null) await userListener!.cancel();
     return _fb.signOut();
   }
 
   Future<void> _addUserToStream({bool refreshIdToken = false}) async {
-    FirebaseUser firebaseUser = await _fb.currentUser();
+    fb.User? firebaseUser = _fb.currentUser;
     if (firebaseUser == null) return null;
-    Map claims = await getClaims(refreshIdToken: refreshIdToken);
+    Map<dynamic, dynamic>? claims =
+        await getClaims(refreshIdToken: refreshIdToken);
 
     log.info("Claims:$claims");
+    if (claims == null) return;
 
     String cid = claims["cid"];
-    User user;
+    User? user;
     if (cid != null && cid != "") {
       user = await _getUserFromFirestore(cid);
     }
@@ -136,20 +138,20 @@ class AuthFb {
     controller.add(user);
   }
 
-  Future<User> _getUserFromFirestore(String userID) async {
-    DocumentSnapshot snap = await Firestore.instance
+  Future<User?> _getUserFromFirestore(String userID) async {
+    DocumentSnapshot snap = await FirebaseFirestore.instance
         .collection(user_collection)
-        .document(userID)
+        .doc(userID)
         .get();
     if (snap.exists) {
-      User user = User.fromMap(snap.data, snap.documentID);
+      User user = User.fromMap(snap.data() as Map<String, dynamic>, snap.id);
       return user;
     }
     return null;
   }
 
   Future<bool> isLogin() async {
-    final FirebaseUser firebaseUser = await _fb.currentUser();
+    final fb.User? firebaseUser = _fb.currentUser;
     return Future.value(firebaseUser != null);
   }
 
@@ -193,48 +195,50 @@ class AuthFb {
   }
 
   Stream<Setting> settings() async* {
-    Stream<DocumentSnapshot> snapshot = Firestore.instance
+    Stream<DocumentSnapshot> snapshot = FirebaseFirestore.instance
         .collection(config_collection)
-        .document(setting_doc_id)
+        .doc(setting_doc_id)
         .snapshots();
 
     await for (var snap in snapshot) {
-      Setting setting = Setting.fromMap(snap.data);
+      Setting setting = Setting.fromMap(snap.data() as Map<String, dynamic>);
       yield setting;
     }
   }
 
-  Future<String> _getCurrentUserID() async {
-    FirebaseUser firebaseUser = await _fb.currentUser();
+  Future<String?> _getCurrentUserID() async {
+    fb.User? firebaseUser = _fb.currentUser;
     if (firebaseUser == null) return null;
-    Map claims = await getClaims();
+    Map? claims = await getClaims();
+    if (claims == null) return null;
     String cid = claims["cid"];
     return cid;
   }
 
   Future<void> _startUserListener() async {
-    if (userListener != null) userListener.cancel();
-    String _userID = await _getCurrentUserID();
+    if (userListener != null) userListener!.cancel();
+    String? _userID = await _getCurrentUserID();
     if (_userID == null) {
       return;
     }
 
-    Stream<DocumentSnapshot> snapshot = Firestore.instance
+    Stream<DocumentSnapshot> snapshot = FirebaseFirestore.instance
         .collection(user_collection)
-        .document(_userID)
+        .doc(_userID)
         .snapshots();
     userListener = snapshot.listen((snap) async {
-      User user = User.fromMap(snap.data, snap.documentID);
+      User user = User.fromMap(snap.data() as Map<String, dynamic>, snap.id);
 
-      FirebaseUser firebaseUser = await _fb.currentUser();
+      fb.User? firebaseUser = _fb.currentUser;
       if (firebaseUser == null) {
-        userListener.cancel();
+        userListener?.cancel();
         return;
       }
       try {
         // get privilege from claim
-        IdTokenResult idToken = await firebaseUser.getIdToken(refresh: true);
-        String privileges = idToken.claims["pr"];
+        fb.IdTokenResult idToken = await firebaseUser.getIdTokenResult(true);
+
+        String privileges = idToken.claims?["pr"] ?? '';
         if (privileges != null && privileges != "") {
           user.privileges = privileges.split(":").toList();
         }
@@ -245,13 +249,13 @@ class AuthFb {
     });
   }
 
-  StreamSubscription<DocumentSnapshot> userListener;
-  Stream<User> user() {
+  StreamSubscription<DocumentSnapshot>? userListener;
+  Stream<User?> user() {
     // ignore: close_sinks
-    StreamSubscription<FirebaseUser> authListener;
+    StreamSubscription<fb.User?>? authListener;
 
     Future<void> _start() async {
-      authListener = _fb.onAuthStateChanged.listen((firebaseUser) async {
+      authListener = _fb.authStateChanges().listen((firebaseUser) {
         if (firebaseUser == null) {
           controller.add(null);
         } else {
@@ -263,10 +267,10 @@ class AuthFb {
 
     void _stop() {
       if (userListener != null) {
-        userListener.cancel();
+        userListener!.cancel();
       }
       if (authListener != null) {
-        authListener.cancel();
+        authListener!.cancel();
       }
     }
 

lib/data/provider/carton_data_provider.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:convert';
 
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:fcs/domain/constants.dart';
@@ -36,7 +35,7 @@ class CartonDataProvider {
   }
 
   Future<List<Carton>> searchCarton(String term) async {
-    if (term == null || term == '') return List();
+    if (term == null || term == '') return [];
 
     // var bytes = utf8.encode(term);
     // var base64Str = base64.encode(bytes);
@@ -45,7 +44,7 @@ class CartonDataProvider {
 
     try {
       String path = "/$cartons_collection";
-      var querySnap = await Firestore.instance
+      var querySnap = await FirebaseFirestore.instance
           .collection(path)
           .where("carton_number", isEqualTo: term)
           .where("carton_type",
@@ -53,13 +52,11 @@ class CartonDataProvider {
           .where("status", isEqualTo: carton_packed_status)
           .where("is_deleted", isEqualTo: false)
           .orderBy("user_name")
-          .getDocuments();
-      return querySnap.documents
-          .map((e) => Carton.fromMap(e.data, e.documentID))
-          .toList();
+          .get();
+      return querySnap.docs.map((e) => Carton.fromMap(e.data(), e.id)).toList();
     } catch (e) {
       log.warning("carton error:" + e.toString());
-      return null;
+      return [];
     }
   }
 }

lib/data/provider/package_data_provider.dart

@@ -56,8 +56,8 @@ class PackageDataProvider {
         token: await getToken());
   }
 
-  Future<List<Package>> ftsSearchPackage(String term) async {
-    if (term == null || term == '') return List();
+  Future<List<Package>?> ftsSearchPackage(String term) async {
+    if (term == null || term == '') return [];
 
     var bytes = utf8.encode(term);
     var base64Str = base64.encode(bytes);
@@ -72,7 +72,7 @@ class PackageDataProvider {
           "/api/fts/$packages_collection/$escapePackage/$limit", "GET",
           url: Config.instance.reportURL, token: await getToken());
 
-      if (data == null) return List();
+      if (data == null) return [];
 
       data.forEach((p) {
         var package = Package.fromJson(p);
@@ -86,7 +86,7 @@ class PackageDataProvider {
   }
 
   Future<List<Package>> searchPackage(String term) async {
-    if (term == null || term == '') return List();
+    if (term == null || term == '') return [];
 
     List<Package> packages = [];
 

lib/data/provider/rate_data_provider.dart

@@ -16,33 +16,33 @@ class RateDataProvider {
   static final RateDataProvider instance = RateDataProvider._();
   RateDataProvider._();
 
-  StreamController<Rate> controller;
+  late StreamController<Rate> controller;
   static Rate _rate = Rate();
 
   Stream<Rate> _rateStream() async* {
-    Stream<DocumentSnapshot> snapshot = Firestore.instance
+    Stream<DocumentSnapshot> snapshot = FirebaseFirestore.instance
         .collection(config_collection)
-        .document(rate_doc_id)
+        .doc(rate_doc_id)
         .snapshots();
     await for (var snap in snapshot) {
-      Rate rate = Rate.fromMap(snap.data);
+      Rate rate = Rate.fromMap(snap.data() as Map<String, dynamic>);
       yield rate;
     }
   }
 
   Stream<List<CargoType>> _cargoTypeStream() async* {
     List<CargoType> cargoTypes = [];
-    Stream<QuerySnapshot> snapshots = Firestore.instance
+    Stream<QuerySnapshot> snapshots = FirebaseFirestore.instance
         .collection(config_collection)
-        .document(rate_doc_id)
+        .doc(rate_doc_id)
         .collection(cargo_types_collection)
         .where("custom_duty", isEqualTo: false)
         .snapshots();
 
     await for (var snaps in snapshots) {
       cargoTypes = [];
-      cargoTypes = snaps.documents.map((snap) {
-        return CargoType.fromMap(snap.data, snap.documentID);
+      cargoTypes = snaps.docs.map((snap) {
+        return CargoType.fromMap(snap.data() as Map<String, dynamic>, snap.id);
       }).toList();
 
       yield cargoTypes;
@@ -51,17 +51,17 @@ class RateDataProvider {
 
   Stream<List<CargoType>> _customDutiesStream() async* {
     List<CargoType> customDuries = [];
-    Stream<QuerySnapshot> snapshots = Firestore.instance
+    Stream<QuerySnapshot> snapshots = FirebaseFirestore.instance
         .collection(config_collection)
-        .document(rate_doc_id)
+        .doc(rate_doc_id)
         .collection(cargo_types_collection)
         .where("custom_duty", isEqualTo: true)
         .snapshots();
 
     await for (var snaps in snapshots) {
       customDuries = [];
-      customDuries = snaps.documents.map((snap) {
-        return CargoType.fromMap(snap.data, snap.documentID);
+      customDuries = snaps.docs.map((snap) {
+        return CargoType.fromMap(snap.data() as Map<String, dynamic>, snap.id);
       }).toList();
       yield customDuries;
     }
@@ -69,25 +69,26 @@ class RateDataProvider {
 
   Stream<List<DiscountByWeight>> _discountByWeightStream() async* {
     List<DiscountByWeight> discountByWeight = [];
-    Stream<QuerySnapshot> snapshots = Firestore.instance
+    Stream<QuerySnapshot> snapshots = FirebaseFirestore.instance
         .collection(config_collection)
-        .document(rate_doc_id)
+        .doc(rate_doc_id)
         .collection(discounts_by_weights_collection)
         .snapshots();
 
     await for (var snaps in snapshots) {
       discountByWeight = [];
-      discountByWeight = snaps.documents.map((snap) {
-        return DiscountByWeight.fromMap(snap.data, snap.documentID);
+      discountByWeight = snaps.docs.map((snap) {
+        return DiscountByWeight.fromMap(
+            snap.data() as Map<String, dynamic>, snap.id);
       }).toList();
       yield discountByWeight;
     }
   }
 
-  StreamSubscription<Rate> rateListener;
-  StreamSubscription<List<CargoType>> cargoListener;
-  StreamSubscription<List<CargoType>> customListener;
-  StreamSubscription<List<DiscountByWeight>> discountListener;
+  late StreamSubscription<Rate> rateListener;
+  late StreamSubscription<List<CargoType>> cargoListener;
+  late StreamSubscription<List<CargoType>> customListener;
+  late StreamSubscription<List<DiscountByWeight>> discountListener;
   Stream<Rate> rate() {
     Future<void> _start() async {
       rateListener = _rateStream().listen((rate) {

lib/data/provider/user_data_provider.dart

@@ -37,23 +37,23 @@ class UserDataProvider {
         payload: {"token": token}, token: await getToken());
   }
 
-  Future<User> findUser(String phoneNumber) async {
-    QuerySnapshot querySnap = await Firestore.instance
+  Future<User?> findUser(String phoneNumber) async {
+    QuerySnapshot querySnap = await FirebaseFirestore.instance
         .collection(user_collection)
         .where("phone_number", isEqualTo: phoneNumber)
         .limit(1)
-        .getDocuments();
+        .get();
 
-    if (querySnap.documents.length > 0) {
-      var snap = querySnap.documents.first;
-      User user = User.fromMap(snap.data, snap.documentID);
+    if (querySnap.docs.length > 0) {
+      var snap = querySnap.docs.first;
+      User user = User.fromMap(snap.data() as Map<String, dynamic>, snap.id);
       return user;
     }
     return null;
   }
 
   Future<List<User>> searchUser(String term) async {
-    if (term == null || term == '') return List();
+    if (term == null || term == '') return [];
 
     var bytes = utf8.encode(term);
     var base64Str = base64.encode(bytes);
@@ -68,7 +68,7 @@ class UserDataProvider {
           "/api/fts/$user_collection/$escapeBuyer/$limit", "GET",
           url: Config.instance.reportURL, token: await getToken());
 
-      if (data == null) return List();
+      if (data == null) return [];
 
       data.forEach((buyer) {
         var user = User.fromJson(buyer);
@@ -76,7 +76,7 @@ class UserDataProvider {
       });
     } catch (e) {
       log.warning("buyer error:" + e.toString());
-      return null;
+      // return null;
     }
     return users;
   }

lib/data/services/auth_imp.dart

@@ -3,17 +3,16 @@ import 'package:fcs/domain/entities/auth_result.dart';
 import 'package:fcs/domain/entities/connectivity.dart';
 import 'package:fcs/domain/entities/setting.dart';
 import 'package:fcs/domain/entities/user.dart';
-import 'package:flutter/material.dart';
 
 import 'auth_service.dart';
 
 class AuthServiceImp implements AuthService {
   AuthServiceImp({
-    @required this.authFb,
-    @required this.connectivity,
+    required this.authFb,
+    required this.connectivity,
   });
 
-  final Connectivity connectivity;
+  final Connectivity? connectivity;
   final AuthFb authFb;
 
   @override
@@ -32,7 +31,7 @@ class AuthServiceImp implements AuthService {
   }
 
   @override
-  Stream<User> getUserStream() {
+  Stream<User?> getUserStream() {
     return authFb.user();
   }
 

lib/data/services/auth_service.dart

@@ -11,6 +11,6 @@ abstract class AuthService {
   Future<void> updateProfileName(String newUserName);
   Future<void> updatePreferredCurrency(String currency);
   Future<bool> hasInvite();
-  Stream<User> getUserStream();
+  Stream<User?> getUserStream();
   Stream<Setting> getSetting();
 }

lib/data/services/carton_imp.dart

@@ -1,17 +1,16 @@
 import 'package:fcs/data/provider/carton_data_provider.dart';
 import 'package:fcs/domain/entities/carton.dart';
 import 'package:fcs/domain/entities/connectivity.dart';
-import 'package:flutter/material.dart';
 
 import 'carton_service.dart';
 
 class CartonServiceImp implements CartonService {
   CartonServiceImp({
-    @required this.cartonDataProvider,
-    @required this.connectivity,
+    required this.cartonDataProvider,
+    required this.connectivity,
   });
 
-  final Connectivity connectivity;
+  final Connectivity? connectivity;
   final CartonDataProvider cartonDataProvider;
 
   @override

lib/data/services/common_imp.dart

@@ -2,13 +2,12 @@ import 'package:fcs/data/provider/common_data_provider.dart';
 import 'package:fcs/domain/entities/discount.dart';
 import 'package:fcs/domain/entities/payment_method.dart';
 import 'package:fcs/domain/vo/message.dart';
-import 'package:flutter/material.dart';
 
 import 'common_service.dart';
 
 class CommonServiceImp implements CommonService {
   CommonServiceImp({
-    @required this.commonDataProvider,
+    required this.commonDataProvider,
   });
 
   final CommonDataProvider commonDataProvider;

lib/data/services/delivery_address_imp.dart

@@ -1,17 +1,16 @@
 import 'package:fcs/data/provider/delivery_address_data_provider.dart';
 import 'package:fcs/domain/entities/connectivity.dart';
 import 'package:fcs/domain/vo/delivery_address.dart';
-import 'package:flutter/material.dart';
 
 import 'delivery_address_service.dart';
 
 class DeliveryAddressImp implements DeliveryAddressService {
   DeliveryAddressImp({
-    @required this.connectivity,
-    @required this.deliveryAddressDataProvider,
+    required this.connectivity,
+    required this.deliveryAddressDataProvider,
   });
 
-  final Connectivity connectivity;
+  final Connectivity? connectivity;
   final DeliveryAddressDataProvider deliveryAddressDataProvider;
 
   @override

lib/data/services/fcs_shipment_imp.dart

@@ -1,17 +1,16 @@
 import 'package:fcs/data/provider/fcs_shipment_data_provider.dart';
 import 'package:fcs/domain/entities/connectivity.dart';
 import 'package:fcs/domain/entities/fcs_shipment.dart';
-import 'package:flutter/material.dart';
 
 import 'fcs_shipment_service.dart';
 
 class FcsShipmentServiceImp implements FcsShipmentService {
   FcsShipmentServiceImp({
-    @required this.connectivity,
-    @required this.shipmentDataProvider,
+    required this.connectivity,
+    required this.shipmentDataProvider,
   });
 
-  final Connectivity connectivity;
+  final Connectivity? connectivity;
   final FcsShipmentDataProvider shipmentDataProvider;
 
   @override

lib/data/services/invoice_imp.dart

@@ -1,21 +1,17 @@
 import 'package:fcs/data/provider/invoice_data_provider.dart';
-import 'package:fcs/data/provider/shipment_data_provider.dart';
-import 'package:fcs/data/services/shipment_service.dart';
 import 'package:fcs/domain/entities/connectivity.dart';
 import 'package:fcs/domain/entities/invoice.dart';
 import 'package:fcs/domain/entities/payment.dart';
-import 'package:fcs/domain/entities/shipment.dart';
-import 'package:flutter/material.dart';
 
 import 'invoice_service.dart';
 
 class InvoiceServiceImp implements InvoiceService {
   InvoiceServiceImp({
-    @required this.invoiceDataProvider,
-    @required this.connectivity,
+    required this.invoiceDataProvider,
+    required this.connectivity,
   });
 
-  final Connectivity connectivity;
+  final Connectivity? connectivity;
   final InvoiceDataProvider invoiceDataProvider;
 
   @override

lib/data/services/package_imp.dart

@@ -1,17 +1,16 @@
 import 'package:fcs/data/provider/package_data_provider.dart';
 import 'package:fcs/domain/entities/connectivity.dart';
 import 'package:fcs/domain/entities/package.dart';
-import 'package:flutter/material.dart';
 
 import 'package_service.dart';
 
 class PackageServiceImp implements PackageService {
   PackageServiceImp({
-    @required this.connectivity,
-    @required this.packageDataProvider,
+    required this.connectivity,
+    required this.packageDataProvider,
   });
 
-  final Connectivity connectivity;
+  final Connectivity? connectivity;
   final PackageDataProvider packageDataProvider;
 
   @override
@@ -30,7 +29,7 @@ class PackageServiceImp implements PackageService {
   }
 
   @override
-  Future<List<Package>> ftsSearchPackage(String term) {
+  Future<List<Package>?> ftsSearchPackage(String term) {
     return packageDataProvider.ftsSearchPackage(term);
   }
 

lib/data/services/package_service.dart

@@ -7,7 +7,7 @@ abstract class PackageService {
   Future<void> deleteReceiving(Package package);
   Future<void> updateProcessing(Package package);
   Future<void> deleteProcessing(Package package);
-  Future<List<Package>> ftsSearchPackage(String term);
+  Future<List<Package>?> ftsSearchPackage(String term);
   Future<List<Package>> searchPackage(String term);
   Future<void> changeDeliveryAddress(String packageID, String deliveryID);
   Future<void> packageReturn(String packageID);

lib/data/services/rate_imp.dart

@@ -4,17 +4,16 @@ import 'package:fcs/domain/entities/connectivity.dart';
 import 'package:fcs/domain/entities/discount_by_weight.dart';
 import 'package:fcs/domain/entities/custom_duty.dart';
 import 'package:fcs/domain/entities/rate.dart';
-import 'package:flutter/material.dart';
 
 import 'rate_service.dart';
 
 class RateServiceImp implements RateService {
   RateServiceImp({
-    @required this.rateDataProvider,
-    @required this.connectivity,
+    required this.rateDataProvider,
+    required this.connectivity,
   });
 
-  final Connectivity connectivity;
+  final Connectivity? connectivity;
   final RateDataProvider rateDataProvider;
 
   @override

lib/data/services/services.dart

@@ -35,17 +35,18 @@ import 'user_service.dart';
 class Services {
   static final Services instance = Services._();
 
-  AuthService _authService;
-  UserService _userService;
-  PackageService _packageService;
-  MessagingService _messagingService;
-  CommonService _commonService;
-  FcsShipmentService _fcsShipmentService;
-  DeliveryAddressService _deliveryAddressService;
-  RateService _rateService;
-  ShipmentService _shipmentService;
-  CartonService _cartonService;
-  InvoiceService _invoiceService;
+  late AuthService _authService;
+  late UserService _userService;
+  late PackageService _packageService;
+  late MessagingService _messagingService;
+  late CommonService _commonService;
+  late FcsShipmentService _fcsShipmentService;
+  late DeliveryAddressService _deliveryAddressService;
+  late RateService _rateService;
+  late ShipmentService _shipmentService;
+  late CartonService _cartonService;
+  late InvoiceService _invoiceService;
+
   Services._() {
     _authService = AuthServiceImp(
       authFb: AuthFb.instance,

lib/data/services/shipment_imp.dart

@@ -2,15 +2,14 @@ import 'package:fcs/data/provider/shipment_data_provider.dart';
 import 'package:fcs/data/services/shipment_service.dart';
 import 'package:fcs/domain/entities/connectivity.dart';
 import 'package:fcs/domain/entities/shipment.dart';
-import 'package:flutter/material.dart';
 
 class ShipmentServiceImp implements ShipmentService {
   ShipmentServiceImp({
-    @required this.shipmentDataProvider,
-    @required this.connectivity,
+    required this.shipmentDataProvider,
+    required this.connectivity,
   });
 
-  final Connectivity connectivity;
+  final Connectivity? connectivity;
   final ShipmentDataProvider shipmentDataProvider;
 
   @override

lib/data/services/user_imp.dart

@@ -1,17 +1,16 @@
 import 'package:fcs/data/provider/user_data_provider.dart';
 import 'package:fcs/domain/entities/connectivity.dart';
 import 'package:fcs/domain/entities/user.dart';
-import 'package:flutter/material.dart';
 
 import 'user_service.dart';
 
 class UserServiceImp implements UserService {
   UserServiceImp({
-    @required this.connectivity,
-    @required this.userDataProvider,
+    required this.connectivity,
+    required this.userDataProvider,
   });
 
-  final Connectivity connectivity;
+  final Connectivity? connectivity;
   final UserDataProvider userDataProvider;
 
   @override
@@ -30,7 +29,7 @@ class UserServiceImp implements UserService {
   }
 
   @override
-  Future<User> findUser(String phoneNumber) {
+  Future<User?> findUser(String phoneNumber) {
     return userDataProvider.findUser(phoneNumber);
   }
 

lib/data/services/user_service.dart

@@ -4,7 +4,7 @@ abstract class UserService {
   Future<void> inviteUser(String userName, String phoneNumber);
   Future<void> deleteInvite(String phoneNumber);
   Future<void> acceptRequest(String userID);
-  Future<User> findUser(String phoneNumber);
+  Future<User?> findUser(String phoneNumber);
   Future<List<User>> searchUser(String term);
   Future<void> uploadMsgToken(String token);
   Future<void> removeMsgToken(String token);

lib/domain/entities/auth_result.dart

@@ -1,9 +1,9 @@
 import 'auth_status.dart';
 
 class AuthResult {
-  AuthStatus authStatus;
-  String authErrorCode;
-  String authErrorMsg;
+  AuthStatus? authStatus;
+  String? authErrorCode;
+  String? authErrorMsg;
 
   AuthResult({this.authStatus, this.authErrorCode, this.authErrorMsg});
 }

lib/domain/entities/cargo_type.dart

@@ -1,28 +1,28 @@
 class CargoType {
-  String id;
-  String name;
+  String? id;
+  String? name;
   double rate;
   double weight;
   bool isChecked;
   int qty;
-  bool isCutomDuty;
+  bool? isCutomDuty;
   double customDutyFee;
-
-  double get calAmount => (calRate ?? 0) * (calWeight ?? 0);
-
   double calRate;
   double calWeight;
+
+  double get calAmount => calRate * calWeight;
+
   CargoType(
       {this.id,
       this.name,
-      this.rate,
-      this.weight,
-      this.calWeight,
-      this.calRate,
+      this.rate = 0,
+      this.weight = 0,
+      this.calWeight = 0,
+      this.calRate = 0,
       this.isChecked = false,
       this.qty = 0,
       this.isCutomDuty,
-      this.customDutyFee});
+      this.customDutyFee = 0});
 
   factory CargoType.fromMap(Map<String, dynamic> map, String id) {
     return CargoType(
@@ -52,7 +52,7 @@ class CargoType {
   }
 
   CargoType clone() {
-    return CargoType.fromMap(toMap(), this.id);
+    return CargoType.fromMap(toMap(), this.id!);
   }
 
   @override
@@ -63,7 +63,7 @@ class CargoType {
 
   @override
   String toString() {
-    return name;
+    return name ?? "";
   }
 
   bool isChangedForEdit(CargoType cargoType) {

lib/domain/entities/carton.dart

@@ -9,64 +9,64 @@ import 'cargo_type.dart';
 import 'package.dart';
 
 class Carton {
-  String id;
-  String shipmentID;
-  String shipmentNumber;
-  String senderID;
-  String senderFCSID;
-  String senderName;
+  String? id;
+  String? shipmentID;
+  String? shipmentNumber;
+  String? senderID;
+  String? senderFCSID;
+  String? senderName;
 
-  String boxNumber;
-  String status;
-  String cargoDesc;
-  String desc;
+  String? boxNumber;
+  String? status;
+  String? cargoDesc;
+  String? desc;
   double width;
   double height;
   double length;
-  int shipmentWeight;
-  bool isChecked;
-  bool isShipmentCarton;
-  String cartonType;
-  String fcsID;
-  String userName;
-  String userID;
-  String fcsShipmentID;
-  String fcsShipmentNumber;
-  String mixCartonID;
-  String mixCartonNumber;
-  String cartonSizeID;
-  String cartonSizeName;
-  double cartonWeight;
+  int? shipmentWeight;
+  bool? isChecked;
+  bool? isShipmentCarton;
+  String? cartonType;
+  String? fcsID;
+  String? userName;
+  String? userID;
+  String? fcsShipmentID;
+  String? fcsShipmentNumber;
+  String? mixCartonID;
+  String? mixCartonNumber;
+  String? cartonSizeID;
+  String? cartonSizeName;
+  double? cartonWeight;
 
   int rate;
   int weight;
-  String packageType;
-  String pickUpID;
-  List<String> photos;
-  String remark;
-  DateTime arrivedDate;
-  String cartonNumber;
+  String? packageType;
+  String? pickUpID;
+  List<String> photos = [];
+  String? remark;
+  DateTime? arrivedDate;
+  String? cartonNumber;
 
   List<String> packageIDs;
   List<Package> packages;
-  List<CargoType> cargoTypes;
+  List<CargoType> cargoTypes = [];
 
-  DeliveryAddress deliveryAddress;
-  Shipment shipment;
+  DeliveryAddress? deliveryAddress;
+  Shipment? shipment;
 
   //for mix box
-  String mixBoxType;
+  String? mixBoxType;
   List<Carton> mixCartons;
   List<String> mixCartonIDs;
 
-  int get amount => rate != null && weight != null ? rate * weight : 0;
+  int get amount => rate != null && weight != null ? (rate * weight) : 0;
 
   // String get packageNumber =>
   //     shipmentNumber + "-" + receiverNumber + " #" + boxNumber;
-  double get price => rate.toDouble() * weight;
 
-  double get actualWeight =>
-      cargoTypes == null ? 0 : cargoTypes.fold(0, (p, e) => e.weight + p);
+  double get actualWeight => cargoTypes == null
+      ? 0
+      : cargoTypes.fold(0, (p, e) => e.weight  + p);
 
   int getShipmentWeight(double volumetricRatio) {
     if (length == null ||
@@ -84,15 +84,15 @@ class Carton {
   /// getCargoTypeForCalWeight returns carton with shipment weight
   List<CargoType> getCargoTypeForCalWeight(double volumetricRatio) {
     // get shipment weight
-    double volume = (length ?? 0) * (width ?? 0) * (height ?? 0);
-    double sw = volume / volumetricRatio ?? 0;
+    double volume = length * width * height;
+    double sw = volume / volumetricRatio;
 
     // get actual weight
     double aw = cargoTypes.fold(0.0, (p, c) => p + c.weight);
     if (aw == 0 || sw == 0) return [];
 
     cargoTypes.forEach((e) {
-      double calWeight = aw > sw ? e.weight : e.weight / aw * sw;
+      double calWeight = aw > sw ? e.weight : (e.weight / aw) * sw;
       e.calWeight = calWeight;
     });
     return cargoTypes;
@@ -115,8 +115,8 @@ class Carton {
 
     double total = 0;
     cargoTypes.forEach((e) {
-      double r =
-          e.rate - (discountByWeight != null ? discountByWeight.discount : 0);
+      double r = e.rate -
+          (discountByWeight != null ? (discountByWeight.discount) : 0);
       double amount = e.weight * r;
       total += amount;
     });
@@ -134,9 +134,9 @@ class Carton {
       this.senderName,
       this.boxNumber,
       this.desc,
-      this.width,
-      this.height,
-      this.length,
+      this.width = 0,
+      this.height = 0,
+      this.length = 0,
       this.shipmentWeight,
       this.isChecked = false,
       this.cartonType,
@@ -151,13 +151,13 @@ class Carton {
       this.status,
       this.arrivedDate,
       this.cargoDesc,
-      this.shipmentHistory,
-      this.packages,
-      this.cargoTypes,
+      this.shipmentHistory = const [],
+      this.packages = const [],
+      this.cargoTypes = const [],
       this.cartonNumber,
       this.fcsShipmentID,
       this.fcsShipmentNumber,
-      this.packageIDs,
+      this.packageIDs = const [],
       this.mixCartonID,
       this.mixCartonNumber,
       this.isShipmentCarton = false,
@@ -165,14 +165,14 @@ class Carton {
       this.cartonSizeID,
       this.cartonSizeName,
       this.mixBoxType,
-      this.mixCartons,
-      this.mixCartonIDs,
+      this.mixCartons = const [],
+      this.mixCartonIDs = const [],
       this.cartonWeight});
 
   Map<String, dynamic> toMap() {
-    List _cargoTypes = cargoTypes?.map((c) => c.toMap())?.toList() ?? [];
-    List _packages = packages?.map((c) => c.toJson())?.toList();
-    List _mixCartons = mixCartons?.map((c) => c.toJson())?.toList();
+    List _cargoTypes = cargoTypes.map((c) => c.toMap()).toList();
+    List _packages = packages.map((c) => c.toJson()).toList();
+    List _mixCartons = mixCartons.map((c) => c.toJson()).toList();
     return {
       'id': id,
       'fcs_shipment_id': fcsShipmentID,
@@ -213,9 +213,9 @@ class Carton {
       shipmentNumber: map['shipment_number'],
       // receiverNumber: map['receiver_number'],
       boxNumber: map['box_number'],
-      length: double.tryParse(map['length']?.toString()),
-      width: double.tryParse(map['width']?.toString()),
-      height: double.tryParse(map['height']?.toString()),
+      length: double.tryParse(map['length'].toString()) ?? 0,
+      width: double.tryParse(map['width'].toString()) ?? 0,
+      height: double.tryParse(map['height'].toString()) ?? 0,
       userName: map['user_name'],
       fcsID: map['fcs_id'],
       cartonType: map['carton_type'],
@@ -242,8 +242,8 @@ class Carton {
 
   Map<String, dynamic> toJson() {
     List _cargoTypes = cargoTypes.map((c) => c.toMap()).toList();
-    List _packages = packages?.map((c) => c.toJson())?.toList();
-    List _mixCartons = mixCartons?.map((c) => c.toJson())?.toList();
+    List _packages = packages.map((c) => c.toJson()).toList();
+    List _mixCartons = mixCartons.map((c) => c.toJson()).toList();
     return {
       'id': id,
       'fcs_shipment_id': fcsShipmentID,

lib/domain/entities/carton_size.dart

@@ -1,10 +1,11 @@
 class CartonSize {
-  String id;
-  String name;
+  String? id;
+  String? name;
   double length;
   double width;
   double height;
-  CartonSize({this.id, this.name, this.length, this.width, this.height});
+  CartonSize(
+      {this.id, this.name, this.length = 0, this.width = 0, this.height = 0});
 
   Map<String, dynamic> toMap() {
     return {
@@ -27,19 +28,10 @@ class CartonSize {
   }
 
   @override
-  bool operator ==(other) {
-    if (identical(this, other)) {
-      return true;
-    }
-    return other.id == this.id;
-  }
+  bool operator ==(Object other) => other is CartonSize && other.id == id;
 
   @override
-  int get hashCode {
-    int result = 17;
-    result = 37 * result + id.hashCode;
-    return result;
-  }
+  int get hashCode => id.hashCode;
 
   bool isChangedForEdit(CartonSize cartonSize) {
     return cartonSize.name != this.name ||

lib/domain/entities/custom_duty.dart

@@ -1,11 +1,15 @@
 class CustomDuty {
-  String id;
-  String productType;
-  String desc;
+  String? id;
+  String? productType;
+  String? desc;
   double fee;
   double shipmentRate;
   CustomDuty(
-      {this.id, this.productType, this.desc, this.fee, this.shipmentRate});
+      {this.id,
+      this.productType,
+      this.desc,
+      this.fee = 0,
+      this.shipmentRate = 0});
 
   factory CustomDuty.fromMap(Map<String, dynamic> map, String id) {
     return CustomDuty(

lib/domain/entities/customer.dart

@@ -1,10 +1,8 @@
-
-
 class Customer {
-  String id;
-  String name;
-  String phoneNumber;
-  String status;
+  String? id;
+  String? name;
+  String? phoneNumber;
+  String? status;
 
   Customer({
     this.id,

lib/domain/entities/discount.dart

@@ -1,9 +1,9 @@
 class Discount {
-  String id;
-  String code;
-  String customerId;
-  String customerName;
-  String status;
+  String? id;
+  String? code;
+  String? customerId;
+  String? customerName;
+  String? status;
   double amount;
 
   Discount({
@@ -11,7 +11,7 @@ class Discount {
     this.code,
     this.customerId,
     this.customerName,
-    this.amount,
+    this.amount = 0,
     this.status,
   });
 

lib/domain/entities/discount_by_weight.dart

@@ -1,9 +1,9 @@
 class DiscountByWeight {
-  String id;
+  String? id;
   double weight;
   double discount;
 
-  DiscountByWeight({this.id, this.weight, this.discount});
+  DiscountByWeight({this.id, this.weight = 0, this.discount = 0});
 
   factory DiscountByWeight.fromMap(Map<String, dynamic> map, String id) {
     return DiscountByWeight(

lib/domain/entities/faq.dart

@@ -1,16 +1,17 @@
 class FAQ {
-  String id;
-  int sn;
-  String questionEng;
-  String questionMm;
-  String answerEng;
-  String answerMm;
-  String pageLinkLabelEng;
-  String pageLinkLabelMm;
-  String pageLink;
+  String? id;
+  int? sn;
+  String? questionEng;
+  String? questionMm;
+  String? answerEng;
+  String? answerMm;
+  String? pageLinkLabelEng;
+  String? pageLinkLabelMm;
+  String? pageLink;
 
-  String question(bool isEng) => isEng ? questionEng : questionMm;
-  String answer(bool isEng) => isEng ? answerEng : answerMm;
+  String question(bool isEng) =>
+      isEng ? (questionEng ?? "") : (questionMm ?? "");
+  String answer(bool isEng) => isEng ? (answerEng ?? "") : (answerMm ?? "");
 
   FAQ(
       {this.id,

lib/domain/entities/fcs_shipment.dart

@@ -3,17 +3,18 @@ import 'package:cloud_firestore/cloud_firestore.dart';
 import '../constants.dart';
 
 class FcsShipment {
-  String id;
-  String shipmentNumber;
-  DateTime cutoffDate;
-  String shipType;
-  DateTime arrivalDate;
-  DateTime departureDate;
-  String consignee;
-  String port;
-  String destination;
-  String status;
-  String reportName;
+  String? id;
+  String? shipmentNumber;
+  DateTime? cutoffDate;
+  String? shipType;
+  DateTime? arrivalDate;
+  DateTime? departureDate;
+  String? consignee;
+  String? port;
+  String? destination;
+  String? status;
+  String? reportName;
+
   FcsShipment({
     this.id,
     this.shipmentNumber,
@@ -51,10 +52,10 @@ class FcsShipment {
     return {
       "id": id,
       'shipment_number': shipmentNumber,
-      'cutoff_date': cutoffDate?.toUtc()?.toIso8601String(),
+      'cutoff_date': cutoffDate?.toUtc().toIso8601String(),
       'shipment_type': shipType,
-      'arrival_date': arrivalDate?.toUtc()?.toIso8601String(),
-      'departure_date': departureDate?.toUtc()?.toIso8601String(),
+      'arrival_date': arrivalDate?.toUtc().toIso8601String(),
+      'departure_date': departureDate?.toUtc().toIso8601String(),
       'consignee': consignee,
       'port': port,
       'destination': destination,

lib/domain/entities/invoice.dart

@@ -10,15 +10,15 @@ import 'package:fcs/domain/entities/rate.dart';
 import 'package:fcs/domain/entities/shipment.dart';
 
 class Invoice {
-  String id;
-  String invoiceNumber;
-  DateTime invoiceDate;
-  String fcsShipmentID;
-  String userID;
-  String fcsID;
-  String userName;
-  String phoneNumber;
-  String status;
+  String? id;
+  String? invoiceNumber;
+  DateTime? invoiceDate;
+  String? fcsShipmentID;
+  String? userID;
+  String? fcsID;
+  String? userName;
+  String? phoneNumber;
+  String? status;
 
   double handlingFee;
   double deliveryFee;
@@ -28,11 +28,11 @@ class Invoice {
   List<CustomDuty> customDuties;
   List<Carton> cartons;
   List<CargoType> cargoTypes;
-  List<Shipment> shipments;
+  List<Shipment?>? shipments;
   List<Payment> payments;
-  Discount discount;
-  PaymentMethod paymentMethod;
-  String invoiceURL;
+  Discount? discount;
+  PaymentMethod? paymentMethod;
+  String? invoiceURL;
 
   List<CargoType> getCargoTypes(Rate rate) {
     if (cargoTypes != null) return cargoTypes;
@@ -40,7 +40,7 @@ class Invoice {
     List<CargoType> _cargoTypes = [];
     double totalCalWeight = 0;
     cartons.forEach((carton) {
-      if (carton.isChecked) {
+      if (carton.isChecked ?? false) {
         var _cartonsTypes =
             carton.getCargoTypeForCalWeight(rate.volumetricRatio);
         _cartonsTypes.forEach((ct) {
@@ -68,15 +68,15 @@ class Invoice {
 
   double getTotal(Rate rate) {
     List<CargoType> cargoTypes = getCargoTypes(rate);
-    var total = cargoTypes.fold(0.0, (p, c) => c.calAmount + p);
+    double total = cargoTypes.fold(0.0, (p, c) => c.calAmount + p);
     return total;
   }
 
-  double get balance => (amount ?? 0) - (paidAmount ?? 0);
+  double get balance => amount - paidAmount;
 
   double getNetAmount(Rate rate) {
     List<CargoType> cargoTypes = getCargoTypes(rate);
-    var total = cargoTypes.fold(0.0, (p, c) => c.calAmount + p);
+    double total = cargoTypes.fold(0.0, (p, c) => c.calAmount + p);
     total += getCustomFee();
     total += getDeliveryFee();
     total += getHandlingFee();
@@ -85,13 +85,13 @@ class Invoice {
   }
 
   double getHandlingFee() {
-    return shipments?.where((sh) => sh.isSelected ?? false)?.fold(0, (p, s) {
-      return p + (s?.handlingFee ?? 0) - (s?.paidHandlingFee ?? 0);
-    });
+    return shipments!
+        .where((sh) => sh!.isSelected)
+        .fold(0, (p, s) => p + (s!.handlingFee - s.paidHandlingFee));
   }
 
   double getTotalBalance(Rate rate) {
-    return getNetAmount(rate) - (paidAmount ?? 0);
+    return getNetAmount(rate) - paidAmount;
   }
 
   double getCustomFee() {
@@ -102,7 +102,7 @@ class Invoice {
     return deliveryFee == null ? 0 : deliveryFee;
   }
 
-  double getDiscount() => discount == null ? 0 : discount.amount;
+  double getDiscount() => discount == null ? 0 : discount!.amount;
 
   Invoice(
       {this.id,
@@ -111,19 +111,19 @@ class Invoice {
       this.fcsID,
       this.userName,
       this.phoneNumber,
-      this.amount,
-      this.paidAmount,
+      this.amount = 0,
+      this.paidAmount = 0,
       this.discount,
       this.status,
-      this.customDuties,
-      this.cartons,
-      this.cargoTypes,
-      this.handlingFee,
-      this.deliveryFee,
+      this.customDuties = const [],
+      this.cartons = const [],
+      this.cargoTypes = const [],
+      this.handlingFee = 0,
+      this.deliveryFee = 0,
       this.fcsShipmentID,
-      this.shipments,
+      this.shipments = const [],
       this.invoiceURL,
-      this.payments,
+      this.payments = const [],
       this.paymentMethod});
 
   factory Invoice.fromMap(Map<String, dynamic> map, String docID) {
@@ -153,7 +153,7 @@ class Invoice {
     return Invoice(
       id: docID,
       invoiceNumber: map['invoice_number'],
-      invoiceDate: invd?.toDate(),
+      invoiceDate: invd.toDate(),
       userName: map['user_name'],
       fcsID: map['fcs_id'],
       phoneNumber: map['phone_number'],
@@ -174,12 +174,12 @@ class Invoice {
 
   Map<String, dynamic> toMap() {
     List _cargoTypes = cargoTypes.map((c) => c.toMap()).toList();
-    List _customDuties = customDuties?.map((c) => c.toMap())?.toList();
-    List _cartons = cartons?.map((c) => c.toMap())?.toList() ?? [];
-    List _shipments = shipments?.map((s) => s.toMap())?.toList() ?? [];
+    List _customDuties = customDuties.map((c) => c.toMap()).toList();
+    List _cartons = cartons.map((c) => c.toMap()).toList();
+    List _shipments = shipments!.map((s) => s!.toMap()).toList();
     return {
       "id": id,
-      "invoice_date": invoiceDate?.toUtc()?.toIso8601String(),
+      "invoice_date": invoiceDate?.toUtc().toIso8601String(),
       "user_id": userID,
       "user_name": userName,
       "invoice_number": invoiceNumber,

lib/domain/entities/market.dart

@@ -1,11 +1,8 @@
 class Market {
-  String id;
-  String name;
+  String? id;
+  String? name;
 
-  Market({
-    this.id,
-    this.name,
-  });
+  Market({this.id, this.name});
 
   Map<String, dynamic> toMap() {
     return {

lib/domain/entities/package.dart

@@ -5,72 +5,71 @@ import 'package:fcs/domain/vo/delivery_address.dart';
 import 'package:fcs/domain/vo/shipment_status.dart';
 
 class Package {
-  String id;
-  String trackingID;
-  String userID;
-  String fcsID;
-  String userName;
-  String phoneNumber;
-  DateTime currentStatusDate;
+  String? id;
+  String? trackingID;
+  String? userID;
+  String? fcsID;
+  String? userName;
+  String? phoneNumber;
+  DateTime? currentStatusDate;
   List<String> photoUrls;
   List<ShipmentStatus> shipmentHistory;
-  String desc;
+  String? desc;
 
-  String status;
-  String shipmentNumber;
-  String senderFCSID;
-  String senderName;
-  String senderPhoneNumber;
-  String boxNumber;
-  String cargoDesc;
-  String market;
+  String? status;
+  String? shipmentNumber;
+  String? senderFCSID;
+  String? senderName;
+  String? senderPhoneNumber;
+  String? boxNumber;
+  String? cargoDesc;
+  String? market;
   bool isChecked;
 
   int rate;
   int weight;
-  String packageType;
-  String pickUpID;
-  List<String> photos;
-  String remark;
-  DateTime arrivedDate;
-  DeliveryAddress deliveryAddress;
+  String? packageType;
+  String? pickUpID;
+  // List<String> photos;
+  String? remark;
+  DateTime? arrivedDate;
+  DeliveryAddress? deliveryAddress;
 
   //for packages in processing
-  List<File> photoFiles;
+  List<File?> photoFiles;
 
   int get amount => rate != null && weight != null ? rate * weight : 0;
 
   double get price => rate.toDouble() * weight;
 
-  Package({
-    this.id,
-    this.trackingID,
-    this.userID,
-    this.userName,
-    this.fcsID,
-    this.phoneNumber,
-    this.shipmentNumber,
-    this.senderFCSID,
-    this.senderName,
-    this.boxNumber,
-    this.rate,
-    this.weight,
-    this.packageType,
-    this.pickUpID,
-    this.remark,
-    this.status,
-    this.arrivedDate,
-    this.cargoDesc,
-    this.market,
-    this.shipmentHistory,
-    this.currentStatusDate,
-    this.photoUrls,
-    this.desc,
-    this.deliveryAddress,
-    this.isChecked = false,
-    this.photoFiles,
-    this.senderPhoneNumber
-  });
+  Package(
+      {this.id,
+      this.trackingID,
+      this.userID,
+      this.userName,
+      this.fcsID,
+      this.phoneNumber,
+      this.shipmentNumber,
+      this.senderFCSID,
+      this.senderName,
+      this.boxNumber,
+      this.rate = 0,
+      this.weight = 0,
+      this.packageType,
+      this.pickUpID,
+      this.remark,
+      this.status,
+      this.arrivedDate,
+      this.cargoDesc,
+      this.market,
+      this.shipmentHistory = const [],
+      this.currentStatusDate,
+      this.photoUrls = const [],
+      this.desc,
+      this.deliveryAddress,
+      this.isChecked = false,
+      this.photoFiles = const [],
+      this.senderPhoneNumber});
 
   factory Package.fromMap(Map<String, dynamic> map, String docID) {
     var _currentStatusDate = (map['status_date'] as Timestamp);
@@ -98,9 +97,7 @@ class Package {
         senderName: map['sender_name'],
         senderPhoneNumber: map['sender_phone_number'],
         deliveryAddress: _da,
-        currentStatusDate: _currentStatusDate != null
-            ? _currentStatusDate.toDate().toLocal()
-            : null,
+        currentStatusDate: _currentStatusDate.toDate().toLocal(),
         photoUrls: _photoUrls,
         shipmentHistory: _shipmentStatus);
   }

lib/domain/entities/payment.dart

@@ -1,11 +1,11 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 
 class Payment {
-  String id;
-  String invoiceID;
-  DateTime paymentDate;
-  String paymentReceiptURL;
-  String status;
+  String? id;
+  String? invoiceID;
+  DateTime? paymentDate;
+  String? paymentReceiptURL;
+  String? status;
   double amount;
 
   Payment(
@@ -14,13 +14,13 @@ class Payment {
       this.paymentDate,
       this.paymentReceiptURL,
       this.status,
-      this.amount});
+      this.amount = 0});
 
   factory Payment.fromMap(Map<String, dynamic> map, String id) {
     var _paymentDate = (map['payment_date'] as Timestamp);
     return Payment(
       id: id,
-      paymentDate: _paymentDate?.toDate(),
+      paymentDate: _paymentDate.toDate(),
       paymentReceiptURL: map['payment_receipt_url'],
       status: map['status'],
       amount: map['amount']?.toDouble() ?? 0,
@@ -31,7 +31,7 @@ class Payment {
     return {
       "id": id,
       "invoice_id": invoiceID,
-      'payment_date': paymentDate?.toUtc()?.toIso8601String(),
+      'payment_date': paymentDate?.toUtc().toIso8601String(),
       'payment_receipt_url': paymentReceiptURL,
       'status': status,
       'amount': amount,
@@ -39,7 +39,7 @@ class Payment {
   }
 
   Payment clone() {
-    return Payment.fromMap(toMap(), this.id);
+    return Payment.fromMap(toMap(), this.id!);
   }
 
   @override

lib/domain/entities/payment_method.dart

@@ -1,11 +1,11 @@
 class PaymentMethod {
-  String id;
-  String name;
-  String accountName;
-  String account;
-  String phone;
-  String email;
-  String link;
+  String? id;
+  String? name;
+  String? accountName;
+  String? account;
+  String? phone;
+  String? email;
+  String? link;
 
   PaymentMethod(
       {this.id,

lib/domain/entities/processing.dart

@@ -1,15 +1,15 @@
 import 'package:fcs/domain/entities/package.dart';
 
 class Processing {
-  String id;
+  String? id;
   //for consignee
-  String userID;
-  String userName;
-  String userPhoneNumber;
+  String? userID;
+  String? userName;
+  String? userPhoneNumber;
   //for shipper
-  String fcsID;
-  String shipperName;
-  String shipperPhoneNumber;
+  String? fcsID;
+  String? shipperName;
+  String? shipperPhoneNumber;
 
   List<Package> packages;
 
@@ -21,7 +21,7 @@ class Processing {
       this.fcsID,
       this.shipperName,
       this.shipperPhoneNumber,
-      this.packages});
+      this.packages = const []});
 
   @override
   bool operator ==(Object other) => other is Processing && other.id == id;

lib/domain/entities/rate.dart

@@ -1,4 +1,3 @@
-
 import 'package:fcs/domain/entities/discount_by_weight.dart';
 
 import 'cargo_type.dart';
@@ -11,26 +10,23 @@ class Rate {
   double diffDiscountWeight;
   double diffWeightRate;
 
-  List<CargoType> cargoTypes;
-  List<CargoType> customDuties;
-  List<DiscountByWeight> discountByWeights;
+  List<CargoType> cargoTypes = [];
+  List<CargoType> customDuties = [];
+  List<DiscountByWeight> discountByWeights = [];
 
   DiscountByWeight getDiscountByWeight(double weight) {
     discountByWeights.sort((d1, d2) => d2.weight.compareTo(d1.weight));
-    return discountByWeights.firstWhere((e) => e.weight < weight,
-        orElse: () => null);
+    return discountByWeights.firstWhere((e) => e.weight < weight);
   }
 
-  CargoType get defaultCargoType => cargoTypes == null
-      ? null
-      : cargoTypes.firstWhere((e) => e.name == "General");
+  CargoType get defaultCargoType => cargoTypes.firstWhere((e) => e.name == "General");
 
   Rate(
-      {this.deliveryFee,
-      this.freeDeliveryWeight,
-      this.volumetricRatio,
-      this.diffDiscountWeight,
-      this.diffWeightRate});
+      {this.deliveryFee = 0,
+      this.freeDeliveryWeight = 0,
+      this.volumetricRatio = 0,
+      this.diffDiscountWeight = 0,
+      this.diffWeightRate = 0});
 
   factory Rate.fromMap(Map<String, dynamic> map) {
     return Rate(

lib/domain/entities/receipt.dart

@@ -1,9 +1,9 @@
 class Receipt {
-  String id;
-  int amount;
-  String date;
-  String status;
-  String fileUrl;
+  String? id;
+  int? amount = 0;
+  String? date;
+  String? status;
+  String? fileUrl;
 
   Receipt({this.id, this.amount, this.date, this.status, this.fileUrl});
 }

lib/domain/entities/setting.dart

@@ -10,25 +10,24 @@ List<Day> dayLists = [
 
 class Setting {
   final int supportBuildNum;
-
   // contact page
-  String usaAddress;
-  String mmAddress;
-  String usaContactNumber;
-  String mmContactNumber;
-  String emailAddress;
-  String facebookLink;
-  bool inviteRequired;
-  String appUrl;
-  final String termsEng;
-  final String termsMm;
-  String about;
-  String courierWebsite;
+  String? usaAddress;
+  String? mmAddress;
+  String? usaContactNumber;
+  String? mmContactNumber;
+  String? emailAddress;
+  String? facebookLink;
+  bool? inviteRequired;
+  String? appUrl;
+  final String? termsEng;
+  final String? termsMm;
+  String? about;
+  String? courierWebsite;
 
   List<String> shipmentTypes;
 
   Setting(
-      {this.supportBuildNum,
+      {this.supportBuildNum = 1,
       this.usaAddress,
       this.mmAddress,
       this.usaContactNumber,
@@ -40,7 +39,7 @@ class Setting {
       this.termsEng,
       this.termsMm,
       this.about,
-      this.shipmentTypes,
+      this.shipmentTypes = const [],
       this.courierWebsite});
 
   factory Setting.fromMap(Map<String, dynamic> map) {
@@ -76,9 +75,9 @@ class Setting {
 }
 
 class Day {
-  int id;
-  String name;
-  bool isChecked = false;
+  int? id;
+  String? name;
+  bool? isChecked = false;
   Day({this.id, this.name, this.isChecked});
 
   @override

lib/domain/entities/shipment.dart

@@ -4,35 +4,35 @@ import 'package:fcs/domain/entities/carton.dart';
 import 'package:fcs/domain/vo/delivery_address.dart';
 
 class Shipment {
-  String id;
-  String shipmentNumber;
-  String shipmentType;
-  DeliveryAddress pickupAddress;
-  DateTime pickupDate;
-  String pickupTimeStart;
-  String pickupTimeEnd;
+  String? id;
+  String? shipmentNumber;
+  String? shipmentType;
+  DeliveryAddress? pickupAddress;
+  DateTime? pickupDate;
+  String? pickupTimeStart;
+  String? pickupTimeEnd;
 
-  String userName;
-  String userID;
-  String phoneNumber;
-  int numberOfPackage;
-  int weight;
-  double handlingFee;
-  double paidHandlingFee;
-  String address;
-  String status;
+  String? userName;
+  String? userID;
+  String? phoneNumber;
+  int numberOfPackage = 0;
+  int weight = 0;
+  double handlingFee = 0;
+  double paidHandlingFee = 0;
+  String? address;
+  String? status;
   bool isCourier;
   int radioIndex;
   List<Carton> boxes;
 
-  String pickupUserID;
-  String pickupUserName;
-  String pickupUserPhoneNumber;
+  String? pickupUserID;
+  String? pickupUserName;
+  String? pickupUserPhoneNumber;
 
-  String fcsShipmentID;
-  String fcsShipmentNumber;
-  String shipmentLabelUrl;
-  bool isSelected;
+  String? fcsShipmentID;
+  String? fcsShipmentNumber;
+  String? shipmentLabelUrl;
+  bool isSelected = false;
 
   Shipment(
       {this.id,
@@ -43,28 +43,28 @@ class Shipment {
       this.phoneNumber,
       this.pickupTimeStart,
       this.pickupTimeEnd,
-      this.numberOfPackage,
-      this.weight,
-      this.handlingFee,
-      this.paidHandlingFee,
+      this.numberOfPackage = 0,
+      this.weight = 0,
+      this.handlingFee = 0,
+      this.paidHandlingFee = 0,
       this.address,
       this.status,
       this.pickupDate,
       this.isCourier = false,
       this.radioIndex = 1,
-      this.pickupAddress,
+      required this.pickupAddress,
       this.pickupUserID,
       this.pickupUserName,
       this.pickupUserPhoneNumber,
       this.fcsShipmentID,
       this.fcsShipmentNumber,
       this.shipmentLabelUrl,
-      this.boxes});
+      this.boxes = const []});
 
-  int get last => DateTime.now().difference(pickupDate).inDays;
+  // int get last => DateTime.now().difference(pickupDate).inDays;
 
-  double get totalWeight => boxes?.fold(0, (p, e) => p + e.actualWeight);
-  int get totalCount => boxes?.length;
+  double get totalWeight => boxes.fold(0, (p, e) => p + e.actualWeight);
+  int get totalCount => boxes.length;
 
   bool get isPending => status == shipment_pending_status;
   bool get isAssigned => status == shipment_assigned_status;
@@ -100,15 +100,15 @@ class Shipment {
   }
 
   Map<String, dynamic> toMap() {
-    List _boxes = boxes?.map((l) => l.toMap())?.toList() ?? [];
+    List _boxes = boxes.map((l) => l.toMap()).toList();
 
     return {
       "id": id,
       'user_id': userID,
       'cartons': _boxes,
       'shipment_type': shipmentType,
-      'pickup_address': pickupAddress.toMap(),
-      "pickup_date": pickupDate?.toUtc()?.toIso8601String(),
+      'pickup_address': pickupAddress?.toMap(),
+      "pickup_date": pickupDate?.toUtc().toIso8601String(),
       'pickup_time_start': pickupTimeStart,
       'pickup_time_end': pickupTimeEnd,
       'pickup_user_id': pickupUserID,

lib/domain/entities/user.dart

@@ -9,18 +9,19 @@ DateFormat timeFormat = DateFormat("HH:mm");
 final DateFormat dateFormat = DateFormat("d MMM yyyy");
 
 class User {
-  String id;
-  String name;
-  String phoneNumber;
-  String status;
-  String fcsID;
-  DateTime lastMessageTime;
-  String lastMessage;
+  String? id;
+  String? name;
+  String? phoneNumber;
+  String? status;
+  String? fcsID;
+  DateTime? lastMessageTime;
+  String? lastMessage;
   int userUnseenCount;
   int fcsUnseenCount;
-  String preferCurrency;
+  String? preferCurrency;
 
-  String get initial => name != null && name != "" ? name.substring(0, 1) : "?";
+  String get initial =>
+      name != null && name != "" ? name!.substring(0, 1) : "?";
 
   String get getLastMessage {
     var msg = lastMessage ?? "Say hi to $name";
@@ -31,27 +32,31 @@ class User {
   String get getLastMessageTime {
     if (lastMessageTime == null) return "";
     DateTime today = DateTime.now();
-    if (lastMessageTime.year == today.year &&
-        lastMessageTime.month == today.month &&
-        lastMessageTime.day == today.day) {
-      return timeFormat.format(lastMessageTime);
+    if (lastMessageTime!.year == today.year &&
+        lastMessageTime!.month == today.month &&
+        lastMessageTime!.day == today.day) {
+      return timeFormat.format(lastMessageTime!);
     } else {
-      return dateFormat.format(lastMessageTime);
+      return dateFormat.format(lastMessageTime!);
     }
   }
 
   String get getUserUnseenCount => userUnseenCount != null
-      ? userUnseenCount > 100 ? "99+" : userUnseenCount.toString()
+      ? userUnseenCount > 100
+          ? "99+"
+          : userUnseenCount.toString()
       : "0";
   String get getFcsUnseenCount => fcsUnseenCount != null
-      ? fcsUnseenCount > 100 ? "99+" : fcsUnseenCount.toString()
+      ? fcsUnseenCount > 100
+          ? "99+"
+          : fcsUnseenCount.toString()
       : "0";
 
   List<String> privileges = [];
 
-  String get phone => phoneNumber != null && phoneNumber.startsWith("959")
-      ? "0${phoneNumber.substring(2)}"
-      : phoneNumber;
+  String get phone => phoneNumber != null && phoneNumber!.startsWith("959")
+      ? "0${phoneNumber!.substring(2)}"
+      : phoneNumber!;
   bool get joined => status != null && status == user_joined_status;
   bool get invited => status != null && status == user_invited_status;
   bool get requested => status != null && status == user_requested_status;
@@ -64,11 +69,11 @@ class User {
       this.phoneNumber,
       this.fcsID,
       this.status,
-      this.privileges,
+      this.privileges = const [],
       this.lastMessage,
       this.lastMessageTime,
-      this.userUnseenCount,
-      this.fcsUnseenCount,
+      this.userUnseenCount = 0,
+      this.fcsUnseenCount = 0,
       this.preferCurrency});
 
   factory User.fromJson(Map<String, dynamic> json) {

lib/domain/exceiptions/server_exceptions.dart

@@ -1,12 +1,12 @@
 
 class ServerException  {
   @override
-  List<Object> get props => null;
+  List<Object>? get props => null;
 
   call() {
     return null;
   }
 
   @override
-  bool get stringify => null;
+  bool? get stringify => null;
 }

lib/domain/vo/contact.dart

@@ -1,12 +1,12 @@
 import 'package:fcs/domain/entities/setting.dart';
 
 class Contact {
-  String usaAddress;
-  String mmAddress;
-  String usaContactNumber;
-  String mmContactNumber;
-  String emailAddress;
-  String facebookLink;
+  String? usaAddress;
+  String? mmAddress;
+  String? usaContactNumber;
+  String? mmContactNumber;
+  String? emailAddress;
+  String? facebookLink;
 
   Contact({
     this.usaAddress,

lib/domain/vo/delivery_address.dart

@@ -1,13 +1,14 @@
 class DeliveryAddress {
-  String id;
-  String fullName;
-  String addressLine1;
-  String addressLine2;
-  String city;
-  String state;
-  String phoneNumber;
+  String? id;
+  String? fullName;
+  String? addressLine1;
+  String? addressLine2;
+  String? city;
+  String? state;
+  String? phoneNumber;
   bool isDefault;
-  String userID;
+  String? userID;
+
   DeliveryAddress(
       {this.id,
       this.fullName,

lib/domain/vo/message.dart

@@ -1,15 +1,15 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 
 class Message {
-  String id;
-  String message;
-  DateTime date;
-  String receiverID;
-  String receiverName;
-  String senderID;
-  String senderName;
-  String messageType;
-  String messageID;
+  String? id;
+  String? message;
+  DateTime? date;
+  String? receiverID;
+  String? receiverName;
+  String? senderID;
+  String? senderName;
+  String? messageType;
+  String? messageID;
 
   Message(
       {this.id,
@@ -21,11 +21,13 @@ class Message {
       this.senderName,
       this.messageType,
       this.messageID});
+
   bool fromToday() {
+    if (date == null) return false;
     var now = DateTime.now();
-    return date.day == now.day &&
-        date.month == now.month &&
-        date.year == now.year;
+    return date!.day == now.day &&
+        date!.month == now.month &&
+        date!.year == now.year;
   }
 
   Map<String, dynamic> toMap() {
@@ -36,9 +38,10 @@ class Message {
   }
 
   bool sameDay(Message another) {
-    return date.year == another.date.year &&
-        date.month == another.date.month &&
-        date.day == another.date.day;
+    if (date == null) return false;
+    return date!.year == another.date!.year &&
+        date!.month == another.date!.month &&
+        date!.day == another.date!.day;
   }
 
   factory Message.fromMap(Map<String, dynamic> map, String id) {
@@ -52,7 +55,7 @@ class Message {
       receiverName: map['receiver_name'],
       messageType: map['msg_type'],
       messageID: map['msg_id'],
-      date: date != null ? date.toDate() : null,
+      date: date.toDate(),
     );
   }
 }

lib/domain/vo/privilege.dart

@@ -1,20 +1,24 @@
 import 'package:fcs/domain/constants.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
+import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 class Privilege {
   String id;
-  String name;
-  String desc;
-  bool sysAdminOnly = true;
-  bool isChecked = false;
+  String? name;
+  String? desc;
+  bool? sysAdminOnly = true;
+  bool? isChecked = false;
 
-  IconData iconData;
+  IconData? iconData;
 
   Privilege(
-      {this.id, this.name, this.desc, this.isChecked, this.sysAdminOnly}) {
+      {required this.id,
+      this.name,
+      this.desc,
+      this.isChecked,
+      this.sysAdminOnly}) {
     if (this.id == privilege_admin) {
       iconData = MaterialCommunityIcons.account_tie;
     } else if (this.id == privilege_support) {

lib/domain/vo/radio.dart

@@ -1,5 +0,0 @@
-class RadioGroup {
-  String text;
-  int index;
-  RadioGroup({this.text, this.index});
-}

lib/domain/vo/shipment_status.dart

@@ -3,17 +3,21 @@ import 'package:cloud_firestore/cloud_firestore.dart';
 class ShipmentStatus {
   String status;
   DateTime date;
-  bool done;
-  String staffId;
-  String staffName;
+  bool? done;
+  String? staffId;
+  String? staffName;
   ShipmentStatus(
-      {this.status, this.date, this.done, this.staffId, this.staffName});
+      {required this.status,
+      required this.date,
+      this.done,
+      this.staffId,
+      this.staffName});
 
   factory ShipmentStatus.fromMap(Map<String, dynamic> map) {
     var _date = (map['date'] as Timestamp);
     return ShipmentStatus(
         status: map['status'],
-        date: _date == null ? null : _date.toDate(),
+        date: _date.toDate(),
         done: map['done'],
         staffId: map['staff_id'],
         staffName: map['staff_name']);

lib/domain/vo/status.dart

@@ -1,8 +1,7 @@
-
 class Status {
-  String status;
-  String message;
-  String errorCode;
+  String? status;
+  String? message;
+  String? errorCode;
   Status(this.status, this.message);
 
   Status.fromJson(Map<String, dynamic> json) {
@@ -10,4 +9,4 @@ class Status {
     message = json['message'];
     errorCode = json['error_code'];
   }
-}
+}

lib/domain/vo/term.dart

@@ -1,8 +1,8 @@
 import 'package:fcs/domain/entities/setting.dart';
 
 class Term {
-  String termEng;
-  String termMm;
+  String? termEng;
+  String? termMm;
 
   Term({this.termEng, this.termMm});
 

lib/helpers/api_helper.dart

@@ -20,8 +20,8 @@ Future<dynamic> requestAPI(
   String path,
   method, {
   dynamic payload,
-  String token,
-  String url,
+  String? token,
+  String? url,
 }) async {
   DevInfo devInfo = await DevInfo.getDevInfo();
 
@@ -33,7 +33,7 @@ Future<dynamic> requestAPI(
     headers["Token"] = token;
   }
   if (devInfo != null && devInfo.deviceID != null && deviceName != null) {
-    headers["Device"] = devInfo.deviceID + ":" + deviceName;
+    headers["Device"] = devInfo.deviceID??"" + ":" + deviceName;
   }
   headers["Project-ID"] = Config.instance.reportProjectID;
 
@@ -66,7 +66,7 @@ Future<dynamic> requestAPI(
 // request makes http request
 // if token is null
 Future<dynamic> requestDownloadAPI(String path, method,
-    {dynamic payload, String token, String url, String filePath}) async {
+    {dynamic payload, String? token, String? url, String? filePath}) async {
   DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
   AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
   String deviceName = "${androidInfo.model}(${androidInfo.id})";
@@ -81,7 +81,7 @@ Future<dynamic> requestDownloadAPI(String path, method,
     log.info("Path:$baseUrl$path");
     HttpClient client = new HttpClient();
     var _downloadData = StringBuffer();
-    var fileSave = new File(filePath);
+    var fileSave = new File(filePath!);
     var request = await client.getUrl(Uri.parse("$baseUrl$path"));
     request.headers.set("Project-ID", Config.instance.reportProjectID);
     request.headers
@@ -108,7 +108,7 @@ Future<dynamic> requestDownloadAPI(String path, method,
 // request makes http request
 // if token is null
 Future<dynamic> requestDownloadPDFAPI(String path, method,
-    {dynamic payload, String token, String url, String filePath}) async {
+    {dynamic payload, String? token, String? url, String? filePath}) async {
   DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
   AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
   String deviceName = "${androidInfo.model}(${androidInfo.id})";
@@ -123,7 +123,7 @@ Future<dynamic> requestDownloadPDFAPI(String path, method,
     log.info("Path:$baseUrl$path");
     HttpClient client = new HttpClient();
     // var _downloadData = StringBuffer();
-    var fileSave = new File(filePath);
+    var fileSave = new File(filePath!);
     var request = await client.getUrl(Uri.parse("$baseUrl$path"));
     request.headers.set("Project-ID", Config.instance.reportProjectID);
     if (token != null) {
@@ -135,7 +135,7 @@ Future<dynamic> requestDownloadPDFAPI(String path, method,
     request.headers.set("payload", escapePayload);
     var response = await request.close();
     print("headers:${response.headers}");
-    var _downloadData = List<int>();
+    List<int> _downloadData = [];
 
     response.listen((d) => _downloadData.addAll(d), onDone: () {
       fileSave.writeAsBytes(_downloadData);
@@ -155,10 +155,10 @@ typedef OnDownloadDone(File file);
 // if token is null
 Future<dynamic> requestDownload(String path, method,
     {dynamic payload,
-    String token,
-    String url,
-    String filePath,
-    OnDownloadDone onDownloadDone}) async {
+    required String token,
+    required String url,
+    required String filePath,
+    OnDownloadDone? onDownloadDone}) async {
   DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
   AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
   String deviceName = "${androidInfo.model}(${androidInfo.id})";
@@ -188,7 +188,7 @@ Future<dynamic> requestDownload(String path, method,
     // request.write(escapePayload);
     var response = await request.close();
     print("headers:${response.headers}");
-    var _downloadData = List<int>();
+    List<int> _downloadData = [];
     var cd = response.headers.value("content-disposition");
     String fileName = "download.csv";
     if (cd != null && cd.contains("filename=")) {

lib/helpers/dev_info.dart

@@ -2,13 +2,13 @@ import 'package:device_info/device_info.dart';
 import 'dart:io' show Platform;
 
 class DevInfo {
-  bool isAndroid;
-  bool isIOS;
-  String deviceID;
-  String id;
-  String model;
+  bool? isAndroid;
+  bool? isIOS;
+  String? deviceID;
+  String? id;
+  String? model;
 
-  static DevInfo _instance;
+  static DevInfo? _instance;
 
   static Future<DevInfo> getDevInfo() async {
     if (_instance != null) return Future.value(_instance);
@@ -18,14 +18,14 @@ class DevInfo {
 
     if (Platform.isAndroid) {
       AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
-      _instance.deviceID = androidInfo.androidId;
-      _instance.id = androidInfo.id;
-      _instance.model = androidInfo.model;
+      _instance!.deviceID = androidInfo.androidId;
+      _instance!.id = androidInfo.id;
+      _instance!.model = androidInfo.model;
     } else if (Platform.isIOS) {
       IosDeviceInfo iosDeviceInfo = await deviceInfo.iosInfo;
-      _instance.deviceID = iosDeviceInfo.identifierForVendor;
-      _instance.id = iosDeviceInfo.utsname.release;
-      _instance.model = iosDeviceInfo.model;
+      _instance!.deviceID = iosDeviceInfo.identifierForVendor;
+      _instance!.id = iosDeviceInfo.utsname.release;
+      _instance!.model = iosDeviceInfo.model;
     }
     return Future.value(_instance);
   }

lib/helpers/firebase_helper.dart

@@ -1,71 +1,82 @@
 import 'dart:io';
 
-import 'package:fcs/config.dart';
-import 'package:firebase_auth/firebase_auth.dart';
+import 'package:firebase_auth/firebase_auth.dart' as fb;
 import 'package:firebase_storage/firebase_storage.dart';
 import 'package:logging/logging.dart';
 import 'package:uuid/uuid.dart';
 
 final log = Logger('firebaseHelper');
 
-final FirebaseAuth auth = FirebaseAuth.instance;
+final fb.FirebaseAuth auth = fb.FirebaseAuth.instance;
 
 Future<String> getToken() async {
-  FirebaseUser firebaseUser = await auth.currentUser();
-  IdTokenResult token = await firebaseUser.getIdToken();
-  return token.token;
+  fb.User? firebaseUser = fb.FirebaseAuth.instance.currentUser;
+  String token = await firebaseUser?.getIdToken() ?? "";
+  return token;
 }
 
-Future<Map> getClaims({bool refreshIdToken = false}) async {
-  FirebaseUser firebaseUser = await auth.currentUser();
+Future<Map?> getClaims({bool refreshIdToken = false}) async {
+  fb.User? firebaseUser = auth.currentUser;
   if (firebaseUser == null) return null;
-  IdTokenResult idToken =
-      await firebaseUser.getIdToken(refresh: refreshIdToken);
+  fb.IdTokenResult idToken =
+      await firebaseUser.getIdTokenResult(refreshIdToken);
   return idToken.claims;
 }
 
 // returns list of url
-Future<List<String>> uploadFiles(String path, List<File> files,
-    {String fileName}) async {
+Future<List<String>> uploadFiles(String path, List<File?> files,
+    {String? fileName}) async {
   List<Future<String>> fu = [];
-  for (File f in files) {
+  for (File? f in files) {
     Future<String> u = uploadStorage(path, f);
     fu.add(u);
   }
   return Future.wait(fu);
 }
 
-Future<String> uploadStorage(String path, File file, {String fileName}) async {
+Future<String> uploadStorage(String path, File? file,
+    {String? fileName}) async {
   if (fileName == null) {
     fileName = Uuid().v4();
   }
-  StorageReference storageReference =
-      FirebaseStorage(storageBucket: Config.instance.bucketName)
-          .ref()
-          .child('$path/$fileName');
-  StorageUploadTask uploadTask = storageReference.putFile(file);
-  await uploadTask.onComplete;
-  String downloadUrl = await storageReference.getDownloadURL();
-  print("name:${await storageReference.getName()}");
-  print("bucket:${await storageReference.getBucket()}");
-  print("path:${await storageReference.getPath()}");
-  print("meta:${await storageReference.getMetadata()}");
+  if (file == null) {
+    return Future.value('');
+  }
+  Reference ref = FirebaseStorage.instance.ref().child('$path/$fileName');
+  UploadTask uploadTask = ref.putFile(file);
+  await uploadTask.resume();
+  String downloadUrl = await ref.getDownloadURL();
   return downloadUrl;
+  // StorageReference storageReference =
+  //     FirebaseStorage(storageBucket: Config.instance.bucketName)
+  //         .ref()
+  //         .child('$path/$fileName');
+  // StorageUploadTask uploadTask = storageReference.putFile(file);
+  // await uploadTask.onComplete;
+  // String downloadUrl = await storageReference.getDownloadURL();
+  // print("name:${await storageReference.getName()}");
+  // print("bucket:${await storageReference.getBucket()}");
+  // print("path:${await storageReference.getPath()}");
+  // print("meta:${await storageReference.getMetadata()}");
+  // return downloadUrl;
 }
 
-Future<void> deleteStorageFromUrls(List<String> urls) async {
+Future<void> deleteStorageFromUrls(List<String?> urls) async {
   if (urls == null) return;
   for (int i = 0; i < urls.length; i++) {
-    await deleteStorageFromUrl(urls[i]);
+    if (urls[i] == null) return;
+    await deleteStorageFromUrl(urls[i]!);
   }
 }
 
 Future<void> deleteStorageFromUrl(String url) async {
   try {
-    StorageReference storageReference =
-        await FirebaseStorage(storageBucket: Config.instance.bucketName)
-            .getReferenceFromUrl(url);
-    await storageReference.delete();
+    Reference ref = FirebaseStorage.instance.refFromURL(url);
+    await ref.delete();
+    // StorageReference storageReference =
+    //     await FirebaseStorage(storageBucket: Config.instance.bucketName)
+    //         .getReferenceFromUrl(url);
+    // await storageReference.delete();
   } catch (e) {
     log.warning("deleteStorage:$e");
   }

lib/helpers/network_connectivity.dart

@@ -11,7 +11,7 @@ class NetworkConnectivity {
   final log = Logger('NetworkConnectivity');
 
   static final NetworkConnectivity instance = NetworkConnectivity._internal();
-  static String hostName;
+  static String? hostName;
   NetworkConnectivity._internal() {
     _initialise();
     var uri = Uri.parse(Config.instance.apiURL);
@@ -38,7 +38,7 @@ class NetworkConnectivity {
     // lookup if connectivity is not none
     if (result != ConnectivityResult.none) {
       try {
-        final hostNameLookup = await InternetAddress.lookup(hostName);
+        final hostNameLookup = await InternetAddress.lookup(hostName ?? "");
         if (hostNameLookup.isNotEmpty &&
             hostNameLookup[0].rawAddress.isNotEmpty) {
           if (await checkHeartbeat()) {

lib/helpers/paginator.dart

@@ -13,7 +13,7 @@ class Paginator<T> {
   final log = Logger('Paginator');
 
   final int rowPerLoad;
-  DocumentSnapshot prev;
+  DocumentSnapshot? prev;
   bool ended = false;
   bool isLoading = false;
   List<T> values = [];
@@ -21,7 +21,7 @@ class Paginator<T> {
 
   Query pageQuery;
 
-  Paginator(this.pageQuery, {this.rowPerLoad = 20, this.toObj}) {
+  Paginator(this.pageQuery, {this.rowPerLoad = 20, required this.toObj}) {
     _clearState();
   }
 
@@ -36,27 +36,27 @@ class Paginator<T> {
     _clearState();
   }
 
-  Future<void> refresh({CallBack onFinished}) async {
+  Future<void> refresh({CallBack? onFinished}) async {
     _clearState();
     await load();
     if (onFinished != null) onFinished();
   }
 
-  Future<bool> load({CallBack onFinished}) async {
+  Future<bool?> load({CallBack? onFinished}) async {
     if (ended) return null;
     isLoading = true;
     Query _query =
-        prev != null ? pageQuery.startAfterDocument(prev) : pageQuery;
+        prev != null ? pageQuery.startAfterDocument(prev!) : pageQuery;
     try {
       await _query
           .limit(rowPerLoad)
-          .getDocuments(source: Source.server)
+          .get(GetOptions(source: Source.server))
           .then((QuerySnapshot snapshot) {
-        int count = snapshot.documents.length;
+        int count = snapshot.docs.length;
         ended = count < rowPerLoad;
-        prev = count > 0 ? snapshot.documents[count - 1] : prev;
-        snapshot.documents.forEach((e) {
-          values.add(toObj(e.data, e.documentID));
+        prev = count > 0 ? snapshot.docs[count - 1] : prev;
+        snapshot.docs.forEach((e) {
+          values.add(toObj(e.data() as Map<String, dynamic>, e.id));
         });
       });
     } catch (e) {

lib/helpers/shared_pref.dart

@@ -7,17 +7,17 @@ class SharedPref {
   static final SharedPref instance = SharedPref._();
   SharedPref._();
 
-  static Future<bool> isFirstLaunch() async {
+  static Future<bool?> isFirstLaunch() async {
     SharedPreferences prefs = await SharedPreferences.getInstance();
     return prefs.getBool('first_launch');
   }
 
   static Future<void> finishFirstLaunch() async {
     SharedPreferences prefs = await SharedPreferences.getInstance();
-    return prefs.setBool('first_launch', false);
+    prefs.setBool('first_launch', false);
   }
 
-  static Future<String> getLang() async {
+  static Future<String?> getLang() async {
     SharedPreferences prefs = await SharedPreferences.getInstance();
     return prefs.getString('language');
   }
@@ -27,7 +27,7 @@ class SharedPref {
     prefs.setString('language', lang);
   }
 
-  static Future<bool> getStaffMode() async {
+  static Future<bool?> getStaffMode() async {
     SharedPreferences prefs = await SharedPreferences.getInstance();
     return prefs.getBool('staff_mode_on');
   }
@@ -41,7 +41,7 @@ class SharedPref {
     await _save("user", user.toJson());
   }
 
-  static Future<User> getUser() async {
+  static Future<User?> getUser() async {
     try {
       return User.fromJson(await _read("user"));
     } catch (e) {
@@ -57,7 +57,7 @@ class SharedPref {
     await _save("skipped_recovery_email", skipped);
   }
 
-  static Future<bool> getSkippedRecoverEmail() async {
+  static Future<bool?> getSkippedRecoverEmail() async {
     try {
       bool _skipped = await _read("skipped_recovery_email");
       return _skipped;
@@ -69,7 +69,7 @@ class SharedPref {
   static _read(String key) async {
     try {
       final prefs = await SharedPreferences.getInstance();
-      return json.decode(prefs.getString(key));
+      return json.decode(prefs.getString(key) ?? "");
     } catch (e) {
       print("Error:$e");
     }

lib/helpers/theme.dart

@@ -20,8 +20,10 @@ const TextStyle labelStyleMM = TextStyle(
     fontFamily: "Myanmar3");
 const TextStyle subMenuStyle =
     TextStyle(fontSize: 14, color: Colors.white, fontWeight: FontWeight.w500);
-const TextStyle subMenuStyleMM =
-    TextStyle(fontSize: 14, color: Colors.white, fontWeight: FontWeight.w500,
+const TextStyle subMenuStyleMM = TextStyle(
+    fontSize: 14,
+    color: Colors.white,
+    fontWeight: FontWeight.w500,
     fontFamily: "Myanmar3");
 
 const TextStyle welcomeLabelStyle =
@@ -31,11 +33,10 @@ const TextStyle welcomeSubLabelStyle =
 const TextStyle siginButtonStyle =
     TextStyle(fontSize: 16, color: Colors.white, fontWeight: FontWeight.w500);
 
-
 TextStyle newLabelStyle(
-    {Color color,
-    double fontSize,
-    FontWeight fontWeight,
+    {Color? color,
+    double? fontSize,
+    FontWeight? fontWeight,
     bool underline = false}) {
   return TextStyle(
       fontSize: fontSize == null ? 14 : fontSize,
@@ -45,9 +46,9 @@ TextStyle newLabelStyle(
 }
 
 TextStyle newLabelStyleMM(
-    {Color color,
-    double fontSize,
-    FontWeight fontWeight,
+    {Color? color,
+    double? fontSize,
+    FontWeight? fontWeight,
     bool underline = false}) {
   return TextStyle(
       fontSize: fontSize == null ? 13 : fontSize,
@@ -59,8 +60,8 @@ TextStyle newLabelStyleMM(
 
 const TextStyle photoLabelStyle =
     TextStyle(color: Colors.black, fontSize: 13.0);
-const TextStyle photoLabelStyleMM = TextStyle(
-    color: Colors.black, fontSize: 13.0, fontFamily: "Myanmar3");
+const TextStyle photoLabelStyleMM =
+    TextStyle(color: Colors.black, fontSize: 13.0, fontFamily: "Myanmar3");
 const TextStyle textStyle =
     TextStyle(fontSize: 14, color: Colors.black87, fontWeight: FontWeight.w500);
 const TextStyle textStyleOdd = TextStyle(

lib/localization/app_translations.dart

@@ -6,14 +6,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' show rootBundle;
 
 class AppTranslations {
-  Locale locale;
-  static Map<dynamic, dynamic> _localisedValues;
+  late Locale locale;
+  static late Map<dynamic, dynamic> _localisedValues;
 
   AppTranslations(Locale locale) {
     this.locale = locale;
   }
 
-  static AppTranslations of(BuildContext context) {
+  static AppTranslations? of(BuildContext context) {
     return Localizations.of<AppTranslations>(context, AppTranslations);
   }
 
@@ -27,7 +27,7 @@ class AppTranslations {
 
   get currentLanguage => locale.languageCode;
 
-  String text(String key, {List<String> translationVariables}) {
+  String text(String key, {List<String>? translationVariables}) {
     String value = _localisedValues[key];
     if (value == null) {
       return "$key not found";

lib/localization/app_translations_delegate.dart

@@ -15,7 +15,7 @@ class AppTranslationsDelegate extends LocalizationsDelegate<AppTranslations> {
 
   @override
   Future<AppTranslations> load(Locale locale) {
-    return AppTranslations.load(newLocale ?? locale);
+    return AppTranslations.load(newLocale);
   }
 
   @override

lib/localization/transalation.dart

@@ -23,5 +23,5 @@ class Translation {
       supportedLanguagesCodes.map<Locale>((language) => Locale(language, ""));
 
   //function to be invoked when changing the language
-  LocaleChangeCallback? onLocaleChanged;
+  late LocaleChangeCallback onLocaleChanged;
 }

lib/pages/buying_instruction/buying_online.dart

@@ -1,6 +1,5 @@
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/main/model/main_model.dart';
-import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
 import 'package:fcs/pages/widgets/fcs_id_icon.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
@@ -15,7 +14,7 @@ class BuyingOnlinePage extends StatefulWidget {
 
 class _BuyingOnlinePagetate extends State<BuyingOnlinePage>
     with SingleTickerProviderStateMixin {
-  TabController _tabController;
+  late TabController _tabController;
 
   @override
   void initState() {
@@ -28,22 +27,22 @@ class _BuyingOnlinePagetate extends State<BuyingOnlinePage>
     MainModel mainModel = Provider.of<MainModel>(context);
 
     final phoneNumberBox = DisplayText(
-      text: mainModel.user.phone,
+      text: mainModel.user?.phone,
       labelTextKey: "contact.phone",
       iconData: Icons.location_on,
     );
     final nameBox = Center(
         child: Text(
-      mainModel.user.name,
+      mainModel.user?.name ?? "",
       style: TextStyle(fontSize: 18, color: primaryColor),
     ));
     final fcsIdBox = DisplayText(
-      text: mainModel.user.fcsID,
+      text: mainModel.user?.fcsID,
       labelTextKey: "customer.fcs.id",
       icon: FcsIDIcon(),
     );
     final shippingAddressBox = DisplayText(
-      text: mainModel.setting.usaAddress,
+      text: mainModel.setting?.usaAddress,
       labelTextKey: "profile.usa.shipping.address",
       iconData: Icons.location_on,
     );

lib/pages/carton/cargo_table.dart

@@ -6,10 +6,10 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class CargoTable extends StatefulWidget {
-  final List<CargoType> cargoTypes;
+  final List<CargoType>? cargoTypes;
 
   const CargoTable({
-    Key key,
+    Key? key,
     this.cargoTypes,
   }) : super(key: key);
 
@@ -58,13 +58,13 @@ class _CargoTableState extends State<CargoTable> {
       return [];
     }
     double total = 0;
-    var rows = widget.cargoTypes.map((c) {
+    var rows = widget.cargoTypes!.map((c) {
       total += c.weight;
       return MyDataRow(
         onSelectChanged: (bool selected) async {},
         cells: [
           MyDataCell(new Text(
-            c.name == null ? "" : c.name,
+            c.name ?? "",
             style: textStyle,
           )),
           MyDataCell(c.qty == null || c.qty == 0

lib/pages/carton/cargo_type_addtion.dart

@@ -35,7 +35,7 @@ class _CargoTypeAdditionState extends State<CargoTypeAddition> {
       p.isChecked = false;
       p.isCutomDuty = false;
       p.weight = 0;
-      p.qty = null;
+      p.qty = 0;
     });
     specialCargos.forEach((p) {
       p.isChecked = false;
@@ -69,12 +69,12 @@ class _CargoTypeAdditionState extends State<CargoTypeAddition> {
                   Checkbox(
                       value: c.isChecked,
                       activeColor: primaryColor,
-                      onChanged: (bool check) {
+                      onChanged: (bool? check) {
                         setState(() {
-                          c.isChecked = check;
+                          c.isChecked = check ?? false;
                         });
                       }),
-                  new Text(c.name, style: textStyle),
+                  new Text(c.name ?? '', style: textStyle),
                 ],
               ),
             ),

lib/pages/carton/cargo_type_editor.dart

@@ -12,7 +12,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 
 class CargoTypeEditor extends StatefulWidget {
-  final CargoType cargo;
+  final CargoType? cargo;
   CargoTypeEditor({this.cargo});
 
   @override
@@ -23,14 +23,14 @@ class _CargoTypeEditorState extends State<CargoTypeEditor> {
   TextEditingController _weightController = new TextEditingController();
 
   bool _isLoading = false;
-  CargoType _cargo;
+  CargoType? _cargo;
 
   @override
   void initState() {
     super.initState();
     if (widget.cargo != null) {
       _cargo = widget.cargo;
-      _weightController.text = _cargo.weight.toStringAsFixed(2);
+      _weightController.text = _cargo!.weight.toStringAsFixed(2);
     } else {
       _loadDefalut();
     }
@@ -67,7 +67,7 @@ class _CargoTypeEditorState extends State<CargoTypeEditor> {
       },
       labelKey: "cargo.type",
       iconData: Icons.text_format,
-      selectedValue: _cargo,
+      selectedValue: _cargo!,
       values: cargos,
     );
 
@@ -75,7 +75,7 @@ class _CargoTypeEditorState extends State<CargoTypeEditor> {
       context,
       getLocalString(context, 'box.cargo.save.btn'),
       callack: () {
-        _cargo.weight = double.tryParse(_weightController.text) ?? 0;
+        _cargo!.weight = double.tryParse(_weightController.text) ?? 0;
         Navigator.pop(context, _cargo);
       },
     );

lib/pages/carton/carton_cargo_table.dart

@@ -11,13 +11,13 @@ typedef OnRemove(CargoType cargoType);
 typedef OnUpdate(CargoType cargoType);
 
 class CargoTable extends StatefulWidget {
-  final List<CargoType> cargoTypes;
-  final bool isNew;
-  final OnRemove onRemove;
-  final OnUpdate onUpdate;
+  final List<CargoType>? cargoTypes;
+  final bool? isNew;
+  final OnRemove? onRemove;
+  final OnUpdate? onUpdate;
 
   const CargoTable(
-      {Key key, this.cargoTypes, this.isNew, this.onRemove, this.onUpdate})
+      {Key? key, this.cargoTypes, this.isNew, this.onRemove, this.onUpdate})
       : super(key: key);
 
   @override
@@ -26,14 +26,14 @@ class CargoTable extends StatefulWidget {
 
 class _CargoTableState extends State<CargoTable> {
   double totalWeight = 0;
-  List<CargoType> cargoTypes;
+  List<CargoType>? cargoTypes;
 
   @override
   void initState() {
     cargoTypes = widget.cargoTypes;
-    if (!widget.isNew) {
+    if (!widget.isNew!) {
       totalWeight =
-          cargoTypes.fold(0, (previous, current) => previous + current.weight);
+          cargoTypes!.fold(0, (previous, current) => previous + current.weight);
     }
 
     super.initState();
@@ -41,8 +41,8 @@ class _CargoTableState extends State<CargoTable> {
 
   @override
   Widget build(BuildContext context) {
-    print("Cargotypes:${cargoTypes.length}");
-    
+    print("Cargotypes:${cargoTypes!.length}");
+
     return SingleChildScrollView(
       scrollDirection: Axis.horizontal,
       child: MyDataTable(
@@ -80,18 +80,18 @@ class _CargoTableState extends State<CargoTable> {
     if (cargoTypes == null) {
       return [];
     }
-    var rows = cargoTypes.map((c) {
+    var rows = cargoTypes!.map((c) {
       return MyDataRow(
         onSelectChanged: (bool selected) async {},
         cells: [
           MyDataCell(
             new Text(
-              c.name == null ? "" : c.name,
+              c.name ?? '',
               style: textStyle,
             ),
           ),
           MyDataCell(
-            c.isCutomDuty
+            c.isCutomDuty!
                 ? GestureDetector(
                     onTap: () async {
                       String _t = await showDialog(
@@ -103,7 +103,7 @@ class _CargoTableState extends State<CargoTable> {
                       setState(() {
                         c.qty = int.tryParse(_t) ?? 0;
                       });
-                      if (widget.onUpdate != null) widget.onUpdate(c);
+                      if (widget.onUpdate != null) widget.onUpdate!(c);
                     },
                     child: Center(
                       child: Container(
@@ -153,7 +153,7 @@ class _CargoTableState extends State<CargoTable> {
                     if (c.weight != 0) {
                       _cal();
                     }
-                    if (widget.onUpdate != null) widget.onUpdate(c);
+                    if (widget.onUpdate != null) widget.onUpdate!(c);
                   },
                   child: Container(
                     padding: const EdgeInsets.all(7.0),
@@ -176,7 +176,7 @@ class _CargoTableState extends State<CargoTable> {
                           color: primaryColor,
                         ),
                         onPressed: () {
-                          if (widget.onRemove != null) widget.onRemove(c);
+                          if (widget.onRemove != null) widget.onRemove!(c);
                         })
               ],
             ),
@@ -237,26 +237,25 @@ class _CargoTableState extends State<CargoTable> {
   }
 
   _cal() {
-    var cargoType = autoCalWeight(cargoTypes, totalWeight);
+    var cargoType = autoCalWeight(cargoTypes!, totalWeight);
     if (cargoType == null) return;
 
     setState(() {
-      cargoTypes.remove(cargoType);
-      cargoTypes.add(cargoType);
+      cargoTypes!.remove(cargoType);
+      cargoTypes!.add(cargoType);
     });
 
     if (widget.onUpdate != null) {
-      widget.onUpdate(cargoType);
+      widget.onUpdate!(cargoType);
     }
   }
 }
 
-CargoType autoCalWeight(List<CargoType> cargoTypes, double total) {
-  if ((cargoTypes?.length ?? 0) == 0 || total == 0) return null;
+CargoType? autoCalWeight(List<CargoType> cargoTypes, double total) {
   List<CargoType> noWeight = cargoTypes.where((c) => c.weight == 0).toList();
   if (noWeight.length != 1) return null;
 
-  var _existing =
+  double _existing =
       cargoTypes.fold(0, (previous, current) => previous + current.weight);
 
   noWeight[0].weight = total - _existing;

lib/pages/carton/carton_cargo_table_old.dart

@@ -1,23 +1,21 @@
 import 'package:fcs/domain/entities/cargo_type.dart';
 import 'package:fcs/helpers/theme.dart';
-import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/my_data_table.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
-import 'cargo_type_editor.dart';
 import 'total_weight_edit.dart';
 
 typedef OnAdd(CargoType cargoType);
 typedef OnRemove(CargoType cargoType);
 
 class CargoTable extends StatefulWidget {
-  final List<CargoType> cargoTypes;
-  final OnAdd onAdd;
-  final OnRemove onRemove;
+  final List<CargoType>? cargoTypes;
+  final OnAdd? onAdd;
+  final OnRemove? onRemove;
 
-  const CargoTable({Key key, this.cargoTypes, this.onAdd, this.onRemove})
+  const CargoTable({Key? key, this.cargoTypes, this.onAdd, this.onRemove})
       : super(key: key);
 
   @override
@@ -67,7 +65,7 @@ class _CargoTableState extends State<CargoTable> {
     List<String> _types = [];
     double _total = 0;
 
-    var rows = widget.cargoTypes.map((c) {
+    var rows = widget.cargoTypes!.map((c) {
       _total += c.weight;
       return MyDataRow(
         onSelectChanged: (bool selected) async {},
@@ -75,7 +73,7 @@ class _CargoTableState extends State<CargoTable> {
           MyDataCell(Row(
             children: [
               new Text(
-                c.name == null ? "" : c.name,
+                c.name ?? "",
                 style: textStyle,
               ),
               new Text(
@@ -99,7 +97,7 @@ class _CargoTableState extends State<CargoTable> {
                           color: primaryColor,
                         ),
                         onPressed: () {
-                          if (widget.onRemove != null) widget.onRemove(c);
+                          if (widget.onRemove != null) widget.onRemove!(c);
                         })
               ],
             ),
@@ -127,7 +125,7 @@ class _CargoTableState extends State<CargoTable> {
                 alignment: Alignment.centerRight,
                 child: InkWell(
                   onTap: () async {
-                    double _t = await Navigator.of(context).push<double>(
+                    double? _t = await Navigator.of(context).push<double>(
                         CupertinoPageRoute(
                             builder: (context) =>
                                 TotalWeightEdit(totalWeight: totalWeight)));
@@ -135,21 +133,21 @@ class _CargoTableState extends State<CargoTable> {
                     setState(() {
                       totalWeight = _t;
                       this.remainingWeight = this.totalWeight - _total;
-                      widget.cargoTypes.forEach((c) {
+                      widget.cargoTypes!.forEach((c) {
                         if (c.qty == null) {
                           this._cargos.add(c);
                         }
                       });
                       this._cargos.forEach((c) {
-                        _list.add(c.name);
+                        _list.add(c.name!);
                       });
-                      widget.cargoTypes.forEach((c) {
-                        _types.add(c.name);
+                      widget.cargoTypes!.forEach((c) {
+                        _types.add(c.name!);
                       });
-                      if (this._cargos.length == widget.cargoTypes.length - 1) {
+                      if (this._cargos.length == widget.cargoTypes!.length - 1) {
                         _types.forEach((t) {
                           if (!_list.contains(t)) {
-                            widget.cargoTypes.forEach((c) {
+                            widget.cargoTypes!.forEach((c) {
                               if (c.name == t) {
                                 c.weight = this.remainingWeight;
                               }

lib/pages/carton/carton_editor.dart

@@ -29,7 +29,7 @@ import 'package:fcs/pages/widgets/local_title.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
+import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 import 'package:provider/provider.dart';
 import 'cargo_type_addtion.dart';
 import 'carton_cargo_table.dart';
@@ -40,7 +40,7 @@ import 'package_carton_editor.dart';
 import 'widgets.dart';
 
 class CartonEditor extends StatefulWidget {
-  final Carton box;
+  final Carton? box;
   CartonEditor({this.box});
 
   @override
@@ -51,32 +51,32 @@ class _CartonEditorState extends State<CartonEditor> {
   TextEditingController _widthController = new TextEditingController();
   TextEditingController _heightController = new TextEditingController();
   TextEditingController _lengthController = new TextEditingController();
-  DeliveryAddress _deliveryAddress = new DeliveryAddress();
+  DeliveryAddress? _deliveryAddress = new DeliveryAddress();
   List<CargoType> _cargoTypes = [];
 
-  Carton _carton;
+  Carton? _carton;
   bool _isLoading = false;
-  bool _isNew;
-  User _user;
-  String _selectedCartonType;
+  bool _isNew = false;
+  User? _user;
+  String? _selectedCartonType;
 
   double volumetricRatio = 0;
   double shipmentWeight = 0;
-  FcsShipment _fcsShipment;
-  List<FcsShipment> _fcsShipments;
+  FcsShipment? _fcsShipment;
+  List<FcsShipment>? _fcsShipments;
   List<Carton> _cartons = [];
-  CartonSize selectedCatonSize;
+  CartonSize? selectedCatonSize;
 
   //for mix carton
   List<Carton> _mixCartons = [];
-  String _selectedMixBoxType;
+  String? _selectedMixBoxType;
 
   //for carton from cargos
-  User consignee;
-  User sender;
+  User? consignee;
+  User? sender;
   List<Carton> _cartonsFromCartons = [];
 
-  double totalWeight;
+  double? totalWeight;
 
   @override
   void initState() {
@@ -92,28 +92,28 @@ class _CartonEditorState extends State<CartonEditor> {
 
     if (widget.box != null) {
       _carton = widget.box;
-      _deliveryAddress = _carton.deliveryAddress;
-      _widthController.text = _carton.width.toString();
-      _heightController.text = _carton.height.toString();
-      _lengthController.text = _carton.length.toString();
-      _selectedCartonType = _carton.cartonType;
+      _deliveryAddress = _carton!.deliveryAddress;
+      _widthController.text = _carton!.width.toString();
+      _heightController.text = _carton!.height.toString();
+      _lengthController.text = _carton!.length.toString();
+      _selectedCartonType = _carton!.cartonType;
 
-      _cargoTypes = _carton.cargoTypes.map((e) => e.clone()).toList();
+      _cargoTypes = _carton!.cargoTypes.map((e) => e.clone()).toList();
 
       _isNew = false;
       _user = User(
-          id: _carton.userID, fcsID: _carton.fcsID, name: _carton.userName);
+          id: _carton!.userID, fcsID: _carton!.fcsID, name: _carton!.userName);
       consignee = User(
-          id: _carton.userID, fcsID: _carton.fcsID, name: _carton.userName);
+          id: _carton!.userID, fcsID: _carton!.fcsID, name: _carton!.userName);
       sender = User(
-          id: _carton.senderID,
-          fcsID: _carton.senderFCSID,
-          name: _carton.senderName);
-      _selectedMixBoxType = _carton.mixBoxType ?? "";
+          id: _carton!.senderID,
+          fcsID: _carton!.senderFCSID,
+          name: _carton!.senderName);
+      _selectedMixBoxType = _carton!.mixBoxType;
       this._mixCartons =
-          _carton.mixCartons == null ? [] : List.from(_carton.mixCartons);
-      bool isMixBox = _carton.cartonType == carton_mix_box;
-      bool isFromPackages = _carton.cartonType == carton_from_packages;
+          _carton!.mixCartons == null ? [] : List.from(_carton!.mixCartons);
+      bool isMixBox = _carton!.cartonType == carton_mix_box;
+      bool isFromPackages = _carton!.cartonType == carton_from_packages;
       if (isFromPackages) _loadPackages();
 
       if (!isMixBox) {
@@ -138,8 +138,8 @@ class _CartonEditorState extends State<CartonEditor> {
     FcsShipmentModel fcsShipmentModel =
         Provider.of<FcsShipmentModel>(context, listen: false);
     var fcsShipments = await fcsShipmentModel.getActiveFcsShipments();
-    var fcsShipment = fcsShipments
-        .firstWhere((e) => e.id == _carton.fcsShipmentID, orElse: () => null);
+    var fcsShipment =
+        fcsShipments.firstWhere((e) => e.id == _carton!.fcsShipmentID);
     setState(() {
       _fcsShipments = fcsShipments;
       _fcsShipment = fcsShipment;
@@ -151,9 +151,9 @@ class _CartonEditorState extends State<CartonEditor> {
     PackageModel packageModel =
         Provider.of<PackageModel>(context, listen: false);
     List<Package> packages = await packageModel.getPackages(
-        _user.id, [package_processed_status, package_packed_status]);
+        _user!.id!, [package_processed_status, package_packed_status]);
     if (_isNew) {
-      String prevCompare;
+      String? prevCompare;
       packages.forEach((p) {
         String compare = (p.deliveryAddress?.fullName ?? "") +
             (p.deliveryAddress?.phoneNumber ?? "");
@@ -169,8 +169,8 @@ class _CartonEditorState extends State<CartonEditor> {
       });
     } else {
       packages.forEach((p) {
-        if (_carton.packages.contains(p)) {
-          p.isChecked = _carton.packages.firstWhere((cp) => cp == p).isChecked;
+        if (_carton!.packages.contains(p)) {
+          p.isChecked = _carton!.packages.firstWhere((cp) => cp == p).isChecked;
         } else {
           p.isChecked = false;
         }
@@ -178,7 +178,7 @@ class _CartonEditorState extends State<CartonEditor> {
     }
 
     setState(() {
-      _carton.packages = packages;
+      _carton!.packages = packages;
     });
     // _populateDeliveryAddress();
   }
@@ -195,9 +195,9 @@ class _CartonEditorState extends State<CartonEditor> {
   // }
 
   _calShipmentWeight() {
-    double l = double.parse(_lengthController.text, (s) => 0);
-    double w = double.parse(_widthController.text, (s) => 0);
-    double h = double.parse(_heightController.text, (s) => 0);
+    double l = double.parse(_lengthController.text);
+    double w = double.parse(_widthController.text);
+    double h = double.parse(_heightController.text);
     setState(() {
       shipmentWeight = l * w * h / volumetricRatio;
     });
@@ -206,9 +206,9 @@ class _CartonEditorState extends State<CartonEditor> {
   _getCartonSize() {
     var cartonSizeModel = Provider.of<CartonSizeModel>(context, listen: false);
     cartonSizeModel.cartonSizes.forEach((c) {
-      if (c.length == _carton.length &&
-          c.width == _carton.width &&
-          c.height == _carton.height) {
+      if (c.length == _carton!.length &&
+          c.width == _carton!.width &&
+          c.height == _carton!.height) {
         selectedCatonSize = CartonSize(
             id: c.id,
             name: c.name,
@@ -232,7 +232,7 @@ class _CartonEditorState extends State<CartonEditor> {
     bool isMixBox = _selectedCartonType == carton_mix_box;
 
     final shipmentBox = DisplayText(
-      text: _carton.fcsShipmentNumber,
+      text: _carton!.fcsShipmentNumber,
       labelTextKey: "box.fcs_shipment_num",
       iconData: Ionicons.ios_airplane,
     );
@@ -248,8 +248,8 @@ class _CartonEditorState extends State<CartonEditor> {
           labelKey: "shipment.pack.fcs.shipment",
           iconData: Ionicons.ios_airplane,
           display: (u) => u.shipmentNumber,
-          selectedValue: _fcsShipment,
-          values: _fcsShipments,
+          selectedValue: _fcsShipment!,
+          values: _fcsShipments!,
         ));
 
     final fcsIDBox = Container(
@@ -297,7 +297,7 @@ class _CartonEditorState extends State<CartonEditor> {
         readOnly: !_isNew,
         values: boxModel.cartonTypes,
         selectedValue: _selectedCartonType,
-        callback: (v) {
+        callback: (String? v) {
           setState(() {
             _selectedCartonType = v;
           });
@@ -337,7 +337,7 @@ class _CartonEditorState extends State<CartonEditor> {
                     value: e,
                     groupValue: _selectedMixBoxType,
                     activeColor: primaryColor,
-                    onChanged: (v) {
+                    onChanged: (String? v) {
                       setState(() {
                         _selectedMixBoxType = v;
                       });
@@ -407,7 +407,7 @@ class _CartonEditorState extends State<CartonEditor> {
             color: primaryColor,
           ),
           onPressed: () async {
-            List<CargoType> cargos = await Navigator.push<List<CargoType>>(
+            List<CargoType>? cargos = await Navigator.push<List<CargoType>>(
                 context,
                 CupertinoPageRoute(builder: (context) => CargoTypeAddition()));
             if (cargos == null) return;
@@ -462,7 +462,7 @@ class _CartonEditorState extends State<CartonEditor> {
       children: <Widget>[
         Expanded(
             child: DisplayText(
-          text: consignee != null ? consignee.fcsID : "",
+          text: consignee != null ? consignee!.fcsID : "",
           labelTextKey: "processing.fcs.id",
           icon: FcsIDIcon(),
         )),
@@ -477,7 +477,7 @@ class _CartonEditorState extends State<CartonEditor> {
     );
 
     final consigneeNameBox = DisplayText(
-      text: consignee != null ? consignee.name : "",
+      text: consignee != null ? consignee!.name : "",
       labelTextKey: "processing.consignee.name",
       maxLines: 2,
       iconData: Icons.person,
@@ -496,7 +496,7 @@ class _CartonEditorState extends State<CartonEditor> {
       children: <Widget>[
         Expanded(
             child: DisplayText(
-          text: sender != null ? sender.fcsID : "",
+          text: sender != null ? sender!.fcsID : "",
           labelTextKey: "processing.fcs.id",
           icon: FcsIDIcon(),
         )),
@@ -511,7 +511,7 @@ class _CartonEditorState extends State<CartonEditor> {
     );
 
     final shipperNamebox = DisplayText(
-      text: sender != null ? sender.name : "",
+      text: sender != null ? sender!.name : "",
       labelTextKey: "processing.shipper.name",
       maxLines: 2,
       iconData: Icons.person,
@@ -551,7 +551,7 @@ class _CartonEditorState extends State<CartonEditor> {
             children: [
               _isNew
                   ? Container()
-                  : Center(child: getCartonNumberStatus(context, _carton)),
+                  : Center(child: getCartonNumberStatus(context, _carton!)),
               LocalTitle(textKey: "box.type.title"),
               cartonTypeBox,
               LocalTitle(textKey: "box.shipment_info"),
@@ -572,7 +572,7 @@ class _CartonEditorState extends State<CartonEditor> {
                       isFromPackages ? namebox : Container(),
                       isFromPackages
                           ? CartonPackageTable(
-                              packages: _carton.packages,
+                              packages: _carton!.packages,
                               onSelect: (p, checked) {
                                 // if (checked &&
                                 //     _deliveryAddress != null &&
@@ -623,7 +623,7 @@ class _CartonEditorState extends State<CartonEditor> {
                               deliveryAddress: _deliveryAddress,
                               labelKey: "box.delivery_address",
                               onTap: () async {
-                                DeliveryAddress d =
+                                DeliveryAddress? d =
                                     await Navigator.push<DeliveryAddress>(
                                   context,
                                   CupertinoPageRoute(
@@ -631,8 +631,8 @@ class _CartonEditorState extends State<CartonEditor> {
                                           DeliveryAddressSelection(
                                               deliveryAddress: _deliveryAddress,
                                               user: User(
-                                                  id: _carton.userID,
-                                                  name: _carton.userName))),
+                                                  id: _carton!.userID,
+                                                  name: _carton!.userName))),
                                 );
                                 if (d == null) return;
                                 setState(() {
@@ -667,7 +667,7 @@ class _CartonEditorState extends State<CartonEditor> {
           bool isFromCartons = _selectedCartonType == carton_from_cartons;
           if (isFromPackages) {
             _loadPackages();
-            c.value.packages = _carton.packages;
+            c.value.packages = _carton!.packages;
             Carton _c = await Navigator.push(
               context,
               CupertinoPageRoute(
@@ -736,20 +736,20 @@ class _CartonEditorState extends State<CartonEditor> {
                     height: 1,
                     color: Colors.grey,
                   ),
-                  onChanged: (CartonSize newValue) {
+                  onChanged: (CartonSize? newValue) {
                     setState(() {
-                      if (newValue.name == MANAGE_CARTONSIZE) {
+                      if (newValue!.name == MANAGE_CARTONSIZE) {
                         selectedCatonSize = null;
                         _manageCartonSize();
                         return;
                       }
                       selectedCatonSize = newValue;
                       _widthController.text =
-                          selectedCatonSize.width.toString();
+                          selectedCatonSize!.width.toString();
                       _heightController.text =
-                          selectedCatonSize.height.toString();
+                          selectedCatonSize!.height.toString();
                       _lengthController.text =
-                          selectedCatonSize.length.toString();
+                          selectedCatonSize!.length.toString();
                     });
                   },
                   isExpanded: true,
@@ -789,8 +789,7 @@ class _CartonEditorState extends State<CartonEditor> {
 
   _updateCargo(CargoType cargo) {
     setState(() {
-      var _c =
-          _cargoTypes.firstWhere((e) => e.id == cargo.id, orElse: () => null);
+      var _c = _cargoTypes.firstWhere((e) => e.id == cargo.id);
       if (_c != null) {
         _c.weight = cargo.weight;
         _c.qty = cargo.qty;
@@ -827,30 +826,30 @@ class _CartonEditorState extends State<CartonEditor> {
     double h = double.parse(_heightController.text, (s) => 0);
 
     Carton carton = Carton();
-    carton.id = _carton.id;
-    carton.cartonType = _selectedCartonType;
-    carton.fcsShipmentID = _isNew ? _fcsShipment.id : _carton.fcsShipmentID;
+    carton.id = _carton!.id;
+    carton.cartonType = _selectedCartonType!;
+    carton.fcsShipmentID = _isNew ? _fcsShipment!.id : _carton!.fcsShipmentID;
     if (isFromPackages) {
-      carton.userID = _user?.id;
-      carton.fcsID = _user?.fcsID;
-      carton.userName = _user?.name;
-      carton.packages = _carton.packages.where((e) => e.isChecked).toList();
+      carton.userID = _user?.id ?? '';
+      carton.fcsID = _user?.fcsID ?? '';
+      carton.userName = _user?.name ?? '';
+      carton.packages = _carton!.packages.where((e) => e.isChecked).toList();
     }
 
     if (isFromCartons) {
-      carton.userID = consignee?.id;
-      carton.fcsID = consignee?.fcsID;
-      carton.userName = consignee?.name;
-      carton.senderID = sender?.id;
-      carton.senderFCSID = sender?.fcsID;
-      carton.senderName = sender?.name;
+      carton.userID = consignee?.id ?? "";
+      carton.fcsID = consignee?.fcsID ?? "";
+      carton.userName = consignee?.name ?? "";
+      carton.senderID = sender?.id ?? "";
+      carton.senderFCSID = sender?.fcsID ?? "";
+      carton.senderName = sender?.name ?? "";
     }
 
-    carton.cargoTypes = _carton.cargoTypes;
+    carton.cargoTypes = _carton!.cargoTypes;
     carton.length = l;
     carton.width = w;
     carton.height = h;
-    carton.deliveryAddress = _carton.deliveryAddress;
+    carton.deliveryAddress = _carton!.deliveryAddress;
 
     try {
       Carton _c = await Navigator.push(
@@ -864,7 +863,7 @@ class _CartonEditorState extends State<CartonEditor> {
       );
       if (_c == null) return;
       var cartonModel = Provider.of<CartonModel>(context, listen: false);
-      Carton _carton = await cartonModel.getCarton(_c.id);
+      Carton _carton = await cartonModel.getCarton(_c.id ?? "");
       if (isFromPackages) {
         _cartons.add(_carton);
       }
@@ -898,15 +897,15 @@ class _CartonEditorState extends State<CartonEditor> {
       showMsgDialog(context, "Error", "Please select FCS shipment");
       return;
     }
-    if ((this._mixCartons?.length ?? 0) == 0) {
+    if (this._mixCartons.length == 0) {
       showMsgDialog(context, "Error", "Expect at least one carton");
       return;
     }
     Carton carton = Carton();
-    carton.id = _carton.id;
-    carton.cartonType = _selectedCartonType;
-    carton.fcsShipmentID = _isNew ? _fcsShipment.id : _carton.fcsShipmentID;
-    carton.mixBoxType = _selectedMixBoxType;
+    carton.id = _carton!.id;
+    carton.cartonType = _selectedCartonType!;
+    carton.fcsShipmentID = _isNew ? _fcsShipment!.id : _carton!.fcsShipmentID;
+    carton.mixBoxType = _selectedMixBoxType!;
     carton.mixCartons = this._mixCartons;
     setState(() {
       _isLoading = true;
@@ -932,7 +931,7 @@ class _CartonEditorState extends State<CartonEditor> {
   _save() async {
     bool isFromPackages = _selectedCartonType == carton_from_packages;
     bool isFromCartons = _selectedCartonType == carton_from_cartons;
-    if ((_cargoTypes?.length ?? 0) == 0 && (isFromPackages || isFromCartons)) {
+    if (_cargoTypes.length == 0 && (isFromPackages || isFromCartons)) {
       showMsgDialog(context, "Error", "Expect at least one cargo type");
       return;
     }
@@ -940,9 +939,9 @@ class _CartonEditorState extends State<CartonEditor> {
       showMsgDialog(context, "Error", "Invalid cargo weight");
       return;
     }
-    double l = double.parse(_lengthController.text, (s) => 0);
-    double w = double.parse(_widthController.text, (s) => 0);
-    double h = double.parse(_heightController.text, (s) => 0);
+    double l = double.parse(_lengthController.text);
+    double w = double.parse(_widthController.text);
+    double h = double.parse(_heightController.text);
     if ((l <= 0 || w <= 0 || h <= 0) && (isFromPackages || isFromCartons)) {
       showMsgDialog(context, "Error", "Invalid dimension");
       return;
@@ -953,16 +952,16 @@ class _CartonEditorState extends State<CartonEditor> {
     }
 
     Carton carton = Carton();
-    carton.id = _carton.id;
-    carton.cartonType = _selectedCartonType;
-    carton.fcsShipmentID = _isNew ? _fcsShipment.id : _carton.fcsShipmentID;
+    carton.id = _carton!.id;
+    carton.cartonType = _selectedCartonType!;
+    carton.fcsShipmentID = _isNew ? _fcsShipment!.id : _carton!.fcsShipmentID;
     if (isFromPackages) {
-      carton.userID = _user?.id;
-      carton.packages = _carton.packages.where((e) => e.isChecked).toList();
+      carton.userID = _user?.id ?? "";
+      carton.packages = _carton!.packages.where((e) => e.isChecked).toList();
     }
     if (isFromCartons) {
-      carton.userID = consignee?.id;
-      carton.senderID = sender?.id;
+      carton.userID = consignee?.id ?? "";
+      carton.senderID = sender?.id ?? "";
     }
 
     carton.cargoTypes = _cargoTypes;

lib/pages/carton/carton_info.dart

@@ -1,7 +1,5 @@
 import 'package:fcs/domain/constants.dart';
-import 'package:fcs/domain/entities/cargo_type.dart';
 import 'package:fcs/domain/entities/carton.dart';
-import 'package:fcs/domain/entities/carton_size.dart';
 import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/domain/vo/delivery_address.dart';
 import 'package:fcs/helpers/theme.dart';
@@ -19,7 +17,7 @@ import 'package:fcs/pages/widgets/local_title.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
+import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
@@ -33,7 +31,7 @@ import 'widgets.dart';
 final DateFormat dateFormat = DateFormat("d MMM yyyy");
 
 class CartonInfo extends StatefulWidget {
-  final Carton box;
+  final Carton? box;
   CartonInfo({this.box});
 
   @override
@@ -42,22 +40,22 @@ class CartonInfo extends StatefulWidget {
 
 class _CartonInfoState extends State<CartonInfo> {
   bool _isLoading = false;
-  Carton _box;
-  DeliveryAddress _deliveryAddress = new DeliveryAddress();
+  Carton? _box;
+  DeliveryAddress? _deliveryAddress = new DeliveryAddress();
   TextEditingController _widthController = new TextEditingController();
   TextEditingController _heightController = new TextEditingController();
   TextEditingController _lengthController = new TextEditingController();
   TextEditingController _cartonSizeController = new TextEditingController();
   double volumetricRatio = 0;
   double shipmentWeight = 0;
-  String selectMixBoxType;
+  String? selectMixBoxType;
 
-  bool isMixBox;
-  bool isFromShipments;
-  bool isFromPackages;
-  bool isSmallBag;
-  bool isFromCartons;
-  bool isEdiable;
+  bool isMixBox = false;
+  bool isFromShipments = false;
+  bool isFromPackages = false;
+  bool isSmallBag = false;
+  bool isFromCartons = false;
+  bool isEdiable = false;
 
   @override
   void initState() {
@@ -77,31 +75,31 @@ class _CartonInfoState extends State<CartonInfo> {
   }
 
   _updateBoxData() {
-    _widthController.text = _box.width.toString();
-    _heightController.text = _box.height.toString();
-    _lengthController.text = _box.length.toString();
-    _cartonSizeController.text = _box.cartonSizeName ?? "";
-    _deliveryAddress = _box.deliveryAddress;
-    isMixBox = _box.cartonType == carton_mix_box;
-    isFromShipments = _box.cartonType == carton_from_shipments;
-    isFromPackages = _box.cartonType == carton_from_packages;
-    isSmallBag = _box.cartonType == carton_small_bag;
-    isFromCartons = _box.cartonType == carton_from_cartons;
+    _widthController.text = _box!.width.toString();
+    _heightController.text = _box!.height.toString();
+    _lengthController.text = _box!.length.toString();
+    _cartonSizeController.text = _box!.cartonSizeName ?? "";
+    _deliveryAddress = _box!.deliveryAddress;
+    isMixBox = _box!.cartonType == carton_mix_box;
+    isFromShipments = _box!.cartonType == carton_from_shipments;
+    isFromPackages = _box!.cartonType == carton_from_packages;
+    isSmallBag = _box!.cartonType == carton_small_bag;
+    isFromCartons = _box!.cartonType == carton_from_cartons;
 
     isEdiable = (isFromPackages || isMixBox || isFromCartons) &&
-        _box.status == carton_packed_status;
-    selectMixBoxType = _box.mixBoxType ?? "";
+        _box!.status == carton_packed_status;
+    selectMixBoxType = _box!.mixBoxType;
     getCartonSize();
   }
 
   getCartonSize() {
     var cartonSizeModel = Provider.of<CartonSizeModel>(context, listen: false);
     cartonSizeModel.cartonSizes.forEach((c) {
-      if (c.length == _box.length &&
-          c.width == _box.width &&
-          c.height == _box.height) {
+      if (c.length == _box!.length &&
+          c.width == _box!.width &&
+          c.height == _box!.height) {
         setState(() {
-          _cartonSizeController.text = c.name;
+          _cartonSizeController.text = c.name ?? "";
         });
       }
     });
@@ -110,43 +108,45 @@ class _CartonInfoState extends State<CartonInfo> {
   _loadPackages() async {
     if (!isFromPackages && !isSmallBag) return;
 
-    if (_box.cartonType == carton_from_packages && _box.userID == null) return;
+    if (_box!.cartonType == carton_from_packages && _box!.userID == null)
+      return;
     PackageModel packageModel =
         Provider.of<PackageModel>(context, listen: false);
-    List<Package> packages = await packageModel.getPackages(_box.userID, [
+    List<Package> packages =
+        await packageModel.getPackages(_box!.userID ?? "", [
       package_processed_status,
       package_packed_status,
       package_shipped_status,
       package_delivered_status
     ]);
-    packages = packages.where((p) => _box.packageIDs.contains(p.id)).toList();
+    packages = packages.where((p) => _box!.packageIDs.contains(p.id)).toList();
     packages.forEach((p) {
       p.isChecked = true;
     });
 
     setState(() {
-      _box.packages = packages;
+      _box!.packages = packages;
     });
   }
 
   _loadMixCartons() async {
-    if (_box.cartonType != carton_mix_box) return;
+    if (_box!.cartonType != carton_mix_box) return;
     CartonModel cartonModel = Provider.of<CartonModel>(context, listen: false);
     List<Carton> catons = [];
-    for (var id in _box.mixCartonIDs) {
+    for (var id in _box!.mixCartonIDs) {
       Carton c = await cartonModel.getCarton(id);
       catons.add(c);
     }
 
     setState(() {
-      _box.mixCartons = catons;
+      _box!.mixCartons = catons;
     });
   }
 
   _calShipmentWeight() {
-    double l = double.parse(_lengthController.text, (s) => 0);
-    double w = double.parse(_widthController.text, (s) => 0);
-    double h = double.parse(_heightController.text, (s) => 0);
+    double l = double.parse(_lengthController.text);
+    double w = double.parse(_widthController.text);
+    double h = double.parse(_heightController.text);
     setState(() {
       shipmentWeight = l * w * h / volumetricRatio;
     });
@@ -166,33 +166,34 @@ class _CartonInfoState extends State<CartonInfo> {
     final cartonTypeBox = LocalRadioButtons(
         readOnly: true,
         values: cartonModel.cartonTypesInfo,
-        selectedValue:
-            _box.isShipmentCarton ? carton_from_shipments : _box.cartonType);
+        selectedValue: (_box!.isShipmentCarton ?? false)
+            ? carton_from_shipments
+            : _box!.cartonType);
     final shipmentBox = DisplayText(
-      text: _box.fcsShipmentNumber,
+      text: _box!.fcsShipmentNumber,
       labelTextKey: "box.fcs_shipment_num",
       iconData: Ionicons.ios_airplane,
     );
     final fcsIDBox = DisplayText(
-      text: _box.fcsID == null ? "" : _box.fcsID,
+      text: _box!.fcsID == null ? "" : _box!.fcsID,
       labelTextKey: "box.fcs.id",
       icon: FcsIDIcon(),
     );
 
     final customerNameBox = DisplayText(
-      text: _box.userName == null ? "" : _box.userName,
+      text: _box!.userName == null ? "" : _box!.userName,
       labelTextKey: "box.name",
       iconData: Icons.person,
     );
 
     final consigneefcsIDBox = DisplayText(
-      text: _box.fcsID != null ? _box.fcsID : "",
+      text: _box!.fcsID != null ? _box!.fcsID : "",
       labelTextKey: "processing.fcs.id",
       icon: FcsIDIcon(),
     );
 
     final consigneeNameBox = DisplayText(
-      text: _box.userName != null ? _box.userName : "",
+      text: _box!.userName != null ? _box!.userName : "",
       labelTextKey: "processing.consignee.name",
       maxLines: 2,
       iconData: Icons.person,
@@ -211,7 +212,7 @@ class _CartonInfoState extends State<CartonInfo> {
       children: <Widget>[
         Expanded(
             child: DisplayText(
-          text: _box.senderFCSID != null ? _box.senderFCSID : "",
+          text: _box!.senderFCSID,
           labelTextKey: "processing.fcs.id",
           icon: FcsIDIcon(),
         )),
@@ -219,7 +220,7 @@ class _CartonInfoState extends State<CartonInfo> {
     );
 
     final shipperNamebox = DisplayText(
-      text: _box.senderName != null ? _box.senderName : "",
+      text: _box!.senderName,
       labelTextKey: "processing.shipper.name",
       maxLines: 2,
       iconData: Icons.person,
@@ -269,10 +270,10 @@ class _CartonInfoState extends State<CartonInfo> {
       iconData: AntDesign.CodeSandbox,
     );
     final cargoTableBox = CargoTable(
-      cargoTypes: _box.cargoTypes,
+      cargoTypes: _box!.cargoTypes,
     );
     final mixCartonNumberBox = DisplayText(
-      text: _box.mixCartonNumber,
+      text: _box!.mixCartonNumber,
       labelTextKey: "box.mix.carton",
       iconData: MaterialCommunityIcons.package,
     );
@@ -300,7 +301,7 @@ class _CartonInfoState extends State<CartonInfo> {
                   color: primaryColor,
                 ),
               ),
-              Text(selectMixBoxType)
+              Text(selectMixBoxType ?? "")
             ],
           )
         ],
@@ -340,7 +341,7 @@ class _CartonInfoState extends State<CartonInfo> {
         body: Padding(
           padding: const EdgeInsets.all(10.0),
           child: ListView(shrinkWrap: true, children: <Widget>[
-            Center(child: getCartonNumberStatus(context, _box)),
+            Center(child: getCartonNumberStatus(context, _box!)),
             LocalTitle(textKey: "box.type.title"),
             cartonTypeBox,
             LocalTitle(textKey: "box.shipment_info"),
@@ -367,11 +368,11 @@ class _CartonInfoState extends State<CartonInfo> {
             isMixBox ? mixTypeBox : Container(),
             isMixBox ? LocalTitle(textKey: "box.mix_caton_title") : Container(),
             isMixBox
-                ? Column(children: _getCartons(context, _box.mixCartons))
+                ? Column(children: _getCartons(context, _box!.mixCartons))
                 : Container(),
             isFromPackages || isSmallBag
                 ? CartonPackageTable(
-                    packages: _box.packages,
+                    packages: _box!.packages,
                   )
                 : Container(),
             isMixBox ? Container() : LocalTitle(textKey: "box.cargo.type"),
@@ -408,14 +409,14 @@ class _CartonInfoState extends State<CartonInfo> {
   }
 
   _gotoEditor() async {
-    _box.mixCartons = _box.mixCartons;
-    bool updated = await Navigator.push<bool>(
+    _box!.mixCartons = _box!.mixCartons;
+    bool? updated = await Navigator.push<bool>(
       context,
       CupertinoPageRoute(builder: (context) => CartonEditor(box: _box)),
     );
     if (updated ?? false) {
       var cartonModel = Provider.of<CartonModel>(context, listen: false);
-      var c = await cartonModel.getCarton(widget.box.id);
+      var c = await cartonModel.getCarton(widget.box!.id ?? "");
       setState(() {
         _box = c;
         _loadPackages();
@@ -437,7 +438,7 @@ class _CartonInfoState extends State<CartonInfo> {
     });
     try {
       var cartonModel = Provider.of<CartonModel>(context, listen: false);
-      await cartonModel.deleteCarton(widget.box);
+      await cartonModel.deleteCarton(widget.box!);
       Navigator.pop(context, true);
     } catch (e) {
       showMsgDialog(context, "Error", e.toString());

lib/pages/carton/carton_list_row.dart

@@ -3,13 +3,13 @@ import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/main/util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
+import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 import 'package:intl/intl.dart';
 import 'carton_info.dart';
 
 class CartonListRow extends StatelessWidget {
   final Carton box;
-  CartonListRow({Key key, this.box}) : super(key: key);
+  CartonListRow({Key? key, required this.box}) : super(key: key);
 
   final double dotSize = 15.0;
   final DateFormat dateFormat = new DateFormat("dd MMM yyyy");
@@ -71,14 +71,14 @@ class CartonListRow extends StatelessWidget {
               children: <Widget>[
                 Padding(
                   padding: const EdgeInsets.all(0),
-                  child: getStatus(box.status == null ? "" : box.status),
+                  child: getStatus(box.status ?? ""),
                 ),
                 Padding(
                   padding: const EdgeInsets.only(left: 8.0, top: 5, bottom: 5),
                   child: Row(
                     children: <Widget>[
                       new Text(
-                        "${box.cartonWeight?.toStringAsFixed(2) ?? ''} lb",
+                        "${box.cartonWeight?.toStringAsFixed(2)} lb",
                         style:
                             new TextStyle(fontSize: 15.0, color: Colors.grey),
                       ),

lib/pages/carton/carton_mix_table.dart

@@ -8,10 +8,10 @@ import 'package:flutter/material.dart';
 typedef OnSelect = Function(Carton carton, bool checked);
 
 class CartonMixTable extends StatelessWidget {
-  final List<Carton> cartons;
-  final OnSelect onSelect;
+  final List<Carton>? cartons;
+  final OnSelect? onSelect;
 
-  const CartonMixTable({Key key, this.cartons, this.onSelect})
+  const CartonMixTable({Key? key, this.cartons, this.onSelect})
       : super(key: key);
 
   @override
@@ -32,21 +32,21 @@ class CartonMixTable extends StatelessWidget {
     );
 
     final rows = cartons == null
-        ? []
-        : cartons.asMap().entries.map((p) {
+        ? [Container()]
+        : cartons!.asMap().entries.map((p) {
             return Container(
-              color: p.value.isChecked
+              color: (p.value.isChecked ?? false)
                   ? Colors.grey.withOpacity(0.2)
-                  : Colors.grey[50].withOpacity(0.2),
+                  : Colors.grey.shade50.withOpacity(0.2),
               child: Container(
                 padding: EdgeInsets.only(
                     left: 0.0, right: 10.0, top: 3.0, bottom: 3.0),
                 decoration: BoxDecoration(
                   border: Border(
                     bottom: BorderSide(
-                        color: p.key == cartons.length - 1
+                        color: p.key == cartons!.length - 1
                             ? Colors.white
-                            : Colors.grey[350],
+                            : Colors.grey.shade300,
                         width: 1),
                   ),
                 ),
@@ -55,8 +55,8 @@ class CartonMixTable extends StatelessWidget {
                     Checkbox(
                         value: p.value.isChecked,
                         activeColor: primaryColor,
-                        onChanged: (bool check) {
-                          if (onSelect != null) onSelect(p.value, check);
+                        onChanged: (bool? check) {
+                          if (onSelect != null) onSelect!(p.value, check!);
                         }),
                     Expanded(
                         child: new Text(
@@ -64,7 +64,7 @@ class CartonMixTable extends StatelessWidget {
                       style: textStyle,
                     )),
                     new Text(
-                      p.value?.actualWeight?.toString() ?? "",
+                      p.value.actualWeight.toString(),
                       style: textStyle,
                     ),
                   ],

lib/pages/carton/carton_package_table.dart

@@ -8,10 +8,10 @@ import 'package:flutter/material.dart';
 typedef OnSelect = Function(Package package, bool checked);
 
 class CartonPackageTable extends StatelessWidget {
-  final List<Package> packages;
-  final OnSelect onSelect;
+  final List<Package>? packages;
+  final OnSelect? onSelect;
 
-  const CartonPackageTable({Key key, this.packages, this.onSelect})
+  const CartonPackageTable({Key? key, this.packages, this.onSelect})
       : super(key: key);
 
   @override
@@ -34,20 +34,20 @@ class CartonPackageTable extends StatelessWidget {
 
     final rows = packages == null
         ? [Container()]
-        : packages.asMap().entries.map((p) {
+        : packages!.asMap().entries.map((p) {
             return Container(
               color: p.value.isChecked
                   ? Colors.grey.withOpacity(0.2)
-                  : Colors.grey[50].withOpacity(0.2),
+                  : Colors.grey.shade50.withOpacity(0.2),
               child: Container(
                 padding: EdgeInsets.only(
                     left: 0.0, right: 10.0, top: 3.0, bottom: 3.0),
                 decoration: BoxDecoration(
                   border: Border(
                     bottom: BorderSide(
-                        color: p.key == packages.length - 1
+                        color: p.key == packages!.length - 1
                             ? Colors.white
-                            : Colors.grey[350],
+                            : Colors.grey.shade300,
                         width: 1),
                   ),
                 ),
@@ -62,15 +62,15 @@ class CartonPackageTable extends StatelessWidget {
                         : Checkbox(
                             value: p.value.isChecked,
                             activeColor: primaryColor,
-                            onChanged: (bool check) {
-                              if (onSelect != null) onSelect(p.value, check);
+                            onChanged: (bool? check) {
+                              if (onSelect != null) onSelect!(p.value, check!);
                             }),
                     Expanded(
                         child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Text(
-                          p.value.trackingID,
+                          p.value.trackingID ?? "",
                           style: textStyle,
                         ),
                         Text(
@@ -88,11 +88,11 @@ class CartonPackageTable extends StatelessWidget {
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           new Text(
-                            p.value?.desc ?? "",
+                            p.value.desc ?? "",
                             style: textStyle,
                           ),
                           new Text(
-                            "(${p.value?.market ?? ""})",
+                            "(${p.value.market})",
                             style: textStyle,
                           )
                         ],

lib/pages/carton/carton_row.dart

@@ -2,15 +2,15 @@ import 'package:fcs/domain/entities/carton.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
+import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 import 'package:intl/intl.dart';
 
 typedef OnRemove(Carton carton);
 
 class CartonRow extends StatelessWidget {
   final Carton box;
-  final OnRemove onRemove;
-  CartonRow({Key key, this.box, this.onRemove}) : super(key: key);
+  final OnRemove? onRemove;
+  CartonRow({Key? key, required this.box, this.onRemove}) : super(key: key);
 
   final double dotSize = 15.0;
   final DateFormat dateFormat = new DateFormat("dd MMM yyyy");
@@ -20,7 +20,7 @@ class CartonRow extends StatelessWidget {
     return Container(
       decoration: BoxDecoration(
         border: Border(
-          bottom: BorderSide(color: Colors.grey[300]),
+          bottom: BorderSide(color: Colors.grey.shade300),
         ),
       ),
       child: Row(
@@ -75,7 +75,7 @@ class CartonRow extends StatelessWidget {
                         color: primaryColor,
                       ),
                       onPressed: () {
-                        if (onRemove != null) onRemove(box);
+                        if (onRemove != null) onRemove!(box);
                       }),
               box.actualWeight == 0
                   ? Container()
@@ -84,7 +84,7 @@ class CartonRow extends StatelessWidget {
                       child: Row(
                         children: <Widget>[
                           new Text(
-                            "${box.actualWeight?.toStringAsFixed(2) ?? ''} lb",
+                            "${box.actualWeight.toStringAsFixed(2)} lb",
                             style: new TextStyle(
                                 fontSize: 15.0, color: Colors.grey),
                           ),

lib/pages/carton/input_text_border.dart

@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
 typedef OnAdd(String value);
 
 class InputTextBorder extends StatelessWidget {
-  final OnAdd onAdd;
-  final TextEditingController controller;
+  final OnAdd? onAdd;
+  final TextEditingController? controller;
 
-  const InputTextBorder({Key key, this.onAdd, this.controller})
+  const InputTextBorder({Key? key, this.onAdd, this.controller})
       : super(key: key);
   @override
   Widget build(BuildContext context) {
@@ -14,7 +14,7 @@ class InputTextBorder extends StatelessWidget {
       textAlign: TextAlign.center,
       controller: controller,
       onChanged: (v) {
-        if (onAdd != null) onAdd(v);
+        if (onAdd != null) onAdd!(v);
       },
       keyboardType: TextInputType.number,
       decoration: new InputDecoration(

lib/pages/carton/model/carton_model.dart

@@ -3,9 +3,7 @@ import 'dart:async';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:fcs/data/services/services.dart';
 import 'package:fcs/domain/constants.dart';
-import 'package:fcs/domain/entities/cargo_type.dart';
 import 'package:fcs/domain/entities/carton.dart';
-import 'package:fcs/domain/vo/message.dart';
 import 'package:fcs/domain/vo/shipment_status.dart';
 import 'package:fcs/helpers/paginator.dart';
 import 'package:fcs/pages/main/model/base_model.dart';
@@ -14,19 +12,20 @@ import 'package:logging/logging.dart';
 
 class CartonModel extends BaseModel {
   List<Carton> _boxes = [];
-  PaginatorListener cartonsByFilter;
+  late PaginatorListener<Carton> cartonsByFilter;
 
   final log = Logger('CartonModel');
-  List<Carton> get boxes =>
-      _selectedIndex == 1 ? _boxes : List<Carton>.from(_delivered.values);
+  List<Carton> get boxes => _selectedIndex == 1
+      ? _boxes
+      : List<Carton>.from(_delivered?.values ?? []);
 
-  Paginator _delivered;
+  Paginator? _delivered;
   int _selectedIndex = 1;
   int _selectedIndexFilter = 1;
   bool isLoading = false;
 
-  StreamSubscription<QuerySnapshot> listener;
-  StreamSubscription<QuerySnapshot> cartonListener;
+  StreamSubscription<QuerySnapshot>? listener;
+  StreamSubscription<QuerySnapshot>? cartonListener;
   static List<ShipmentStatus> statusHistory = [
     ShipmentStatus(status: "Packed", date: DateTime(2020, 6, 1), done: true),
     ShipmentStatus(status: "Shipped", date: DateTime(2020, 6, 5), done: false),
@@ -87,22 +86,22 @@ class CartonModel extends BaseModel {
     notifyListeners();
   }
 
-  get selectedIndex => _selectedIndex;
-  get selectedIndexFilter => _selectedIndexFilter;
+  int get selectedIndex => _selectedIndex;
+  int get selectedIndexFilter => _selectedIndexFilter;
 
   initData() async {
     _selectedIndex = 1;
     _selectedIndexFilter = 1;
     _loadBoxes();
 
-    if (_delivered != null) _delivered.close();
+    if (_delivered != null) _delivered!.close();
     _delivered = _getDelivered();
-    _delivered.load();
+    _delivered!.load();
   }
 
   @override
   void privilegeChanged() {
-    if (user != null || !user.hasCarton()) {
+    if (user != null || !user!.hasCarton()) {
       _initData();
     }
   }
@@ -120,12 +119,12 @@ class CartonModel extends BaseModel {
   }
 
   Future<void> _loadBoxes() async {
-    if (user == null || !user.hasCarton()) return;
+    if (user == null || !user!.hasCarton()) return;
     String path = "/$cartons_collection/";
-    if (listener != null) listener.cancel();
+    if (listener != null) listener!.cancel();
     _boxes = [];
     try {
-      listener = Firestore.instance
+      listener = FirebaseFirestore.instance
           .collection("$path")
           .where("status",
               whereIn: [carton_packed_status, carton_shipped_status])
@@ -134,9 +133,10 @@ class CartonModel extends BaseModel {
           .snapshots()
           .listen((QuerySnapshot snapshot) {
             _boxes.clear();
-            _boxes = snapshot.documents.map((documentSnapshot) {
+            _boxes = snapshot.docs.map((documentSnapshot) {
               var s = Carton.fromMap(
-                  documentSnapshot.data, documentSnapshot.documentID);
+                  documentSnapshot.data() as Map<String, dynamic>,
+                  documentSnapshot.id);
               return s;
             }).toList();
             notifyListeners();
@@ -147,18 +147,18 @@ class CartonModel extends BaseModel {
   }
 
   Future<void> _loadCartonsByFilter(String orderName) async {
-    if (user == null || !user.hasCarton()) return null;
+    if (user == null || !user!.hasCarton()) return null;
     String path = "/$cartons_collection";
 
     try {
-      Query listenerQuery = Firestore.instance
+      Query listenerQuery = FirebaseFirestore.instance
           .collection("$path")
           .where("carton_type", whereIn: [
         carton_from_packages,
         carton_from_cartons
       ]).where("status", isEqualTo: carton_packed_status);
 
-      Query pageQuery = Firestore.instance
+      Query pageQuery = FirebaseFirestore.instance
           .collection("$path")
           .where("carton_type",
               whereIn: [carton_from_packages, carton_from_cartons])
@@ -172,10 +172,10 @@ class CartonModel extends BaseModel {
     }
   }
 
-  Paginator _getDelivered() {
-    if (user == null || !user.hasCarton()) return null;
+  Paginator? _getDelivered() {
+    if (user == null || !user!.hasCarton()) return null;
 
-    var pageQuery = Firestore.instance
+    var pageQuery = FirebaseFirestore.instance
         .collection("/$cartons_collection")
         .where("is_delivered", isEqualTo: true)
         .where("is_deleted", isEqualTo: false);
@@ -186,10 +186,10 @@ class CartonModel extends BaseModel {
   }
 
   Future<void> loadMore() async {
-    if (_delivered.ended || selectedIndex == 1) return;
+    if (_delivered == null && _delivered!.ended || selectedIndex == 1) return;
     isLoading = true;
     notifyListeners();
-    await _delivered.load(onFinished: () {
+    await _delivered!.load(onFinished: () {
       isLoading = false;
       notifyListeners();
     });
@@ -197,7 +197,7 @@ class CartonModel extends BaseModel {
 
   Future<void> refresh() async {
     if (selectedIndex == 1) return;
-    await _delivered.refresh(onFinished: () {
+    await _delivered?.refresh(onFinished: () {
       notifyListeners();
     });
   }
@@ -208,69 +208,62 @@ class CartonModel extends BaseModel {
 
   @override
   logout() async {
-    if (listener != null) await listener.cancel();
-    if (cartonListener != null) await cartonListener.cancel();
-    if (_delivered != null) _delivered.close();
+    if (listener != null) await listener!.cancel();
+    if (cartonListener != null) await cartonListener!.cancel();
+    if (_delivered != null) _delivered!.close();
     if (cartonsByFilter != null) cartonsByFilter.close();
     _boxes = [];
   }
 
   Future<List<Carton>> getCartons(String shipmentID) async {
     String path = "/$cartons_collection";
-    var querySnap = await Firestore.instance
+    var querySnap = await FirebaseFirestore.instance
         .collection(path)
         .where("shipment_id", isEqualTo: shipmentID)
-        .getDocuments();
-    return querySnap.documents
-        .map((e) => Carton.fromMap(e.data, e.documentID))
-        .toList();
+        .get();
+    return querySnap.docs.map((e) => Carton.fromMap(e.data(), e.id)).toList();
   }
 
   Future<List<Carton>> getCartonsByFcsShipment(String fcsShipmentID) async {
     String path = "/$cartons_collection";
-    var querySnap = await Firestore.instance
+    var querySnap = await FirebaseFirestore.instance
         .collection(path)
         .where("fcs_shipment_id", isEqualTo: fcsShipmentID)
         .where("is_deleted", isEqualTo: false)
-        .getDocuments();
-    return querySnap.documents
-        .map((e) => Carton.fromMap(e.data, e.documentID))
-        .toList();
+        .get();
+    return querySnap.docs.map((e) => Carton.fromMap(e.data(), e.id)).toList();
   }
 
   Future<List<Carton>> getCartonsForInvoice(
       String fcsShipmentID, String userID) async {
     String path = "/$cartons_collection";
-    var querySnap = await Firestore.instance
+    var querySnap = await FirebaseFirestore.instance
         .collection(path)
         .where("fcs_shipment_id", isEqualTo: fcsShipmentID)
         .where("user_id", isEqualTo: userID)
         .where("is_deleted", isEqualTo: false)
         .where("is_invoiced", isEqualTo: false)
-        .getDocuments();
-    List<Carton> cartons = querySnap.documents
-        .map((e) => Carton.fromMap(e.data, e.documentID))
-        .toList();
+        .get();
+    List<Carton> cartons =
+        querySnap.docs.map((e) => Carton.fromMap(e.data(), e.id)).toList();
     return cartons;
   }
 
   Future<List<Carton>> getMixCartonsByFcsShipment(String fcsShipmentID) async {
     String path = "/$cartons_collection";
-    var querySnap = await Firestore.instance
+    var querySnap = await FirebaseFirestore.instance
         .collection(path)
         .where("fcs_shipment_id", isEqualTo: fcsShipmentID)
         .where("carton_type", isEqualTo: carton_mix_box)
         .where("is_deleted", isEqualTo: false)
-        .getDocuments();
-    return querySnap.documents
-        .map((e) => Carton.fromMap(e.data, e.documentID))
-        .toList();
+        .get();
+    return querySnap.docs.map((e) => Carton.fromMap(e.data(), e.id)).toList();
   }
 
   Future<Carton> getCarton(String id) async {
     String path = "/$cartons_collection";
-    var snap = await Firestore.instance.collection(path).document(id).get();
-    return Carton.fromMap(snap.data, snap.documentID);
+    var snap = await FirebaseFirestore.instance.collection(path).doc(id).get();
+    return Carton.fromMap(snap.data() as Map<String, dynamic>, snap.id);
   }
 
   Future<Carton> createCarton(Carton carton) {

lib/pages/carton/package_carton_editor.dart

@@ -8,12 +8,9 @@ import 'package:fcs/domain/vo/delivery_address.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/carton_size/carton_size_list.dart';
 import 'package:fcs/pages/carton_size/model/carton_size_model.dart';
-import 'package:fcs/pages/delivery_address/model/delivery_address_model.dart';
 import 'package:fcs/pages/main/util.dart';
-import 'package:fcs/pages/rates/model/shipment_rate_model.dart';
 import 'package:fcs/pages/widgets/defalut_delivery_address.dart';
 import 'package:fcs/pages/widgets/delivery_address_selection.dart';
-import 'package:fcs/pages/widgets/display_text.dart';
 import 'package:fcs/pages/widgets/length_picker.dart';
 import 'package:fcs/pages/widgets/local_button.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
@@ -21,7 +18,7 @@ import 'package:fcs/pages/widgets/local_title.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
+import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 import 'package:provider/provider.dart';
 
 import 'cargo_type_addtion.dart';
@@ -29,9 +26,9 @@ import 'carton_cargo_table.dart';
 import 'model/carton_model.dart';
 
 class PackageCartonEditor extends StatefulWidget {
-  final Carton carton;
-  final bool isNew;
-  final User consignee;
+  final Carton? carton;
+  final bool? isNew;
+  final User? consignee;
   PackageCartonEditor({this.carton, this.isNew, this.consignee});
 
   @override
@@ -43,13 +40,13 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
   TextEditingController _widthCtl = new TextEditingController();
   TextEditingController _heightCtl = new TextEditingController();
 
-  Carton _carton;
+  Carton? _carton;
   bool _isLoading = false;
-  DeliveryAddress _deliveryAddress = new DeliveryAddress();
+  DeliveryAddress? _deliveryAddress = new DeliveryAddress();
   List<CargoType> _cargoTypes = [];
-  CartonSize selectedCatonSize;
-  bool isFromPackages;
-  bool isFromCartons;
+  CartonSize? selectedCatonSize;
+  bool isFromPackages = false;
+  bool isFromCartons = false;
 
   @override
   void initState() {
@@ -59,19 +56,19 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
 
   _load() {
     _carton = widget.carton;
-    isFromPackages = _carton.cartonType == carton_from_packages;
-    isFromCartons = _carton.cartonType == carton_from_cartons;
+    isFromPackages = _carton!.cartonType == carton_from_packages;
+    isFromCartons = _carton!.cartonType == carton_from_cartons;
 
-    if (widget.isNew) {
+    if (widget.isNew!) {
       _lengthCtl.text = "0";
       _widthCtl.text = "0";
       _heightCtl.text = "0";
     } else {
-      _cargoTypes = widget.carton.cargoTypes.map((e) => e.clone()).toList();
-      _lengthCtl.text = _carton.length.toString();
-      _widthCtl.text = _carton.width.toString();
-      _heightCtl.text = _carton.height.toString();
-      _deliveryAddress = _carton.deliveryAddress;
+      _cargoTypes = widget.carton!.cargoTypes.map((e) => e.clone()).toList();
+      _lengthCtl.text = _carton!.length.toString();
+      _widthCtl.text = _carton!.width.toString();
+      _heightCtl.text = _carton!.height.toString();
+      _deliveryAddress = _carton!.deliveryAddress;
       _getCartonSize();
     }
   }
@@ -79,9 +76,9 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
   _getCartonSize() {
     var cartonSizeModel = Provider.of<CartonSizeModel>(context, listen: false);
     cartonSizeModel.cartonSizes.forEach((c) {
-      if (c.length == _carton.length &&
-          c.width == _carton.width &&
-          c.height == _carton.height) {
+      if (c.length == _carton!.length &&
+          c.width == _carton!.width &&
+          c.height == _carton!.height) {
         selectedCatonSize = CartonSize(
             id: c.id,
             name: c.name,
@@ -122,7 +119,7 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
       ],
     );
     final createBtn = LocalButton(
-      textKey: widget.isNew ? "box.new_carton_btn" : "box.cargo.save.btn",
+      textKey: widget.isNew! ? "box.new_carton_btn" : "box.cargo.save.btn",
       callBack: _creatCarton,
     );
 
@@ -134,11 +131,10 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
             color: primaryColor,
           ),
           onPressed: () async {
-            List<CargoType> cargos = await Navigator.push<List<CargoType>>(
+            List<CargoType>? cargos = await Navigator.push<List<CargoType>>(
                 context,
                 CupertinoPageRoute(builder: (context) => CargoTypeAddition()));
             if (cargos == null) return;
-            if (cargos == null) return;
             setState(() {
               _cargoTypes.addAll(
                   cargos.where((e) => !_cargoTypes.contains(e)).toList());
@@ -168,7 +164,7 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
           backgroundColor: Colors.white,
           title: LocalText(
             context,
-            widget.isNew ? "boxes.create.title" : "box.edit.title",
+            widget.isNew! ? "boxes.create.title" : "box.edit.title",
             fontSize: 20,
             color: primaryColor,
           ),
@@ -187,13 +183,14 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
                   deliveryAddress: _deliveryAddress,
                   labelKey: "box.delivery_address",
                   onTap: () async {
-                    DeliveryAddress d = await Navigator.push<DeliveryAddress>(
+                    DeliveryAddress? d = await Navigator.push<DeliveryAddress>(
                       context,
                       CupertinoPageRoute(
                           builder: (context) => DeliveryAddressSelection(
                                 deliveryAddress: _deliveryAddress,
                                 user: User(
-                                    id: _carton.userID, name: _carton.userName),
+                                    id: _carton!.userID,
+                                    name: _carton!.userName),
                               )),
                     );
                     if (d == null) return;
@@ -245,17 +242,17 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
                     height: 1,
                     color: Colors.grey,
                   ),
-                  onChanged: (CartonSize newValue) {
+                  onChanged: (CartonSize? newValue) {
                     setState(() {
-                      if (newValue.name == MANAGE_CARTONSIZE) {
+                      if (newValue!.name == MANAGE_CARTONSIZE) {
                         selectedCatonSize = null;
                         _manageCartonSize();
                         return;
                       }
                       selectedCatonSize = newValue;
-                      _widthCtl.text = selectedCatonSize.width.toString();
-                      _heightCtl.text = selectedCatonSize.height.toString();
-                      _lengthCtl.text = selectedCatonSize.length.toString();
+                      _widthCtl.text = selectedCatonSize!.width.toString();
+                      _heightCtl.text = selectedCatonSize!.height.toString();
+                      _lengthCtl.text = selectedCatonSize!.length.toString();
                     });
                   },
                   isExpanded: true,
@@ -295,8 +292,7 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
 
   _updateCargo(CargoType cargo) {
     setState(() {
-      var _c =
-          _cargoTypes.firstWhere((e) => e.id == cargo.id, orElse: () => null);
+      var _c = _cargoTypes.firstWhere((e) => e.id == cargo.id);
       if (_c != null) {
         _c.weight = cargo.weight;
         _c.qty = cargo.qty;
@@ -305,13 +301,13 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
   }
 
   _creatCarton() async {
-    if ((_cargoTypes?.length ?? 0) == 0) {
+    if (_cargoTypes.length == 0) {
       showMsgDialog(context, "Error", "Expect at least one cargo type");
       return;
     }
-    double l = double.parse(_lengthCtl.text, (s) => 0);
-    double w = double.parse(_widthCtl.text, (s) => 0);
-    double h = double.parse(_heightCtl.text, (s) => 0);
+    double l = double.parse(_lengthCtl.text);
+    double w = double.parse(_widthCtl.text);
+    double h = double.parse(_heightCtl.text);
     if ((l <= 0 || w <= 0 || h <= 0)) {
       showMsgDialog(context, "Error", "Invalid dimension");
       return;
@@ -322,22 +318,22 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
     }
 
     Carton carton = Carton();
-    carton.id = _carton.id;
-    carton.cartonType = _carton.cartonType;
-    carton.fcsShipmentID = _carton.fcsShipmentID;
+    carton.id = _carton!.id;
+    carton.cartonType = _carton!.cartonType;
+    carton.fcsShipmentID = _carton!.fcsShipmentID;
     carton.cargoTypes = _cargoTypes;
     if (isFromPackages) {
-      carton.userID = _carton.userID;
-      carton.packages = _carton.packages.where((e) => e.isChecked).toList();
+      carton.userID = _carton!.userID;
+      carton.packages = _carton!.packages.where((e) => e.isChecked).toList();
     }
 
     if (isFromCartons) {
-      carton.userID = _carton.userID;
-      carton.fcsID = _carton.fcsID;
-      carton.userName = _carton.userName;
-      carton.senderID = _carton.senderID;
-      carton.senderFCSID = _carton.senderFCSID;
-      carton.senderName = _carton.senderName;
+      carton.userID = _carton!.userID;
+      carton.fcsID = _carton!.fcsID;
+      carton.userName = _carton!.userName;
+      carton.senderID = _carton!.senderID;
+      carton.senderFCSID = _carton!.senderFCSID;
+      carton.senderName = _carton!.senderName;
     }
 
     carton.length = l;
@@ -350,12 +346,12 @@ class _PackageCartonEditorState extends State<PackageCartonEditor> {
     try {
       CartonModel cartonModel =
           Provider.of<CartonModel>(context, listen: false);
-      if (widget.isNew) {
+      if (widget.isNew!) {
         Carton _c = await cartonModel.createCarton(carton);
         Navigator.pop(context, _c);
       } else {
         await cartonModel.updateCarton(carton);
-        Carton _c = await cartonModel.getCarton(_carton.id);
+        Carton _c = await cartonModel.getCarton(_carton!.id!);
         Navigator.pop(context, _c);
       }
     } catch (e) {

lib/pages/carton/total_weight_edit.dart

@@ -10,9 +10,9 @@ import 'package:fcs/pages/main/util.dart';
 typedef void ProfileCallback();
 
 class TotalWeightEdit extends StatefulWidget {
-  final double totalWeight;
+  final double? totalWeight;
 
-  const TotalWeightEdit({Key key, this.totalWeight}) : super(key: key);
+  const TotalWeightEdit({Key? key, this.totalWeight}) : super(key: key);
   @override
   _TotalWeightEditState createState() => _TotalWeightEditState();
 }
@@ -24,7 +24,7 @@ class _TotalWeightEditState extends State<TotalWeightEdit> {
   @override
   void initState() {
     super.initState();
-    totalController.text = widget.totalWeight.toStringAsFixed(2);
+    totalController.text = widget.totalWeight!.toStringAsFixed(2);
   }
 
   @override

lib/pages/carton/widgets.dart

@@ -10,14 +10,14 @@ Widget getCartonNumberStatus(BuildContext context, Carton carton) {
       LocalText(
         context,
         '',
-        text: carton.cartonNumber ?? "",
+        text: carton.cartonNumber ,
         color: primaryColor,
         fontSize: 18,
         fontWeight: FontWeight.bold,
       ),
       Padding(
         padding: const EdgeInsets.only(left: 8.0),
-        child: Chip(label: Text(carton.status ?? "")),
+        child: Chip(label: Text(carton.status??"")),
       ),
     ],
   );

lib/pages/carton_search/carton_list_row.dart

@@ -1,45 +1,32 @@
 import 'package:fcs/domain/entities/carton.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
+import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 
 import 'carton_search.dart';
 
-class CartonListRow extends StatefulWidget {
-  final CallbackCartonSelect callbackCartonSelect;
+class CartonListRow extends StatelessWidget {
+  final CallbackCartonSelect? callbackCartonSelect;
   final Carton carton;
 
   // const CartonListRow({this.carton, this.callbackCartonSelect});
-  CartonListRow(
-      {Key key, this.carton, this.callbackCartonSelect})
+  CartonListRow({Key? key, required this.carton, this.callbackCartonSelect})
       : super(key: key);
 
-  @override
-  _CartonListRowState createState() => _CartonListRowState();
-}
-
-class _CartonListRowState extends State<CartonListRow> {
   final double dotSize = 15.0;
-  Carton _carton;
-  @override
-  void initState() {
-    super.initState();
-    this._carton = widget.carton;
-  }
 
   @override
   Widget build(BuildContext context) {
     return Container(
       decoration: BoxDecoration(
         border: Border(
-          bottom: BorderSide(color: Colors.grey[300]),
+          bottom: BorderSide(color: Colors.grey.shade300),
         ),
       ),
       child: InkWell(
         onTap: () {
           Navigator.pop(context);
-          if (widget.callbackCartonSelect != null)
-            widget.callbackCartonSelect(widget.carton);
+          if (callbackCartonSelect != null) callbackCartonSelect!(carton);
         },
         child: Row(
           children: <Widget>[
@@ -64,7 +51,7 @@ class _CartonListRowState extends State<CartonListRow> {
                           Padding(
                             padding: const EdgeInsets.only(left: 8.0),
                             child: new Text(
-                              _carton.cartonNumber ?? "",
+                              carton.cartonNumber ?? "",
                               style: new TextStyle(
                                   fontSize: 15.0, color: Colors.black),
                             ),
@@ -72,7 +59,7 @@ class _CartonListRowState extends State<CartonListRow> {
                           Padding(
                             padding: const EdgeInsets.only(left: 10.0, top: 10),
                             child: new Text(
-                              _carton.userName ?? "",
+                              carton.userName ?? "",
                               style: new TextStyle(
                                   fontSize: 15.0, color: Colors.grey),
                             ),
@@ -86,7 +73,7 @@ class _CartonListRowState extends State<CartonListRow> {
                       child: Row(
                         children: <Widget>[
                           new Text(
-                            "${_carton.cartonWeight?.toStringAsFixed(2) ?? ''} lb",
+                            "${carton.cartonWeight?.toStringAsFixed(2)} lb",
                             style: new TextStyle(
                                 fontSize: 15.0, color: Colors.grey),
                           ),

lib/pages/carton_search/carton_search.dart

@@ -10,7 +10,7 @@ import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/popupmenu.dart';
 import 'package:fcs/pagination/paginator_listview.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
+import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
 
@@ -18,15 +18,15 @@ import 'carton_list_row.dart';
 
 typedef CallbackCartonSelect(Carton carton);
 
-Future<Carton> searchCarton(BuildContext context,
-        {CallbackCartonSelect callbackCartonSelect}) async =>
+Future<Carton?> searchCarton(BuildContext context,
+        {CallbackCartonSelect? callbackCartonSelect}) async =>
     await showSearch<Carton>(
       context: context,
       delegate: PartSearchDelegate(callbackCartonSelect: callbackCartonSelect),
     );
 
 class PartSearchDelegate extends SearchDelegate<Carton> {
-  final CallbackCartonSelect callbackCartonSelect;
+  final CallbackCartonSelect? callbackCartonSelect;
   PartSearchDelegate({this.callbackCartonSelect});
 
   @override
@@ -38,10 +38,10 @@ class PartSearchDelegate extends SearchDelegate<Carton> {
     return theme.copyWith(
       inputDecorationTheme: InputDecorationTheme(
           hintStyle: TextStyle(
-              color: theme.primaryTextTheme.caption.color, fontSize: 14)),
+              color: theme.primaryTextTheme.caption!.color, fontSize: 14)),
       textTheme: theme.textTheme.copyWith(
-          title: theme.textTheme.title.copyWith(
-              color: theme.primaryTextTheme.title.color, fontSize: 16)),
+          title: theme.textTheme.title!.copyWith(
+              color: theme.primaryTextTheme.title!.color, fontSize: 16)),
       primaryColor: primaryColor,
     );
   }
@@ -85,7 +85,7 @@ class PartSearchDelegate extends SearchDelegate<Carton> {
   Widget buildLeading(BuildContext context) {
     return IconButton(
       icon: Icon(Icons.arrow_back),
-      onPressed: () => close(context, null),
+      onPressed: () => close(context, new Carton()),
     );
   }
 
@@ -96,7 +96,7 @@ class PartSearchDelegate extends SearchDelegate<Carton> {
         future: cartonModel.searchCarton(query),
         builder: (context, AsyncSnapshot<List<Carton>> snapshot) {
           if (snapshot.hasData) {
-            if (snapshot.data.length == 0) {
+            if (snapshot.data!.length == 0) {
               return Container(
                 child: Center(
                   child: Text(
@@ -109,7 +109,7 @@ class PartSearchDelegate extends SearchDelegate<Carton> {
             return Container(
               padding: EdgeInsets.only(top: 15),
               child: ListView(
-                children: snapshot.data
+                children: snapshot.data!
                     .map((u) => CartonListRow(
                           key: ValueKey(u.id),
                           carton: u,
@@ -158,20 +158,20 @@ class PartSearchDelegate extends SearchDelegate<Carton> {
   }
 
   _scan(BuildContext context) async {
-    PermissionStatus permission =
-        await PermissionHandler().checkPermissionStatus(PermissionGroup.camera);
-    if (permission != PermissionStatus.granted) {
-      Map<PermissionGroup, PermissionStatus> permissions =
-          await PermissionHandler()
-              .requestPermissions([PermissionGroup.camera]);
-      if (permissions[PermissionGroup.camera] != PermissionStatus.granted) {
-        showMsgDialog(context, "Error", "Camera permission is not granted");
-        return null;
-      }
-    }
+    // PermissionStatus permission =
+    //     await PermissionHandler().checkPermissionStatus(PermissionGroup.camera);
+    // if (permission != PermissionStatus.granted) {
+    //   Map<PermissionGroup, PermissionStatus> permissions =
+    //       await PermissionHandler()
+    //           .requestPermissions([PermissionGroup.camera]);
+    //   if (permissions[PermissionGroup.camera] != PermissionStatus.granted) {
+    //     showMsgDialog(context, "Error", "Camera permission is not granted");
+    //     return null;
+    //   }
+    // }
 
     try {
-      String barcode = await scanBarcode();
+      String? barcode = await scanBarcode();
       if (barcode != null) {
         query = barcode;
         showResults(context);

lib/pages/carton_size/carton_size_editor.dart

@@ -7,13 +7,13 @@ import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
+import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 import 'package:provider/provider.dart';
 
 import 'model/carton_size_model.dart';
 
 class CartonSizeEditor extends StatefulWidget {
-  final CartonSize cartonSize;
+  final CartonSize? cartonSize;
   CartonSizeEditor({this.cartonSize});
 
   @override
@@ -27,8 +27,8 @@ class _CartonSizeEditorState extends State<CartonSizeEditor> {
   TextEditingController _lengthController = new TextEditingController();
 
   bool _isLoading = false;
-  CartonSize _cartonSize;
-  bool _isNew;
+  CartonSize? _cartonSize;
+  bool _isNew = false;
 
   @override
   void initState() {
@@ -36,10 +36,10 @@ class _CartonSizeEditorState extends State<CartonSizeEditor> {
     if (widget.cartonSize != null) {
       _cartonSize = widget.cartonSize;
       _isNew = false;
-      _nameController.text = _cartonSize.name;
-      _widthController.text = _cartonSize.width.toString();
-      _heightController.text = _cartonSize.height.toString();
-      _lengthController.text = _cartonSize.length.toString();
+      _nameController.text = _cartonSize!.name ?? "";
+      _widthController.text = _cartonSize!.width.toString();
+      _heightController.text = _cartonSize!.height.toString();
+      _lengthController.text = _cartonSize!.length.toString();
     } else {
       _lengthController.text = "12";
       _widthController.text = "12";
@@ -110,7 +110,7 @@ class _CartonSizeEditorState extends State<CartonSizeEditor> {
             await cartonSizeModel.addCartonSize(_cartonSize);
           } else {
             CartonSize _cartonSize = CartonSize(
-                id: widget.cartonSize.id,
+                id: widget.cartonSize!.id,
                 name: _nameController.text,
                 length: l,
                 width: w,
@@ -184,7 +184,7 @@ class _CartonSizeEditorState extends State<CartonSizeEditor> {
       CartonSize _cartonSize = CartonSize(
           name: _nameController.text, length: l, width: w, height: h);
 
-      return widget.cartonSize.isChangedForEdit(_cartonSize);
+      return widget.cartonSize!.isChangedForEdit(_cartonSize);
     }
   }
 }

lib/pages/carton_size/carton_size_list.dart

@@ -40,7 +40,7 @@ class _CartonSizeListState extends State<CartonSizeList> {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     new Text(
-                      p.name,
+                      p.name ?? "",
                       style: TextStyle(fontSize: 15.0),
                     ),
                     Padding(
@@ -135,7 +135,7 @@ class _CartonSizeListState extends State<CartonSizeList> {
     CartonSizeModel cartonSizeModel =
         Provider.of<CartonSizeModel>(context, listen: false);
     try {
-      await cartonSizeModel.deleteCartonSize(cartonSize.id);
+      await cartonSizeModel.deleteCartonSize(cartonSize.id!);
     } catch (e) {
       showMsgDialog(context, "Error", e.toString());
     } finally {

lib/pages/carton_size/model/carton_size_model.dart

@@ -13,7 +13,7 @@ class CartonSizeModel extends BaseModel {
   List<CartonSize> cartonSizes = [];
   final log = Logger('CartonSizeModel');
 
-  StreamSubscription<QuerySnapshot> listener;
+  StreamSubscription<QuerySnapshot>? listener;
 
   List<CartonSize> get getCartonSizes {
     var _cartonSizes = new List<CartonSize>.from(cartonSizes);
@@ -27,17 +27,18 @@ class CartonSizeModel extends BaseModel {
 
   Future<void> _loadCartonSizes() async {
     try {
-      if (listener != null) listener.cancel();
+      if (listener != null) listener!.cancel();
 
-      listener = Firestore.instance
+      listener = FirebaseFirestore.instance
           .collection(
               "/$config_collection/$setting_doc_id/$carton_sizes_collection")
           .snapshots()
           .listen((QuerySnapshot snapshot) {
         cartonSizes.clear();
-        cartonSizes = snapshot.documents.map((documentSnapshot) {
+        cartonSizes = snapshot.docs.map((documentSnapshot) {
           var c = CartonSize.fromMap(
-              documentSnapshot.data, documentSnapshot.documentID);
+              documentSnapshot.data() as Map<String, dynamic>,
+              documentSnapshot.id);
           return c;
         }).toList();
         notifyListeners();
@@ -49,7 +50,7 @@ class CartonSizeModel extends BaseModel {
 
   @override
   logout() async {
-    if (listener != null) await listener.cancel();
+    if (listener != null) await listener!.cancel();
     cartonSizes = [];
   }
 

lib/pages/chat/bubble.dart

@@ -2,7 +2,6 @@ import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/package/package_info.dart';
 import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/widgets/fcs_id_icon.dart';
-import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
@@ -14,18 +13,18 @@ typedef CallbackOnViewDetail();
 class Bubble extends StatelessWidget {
   Bubble(
       {this.message,
-      this.date,
-      this.delivered,
-      this.isMine,
+      required this.date,
+      required this.delivered,
+      required this.isMine,
       this.sender,
-      this.isSystem,
-      this.isCustomer,
-      this.showDate,
+      required this.isSystem,
+      required this.isCustomer,
+      required this.showDate,
       this.callbackOnViewDetail});
 
-  final CallbackOnViewDetail callbackOnViewDetail;
+  final CallbackOnViewDetail? callbackOnViewDetail;
   final DateTime date;
-  final String message, sender;
+  final String? message, sender;
   final bool delivered, isMine, isSystem, isCustomer, showDate;
 
   @override
@@ -84,7 +83,7 @@ class Bubble extends StatelessWidget {
                                     fontWeight: FontWeight.bold)))
                       ]
                     : [
-                        Text(isCustomer ? "FCS Team" : sender,
+                        Text(isCustomer ? "FCS Team" : sender ?? "",
                             style: TextStyle(
                               color: Colors.black38,
                               fontSize: 10.0,
@@ -102,8 +101,8 @@ class Bubble extends StatelessWidget {
       children: <Widget>[
         Padding(
             padding: EdgeInsets.only(right: 48.0),
-            child: Text(message,
-                style: hasUnicode(message)
+            child: Text(message ?? "",
+                style: hasUnicode(message ?? "")
                     ? newLabelStyleMM(color: primaryColor)
                     : newLabelStyle(color: primaryColor))),
         Positioned(
@@ -130,6 +129,6 @@ class Bubble extends StatelessWidget {
   }
 
   _viewDetail() {
-    if (callbackOnViewDetail != null) callbackOnViewDetail();
+    if (callbackOnViewDetail != null) callbackOnViewDetail!();
   }
 }

lib/pages/chat/message_detail.dart

@@ -21,14 +21,17 @@ import 'package:provider/provider.dart';
 import 'bubble.dart';
 
 class MessageDetail extends StatelessWidget {
-  final String receiverName;
-  final String receiverID;
+  final String? receiverName;
+  final String? receiverID;
   final MessageModel messageModel;
   final TextEditingController textEditingController = TextEditingController();
   final ScrollController listScrollController = ScrollController();
 
   MessageDetail(
-      {Key key, this.messageModel, this.receiverName, this.receiverID})
+      {Key? key,
+      required this.messageModel,
+      this.receiverName,
+      this.receiverID})
       : super(key: key) {
     listScrollController.addListener(() {
       if (listScrollController.offset >=
@@ -44,7 +47,7 @@ class MessageDetail extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    String userID = Provider.of<MessageModel>(context).user.id;
+    String userID = Provider.of<MessageModel>(context).user?.id ?? "";
 
     return Scaffold(
       appBar: AppBar(
@@ -96,8 +99,8 @@ class MessageDetail extends StatelessWidget {
   Widget buildBubble(Message msg, String userID, bool showDate,
       CallbackOnViewDetail callback) {
     return Bubble(
-      message: msg.message,
-      date: msg.date,
+      message: msg.message ?? "",
+      date: msg.date!,
       delivered: true,
       sender: msg.senderName,
       isMine: msg.senderID == userID || msg.receiverID == receiverID,
@@ -117,8 +120,8 @@ class MessageDetail extends StatelessWidget {
             child: Container(
               child: TextField(
                 onSubmitted: (value) {
-                  Provider.of<MessageModel>(context, listen: false)
-                      .sendMessage(textEditingController.text, receiverID);
+                  Provider.of<MessageModel>(context, listen: false).sendMessage(
+                      textEditingController.text, receiverID ?? "");
                   textEditingController.text = "";
                 },
                 style: TextStyle(color: primaryColor, fontSize: 15.0),
@@ -152,8 +155,8 @@ class MessageDetail extends StatelessWidget {
               child: IconButton(
                 icon: Icon(Icons.send),
                 onPressed: () {
-                  Provider.of<MessageModel>(context, listen: false)
-                      .sendMessage(textEditingController.text, receiverID);
+                  Provider.of<MessageModel>(context, listen: false).sendMessage(
+                      textEditingController.text, receiverID ?? "");
                   textEditingController.text = "";
                 },
                 color: primaryColor,
@@ -165,7 +168,8 @@ class MessageDetail extends StatelessWidget {
       ),
       width: double.infinity,
       decoration: BoxDecoration(
-          border: Border(top: BorderSide(color: Colors.grey[700], width: 0.5)),
+          border:
+              Border(top: BorderSide(color: Colors.grey.shade700, width: 0.5)),
           color: Colors.white),
     );
   }
@@ -176,7 +180,7 @@ class MessageDetail extends StatelessWidget {
         message.messageID != "") {
       PackageModel packageModel =
           Provider.of<PackageModel>(context, listen: false);
-      Package p = await packageModel.getPackage(message.messageID);
+      Package p = await packageModel.getPackage(message.messageID!);
       if (p == null) return;
       Navigator.push<bool>(context,
           CupertinoPageRoute(builder: (context) => PackageInfo(package: p)));
@@ -186,7 +190,7 @@ class MessageDetail extends StatelessWidget {
         message.messageID != "") {
       MainModel mainModel = Provider.of<MainModel>(context, listen: false);
 
-      if (mainModel.user.isCustomer()) {
+      if (mainModel.user?.isCustomer() ?? false) {
         Navigator.push<bool>(
             context, CupertinoPageRoute(builder: (context) => Profile()));
       } else {
@@ -202,7 +206,7 @@ class MessageDetail extends StatelessWidget {
         message.messageID != "") {
       ShipmentModel shipmentModel =
           Provider.of<ShipmentModel>(context, listen: false);
-      Shipment s = await shipmentModel.getShipment(message.messageID);
+      Shipment s = await shipmentModel.getShipment(message.messageID!);
       if (s == null) return;
       await Navigator.push<bool>(
           context,

lib/pages/chat/model/message_model.dart

@@ -10,44 +10,46 @@ import 'package:logging/logging.dart';
 class MessageModel extends BaseModel {
   final log = Logger('MessageModel');
 
-  List<Message> messages;
+  List<Message> messages = [];
 
   @override
   logout() async {
-    if (listener != null) await listener.cancel();
+    if (listener != null) await listener!.cancel();
     messages = [];
   }
 
-  Query query;
-  DocumentSnapshot prevSnap;
-  bool isEnded;
-  bool isLoading;
-  String userID;
-  StreamSubscription<QuerySnapshot> listener;
+  late Query query;
+  DocumentSnapshot? prevSnap;
+  late bool isEnded;
+  late bool isLoading;
+  String? userID;
+  StreamSubscription<QuerySnapshot>? listener;
 
   static const int rowPerLoad = 20;
-  void initQuery(String userID) {
+  void initQuery(String? userID) {
+    if (userID == null) return;
     this.messages = [];
     this.userID = userID;
     this.prevSnap = null;
-    query = Firestore.instance
+    query = FirebaseFirestore.instance
         .collection("$user_collection/$userID/$messages_collection")
         .orderBy('date', descending: true);
     load();
   }
 
   Future<void> load() async {
+    if (prevSnap == null) return;
     Query _query =
-        prevSnap != null ? query.startAfterDocument(prevSnap) : query;
+        prevSnap != null ? query.startAfterDocument(prevSnap!) : query;
     QuerySnapshot snapshot =
-        await _query.limit(rowPerLoad).getDocuments(source: Source.server);
+        await _query.limit(rowPerLoad).get(GetOptions(source: Source.server));
 
-    int count = snapshot.documents.length;
+    int count = snapshot.docs.length;
     isEnded = count < rowPerLoad;
-    prevSnap = count > 0 ? snapshot.documents[count - 1] : prevSnap;
+    prevSnap = count > 0 ? snapshot.docs[count - 1] : prevSnap;
 
-    snapshot.documents.forEach((e) {
-      messages.add(Message.fromMap(e.data, e.documentID));
+    snapshot.docs.forEach((e) {
+      messages.add(Message.fromMap(e.data() as Map<String, dynamic>, e.id));
       if (messages.length == 1) {
         _initListener(e);
       }
@@ -56,20 +58,22 @@ class MessageModel extends BaseModel {
   }
 
   void _initListener(DocumentSnapshot snap) {
-    if (listener != null) listener.cancel();
+    if (listener != null) listener!.cancel();
 
-    listener = Firestore.instance
+    listener = FirebaseFirestore.instance
         .collection("$user_collection/$userID/$messages_collection")
         .endBeforeDocument(snap)
         .orderBy('date', descending: true)
         .snapshots(includeMetadataChanges: true)
         .listen((qs) {
-      qs.documentChanges.forEach((c) {
+      qs.docChanges.forEach((c) {
         switch (c.type) {
           case DocumentChangeType.added:
             log.info("added!! $c");
             messages.insert(
-                0, Message.fromMap(c.document.data, c.document.documentID));
+                0,
+                Message.fromMap(
+                    c.doc.data() as Map<String, dynamic>, c.doc.id));
             notifyListeners();
             break;
           case DocumentChangeType.modified:

lib/pages/contact/contact_editor.dart

@@ -1,6 +1,5 @@
 import 'package:fcs/domain/vo/contact.dart';
 import 'package:fcs/helpers/theme.dart';
-import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/contact/model/contact_model.dart';
 import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/widgets/input_text.dart';
@@ -14,7 +13,7 @@ import 'package:provider/provider.dart';
 import 'widgets.dart';
 
 class ContactEditor extends StatefulWidget {
-  final Contact contact;
+  final Contact? contact;
   const ContactEditor({this.contact});
   @override
   _ContactEditorState createState() => _ContactEditorState();
@@ -29,22 +28,23 @@ class _ContactEditorState extends State<ContactEditor> {
   TextEditingController _facebook = new TextEditingController();
 
   bool _isLoading = false;
-  bool isNew;
+  bool isNew = false;
 
+  Contact? _contact;
   @override
   void initState() {
+    if (widget.contact != null) _contact = widget.contact!;
     super.initState();
-    if (widget.contact != null) {
-      isNew = false;
-      _usaPhone.text = widget.contact.usaContactNumber;
-      _mmPhone.text = widget.contact.mmContactNumber;
-      _usaAddress.text = widget.contact.usaAddress;
-      _mmAddress.text = widget.contact.mmAddress;
-      _email.text = widget.contact.emailAddress;
-      _facebook.text = widget.contact.facebookLink;
-    } else {
-      isNew = true;
-    }
+    isNew = widget.contact == null;
+  }
+
+  initContact() {
+    _usaPhone.text = _contact?.usaContactNumber ?? '';
+    _mmPhone.text = _contact?.mmContactNumber ?? '';
+    _usaAddress.text = _contact?.usaAddress ?? '';
+    _mmAddress.text = _contact?.mmAddress ?? '';
+    _email.text = _contact?.emailAddress ?? '';
+    _facebook.text = _contact?.facebookLink ?? '';
   }
 
   @override
@@ -136,14 +136,17 @@ class _ContactEditorState extends State<ContactEditor> {
       _isLoading = true;
     });
     try {
-      widget.contact.usaContactNumber = _usaPhone.text;
-      widget.contact.mmContactNumber = _mmPhone.text;
-      widget.contact.usaAddress = _usaAddress.text;
-      widget.contact.mmAddress = _mmAddress.text;
-      widget.contact.emailAddress = _email.text;
-      widget.contact.facebookLink = _facebook.text;
-      var contactModel = Provider.of<ContactModel>(context, listen: false);
-      await contactModel.saveContact(widget.contact);
+      _contact?.usaContactNumber = _usaPhone.text;
+      _contact?.mmContactNumber = _mmPhone.text;
+      _contact?.usaAddress = _usaAddress.text;
+      _contact?.mmAddress = _mmAddress.text;
+      _contact?.emailAddress = _email.text;
+      _contact?.facebookLink = _facebook.text;
+      if (this._contact != null) {
+        var contactModel = Provider.of<ContactModel>(context, listen: false);
+        await contactModel.saveContact(_contact!);
+      }
+
       Navigator.pop(context);
     } catch (e) {
       showMsgDialog(context, "Error", e.toString());

lib/pages/contact/contact_page.dart

@@ -1,7 +1,6 @@
 import 'package:fcs/domain/entities/setting.dart';
 import 'package:fcs/domain/vo/contact.dart';
 import 'package:fcs/helpers/theme.dart';
-import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/contact/contact_editor.dart';
 import 'package:fcs/pages/main/model/main_model.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
@@ -22,7 +21,8 @@ class ContactPage extends StatefulWidget {
 class _ContactPageState extends State<ContactPage> {
   @override
   Widget build(BuildContext context) {
-    Setting setting = Provider.of<MainModel>(context).setting;
+    Setting? setting = Provider.of<MainModel>(context).setting;
+    if (setting == null) return Container();
     bool isEditable = context.select((MainModel m) => m.contactEditable());
 
     return Scaffold(
@@ -62,14 +62,14 @@ class _ContactPageState extends State<ContactPage> {
         children: [
           itemTitle(context, "contact.callus"),
           contactItem(context, setting.usaContactNumber, CupertinoIcons.phone,
-              onTap: () => _call(setting.usaContactNumber),
+              onTap: () => _call(setting.usaContactNumber ?? ""),
               labelKey: "contact.usa.phone"),
           contactItem(
             context,
             setting.mmContactNumber,
             CupertinoIcons.phone,
             onTap: () => _call(
-              setting.mmContactNumber,
+              setting.mmContactNumber ?? "",
             ),
             labelKey: "contact.mm.phone",
           ),
@@ -91,7 +91,7 @@ class _ContactPageState extends State<ContactPage> {
             context,
             setting.emailAddress,
             CupertinoIcons.mail,
-            onTap: () => _email(setting.emailAddress),
+            onTap: () => _email(setting.emailAddress ?? ""),
             labelKey: "contact.fcs.email",
           ),
           itemTitle(context, "contact.visitus"),
@@ -99,7 +99,7 @@ class _ContactPageState extends State<ContactPage> {
             context,
             setting.facebookLink,
             FontAwesomeIcons.facebook,
-            onTap: () => _opencontactItem(setting.facebookLink),
+            onTap: () => _opencontactItem(setting.facebookLink ?? ""),
             labelKey: "contact.facebook",
           ),
         ],

lib/pages/contact/widgets.dart

@@ -7,25 +7,25 @@ Widget itemTitle(BuildContext context, String textKey) {
   return Padding(
     padding: const EdgeInsets.only(left: 18.0, top: 25, bottom: 5),
     child: Text(
-      AppTranslations.of(context).text(textKey),
+      AppTranslations.of(context)!.text(textKey),
       style: TextStyle(
           fontWeight: FontWeight.bold, fontSize: 18, color: Colors.black),
     ),
   );
 }
 
-Widget subItemTitle(BuildContext context, String textKey, {IconData iconData}) {
+Widget subItemTitle(BuildContext context, String textKey, {IconData? iconData}) {
   return Padding(
     padding: const EdgeInsets.only(left: 0, top: 0, bottom: 0),
     child: Row(
       children: [
         Icon(
-          iconData,
+          iconData, 
           color: primaryColor,
         ),
         SizedBox(width: 10),
         Text(
-          AppTranslations.of(context).text(textKey),
+          AppTranslations.of(context)!.text(textKey),
           style: TextStyle(
               fontWeight: FontWeight.w700, fontSize: 15, color: primaryColor),
         ),
@@ -34,8 +34,8 @@ Widget subItemTitle(BuildContext context, String textKey, {IconData iconData}) {
   );
 }
 
-Widget contactItem(BuildContext context, String text, IconData iconData,
-    {Function() onTap, String labelKey}) {
+Widget contactItem(BuildContext context, String? text, IconData iconData,
+    {Function()? onTap, String? labelKey}) {
   return Material(
     child: Padding(
       padding: const EdgeInsets.only(left: 18.0, bottom: 10, right: 18),

lib/pages/customer/customer_editor.dart

@@ -14,7 +14,7 @@ import 'package:provider/provider.dart';
 typedef void FindCallBack();
 
 class CustomerEditor extends StatefulWidget {
-  final User customer;
+  final User? customer;
   const CustomerEditor({this.customer});
   @override
   _CustomerEditorState createState() => _CustomerEditorState();
@@ -34,17 +34,17 @@ class _CustomerEditorState extends State<CustomerEditor> {
       children: <Widget>[
         Expanded(
             child: DisplayText(
-          text: widget.customer.phoneNumber,
+          text: widget.customer!.phoneNumber,
           labelTextKey: "customer.phone",
           iconData: Icons.phone,
         )),
         IconButton(
             icon: Icon(Icons.open_in_new, color: primaryColor),
-            onPressed: () => call(context, widget.customer.phoneNumber)),
+            onPressed: () => call(context, widget.customer?.phoneNumber ?? "")),
       ],
     );
 
-    final enabled = widget.customer.status != user_disabled_status;
+    final enabled = widget.customer!.status != user_disabled_status;
     final enableBox = LocalButton(
       textKey: enabled ? "customer.disable.btn" : "customer.enable.btn",
       iconData: enabled ? Icons.lock : Icons.lock_open,
@@ -68,7 +68,7 @@ class _CustomerEditorState extends State<CustomerEditor> {
                 onPressed: () => Navigator.of(context).pop(),
               ),
               title: Text(
-                widget.customer.name,
+                widget.customer?.name ?? "",
                 style: TextStyle(
                   fontSize: 20,
                   color: primaryColor,
@@ -81,26 +81,26 @@ class _CustomerEditorState extends State<CustomerEditor> {
                 children: <Widget>[
                   phoneNumberBox,
                   DisplayText(
-                    text: widget.customer.fcsID,
+                    text: widget.customer!.fcsID,
                     labelTextKey: "customer.fcs.id",
                     icon: FcsIDIcon(),
                   ),
                   DisplayText(
-                    text: widget.customer.status,
+                    text: widget.customer!.status,
                     labelTextKey: "customer.status",
                     iconData: Icons.add_alarm,
                   ),
                   SizedBox(
                     height: 20,
                   ),
-                  widget.customer.requested
+                  widget.customer!.requested
                       ? fcsButton(
                           context,
                           getLocalString(
                               context, "customer.invitation.request.confirm"),
                           callack: _add)
                       : Container(),
-                  widget.customer.joined || widget.customer.disabled
+                  widget.customer!.joined || widget.customer!.disabled
                       ? enableBox
                       : Container()
                 ],
@@ -119,7 +119,7 @@ class _CustomerEditorState extends State<CustomerEditor> {
       CustomerModel customerModel =
           Provider.of<CustomerModel>(context, listen: false);
       try {
-        await customerModel.acceptRequest(widget.customer.id);
+        await customerModel.acceptRequest(widget.customer?.id ?? "");
         Navigator.pop(context);
       } catch (e) {
         showMsgDialog(context, "Error", e.toString());
@@ -139,7 +139,7 @@ class _CustomerEditorState extends State<CustomerEditor> {
     CustomerModel customerModel =
         Provider.of<CustomerModel>(context, listen: false);
     try {
-      await customerModel.enableUser(widget.customer, enabled);
+      await customerModel.enableUser(widget.customer!, enabled);
       Navigator.pop(context);
     } catch (e) {
       showMsgDialog(context, "Error", e.toString());

lib/pages/customer/customer_list.dart

@@ -125,7 +125,7 @@ class _CustomerListState extends State<CustomerList> {
                             Padding(
                               padding: const EdgeInsets.only(top: 2.0),
                               child: new Text(
-                                customer.name,
+                                customer.name ?? "",
                                 style: new TextStyle(
                                     fontSize: 20.0, color: primaryColor),
                               ),
@@ -171,7 +171,7 @@ class _CustomerListState extends State<CustomerList> {
               children: [
                 Padding(
                   padding: const EdgeInsets.only(right: 5),
-                  child: _status(customer.status),
+                  child: _status(customer.status ?? ""),
                 ),
                 Padding(
                   padding: const EdgeInsets.only(right: 5),
@@ -222,22 +222,22 @@ class _CustomerListState extends State<CustomerList> {
                 )))
         .then((value) {
       if (customer.fcsUnseenCount > 0) {
-        messageModel.seenMessages(customer.id, false);
+        messageModel.seenMessages(customer.id ?? "", false);
       }
     });
     if (customer.fcsUnseenCount > 0) {
-      messageModel.seenMessages(customer.id, false);
+      messageModel.seenMessages(customer.id ?? "", false);
     }
   }
 
   _share(User user) async {
     MainModel mainModel = Provider.of<MainModel>(context, listen: false);
-    String appUrl = mainModel.setting.appUrl;
-    final RenderBox box = context.findRenderObject();
+    String appUrl = mainModel.setting?.appUrl ?? "";
+    final RenderBox? box = context.findRenderObject() as RenderBox;
     await Share.share(
         "Join us on FCS Logistics App. Here is the link:\n $appUrl\n" +
             user.share,
         subject: "Invitation to FCS Logistics App",
-        sharePositionOrigin: box.localToGlobal(Offset.zero) & box.size);
+        sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size);
   }
 }

lib/pages/customer/invitation_create.dart

@@ -19,7 +19,7 @@ class _InvitationCreateState extends State<InvitationCreate> {
   TextEditingController _phoneController = new TextEditingController();
 
   bool _isLoading = false;
-  String dialCode;
+  late String dialCode;
 
   @override
   void initState() {
@@ -85,7 +85,7 @@ class _InvitationCreateState extends State<InvitationCreate> {
                   ),
                   Container(
                     decoration: BoxDecoration(
-                        border: Border.all(color: Colors.grey[400], width: 1),
+                        border: Border.all(color: Colors.grey.shade400, width: 1),
                         borderRadius: BorderRadius.all(Radius.circular(12.0))),
                     child: CountryCodePicker(
                       onChanged: _countryChange,
@@ -140,7 +140,7 @@ class _InvitationCreateState extends State<InvitationCreate> {
 
   _countryChange(CountryCode countryCode) {
     setState(() {
-      dialCode = countryCode.dialCode;
+      dialCode = countryCode.dialCode!;
     });
   }
 

lib/pages/customer/invitation_editor.dart

@@ -11,7 +11,7 @@ import 'package:provider/provider.dart';
 typedef void FindCallBack();
 
 class InvitationEditor extends StatefulWidget {
-  final User customer;
+  final User? customer;
   const InvitationEditor({this.customer});
   @override
   _InvitationEditorState createState() => _InvitationEditorState();
@@ -31,13 +31,13 @@ class _InvitationEditorState extends State<InvitationEditor> {
       children: <Widget>[
         Expanded(
             child: DisplayText(
-          text: widget.customer.phoneNumber,
+          text: widget.customer!.phoneNumber,
           labelTextKey: getLocalString(context, "customer.phone"),
           iconData: Icons.phone,
         )),
         IconButton(
             icon: Icon(Icons.open_in_new, color: primaryColor),
-            onPressed: () => call(context, widget.customer.phoneNumber)),
+            onPressed: () => call(context, widget.customer?.phoneNumber ?? "")),
       ],
     );
 
@@ -57,7 +57,7 @@ class _InvitationEditorState extends State<InvitationEditor> {
               onPressed: () => Navigator.of(context).pop(),
             ),
             title: Text(
-              widget.customer.name,
+              widget.customer?.name ?? "",
               style: TextStyle(fontSize: 20, color: primaryColor),
             ),
           ),
@@ -87,7 +87,7 @@ class _InvitationEditorState extends State<InvitationEditor> {
       CustomerModel customerModel =
           Provider.of<CustomerModel>(context, listen: false);
       try {
-        await customerModel.deleteInvite(widget.customer.phoneNumber);
+        await customerModel.deleteInvite(widget.customer?.phoneNumber ?? "");
         Navigator.pop(context);
       } catch (e) {
         showMsgDialog(context, "Error", e.toString());

lib/pages/customer/model/customer_model.dart

@@ -12,8 +12,8 @@ class CustomerModel extends BaseModel {
 
   List<User> customers = [];
   List<User> invitations = [];
-  StreamSubscription<QuerySnapshot> customerListener;
-  StreamSubscription<QuerySnapshot> invitationListener;
+  late StreamSubscription<QuerySnapshot>? customerListener;
+  late StreamSubscription<QuerySnapshot>? invitationListener;
 
   @override
   void privilegeChanged() {
@@ -24,8 +24,8 @@ class CustomerModel extends BaseModel {
 
   @override
   logout() async {
-    if (customerListener != null) customerListener.cancel();
-    if (invitationListener != null) invitationListener.cancel();
+    if (customerListener != null) customerListener!.cancel();
+    if (invitationListener != null) invitationListener!.cancel();
     customers = [];
     invitations = [];
   }
@@ -43,21 +43,22 @@ class CustomerModel extends BaseModel {
   }
 
   Future<void> _loadCustomer() async {
-    if (user == null || !user.hasCustomers()) return;
+    if (user == null && !user!.hasCustomers()) return;
 
     try {
-      if (customerListener != null) customerListener.cancel();
+      if (customerListener != null) customerListener!.cancel();
 
-      customerListener = Firestore.instance
+      customerListener = FirebaseFirestore.instance
           .collection("/$user_collection")
           .where("is_sys_admin", isEqualTo: false)
           .orderBy("message_time", descending: true)
           .snapshots()
           .listen((QuerySnapshot snapshot) {
         customers.clear();
-        customers = snapshot.documents.map((documentSnapshot) {
-          var user =
-              User.fromMap(documentSnapshot.data, documentSnapshot.documentID);
+        customers = snapshot.docs.map((documentSnapshot) {
+          var user = User.fromMap(
+              documentSnapshot.data() as Map<String, dynamic>,
+              documentSnapshot.id);
           return user;
         }).toList();
         notifyListeners();
@@ -68,19 +69,20 @@ class CustomerModel extends BaseModel {
   }
 
   Future<void> _loadInvitations() async {
-    if (user == null || !user.hasCustomers()) return;
+    if (user == null && !user!.hasCustomers()) return;
 
     try {
-      if (invitationListener != null) invitationListener.cancel();
+      if (invitationListener != null) invitationListener!.cancel();
 
-      invitationListener = Firestore.instance
+      invitationListener = FirebaseFirestore.instance
           .collection("/$invitations_collection")
           .snapshots()
           .listen((QuerySnapshot snapshot) {
         invitations.clear();
-        invitations = snapshot.documents.map((documentSnapshot) {
-          var user =
-              User.fromMap(documentSnapshot.data, documentSnapshot.documentID);
+        invitations = snapshot.docs.map((documentSnapshot) {
+          var user = User.fromMap(
+              documentSnapshot.data() as Map<String, dynamic>,
+              documentSnapshot.id);
           return user;
         }).toList();
         notifyListeners();
@@ -90,23 +92,22 @@ class CustomerModel extends BaseModel {
     }
   }
 
-  Future<User> getUser(String id) async {
+  Future<User> getUser(String? id) async {
     String path = "/$user_collection";
-    var snap = await Firestore.instance.collection(path).document(id).get();
-    return User.fromMap(snap.data, snap.documentID);
+    var snap = await FirebaseFirestore.instance.collection(path).doc(id).get();
+    return User.fromMap(snap.data() as Map<String, dynamic>, snap.id);
   }
 
   Future<List<User>> getInvoiceUsers(String fcsShipmentID) async {
     List<User> users = [];
     try {
-      var snaps = await Firestore.instance
+      var snaps = await FirebaseFirestore.instance
           .collection(
               "/$fcs_shipment_collection/$fcsShipmentID/$user_collection")
           .where("pending_invoice_carton_count", isGreaterThan: 0)
-          .getDocuments(source: Source.server);
-      users = snaps.documents.map((documentSnapshot) {
-        var user =
-            User.fromMap(documentSnapshot.data, documentSnapshot.documentID);
+          .get(GetOptions(source: Source.server));
+      users = snaps.docs.map((documentSnapshot) {
+        var user = User.fromMap(documentSnapshot.data(), documentSnapshot.id);
         return user;
       }).toList();
     } catch (e) {
@@ -116,6 +117,6 @@ class CustomerModel extends BaseModel {
   }
 
   Future<void> enableUser(User user, bool enabled) {
-    return Services.instance.userService.enableUser(user.id, enabled);
+    return Services.instance.userService.enableUser(user.id ?? "", enabled);
   }
 }

lib/pages/delivery/delivery_info.dart

@@ -22,14 +22,14 @@ import 'package:fcs/pages/widgets/local_title.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
+import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
 final DateFormat dateFormat = DateFormat("d MMM yyyy");
 
 class DeliveryInfo extends StatefulWidget {
-  final Carton box;
+  final Carton? box;
   DeliveryInfo({this.box});
 
   @override
@@ -38,8 +38,8 @@ class DeliveryInfo extends StatefulWidget {
 
 class _DeliveryInfoState extends State<DeliveryInfo> {
   bool _isLoading = false;
-  Carton _box;
-  String _selectedCartonType;
+  late Carton _box;
+  late String _selectedCartonType;
   List<Package> _packages = [];
   List<Carton> _mixBoxes = [];
   Carton _selectedShipmentBox = new Carton();
@@ -51,17 +51,17 @@ class _DeliveryInfoState extends State<DeliveryInfo> {
   double volumetricRatio = 0;
   double shipmentWeight = 0;
 
-  bool isMixBox;
-  bool isFromShipments;
-  bool isFromPackages;
-  bool isSmallBag;
-  bool isEdiable;
+  late bool isMixBox;
+  late bool isFromShipments;
+  late bool isFromPackages;
+  late bool isSmallBag;
+  late bool isEdiable;
 
   @override
   void initState() {
     super.initState();
-    _box = widget.box;
-    _selectedCartonType = _box.cartonType;
+    if (widget.box != null) _box = widget.box!;
+    _selectedCartonType = _box.cartonType ?? '';
 
     //for shipment weight
     volumetricRatio = Provider.of<ShipmentRateModel>(context, listen: false)
@@ -80,7 +80,7 @@ class _DeliveryInfoState extends State<DeliveryInfo> {
     _heightController.text = _box.height.toString();
     _lengthController.text = _box.length.toString();
     _cargoTypes = _box.cargoTypes;
-    _deliveryAddress = _box.deliveryAddress;
+    _deliveryAddress = _box.deliveryAddress!;
     isMixBox = _box.cartonType == carton_mix_box;
     isFromShipments = _box.cartonType == carton_from_shipments;
     isFromPackages = _box.cartonType == carton_from_packages;
@@ -96,7 +96,7 @@ class _DeliveryInfoState extends State<DeliveryInfo> {
     if (_box.cartonType == carton_from_packages && _box.userID == null) return;
     PackageModel packageModel =
         Provider.of<PackageModel>(context, listen: false);
-    List<Package> packages = await packageModel.getPackages(_box.userID, [
+    List<Package> packages = await packageModel.getPackages(_box.userID!, [
       package_processed_status,
       package_packed_status,
       package_shipped_status,
@@ -135,21 +135,22 @@ class _DeliveryInfoState extends State<DeliveryInfo> {
     final cartonTypeBox = LocalRadioButtons(
         readOnly: true,
         values: cartonModel.cartonTypesInfo,
-        selectedValue:
-            _box.isShipmentCarton ? carton_from_shipments : _box.cartonType);
+        selectedValue: (_box.isShipmentCarton ?? false)
+            ? carton_from_shipments
+            : _box.cartonType);
     final shipmentBox = DisplayText(
       text: _box.fcsShipmentNumber,
       labelTextKey: "box.fcs_shipment_num",
       iconData: Ionicons.ios_airplane,
     );
     final fcsIDBox = DisplayText(
-      text: _box.fcsID == null ? "" : _box.fcsID,
+      text: _box.fcsID,
       labelTextKey: "box.fcs.id",
       icon: FcsIDIcon(),
     );
 
     final customerNameBox = DisplayText(
-      text: _box.userName == null ? "" : _box.userName,
+      text: _box.userName,
       labelTextKey: "box.name",
       iconData: Icons.person,
     );
@@ -173,13 +174,11 @@ class _DeliveryInfoState extends State<DeliveryInfo> {
         children: <Widget>[
           Expanded(
               child: new Text(
-            _selectedShipmentBox.shipmentNumber == null
-                ? ""
-                : _selectedShipmentBox.shipmentNumber,
+            _selectedShipmentBox.shipmentNumber ?? "",
             style: textStyle,
           )),
           new Text(
-            _selectedShipmentBox.desc == null ? "" : _selectedShipmentBox.desc,
+            _selectedShipmentBox.desc ?? "",
             style: textStyle,
           ),
         ],
@@ -216,7 +215,7 @@ class _DeliveryInfoState extends State<DeliveryInfo> {
     );
 
     final shipmentWeightBox = DisplayText(
-      text: shipmentWeight != null ? shipmentWeight.toStringAsFixed(0) : "",
+      text: shipmentWeight.toStringAsFixed(0),
       labelTextKey: "box.shipment_weight",
       iconData: MaterialCommunityIcons.weight,
     );
@@ -302,7 +301,7 @@ class _DeliveryInfoState extends State<DeliveryInfo> {
     });
     try {
       var deliveryModel = Provider.of<DeliveryModel>(context, listen: false);
-      await deliveryModel.deliver(widget.box);
+      await deliveryModel.deliver(this._box);
       Navigator.pop(context, true);
     } catch (e) {
       showMsgDialog(context, "Error", e.toString());

lib/pages/delivery/delivery_list_row.dart

@@ -3,14 +3,14 @@ import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/main/util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
+import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 import 'package:intl/intl.dart';
 
 import 'delivery_info.dart';
 
 class DeliveryListRow extends StatelessWidget {
-  final Carton box;
-  DeliveryListRow({Key key, this.box}) : super(key: key);
+  final Carton? box;
+  DeliveryListRow({Key? key, this.box}) : super(key: key);
 
   final double dotSize = 15.0;
   final DateFormat dateFormat = new DateFormat("dd MMM yyyy");
@@ -19,10 +19,11 @@ class DeliveryListRow extends StatelessWidget {
   Widget build(BuildContext context) {
     return InkWell(
       onTap: () {
-        Navigator.push(
-          context,
-          CupertinoPageRoute(builder: (context) => DeliveryInfo(box: box)),
-        );
+        if (box != null)
+          Navigator.push(
+            context,
+            CupertinoPageRoute(builder: (context) => DeliveryInfo(box: box!)),
+          );
       },
       child: Container(
         padding: EdgeInsets.only(left: 15, right: 15),
@@ -48,7 +49,7 @@ class DeliveryListRow extends StatelessWidget {
                           Padding(
                             padding: const EdgeInsets.only(left: 8.0),
                             child: new Text(
-                              box.cartonNumber ?? "",
+                              box?.cartonNumber ?? "",
                               style: new TextStyle(
                                   fontSize: 15.0, color: Colors.black),
                             ),
@@ -56,7 +57,7 @@ class DeliveryListRow extends StatelessWidget {
                           Padding(
                             padding: const EdgeInsets.only(left: 10.0, top: 10),
                             child: new Text(
-                              box.userName ?? "",
+                              box?.userName ?? "",
                               style: new TextStyle(
                                   fontSize: 15.0, color: Colors.grey),
                             ),
@@ -72,14 +73,14 @@ class DeliveryListRow extends StatelessWidget {
               children: <Widget>[
                 Padding(
                   padding: const EdgeInsets.all(0),
-                  child: getStatus(box.status == null ? "" : box.status),
+                  child: getStatus(box?.status ?? ''),
                 ),
                 Padding(
                   padding: const EdgeInsets.only(left: 8.0, top: 5, bottom: 5),
                   child: Row(
                     children: <Widget>[
                       new Text(
-                        "${box.actualWeight?.toString() ?? ''} lb",
+                        "${box?.actualWeight.toString() ?? ''} lb",
                         style:
                             new TextStyle(fontSize: 15.0, color: Colors.grey),
                       ),

lib/pages/delivery/model/delivery_model.dart

@@ -14,18 +14,18 @@ class DeliveryModel extends BaseModel {
   List<Carton> get cartons =>
       _selectedIndex == 1 ? _cartons : List<Carton>.from(_delivered.values);
 
-  Paginator _delivered;
+  late Paginator _delivered;
   int _selectedIndex = 1;
   bool isLoading = false;
   List<Carton> _cartons = [];
-  StreamSubscription<QuerySnapshot> listener;
+  StreamSubscription<QuerySnapshot>? listener;
 
   set selectedIndex(int index) {
     _selectedIndex = index;
     notifyListeners();
   }
 
-  get selectedIndex => _selectedIndex;
+  int get selectedIndex => _selectedIndex;
 
   initData() {
     _selectedIndex = 1;
@@ -37,12 +37,12 @@ class DeliveryModel extends BaseModel {
   }
 
   Future<void> _loadCartons() async {
-    if (user == null || !user.hasDeliveries()) return;
+    if (user == null || !user!.hasDeliveries()) return;
     String path = "/$cartons_collection/";
-    if (listener != null) listener.cancel();
+    if (listener != null) listener!.cancel();
     _cartons = [];
     try {
-      listener = Firestore.instance
+      listener = FirebaseFirestore.instance
           .collection("$path")
           .where("status", isEqualTo: carton_shipped_status)
           .where("carton_type", whereIn: [
@@ -55,9 +55,9 @@ class DeliveryModel extends BaseModel {
           .snapshots()
           .listen((QuerySnapshot snapshot) {
             _cartons.clear();
-            _cartons = snapshot.documents.map((documentSnapshot) {
+            _cartons = snapshot.docs.map((documentSnapshot) {
               var s = Carton.fromMap(
-                  documentSnapshot.data, documentSnapshot.documentID);
+                  documentSnapshot.data as Map<String, dynamic>, documentSnapshot.id);
               return s;
             }).toList();
             notifyListeners();
@@ -68,9 +68,9 @@ class DeliveryModel extends BaseModel {
   }
 
   Paginator _getDelivered() {
-    if (user == null || !user.hasDeliveries()) return null;
+    if (user == null || !user!.hasDeliveries()) throw "No Privilege";
 
-    var pageQuery = Firestore.instance
+    var pageQuery = FirebaseFirestore.instance
         .collection("/$cartons_collection")
         .where("is_delivered", isEqualTo: true)
         .where("status", whereIn: [carton_delivered_status]).where("is_deleted",
@@ -105,7 +105,7 @@ class DeliveryModel extends BaseModel {
 
   @override
   logout() async {
-    if (listener != null) await listener.cancel();
+    if (listener != null) await listener!.cancel();
     if (_delivered != null) _delivered.close();
     _cartons = [];
   }

lib/pages/delivery_address/delivery_address_editor.dart

@@ -7,13 +7,13 @@ import 'package:fcs/pages/widgets/input_text.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:flutter_icons/flutter_icons.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 import 'package:provider/provider.dart';
 
 class DeliveryAddressEditor extends StatefulWidget {
-  final DeliveryAddress deliveryAddress;
-  final User user;
+  final DeliveryAddress? deliveryAddress;
+  final User? user;
   DeliveryAddressEditor({this.deliveryAddress, this.user});
 
   @override
@@ -38,13 +38,13 @@ class _DeliveryAddressEditorState extends State<DeliveryAddressEditor> {
     super.initState();
     if (widget.deliveryAddress != null) {
       _isNew = false;
-      _deliveryAddress = widget.deliveryAddress;
-      _nameController.text = _deliveryAddress.fullName;
-      _address1Controller.text = _deliveryAddress.addressLine1;
-      _address2Controller.text = _deliveryAddress.addressLine2;
-      _cityController.text = _deliveryAddress.city;
-      _stateController.text = _deliveryAddress.state;
-      _phoneController.text = _deliveryAddress.phoneNumber;
+      _deliveryAddress = widget.deliveryAddress!;
+      _nameController.text = _deliveryAddress.fullName ?? "";
+      _address1Controller.text = _deliveryAddress.addressLine1 ?? "";
+      _address2Controller.text = _deliveryAddress.addressLine2 ?? "";
+      _cityController.text = _deliveryAddress.city ?? "";
+      _stateController.text = _deliveryAddress.state ?? "";
+      _phoneController.text = _deliveryAddress.phoneNumber?? "";
     } else {
       _cityController.text = "Yangon";
       _stateController.text = "Yangon";
@@ -198,7 +198,7 @@ class _DeliveryAddressEditorState extends State<DeliveryAddressEditor> {
       return;
     }
     if (widget.user != null) {
-      deliveryAddress.userID = widget.user.id;
+      deliveryAddress.userID = widget.user!.id;
     }
     setState(() {
       _isLoading = true;
@@ -224,7 +224,7 @@ class _DeliveryAddressEditorState extends State<DeliveryAddressEditor> {
       return;
     }
     if (widget.user != null) {
-      deliveryAddress.userID = widget.user.id;
+      deliveryAddress.userID = widget.user!.id;
     }
     setState(() {
       _isLoading = true;
@@ -255,7 +255,7 @@ class _DeliveryAddressEditorState extends State<DeliveryAddressEditor> {
       DeliveryAddressModel deliveryAddressModel =
           Provider.of<DeliveryAddressModel>(context, listen: false);
       if (widget.user != null) {
-        _deliveryAddress.userID = widget.user.id;
+        _deliveryAddress.userID = widget.user!.id;
       }
       await deliveryAddressModel.deleteDeliveryAddress(_deliveryAddress);
       Navigator.pop(context, true);
@@ -278,7 +278,7 @@ class _DeliveryAddressEditorState extends State<DeliveryAddressEditor> {
           _stateController.text != "Yangon";
     } else {
       DeliveryAddress deliveryAddress = _getPayload();
-      return widget.deliveryAddress.isChangedForEdit(deliveryAddress);
+      return this._deliveryAddress.isChangedForEdit(deliveryAddress);
     }
   }
 }

lib/pages/delivery_address/delivery_address_list.dart

@@ -13,9 +13,9 @@ import 'model/delivery_address_model.dart';
 
 class DeliveryAddressList extends StatefulWidget {
   final bool isAdminCreation;
-  final DeliveryAddress deliveryAddress;
+  final DeliveryAddress? deliveryAddress;
   const DeliveryAddressList(
-      {Key key, this.isAdminCreation = false, this.deliveryAddress})
+      {Key? key, this.isAdminCreation = false,  this.deliveryAddress})
       : super(key: key);
   @override
   _DeliveryAddressListState createState() => _DeliveryAddressListState();
@@ -85,7 +85,7 @@ class _DeliveryAddressListState extends State<DeliveryAddressList> {
             padding: const EdgeInsets.all(10.0),
             child: Icon(Icons.check,
                 color: widget.isAdminCreation
-                    ? widget.deliveryAddress.id == deliveryAddress.id
+                    ? widget.deliveryAddress?.id == deliveryAddress.id
                         ? primaryColor
                         : Colors.black26
                     : deliveryAddress.isDefault

lib/pages/delivery_address/delivery_address_row.dart

@@ -3,15 +3,15 @@ import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
+import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 
 typedef SelectionCallback(DeliveryAddress deliveryAddress);
 
 class DeliveryAddressRow extends StatelessWidget {
   final DeliveryAddress deliveryAddress;
-  final SelectionCallback selectionCallback;
+  final SelectionCallback? selectionCallback;
   const DeliveryAddressRow(
-      {Key key, this.deliveryAddress, this.selectionCallback})
+      {Key? key, required this.deliveryAddress, this.selectionCallback})
       : super(key: key);
 
   @override
@@ -19,7 +19,7 @@ class DeliveryAddressRow extends StatelessWidget {
     return InkWell(
       onTap: selectionCallback == null
           ? null
-          : () => this.selectionCallback(deliveryAddress),
+          : () => this.selectionCallback!(deliveryAddress),
       child: Row(
         children: <Widget>[
           Expanded(
@@ -54,8 +54,8 @@ class DeliveryAddressRow extends StatelessWidget {
     );
   }
 
-  Widget line(BuildContext context, String text,
-      {IconData iconData, Color color, double fontSize}) {
+  Widget line(BuildContext context, String? text,
+      {IconData? iconData, Color? color, double? fontSize}) {
     return Row(
       children: [
         iconData == null
@@ -69,7 +69,7 @@ class DeliveryAddressRow extends StatelessWidget {
             context,
             text ?? "",
             fontSize: fontSize ?? 14,
-            color: color,
+            color: color ?? Colors.grey,
           ),
         ),
       ],

lib/pages/delivery_address/model/delivery_address_model.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:barcode_scan2/gen/protos/protos.pb.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:fcs/data/services/services.dart';
 import 'package:fcs/domain/vo/delivery_address.dart';
@@ -10,13 +11,13 @@ class DeliveryAddressModel extends BaseModel {
   final log = Logger('FcsShipmentModel');
   List<DeliveryAddress> deliveryAddresses = [];
 
-  StreamSubscription<QuerySnapshot> listener;
+  StreamSubscription<QuerySnapshot>? listener;
 
   DeliveryAddress get defalutAddress =>
-      deliveryAddresses.firstWhere((e) => e.isDefault, orElse: () => null);
+      deliveryAddresses.firstWhere((e) => e.isDefault, orElse: () => DeliveryAddress());
 
   DeliveryAddress getLocalDeliveryAddress(String id) =>
-      deliveryAddresses.firstWhere((e) => e.id == id, orElse: () => null);
+      deliveryAddresses.firstWhere((e) => e.id == id, orElse: () => DeliveryAddress());
 
   @override
   void privilegeChanged() {
@@ -26,26 +27,26 @@ class DeliveryAddressModel extends BaseModel {
 
   @override
   logout() async {
-    if (listener != null) await listener.cancel();
+    if (listener != null) await listener!.cancel();
     deliveryAddresses = [];
   }
 
   Future<void> _loadDeliveryAddresses() async {
     if (user == null) return;
     String path = "$delivery_address_collection/";
-    if (listener != null) listener.cancel();
+    if (listener != null) listener!.cancel();
     deliveryAddresses = [];
     try {
-      listener = Firestore.instance
+      listener = FirebaseFirestore.instance
           .collection('users')
-          .document("${user.id}")
+          .doc("${user!.id}")
           .collection("$path")
           .snapshots()
           .listen((QuerySnapshot snapshot) {
         deliveryAddresses.clear();
-        deliveryAddresses = snapshot.documents.map((documentSnapshot) {
+        deliveryAddresses = snapshot.docs.map((documentSnapshot) {
           var s = DeliveryAddress.fromMap(
-              documentSnapshot.data, documentSnapshot.documentID);
+              documentSnapshot.data as Map<String,dynamic>, documentSnapshot.id);
           return s;
         }).toList();
         notifyListeners();
@@ -56,9 +57,9 @@ class DeliveryAddressModel extends BaseModel {
   }
 
   Future<DeliveryAddress> getDeliveryAddress(String id) async {
-    String path = "/$user_collection/${user.id}/$delivery_address_collection";
-    var snap = await Firestore.instance.collection(path).document(id).get();
-    return DeliveryAddress.fromMap(snap.data, snap.documentID);
+    String path = "/$user_collection/${user!.id}/$delivery_address_collection";
+    var snap = await FirebaseFirestore.instance.collection(path).doc(id).get();
+    return DeliveryAddress.fromMap(snap.data as Map<String,dynamic>, snap.id);
   }
 
   void initUser(user) {
@@ -87,14 +88,14 @@ class DeliveryAddressModel extends BaseModel {
 
   Future<List<DeliveryAddress>> getDeliveryAddresses(String userID) async {
     String path = "$delivery_address_collection/";
-    var querySnap = await Firestore.instance
+    var querySnap = await FirebaseFirestore.instance
         .collection('users')
-        .document("$userID")
+        .doc("$userID")
         .collection("$path")
         .orderBy("full_name")
-        .getDocuments();
-    return querySnap.documents
-        .map((e) => DeliveryAddress.fromMap(e.data, e.documentID))
+        .get();
+    return querySnap.docs
+        .map((e) => DeliveryAddress.fromMap(e.data as Map<String,dynamic>, e.id))
         .toList();
   }
 }

lib/pages/discount/discount_editor.dart

@@ -1,24 +1,22 @@
 import 'package:fcs/domain/entities/discount.dart';
-import 'package:fcs/domain/entities/user.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/discount/model/discount_model.dart';
 import 'package:fcs/pages/main/util.dart';
-import 'package:fcs/pages/rates/model/shipment_rate_model.dart';
 import 'package:fcs/pages/user_search/user_serach.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
 import 'package:fcs/pages/widgets/input_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
+import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 
 class DiscountEditor extends StatefulWidget {
-  final Discount discount;
+  final Discount? discount;
 
-  const DiscountEditor({Key key, this.discount}) : super(key: key);
+  const DiscountEditor({Key? key, this.discount}) : super(key: key);
   @override
   _DiscountEditorState createState() => _DiscountEditorState();
 }
@@ -38,12 +36,12 @@ class _DiscountEditorState extends State<DiscountEditor> {
   void initState() {
     super.initState();
     if (widget.discount != null) {
-      _discount = widget.discount;
-      _codeController.text = _discount.code;
+      _discount = widget.discount!;
+      _codeController.text = _discount.code ?? "";
       _amountController.text = _discount.amount.toStringAsFixed(2);
-      _statusController.text = _discount.status;
-      customerName = widget.discount.customerName;
-      customerId = widget.discount.customerId;
+      _statusController.text = _discount.status ?? '';
+      customerName = _discount.customerName ?? "";
+      customerId = _discount.customerId ?? "";
     } else {
       _isNew = true;
     }
@@ -71,7 +69,7 @@ class _DiscountEditorState extends State<DiscountEditor> {
       children: <Widget>[
         Expanded(
             child: DisplayText(
-          text: customerName != null ? customerName : "",
+          text: customerName,
           labelTextKey: "discount.name",
           iconData: Feather.user,
         )),
@@ -79,8 +77,8 @@ class _DiscountEditorState extends State<DiscountEditor> {
             icon: Icon(Icons.search, color: primaryColor),
             onPressed: () => searchUser(context, onUserSelect: (u) {
                   setState(() {
-                    customerId = u.id;
-                    customerName = u.name;
+                    customerId = u.id ?? "";
+                    customerName = u.name ?? "";
                   });
                 },popPage: true)),
       ],
@@ -93,7 +91,7 @@ class _DiscountEditorState extends State<DiscountEditor> {
           appBar: AppBar(
             centerTitle: true,
             title: Text(
-              AppTranslations.of(context).text("discount.form"),
+              AppTranslations.of(context)!.text("discount.form"),
             ),
             leading: new IconButton(
               icon: new Icon(CupertinoIcons.back),
@@ -162,7 +160,7 @@ class _DiscountEditorState extends State<DiscountEditor> {
       if (_isNew) {
         await discountModel.addDiscount(_discount);
       } else {
-        _discount.id = widget.discount.id;
+        _discount.id = this._discount.id;
         await discountModel.updateDiscount(_discount);
       }
       Navigator.pop(context);
@@ -186,7 +184,7 @@ class _DiscountEditorState extends State<DiscountEditor> {
     });
     try {
       var discountModel = Provider.of<DiscountModel>(context, listen: false);
-      await discountModel.deleteDiscount(widget.discount);
+      await discountModel.deleteDiscount(_discount);
       Navigator.pop(context);
     } catch (e) {
       showMsgDialog(context, "Error", e.toString());
@@ -208,7 +206,7 @@ class _DiscountEditorState extends State<DiscountEditor> {
           customerName: customerName,
           customerId: customerId,
           amount: double.parse(_amountController.text));
-      return widget.discount.isChangedForEdit(_discount);
+      return widget.discount!.isChangedForEdit(_discount);
     }
   }
 }