null safety
This commit is contained in:
@@ -11,14 +11,14 @@ 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/processing_model.dart';
|
||||
import 'package_editor.dart';
|
||||
|
||||
class ProcesingEditor extends StatefulWidget {
|
||||
final Processing processing;
|
||||
final Processing? processing;
|
||||
const ProcesingEditor({this.processing});
|
||||
@override
|
||||
_ProcesingEditorState createState() => _ProcesingEditorState();
|
||||
@@ -27,9 +27,9 @@ class ProcesingEditor extends StatefulWidget {
|
||||
class _ProcesingEditorState extends State<ProcesingEditor> {
|
||||
Processing processing = Processing();
|
||||
bool _isLoading = false;
|
||||
bool _isNew;
|
||||
User consignee;
|
||||
User sender;
|
||||
late bool _isNew;
|
||||
User? consignee;
|
||||
User? sender;
|
||||
List<Package> packages = [];
|
||||
|
||||
@override
|
||||
@@ -37,7 +37,7 @@ class _ProcesingEditorState extends State<ProcesingEditor> {
|
||||
super.initState();
|
||||
_isNew = widget.processing == null;
|
||||
if (!_isNew) {
|
||||
processing = widget.processing;
|
||||
processing = widget.processing!;
|
||||
consignee = User(
|
||||
fcsID: processing.userID,
|
||||
name: processing.userName,
|
||||
@@ -56,7 +56,7 @@ class _ProcesingEditorState extends State<ProcesingEditor> {
|
||||
children: <Widget>[
|
||||
Expanded(
|
||||
child: DisplayText(
|
||||
text: consignee != null ? consignee.fcsID : "",
|
||||
text: consignee != null ? consignee!.fcsID : "",
|
||||
labelTextKey: "processing.fcs.id",
|
||||
icon: FcsIDIcon(),
|
||||
)),
|
||||
@@ -71,14 +71,14 @@ class _ProcesingEditorState extends State<ProcesingEditor> {
|
||||
);
|
||||
|
||||
final phoneNumberBox = DisplayText(
|
||||
text: consignee != null ? consignee.phoneNumber : "",
|
||||
text: consignee != null ? consignee!.phoneNumber : "",
|
||||
labelTextKey: "processing.phone",
|
||||
maxLines: 2,
|
||||
iconData: Icons.phone,
|
||||
);
|
||||
|
||||
final namebox = DisplayText(
|
||||
text: consignee != null ? consignee.name : "",
|
||||
text: consignee != null ? consignee!.name : "",
|
||||
labelTextKey: "processing.consignee.name",
|
||||
maxLines: 2,
|
||||
iconData: Icons.person,
|
||||
@@ -98,7 +98,7 @@ class _ProcesingEditorState extends State<ProcesingEditor> {
|
||||
children: <Widget>[
|
||||
Expanded(
|
||||
child: DisplayText(
|
||||
text: sender != null ? sender.fcsID : "",
|
||||
text: sender != null ? sender!.fcsID : "",
|
||||
labelTextKey: "processing.fcs.id",
|
||||
icon: FcsIDIcon(),
|
||||
)),
|
||||
@@ -113,14 +113,14 @@ class _ProcesingEditorState extends State<ProcesingEditor> {
|
||||
);
|
||||
|
||||
final shipperPhoneNumberBox = DisplayText(
|
||||
text: sender != null ? sender.phoneNumber : "",
|
||||
text: sender != null ? sender!.phoneNumber : "",
|
||||
labelTextKey: "processing.phone",
|
||||
maxLines: 2,
|
||||
iconData: Icons.phone,
|
||||
);
|
||||
|
||||
final shipperNamebox = DisplayText(
|
||||
text: sender != null ? sender.name : "",
|
||||
text: sender != null ? sender!.name : "",
|
||||
labelTextKey: "processing.shipper.name",
|
||||
maxLines: 2,
|
||||
iconData: Icons.person,
|
||||
@@ -152,7 +152,7 @@ class _ProcesingEditorState extends State<ProcesingEditor> {
|
||||
context, "Warning", "Please select 'Consignee'");
|
||||
return;
|
||||
}
|
||||
Package _package = await Navigator.push<Package>(
|
||||
Package? _package = await Navigator.push<Package>(
|
||||
context,
|
||||
CupertinoPageRoute(
|
||||
builder: (context) => PackageEditor(
|
||||
@@ -160,7 +160,7 @@ class _ProcesingEditorState extends State<ProcesingEditor> {
|
||||
consignee: this.consignee,
|
||||
)),
|
||||
);
|
||||
_addPackage(_package);
|
||||
_addPackage(_package!);
|
||||
// _savePackage(_package);
|
||||
}),
|
||||
],
|
||||
@@ -230,10 +230,10 @@ class _ProcesingEditorState extends State<ProcesingEditor> {
|
||||
return packages.map((p) {
|
||||
return InkWell(
|
||||
onTap: () async {
|
||||
Package _package = await Navigator.of(context).push<Package>(
|
||||
Package? _package = await Navigator.of(context).push<Package>(
|
||||
CupertinoPageRoute(
|
||||
builder: (context) => PackageInfo(package: p)));
|
||||
_savePackage(_package);
|
||||
_savePackage(_package!);
|
||||
},
|
||||
child: DisplayText(
|
||||
labelTextKey: "processing.tracking.id",
|
||||
@@ -273,7 +273,7 @@ class _ProcesingEditorState extends State<ProcesingEditor> {
|
||||
if (_isNew) {
|
||||
await processingModel.createProcessing(processing);
|
||||
} else {
|
||||
processing.id = widget.processing.id;
|
||||
processing.id = widget.processing!.id;
|
||||
await processingModel.updateProcessing(processing);
|
||||
}
|
||||
Navigator.pop(context);
|
||||
|
||||
Reference in New Issue
Block a user