null safety

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

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),
),