null safety

lib/pages/package/package_editor.dart

@@ -14,12 +14,12 @@ import 'package:fcs/pages/widgets/multi_img_file.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';
 
 class PackageEditorPage extends StatefulWidget {
-  final Package package;
+  final Package? package;
   PackageEditorPage({this.package});
 
   @override
@@ -30,17 +30,17 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
   TextEditingController _remarkCtl = new TextEditingController();
   TextEditingController _descCtl = new TextEditingController();
 
-  Package _package;
+  Package? _package;
   bool _isLoading = false;
 
   @override
   void initState() {
     super.initState();
-    _package = widget.package;
-    selectedMarket = _package.market ?? "";
-    _descCtl.text = _package.desc;
-    _remarkCtl.text = _package.remark;
-    multiImgController.setImageUrls = _package.photoUrls;
+    _package = widget.package!;
+    selectedMarket = _package!.market;
+    _descCtl.text = _package!.desc;
+    _remarkCtl.text = _package!.remark;
+    multiImgController.setImageUrls = _package!.photoUrls;
   }
 
   final DateFormat dateFormat = DateFormat("d MMM yyyy");
@@ -51,17 +51,17 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
   @override
   Widget build(BuildContext context) {
     final trackingIdBox = DisplayText(
-      text: _package.trackingID,
+      text: _package != null ? _package!.trackingID : "",
       labelTextKey: "package.tracking.id",
       iconData: MaterialCommunityIcons.barcode_scan,
     );
     final statusBox = DisplayText(
-      text: _package.status,
+      text: _package != null ? _package!.status : "",
       labelTextKey: "package.edit.status",
       iconData: AntDesign.exclamationcircleo,
     );
     final customerNameBox = DisplayText(
-      text: _package.userName,
+      text: _package != null ? _package!.userName : "",
       labelTextKey: "package.create.name",
       iconData: Icons.perm_identity,
     );
@@ -154,13 +154,13 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
     );
   }
 
-  String selectedMarket;
+  String? selectedMarket;
   Widget marketDropdown() {
     List<Market> _markets = Provider.of<MarketModel>(context).markets;
     List<String> markets = _markets.map((e) => e.name).toList();
     markets.insert(0, MANAGE_MARKET);
     if (!markets.contains(selectedMarket)) {
-      markets.insert(0, selectedMarket);
+      markets.insert(0, selectedMarket!);
     }
 
     return Row(
@@ -183,7 +183,7 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
               height: 1,
               color: Colors.grey,
             ),
-            onChanged: (String newValue) {
+            onChanged: (String? newValue) {
               setState(() {
                 if (newValue == MANAGE_MARKET) {
                   selectedMarket = null;
@@ -197,7 +197,7 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
             items: markets.map<DropdownMenuItem<String>>((String value) {
               return DropdownMenuItem<String>(
                 value: value,
-                child: Text(value ?? "",
+                child: Text(value,
                     overflow: TextOverflow.ellipsis,
                     style: TextStyle(
                         color: value == MANAGE_MARKET
@@ -229,9 +229,9 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
     PackageModel packageModel =
         Provider.of<PackageModel>(context, listen: false);
     try {
-      _package.desc = _descCtl.text;
-      _package.remark = _remarkCtl.text;
-      _package.market = selectedMarket;
+      _package!.desc = _descCtl.text;
+      _package!.remark = _remarkCtl.text;
+      _package!.market = selectedMarket!;
       // await packageModel.completeProcessing(_package,
       //     multiImgController.getAddedFile, multiImgController.getDeletedUrl);
       Navigator.pop(context);