hermes-agent/flutter_wisetronic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(runtime): 37 late fields with == null checks were wrongly migrated -> nullable. Fixes LateInitializationError crashes on page navigation (shop/checkout/comment/data pages)

Browse Source
This commit is contained in:
peima
2026-08-01 01:58:36 +08:00
parent b49fb59db4
commit 0526baa3c8
32 changed files with 317 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/widgets/mobile/create_online_store_1.dart
View File

@@ -30,7 +30,7 @@ class CreateOnlineStore1State extends State<CreateOnlineStore1> {
bool canSubmit = false;
List<dynamic> stores = [];
late Map<String, dynamic> service;
Map<String, dynamic>? service;
dynamic selectedStore;
late Group group;
@@ -269,7 +269,7 @@ class CreateOnlineStore1State extends State<CreateOnlineStore1> {
Container(
padding: EdgeInsets.only(top: 8.0),
child: Text(
service['description'],
service!['description'],
),
),
);
@@ -277,7 +277,7 @@ class CreateOnlineStore1State extends State<CreateOnlineStore1> {
Container(
padding: EdgeInsets.only(top: 8.0),
child: Text(
service['options'][0]['name'],
service!['options'][0]['name'],
),
),
);
@@ -285,7 +285,7 @@ class CreateOnlineStore1State extends State<CreateOnlineStore1> {
Container(
padding: EdgeInsets.only(top: 8.0),
child: Text(
'\$${service['options'][0]['price']}',
'\$${service!['options'][0]['price']}',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,

72
lib/widgets/mobile/mobile_checkout.dart
View File

@@ -45,7 +45,7 @@ class MobileCheckout extends StatefulWidget {
}
class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProviderStateMixin, AutomaticKeepAliveClientMixin {
late CartInfo cartInfo;
CartInfo? cartInfo;
Address? shipAddress;
late bool canSubmit;
late List<ErrorMessage> errorMessages;
@@ -53,7 +53,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
late List<BookingDateTime> bookingDateTimeList;
late List<PaymentPlatform> paymentPlatforms;
TextValue? durationInTraffic;
late int selectedCoupon;
int? selectedCoupon;
double couponDiscountAmount = 0;
late List<Coupon> coupons;
@@ -79,7 +79,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
GlobalKey slidingUpPanelKey = GlobalKey();
late SlidingUpPanel slidingUpPanel;
PanelController panelController = PanelController();
late Widget panel;
Widget? panel;
late double subtotal;
@@ -102,7 +102,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
);
}
if (cartInfo.businessInfo!.deliveryPickup == false && cartInfo.businessInfo!.deliveryCanadaPost == false && cartInfo.businessInfo!.deliveryStoreDelivery == false) {
if (cartInfo!.businessInfo!.deliveryPickup == false && cartInfo!.businessInfo!.deliveryCanadaPost == false && cartInfo!.businessInfo!.deliveryStoreDelivery == false) {
return Scaffold(
body: Container(
child: Center(
@@ -197,13 +197,13 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'\$${(cartInfo.totalPrice! - couponDiscountAmount).toStringAsFixed(2)}',
'\$${(cartInfo!.totalPrice! - couponDiscountAmount).toStringAsFixed(2)}',
style: TextStyle(
fontSize: 20.0,
color: Colors.white,
),
),
cartInfo.businessInfo!.isPublic == true ? SizedBox.shrink() : Container(
cartInfo!.businessInfo!.isPublic == true ? SizedBox.shrink() : Container(
padding: EdgeInsets.only(top: 2.0, bottom: 2.0, left: 5.0, right: 5.0),
width: 100.0,
color: Colors.red,
@@ -267,7 +267,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
itemCount: 6,
addAutomaticKeepAlives: true,
itemBuilder: (BuildContext context, int position) {
var deliveryTimeInSeconds = cartInfo.businessInfo!.shippingTime! * 60 + (durationInTraffic != null ? durationInTraffic!.value ?? 0 : 0);
var deliveryTimeInSeconds = cartInfo!.businessInfo!.shippingTime! * 60 + (durationInTraffic != null ? durationInTraffic!.value ?? 0 : 0);
print('aaa: $deliveryTimeInSeconds');
DateTime now = DateTime.now();
var formatter = DateFormat('H:mm');
@@ -341,7 +341,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
);
switch (position) {
case 0:
if (cartInfo.businessInfo!.deliveryPickup == true) {
if (cartInfo!.businessInfo!.deliveryPickup == true) {
return Container(
padding: EdgeInsets.only(
top: 16.0, bottom: 16.0, left: 16.0, right: 16.0),
@@ -389,7 +389,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
Container(
margin: EdgeInsets.only(top: 10.0),
child: Text(
cartInfo.businessInfo!.name!,
cartInfo!.businessInfo!.name!,
style: TextStyle(
fontSize: 17.0,
),
@@ -398,7 +398,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
Container(
margin: EdgeInsets.only(top: 5.0),
child: Text(
cartInfo.businessInfo!.address!.addressLine1!,
cartInfo!.businessInfo!.address!.addressLine1!,
style: TextStyle(
fontSize: 14.0,
color: Colors.black45,
@@ -406,9 +406,9 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
),
Container(
child: cartInfo.businessInfo!.address!.addressLine2 != null
&& cartInfo.businessInfo!.address!.addressLine2!.length > 0 ?
Text(cartInfo.businessInfo!.address!.addressLine2!,
child: cartInfo!.businessInfo!.address!.addressLine2 != null
&& cartInfo!.businessInfo!.address!.addressLine2!.length > 0 ?
Text(cartInfo!.businessInfo!.address!.addressLine2!,
style: TextStyle(
fontSize: 14.0,
color: Colors.black45,
@@ -417,7 +417,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
Container(
child: Text(
'${cartInfo.businessInfo!.address!.city}, ${cartInfo.businessInfo!.address!.state}, ${cartInfo.businessInfo!.address!.zip}',
'${cartInfo!.businessInfo!.address!.city}, ${cartInfo!.businessInfo!.address!.state}, ${cartInfo!.businessInfo!.address!.zip}',
style: TextStyle(
fontSize: 14.0,
color: Colors.black45,
@@ -427,7 +427,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
Container(
margin: EdgeInsets.only(top: 5.0),
child: Text(
'Tel: ${cartInfo.businessInfo!.phone}',
'Tel: ${cartInfo!.businessInfo!.phone}',
style: TextStyle(
fontSize: 15.0,
color: Colors.black54,
@@ -504,7 +504,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
),
onTap: () {
Routes.router.navigateTo(context, '/my-addresses/${cartInfo.businessInfo!.id}', replace: true);
Routes.router.navigateTo(context, '/my-addresses/${cartInfo!.businessInfo!.id}', replace: true);
},
);
break;
@@ -583,7 +583,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
},
);
}
if (cartInfo.businessInfo!.instanceDelivery != true) {
if (cartInfo!.businessInfo!.instanceDelivery != true) {
return Container(
padding: EdgeInsets.only(left: 16.0, right: 16.0, top: 0.0, bottom: 16.0),
child: Text(S.of(context).no_instance_delivery_desc),
@@ -712,7 +712,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
width: double.infinity,
padding: EdgeInsets.only(bottom: 10.0),
child: Text(
cartInfo.businessInfo!.name!,
cartInfo!.businessInfo!.name!,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 16.0,
@@ -731,9 +731,9 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
subtotal = 0.0;
for (var i = 0; i < cartInfo.productList!.length; i++) {
subtotal += cartInfo.productList![i].totalPrice!;
column.children.add(lineItem(cartInfo.productList![i]));
for (var i = 0; i < cartInfo!.productList!.length; i++) {
subtotal += cartInfo!.productList![i].totalPrice!;
column.children.add(lineItem(cartInfo!.productList![i]));
}
column.children.add(GestureDetector(
child: Container(
@@ -826,8 +826,8 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
));
if (cartInfo.extraFeeList!.length > 0) {
for (var i = 0; i < cartInfo.extraFeeList!.length; i++) {
if (cartInfo!.extraFeeList!.length > 0) {
for (var i = 0; i < cartInfo!.extraFeeList!.length; i++) {
column.children.add(Container(
padding: EdgeInsets.only(bottom: 16.0),
alignment: Alignment.centerRight,
@@ -838,7 +838,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
Container(
alignment: Alignment.centerRight,
child: Text(
S.of(context).extra_fee_token(cartInfo.extraFeeList![i].name!, cartInfo.extraFeeList![i].rate!),
S.of(context).extra_fee_token(cartInfo!.extraFeeList![i].name!, cartInfo!.extraFeeList![i].rate!),
style: TextStyle(
color: Colors.grey,
),
@@ -848,7 +848,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
width: 100.0,
alignment: Alignment.centerRight,
child: Text(
'${cartInfo.extraFeeList![i].price!.toStringAsFixed(2)}'
'${cartInfo!.extraFeeList![i].price!.toStringAsFixed(2)}'
),
),
],
@@ -876,7 +876,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
width: 100.0,
alignment: Alignment.centerRight,
child: Text(
'${(cartInfo.totalPrice! - couponDiscountAmount).toStringAsFixed(2)}',
'${(cartInfo!.totalPrice! - couponDiscountAmount).toStringAsFixed(2)}',
style: TextStyle(
fontSize: 19.0,
fontWeight: FontWeight.bold,
@@ -1074,7 +1074,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
shippingRates = (response.data['shipping_rates'] as List).map((e) => ShippingRate.fromJson(e)).toList();
selectedShippingRate = (response.data['selected_shipping_rate'] as String).length > 0 ? ShippingRate.fromJson(json.decode(response.data['selected_shipping_rate'])) : null;
int i = 0;
if (cartInfo.businessInfo!.deliveryStoreDelivery == true) {
if (cartInfo!.businessInfo!.deliveryStoreDelivery == true) {
shippingMethodLabels.add(S.of(context).delivery);
shippingMethodIcons.add(Icons.directions_car);
if (deliveryMethod == 'store-delivery') {
@@ -1082,7 +1082,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
}
i++;
}
if (cartInfo.businessInfo!.deliveryCanadaPost == true) {
if (cartInfo!.businessInfo!.deliveryCanadaPost == true) {
shippingMethodLabels.add(S.of(context).canada_post);
shippingMethodIcons.add(Icons.local_shipping);
if (deliveryMethod == 'canada-post') {
@@ -1090,7 +1090,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
}
i++;
}
if (cartInfo.businessInfo!.deliveryPickup == true) {
if (cartInfo!.businessInfo!.deliveryPickup == true) {
shippingMethodLabels.add(S.of(context).pickup);
shippingMethodIcons.add(Icons.store);
if (deliveryMethod == 'pickup') {
@@ -1681,7 +1681,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
return GestureDetector(
child: Container(
decoration: selectedCoupon == 0 ? BoxDecoration(
color: subtotal > cartInfo.businessInfo!.minPrice! ? Colors
color: subtotal > cartInfo!.businessInfo!.minPrice! ? Colors
.transparent : Colors.black38,
border: Border(
top: BorderSide(
@@ -1702,7 +1702,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
),
) : BoxDecoration(
color: subtotal > cartInfo.businessInfo!.minPrice! ? Colors
color: subtotal > cartInfo!.businessInfo!.minPrice! ? Colors
.transparent : Colors.black38,
),
child: Row(
@@ -1743,7 +1743,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
return GestureDetector(
child: Container(
decoration: selectedCoupon == coupon.id ? BoxDecoration(
color: subtotal > cartInfo.businessInfo!.minPrice! ? Colors
color: subtotal > cartInfo!.businessInfo!.minPrice! ? Colors
.transparent : Colors.black38,
border: Border(
top: BorderSide(
@@ -1917,7 +1917,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
crossAxisAlignment: CrossAxisAlignment.start,
children: [],
);
if (cartInfo.businessInfo!.quickInputs!.length > 0) {
if (cartInfo!.businessInfo!.quickInputs!.length > 0) {
Wrap w = Wrap(
children: [],
);
@@ -1931,8 +1931,8 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
),
));
for (int i = 0; i < cartInfo.businessInfo!.quickInputs!.length; i++) {
String qi = cartInfo.businessInfo!.quickInputs![i].value!;
for (int i = 0; i < cartInfo!.businessInfo!.quickInputs!.length; i++) {
String qi = cartInfo!.businessInfo!.quickInputs![i].value!;
w.children.add(TextButton(
child: Text(
qi,
@@ -2196,7 +2196,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
},
businessId: widget.businessId,
body: {
'cart_id': cartInfo.id,
'cart_id': cartInfo!.id,
'remark': orderRemark,
'booked_at': bookingTimeList.length > 0
? bookingTimeList[bookingTimeIndex].unixTime

16
lib/widgets/mobile/mobile_new_comment.dart
View File

@@ -31,7 +31,7 @@ class MobileNewComment extends StatefulWidget {
}
class MobileNewCommentState extends State<MobileNewComment> {
late Comment comment;
Comment? comment;
late bool _showProgress;
@@ -167,8 +167,8 @@ class MobileNewCommentState extends State<MobileNewComment> {
children: <Widget>[],
);
if (comment != null && comment.images!.length > 0) {
for (ProductImage image in comment.images!) {
if (comment != null && comment!.images!.length > 0) {
for (ProductImage image in comment!.images!) {
row.children.add(
Container(
padding: EdgeInsets.only(left: 10.0),
@@ -239,7 +239,7 @@ class MobileNewCommentState extends State<MobileNewComment> {
child: Icon(
Icons.add,
size: 60.0,
color: comment == null || comment.images!.length < 3 ? Colors.lightBlue : Colors.black12,
color: comment == null || comment!.images!.length < 3 ? Colors.lightBlue : Colors.black12,
),
decoration: BoxDecoration(
color: Colors.white70,
@@ -264,13 +264,13 @@ class MobileNewCommentState extends State<MobileNewComment> {
),
),
onTap: () {
if (comment == null || comment.images!.length < 3) {
if (comment == null || comment!.images!.length < 3) {
showDialog(
context: mainContext,
barrierDismissible: true,
builder: (BuildContext context) {
return Util().getPicture(mainContext, store.state.user!,
commentId: comment != null ? comment.id! : 0,
commentId: comment != null ? comment!.id! : 0,
orderId: widget.orderId);
}
);
@@ -329,7 +329,7 @@ class MobileNewCommentState extends State<MobileNewComment> {
}
},
queryParameters: {
'comment_id': comment != null ? comment.id! : 0,
'comment_id': comment != null ? comment!.id! : 0,
},
).catchError((error) {
Utils.showMessageDialog(context, error);
@@ -356,7 +356,7 @@ class MobileNewCommentState extends State<MobileNewComment> {
isFormData: true,
body: {
'order_id': widget.orderId,
'comment_id': comment != null ? comment.id! : 0,
'comment_id': comment != null ? comment!.id! : 0,
'content': commentController.text,
'rating': rating.round(),
},

6
lib/widgets/mobile/mobile_pay_now.dart
View File

@@ -30,7 +30,7 @@ class MobilePayNow extends StatefulWidget {
}
class MobilePayNowState extends State<MobilePayNow> {
late Order order;
Order? order;
late List<PaymentPlatform> paymentPlatforms;
late User _user;
@@ -74,7 +74,7 @@ class MobilePayNowState extends State<MobilePayNow> {
),
),
Text(
'\$${order.totalPrice!.toStringAsFixed(2)}',
'\$${order!.totalPrice!.toStringAsFixed(2)}',
style: TextStyle(
fontSize: 24.0,
fontWeight: FontWeight.bold,
@@ -194,7 +194,7 @@ class MobilePayNowState extends State<MobilePayNow> {
),
),
onTap: () {
Util.goPayment(context, order, paymentPlatform);
Util.goPayment(context, order!, paymentPlatform);
},
);
}

38
lib/widgets/mobile/mobile_product_detail_page.dart
View File

@@ -53,7 +53,7 @@ class MobileProductDetailPageState extends State<MobileProductDetailPage>
late double _sliverAppBarMaxHeight;
final double _tabBarHeight = 50;
late ProductDetail productDetail;
ProductDetail? productDetail;
late bool refresh;
@@ -133,7 +133,7 @@ class MobileProductDetailPageState extends State<MobileProductDetailPage>
padding:
EdgeInsets.only(left: 10.0, top: 5.0, right: 10.0),
child: Text(
productDetail.name!,
productDetail!.name!,
style: TextStyle(
fontSize: 15.0, fontWeight: FontWeight.bold),
maxLines: 1,
@@ -144,12 +144,12 @@ class MobileProductDetailPageState extends State<MobileProductDetailPage>
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
ShowPrice(
productDetail.price!,
productDetail!.price!,
currencySign: '\$',
fontWeight: FontWeight.bold,
smallFontSize: 14,
largeFontSize: 18,
regularPrice: productDetail.regularPrice,
regularPrice: productDetail!.regularPrice,
),
Container(
child: AddRemoveButton(
@@ -204,35 +204,35 @@ class MobileProductDetailPageState extends State<MobileProductDetailPage>
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
(productDetail.subproducts!.length > 0) ?
subProducts(productDetail.subproducts!) :
(productDetail!.subproducts!.length > 0) ?
subProducts(productDetail!.subproducts!) :
SizedBox.shrink(),
Container(
padding: EdgeInsets.only(
top: 10.0, left: 10.0, right: 10.0),
child: Text(
productDetail.description!,
productDetail!.description!,
style: TextStyle(
fontSize: 14.0, color: Colors.black54),
),
),
Container(
padding: EdgeInsets.only(left: 10.0, right: 10.0),
child: (productDetail.description2 != null &&
!productDetail.description2!.isEmpty)
child: (productDetail!.description2 != null &&
!productDetail!.description2!.isEmpty)
? Text(
'${productDetail.description2}',
'${productDetail!.description2}',
style: TextStyle(
fontSize: 14.0, color: Colors.black54),
)
: SizedBox.shrink(),
),
productDetail.detailDescription != null
productDetail!.detailDescription != null
? Container(
padding:
EdgeInsets.only(left: 10.0, right: 10.0),
child: MarkdownBody(
data: '${productDetail.detailDescription}',
data: '${productDetail!.detailDescription}',
shrinkWrap: true,
),
)
@@ -250,7 +250,7 @@ class MobileProductDetailPageState extends State<MobileProductDetailPage>
children: <Widget>[
Container(
child: Text(
S.of(context).weight_token(productDetail.weight!),
S.of(context).weight_token(productDetail!.weight!),
style: TextStyle(
fontSize: 12.0,
color: Colors.black54,
@@ -260,9 +260,9 @@ class MobileProductDetailPageState extends State<MobileProductDetailPage>
Container(
child: Text(
S.of(context).dimentions_token(
productDetail.dimentionsLength!,
productDetail.dimentionsWidth!,
productDetail.dimentionsHeight!),
productDetail!.dimentionsLength!,
productDetail!.dimentionsWidth!,
productDetail!.dimentionsHeight!),
style: TextStyle(
fontSize: 12.0,
color: Colors.black54,
@@ -418,10 +418,10 @@ class MobileProductDetailPageState extends State<MobileProductDetailPage>
List<Widget> _getProductPictures(BuildContext context) {
var pages = <Widget>[];
List<String> images = [];
images.add(productDetail.image!);
for (var i = 0; i < productDetail.images!.length; i++) {
images.add(productDetail!.image!);
for (var i = 0; i < productDetail!.images!.length; i++) {
// print('>>https:' + productDetail.images[i].image);
images.add(productDetail.images![i].image!);
images.add(productDetail!.images![i].image!);
}
for (var i = 0; i < images.length; i++) {

12
lib/widgets/mobile/mobile_view_blog.dart
View File

@@ -28,7 +28,7 @@ class MobileViewBlog extends StatefulWidget {
}
class MobileViewBlogState extends State<MobileViewBlog> {
late Blog blog;
Blog? blog;
@override
void initState() {
@@ -85,7 +85,7 @@ class MobileViewBlogState extends State<MobileViewBlog> {
children: [
Expanded(
child: Text(
'${blog.title}',
'${blog!.title}',
style: TextStyle(
fontSize: 24.0,
color: Colors.black
@@ -93,7 +93,7 @@ class MobileViewBlogState extends State<MobileViewBlog> {
),
),
Text(
Utils.utcDatetimeStringToLocalDatetimeString(context, blog.createdAt!),
Utils.utcDatetimeStringToLocalDatetimeString(context, blog!.createdAt!),
style: TextStyle(
fontSize: 14.0,
color: Colors.black38,
@@ -106,7 +106,7 @@ class MobileViewBlogState extends State<MobileViewBlog> {
width: double.maxFinite,
padding: EdgeInsets.only(top: 8.0, left: 16.0, right: 16.0, bottom: 24.0),
child: Text(
'${blog.body}',
'${blog!.body}',
style: TextStyle(
color: Colors.black87,
fontSize: 17.0,
@@ -124,11 +124,11 @@ class MobileViewBlogState extends State<MobileViewBlog> {
Container(
width: double.maxFinite,
padding: EdgeInsets.only(top: 16.0, bottom: 16.0, left: 16.0, right: 16.0),
child: (blog.imageUrl != null) ?
child: (blog!.imageUrl != null) ?
Container(
width: min(MediaQuery.of(context).size.width, MediaQuery.of(context).size.height) - 100.0,
height: min(MediaQuery.of(context).size.width, MediaQuery.of(context).size.height) - 100.0,
child: Util.showImage('https:${blog.imageUrl}'),
child: Util.showImage('https:${blog!.imageUrl}'),
) : SizedBox.shrink(),
decoration: BoxDecoration(
border: Border(

24
lib/widgets/mobile/mobile_view_ticket.dart
View File

@@ -34,7 +34,7 @@ class MobileViewTicket extends StatefulWidget {
class MobileViewTicketState extends State<MobileViewTicket> {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
late Ticket ticket;
Ticket? ticket;
final issueMsgController = TextEditingController();
@@ -103,14 +103,14 @@ class MobileViewTicketState extends State<MobileViewTicket> {
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
S.of(context).ticket_number_token(ticket.id!),
S.of(context).ticket_number_token(ticket!.id!),
style: TextStyle(
fontSize: 24.0,
color: Colors.black
),
),
Text(
Utils.utcDatetimeStringToLocalDatetimeString(context, ticket.createdAt!),
Utils.utcDatetimeStringToLocalDatetimeString(context, ticket!.createdAt!),
style: TextStyle(
fontSize: 14.0,
color: Colors.black38,
@@ -123,7 +123,7 @@ class MobileViewTicketState extends State<MobileViewTicket> {
width: double.maxFinite,
padding: EdgeInsets.only(top: 8.0, left: 16.0, right: 16.0, bottom: 24.0),
child: Text(
'${ticket.issue!.msg}',
'${ticket!.issue!.msg}',
style: TextStyle(
color: Colors.black54,
fontSize: 14.0,
@@ -141,7 +141,7 @@ class MobileViewTicketState extends State<MobileViewTicket> {
Container(
width: double.maxFinite,
padding: EdgeInsets.only(top: 16.0, bottom: 16.0, left: 16.0, right: 16.0),
child: showGalleryImages(mainContext, ticket.issue!.files!),
child: showGalleryImages(mainContext, ticket!.issue!.files!),
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
@@ -171,7 +171,7 @@ class MobileViewTicketState extends State<MobileViewTicket> {
],
);
if (ticket.followUps!.length > 0) {
if (ticket!.followUps!.length > 0) {
view.children.add(
Container(
width: double.maxFinite,
@@ -185,8 +185,8 @@ class MobileViewTicketState extends State<MobileViewTicket> {
),
),
);
for (int i = 0; i < ticket.followUps!.length; i++) {
FollowUp followUp = ticket.followUps![i];
for (int i = 0; i < ticket!.followUps!.length; i++) {
FollowUp followUp = ticket!.followUps![i];
view.children.add(
Container(
width: double.maxFinite,
@@ -353,7 +353,7 @@ class MobileViewTicketState extends State<MobileViewTicket> {
),
);
if (ticket.followUps!.length > 0) {
if (ticket!.followUps!.length > 0) {
view.children.add(
Container(
width: double.maxFinite,
@@ -375,7 +375,7 @@ class MobileViewTicketState extends State<MobileViewTicket> {
);
}
if (ticket.isClosed == true) {
if (ticket!.isClosed == true) {
view.children.add(
Container(
padding: EdgeInsets.symmetric(horizontal: 20.0, vertical: 20.0),
@@ -393,7 +393,7 @@ class MobileViewTicketState extends State<MobileViewTicket> {
padding: EdgeInsets.only(left: 20.0, right: 20.0, top: 0.0, bottom: 30.0),
child: TextLink(
S.of(context).new_ticket,
'/new-ticket/${ticket.store!.id}',
'/new-ticket/${ticket!.store!.id}',
),
),
);
@@ -689,7 +689,7 @@ class MobileViewTicketState extends State<MobileViewTicket> {
child: Text(S.of(context).ok),
onPressed: () {
Routes.router.navigateTo(context,
'/my-support/${ticket.store!.id}',
'/my-support/${ticket!.store!.id}',
replace: true,
);
},

152
lib/widgets/mobile/shop.dart
View File

@@ -56,8 +56,8 @@ class ShopState extends State<Shop>
GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
late Business _business;
late List<CategoryProducts> _categoryProducts;
Business? _business;
List<CategoryProducts>? _categoryProducts;
late List<Product> _featuredProducts;
late List<Product> _hotSaleProducts;
@@ -86,7 +86,7 @@ class ShopState extends State<Shop>
final double _tabBarHeight = 50.0;
late double _sliverAppBarMaxHeight;
late ShopScrollController _listScrollController1;
ShopScrollController? _listScrollController1;
late ShopScrollController _listScrollController2;
late ShopScrollController _listScrollController3;
@@ -94,7 +94,7 @@ class ShopState extends State<Shop>
GlobalKey stackKey = GlobalKey();
GlobalKey endKey = GlobalKey();
late List<Comment> comments;
List<Comment>? comments;
int _commentPage = 1;
int _commentPageCount = 1;
bool _commentLoadingFinish = false;
@@ -140,7 +140,7 @@ class ShopState extends State<Shop>
'page': _commentPage.toString(),
'size': Constants.ORDERS_PER_PAGE.toString(),
},
businessId: _business.id!,
businessId: _business!.id!,
).then((data) {
if (isRefresh) {
_commentRefreshController.refreshCompleted();
@@ -226,7 +226,7 @@ class ShopState extends State<Shop>
isDraggable: true,
backdropEnabled: true,
panel: ShoppingCartBar(
business: _business,
business: _business!,
endKey: endKey,
onEmptyCartListener: () {
Future.delayed(Duration(seconds: 1), () {
@@ -247,7 +247,7 @@ class ShopState extends State<Shop>
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[],
);
for (var i = 0; i < _business.promoProducts!.length; i++) {
for (var i = 0; i < _business!.promoProducts!.length; i++) {
promotRow.children.add(Container(
padding: EdgeInsets.only(
left: 10.0,
@@ -286,17 +286,17 @@ class ShopState extends State<Shop>
GestureDetector(
child: Container(
child: Util.showImage(
_business.promoProducts![i].imagePath!,
_business!.promoProducts![i].imagePath!,
width: 110.0,
),
),
onTap: () {
_showProductDetail(_business.promoProducts![i]);
_showProductDetail(_business!.promoProducts![i]);
},
),
Container(
child: Text(
_business.promoProducts![i].name!,
_business!.promoProducts![i].name!,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 14.0),
@@ -306,13 +306,13 @@ class ShopState extends State<Shop>
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
ShowPrice(
_business.promoProducts![i].price!,
_business!.promoProducts![i].price!,
currencySign: '\$',
regularPrice: _business.promoProducts![i].regularPrice,
regularPrice: _business!.promoProducts![i].regularPrice,
),
Container(
child: AddRemoveButton(
product: _business.promoProducts![i],
product: _business!.promoProducts![i],
business: _business,
addOnly: true,
),
@@ -392,7 +392,7 @@ class ShopState extends State<Shop>
onTap: () {
Navigator.push(context,
MaterialPageRoute(builder: (BuildContext context) {
return ProductSearch(_business);
return ProductSearch(_business!);
}));
},
),
@@ -403,13 +403,13 @@ class ShopState extends State<Shop>
child: new Icon(Icons.phone),
onTap: () {
Utils.launchURL(
'tel:${Utils.getFirstNumberFromString(_business.phone!)}');
'tel:${Utils.getFirstNumberFromString(_business!.phone!)}');
},
),
),
],
title: Text(
_business != null ? _business.name! : '',
_business != null ? _business!.name! : '',
style: TextStyle(
color: Colors.white,
),
@@ -446,7 +446,7 @@ class ShopState extends State<Shop>
Tab(
child: Badge(
badgeContent: Text(
'${_business.commentsCount}',
'${_business!.commentsCount}',
style: TextStyle(color: Colors.white, fontSize: 11.0),
),
badgeStyle: BadgeStyle(badgeColor: Colors.lightBlueAccent),
@@ -508,7 +508,7 @@ class ShopState extends State<Shop>
stack.children.addAll(children);
if (_business.isPublic != true) {
if (_business!.isPublic != true) {
stack.children.add(
Positioned(
top: 0,
@@ -571,12 +571,12 @@ class ShopState extends State<Shop>
Widget commentWidget = Center(
child: Text(S.of(context).no_comments_yet),
);
if (comments != null && comments.length > 0) {
if (comments != null && comments!.length > 0) {
commentWidget = ListView.builder(
controller: _listScrollController3,
itemCount: comments.length,
itemCount: comments!.length,
itemBuilder: (BuildContext context, int position) {
Comment comment = comments[position];
Comment comment = comments![position];
Row imageRow = Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[],
@@ -772,18 +772,18 @@ class ShopState extends State<Shop>
children: <Widget>[],
);
addressColumn.children.add(new Text(
_business.address!.addressLine1! +
(_business.address!.addressLine2!.isNotEmpty
? ' ' + _business.address!.addressLine2!
_business!.address!.addressLine1! +
(_business!.address!.addressLine2!.isNotEmpty
? ' ' + _business!.address!.addressLine2!
: ''),
style: new TextStyle(fontSize: 13.0, color: const Color(0xFFEEEEEE)),
));
addressColumn.children.add(new Text(
_business.address!.city! +
_business!.address!.city! +
', ' +
_business.address!.state! +
_business!.address!.state! +
', ' +
_business.address!.zip!,
_business!.address!.zip!,
style: new TextStyle(fontSize: 13.0, color: const Color(0xFFEEEEEE)),
));
@@ -793,23 +793,23 @@ class ShopState extends State<Shop>
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[],
);
if (_business.distanceInfo != null) {
if (_business!.distanceInfo != null) {
distanceRow.children.add(new Icon(
Icons.directions_car,
size: 14.0,
color: Colors.white,
));
distanceRow.children.add(new Text(
_business.distanceInfo!.distance != null
? _business.distanceInfo!.distance!.text!
_business!.distanceInfo!.distance != null
? _business!.distanceInfo!.distance!.text!
: '***' + ' / ',
style: new TextStyle(color: const Color(0xFFEEEEEE), fontSize: 13.0),
));
var duration = Duration(
seconds: (_business.distanceInfo!.duration != null
? _business.distanceInfo!.duration!.value
seconds: (_business!.distanceInfo!.duration != null
? _business!.distanceInfo!.duration!.value
: 30)! +
_business.shippingTime! * 60);
_business!.shippingTime! * 60);
var hours = duration.inHours.remainder(60);
var minutes = duration.inMinutes.remainder(60);
distanceRow.children.add(new Text(
@@ -825,7 +825,7 @@ class ShopState extends State<Shop>
distanceRow.children.add(
new Text(
' / ' +
S.of(context).min_order_amount_token(_business.minPrice!) +
S.of(context).min_order_amount_token(_business!.minPrice!) +
' ',
style: new TextStyle(fontSize: 13.0, color: const Color(0xFFEEEEEE)),
),
@@ -853,7 +853,7 @@ class ShopState extends State<Shop>
bottom: 0.0,
child: GestureDetector(
child: Util.showImage(
'${_business.picUrl}',
'${_business!.picUrl}',
width: 72.0,
height: 72.0,
fit: BoxFit.fill,
@@ -895,7 +895,7 @@ class ShopState extends State<Shop>
color: Colors.white,
),
new Text(
_business.phone!,
_business!.phone!,
style: new TextStyle(
fontSize: 13.0, color: const Color(0xFFEEEEEE)),
)
@@ -910,9 +910,9 @@ class ShopState extends State<Shop>
color: Colors.white,
),
new Text(
_business.openingTime![0].openTime! +
_business!.openingTime![0].openTime! +
':00 - ' +
_business.openingTime![0].closeTime! +
_business!.openingTime![0].closeTime! +
':00',
style: new TextStyle(
fontSize: 13.0, color: const Color(0xFFEEEEEE)),
@@ -941,7 +941,7 @@ class ShopState extends State<Shop>
mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
_business.bulletin!.isNotEmpty ? Row(
_business!.bulletin!.isNotEmpty ? Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
@@ -956,7 +956,7 @@ class ShopState extends State<Shop>
width: mediaQuery.size.width - 30.0,
padding: EdgeInsets.only(right: 10.0, bottom: 10.0),
child: new Text(
_business.bulletin!.isEmpty ? '' : _business.bulletin!,
_business!.bulletin!.isEmpty ? '' : _business!.bulletin!,
softWrap: true,
style: new TextStyle(
fontSize: 12.0, color: const Color(0xFFDDDDDD)),
@@ -965,7 +965,7 @@ class ShopState extends State<Shop>
),
],
) : SizedBox.shrink(),
_business.description!.isNotEmpty ? Column(
_business!.description!.isNotEmpty ? Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -996,7 +996,7 @@ class ShopState extends State<Shop>
padding:
EdgeInsets.only(left: 10.0, right: 10.0, top: 5.0, bottom: 5.0),
child: Text(
_business.description!,
_business!.description!,
style: TextStyle(
color: Colors.lightGreen,
fontSize: 12.0,
@@ -1009,7 +1009,7 @@ class ShopState extends State<Shop>
padding: EdgeInsets.only(left: 10.0, right: 10.0, bottom: 10.0),
child: slidingGellery,
) : SizedBox.shrink(),
_business.policy!.isNotEmpty ? Column(
_business!.policy!.isNotEmpty ? Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -1040,7 +1040,7 @@ class ShopState extends State<Shop>
padding: EdgeInsets.only(left: 10.0, right: 10.0, bottom: 10.0),
child: SingleChildScrollView(
child: Text(
_business.policy!,
_business!.policy!,
softWrap: true,
style: TextStyle(
fontSize: 10.0,
@@ -1062,7 +1062,7 @@ class ShopState extends State<Shop>
right: 0,
bottom: 0,
child: Util.showImage(
_business.bannerImageUrl!,
_business!.bannerImageUrl!,
fit: BoxFit.cover,
),
),
@@ -1098,11 +1098,11 @@ class ShopState extends State<Shop>
List<Widget> _buildBanners(BuildContext context) {
var pages = <Widget>[];
for (var i = 0; i < _business.slideImages!.length; i++) {
for (var i = 0; i < _business!.slideImages!.length; i++) {
pages.add(new GestureDetector(
child: new Container(
child: Util.showImage(
_business.slideImages![i].imageUrl!,
_business!.slideImages![i].imageUrl!,
fit: BoxFit.cover,
),
),
@@ -1132,14 +1132,14 @@ class ShopState extends State<Shop>
child: new ListView.builder(
physics: ClampingScrollPhysics(),
controller: _listScrollController2,
itemCount: _categoryProducts == null ? 0 : _categoryProducts.length,
itemCount: _categoryProducts == null ? 0 : _categoryProducts!.length,
itemBuilder: (BuildContext context, int i) {
CategoryProducts cp = _categoryProducts[i];
CategoryProducts cp = _categoryProducts![i];
int qtyInCategory = 0;
CartInfo cartInfo =
Utils.getCartInfoByBusiness(store.state.cartInfos, _business)!;
Utils.getCartInfoByBusiness(store.state.cartInfos, _business!)!;
if (cartInfo != null &&
cartInfo.businessInfo!.id == _business.id &&
cartInfo.businessInfo!.id == _business!.id &&
cartInfo.productList != null) {
for (var i = 0; i < cartInfo.productList!.length; i++) {
if (cartInfo.productList![i].product!.categoryId == cp.id) {
@@ -1213,21 +1213,21 @@ class ShopState extends State<Shop>
}
void _selectCategory(int index) {
if (displayProductByCategoryClick && _categoryProducts[index].id! > 0) {
categoryId = _categoryProducts[index].id!;
if (displayProductByCategoryClick && _categoryProducts![index].id! > 0) {
categoryId = _categoryProducts![index].id!;
loadProducts();
return;
}
double height = 0.0;
for (int i = 0; i < index; ++i) {
height += _categoryDescHeight +
_categoryProducts[i].products!.length * _productHeight;
_categoryProducts![i].products!.length * _productHeight;
}
if (height > _listScrollController1.position.maxScrollExtent) {
height = _listScrollController1.position.maxScrollExtent;
if (height > _listScrollController1!.position.maxScrollExtent) {
height = _listScrollController1!.position.maxScrollExtent;
}
_categoryIndexChange = true;
_listScrollController1
_listScrollController1!
.animateTo(height,
duration: new Duration(
microseconds: 200,
@@ -1237,7 +1237,7 @@ class ShopState extends State<Shop>
_categoryIndexChange = false;
});
print(
'height: $height, index: $index, ${_categoryProducts[0].products!.length}');
'height: $height, index: $index, ${_categoryProducts![0].products!.length}');
if (mounted) {
setState(() {
_categoryIndex = index;
@@ -1246,7 +1246,7 @@ class ShopState extends State<Shop>
}
CategoryProducts? getCategoryProductByCategoryId(int cid) {
for (CategoryProducts cp in _categoryProducts) {
for (CategoryProducts cp in _categoryProducts!) {
if (cp.id == cid) {
return cp;
}
@@ -1256,8 +1256,8 @@ class ShopState extends State<Shop>
void _resetProductListScroll() {
if (_listScrollController1 != null &&
_listScrollController1.positions.isNotEmpty) {
_listScrollController1.animateTo(
_listScrollController1!.positions.isNotEmpty) {
_listScrollController1!.animateTo(
0,
duration: new Duration(
microseconds: 200,
@@ -1270,9 +1270,9 @@ class ShopState extends State<Shop>
int _getCategoryIndexByRightScrollHeight(double height) {
double cHeight = 0.0;
if (height > 0) {
for (int i = 0; i < _categoryProducts.length; ++i) {
for (int i = 0; i < _categoryProducts!.length; ++i) {
double categoryHeight = _categoryDescHeight +
_categoryProducts[i].products!.length * _productHeight;
_categoryProducts![i].products!.length * _productHeight;
if (height >= cHeight && height < cHeight + categoryHeight) {
return i;
}
@@ -1280,7 +1280,7 @@ class ShopState extends State<Shop>
}
}
if (height > cHeight) {
return _categoryProducts.length - 1;
return _categoryProducts!.length - 1;
}
return -1;
}
@@ -1310,7 +1310,7 @@ class ShopState extends State<Shop>
int numCategoriesHasProducts() {
int num = 0;
for (CategoryProducts cp in _categoryProducts) {
for (CategoryProducts cp in _categoryProducts!) {
if (cp.products!.length > 0) {
num += 1;
}
@@ -1340,21 +1340,21 @@ class ShopState extends State<Shop>
_categoryProducts == null ? 0 : numCategoriesHasProducts(),
itemBuilder: (BuildContext context, int i) {
CategoryProducts cp;
cp = _categoryProducts[i];
cp = _categoryProducts![i];
int index = -1;
if (displayProductByCategoryClick) {
if (categoryId > 0) {
for (var j = 0; j < _categoryProducts.length; j++) {
if (_categoryProducts[j].id == categoryId) {
cp = _categoryProducts[j];
for (var j = 0; j < _categoryProducts!.length; j++) {
if (_categoryProducts![j].id == categoryId) {
cp = _categoryProducts![j];
index = j;
break;
}
}
if (cp == null) {
index = 0;
cp = _categoryProducts[0];
cp = _categoryProducts![0];
}
}
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
@@ -1424,7 +1424,7 @@ class ShopState extends State<Shop>
pStack.children.add(Container(
// width: MediaQuery.of(context).size.width - 100.0,
child: ProductItem(
p, _business,
p, _business!,
horizontal: true,
imageWidth: 80.0,
),
@@ -1498,9 +1498,9 @@ class ShopState extends State<Shop>
_listScrollController2 = _shopCoordinator.newChildScrollController();
_listScrollController3 = _shopCoordinator.newChildScrollController();
_listScrollController1.addListener(() {
if (_listScrollController1.position.atEdge) {
if (_listScrollController1.position.pixels == 0) {
_listScrollController1!.addListener(() {
if (_listScrollController1!.position.atEdge) {
if (_listScrollController1!.position.pixels == 0) {
print('product list at top');
} else {
print('product list at bottom');
@@ -1567,7 +1567,7 @@ class ShopState extends State<Shop>
'',
'',
_hotSaleProducts);
_categoryProducts.insert(0, hs);
_categoryProducts!.insert(0, hs);
}
if (_featuredProducts.length > 0) {
@@ -1578,7 +1578,7 @@ class ShopState extends State<Shop>
'',
'',
_featuredProducts);
_categoryProducts.insert(0, fe);
_categoryProducts!.insert(0, fe);
}
checkActionAndClose(context);

14
lib/widgets/mobile/shopping_cart_bar.dart
View File

@@ -35,21 +35,21 @@ class ShoppingCartBar extends StatefulWidget {
}
class ShoppingCartBarState extends State<ShoppingCartBar> {
late CartInfo cartInfo;
CartInfo? cartInfo;
double totalPrice = 0.0;
@override
Widget build(BuildContext context) {
totalPrice = 0.0;
cartInfo = Utils.getCartInfoByBusiness(store.state.cartInfos, widget.business)!;
if (cartInfo != null && cartInfo.businessInfo!.id == widget.business.id) {
totalPrice = cartInfo.getTotalPrice();
if (cartInfo != null && cartInfo!.businessInfo!.id == widget.business.id) {
totalPrice = cartInfo!.getTotalPrice();
}
Widget cartContent;
if (cartInfo == null || (cartInfo.businessInfo!.id != widget.business.id)
|| (totalPrice == 0.0 && cartInfo.productList!.length == 0)) {
if (cartInfo == null || (cartInfo!.businessInfo!.id != widget.business.id)
|| (totalPrice == 0.0 && cartInfo!.productList!.length == 0)) {
cartContent = Center(
child: Container(
padding: EdgeInsets.all(20.0),
@@ -92,8 +92,8 @@ class ShoppingCartBarState extends State<ShoppingCartBar> {
},
),
);
for (var i = 0; i < cartInfo.productList!.length; i++) {
(cartContent as Column).children.add(cartLineItem(cartInfo.productList![i], i));
for (var i = 0; i < cartInfo!.productList!.length; i++) {
(cartContent as Column).children.add(cartLineItem(cartInfo!.productList![i], i));
}
}