sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

null safety

Browse Source
This commit is contained in:
phyothandar
2021-09-10 16:48:21 +06:30
parent 03c5fc5016
commit bb4f4ad7c2
40 changed files with 393 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pages/processing/model/processing_model.dart
View File

@@ -11,7 +11,7 @@ class ProcessingModel extends BaseModel {
List<Processing> processings = [];
final log = Logger('ProcessingModel');
StreamSubscription<QuerySnapshot> listener;
StreamSubscription<QuerySnapshot>? listener;
void initUser(user) {
super.initUser(user);
@@ -19,12 +19,12 @@ class ProcessingModel extends BaseModel {
@override
logout() async {
if (listener != null) await listener.cancel();
if (listener != null) await listener!.cancel();
processings = [];
}
Future<void> createProcessing(Processing processing) {}
Future<void> createProcessing(Processing processing) async {}
Future<void> updateProcessing(Processing processing) {}
Future<void> updateProcessing(Processing processing) async {}
}

14
lib/pages/processing/package_editor.dart
View File

@@ -44,14 +44,14 @@ class _PackageEditorState extends State<PackageEditor> {
void initState() {
super.initState();
_package = Package();
_loadPackageData(widget.package!.id);
_loadPackageData(widget.package!.id!);
}
_loadPackageData(String id) async {
if (id != null) {
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
Package package = await packageModel.getPackage(id);
Package? package = await packageModel.getPackage(id);
if (package != null) {
if (package.status != package_received_status) {
showMsgDialog(context, "Error",
@@ -65,8 +65,8 @@ class _PackageEditorState extends State<PackageEditor> {
}
setState(() {
selectedMarket = _package!.market ?? "";
_descCtl.text = _package!.desc;
_remarkCtl.text = _package!.remark;
_descCtl.text = _package!.desc!;
_remarkCtl.text = _package!.remark!;
multiImgController.setImageUrls = _package!.photoUrls;
});
}
@@ -84,7 +84,7 @@ class _PackageEditorState extends State<PackageEditor> {
IconButton(
icon: Icon(Icons.search, color: primaryColor),
onPressed: () => searchPackage(context, callbackPackageSelect: (u) {
_loadPackageData(u.id);
_loadPackageData(u.id!);
Navigator.pop(context);
})),
],
@@ -177,7 +177,7 @@ class _PackageEditorState extends State<PackageEditor> {
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!);
@@ -221,7 +221,7 @@ class _PackageEditorState extends State<PackageEditor> {
});
},
isExpanded: true,
items: markets.map<DropdownMenuItem<String>>((String value) {
items: markets.map<DropdownMenuItem<String>>((String? value) {
return DropdownMenuItem<String>(
value: value,
child: Text(value ?? "",

8
lib/pages/processing/processing_edit_editor.dart
View File

@@ -42,8 +42,8 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
super.initState();
_package = widget.package;
selectedMarket = _package!.market ?? "";
_descCtl.text = _package!.desc;
_remarkCtl.text = _package!.remark;
_descCtl.text = _package!.desc!;
_remarkCtl.text = _package!.remark!;
multiImgController.setImageUrls = _package!.photoUrls;
_user = User(
fcsID: _package!.fcsID ?? "",
@@ -162,7 +162,7 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
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!);
@@ -208,7 +208,7 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
});
},
isExpanded: true,
items: markets.map<DropdownMenuItem<String>>((String value) {
items: markets.map<DropdownMenuItem<String>>((String? value) {
return DropdownMenuItem<String>(
value: value,
child: Text(value ?? "",

6
lib/pages/processing/processing_info.dart
View File

@@ -175,7 +175,7 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
_package!.photoUrls.length == 0 ? Container() : img,
StatusTree(
shipmentHistory: _package!.shipmentHistory,
currentStatus: _package!.status),
currentStatus: _package!.status??""),
SizedBox(
height: 20,
)
@@ -222,8 +222,8 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
} 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!);
}
}
}

2
lib/pages/processing/processing_list.dart
View File

@@ -85,7 +85,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,

10
lib/pages/processing/processing_list_row.dart
View File

@@ -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),
),
),