null safety

2021-09-10 16:48:21 +06:30
parent 03c5fc5016
commit bb4f4ad7c2
40 changed files with 393 additions and 352 deletions
--- a/lib/pages/processing_old/processing_editor.dart
+++ b/lib/pages/processing_old/processing_editor.dart
@@ -18,12 +18,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_icons_null_safety/flutter_icons_null_safety.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';

 class ProcessingEditor extends StatefulWidget {
-  final Package package;
+  final Package? package;
  ProcessingEditor({this.package});

  @override
@@ -34,22 +34,22 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
  TextEditingController _remarkCtl = new TextEditingController();
  TextEditingController _descCtl = new TextEditingController();

-  Package _package;
-  User _user;
+  Package? _package;
+  User? _user;
  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;
+    selectedMarket = _package!.market ?? "";
+    _descCtl.text = _package!.desc!;
+    _remarkCtl.text = _package!.remark!;
+    multiImgController.setImageUrls = _package!.photoUrls;
    _user = User(
-        fcsID: _package.fcsID ?? "",
-        name: _package.userName ?? "",
-        phoneNumber: _package.phoneNumber ?? "");
+        fcsID: _package!.fcsID ?? "",
+        name: _package!.userName ?? "",
+        phoneNumber: _package!.phoneNumber ?? "");
  }

  final DateFormat dateFormat = DateFormat("d MMM yyyy");
@@ -63,7 +63,7 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
      children: <Widget>[
        Expanded(
            child: DisplayText(
-          text: _user.fcsID,
+          text: _user!.fcsID??"",
          labelTextKey: "processing.fcs.id",
          icon: FcsIDIcon(),
        )),
@@ -77,18 +77,18 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
      ],
    );
    final namebox = DisplayText(
-      text: _user.name,
+      text: _user!.name??"",
      labelTextKey: "processing.name",
      iconData: Icons.person,
    );
    final phoneNumberBox = DisplayText(
-      text: _user.phoneNumber,
+      text: _user!.phoneNumber??"",
      labelTextKey: "processing.phone",
      iconData: Icons.phone,
    );

    final trackingIdBox = DisplayText(
-      text: _package.trackingID,
+      text: _package!.trackingID??"",
      labelTextKey: "processing.tracking.id",
      iconData: MaterialCommunityIcons.barcode_scan,
    );
@@ -152,13 +152,13 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
    );
  }

