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

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!));
}
}