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

48
lib/pages/receiving/receiving_editor.dart
View File

@@ -14,14 +14,14 @@ 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:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart';
typedef void FindCallBack();
class ReceivingEditor extends StatefulWidget {
final Package package;
final Package? package;
const ReceivingEditor({this.package});
@override
_ReceivingEditorState createState() => _ReceivingEditorState();
@@ -30,8 +30,8 @@ class ReceivingEditor extends StatefulWidget {
class _ReceivingEditorState extends State<ReceivingEditor> {
Package package = Package();
bool _isLoading = false;
bool _isNew;
User user;
late bool _isNew;
User? user;
TextEditingController _trackingIDCtl = new TextEditingController();
TextEditingController _remarkCtl = new TextEditingController();
MultiImgController _multiImgController = MultiImgController();
@@ -41,7 +41,7 @@ class _ReceivingEditorState extends State<ReceivingEditor> {
super.initState();
_isNew = widget.package == null;
if (!_isNew) {
package = widget.package;
package = widget.package!;
_trackingIDCtl.text = package.trackingID;
_remarkCtl.text = package.remark;
_multiImgController.setImageUrls = package.photoUrls;
@@ -71,7 +71,7 @@ class _ReceivingEditorState extends State<ReceivingEditor> {
children: <Widget>[
Expanded(
child: DisplayText(
text: user != null ? user.fcsID : "",
text: user != null ? user!.fcsID : "",
labelTextKey: "receiving.fcs.id",
icon: FcsIDIcon(),
)),
@@ -124,7 +124,7 @@ class _ReceivingEditorState extends State<ReceivingEditor> {
title: "Receiving",
);
final namebox = DisplayText(
text: user != null ? user.name : "",
text: user != null ? user!.name : "",
labelTextKey: "receiving.consignee.name",
iconData: Icons.person,
);
@@ -199,17 +199,17 @@ class _ReceivingEditorState extends State<ReceivingEditor> {
}
_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();
@@ -239,12 +239,12 @@ class _ReceivingEditorState extends State<ReceivingEditor> {
try {
if (_isNew) {
await packageModel.createReceiving(
user, _p, _multiImgController.getAddedFile);
user!, _p, _multiImgController.getAddedFile);
} else {
_p.id = widget.package.id;
_p.id = widget.package!.id;
_p.photoUrls = package.photoUrls;
await packageModel.updateReceiving(
user,
user!,
_p,
_multiImgController.getAddedFile,
_multiImgController.getDeletedUrl);
@@ -269,9 +269,9 @@ class _ReceivingEditorState extends State<ReceivingEditor> {
var _package = Package(
trackingID: _trackingIDCtl.text,
remark: _remarkCtl.text,
fcsID: user.fcsID,
photoUrls: widget.package.photoUrls);
return widget.package.isChangedForEdit(_package) ||
fcsID: user!.fcsID,
photoUrls: widget.package!.photoUrls);
return widget.package!.isChangedForEdit(_package) ||
_multiImgController.getAddedFile.isNotEmpty ||
_multiImgController.getDeletedUrl.isNotEmpty;
}