-  String selectedMarket;
+  String? selectedMarket;
  Widget marketDropdown() {
    List<Market> _markets = Provider.of<MarketModel>(context).markets;
-    List<String> markets = _markets.map((e) => e.name).toList();
+    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 Padding(
@@ -190,7 +190,7 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
                    height: 1,
                    color: Colors.grey,
                  ),
-                  onChanged: (String newValue) {
+                  onChanged: (String? newValue) {
                    setState(() {
                      if (newValue == MANAGE_MARKET) {
                        selectedMarket = null;
@@ -201,7 +201,7 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
                    });
                  },
                  isExpanded: true,
-                  items: markets.map<DropdownMenuItem<String>>((String value) {
+                  items: markets.map<DropdownMenuItem<String>>((String? value) {
                    return DropdownMenuItem<String>(
                      value: value,
                      child: Text(value ?? "",
--- a/lib/pages/processing_old/processing_info.dart
+++ b/lib/pages/processing_old/processing_info.dart
@@ -12,7 +12,8 @@ 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_icons_null_safety/flutter_icons_null_safety.dart';
+
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';

@@ -21,7 +22,7 @@ import 'processing_editor.dart';
 final DateFormat dateFormat = DateFormat("d MMM yyyy");

 class ProcessingInfo extends StatefulWidget {
-  final Package package;
+  final Package? package;
  ProcessingInfo({this.package});

  @override
@@ -30,14 +31,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) {
@@ -55,37 +56,37 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
  @override
  Widget build(BuildContext context) {
    final trackingIdBox = DisplayText(
-      text: _package.trackingID,
+      text: _package!.trackingID ?? "",
      labelTextKey: "processing.tracking.id",
      iconData: MaterialCommunityIcons.barcode_scan,
    );
    var fcsIDBox = DisplayText(
-      text: _package.fcsID,
+      text: _package!.fcsID??"",
      labelTextKey: "processing.fcs.id",
      icon: FcsIDIcon(),
    );
    final phoneNumberBox = DisplayText(
-      text: _package.phoneNumber,
+      text: _package!.phoneNumber??"",
      labelTextKey: "processing.phone",
      iconData: Icons.phone,
    );
    final customerNameBox = DisplayText(
-      text: _package.userName,
+      text: _package!.userName??"",
      labelTextKey: "processing.name",
      iconData: Icons.perm_identity,
    );
    final marketBox = DisplayText(
-      text: _package.market ?? "-",
+      text: _package!.market ?? "-",
      labelTextKey: "processing.market",
      iconData: Icons.store,
    );
    final descBox = DisplayText(
-      text: _package.desc ?? "-",
+      text: _package!.desc ?? "-",
      labelTextKey: "processing.desc",
      iconData: MaterialCommunityIcons.message_text_outline,
    );
    final remarkBox = DisplayText(
-      text: _package.remark ?? "-",
+      text: _package!.remark ?? "-",
      labelTextKey: "processing.remark",
      iconData: Entypo.new_message,
    );
@@ -137,10 +138,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,
                  )
@@ -164,7 +165,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());
@@ -176,19 +177,19 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
  }

  _gotoEditor() async {
-    bool deleted = await Navigator.push<bool>(
+    bool? deleted = await Navigator.push<bool>(
        context,
        CupertinoPageRoute(
            builder: (context) => ProcessingEditor(
-                  package: widget.package,
+                  package: widget.package!,
                )));
    if (deleted ?? false) {
      Navigator.pop(context);
    } else {
      PackageModel packageModel =
          Provider.of<PackageModel>(context, listen: false);
-      Package p = await packageModel.getPackage(_package.id);
-      initPackage(p);
+      Package? p = await packageModel.getPackage(_package!.id!);
+      initPackage(p!);
    }
  }
 }
--- a/lib/pages/processing_old/processing_list.dart
+++ b/lib/pages/processing_old/processing_list.dart
@@ -77,7 +77,7 @@ class _ProcessingListState extends State<ProcessingList> {

  _searchCallback(Package package) async {
    var packageModel = Provider.of<PackageModel>(context, listen: false);
-    Package _package = await packageModel.getPackage(package.id);
+    Package? _package = await packageModel.getPackage(package.id!);
    if (_package == null) return;
    Navigator.push(
      context,
--- a/lib/pages/processing_old/processing_list_row.dart
+++ b/lib/pages/processing_old/processing_list_row.dart
@@ -3,7 +3,7 @@ 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:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:intl/intl.dart';

 import 'processing_info.dart';
@@ -11,12 +11,12 @@ import 'processing_info.dart';
 typedef CallbackPackageSelect(Package package);

 class ProcessingListRow extends StatelessWidget {
-  final Package package;
-  final CallbackPackageSelect callbackPackageSelect;
+  final Package? package;
+  final CallbackPackageSelect? callbackPackageSelect;
  final double dotSize = 15.0;
  final DateFormat dateFormat = new DateFormat("dd MMM yyyy");

-  ProcessingListRow({Key key, this.package, this.callbackPackageSelect})
+  ProcessingListRow({Key? key, this.package, this.callbackPackageSelect})
      : super(key: key);

  @override
@@ -24,7 +24,7 @@ class ProcessingListRow extends StatelessWidget {
    return InkWell(
      onTap: () {
        if (callbackPackageSelect != null) {
-          callbackPackageSelect(package);
+          callbackPackageSelect!(package!);
          return;
        }
        Navigator.push(
@@ -45,7 +45,7 @@ class ProcessingListRow extends StatelessWidget {
                    Container(
                      padding: EdgeInsets.only(left: 5, right: 10),
                      child: Icon(
-                        FontAwesome.dropbox,
+                        FontAwesomeIcons.dropbox,
                        color: primaryColor,
                        size: 30,
                      ),
@@ -57,7 +57,7 @@ class ProcessingListRow extends StatelessWidget {
                          Padding(
                            padding: const EdgeInsets.only(left: 8.0),
                            child: new Text(
-                              package.id == null ? '' : package.trackingID,
+                              package!.id == null ? '' : package!.trackingID!,
                              style: new TextStyle(
                                  fontSize: 15.0, color: Colors.black),
                            ),
@@ -65,7 +65,7 @@ class ProcessingListRow extends StatelessWidget {
                          Padding(
                            padding: const EdgeInsets.only(left: 8.0),
                            child: new Text(
-                              package.market == null ? '' : package.market,
+                              package!.market == null ? '' : package!.market!,
                              style: new TextStyle(
                                  fontSize: 15.0, color: Colors.black),
                            ),
@@ -81,12 +81,14 @@ class ProcessingListRow extends StatelessWidget {
              children: <Widget>[
                Padding(
                  padding: const EdgeInsets.all(3.0),
-                  child: getStatus(package.status),
+                  child: getStatus(package!.status ?? ""),
                ),
                Padding(
                  padding: const EdgeInsets.all(0),
                  child: new Text(
-                    dateFormat.format(package.currentStatusDate),
+                    package!.currentStatusDate != null
+                        ? dateFormat.format(package!.currentStatusDate!)
+                        : '',
                    style: new TextStyle(fontSize: 15.0, color: Colors.grey),
                  ),
                ),