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

40
lib/pages/processing_old/processing_editor.dart
View File

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