null safety

This commit is contained in:
phyothandar
2021-09-10 12:00:08 +06:30
parent a144c945b6
commit 5e672937b5
67 changed files with 901 additions and 896 deletions

View File

@@ -26,7 +26,7 @@ class PackageNew extends StatefulWidget {
class _PackageNewState extends State<PackageNew> {
bool _isLoading = false;
User user;
User? user;
List<Package> packages = [];
@@ -41,7 +41,7 @@ class _PackageNewState extends State<PackageNew> {
children: <Widget>[
Expanded(
child: DisplayText(
text: user != null ? user.fcsID : "",
text: user != null ? user!.fcsID : "",
labelTextKey: "package.create.fcs.id",
icon: FcsIDIcon(),
)),
@@ -55,12 +55,12 @@ class _PackageNewState extends State<PackageNew> {
],
);
final namebox = DisplayText(
text: user != null ? user.name : "",
text: user != null ? user!.name : "",
labelTextKey: "package.create.name",
iconData: Icons.person,
);
final phoneNumberBox = DisplayText(
text: user != null ? user.phoneNumber : "",
text: user != null ? user!.phoneNumber : "",
labelTextKey: "package.create.phone",
iconData: Icons.phone,
);
@@ -144,7 +144,7 @@ class _PackageNewState extends State<PackageNew> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(packages[index].market ?? ""),
Text(packages[index].market),
Text(packages[index].trackingID),
// DisplayText(
// labelText: "Tracking ID",
@@ -170,7 +170,7 @@ class _PackageNewState extends State<PackageNew> {
}
_addPackage() async {
Package package = await Navigator.push<Package>(
Package? package = await Navigator.push<Package>(
context,
CupertinoPageRoute(builder: (context) => TrackingIDPage()),
);
@@ -197,7 +197,7 @@ class _PackageNewState extends State<PackageNew> {
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
try {
await packageModel.createPackages(user, packages);
await packageModel.createPackages(user!, packages);
Navigator.pop(context);
} catch (e) {
showMsgDialog(context, "Error", e.toString());