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

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 ?? "",