null safety

lib/pages/processing/processing_info.dart

@@ -11,7 +11,7 @@ import 'package:fcs/pages/widgets/progress.dart';
 import 'package:fcs/pages/widgets/status_tree.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';
 
@@ -20,7 +20,7 @@ import 'processing_edit_editor.dart';
 final DateFormat dateFormat = DateFormat("d MMM yyyy");
 
 class ProcessingInfo extends StatefulWidget {
-  final Package package;
+  final Package? package;
   ProcessingInfo({this.package});
 
   @override
@@ -29,14 +29,14 @@ class ProcessingInfo extends StatefulWidget {
 
 class _ProcessingInfoState extends State<ProcessingInfo> {
   var dateFormatter = new DateFormat('dd MMM yyyy');
-  Package _package;
+  Package? _package;
   bool _isLoading = false;
   MultiImgController multiImgController = MultiImgController();
 
   @override
   void initState() {
     super.initState();
-    initPackage(widget.package);
+    initPackage(widget.package!);
   }
 
   initPackage(Package package) {
@@ -54,52 +54,52 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
   @override
   Widget build(BuildContext context) {
     final trackingIdBox = DisplayText(
-      text: _package.trackingID,
+      text: _package != null ? _package!.trackingID : '',
       labelTextKey: "processing.tracking.id",
       iconData: MaterialCommunityIcons.barcode_scan,
     );
     var fcsIDBox = DisplayText(
-      text: _package.fcsID,
+      text: _package != null ? _package!.fcsID : "",
       labelTextKey: "processing.fcs.id",
       icon: FcsIDIcon(),
     );
     final phoneNumberBox = DisplayText(
-      text: _package.phoneNumber,
+      text: _package != null ? _package!.phoneNumber : "",
       labelTextKey: "processing.phone",
       iconData: Icons.phone,
     );
     final customerNameBox = DisplayText(
-      text: _package.userName,
+      text:_package!=null? _package!.userName:"",
       labelTextKey: "processing.consignee.name",
       iconData: Icons.perm_identity,
     );
     var senderFcsIDBox = DisplayText(
-      text: _package.senderFCSID,
+      text:_package!=null? _package!.senderFCSID:"",
       labelTextKey: "processing.fcs.id",
       icon: FcsIDIcon(),
     );
     final senderPhoneNumberBox = DisplayText(
-      text: _package.senderPhoneNumber,
+      text: _package!=null?_package!.senderPhoneNumber:"",
       labelTextKey: "processing.phone",
       iconData: Icons.phone,
     );
     final senderNameBox = DisplayText(
-      text: _package.senderName,
+      text:_package!=null? _package!.senderName:"",
       labelTextKey: "processing.shipper.name",
       iconData: Icons.perm_identity,
     );
     final marketBox = DisplayText(
-      text: _package.market ?? "-",
+      text:_package!=null? _package!.market : "-",
       labelTextKey: "processing.market",
       iconData: Icons.store,
     );
     final descBox = DisplayText(
-      text: _package.desc ?? "-",
+      text:_package!=null? _package!.desc : "-",
       labelTextKey: "processing.desc",
       iconData: MaterialCommunityIcons.message_text_outline,
     );
     final remarkBox = DisplayText(
-      text: _package.remark ?? "-",
+      text:_package!=null? _package!.remark : "-",
       labelTextKey: "processing.remark",
       iconData: Entypo.new_message,
     );
@@ -172,10 +172,10 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
                   marketBox,
                   descBox,
                   remarkBox,
-                  _package.photoUrls.length == 0 ? Container() : img,
+                  _package!.photoUrls.length == 0 ? Container() : img,
                   StatusTree(
-                      shipmentHistory: _package.shipmentHistory,
-                      currentStatus: _package.status),
+                      shipmentHistory: _package!.shipmentHistory,
+                      currentStatus: _package!.status),
                   SizedBox(
                     height: 20,
                   )
@@ -199,7 +199,7 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
     PackageModel packageModel =
         Provider.of<PackageModel>(context, listen: false);
     try {
-      await packageModel.deleteProcessing(_package);
+      await packageModel.deleteProcessing(_package!);
       Navigator.pop<bool>(context, true);
     } catch (e) {
       showMsgDialog(context, "Error", e.toString());
@@ -211,7 +211,7 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
   }
 
   _gotoEditor() async {
-    bool deleted = await Navigator.push<bool>(
+    bool? deleted = await Navigator.push<bool>(
         context,
         CupertinoPageRoute(
             builder: (context) => ProcessingEditEditor(
@@ -222,7 +222,7 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
     } else {
       PackageModel packageModel =
           Provider.of<PackageModel>(context, listen: false);
-      Package p = await packageModel.getPackage(_package.id);
+      Package p = await packageModel.getPackage(_package!.id);
       initPackage(p);
     }
   }