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

36
lib/pages/package/package_editor.dart
View File

@@ -14,12 +14,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_vector_icons/flutter_vector_icons.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
class PackageEditorPage extends StatefulWidget {
final Package package;
final Package? package;
PackageEditorPage({this.package});
@override
@@ -30,17 +30,17 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
TextEditingController _remarkCtl = new TextEditingController();
TextEditingController _descCtl = new TextEditingController();
Package _package;
Package? _package;
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;
_package = widget.package!;
selectedMarket = _package!.market;
_descCtl.text = _package!.desc;
_remarkCtl.text = _package!.remark;
multiImgController.setImageUrls = _package!.photoUrls;
}
final DateFormat dateFormat = DateFormat("d MMM yyyy");
@@ -51,17 +51,17 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
@override
Widget build(BuildContext context) {
final trackingIdBox = DisplayText(
text: _package.trackingID,
text: _package != null ? _package!.trackingID : "",
labelTextKey: "package.tracking.id",
iconData: MaterialCommunityIcons.barcode_scan,
);
final statusBox = DisplayText(
text: _package.status,
text: _package != null ? _package!.status : "",
labelTextKey: "package.edit.status",
iconData: AntDesign.exclamationcircleo,
);
final customerNameBox = DisplayText(
text: _package.userName,
text: _package != null ? _package!.userName : "",
labelTextKey: "package.create.name",
iconData: Icons.perm_identity,
);
@@ -154,13 +154,13 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
);
}
String selectedMarket;
String? selectedMarket;
Widget marketDropdown() {
List<Market> _markets = Provider.of<MarketModel>(context).markets;
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 Row(
@@ -183,7 +183,7 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
height: 1,
color: Colors.grey,
),
onChanged: (String newValue) {
onChanged: (String? newValue) {
setState(() {
if (newValue == MANAGE_MARKET) {
selectedMarket = null;
@@ -197,7 +197,7 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
items: markets.map<DropdownMenuItem<String>>((String value) {
return DropdownMenuItem<String>(
value: value,
child: Text(value ?? "",
child: Text(value,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: value == MANAGE_MARKET
@@ -229,9 +229,9 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
try {
_package.desc = _descCtl.text;
_package.remark = _remarkCtl.text;
_package.market = selectedMarket;
_package!.desc = _descCtl.text;
_package!.remark = _remarkCtl.text;
_package!.market = selectedMarket!;
// await packageModel.completeProcessing(_package,
// multiImgController.getAddedFile, multiImgController.getDeletedUrl);
Navigator.pop(context);

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());

2
lib/pages/package/package_list.dart
View File

@@ -16,7 +16,7 @@ import 'package:provider/provider.dart';
class PackageList extends StatefulWidget {
final bool forCustomer;
const PackageList({Key key, this.forCustomer = true}) : super(key: key);
const PackageList({Key? key, this.forCustomer = true}) : super(key: key);
@override
_PackageListState createState() => _PackageListState();
}

23
lib/pages/package/package_list_row.dart
View File

@@ -4,28 +4,31 @@ import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/package/package_info.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';
typedef CallbackPackageSelect(Package package);
class PackageListRow extends StatelessWidget {
final bool isCustomer;
final Package package;
final CallbackPackageSelect callbackPackageSelect;
final Package? package;
final CallbackPackageSelect? callbackPackageSelect;
final double dotSize = 15.0;
final DateFormat dateFormat = new DateFormat("dd MMM yyyy");
PackageListRow(
{Key key, this.package, this.callbackPackageSelect, this.isCustomer})
{Key? key,
this.package,
this.callbackPackageSelect,
this.isCustomer = false})
: super(key: key);
@override
Widget build(BuildContext context) {
return InkWell(
onTap: () {
onTap: () {
if (callbackPackageSelect != null) {
callbackPackageSelect(package);
callbackPackageSelect!(package!);
return;
}
Navigator.push(
@@ -57,7 +60,7 @@ class PackageListRow 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 +68,7 @@ class PackageListRow 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 +84,12 @@ class PackageListRow 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),
dateFormat.format(package!.currentStatusDate),
style:
new TextStyle(fontSize: 15.0, color: Colors.grey),
),

14
lib/pages/package/package_new.dart
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());

33
lib/pages/package/tracking_id_page.dart
View File

@@ -1,4 +1,3 @@
import 'package:barcode_scan/barcode_scan.dart';
import 'package:fcs/domain/entities/market.dart';
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/helpers/theme.dart';
@@ -12,7 +11,7 @@ import 'package:fcs/pages/widgets/local_text.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_vector_icons/flutter_vector_icons.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart';
@@ -20,7 +19,7 @@ const MANAGE_MARKET = "Manage Market";
const SELECT_MARKET = "Select Market";
class TrackingIDPage extends StatefulWidget {
const TrackingIDPage({Key key}) : super(key: key);
const TrackingIDPage({Key? key}) : super(key: key);
@override
_TrackingIDPageState createState() => _TrackingIDPageState();
}
@@ -85,7 +84,7 @@ class _TrackingIDPageState extends State<TrackingIDPage> {
);
}
String selectedMarket;
String? selectedMarket;
Widget dropDown() {
List<Market> _markets = Provider.of<MarketModel>(context).markets;
List<String> markets = _markets.map((e) => e.name).toList();
@@ -112,7 +111,7 @@ class _TrackingIDPageState extends State<TrackingIDPage> {
height: 1,
color: Colors.grey,
),
onChanged: (String newValue) {
onChanged: (String? newValue) {
setState(() {
if (newValue == MANAGE_MARKET) {
selectedMarket = null;
@@ -152,17 +151,17 @@ class _TrackingIDPageState extends State<TrackingIDPage> {
}
_scan() async {
PermissionStatus permission =
await PermissionHandler().checkPermissionStatus(PermissionGroup.camera);
if (permission != PermissionStatus.granted) {
Map<PermissionGroup, PermissionStatus> permissions =
await PermissionHandler()
.requestPermissions([PermissionGroup.camera]);
if (permissions[PermissionGroup.camera] != PermissionStatus.granted) {
showMsgDialog(context, "Error", "Camera permission is not granted");
return null;
}
}
// PermissionStatus permission =
// await PermissionHandler().checkPermissionStatus(PermissionGroup.camera);
// if (permission != PermissionStatus.granted) {
// Map<PermissionGroup, PermissionStatus> permissions =
// await PermissionHandler()
// .requestPermissions([PermissionGroup.camera]);
// if (permissions[PermissionGroup.camera] != PermissionStatus.granted) {
// showMsgDialog(context, "Error", "Camera permission is not granted");
// return null;
// }
// }
try {
String barcode = await scanBarcode();
@@ -179,6 +178,6 @@ class _TrackingIDPageState extends State<TrackingIDPage> {
_select() {
if (_transcationIDCtl.text == "" && selectedMarket == null) return;
Navigator.pop(context,
Package(trackingID: _transcationIDCtl.text, market: selectedMarket));
Package(trackingID: _transcationIDCtl.text, market: selectedMarket!));
}
}