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

43
lib/pages/package_search/package_serach.dart
View File

@@ -1,4 +1,3 @@
import 'package:barcode_scan/barcode_scan.dart';
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/main/util.dart';
@@ -6,12 +5,12 @@ import 'package:fcs/pages/package/model/package_model.dart';
import 'package:fcs/pages/package/package_list_row.dart';
import 'package:fcs/pages/widgets/barcode_scanner.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';
Future<Package> searchPackage(BuildContext context,
{CallbackPackageSelect callbackPackageSelect}) async =>
Future<Package?> searchPackage(BuildContext context,
{CallbackPackageSelect? callbackPackageSelect}) async =>
await showSearch<Package>(
context: context,
delegate:
@@ -19,7 +18,7 @@ Future<Package> searchPackage(BuildContext context,
);
class PackageSearchDelegate extends SearchDelegate<Package> {
final CallbackPackageSelect callbackPackageSelect;
final CallbackPackageSelect? callbackPackageSelect;
PackageSearchDelegate({this.callbackPackageSelect});
@@ -32,10 +31,10 @@ class PackageSearchDelegate extends SearchDelegate<Package> {
return theme.copyWith(
inputDecorationTheme: InputDecorationTheme(
hintStyle: TextStyle(
color: theme.primaryTextTheme.caption.color, fontSize: 14)),
color: theme.primaryTextTheme.caption!.color, fontSize: 14)),
textTheme: theme.textTheme.copyWith(
title: theme.textTheme.title.copyWith(
color: theme.primaryTextTheme.title.color, fontSize: 16)),
title: theme.textTheme.title!.copyWith(
color: theme.primaryTextTheme.title!.color, fontSize: 16)),
primaryColor: primaryColor,
);
}
@@ -59,7 +58,7 @@ class PackageSearchDelegate extends SearchDelegate<Package> {
Widget buildLeading(BuildContext context) {
return IconButton(
icon: Icon(Icons.arrow_back),
onPressed: () => close(context, null),
onPressed: () => close(context, new Package()),
);
}
@@ -70,7 +69,7 @@ class PackageSearchDelegate extends SearchDelegate<Package> {
future: packageModel.searchPackage(query),
builder: (context, AsyncSnapshot<List<Package>> snapshot) {
if (snapshot.hasData) {
if (snapshot.data.length == 0) {
if (snapshot.data!.length == 0) {
return Container(
child: Center(
child: Text(
@@ -83,7 +82,7 @@ class PackageSearchDelegate extends SearchDelegate<Package> {
return Container(
padding: EdgeInsets.only(top: 15),
child: ListView(
children: snapshot.data
children: snapshot.data!
.map((u) => PackageListRow(
package: u,
callbackPackageSelect: callbackPackageSelect,
@@ -124,17 +123,17 @@ class PackageSearchDelegate extends SearchDelegate<Package> {
}
_scan(BuildContext context) 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 {
// PickedFile pickedFile =