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 12:00:08 +06:30
parent a144c945b6
commit 5e672937b5
67 changed files with 901 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/pages/package/package_info.dart
View File

@@ -18,7 +18,7 @@ import 'package:fcs/pages/widgets/progress.dart';
import 'package:fcs/pages/widgets/status_tree.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:intl/intl.dart';
import 'package:provider/provider.dart';
@@ -27,7 +27,7 @@ final DateFormat dateFormat = DateFormat("d MMM yyyy");
class PackageInfo extends StatefulWidget {
final isCustomer;
final isSearchResult;
final Package package;
final Package? package;
PackageInfo(
{this.package, this.isSearchResult = false, this.isCustomer = false});
@@ -38,14 +38,14 @@ class PackageInfo extends StatefulWidget {
class _PackageInfoState extends State<PackageInfo> {
var dateFormatter = new DateFormat('dd MMM yyyy');
Package _package;
Package? _package;
bool _isLoading = false;
MultiImgController multiImgController = MultiImgController();
@override
void initState() {
super.initState();
initPackage(widget.package);
initPackage(widget.package!);
}
initPackage(Package pkg) async {
@@ -113,21 +113,21 @@ class _PackageInfoState extends State<PackageInfo> {
callBack: _return,
);
final deliveryAddressBox = DefaultDeliveryAddress(
deliveryAddress: _package?.deliveryAddress,
deliveryAddress: _package!.deliveryAddress,
labelKey: "package.delivery.address",
onTap: owner && canChangeDeliveryAddress
? () async {
DeliveryAddress d = await Navigator.push<DeliveryAddress>(
DeliveryAddress? d = await Navigator.push<DeliveryAddress>(
context,
CupertinoPageRoute(
builder: (context) => DeliveryAddressSelection(
deliveryAddress: _package.deliveryAddress,
deliveryAddress: _package!.deliveryAddress,
user: mainModel.user)),
);
if (d == null) return;
_changeDeliverayAddress(d);
}
: null,
: () {},
);
return LocalProgress(
@@ -159,7 +159,7 @@ class _PackageInfoState extends State<PackageInfo> {
widget.isSearchResult ? Container() : fcsIDBox,
widget.isSearchResult ? Container() : customerNameBox,
widget.isSearchResult ? Container() : marketBox,
_package == null || _package.photoUrls.length == 0
_package == null || _package!.photoUrls.length == 0
? Container()
: img,
widget.isSearchResult ? Container() : descBox,
@@ -172,8 +172,8 @@ class _PackageInfoState extends State<PackageInfo> {
widget.isSearchResult
? Container()
: StatusTree(
shipmentHistory: _package?.shipmentHistory,
currentStatus: _package?.status),
shipmentHistory: _package!.shipmentHistory,
currentStatus: _package!.status),
SizedBox(
height: 20,
)
@@ -197,11 +197,11 @@ class _PackageInfoState extends State<PackageInfo> {
Provider.of<DeliveryAddressModel>(context, listen: false);
try {
await packageModel.changeDeliveryAddress(_package, deliveryAddress);
await packageModel.changeDeliveryAddress(_package!, deliveryAddress);
var da =
await deliveryAddressModel.getDeliveryAddress(deliveryAddress.id);
setState(() {
_package.deliveryAddress = da;
_package!.deliveryAddress = da;
});
} catch (e) {
showMsgDialog(context, "Error", e.toString());
@@ -223,7 +223,7 @@ class _PackageInfoState extends State<PackageInfo> {
try {
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
await packageModel.packageReturn(_package);
await packageModel.packageReturn(_package!);
Navigator.pop(context);
} catch (e) {
showMsgDialog(context, "Error", e.toString());