diff --git a/assets/translations/en-US.json b/assets/translations/en.json similarity index 100% rename from assets/translations/en-US.json rename to assets/translations/en.json diff --git a/assets/translations/ru-RU.json b/assets/translations/ru.json similarity index 100% rename from assets/translations/ru-RU.json rename to assets/translations/ru.json diff --git a/assets/translations/uz-UZ.json b/assets/translations/uz.json similarity index 100% rename from assets/translations/uz-UZ.json rename to assets/translations/uz.json diff --git a/lib/constant/constant.dart b/lib/constant/constant.dart index 6becfc0..10c4e2e 100644 --- a/lib/constant/constant.dart +++ b/lib/constant/constant.dart @@ -19,7 +19,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:geolocator/geolocator.dart' as geolocator; import 'package:geolocator/geolocator.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:intl/intl.dart'; import 'package:mailer/mailer.dart'; diff --git a/lib/controllers/0n_demand_payment_controller.dart b/lib/controllers/0n_demand_payment_controller.dart index e53d848..069ee50 100644 --- a/lib/controllers/0n_demand_payment_controller.dart +++ b/lib/controllers/0n_demand_payment_controller.dart @@ -1,7 +1,8 @@ import 'dart:convert'; import 'package:cloud_firestore/cloud_firestore.dart'; -import 'package:easy_localization/easy_localization.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:customer/utils/app_router.dart'; + +import 'package:get/get.dart'; import 'package:http/http.dart' as http; import '../../models/onprovider_order_model.dart'; import '../models/wallet_transaction_model.dart'; @@ -75,7 +76,7 @@ class OnDemandPaymentController extends GetxController { Future placeOrder() async { if (!isExtra) { // Normal Order - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); onDemandOrderModel.value?.payment_method = selectedPaymentMethod.value; onDemandOrderModel.value?.paymentStatus = @@ -111,7 +112,7 @@ class OnDemandPaymentController extends GetxController { ); } - ShowToastDialog.showToast("OnDemand Service successfully booked".tr()); + ShowToastDialog.showToast("OnDemand Service successfully booked".tr); } if (selectedPaymentMethod.value == PaymentGateway.wallet.name) { WalletTransactionModel transactionModel = WalletTransactionModel( @@ -123,8 +124,8 @@ class OnDemandPaymentController extends GetxController { userId: FireStoreUtils.getCurrentUid(), isTopup: false, orderId: onDemandOrderModel.value!.id, - note: "Booking Amount debited".tr(), - paymentStatus: "success".tr(), + note: "Booking Amount debited".tr, + paymentStatus: "success".tr, ); await FireStoreUtils.setWalletTransaction(transactionModel).then(( @@ -161,7 +162,7 @@ class OnDemandPaymentController extends GetxController { isTopup: false, orderId: onDemandOrderModel.value!.id, note: "Booking Extra charge debited", - paymentStatus: "success".tr(), + paymentStatus: "success".tr, ); await FireStoreUtils.setWalletTransaction(transactionModel).then(( @@ -189,7 +190,7 @@ class OnDemandPaymentController extends GetxController { isTopup: true, orderId: onDemandOrderModel.value?.id, note: 'Extra Charge Amount Credited', - paymentStatus: "success".tr(), + paymentStatus: "success".tr, ); await FireStoreUtils.setWalletTransaction(transactionModel).then(( @@ -321,7 +322,7 @@ class OnDemandPaymentController extends GetxController { if (paymentIntentData!.containsKey("error")) { Get.back(); ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } else { await Stripe.instance.initPaymentSheet( @@ -354,7 +355,7 @@ class OnDemandPaymentController extends GetxController { Future displayStripePaymentSheet({required String amount}) async { try { await Stripe.instance.presentPaymentSheet().then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); placeOrder(); }); } on StripeException catch (e) { @@ -437,10 +438,10 @@ class OnDemandPaymentController extends GetxController { final data = jsonDecode(response.body); Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -472,15 +473,15 @@ class OnDemandPaymentController extends GetxController { note: "Contact us for any questions on your order.", onSuccess: (Map params) async { placeOrder(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); }, onError: (error) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, onCancel: (params) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, ), ), @@ -507,15 +508,15 @@ class OnDemandPaymentController extends GetxController { ), )!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } }); @@ -557,10 +558,10 @@ class OnDemandPaymentController extends GetxController { value, ) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -594,11 +595,11 @@ class OnDemandPaymentController extends GetxController { ); if (isDone) { Get.back(); - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); placeOrder(); } else { Get.back(); - ShowToastDialog.showToast("Payment Failed".tr()); + ShowToastDialog.showToast("Payment Failed".tr); } }); } @@ -743,7 +744,7 @@ class OnDemandPaymentController extends GetxController { data["body"]["txnToken"].toString().isEmpty) { Get.back(); ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); } return GetPaymentTxtTokenModel.fromJson(data); @@ -780,18 +781,18 @@ class OnDemandPaymentController extends GetxController { void handlePaymentSuccess(PaymentSuccessResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } void handleExternalWaller(ExternalWalletResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Processing!! via".tr()); + ShowToastDialog.showToast("Payment Processing!! via".tr); } void handlePaymentError(PaymentFailureResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Failed!!".tr()); + ShowToastDialog.showToast("Payment Failed!!".tr); } bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { @@ -809,10 +810,10 @@ class OnDemandPaymentController extends GetxController { if (url != '') { Get.to(() => MidtransScreen(initialURl: url))!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } @@ -853,7 +854,7 @@ class OnDemandPaymentController extends GetxController { return responseData['payment_url']; } else { ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); return ''; } @@ -901,12 +902,12 @@ class OnDemandPaymentController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } }); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } } @@ -934,7 +935,7 @@ class OnDemandPaymentController extends GetxController { accessToken = responseData['access_token'] ?? ''; if (accessToken.isEmpty) { - ShowToastDialog.showToast("Failed to get access token".tr()); + ShowToastDialog.showToast("Failed to get access token".tr); return ''; } @@ -946,7 +947,7 @@ class OnDemandPaymentController extends GetxController { ); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -1001,7 +1002,7 @@ class OnDemandPaymentController extends GetxController { } } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -1029,13 +1030,13 @@ class OnDemandPaymentController extends GetxController { // () => OrangeMoneyScreen(initialURl: paymentURL, accessToken: accessToken, amount: amount, orangePay: orangeMoneyModel.value, orderId: orderId, payToken: payToken), // )!.then((value) { // if (value == true) { - // ShowToastDialog.showToast("Payment Successful!!".tr()); + // ShowToastDialog.showToast("Payment Successful!!".tr); // placeOrder(); // (); // } // }); // } else { - // ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + // ShowToastDialog.showToast("Payment Unsuccessful!!".tr); // } // } // @@ -1058,7 +1059,7 @@ class OnDemandPaymentController extends GetxController { // // ignore: use_build_context_synchronously // return await webpayment(context: context, amountData: amount, currency: currency, orderIdData: orderId); // } else { - // ShowToastDialog.showToast("Something went wrong, please contact admin.".tr()); + // ShowToastDialog.showToast("Something went wrong, please contact admin.".tr); // return ''; // } // } @@ -1099,7 +1100,7 @@ class OnDemandPaymentController extends GetxController { // return ''; // } // } else { - // ShowToastDialog.showToast("Something went wrong, please contact admin.".tr()); + // ShowToastDialog.showToast("Something went wrong, please contact admin.".tr); // return ''; // } // } @@ -1124,11 +1125,11 @@ class OnDemandPaymentController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); (); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } diff --git a/lib/controllers/Intercity_home_controller.dart b/lib/controllers/Intercity_home_controller.dart index ba768de..5528c5e 100644 --- a/lib/controllers/Intercity_home_controller.dart +++ b/lib/controllers/Intercity_home_controller.dart @@ -42,13 +42,13 @@ import 'package:customer/payment/xenditScreen.dart'; import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/utils/preferences.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart' as flutterMap; import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_polyline_points/flutter_polyline_points.dart'; import 'package:flutter_stripe/flutter_stripe.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:http/http.dart' as http; import 'package:latlong2/latlong.dart' as latlong; @@ -402,7 +402,7 @@ class IntercityHomeController extends GetxController { Marker( markerId: const MarkerId("pickup"), position: LatLng(pickupLat, pickupLng), - infoWindow: InfoWindow(title: "Pickup Location".tr()), + infoWindow: InfoWindow(title: "Pickup Location".tr), icon: departureIcon ?? BitmapDescriptor.defaultMarkerWithHue( @@ -412,7 +412,7 @@ class IntercityHomeController extends GetxController { Marker( markerId: const MarkerId("driver"), position: LatLng(driverLat, driverLng), - infoWindow: InfoWindow(title: "Driver at Pickup".tr()), + infoWindow: InfoWindow(title: "Driver at Pickup".tr), icon: taxiIcon ?? BitmapDescriptor.defaultMarker, ), ]); @@ -421,7 +421,7 @@ class IntercityHomeController extends GetxController { Marker( markerId: const MarkerId("destination"), position: LatLng(destLat, destLng), - infoWindow: InfoWindow(title: "Destination Location".tr()), + infoWindow: InfoWindow(title: "Destination Location".tr), icon: destinationIcon ?? BitmapDescriptor.defaultMarkerWithHue( @@ -431,7 +431,7 @@ class IntercityHomeController extends GetxController { Marker( markerId: const MarkerId("driver"), position: LatLng(driverLat, driverLng), - infoWindow: InfoWindow(title: "Driver Location".tr()), + infoWindow: InfoWindow(title: "Driver Location".tr), icon: taxiIcon ?? BitmapDescriptor.defaultMarker, ), ]); @@ -536,7 +536,7 @@ class IntercityHomeController extends GetxController { if (selectedPaymentMethod.value == PaymentGateway.cod.name) { currentOrder.value.paymentMethod = selectedPaymentMethod.value; await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) { - ShowToastDialog.showToast("Payment method changed".tr()); + ShowToastDialog.showToast("Payment method changed".tr); Get.back(); Get.back(); }); @@ -557,8 +557,8 @@ class IntercityHomeController extends GetxController { userId: FireStoreUtils.getCurrentUid(), isTopup: false, orderId: currentOrder.value.id, - note: "Cab Amount debited".tr(), - paymentStatus: "success".tr(), + note: "Cab Amount debited".tr, + paymentStatus: "success".tr, serviceType: Constant.parcelServiceType, ); @@ -575,7 +575,7 @@ class IntercityHomeController extends GetxController { } await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); Get.back(); }); } @@ -743,7 +743,7 @@ class IntercityHomeController extends GetxController { final LatLng pos = LatLng(lat, lng); final markerId = MarkerId(isDeparture ? 'Departure' : 'Destination'); final icon = isDeparture ? departureIcon! : destinationIcon!; - final title = isDeparture ? 'Departure'.tr() : 'Destination'.tr(); + final title = isDeparture ? 'Departure'.tr : 'Destination'.tr; if (isDeparture) { departureLatLong.value = pos; @@ -1371,7 +1371,7 @@ class IntercityHomeController extends GetxController { if (paymentIntentData!.containsKey("error")) { Get.back(); ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } else { await Stripe.instance.initPaymentSheet( @@ -1404,7 +1404,7 @@ class IntercityHomeController extends GetxController { Future displayStripePaymentSheet({required String amount}) async { try { await Stripe.instance.presentPaymentSheet().then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); completeOrder(); }); } on StripeException catch (e) { @@ -1487,10 +1487,10 @@ class IntercityHomeController extends GetxController { final data = jsonDecode(response.body); Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -1522,15 +1522,15 @@ class IntercityHomeController extends GetxController { note: "Contact us for any questions on your order.", onSuccess: (Map params) async { completeOrder(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); }, onError: (error) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, onCancel: (params) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, ), ), @@ -1557,15 +1557,15 @@ class IntercityHomeController extends GetxController { ), )!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } }); @@ -1607,10 +1607,10 @@ class IntercityHomeController extends GetxController { value, ) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -1644,11 +1644,11 @@ class IntercityHomeController extends GetxController { ); if (isDone) { Get.back(); - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); completeOrder(); } else { Get.back(); - ShowToastDialog.showToast("Payment Failed".tr()); + ShowToastDialog.showToast("Payment Failed".tr); } }); } @@ -1776,7 +1776,7 @@ class IntercityHomeController extends GetxController { data["body"]["txnToken"].toString().isEmpty) { Get.back(); ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); } return GetPaymentTxtTokenModel.fromJson(data); @@ -1813,18 +1813,18 @@ class IntercityHomeController extends GetxController { void handlePaymentSuccess(PaymentSuccessResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } void handleExternalWaller(ExternalWalletResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Processing!! via".tr()); + ShowToastDialog.showToast("Payment Processing!! via".tr); } void handlePaymentError(PaymentFailureResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Failed!!".tr()); + ShowToastDialog.showToast("Payment Failed!!".tr); } bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { @@ -1842,10 +1842,10 @@ class IntercityHomeController extends GetxController { if (url != '') { Get.to(() => MidtransScreen(initialURl: url))!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } @@ -1886,7 +1886,7 @@ class IntercityHomeController extends GetxController { return responseData['payment_url']; } else { ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); return ''; } @@ -1929,13 +1929,13 @@ class IntercityHomeController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); (); } }); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } } @@ -1973,7 +1973,7 @@ class IntercityHomeController extends GetxController { ); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -2024,7 +2024,7 @@ class IntercityHomeController extends GetxController { } } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -2050,11 +2050,11 @@ class IntercityHomeController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); (); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } diff --git a/lib/controllers/address_list_controller.dart b/lib/controllers/address_list_controller.dart index ef1b6a2..7efd69a 100644 --- a/lib/controllers/address_list_controller.dart +++ b/lib/controllers/address_list_controller.dart @@ -1,5 +1,5 @@ import 'package:customer/models/user_model.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../constant/constant.dart'; import '../service/fire_store_utils.dart'; diff --git a/lib/controllers/advertisement_list_controller.dart b/lib/controllers/advertisement_list_controller.dart index a8f0e65..56ae63b 100644 --- a/lib/controllers/advertisement_list_controller.dart +++ b/lib/controllers/advertisement_list_controller.dart @@ -3,7 +3,7 @@ import 'package:customer/models/advertisement_model.dart'; import 'package:customer/models/favourite_model.dart'; import 'package:customer/models/vendor_model.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class AdvertisementListController extends GetxController { RxBool isLoading = true.obs; diff --git a/lib/controllers/all_brand_product_controller.dart b/lib/controllers/all_brand_product_controller.dart index 8a8867a..f167094 100644 --- a/lib/controllers/all_brand_product_controller.dart +++ b/lib/controllers/all_brand_product_controller.dart @@ -3,7 +3,7 @@ import 'package:customer/models/brands_model.dart'; import 'package:customer/models/product_model.dart'; import 'package:customer/models/vendor_model.dart'; import 'package:customer/service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class AllBrandProductController extends GetxController { RxList productList = [].obs; diff --git a/lib/controllers/all_category_product_controller.dart b/lib/controllers/all_category_product_controller.dart index d609ade..a1fe34f 100644 --- a/lib/controllers/all_category_product_controller.dart +++ b/lib/controllers/all_category_product_controller.dart @@ -1,7 +1,7 @@ import 'package:customer/models/product_model.dart'; import 'package:customer/models/vendor_category_model.dart'; import 'package:customer/service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class AllCategoryProductController extends GetxController { RxBool isLoading = true.obs; diff --git a/lib/controllers/book_parcel_controller.dart b/lib/controllers/book_parcel_controller.dart index e7d25e1..3dcf92f 100644 --- a/lib/controllers/book_parcel_controller.dart +++ b/lib/controllers/book_parcel_controller.dart @@ -3,12 +3,12 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:customer/models/vendor_model.dart'; import 'package:customer/widget/geoflutterfire/src/geoflutterfire.dart'; import 'package:dropdown_textfield/dropdown_textfield.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:geocoding/geocoding.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart' as latlong; import 'package:http/http.dart' as http; import 'package:image_picker/image_picker.dart'; @@ -124,12 +124,12 @@ class BookParcelController extends GetxController { void onCameraClick(BuildContext context) { final action = CupertinoActionSheet( message: Text( - 'Add your parcel image.'.tr(), + 'Add your parcel image.'.tr, style: const TextStyle(fontSize: 15.0), ), actions: [ CupertinoActionSheetAction( - child: Text('Choose image from gallery'.tr()), + child: Text('Choose image from gallery'.tr), onPressed: () async { Navigator.pop(context); final imageList = await _picker.pickMultiImage(); @@ -139,7 +139,7 @@ class BookParcelController extends GetxController { }, ), CupertinoActionSheetAction( - child: Text('Take a picture'.tr()), + child: Text('Take a picture'.tr), onPressed: () async { Navigator.pop(context); final XFile? photo = await _picker.pickImage( @@ -152,7 +152,7 @@ class BookParcelController extends GetxController { ), ], cancelButton: CupertinoActionSheetAction( - child: Text('Cancel'.tr()), + child: Text('Cancel'.tr), onPressed: () => Navigator.pop(context), ), ); @@ -184,39 +184,39 @@ class BookParcelController extends GetxController { bool validateFields() { if (senderNameController.value.text.isEmpty) { - ShowToastDialog.showToast("Please enter sender name".tr()); + ShowToastDialog.showToast("Please enter sender name".tr); return false; } else if (senderMobileController.value.text.isEmpty) { - ShowToastDialog.showToast("Please enter sender mobile".tr()); + ShowToastDialog.showToast("Please enter sender mobile".tr); return false; } else if (senderLocationController.value.text.isEmpty) { - ShowToastDialog.showToast("Please enter sender address".tr()); + ShowToastDialog.showToast("Please enter sender address".tr); return false; } else if (receiverNameController.value.text.isEmpty) { - ShowToastDialog.showToast("Please enter receiver name".tr()); + ShowToastDialog.showToast("Please enter receiver name".tr); return false; } else if (receiverMobileController.value.text.isEmpty) { - ShowToastDialog.showToast("Please enter receiver mobile".tr()); + ShowToastDialog.showToast("Please enter receiver mobile".tr); return false; } else if (receiverLocationController.value.text.isEmpty) { - ShowToastDialog.showToast("Please enter receiver address".tr()); + ShowToastDialog.showToast("Please enter receiver address".tr); return false; } else if (isScheduled.value) { if (scheduledDate.value.isEmpty) { - ShowToastDialog.showToast("Please select scheduled date".tr()); + ShowToastDialog.showToast("Please select scheduled date".tr); return false; } else if (scheduledTime.value.isEmpty) { - ShowToastDialog.showToast("Please select scheduled time".tr()); + ShowToastDialog.showToast("Please select scheduled time".tr); return false; } } if (selectedWeight == null) { - ShowToastDialog.showToast("Please select parcel weight".tr()); + ShowToastDialog.showToast("Please select parcel weight".tr); return false; } else if (senderLocation.value == null || receiverLocation.value == null) { ShowToastDialog.showToast( - "Please select both sender and receiver locations".tr(), + "Please select both sender and receiver locations".tr, ); return false; } @@ -254,7 +254,7 @@ class BookParcelController extends GetxController { if (distance.value < 0.5) { ShowToastDialog.showToast( "Sender's location to receiver's location should be more than 1 km." - .tr(), + .tr, ); return; } @@ -264,7 +264,7 @@ class BookParcelController extends GetxController { double.parse(selectedWeight!.deliveryCharge.toString())); goToCart(); } catch (e) { - ShowToastDialog.showToast("Something went wrong while booking.".tr()); + ShowToastDialog.showToast("Something went wrong while booking.".tr); debugPrint("bookNow error: $e"); } } diff --git a/lib/controllers/cab_booking_controller.dart b/lib/controllers/cab_booking_controller.dart index ccd500c..f894af3 100644 --- a/lib/controllers/cab_booking_controller.dart +++ b/lib/controllers/cab_booking_controller.dart @@ -40,13 +40,13 @@ import 'package:customer/payment/xenditScreen.dart'; import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/utils/preferences.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart' as flutterMap; import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_polyline_points/flutter_polyline_points.dart'; import 'package:flutter_stripe/flutter_stripe.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:http/http.dart' as http; import 'package:latlong2/latlong.dart' as latlong; @@ -393,7 +393,7 @@ class CabBookingController extends GetxController { Marker( markerId: const MarkerId("pickup"), position: LatLng(pickupLat, pickupLng), - infoWindow: InfoWindow(title: "Pickup Location".tr()), + infoWindow: InfoWindow(title: "Pickup Location".tr), icon: departureIcon ?? BitmapDescriptor.defaultMarkerWithHue( @@ -403,7 +403,7 @@ class CabBookingController extends GetxController { Marker( markerId: const MarkerId("driver"), position: LatLng(driverLat, driverLng), - infoWindow: InfoWindow(title: "Driver at Pickup".tr()), + infoWindow: InfoWindow(title: "Driver at Pickup".tr), icon: taxiIcon ?? BitmapDescriptor.defaultMarker, ), ]); @@ -412,7 +412,7 @@ class CabBookingController extends GetxController { Marker( markerId: const MarkerId("destination"), position: LatLng(destLat, destLng), - infoWindow: InfoWindow(title: "Destination Location".tr()), + infoWindow: InfoWindow(title: "Destination Location".tr), icon: destinationIcon ?? BitmapDescriptor.defaultMarkerWithHue( @@ -422,7 +422,7 @@ class CabBookingController extends GetxController { Marker( markerId: const MarkerId("driver"), position: LatLng(driverLat, driverLng), - infoWindow: InfoWindow(title: "Driver Location".tr()), + infoWindow: InfoWindow(title: "Driver Location".tr), icon: taxiIcon ?? BitmapDescriptor.defaultMarker, ), ]); @@ -527,7 +527,7 @@ class CabBookingController extends GetxController { if (selectedPaymentMethod.value == PaymentGateway.cod.name) { currentOrder.value.paymentMethod = selectedPaymentMethod.value; await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) { - ShowToastDialog.showToast("Payment method changed".tr()); + ShowToastDialog.showToast("Payment method changed".tr); Get.back(); Get.back(); }); @@ -566,7 +566,7 @@ class CabBookingController extends GetxController { } await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); Get.back(); }); } @@ -699,7 +699,7 @@ class CabBookingController extends GetxController { Marker( markerId: markerId, infoWindow: InfoWindow( - title: '${'Stop'.tr()} ${String.fromCharCode(index + 65)}', + title: '${'Stop'.tr} ${String.fromCharCode(index + 65)}', ), position: LatLng(lat, lng), icon: stopIcon!, @@ -734,7 +734,7 @@ class CabBookingController extends GetxController { final LatLng pos = LatLng(lat, lng); final markerId = MarkerId(isDeparture ? 'Departure' : 'Destination'); final icon = isDeparture ? departureIcon! : destinationIcon!; - final title = isDeparture ? 'Departure'.tr() : 'Destination'.tr(); + final title = isDeparture ? 'Departure'.tr : 'Destination'.tr; if (isDeparture) { departureLatLong.value = pos; @@ -1362,7 +1362,7 @@ class CabBookingController extends GetxController { if (paymentIntentData!.containsKey("error")) { Get.back(); ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } else { await Stripe.instance.initPaymentSheet( @@ -1395,7 +1395,7 @@ class CabBookingController extends GetxController { Future displayStripePaymentSheet({required String amount}) async { try { await Stripe.instance.presentPaymentSheet().then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); completeOrder(); }); } on StripeException catch (e) { @@ -1478,10 +1478,10 @@ class CabBookingController extends GetxController { final data = jsonDecode(response.body); Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -1513,15 +1513,15 @@ class CabBookingController extends GetxController { note: "Contact us for any questions on your order.", onSuccess: (Map params) async { completeOrder(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); }, onError: (error) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, onCancel: (params) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, ), ), @@ -1548,15 +1548,15 @@ class CabBookingController extends GetxController { ), )!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } }); @@ -1598,10 +1598,10 @@ class CabBookingController extends GetxController { value, ) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -1635,11 +1635,11 @@ class CabBookingController extends GetxController { ); if (isDone) { Get.back(); - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); completeOrder(); } else { Get.back(); - ShowToastDialog.showToast("Payment Failed".tr()); + ShowToastDialog.showToast("Payment Failed".tr); } }); } @@ -1767,7 +1767,7 @@ class CabBookingController extends GetxController { data["body"]["txnToken"].toString().isEmpty) { Get.back(); ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); } return GetPaymentTxtTokenModel.fromJson(data); @@ -1804,18 +1804,18 @@ class CabBookingController extends GetxController { void handlePaymentSuccess(PaymentSuccessResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } void handleExternalWaller(ExternalWalletResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Processing!! via".tr()); + ShowToastDialog.showToast("Payment Processing!! via".tr); } void handlePaymentError(PaymentFailureResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Failed!!".tr()); + ShowToastDialog.showToast("Payment Failed!!".tr); } bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { @@ -1833,10 +1833,10 @@ class CabBookingController extends GetxController { if (url != '') { Get.to(() => MidtransScreen(initialURl: url))!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } @@ -1877,7 +1877,7 @@ class CabBookingController extends GetxController { return responseData['payment_url']; } else { ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); return ''; } @@ -1920,13 +1920,13 @@ class CabBookingController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); (); } }); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } } @@ -1964,7 +1964,7 @@ class CabBookingController extends GetxController { ); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -2015,7 +2015,7 @@ class CabBookingController extends GetxController { } } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -2041,11 +2041,11 @@ class CabBookingController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); (); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } diff --git a/lib/controllers/cab_coupon_code_controller.dart b/lib/controllers/cab_coupon_code_controller.dart index 2da0007..12dc0e1 100644 --- a/lib/controllers/cab_coupon_code_controller.dart +++ b/lib/controllers/cab_coupon_code_controller.dart @@ -1,6 +1,6 @@ import 'package:customer/models/coupon_model.dart'; import 'package:customer/service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class CabCouponCodeController extends GetxController { // Add your methods and properties here diff --git a/lib/controllers/cab_dashboard_controller.dart b/lib/controllers/cab_dashboard_controller.dart index 24e33cf..dc8e92a 100644 --- a/lib/controllers/cab_dashboard_controller.dart +++ b/lib/controllers/cab_dashboard_controller.dart @@ -3,7 +3,7 @@ import 'package:customer/screen_ui/cab_service_screens/cab_home_screen.dart'; import 'package:customer/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart'; import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../screen_ui/cab_service_screens/my_cab_booking_screen.dart'; class CabDashboardController extends GetxController { diff --git a/lib/controllers/cab_home_controller.dart b/lib/controllers/cab_home_controller.dart index 8ece16f..ba4361c 100644 --- a/lib/controllers/cab_home_controller.dart +++ b/lib/controllers/cab_home_controller.dart @@ -1,6 +1,6 @@ import 'package:customer/models/banner_model.dart'; import 'package:customer/service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class CabHomeController extends GetxController { RxBool isLoading = true.obs; diff --git a/lib/controllers/cab_order_details_controller.dart b/lib/controllers/cab_order_details_controller.dart index e2f5e3b..a16cdfd 100644 --- a/lib/controllers/cab_order_details_controller.dart +++ b/lib/controllers/cab_order_details_controller.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'package:customer/constant/constant.dart'; import 'package:customer/models/rating_model.dart'; import 'package:flutter_polyline_points/flutter_polyline_points.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:http/http.dart' as http; import 'package:google_maps_flutter/google_maps_flutter.dart' as gmap; import 'package:latlong2/latlong.dart' as osm; diff --git a/lib/controllers/cab_rental_dashboard_controllers.dart b/lib/controllers/cab_rental_dashboard_controllers.dart index 1e0eda6..c7f5b95 100644 --- a/lib/controllers/cab_rental_dashboard_controllers.dart +++ b/lib/controllers/cab_rental_dashboard_controllers.dart @@ -3,7 +3,7 @@ import 'package:customer/screen_ui/multi_vendor_service/profile_screen/profile_s import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/screen_ui/rental_service/rental_home_screen.dart'; import 'package:customer/service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../screen_ui/rental_service/my_rental_booking_screen.dart'; class CabRentalDashboardControllers extends GetxController { diff --git a/lib/controllers/cab_review_controller.dart b/lib/controllers/cab_review_controller.dart index e5218bb..baa473b 100644 --- a/lib/controllers/cab_review_controller.dart +++ b/lib/controllers/cab_review_controller.dart @@ -1,8 +1,8 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:customer/models/cab_order_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../constant/collection_name.dart'; import '../models/rating_model.dart'; import '../models/user_model.dart'; @@ -73,11 +73,11 @@ class CabReviewController extends GetxController { /// Save / update review Future submitReview() async { if (comment.value.text.trim().isEmpty || ratings.value == 0) { - ShowToastDialog.showToast("Please provide rating and comment".tr()); + ShowToastDialog.showToast("Please provide rating and comment".tr); return; } - ShowToastDialog.showLoader("Submit in...".tr()); + ShowToastDialog.showLoader("Submit in...".tr); final user = await FireStoreUtils.getUserProfile( order.value?.driverId ?? '', diff --git a/lib/controllers/cart_controller.dart b/lib/controllers/cart_controller.dart index 5dc45ff..28f87e3 100644 --- a/lib/controllers/cart_controller.dart +++ b/lib/controllers/cart_controller.dart @@ -13,11 +13,11 @@ import 'package:customer/models/user_model.dart'; import 'package:customer/models/vendor_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/utils/preferences.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_stripe/flutter_stripe.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:http/http.dart' as http; import 'package:intl/intl.dart'; import 'package:razorpay_flutter/razorpay_flutter.dart'; @@ -416,7 +416,7 @@ class CartController extends GetxController { setOrder(); } else { ShowToastDialog.showToast( - "You don't have sufficient wallet balance to place order".tr(), + "You don't have sufficient wallet balance to place order".tr, ); } } else { @@ -425,7 +425,7 @@ class CartController extends GetxController { } Future setOrder() async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); if ((Constant.isSubscriptionModelApplied == true || Constant.sectionConstantModel?.adminCommision?.isEnabled == true) && @@ -438,7 +438,7 @@ class CartController extends GetxController { ShowToastDialog.closeLoader(); ShowToastDialog.showToast( "This vendor has reached their maximum order capacity. Please select a different vendor or try again later." - .tr(), + .tr, ); return; } @@ -508,8 +508,8 @@ class CartController extends GetxController { userId: FireStoreUtils.getCurrentUid(), isTopup: false, orderId: orderModel.id, - note: "Order Amount debited".tr(), - paymentStatus: "success".tr(), + note: "Order Amount debited".tr, + paymentStatus: "success".tr, ); await FireStoreUtils.setWalletTransaction(transactionModel).then(( @@ -712,7 +712,7 @@ class CartController extends GetxController { if (paymentIntentData!.containsKey("error")) { Get.back(); ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } else { await Stripe.instance.initPaymentSheet( @@ -745,7 +745,7 @@ class CartController extends GetxController { Future displayStripePaymentSheet({required String amount}) async { try { await Stripe.instance.presentPaymentSheet().then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); placeOrder(); }); } on StripeException catch (e) { @@ -828,10 +828,10 @@ class CartController extends GetxController { final data = jsonDecode(response.body); Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -863,15 +863,15 @@ class CartController extends GetxController { note: "Contact us for any questions on your order.", onSuccess: (Map params) async { placeOrder(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); }, onError: (error) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, onCancel: (params) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, ), ), @@ -898,15 +898,15 @@ class CartController extends GetxController { ), )!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } }); @@ -948,10 +948,10 @@ class CartController extends GetxController { value, ) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -985,11 +985,11 @@ class CartController extends GetxController { ); if (isDone) { Get.back(); - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); placeOrder(); } else { Get.back(); - ShowToastDialog.showToast("Payment Failed".tr()); + ShowToastDialog.showToast("Payment Failed".tr); } }); } @@ -1134,7 +1134,7 @@ class CartController extends GetxController { data["body"]["txnToken"].toString().isEmpty) { Get.back(); ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); } return GetPaymentTxtTokenModel.fromJson(data); @@ -1170,18 +1170,18 @@ class CartController extends GetxController { } void handlePaymentSuccess(PaymentSuccessResponse response) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } void handleExternalWaller(ExternalWalletResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Processing!! via".tr()); + ShowToastDialog.showToast("Payment Processing!! via".tr); } void handlePaymentError(PaymentFailureResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Failed!!".tr()); + ShowToastDialog.showToast("Payment Failed!!".tr); } bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { @@ -1199,10 +1199,10 @@ class CartController extends GetxController { if (url != '') { Get.to(() => MidtransScreen(initialURl: url))!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } @@ -1243,7 +1243,7 @@ class CartController extends GetxController { return responseData['payment_url']; } else { ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); return ''; } @@ -1286,13 +1286,13 @@ class CartController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); (); } }); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } } @@ -1330,7 +1330,7 @@ class CartController extends GetxController { ); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -1381,7 +1381,7 @@ class CartController extends GetxController { } } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -1407,11 +1407,11 @@ class CartController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); (); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } diff --git a/lib/controllers/cashback_controller.dart b/lib/controllers/cashback_controller.dart index 786fa55..43aa518 100644 --- a/lib/controllers/cashback_controller.dart +++ b/lib/controllers/cashback_controller.dart @@ -1,5 +1,5 @@ import '../models/cashback_model.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../service/fire_store_utils.dart'; class CashbackController extends GetxController { diff --git a/lib/controllers/category_restaurant_controller.dart b/lib/controllers/category_restaurant_controller.dart index a80b92b..dbf3077 100644 --- a/lib/controllers/category_restaurant_controller.dart +++ b/lib/controllers/category_restaurant_controller.dart @@ -3,7 +3,7 @@ import 'package:customer/models/vendor_model.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import '../models/vendor_category_model.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class CategoryRestaurantController extends GetxController { RxBool isLoading = true.obs; diff --git a/lib/controllers/change_language_controller.dart b/lib/controllers/change_language_controller.dart index 82be122..2b89879 100644 --- a/lib/controllers/change_language_controller.dart +++ b/lib/controllers/change_language_controller.dart @@ -2,7 +2,7 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/models/language_model.dart'; import '../service/fire_store_utils.dart'; import 'package:customer/utils/preferences.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../constant/collection_name.dart'; class ChangeLanguageController extends GetxController { diff --git a/lib/controllers/chat_controller.dart b/lib/controllers/chat_controller.dart index c0e2925..1923bef 100644 --- a/lib/controllers/chat_controller.dart +++ b/lib/controllers/chat_controller.dart @@ -1,13 +1,13 @@ import 'dart:async'; import 'package:cloud_firestore/cloud_firestore.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:image_picker/image_picker.dart'; import '../models/conversation_model.dart'; import '../models/inbox_model.dart'; import '../service/fire_store_utils.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:uuid/uuid.dart'; import '../service/send_notification.dart'; @@ -104,11 +104,11 @@ class ChatController extends GetxController { if (url != null) { if (url.mime.contains('image')) { - conversationModel.message = "sent a message".tr(); + conversationModel.message = "sent a message".tr; } else if (url.mime.contains('video')) { - conversationModel.message = "Sent a video".tr(); + conversationModel.message = "Sent a video".tr; } else if (url.mime.contains('audio')) { - conversationModel.message = "Sent a audio".tr(); + conversationModel.message = "Sent a audio".tr; } } @@ -152,7 +152,7 @@ class ChatController extends GetxController { // sendMessage('', url, '', 'image'); // Get.back(); // } on PlatformException catch (e) { - // ShowToastDialog.showToast("${"failed_to_pick".tr()} : \n $e"); + // ShowToastDialog.showToast("${"failed_to_pick".tr} : \n $e"); // } // } } diff --git a/lib/controllers/complain_controller.dart b/lib/controllers/complain_controller.dart index 45367eb..5fa362e 100644 --- a/lib/controllers/complain_controller.dart +++ b/lib/controllers/complain_controller.dart @@ -1,6 +1,5 @@ -import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../models/cab_order_model.dart'; import '../service/fire_store_utils.dart'; import '../themes/show_toast_dialog.dart'; @@ -22,7 +21,7 @@ class ComplainController extends GetxController { order.value = args['order'] as CabOrderModel; getComplain(); } else { - ShowToastDialog.showToast("Order data not found".tr()); + ShowToastDialog.showToast("Order data not found".tr); Get.back(); } } @@ -38,7 +37,7 @@ class ComplainController extends GetxController { comment.value.text = data['description'] ?? ''; } } catch (e) { - ShowToastDialog.showToast("Failed to load complaint".tr()); + ShowToastDialog.showToast("Failed to load complaint".tr); } finally { isLoading.value = false; } @@ -47,12 +46,12 @@ class ComplainController extends GetxController { Future submitComplain() async { // Validation if (title.value.text.trim().isEmpty) { - ShowToastDialog.showToast("Please enter complaint title".tr()); + ShowToastDialog.showToast("Please enter complaint title".tr); return; } if (comment.value.text.trim().isEmpty) { - ShowToastDialog.showToast("Please enter complaint description".tr()); + ShowToastDialog.showToast("Please enter complaint description".tr); return; } @@ -82,16 +81,16 @@ class ComplainController extends GetxController { ShowToastDialog.closeLoader(); ShowToastDialog.showToast( - "Your complaint has been submitted to admin".tr(), + "Your complaint has been submitted to admin".tr, ); Get.back(); } else { ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Your complaint is already submitted".tr()); + ShowToastDialog.showToast("Your complaint is already submitted".tr); } } catch (e) { ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Something went wrong, please try again".tr()); + ShowToastDialog.showToast("Something went wrong, please try again".tr); } finally { isLoading.value = false; } diff --git a/lib/controllers/dash_board_controller.dart b/lib/controllers/dash_board_controller.dart index 405df62..f336ca5 100644 --- a/lib/controllers/dash_board_controller.dart +++ b/lib/controllers/dash_board_controller.dart @@ -6,7 +6,7 @@ import '../screen_ui/multi_vendor_service/order_list_screen/order_screen.dart'; import '../screen_ui/multi_vendor_service/profile_screen/profile_screen.dart'; import '../screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class DashBoardController extends GetxController { RxInt selectedIndex = 0.obs; diff --git a/lib/controllers/dash_board_ecommarce_controller.dart b/lib/controllers/dash_board_ecommarce_controller.dart index 647f120..b690994 100644 --- a/lib/controllers/dash_board_ecommarce_controller.dart +++ b/lib/controllers/dash_board_ecommarce_controller.dart @@ -5,7 +5,7 @@ import '../screen_ui/multi_vendor_service/order_list_screen/order_screen.dart'; import '../screen_ui/multi_vendor_service/profile_screen/profile_screen.dart'; import '../screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class DashBoardEcommerceController extends GetxController { RxInt selectedIndex = 0.obs; diff --git a/lib/controllers/dine_in_booking_controller.dart b/lib/controllers/dine_in_booking_controller.dart index 4f31c69..482e3cd 100644 --- a/lib/controllers/dine_in_booking_controller.dart +++ b/lib/controllers/dine_in_booking_controller.dart @@ -1,6 +1,6 @@ import '../models/dine_in_booking_model.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class DineInBookingController extends GetxController { RxBool isLoading = true.obs; diff --git a/lib/controllers/dine_in_booking_details_controller.dart b/lib/controllers/dine_in_booking_details_controller.dart index 9332e76..994420c 100644 --- a/lib/controllers/dine_in_booking_details_controller.dart +++ b/lib/controllers/dine_in_booking_details_controller.dart @@ -1,5 +1,5 @@ import 'package:customer/models/dine_in_booking_model.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class DineInBookingDetailsController extends GetxController { RxBool isLoading = true.obs; diff --git a/lib/controllers/dine_in_controller.dart b/lib/controllers/dine_in_controller.dart index 57c6524..d4d5339 100644 --- a/lib/controllers/dine_in_controller.dart +++ b/lib/controllers/dine_in_controller.dart @@ -7,7 +7,7 @@ import 'package:google_maps_flutter/google_maps_flutter.dart'; import '../models/banner_model.dart'; import '../service/fire_store_utils.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class DineInController extends GetxController { RxBool isLoading = true.obs; diff --git a/lib/controllers/dine_in_restaurant_details_controller.dart b/lib/controllers/dine_in_restaurant_details_controller.dart index 5436203..a354e95 100644 --- a/lib/controllers/dine_in_restaurant_details_controller.dart +++ b/lib/controllers/dine_in_restaurant_details_controller.dart @@ -4,11 +4,11 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/models/dine_in_booking_model.dart'; import 'package:customer/models/favourite_model.dart'; import 'package:customer/models/vendor_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import '../screen_ui/multi_vendor_service/dine_in_booking/dine_in_booking_screen.dart'; import '../service/fire_store_utils.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:intl/intl.dart'; import '../service/send_notification.dart'; @@ -37,9 +37,9 @@ class DineInRestaurantDetailsController extends GetxController { String getLocalizedOccasion(String key) { switch (key) { case "Birthday": - return "Birthday".tr(); + return "Birthday".tr; case "Anniversary": - return "Anniversary".tr(); + return "Anniversary".tr; default: return key; } @@ -65,7 +65,7 @@ class DineInRestaurantDetailsController extends GetxController { } Future orderBook() async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); DateTime dt = selectedDate.value.toDate(); String hour = DateFormat("kk:mm").format( @@ -118,7 +118,7 @@ class DineInRestaurantDetailsController extends GetxController { ShowToastDialog.closeLoader(); Get.back(); Get.to(const DineInBookingScreen()); - ShowToastDialog.showToast('Dine-In Request submitted successfully.'.tr()); + ShowToastDialog.showToast('Dine-In Request submitted successfully.'.tr); } void getRecord() { diff --git a/lib/controllers/discount_restaurant_list_controller.dart b/lib/controllers/discount_restaurant_list_controller.dart index bc5b12e..4b01083 100644 --- a/lib/controllers/discount_restaurant_list_controller.dart +++ b/lib/controllers/discount_restaurant_list_controller.dart @@ -1,6 +1,6 @@ import 'package:customer/models/coupon_model.dart'; import 'package:customer/models/vendor_model.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class DiscountRestaurantListController extends GetxController { RxBool isLoading = true.obs; diff --git a/lib/controllers/edit_profile_controller.dart b/lib/controllers/edit_profile_controller.dart index 6fc4203..12c2fd4 100644 --- a/lib/controllers/edit_profile_controller.dart +++ b/lib/controllers/edit_profile_controller.dart @@ -1,11 +1,11 @@ import 'dart:io'; import 'package:customer/constant/constant.dart'; import 'package:customer/models/user_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import '../service/fire_store_utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:image_picker/image_picker.dart'; import '../themes/show_toast_dialog.dart'; @@ -48,7 +48,7 @@ class EditProfileController extends GetxController { } Future saveData() async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); if (Constant().hasValidUrl(profileImage.value) == false && profileImage.value.isNotEmpty) { profileImage.value = await Constant.uploadUserImageToFireStorage( @@ -78,7 +78,7 @@ class EditProfileController extends GetxController { Get.back(); profileImage.value = image.path; } on PlatformException catch (e) { - ShowToastDialog.showToast("${"failed_to_pick".tr()} : \n $e"); + ShowToastDialog.showToast("${"failed_to_pick".tr} : \n $e"); } } } diff --git a/lib/controllers/enter_manually_location_controller.dart b/lib/controllers/enter_manually_location_controller.dart index 6a7382d..8711cc5 100644 --- a/lib/controllers/enter_manually_location_controller.dart +++ b/lib/controllers/enter_manually_location_controller.dart @@ -1,7 +1,7 @@ import 'package:customer/service/fire_store_utils.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../models/user_model.dart'; class EnterManuallyLocationController extends GetxController { @@ -76,13 +76,13 @@ class EnterManuallyLocationController extends GetxController { String getLocalizedSaveAs(String key) { switch (key) { case 'Home': - return 'Home'.tr(); + return 'Home'.tr; case 'Work': - return 'Work'.tr(); + return 'Work'.tr; case 'Hotel': - return 'Hotel'.tr(); + return 'Hotel'.tr; case 'Other': - return 'Other'.tr(); + return 'Other'.tr; default: return key; } diff --git a/lib/controllers/favourite_controller.dart b/lib/controllers/favourite_controller.dart index b150298..e2c3b8c 100644 --- a/lib/controllers/favourite_controller.dart +++ b/lib/controllers/favourite_controller.dart @@ -5,7 +5,7 @@ import 'package:customer/models/favourite_model.dart'; import 'package:customer/models/product_model.dart'; import 'package:customer/models/vendor_model.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class FavouriteController extends GetxController { RxBool favouriteRestaurant = true.obs; diff --git a/lib/controllers/favourite_ondemmand_controller.dart b/lib/controllers/favourite_ondemmand_controller.dart index 19174cf..5210822 100644 --- a/lib/controllers/favourite_ondemmand_controller.dart +++ b/lib/controllers/favourite_ondemmand_controller.dart @@ -4,7 +4,7 @@ import 'package:customer/models/favorite_ondemand_service_model.dart'; import 'package:customer/models/provider_serivce_model.dart'; import 'package:customer/screen_ui/auth_screens/login_screen.dart'; import 'package:customer/service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class FavouriteOndemmandController extends GetxController { // Add your controller logic here diff --git a/lib/controllers/food_home_controller.dart b/lib/controllers/food_home_controller.dart index 2ffdf08..095a6e5 100644 --- a/lib/controllers/food_home_controller.dart +++ b/lib/controllers/food_home_controller.dart @@ -9,9 +9,9 @@ import 'package:customer/models/favourite_model.dart'; import 'package:customer/models/vendor_category_model.dart'; import 'package:customer/models/vendor_model.dart'; import 'package:customer/utils/preferences.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import '../models/banner_model.dart'; import '../models/story_model.dart'; @@ -33,7 +33,7 @@ class FoodHomeController extends GetxController { RxBool isLoading = true.obs; RxBool isListView = true.obs; RxBool isPopular = true.obs; - RxString selectedOrderTypeValue = "Delivery".tr().obs; + RxString selectedOrderTypeValue = "Delivery".tr.obs; Rx pageController = PageController(viewportFraction: 0.877).obs; diff --git a/lib/controllers/forgot_password_controller.dart b/lib/controllers/forgot_password_controller.dart index 4b84ad8..3936731 100644 --- a/lib/controllers/forgot_password_controller.dart +++ b/lib/controllers/forgot_password_controller.dart @@ -1,7 +1,6 @@ -import 'package:easy_localization/easy_localization.dart'; import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../themes/show_toast_dialog.dart'; class ForgotPasswordController extends GetxController { @@ -12,32 +11,29 @@ class ForgotPasswordController extends GetxController { final email = emailEditingController.value.text.trim(); if (email.isEmpty) { - ShowToastDialog.showToast("Please enter your email address.".tr()); + ShowToastDialog.showToast("Please enter your email address.".tr); return; } if (!GetUtils.isEmail(email)) { - ShowToastDialog.showToast("Please enter a valid email address.".tr()); + ShowToastDialog.showToast("Please enter a valid email address.".tr); return; } try { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); await FirebaseAuth.instance.sendPasswordResetEmail(email: email); ShowToastDialog.closeLoader(); ShowToastDialog.showToast( - 'reset_password_link_sent'.tr(namedArgs: {'email': email}) - + 'reset_password_link_sent'.trParams({'email': email}), ); Get.back(); } on FirebaseAuthException catch (e) { ShowToastDialog.closeLoader(); if (e.code == 'user-not-found') { - ShowToastDialog.showToast('No user found for that email.'.tr()); + ShowToastDialog.showToast('No user found for that email.'.tr); } else { - ShowToastDialog.showToast( - e.message?.tr() ?? "something_went_wrong".tr(), - ); + ShowToastDialog.showToast(e.message?.tr ?? "something_went_wrong".tr); } } } diff --git a/lib/controllers/gift_card_controller.dart b/lib/controllers/gift_card_controller.dart index 0acedfe..c724901 100644 --- a/lib/controllers/gift_card_controller.dart +++ b/lib/controllers/gift_card_controller.dart @@ -6,7 +6,7 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:customer/constant/constant.dart'; import 'package:customer/models/gift_cards_model.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_stripe/flutter_stripe.dart'; import 'package:razorpay_flutter/razorpay_flutter.dart'; @@ -42,7 +42,7 @@ import '../screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import '../service/fire_store_utils.dart'; import 'package:customer/utils/preferences.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:http/http.dart' as http; import 'package:uuid/uuid.dart'; @@ -99,7 +99,7 @@ class GiftCardController extends GetxController { setOrder(); } else { ShowToastDialog.showToast( - "You don't have sufficient wallet balance to purchase gift card".tr(), + "You don't have sufficient wallet balance to purchase gift card".tr, ); } } else { @@ -108,7 +108,7 @@ class GiftCardController extends GetxController { } Future setOrder() async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); GiftCardsOrderModel giftCardsOrderModel = GiftCardsOrderModel(); giftCardsOrderModel.id = const Uuid().v4(); giftCardsOrderModel.giftId = selectedGiftCard.value.id.toString(); @@ -136,8 +136,8 @@ class GiftCardController extends GetxController { userId: FireStoreUtils.getCurrentUid(), isTopup: false, orderId: giftCardsOrderModel.id, - note: "Gift card purchase amount debited".tr(), - paymentStatus: "success".tr(), + note: "Gift card purchase amount debited".tr, + paymentStatus: "success".tr, ); await FireStoreUtils.setWalletTransaction(transactionModel).then(( @@ -154,7 +154,7 @@ class GiftCardController extends GetxController { await FireStoreUtils.placeGiftCardOrder(giftCardsOrderModel); ShowToastDialog.closeLoader(); Get.off(const HistoryGiftCard()); - ShowToastDialog.showToast("Gift card Purchases successfully".tr()); + ShowToastDialog.showToast("Gift card Purchases successfully".tr); } String generateGiftCode() { @@ -371,7 +371,7 @@ class GiftCardController extends GetxController { Future displayStripePaymentSheet({required String amount}) async { try { await Stripe.instance.presentPaymentSheet().then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); placeOrder(); }); } on StripeException catch (e) { @@ -454,10 +454,10 @@ class GiftCardController extends GetxController { final data = jsonDecode(response.body); Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -486,15 +486,15 @@ class GiftCardController extends GetxController { ), )!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } }); @@ -536,10 +536,10 @@ class GiftCardController extends GetxController { value, ) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -573,11 +573,11 @@ class GiftCardController extends GetxController { ); if (isDone) { Get.back(); - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); placeOrder(); } else { Get.back(); - ShowToastDialog.showToast("Payment Failed".tr()); + ShowToastDialog.showToast("Payment Failed".tr); } }); } @@ -605,15 +605,15 @@ class GiftCardController extends GetxController { note: "Contact us for any questions on your order.", onSuccess: (Map params) async { placeOrder(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); }, onError: (error) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, onCancel: (params) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, ), ), @@ -759,7 +759,7 @@ class GiftCardController extends GetxController { data["body"]["txnToken"].toString().isEmpty) { Get.back(); ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); } return GetPaymentTxtTokenModel.fromJson(data); @@ -796,18 +796,18 @@ class GiftCardController extends GetxController { void handlePaymentSuccess(PaymentSuccessResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } void handleExternalWaller(ExternalWalletResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Processing!! via".tr()); + ShowToastDialog.showToast("Payment Processing!! via".tr); } void handlePaymentError(PaymentFailureResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Failed!!".tr()); + ShowToastDialog.showToast("Payment Failed!!".tr); } //Midtrans payment @@ -820,10 +820,10 @@ class GiftCardController extends GetxController { if (url != '') { Get.to(() => MidtransScreen(initialURl: url))!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } @@ -864,7 +864,7 @@ class GiftCardController extends GetxController { return responseData['payment_url']; } else { ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); return ''; } @@ -907,13 +907,13 @@ class GiftCardController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); (); } }); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } } @@ -951,7 +951,7 @@ class GiftCardController extends GetxController { ); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -1002,7 +1002,7 @@ class GiftCardController extends GetxController { } } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -1028,11 +1028,11 @@ class GiftCardController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); (); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } diff --git a/lib/controllers/global_setting_controller.dart b/lib/controllers/global_setting_controller.dart index 0eba1f1..1efe160 100644 --- a/lib/controllers/global_setting_controller.dart +++ b/lib/controllers/global_setting_controller.dart @@ -4,7 +4,7 @@ import 'package:customer/models/currency_model.dart'; import 'package:customer/models/user_model.dart'; import 'package:customer/utils/notification_service.dart'; import 'package:firebase_auth/firebase_auth.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../constant/collection_name.dart'; import '../service/fire_store_utils.dart'; diff --git a/lib/controllers/history_gift_card_controller.dart b/lib/controllers/history_gift_card_controller.dart index d11c857..14d749c 100644 --- a/lib/controllers/history_gift_card_controller.dart +++ b/lib/controllers/history_gift_card_controller.dart @@ -1,10 +1,10 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:customer/constant/constant.dart'; import 'package:customer/models/gift_cards_order_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:share_plus/share_plus.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class HistoryGiftCardController extends GetxController { RxList giftCardsOrderList = [].obs; @@ -40,7 +40,7 @@ class HistoryGiftCardController extends GetxController { Timestamp date, ) async { await Share.share( - "${'Gift Code :'.tr()} $giftCode\n${'Gift Pin :'.tr()} $giftPin\n${'Price :'.tr()} ${Constant.amountShow(amount: amount)}\n${'Expire Date :'.tr()} ${date.toDate()}\n\n${'Message'.tr()} : $msg", + "${'Gift Code :'.tr} $giftCode\n${'Gift Pin :'.tr} $giftPin\n${'Price :'.tr} ${Constant.amountShow(amount: amount)}\n${'Expire Date :'.tr} ${date.toDate()}\n\n${'Message'.tr} : $msg", ); } } diff --git a/lib/controllers/home_e_commerce_controller.dart b/lib/controllers/home_e_commerce_controller.dart index 95adb18..7571744 100644 --- a/lib/controllers/home_e_commerce_controller.dart +++ b/lib/controllers/home_e_commerce_controller.dart @@ -8,7 +8,7 @@ import 'package:customer/models/vendor_model.dart'; import 'package:customer/service/cart_provider.dart'; import 'package:customer/service/fire_store_utils.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../constant/constant.dart'; class HomeECommerceController extends GetxController { diff --git a/lib/controllers/home_parcel_controller.dart b/lib/controllers/home_parcel_controller.dart index f3e112f..aaccf75 100644 --- a/lib/controllers/home_parcel_controller.dart +++ b/lib/controllers/home_parcel_controller.dart @@ -1,6 +1,6 @@ import 'dart:developer'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../models/banner_model.dart'; import '../models/parcel_category.dart'; import '../service/fire_store_utils.dart'; diff --git a/lib/controllers/live_tracking_controller.dart b/lib/controllers/live_tracking_controller.dart index 9ec6f71..c347535 100644 --- a/lib/controllers/live_tracking_controller.dart +++ b/lib/controllers/live_tracking_controller.dart @@ -6,7 +6,7 @@ import 'package:customer/models/order_model.dart'; import 'package:customer/models/user_model.dart'; import 'package:customer/service/fire_store_utils.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:latlong2/latlong.dart' as location; import 'package:flutter_map/flutter_map.dart' as flutterMap; diff --git a/lib/controllers/login_controller.dart b/lib/controllers/login_controller.dart index 3af30c4..52dbfad 100644 --- a/lib/controllers/login_controller.dart +++ b/lib/controllers/login_controller.dart @@ -1,9 +1,10 @@ import 'dart:convert'; import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_sign_in/google_sign_in.dart'; import 'package:sign_in_with_apple/sign_in_with_apple.dart'; import '../constant/constant.dart'; @@ -33,18 +34,18 @@ class LoginController extends GetxController { final email = emailController.value.text.trim(); final password = passwordController.value.text.trim(); if (email.isEmpty || !email.contains('@')) { - ShowToastDialog.showToast("Please enter a valid email address".tr()); + ShowToastDialog.showToast("Please enter a valid email address".tr); return; } if (password.isEmpty) { - ShowToastDialog.showToast("Please enter your password".tr()); + ShowToastDialog.showToast("Please enter your password".tr); return; } try { isLoading.value = true; - ShowToastDialog.showLoader("Logging in...".tr()); + ShowToastDialog.showLoader("Logging in...".tr); final credential = await FirebaseAuth.instance.signInWithEmailAndPassword( email: email, @@ -69,34 +70,34 @@ class LoginController extends GetxController { Constant.selectedLocation = defaultAddress; - Get.offAll(() => const ServiceListScreen()); + Get.offAll(ServiceListScreen()); } else { - Get.offAll(() => const LocationPermissionScreen()); + Get.offAll(LocationPermissionScreen()); } } else { await FirebaseAuth.instance.signOut(); ShowToastDialog.showToast( - "This user is disabled. Please contact admin.".tr(), + "This user is disabled. Please contact admin.".tr, ); - Get.offAll(() => const LoginScreen()); + Get.offAll(LoginScreen()); } } else { await FirebaseAuth.instance.signOut(); ShowToastDialog.showToast( - "This user does not exist in the customer app.".tr(), + "This user does not exist in the customer app.".tr, ); - Get.offAll(() => const LoginScreen()); + Get.offAll(LoginScreen()); } } on FirebaseAuthException catch (e) { if (e.code == 'user-not-found') { - ShowToastDialog.showToast("No user found for that email.".tr()); + ShowToastDialog.showToast("No user found for that email.".tr); } else if (e.code == 'wrong-password') { - ShowToastDialog.showToast("Wrong password provided.".tr()); + ShowToastDialog.showToast("Wrong password provided.".tr); } else if (e.code == 'invalid-email') { - ShowToastDialog.showToast("Invalid email.".tr()); + ShowToastDialog.showToast("Invalid email.".tr); } else { ShowToastDialog.showToast( - e.message?.tr() ?? "Login failed. Please try again.".tr(), + e.message?.tr ?? "Login failed. Please try again.".tr, ); } } finally { @@ -106,7 +107,7 @@ class LoginController extends GetxController { } Future loginWithGoogle() async { - ShowToastDialog.showLoader("please wait...".tr()); + ShowToastDialog.showLoader("please wait...".tr); await signInWithGoogle().then((value) async { ShowToastDialog.closeLoader(); if (value != null) { @@ -148,23 +149,23 @@ class LoginController extends GetxController { Constant.selectedLocation = defaultAddress; - Get.offAll(() => const ServiceListScreen()); + Get.offAll(ServiceListScreen()); } else { - Get.offAll(() => const LocationPermissionScreen()); + Get.offAll(LocationPermissionScreen()); } } else { await FirebaseAuth.instance.signOut(); ShowToastDialog.showToast( - "This user is disabled. Please contact admin.".tr(), + "This user is disabled. Please contact admin.".tr, ); - Get.offAll(() => const LoginScreen()); + Get.offAll(LoginScreen()); } } else { await FirebaseAuth.instance.signOut(); ShowToastDialog.showToast( - "This user does not exist in the customer app.".tr(), + "This user does not exist in the customer app.".tr, ); - Get.offAll(() => const LoginScreen()); + Get.offAll(LoginScreen()); } } else { UserModel userModel = UserModel(); @@ -186,7 +187,7 @@ class LoginController extends GetxController { } Future loginWithApple() async { - ShowToastDialog.showLoader("please wait...".tr()); + ShowToastDialog.showLoader("please wait...".tr); await signInWithApple().then((value) async { ShowToastDialog.closeLoader(); if (value != null) { @@ -231,23 +232,23 @@ class LoginController extends GetxController { ); Constant.selectedLocation = defaultAddress; - Get.offAll(() => const ServiceListScreen()); + Get.offAll(ServiceListScreen()); } else { - Get.offAll(() => const LocationPermissionScreen()); + Get.offAll(LocationPermissionScreen()); } } else { await FirebaseAuth.instance.signOut(); ShowToastDialog.showToast( - "This user is disabled. Please contact admin.".tr(), + "This user is disabled. Please contact admin.".tr, ); - Get.offAll(() => const LoginScreen()); + Get.offAll(LoginScreen()); } } else { await FirebaseAuth.instance.signOut(); ShowToastDialog.showToast( - "This user does not exist in the customer app.".tr(), + "This user does not exist in the customer app.".tr, ); - Get.offAll(() => const LoginScreen()); + Get.offAll(LoginScreen()); } } else { // User not in DB → go to signup diff --git a/lib/controllers/map_view_controller.dart b/lib/controllers/map_view_controller.dart index efa346f..a7e148e 100644 --- a/lib/controllers/map_view_controller.dart +++ b/lib/controllers/map_view_controller.dart @@ -2,7 +2,7 @@ import 'dart:typed_data'; import 'package:customer/constant/constant.dart'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart' as flutterMap; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:latlong2/latlong.dart' as location; import '../screen_ui/multi_vendor_service/restaurant_details_screen/restaurant_details_screen.dart'; diff --git a/lib/controllers/mobile_login_controller.dart b/lib/controllers/mobile_login_controller.dart index 5717b2c..5a1a048 100644 --- a/lib/controllers/mobile_login_controller.dart +++ b/lib/controllers/mobile_login_controller.dart @@ -1,8 +1,8 @@ import 'package:customer/themes/show_toast_dialog.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../constant/constant.dart'; import '../screen_ui/auth_screens/otp_verification_screen.dart'; @@ -21,13 +21,13 @@ class MobileLoginController extends GetxController { if (mobile.isEmpty || mobile.length != 10) { ShowToastDialog.showToast( - "Please enter a valid 10-digit mobile number".tr(), + "Please enter a valid 10-digit mobile number".tr, ); return; } try { - ShowToastDialog.showLoader("Sending OTP...".tr()); + ShowToastDialog.showLoader("Sending OTP...".tr); await _auth.verifyPhoneNumber( phoneNumber: '$countryCode$mobile', @@ -37,10 +37,10 @@ class MobileLoginController extends GetxController { verificationFailed: (FirebaseAuthException e) { ShowToastDialog.closeLoader(); if (e.code == 'invalid-phone-number') { - ShowToastDialog.showToast("Invalid phone number".tr()); + ShowToastDialog.showToast("Invalid phone number".tr); } else { ShowToastDialog.showToast( - e.message ?? "OTP verification failed".tr(), + e.message ?? "OTP verification failed".tr, ); } }, @@ -57,13 +57,13 @@ class MobileLoginController extends GetxController { }, codeAutoRetrievalTimeout: (String verificationId) { ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("OTP timed out. Please try again.".tr()); + ShowToastDialog.showToast("OTP timed out. Please try again.".tr); // Optional: Handle timeout }, ); } catch (e) { ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Something went wrong. Please try again.".tr()); + ShowToastDialog.showToast("Something went wrong. Please try again.".tr); } } diff --git a/lib/controllers/my_booking_on_demand_controller.dart b/lib/controllers/my_booking_on_demand_controller.dart index 6fc60e6..20a7be3 100644 --- a/lib/controllers/my_booking_on_demand_controller.dart +++ b/lib/controllers/my_booking_on_demand_controller.dart @@ -1,4 +1,4 @@ -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../models/onprovider_order_model.dart'; import '../models/worker_model.dart'; import '../service/fire_store_utils.dart'; diff --git a/lib/controllers/my_cab_booking_controller.dart b/lib/controllers/my_cab_booking_controller.dart index 884a512..eee4f01 100644 --- a/lib/controllers/my_cab_booking_controller.dart +++ b/lib/controllers/my_cab_booking_controller.dart @@ -34,12 +34,12 @@ import 'package:customer/payment/xenditScreen.dart'; import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/utils/preferences.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/material.dart'; import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_stripe/flutter_stripe.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:http/http.dart' as http; import 'package:intl/intl.dart'; import 'package:razorpay_flutter/razorpay_flutter.dart'; @@ -139,13 +139,13 @@ class MyCabBookingController extends GetxController { String getLocalizedTabTitle(String tabKey) { switch (tabKey) { case "New": - return "New".tr(); + return "New".tr; case "On Going": - return "On Going".tr(); + return "On Going".tr; case "Completed": - return "Completed".tr(); + return "Completed".tr; case "Cancelled": - return "Cancelled".tr(); + return "Cancelled".tr; default: return tabKey; } @@ -219,7 +219,7 @@ class MyCabBookingController extends GetxController { if (selectedPaymentMethod.value == PaymentGateway.cod.name) { selectedOrder.value.paymentMethod = selectedPaymentMethod.value; await FireStoreUtils.cabOrderPlace(selectedOrder.value).then((value) { - ShowToastDialog.showToast("Payment method changed".tr()); + ShowToastDialog.showToast("Payment method changed".tr); Get.back(); }); } else { @@ -237,8 +237,8 @@ class MyCabBookingController extends GetxController { userId: FireStoreUtils.getCurrentUid(), isTopup: false, orderId: selectedOrder.value.id, - note: "Cab Amount debited".tr(), - paymentStatus: "success".tr(), + note: "Cab Amount debited".tr, + paymentStatus: "success".tr, serviceType: Constant.parcelServiceType, ); @@ -253,7 +253,7 @@ class MyCabBookingController extends GetxController { } selectedOrder.value.paymentStatus = true; await FireStoreUtils.cabOrderPlace(selectedOrder.value).then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); Get.back(); }); } @@ -348,7 +348,7 @@ class MyCabBookingController extends GetxController { if (paymentIntentData!.containsKey("error")) { Get.back(); ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } else { await Stripe.instance.initPaymentSheet( @@ -381,7 +381,7 @@ class MyCabBookingController extends GetxController { Future displayStripePaymentSheet({required String amount}) async { try { await Stripe.instance.presentPaymentSheet().then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); completeOrder(); }); } on StripeException catch (e) { @@ -464,10 +464,10 @@ class MyCabBookingController extends GetxController { final data = jsonDecode(response.body); Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -499,15 +499,15 @@ class MyCabBookingController extends GetxController { note: "Contact us for any questions on your order.", onSuccess: (Map params) async { completeOrder(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); }, onError: (error) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, onCancel: (params) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, ), ), @@ -534,15 +534,15 @@ class MyCabBookingController extends GetxController { ), )!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } }); @@ -585,10 +585,10 @@ class MyCabBookingController extends GetxController { value, ) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -622,11 +622,11 @@ class MyCabBookingController extends GetxController { ); if (isDone) { Get.back(); - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); completeOrder(); } else { Get.back(); - ShowToastDialog.showToast("Payment Failed".tr()); + ShowToastDialog.showToast("Payment Failed".tr); } }); } @@ -754,7 +754,7 @@ class MyCabBookingController extends GetxController { data["body"]["txnToken"].toString().isEmpty) { Get.back(); ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); } return GetPaymentTxtTokenModel.fromJson(data); @@ -791,18 +791,18 @@ class MyCabBookingController extends GetxController { void handlePaymentSuccess(PaymentSuccessResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } void handleExternalWaller(ExternalWalletResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Processing!! via".tr()); + ShowToastDialog.showToast("Payment Processing!! via".tr); } void handlePaymentError(PaymentFailureResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Failed!!".tr()); + ShowToastDialog.showToast("Payment Failed!!".tr); } bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { @@ -820,10 +820,10 @@ class MyCabBookingController extends GetxController { if (url != '') { Get.to(() => MidtransScreen(initialURl: url))!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } @@ -864,7 +864,7 @@ class MyCabBookingController extends GetxController { return responseData['payment_url']; } else { ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); return ''; } @@ -907,13 +907,13 @@ class MyCabBookingController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); (); } }); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } } @@ -951,7 +951,7 @@ class MyCabBookingController extends GetxController { ); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -1002,7 +1002,7 @@ class MyCabBookingController extends GetxController { } } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -1028,11 +1028,11 @@ class MyCabBookingController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); (); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } diff --git a/lib/controllers/my_profile_controller.dart b/lib/controllers/my_profile_controller.dart index c6d7068..4546340 100644 --- a/lib/controllers/my_profile_controller.dart +++ b/lib/controllers/my_profile_controller.dart @@ -3,7 +3,7 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/theme_controller.dart'; import '../service/fire_store_utils.dart'; import 'package:customer/utils/preferences.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:http/http.dart' as http; class MyProfileController extends GetxController { diff --git a/lib/controllers/my_rental_booking_controller.dart b/lib/controllers/my_rental_booking_controller.dart index 3e595a7..35be194 100644 --- a/lib/controllers/my_rental_booking_controller.dart +++ b/lib/controllers/my_rental_booking_controller.dart @@ -4,8 +4,8 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/models/wallet_transaction_model.dart'; import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/themes/show_toast_dialog.dart'; -import 'package:easy_localization/easy_localization.dart'; -import 'package:get/get.dart' hide Trans; + +import 'package:get/get.dart'; import '../models/rental_order_model.dart'; import '../models/tax_model.dart'; import '../service/fire_store_utils.dart'; @@ -157,7 +157,7 @@ class MyRentalBookingController extends GetxController { if (selectedPaymentMethod.value == PaymentGateway.cod.name) { selectedOrder.value.paymentMethod = selectedPaymentMethod.value; await FireStoreUtils.rentalOrderPlace(selectedOrder.value).then((value) { - ShowToastDialog.showToast("Payment method changed".tr()); + ShowToastDialog.showToast("Payment method changed".tr); Get.back(); Get.back(); }); @@ -174,8 +174,8 @@ class MyRentalBookingController extends GetxController { userId: FireStoreUtils.getCurrentUid(), isTopup: false, orderId: selectedOrder.value.id, - note: "Rental Amount debited".tr(), - paymentStatus: "success".tr(), + note: "Rental Amount debited".tr, + paymentStatus: "success".tr, serviceType: Constant.parcelServiceType, ); @@ -192,7 +192,7 @@ class MyRentalBookingController extends GetxController { } await FireStoreUtils.rentalOrderPlace(selectedOrder.value).then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); Get.back(); Get.back(); }); @@ -290,8 +290,8 @@ class MyRentalBookingController extends GetxController { isTopup: true, // refund orderId: order.id, - note: "Refund for cancelled booking".tr(), - paymentStatus: "success".tr(), + note: "Refund for cancelled booking".tr, + paymentStatus: "success".tr, serviceType: Constant.parcelServiceType, ); @@ -301,9 +301,9 @@ class MyRentalBookingController extends GetxController { userId: FireStoreUtils.getCurrentUid(), ); } - ShowToastDialog.showToast("Booking cancelled successfully".tr()); + ShowToastDialog.showToast("Booking cancelled successfully".tr); } catch (e) { - ShowToastDialog.showToast("Failed to cancel booking: $e".tr()); + ShowToastDialog.showToast("Failed to cancel booking: $e".tr); } finally { isLoading.value = false; } diff --git a/lib/controllers/on_boarding_controller.dart b/lib/controllers/on_boarding_controller.dart index eed931f..178fbaf 100644 --- a/lib/controllers/on_boarding_controller.dart +++ b/lib/controllers/on_boarding_controller.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../models/on_boarding_model.dart'; import '../service/fire_store_utils.dart'; diff --git a/lib/controllers/on_demand_booking_controller.dart b/lib/controllers/on_demand_booking_controller.dart index dc73c5b..647c514 100644 --- a/lib/controllers/on_demand_booking_controller.dart +++ b/lib/controllers/on_demand_booking_controller.dart @@ -2,9 +2,10 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:customer/constant/constant.dart'; import 'package:customer/models/coupon_model.dart'; import 'package:customer/models/user_model.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:intl/intl.dart'; import '../models/onprovider_order_model.dart'; import '../models/provider_serivce_model.dart'; @@ -149,9 +150,9 @@ class OnDemandBookingController extends GetxController { Future confirmBooking(BuildContext context) async { if (selectedAddress.value.getFullAddress().isEmpty) { - ShowToastDialog.showToast("Please enter address".tr()); + ShowToastDialog.showToast("Please enter address".tr); } else if (dateTimeController.value.text.isEmpty) { - ShowToastDialog.showToast("Please select time slot.".tr()); + ShowToastDialog.showToast("Please select time slot.".tr); } else { UserModel? providerUser = await FireStoreUtils.getUserProfile( provider.value!.author!, @@ -201,7 +202,7 @@ class OnDemandBookingController extends GetxController { }, ); } else { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); OnProviderOrderModel onDemandOrder = OnProviderOrderModel( otp: Constant.getReferralCode(), authorID: FireStoreUtils.getCurrentUid(), @@ -254,7 +255,7 @@ class OnDemandBookingController extends GetxController { OnDemandDashboardController(), ); controller.selectedIndex.value = 2; - ShowToastDialog.showToast("OnDemand Service successfully booked".tr()); + ShowToastDialog.showToast("OnDemand Service successfully booked".tr); } } } diff --git a/lib/controllers/on_demand_category_controller.dart b/lib/controllers/on_demand_category_controller.dart index 1df529a..8b573c4 100644 --- a/lib/controllers/on_demand_category_controller.dart +++ b/lib/controllers/on_demand_category_controller.dart @@ -1,4 +1,4 @@ -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../models/category_model.dart'; import '../service/fire_store_utils.dart'; diff --git a/lib/controllers/on_demand_dashboard_controller.dart b/lib/controllers/on_demand_dashboard_controller.dart index a6f90f8..d7cf110 100644 --- a/lib/controllers/on_demand_dashboard_controller.dart +++ b/lib/controllers/on_demand_dashboard_controller.dart @@ -3,7 +3,7 @@ import 'package:customer/screen_ui/multi_vendor_service/profile_screen/profile_s import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/screen_ui/on_demand_service/favourite_ondemand_screen.dart'; import 'package:customer/service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../screen_ui/on_demand_service/my_booking_on_demand_screen.dart'; import '../screen_ui/on_demand_service/on_demand_home_screen.dart'; diff --git a/lib/controllers/on_demand_details_controller.dart b/lib/controllers/on_demand_details_controller.dart index a569994..3064071 100644 --- a/lib/controllers/on_demand_details_controller.dart +++ b/lib/controllers/on_demand_details_controller.dart @@ -1,6 +1,6 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/models/user_model.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:intl/intl.dart'; import '../models/favorite_ondemand_service_model.dart'; import '../models/provider_serivce_model.dart'; diff --git a/lib/controllers/on_demand_home_controller.dart b/lib/controllers/on_demand_home_controller.dart index 2b609a8..fc8764c 100644 --- a/lib/controllers/on_demand_home_controller.dart +++ b/lib/controllers/on_demand_home_controller.dart @@ -4,7 +4,7 @@ import 'package:customer/models/favorite_ondemand_service_model.dart'; import 'package:customer/models/provider_serivce_model.dart'; import 'package:customer/screen_ui/auth_screens/login_screen.dart'; import 'package:customer/service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import '../constant/constant.dart'; diff --git a/lib/controllers/on_demand_order_details_controller.dart b/lib/controllers/on_demand_order_details_controller.dart index afab172..c2c7ad1 100644 --- a/lib/controllers/on_demand_order_details_controller.dart +++ b/lib/controllers/on_demand_order_details_controller.dart @@ -2,9 +2,9 @@ import 'dart:developer'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:customer/models/coupon_model.dart'; import 'package:customer/models/user_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/cupertino.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../constant/constant.dart'; import '../models/onprovider_order_model.dart'; import '../models/wallet_transaction_model.dart'; @@ -172,7 +172,7 @@ class OnDemandOrderDetailsController extends GetxController { final order = onProviderOrder.value; if (order == null) return; - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); try { double total = 0.0; @@ -222,7 +222,7 @@ class OnDemandOrderDetailsController extends GetxController { isTopup: true, orderId: order.id, note: 'Booking Amount Refund', - paymentStatus: "success".tr(), + paymentStatus: "success".tr, ), ); @@ -240,7 +240,7 @@ class OnDemandOrderDetailsController extends GetxController { isTopup: false, orderId: order.id, note: 'Booking Amount Refund', - paymentStatus: "success".tr(), + paymentStatus: "success".tr, ), ); } @@ -260,7 +260,7 @@ class OnDemandOrderDetailsController extends GetxController { isTopup: true, orderId: order.id, note: 'Admin commission refund', - paymentStatus: "success".tr(), + paymentStatus: "success".tr, ), ); } @@ -289,11 +289,11 @@ class OnDemandOrderDetailsController extends GetxController { ShowToastDialog.closeLoader(); Get.back(); - ShowToastDialog.showToast("Booking cancelled successfully".tr()); + ShowToastDialog.showToast("Booking cancelled successfully".tr); } catch (e, st) { log("Cancel error: $e\n$st"); ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Something went wrong".tr()); + ShowToastDialog.showToast("Something went wrong".tr); } } } diff --git a/lib/controllers/on_demand_review_controller.dart b/lib/controllers/on_demand_review_controller.dart index a5ea0a0..9208286 100644 --- a/lib/controllers/on_demand_review_controller.dart +++ b/lib/controllers/on_demand_review_controller.dart @@ -1,7 +1,7 @@ import 'package:cloud_firestore/cloud_firestore.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../constant/collection_name.dart'; import '../models/onprovider_order_model.dart'; import '../models/provider_serivce_model.dart'; @@ -133,7 +133,7 @@ class OnDemandReviewController extends GetxController { } Future _providerReviewSubmit() async { - ShowToastDialog.showLoader("Submit in...".tr()); + ShowToastDialog.showLoader("Submit in...".tr); providerServiceModel.value!.reviewsCount = serviceReviewCount.value + 1; providerServiceModel.value!.reviewsSum = serviceReviewSum.value + ratings.value; @@ -171,7 +171,7 @@ class OnDemandReviewController extends GetxController { } Future _workerReviewSubmit() async { - ShowToastDialog.showLoader("Submit in...".tr()); + ShowToastDialog.showLoader("Submit in...".tr); workerModel.value!.reviewsCount = workerReviewCount.value + 1; workerModel.value!.reviewsSum = workerReviewSum.value + ratings.value; diff --git a/lib/controllers/order_controller.dart b/lib/controllers/order_controller.dart index 7c39996..aa16c62 100644 --- a/lib/controllers/order_controller.dart +++ b/lib/controllers/order_controller.dart @@ -3,7 +3,7 @@ import 'package:customer/models/cart_product_model.dart'; import 'package:customer/models/order_model.dart'; import '../service/cart_provider.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class OrderController extends GetxController { RxList allList = [].obs; diff --git a/lib/controllers/order_details_controller.dart b/lib/controllers/order_details_controller.dart index e1a51fa..adf1e24 100644 --- a/lib/controllers/order_details_controller.dart +++ b/lib/controllers/order_details_controller.dart @@ -1,7 +1,7 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/models/cart_product_model.dart'; import 'package:customer/models/order_model.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../service/cart_provider.dart'; class OrderDetailsController extends GetxController { diff --git a/lib/controllers/order_placing_controller.dart b/lib/controllers/order_placing_controller.dart index 5fa8060..fa489d6 100644 --- a/lib/controllers/order_placing_controller.dart +++ b/lib/controllers/order_placing_controller.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'package:customer/models/order_model.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../service/database_helper.dart'; class OrderPlacingController extends GetxController { diff --git a/lib/controllers/osm_search_place_controller.dart b/lib/controllers/osm_search_place_controller.dart index be7afab..8902871 100644 --- a/lib/controllers/osm_search_place_controller.dart +++ b/lib/controllers/osm_search_place_controller.dart @@ -1,7 +1,7 @@ import 'dart:developer'; import 'package:flutter/material.dart'; import 'package:flutter_osm_plugin/flutter_osm_plugin.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:shared_preferences/shared_preferences.dart'; class OsmSearchPlaceController extends GetxController { diff --git a/lib/controllers/otp_verification_controller.dart b/lib/controllers/otp_verification_controller.dart index 745082a..7c6712a 100644 --- a/lib/controllers/otp_verification_controller.dart +++ b/lib/controllers/otp_verification_controller.dart @@ -1,9 +1,10 @@ import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart'; import 'package:customer/themes/show_toast_dialog.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../constant/constant.dart'; import '../models/user_model.dart'; import '../screen_ui/auth_screens/login_screen.dart'; @@ -43,7 +44,7 @@ class OtpVerifyController extends GetxController { codeSent: (String verificationId0, int? resendToken0) async { verificationId.value = verificationId0; resendToken.value = resendToken0!; - ShowToastDialog.showToast("OTP sent".tr()); + ShowToastDialog.showToast("OTP sent".tr); }, timeout: const Duration(seconds: 25), forceResendingToken: resendToken.value, @@ -56,12 +57,12 @@ class OtpVerifyController extends GetxController { void verifyOtp() async { if (otpController.value.text.length != 6) { - ShowToastDialog.showToast("Enter valid 6-digit OTP".tr()); + ShowToastDialog.showToast("Enter valid 6-digit OTP".tr); return; } try { - ShowToastDialog.showLoader("Verifying OTP...".tr()); + ShowToastDialog.showLoader("Verifying OTP...".tr); final credential = PhoneAuthProvider.credential( verificationId: verificationId.value, @@ -107,14 +108,14 @@ class OtpVerifyController extends GetxController { final userModel = await FireStoreUtils.getUserProfile(result.user!.uid); if (userModel == null || userModel.role != 'customer') { await _auth.signOut(); - Get.offAll(() => const LoginScreen()); + Get.offAll(LoginScreen()); return; } if (userModel.active == false) { - ShowToastDialog.showToast("This user is disabled".tr()); + ShowToastDialog.showToast("This user is disabled".tr); await _auth.signOut(); - Get.offAll(() => const LoginScreen()); + Get.offAll(LoginScreen()); return; } @@ -128,13 +129,13 @@ class OtpVerifyController extends GetxController { ); Constant.selectedLocation = defaultAddress; - Get.offAll(() => const ServiceListScreen()); + Get.offAll(ServiceListScreen()); } else { - Get.offAll(() => const LocationPermissionScreen()); + Get.offAll(LocationPermissionScreen()); } } catch (e) { ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Invalid OTP or Verification Failed".tr()); + ShowToastDialog.showToast("Invalid OTP or Verification Failed".tr); } } diff --git a/lib/controllers/parcel_coupon_controller.dart b/lib/controllers/parcel_coupon_controller.dart index fe0c298..f01f03f 100644 --- a/lib/controllers/parcel_coupon_controller.dart +++ b/lib/controllers/parcel_coupon_controller.dart @@ -1,6 +1,6 @@ import 'package:customer/models/coupon_model.dart'; import 'package:customer/service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class ParcelCouponController extends GetxController { @override diff --git a/lib/controllers/parcel_dashboard_controller.dart b/lib/controllers/parcel_dashboard_controller.dart index 38a274e..bf7b2ce 100644 --- a/lib/controllers/parcel_dashboard_controller.dart +++ b/lib/controllers/parcel_dashboard_controller.dart @@ -3,7 +3,7 @@ import 'package:customer/screen_ui/multi_vendor_service/profile_screen/profile_s import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/screen_ui/parcel_service/home_parcel_screen.dart'; import 'package:customer/service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../screen_ui/parcel_service/my_booking_screen.dart'; class ParcelDashboardController extends GetxController { diff --git a/lib/controllers/parcel_my_booking_controller.dart b/lib/controllers/parcel_my_booking_controller.dart index 742e67c..90c541e 100644 --- a/lib/controllers/parcel_my_booking_controller.dart +++ b/lib/controllers/parcel_my_booking_controller.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:cloud_firestore/cloud_firestore.dart'; -import 'package:easy_localization/easy_localization.dart'; -import 'package:get/get.dart' hide Trans; + +import 'package:get/get.dart'; import 'package:intl/intl.dart'; import '../constant/constant.dart'; import '../models/parcel_order_model.dart'; @@ -106,7 +106,7 @@ class ParcelMyBookingController extends GetxController { isLoading.value = true; if (order.status != Constant.orderPlaced) { - ShowToastDialog.showToast("You can only cancel before pickup.".tr()); + ShowToastDialog.showToast("You can only cancel before pickup.".tr); return; } @@ -160,9 +160,9 @@ class ParcelMyBookingController extends GetxController { ); } - ShowToastDialog.showToast("Order cancelled successfully".tr()); + ShowToastDialog.showToast("Order cancelled successfully".tr); } catch (e) { - ShowToastDialog.showToast("${'Failed to cancel order:'.tr()} $e".tr()); + ShowToastDialog.showToast("${'Failed to cancel order:'.tr} $e".tr); } finally { isLoading.value = false; } diff --git a/lib/controllers/parcel_order_confirmation_controller.dart b/lib/controllers/parcel_order_confirmation_controller.dart index abbcef0..b76f4dd 100644 --- a/lib/controllers/parcel_order_confirmation_controller.dart +++ b/lib/controllers/parcel_order_confirmation_controller.dart @@ -5,11 +5,11 @@ import 'dart:math' as maths; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:customer/models/coupon_model.dart'; import 'package:customer/models/wallet_transaction_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_stripe/flutter_stripe.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:http/http.dart' as http; import 'package:image_picker/image_picker.dart'; import 'package:intl/intl.dart'; @@ -136,7 +136,7 @@ class ParcelOrderConfirmationController extends GetxController { } Future placeOrder() async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); try { List parcelImages = []; @@ -207,7 +207,7 @@ class ParcelOrderConfirmationController extends GetxController { value, ) async { ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Order placed successfully".tr()); + ShowToastDialog.showToast("Order placed successfully".tr); Get.offAll( () => OrderSuccessfullyPlaced(), arguments: {'parcelOrder': parcelOrder.value}, @@ -216,7 +216,7 @@ class ParcelOrderConfirmationController extends GetxController { }); } catch (e) { ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Something went wrong. Please try again.".tr()); + ShowToastDialog.showToast("Something went wrong. Please try again.".tr); } } @@ -324,7 +324,7 @@ class ParcelOrderConfirmationController extends GetxController { if (paymentIntentData!.containsKey("error")) { Get.back(); ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } else { await Stripe.instance.initPaymentSheet( @@ -357,7 +357,7 @@ class ParcelOrderConfirmationController extends GetxController { Future displayStripePaymentSheet({required String amount}) async { try { await Stripe.instance.presentPaymentSheet().then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); placeOrder(); }); } on StripeException catch (e) { @@ -440,10 +440,10 @@ class ParcelOrderConfirmationController extends GetxController { final data = jsonDecode(response.body); Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -480,17 +480,17 @@ class ParcelOrderConfirmationController extends GetxController { onSuccess: (Map params) async { debugPrint("✅ PayPal Payment Success: $params"); placeOrder(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); }, onError: (error) { debugPrint("❌ PayPal Payment Error: $error"); Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, onCancel: (params) { debugPrint("⚠️ PayPal Payment Canceled: $params"); Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, ), ), @@ -521,15 +521,15 @@ class ParcelOrderConfirmationController extends GetxController { // note: "Contact us for any questions on your order.", // onSuccess: (Map params) async { // placeOrder(); - // ShowToastDialog.showToast("Payment Successful!!".tr()); + // ShowToastDialog.showToast("Payment Successful!!".tr); // }, // onError: (error) { // Get.back(); - // ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + // ShowToastDialog.showToast("Payment UnSuccessful!!".tr); // }, // onCancel: (params) { // Get.back(); - // ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + // ShowToastDialog.showToast("Payment UnSuccessful!!".tr); // }, // ), // ), @@ -559,15 +559,15 @@ class ParcelOrderConfirmationController extends GetxController { ), )!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } }); @@ -614,10 +614,10 @@ class ParcelOrderConfirmationController extends GetxController { bool isVerified = await verifyFlutterWavePayment(_ref!); if (isVerified) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); Get.back(); } }); @@ -676,11 +676,11 @@ class ParcelOrderConfirmationController extends GetxController { ); if (isDone) { Get.back(); - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); placeOrder(); } else { Get.back(); - ShowToastDialog.showToast("Payment Failed".tr()); + ShowToastDialog.showToast("Payment Failed".tr); } }); } @@ -833,7 +833,7 @@ class ParcelOrderConfirmationController extends GetxController { data["body"]["txnToken"].toString().isEmpty) { Get.back(); ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } @@ -866,7 +866,7 @@ class ParcelOrderConfirmationController extends GetxController { // final data = jsonDecode(response.body); // if (data["body"]["txnToken"] == null || data["body"]["txnToken"].toString().isEmpty) { // Get.back(); - // ShowToastDialog.showToast("something went wrong, please contact admin.".tr()); + // ShowToastDialog.showToast("something went wrong, please contact admin.".tr); // } // return GetPaymentTxtTokenModel.fromJson(data); // } @@ -902,18 +902,18 @@ class ParcelOrderConfirmationController extends GetxController { void handlePaymentSuccess(PaymentSuccessResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } void handleExternalWaller(ExternalWalletResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Processing!! via".tr()); + ShowToastDialog.showToast("Payment Processing!! via".tr); } void handlePaymentError(PaymentFailureResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Failed!!".tr()); + ShowToastDialog.showToast("Payment Failed!!".tr); } bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { @@ -931,10 +931,10 @@ class ParcelOrderConfirmationController extends GetxController { if (url != '') { Get.to(() => MidtransScreen(initialURl: url))!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } @@ -975,7 +975,7 @@ class ParcelOrderConfirmationController extends GetxController { return responseData['payment_url']; } else { ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); return ''; } @@ -1002,7 +1002,7 @@ class ParcelOrderConfirmationController extends GetxController { debugPrint('🟩 Starting OrangePay Payment...'); debugPrint('💰 Amount: $amount | 🆔 Order ID: $id'); - ShowToastDialog.showLoader("Initializing payment...".tr()); + ShowToastDialog.showLoader("Initializing payment...".tr); var paymentURL = await fetchToken( context: context, @@ -1027,20 +1027,20 @@ class ParcelOrderConfirmationController extends GetxController { ), )?.then((value) async { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); debugPrint('🎉 Payment Successful for Order ID: $orderId'); if (Get.isBottomSheetOpen ?? false) Get.back(); await placeOrder(); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); debugPrint('⚠️ Payment flow closed without success.'); if (Get.isBottomSheetOpen ?? false) Get.back(); } }); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); if (Get.isBottomSheetOpen ?? false) Get.back(); } } @@ -1086,7 +1086,7 @@ class ParcelOrderConfirmationController extends GetxController { } else { debugPrint('❌ Failed to fetch access token.'); ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -1152,7 +1152,7 @@ class ParcelOrderConfirmationController extends GetxController { } else { debugPrint('❌ Payment request failed.'); ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -1179,11 +1179,11 @@ class ParcelOrderConfirmationController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); placeOrder(); (); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } diff --git a/lib/controllers/parcel_order_details_controller.dart b/lib/controllers/parcel_order_details_controller.dart index 6e9e83b..3d0b30e 100644 --- a/lib/controllers/parcel_order_details_controller.dart +++ b/lib/controllers/parcel_order_details_controller.dart @@ -3,8 +3,8 @@ import 'package:customer/models/rating_model.dart'; import 'package:customer/models/wallet_transaction_model.dart'; import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/themes/show_toast_dialog.dart'; -import 'package:easy_localization/easy_localization.dart'; -import 'package:get/get.dart' hide Trans; + +import 'package:get/get.dart'; import 'package:intl/intl.dart'; import '../constant/constant.dart'; import '../models/parcel_category.dart'; @@ -108,7 +108,7 @@ class ParcelOrderDetailsController extends GetxController { } Future cancelParcelOrder() async { - ShowToastDialog.showLoader("Cancelling order...".tr()); + ShowToastDialog.showLoader("Cancelling order...".tr); parcelOrder.value.status = Constant.orderCancelled; if (parcelOrder.value.paymentMethod?.toLowerCase() != "cod") { WalletTransactionModel walletTransaction = WalletTransactionModel( @@ -137,7 +137,7 @@ class ParcelOrderDetailsController extends GetxController { await FireStoreUtils.parcelOrderPlace(parcelOrder.value); ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Order cancelled successfully".tr()); + ShowToastDialog.showToast("Order cancelled successfully".tr); Get.back(result: true); } diff --git a/lib/controllers/parcel_review_controller.dart b/lib/controllers/parcel_review_controller.dart index 2ad0958..cf445c1 100644 --- a/lib/controllers/parcel_review_controller.dart +++ b/lib/controllers/parcel_review_controller.dart @@ -1,8 +1,8 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:customer/models/parcel_order_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../models/rating_model.dart'; import '../models/user_model.dart'; import '../service/fire_store_utils.dart'; @@ -76,11 +76,11 @@ class ParcelReviewController extends GetxController { /// Save / update review Future submitReview() async { if (comment.value.text.trim().isEmpty || ratings.value == 0) { - ShowToastDialog.showToast("Please provide rating and comment".tr()); + ShowToastDialog.showToast("Please provide rating and comment".tr); return; } - ShowToastDialog.showLoader("Submit in...".tr()); + ShowToastDialog.showLoader("Submit in...".tr); final user = await FireStoreUtils.getUserProfile( order.value?.driverId ?? '', diff --git a/lib/controllers/provider_controller.dart b/lib/controllers/provider_controller.dart index ed6379e..2cde1b4 100644 --- a/lib/controllers/provider_controller.dart +++ b/lib/controllers/provider_controller.dart @@ -1,5 +1,5 @@ import 'package:customer/controllers/on_demand_home_controller.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../models/provider_serivce_model.dart'; import '../models/user_model.dart'; import '../service/fire_store_utils.dart'; diff --git a/lib/controllers/rate_product_controller.dart b/lib/controllers/rate_product_controller.dart index ece8c88..d4d5d0c 100644 --- a/lib/controllers/rate_product_controller.dart +++ b/lib/controllers/rate_product_controller.dart @@ -6,13 +6,13 @@ import 'package:customer/models/order_model.dart'; import 'package:customer/models/product_model.dart'; import 'package:customer/models/vendor_category_model.dart'; import 'package:customer/models/vendor_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import '../models/rating_model.dart'; import '../models/review_attribute_model.dart'; import '../service/fire_store_utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:image_picker/image_picker.dart'; import '../themes/show_toast_dialog.dart'; @@ -142,7 +142,7 @@ class RateProductController extends GetxController { Future saveRating() async { if (ratings.value != 0.0) { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); productModel.value.reviewsCount = productReviewCount.value + 1; productModel.value.reviewsSum = productReviewSum.value + ratings.value; productModel.value.reviewAttributes = reviewProductAttributes; @@ -213,10 +213,10 @@ class RateProductController extends GetxController { await FireStoreUtils.updateVendor(vendorModel.value); await FireStoreUtils.setProduct(productModel.value); ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Rating saved successfully.".tr()); + ShowToastDialog.showToast("Rating saved successfully.".tr); Get.back(); } else { - ShowToastDialog.showToast("Please add rate for food item.".tr()); + ShowToastDialog.showToast("Please add rate for food item.".tr); } } diff --git a/lib/controllers/redeem_gift_card_controller.dart b/lib/controllers/redeem_gift_card_controller.dart index 8332496..d445e2f 100644 --- a/lib/controllers/redeem_gift_card_controller.dart +++ b/lib/controllers/redeem_gift_card_controller.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class RedeemGiftCardController extends GetxController { Rx giftCodeController = TextEditingController().obs; diff --git a/lib/controllers/refer_friend_controller.dart b/lib/controllers/refer_friend_controller.dart index 66c3f7e..8b9cd87 100644 --- a/lib/controllers/refer_friend_controller.dart +++ b/lib/controllers/refer_friend_controller.dart @@ -1,6 +1,6 @@ import 'package:customer/models/referral_model.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class ReferFriendController extends GetxController { Rx referralModel = ReferralModel().obs; diff --git a/lib/controllers/rental_conformation_controller.dart b/lib/controllers/rental_conformation_controller.dart index 49f838e..0c4c3e1 100644 --- a/lib/controllers/rental_conformation_controller.dart +++ b/lib/controllers/rental_conformation_controller.dart @@ -5,9 +5,10 @@ import 'package:customer/models/coupon_model.dart'; import 'package:customer/models/rental_order_model.dart'; import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/themes/show_toast_dialog.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../screen_ui/rental_service/rental_dashboard_screen.dart'; import 'cab_rental_dashboard_controllers.dart'; @@ -81,7 +82,7 @@ class RentalConformationController extends GetxController { } Future placeOrder() async { - ShowToastDialog.showLoader("Placing booking...".tr()); + ShowToastDialog.showLoader("Placing booking...".tr); rentalOrderModel.value.discount = discount.value.toString(); rentalOrderModel.value.couponCode = selectedCouponModel.value.code; rentalOrderModel.value.couponId = selectedCouponModel.value.id; @@ -92,8 +93,8 @@ class RentalConformationController extends GetxController { value, ) async { ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Order placed successfully".tr()); - Get.offAll(const RentalDashboardScreen()); + ShowToastDialog.showToast("Order placed successfully".tr); + Get.offAll(RentalDashboardScreen()); CabRentalDashboardControllers controller = Get.put( CabRentalDashboardControllers(), ); diff --git a/lib/controllers/rental_coupon_controller.dart b/lib/controllers/rental_coupon_controller.dart index 4cb1292..e5ded68 100644 --- a/lib/controllers/rental_coupon_controller.dart +++ b/lib/controllers/rental_coupon_controller.dart @@ -1,6 +1,6 @@ import 'package:customer/models/coupon_model.dart'; import 'package:customer/service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class RentalCouponController extends GetxController { @override diff --git a/lib/controllers/rental_home_controller.dart b/lib/controllers/rental_home_controller.dart index 87b8181..621993b 100644 --- a/lib/controllers/rental_home_controller.dart +++ b/lib/controllers/rental_home_controller.dart @@ -7,10 +7,10 @@ import 'package:customer/models/user_model.dart'; import 'package:customer/models/vendor_model.dart'; import 'package:customer/screen_ui/rental_service/rental_conformation_screen.dart'; import 'package:customer/widget/geoflutterfire/src/geoflutterfire.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart' as latlong; import '../constant/constant.dart'; import '../models/payment_model/cod_setting_model.dart'; @@ -92,7 +92,7 @@ class RentalHomeController extends GetxController { sourceTextEditController.value.text = address; } } catch (e) { - ShowToastDialog.showToast("Unable to fetch current location".tr()); + ShowToastDialog.showToast("Unable to fetch current location".tr); } } diff --git a/lib/controllers/rental_order_details_controller.dart b/lib/controllers/rental_order_details_controller.dart index 69bd57c..76f634b 100644 --- a/lib/controllers/rental_order_details_controller.dart +++ b/lib/controllers/rental_order_details_controller.dart @@ -35,11 +35,11 @@ import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_scr import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/utils/preferences.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_stripe/flutter_stripe.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:http/http.dart' as http; import 'package:razorpay_flutter/razorpay_flutter.dart'; import 'package:uuid/uuid.dart'; @@ -210,7 +210,7 @@ class RentalOrderDetailsController extends GetxController { totalAmount.value = (subTotal.value - discount.value) + taxAmount.value; } catch (e) { - ShowToastDialog.showToast("${'Failed to calculate total:'.tr()} $e"); + ShowToastDialog.showToast("${'Failed to calculate total:'.tr} $e"); } } @@ -218,7 +218,7 @@ class RentalOrderDetailsController extends GetxController { if (selectedPaymentMethod.value == PaymentGateway.cod.name) { order.value.paymentMethod = selectedPaymentMethod.value; await FireStoreUtils.rentalOrderPlace(order.value).then((value) { - ShowToastDialog.showToast("Payment method changed".tr()); + ShowToastDialog.showToast("Payment method changed".tr); Get.back(); Get.back(); }); @@ -253,7 +253,7 @@ class RentalOrderDetailsController extends GetxController { } await FireStoreUtils.rentalOrderPlace(order.value).then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); Get.back(); Get.back(); }); @@ -311,10 +311,10 @@ class RentalOrderDetailsController extends GetxController { userId: FireStoreUtils.getCurrentUid(), ); } - ShowToastDialog.showToast("Booking cancelled successfully".tr()); + ShowToastDialog.showToast("Booking cancelled successfully".tr); Get.back(); } catch (e) { - ShowToastDialog.showToast("${'Failed to cancel booking:'.tr()} $e".tr()); + ShowToastDialog.showToast("${'Failed to cancel booking:'.tr} $e".tr); } finally { isLoading.value = false; } @@ -424,7 +424,7 @@ class RentalOrderDetailsController extends GetxController { if (paymentIntentData!.containsKey("error")) { Get.back(); ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } else { await Stripe.instance.initPaymentSheet( @@ -457,7 +457,7 @@ class RentalOrderDetailsController extends GetxController { Future displayStripePaymentSheet({required String amount}) async { try { await Stripe.instance.presentPaymentSheet().then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); completeOrder(); }); } on StripeException catch (e) { @@ -540,10 +540,10 @@ class RentalOrderDetailsController extends GetxController { final data = jsonDecode(response.body); Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -575,15 +575,15 @@ class RentalOrderDetailsController extends GetxController { note: "Contact us for any questions on your order.", onSuccess: (Map params) async { completeOrder(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); }, onError: (error) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, onCancel: (params) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, ), ), @@ -610,15 +610,15 @@ class RentalOrderDetailsController extends GetxController { ), )!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } }); @@ -661,10 +661,10 @@ class RentalOrderDetailsController extends GetxController { value, ) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -698,11 +698,11 @@ class RentalOrderDetailsController extends GetxController { ); if (isDone) { Get.back(); - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); completeOrder(); } else { Get.back(); - ShowToastDialog.showToast("Payment Failed".tr()); + ShowToastDialog.showToast("Payment Failed".tr); } }); } @@ -830,7 +830,7 @@ class RentalOrderDetailsController extends GetxController { data["body"]["txnToken"].toString().isEmpty) { Get.back(); ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); } return GetPaymentTxtTokenModel.fromJson(data); @@ -867,18 +867,18 @@ class RentalOrderDetailsController extends GetxController { void handlePaymentSuccess(PaymentSuccessResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } void handleExternalWaller(ExternalWalletResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Processing!! via".tr()); + ShowToastDialog.showToast("Payment Processing!! via".tr); } void handlePaymentError(PaymentFailureResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Failed!!".tr()); + ShowToastDialog.showToast("Payment Failed!!".tr); } bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { @@ -896,10 +896,10 @@ class RentalOrderDetailsController extends GetxController { if (url != '') { Get.to(() => MidtransScreen(initialURl: url))!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } @@ -940,7 +940,7 @@ class RentalOrderDetailsController extends GetxController { return responseData['payment_url']; } else { ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); return ''; } @@ -983,13 +983,13 @@ class RentalOrderDetailsController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); (); } }); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } } @@ -1027,7 +1027,7 @@ class RentalOrderDetailsController extends GetxController { ); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -1078,7 +1078,7 @@ class RentalOrderDetailsController extends GetxController { } } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -1103,10 +1103,10 @@ class RentalOrderDetailsController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); completeOrder(); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } diff --git a/lib/controllers/rental_review_controller.dart b/lib/controllers/rental_review_controller.dart index 88d06c3..58283ca 100644 --- a/lib/controllers/rental_review_controller.dart +++ b/lib/controllers/rental_review_controller.dart @@ -1,7 +1,7 @@ import 'package:cloud_firestore/cloud_firestore.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../constant/collection_name.dart'; import '../models/rating_model.dart'; import '../models/rental_order_model.dart'; @@ -77,11 +77,11 @@ class RentalReviewController extends GetxController { /// Save / update review Future submitReview() async { if (comment.value.text.trim().isEmpty || ratings.value == 0) { - ShowToastDialog.showToast("Please provide rating and comment".tr()); + ShowToastDialog.showToast("Please provide rating and comment".tr); return; } - ShowToastDialog.showLoader("Submit in...".tr()); + ShowToastDialog.showLoader("Submit in...".tr); final user = await FireStoreUtils.getUserProfile( order.value?.driverId ?? '', diff --git a/lib/controllers/restaurant_details_controller.dart b/lib/controllers/restaurant_details_controller.dart index dcc56ac..6c7f50c 100644 --- a/lib/controllers/restaurant_details_controller.dart +++ b/lib/controllers/restaurant_details_controller.dart @@ -13,7 +13,7 @@ import '../models/attributes_model.dart'; import '../service/cart_provider.dart'; import '../service/fire_store_utils.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:intl/intl.dart'; class RestaurantDetailsController extends GetxController { diff --git a/lib/controllers/restaurant_list_controller.dart b/lib/controllers/restaurant_list_controller.dart index bfe86f8..fe953e2 100644 --- a/lib/controllers/restaurant_list_controller.dart +++ b/lib/controllers/restaurant_list_controller.dart @@ -2,7 +2,7 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/models/favourite_model.dart'; import 'package:customer/models/vendor_model.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class RestaurantListController extends GetxController { RxBool isLoading = true.obs; diff --git a/lib/controllers/review_list_controller.dart b/lib/controllers/review_list_controller.dart index 659bfb5..540165c 100644 --- a/lib/controllers/review_list_controller.dart +++ b/lib/controllers/review_list_controller.dart @@ -1,7 +1,7 @@ import 'package:customer/models/rating_model.dart'; import 'package:customer/models/vendor_model.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class ReviewListController extends GetxController { RxBool isLoading = true.obs; diff --git a/lib/controllers/scan_qr_code_controller.dart b/lib/controllers/scan_qr_code_controller.dart index 8c36a5b..066dcee 100644 --- a/lib/controllers/scan_qr_code_controller.dart +++ b/lib/controllers/scan_qr_code_controller.dart @@ -1,6 +1,6 @@ import 'package:customer/models/vendor_model.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class ScanQrCodeController extends GetxController { @override diff --git a/lib/controllers/search_controller.dart b/lib/controllers/search_controller.dart index 01dee30..278c9da 100644 --- a/lib/controllers/search_controller.dart +++ b/lib/controllers/search_controller.dart @@ -2,7 +2,7 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/models/product_model.dart'; import 'package:customer/models/vendor_model.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class SearchScreenController extends GetxController { @override diff --git a/lib/controllers/service_list_controller.dart b/lib/controllers/service_list_controller.dart index e21ce0f..f107978 100644 --- a/lib/controllers/service_list_controller.dart +++ b/lib/controllers/service_list_controller.dart @@ -12,11 +12,12 @@ import 'package:customer/models/currency_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/show_toast_dialog.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:firebase_auth/firebase_auth.dart' as auth; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../screen_ui/auth_screens/login_screen.dart'; import '../screen_ui/multi_vendor_service/dash_board_screens/dash_board_screen.dart'; import '../screen_ui/on_demand_service/on_demand_dashboard_screen.dart'; @@ -76,7 +77,7 @@ class ServiceListController extends GetxController { SectionModel sectionModel, ) async { try { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); Constant.sectionConstantModel = sectionModel; AppThemeData.primary300 = Color( int.tryParse(sectionModel.color?.replaceFirst("#", "0xff") ?? '') ?? @@ -92,7 +93,7 @@ class ServiceListController extends GetxController { await _navigate(sectionModel); } else { ShowToastDialog.closeLoader(); - Get.offAll(() => const LoginScreen()); + Get.offAll(LoginScreen()); } } else { ShowToastDialog.closeLoader(); @@ -161,7 +162,7 @@ class ServiceListController extends GetxController { children: [ Text( "If you select this Section/Service, your previously added items will be removed from the cart." - .tr(), + .tr, textAlign: TextAlign.center, ), const SizedBox(height: 20), @@ -171,7 +172,7 @@ class ServiceListController extends GetxController { child: RoundedButtonFill( borderRadius: 10.r, height: 5.5, - title: "Cancel".tr(), + title: "Cancel".tr, onPress: () { Get.back(); }, @@ -183,7 +184,7 @@ class ServiceListController extends GetxController { Expanded( child: RoundedButtonFill( borderRadius: 10.r, - title: "OK".tr(), + title: "OK".tr, height: 5.5, onPress: () async { DatabaseHelper.instance.deleteAllCartProducts(); diff --git a/lib/controllers/sign_up_controller.dart b/lib/controllers/sign_up_controller.dart index bd990ba..8760fcd 100644 --- a/lib/controllers/sign_up_controller.dart +++ b/lib/controllers/sign_up_controller.dart @@ -1,9 +1,10 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:customer/models/user_model.dart'; import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:firebase_auth/firebase_auth.dart' as auth; import '../constant/constant.dart'; import '../models/referral_model.dart'; @@ -68,7 +69,7 @@ class SignUpController extends GetxController { try { if (!_validateInputs()) return; - ShowToastDialog.showLoader("Creating account...".tr()); + ShowToastDialog.showLoader("Creating account...".tr); if (type.value == "mobileNumber") { await _signUpWithMobile(); @@ -80,32 +81,32 @@ class SignUpController extends GetxController { } catch (e, st) { ShowToastDialog.closeLoader(); debugPrint("SIGNUP OUTER EXCEPTION: $e\n$st"); - ShowToastDialog.showToast("${'signup_failed'.tr()}: $e"); + ShowToastDialog.showToast("${'signup_failed'.tr}: $e"); } } /// Validation Logic bool _validateInputs() { if (firstNameController.value.text.isEmpty) { - ShowToastDialog.showToast("Please enter first name".tr()); + ShowToastDialog.showToast("Please enter first name".tr); return false; } else if (lastNameController.value.text.isEmpty) { - ShowToastDialog.showToast("Please enter last name".tr()); + ShowToastDialog.showToast("Please enter last name".tr); return false; } else if (emailController.value.text.isEmpty || !emailController.value.text.isEmail) { - ShowToastDialog.showToast("Please enter a valid email address".tr()); + ShowToastDialog.showToast("Please enter a valid email address".tr); return false; } else if (mobileController.value.text.isEmpty) { - ShowToastDialog.showToast("Please enter a valid phone number".tr()); + ShowToastDialog.showToast("Please enter a valid phone number".tr); return false; } else if (passwordController.value.text.length < 6) { - ShowToastDialog.showToast("Password must be at least 6 characters".tr()); + ShowToastDialog.showToast("Password must be at least 6 characters".tr); return false; } else if (passwordController.value.text != confirmPasswordController.value.text) { ShowToastDialog.showToast( - "Password and Confirm password do not match".tr(), + "Password and Confirm password do not match".tr, ); return false; } @@ -132,18 +133,18 @@ class SignUpController extends GetxController { "FirebaseAuthException caught: code=${e.code}, message=${e.message}", ); if (e.code == 'email-already-in-use') { - ShowToastDialog.showToast("Email already in use".tr()); + ShowToastDialog.showToast("Email already in use".tr); } else if (e.code == 'weak-password') { - ShowToastDialog.showToast("Password is too weak".tr()); + ShowToastDialog.showToast("Password is too weak".tr); } else if (e.code == 'invalid-email') { - ShowToastDialog.showToast("Invalid email address".tr()); + ShowToastDialog.showToast("Invalid email address".tr); } else { - ShowToastDialog.showToast(e.message ?? "signup_failed".tr()); + ShowToastDialog.showToast(e.message ?? "signup_failed".tr); } } catch (e) { debugPrint("Something went wrong: ${e.toString()}"); ShowToastDialog.showToast( - "${'something_went_wrong'.tr()}: ${e.toString()}", + "${'something_went_wrong'.tr}: ${e.toString()}", ); } } @@ -161,7 +162,7 @@ class SignUpController extends GetxController { _navigateBasedOnAddress(userModel.value); } catch (e) { - ShowToastDialog.showToast("${'signup_failed'.tr()}: $e"); + ShowToastDialog.showToast("${'signup_failed'.tr}: $e"); } } @@ -212,9 +213,9 @@ class SignUpController extends GetxController { /// Save the default address to global constant Constant.selectedLocation = defaultAddress; - Get.offAll(() => const ServiceListScreen()); + Get.offAll(ServiceListScreen()); } else { - Get.offAll(() => const LocationPermissionScreen()); + Get.offAll(LocationPermissionScreen()); } } } diff --git a/lib/controllers/splash_controller.dart b/lib/controllers/splash_controller.dart index 53f95e8..2052507 100644 --- a/lib/controllers/splash_controller.dart +++ b/lib/controllers/splash_controller.dart @@ -4,11 +4,12 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/models/user_model.dart'; import 'package:customer/screen_ui/maintenance_mode_screen/maintenance_mode_screen.dart'; import 'package:customer/screen_ui/service_home_screen/service_list_screen.dart'; +import 'package:customer/utils/app_router.dart'; import 'package:customer/utils/notification_service.dart'; import 'package:customer/utils/preferences.dart'; import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../screen_ui/auth_screens/login_screen.dart'; import '../screen_ui/location_enable_screens/location_permission_screen.dart'; import '../screen_ui/on_boarding_screen/on_boarding_screen.dart'; diff --git a/lib/controllers/theme_controller.dart b/lib/controllers/theme_controller.dart index 92ebb62..50efcc6 100644 --- a/lib/controllers/theme_controller.dart +++ b/lib/controllers/theme_controller.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../utils/preferences.dart'; class ThemeController extends GetxController { diff --git a/lib/controllers/view_all_category_controller.dart b/lib/controllers/view_all_category_controller.dart index 52ad4a4..49a61e5 100644 --- a/lib/controllers/view_all_category_controller.dart +++ b/lib/controllers/view_all_category_controller.dart @@ -1,7 +1,7 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/models/vendor_category_model.dart'; import '../service/fire_store_utils.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class ViewAllCategoryController extends GetxController { RxBool isLoading = true.obs; diff --git a/lib/controllers/view_all_popular_service_controller.dart b/lib/controllers/view_all_popular_service_controller.dart index 68379a6..5f2d604 100644 --- a/lib/controllers/view_all_popular_service_controller.dart +++ b/lib/controllers/view_all_popular_service_controller.dart @@ -1,6 +1,6 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/on_demand_home_controller.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:flutter/material.dart'; import '../models/favorite_ondemand_service_model.dart'; import '../models/provider_serivce_model.dart'; diff --git a/lib/controllers/view_category_service_controller.dart b/lib/controllers/view_category_service_controller.dart index 433bd2a..776ab42 100644 --- a/lib/controllers/view_category_service_controller.dart +++ b/lib/controllers/view_category_service_controller.dart @@ -1,6 +1,6 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/on_demand_home_controller.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../models/provider_serivce_model.dart'; import '../service/fire_store_utils.dart'; diff --git a/lib/controllers/wallet_controller.dart b/lib/controllers/wallet_controller.dart index 44518fb..afa1f11 100644 --- a/lib/controllers/wallet_controller.dart +++ b/lib/controllers/wallet_controller.dart @@ -17,7 +17,7 @@ import 'package:customer/models/payment_model/xendit.dart'; import 'package:customer/models/user_model.dart'; import 'package:customer/models/wallet_transaction_model.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_stripe/flutter_stripe.dart'; import 'package:razorpay_flutter/razorpay_flutter.dart'; @@ -34,7 +34,7 @@ import '../payment/xenditScreen.dart'; import '../service/fire_store_utils.dart'; import 'package:customer/utils/preferences.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:http/http.dart' as http; import 'package:uuid/uuid.dart'; @@ -160,7 +160,7 @@ class WalletController extends GetxController { } }); - ShowToastDialog.showToast("Amount Top-up successfully".tr()); + ShowToastDialog.showToast("Amount Top-up successfully".tr); } // Strip @@ -174,7 +174,7 @@ class WalletController extends GetxController { if (paymentIntentData!.containsKey("error")) { Get.back(); ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } else { await Stripe.instance.initPaymentSheet( @@ -207,7 +207,7 @@ class WalletController extends GetxController { Future displayStripePaymentSheet({required String amount}) async { try { await Stripe.instance.presentPaymentSheet().then((value) { - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); walletTopUp(); }); } on StripeException catch (e) { @@ -290,15 +290,15 @@ class WalletController extends GetxController { final data = jsonDecode(response.body); Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); walletTopUp(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { ShowToastDialog.showToast( - "Something want wrong please contact administrator".tr(), + "Something want wrong please contact administrator".tr, ); print('Error creating preference: ${response.body}'); return null; @@ -327,15 +327,15 @@ class WalletController extends GetxController { note: "Contact us for any questions on your order.", onSuccess: (Map params) async { walletTopUp(); - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); }, onError: (error) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, onCancel: (params) { Get.back(); - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); }, ), ), @@ -362,15 +362,15 @@ class WalletController extends GetxController { ), )!.then((value) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); walletTopUp(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); } }); @@ -412,10 +412,10 @@ class WalletController extends GetxController { value, ) { if (value) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); walletTopUp(); } else { - ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); + ShowToastDialog.showToast("Payment UnSuccessful!!".tr); } }); } else { @@ -449,11 +449,11 @@ class WalletController extends GetxController { ); if (isDone) { Get.back(); - ShowToastDialog.showToast("Payment successfully".tr()); + ShowToastDialog.showToast("Payment successfully".tr); walletTopUp(); } else { Get.back(); - ShowToastDialog.showToast("Payment Failed".tr()); + ShowToastDialog.showToast("Payment Failed".tr); } }); } @@ -488,18 +488,18 @@ class WalletController extends GetxController { } void handlePaymentSuccess(PaymentSuccessResponse response) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); walletTopUp(); } void handleExternalWaller(ExternalWalletResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Processing!! via".tr()); + ShowToastDialog.showToast("Payment Processing!! via".tr); } void handlePaymentError(PaymentFailureResponse response) { Get.back(); - ShowToastDialog.showToast("Payment Failed!!".tr()); + ShowToastDialog.showToast("Payment Failed!!".tr); } //Midtrans payment @@ -512,10 +512,10 @@ class WalletController extends GetxController { if (url != '') { Get.to(() => MidtransScreen(initialURl: url))!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); walletTopUp(); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } @@ -556,7 +556,7 @@ class WalletController extends GetxController { return responseData['payment_url']; } else { ShowToastDialog.showToast( - "something went wrong, please contact admin.".tr(), + "something went wrong, please contact admin.".tr, ); return ''; } @@ -599,12 +599,12 @@ class WalletController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); walletTopUp(); } }); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } } @@ -639,7 +639,7 @@ class WalletController extends GetxController { ); } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -692,7 +692,7 @@ class WalletController extends GetxController { } } else { ShowToastDialog.showToast( - "Something went wrong, please contact admin.".tr(), + "Something went wrong, please contact admin.".tr, ); return ''; } @@ -718,10 +718,10 @@ class WalletController extends GetxController { ), )!.then((value) { if (value == true) { - ShowToastDialog.showToast("Payment Successful!!".tr()); + ShowToastDialog.showToast("Payment Successful!!".tr); walletTopUp(); } else { - ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); + ShowToastDialog.showToast("Payment Unsuccessful!!".tr); } }); } diff --git a/lib/main.dart b/lib/main.dart index 7dae675..47b0a7e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,11 +4,10 @@ import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/easy_loading_config.dart'; import 'package:customer/utils/app_router.dart'; import 'package:customer/utils/preferences.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; -import 'package:flutter_phoenix/flutter_phoenix.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'controllers/global_setting_controller.dart'; @@ -17,7 +16,7 @@ import 'firebase_options.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); - await EasyLocalization.ensureInitialized(); + await LocalizationService.init(); await Firebase.initializeApp( name: 'default', options: DefaultFirebaseOptions.currentPlatform, @@ -28,19 +27,7 @@ void main() async { Get.put(ThemeController()); await configEasyLoading(); - runApp( - EasyLocalization( - startLocale: Locale('uz', 'UZ'), - supportedLocales: [ - Locale('en', 'US'), - Locale('uz', 'UZ'), - Locale('ru', 'RU'), - ], - path: 'assets/translations', - fallbackLocale: Locale('uz', 'UZ'), - child: MyApp(), - ), - ); + runApp(MyApp()); } class MyApp extends StatelessWidget { @@ -56,11 +43,12 @@ class MyApp extends StatelessWidget { designSize: Size(375, 812), minTextAdapt: true, splitScreenMode: true, - child: MaterialApp( + child: GetMaterialApp( + translations: LocalizationService(), + locale: const Locale('uz', 'UZ'), navigatorKey: AppRouter.navigatorKey, - localizationsDelegates: context.localizationDelegates, - supportedLocales: context.supportedLocales, - locale: context.locale, + fallbackLocale: const Locale('uz', 'UZ'), + supportedLocales: LocalizationService.supportedLocales, debugShowCheckedModeBanner: false, builder: (context, child) { return SafeArea( diff --git a/lib/payment/MercadoPagoScreen.dart b/lib/payment/MercadoPagoScreen.dart index 432e62c..c8ff28f 100644 --- a/lib/payment/MercadoPagoScreen.dart +++ b/lib/payment/MercadoPagoScreen.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'package:customer/constant/constant.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:webview_flutter/webview_flutter.dart'; class MercadoPagoScreen extends StatefulWidget { @@ -65,7 +65,7 @@ class _MercadoPagoScreenState extends State { }, child: Scaffold( appBar: AppBar( - title: Text("Payment".tr()), + title: Text("Payment".tr), centerTitle: false, leading: GestureDetector( onTap: () { @@ -85,12 +85,12 @@ class _MercadoPagoScreenState extends State { barrierDismissible: true, // user must tap button! builder: (BuildContext context) { return AlertDialog( - title: Text('Cancel Payment'.tr()), - content: SingleChildScrollView(child: Text("Cancel Payment?".tr())), + title: Text('Cancel Payment'.tr), + content: SingleChildScrollView(child: Text("Cancel Payment?".tr)), actions: [ TextButton( child: Text( - 'Cancel'.tr(), + 'Cancel'.tr, style: const TextStyle(color: Colors.red), ), onPressed: () { @@ -100,7 +100,7 @@ class _MercadoPagoScreenState extends State { ), TextButton( child: Text( - 'Continue'.tr(), + 'Continue'.tr, style: const TextStyle(color: Colors.green), ), onPressed: () { diff --git a/lib/payment/PayFastScreen.dart b/lib/payment/PayFastScreen.dart index d1cd451..d8bc2b5 100644 --- a/lib/payment/PayFastScreen.dart +++ b/lib/payment/PayFastScreen.dart @@ -3,10 +3,10 @@ import 'dart:developer'; import 'package:customer/models/payment_model/pay_fast_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:webview_flutter/webview_flutter.dart'; class PayFastScreen extends StatefulWidget { @@ -91,10 +91,10 @@ class _PayFastScreenState extends State { builder: (BuildContext context) { return AlertDialog( title: const Text('Cancel Payment'), - content: SingleChildScrollView(child: Text("Cancel Payment?".tr())), + content: SingleChildScrollView(child: Text("Cancel Payment?".tr)), actions: [ TextButton( - child: Text('Exit'.tr(), style: TextStyle(color: Colors.red)), + child: Text('Exit'.tr, style: TextStyle(color: Colors.red)), onPressed: () { Get.back(); Get.back(result: false); @@ -102,7 +102,7 @@ class _PayFastScreenState extends State { ), TextButton( child: Text( - 'Continue Payment'.tr(), + 'Continue Payment'.tr, style: TextStyle(color: Colors.green), ), onPressed: () { diff --git a/lib/payment/midtrans_screen.dart b/lib/payment/midtrans_screen.dart index 9c6c6c2..2ca9411 100644 --- a/lib/payment/midtrans_screen.dart +++ b/lib/payment/midtrans_screen.dart @@ -2,9 +2,8 @@ import 'dart:async'; import 'dart:developer'; import 'dart:io'; -import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:webview_flutter/webview_flutter.dart'; class MidtransScreen extends StatefulWidget { @@ -104,12 +103,12 @@ class _MidtransScreenState extends State { barrierDismissible: true, // user must tap button! builder: (BuildContext context) { return AlertDialog( - title: Text('Cancel Payment'.tr()), - content: SingleChildScrollView(child: Text("Cancel Payment?".tr())), + title: Text('Cancel Payment'.tr), + content: SingleChildScrollView(child: Text("Cancel Payment?".tr)), actions: [ TextButton( child: Text( - 'Cancel'.tr(), + 'Cancel'.tr, style: const TextStyle(color: Colors.red), ), onPressed: () { @@ -119,7 +118,7 @@ class _MidtransScreenState extends State { ), TextButton( child: Text( - 'Continue'.tr(), + 'Continue'.tr, style: const TextStyle(color: Colors.green), ), onPressed: () { diff --git a/lib/payment/orangePayScreen.dart b/lib/payment/orangePayScreen.dart index 7d2bbd7..dd71bda 100644 --- a/lib/payment/orangePayScreen.dart +++ b/lib/payment/orangePayScreen.dart @@ -3,9 +3,9 @@ import 'dart:async'; import 'dart:convert'; import 'package:customer/models/payment_model/orange_money.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:http/http.dart' as http; import 'package:webview_flutter/webview_flutter.dart'; @@ -140,7 +140,7 @@ class _OrangeMoneyScreenState extends State { icon: const Icon(Icons.arrow_back, color: Colors.white), onPressed: _showCancelDialog, ), - title: Text('Orange Money Payment'.tr()), + title: Text('Orange Money Payment'.tr), ), body: isLoading @@ -156,15 +156,15 @@ class _OrangeMoneyScreenState extends State { barrierDismissible: true, builder: (BuildContext context) { return AlertDialog( - title: Text('Cancel Payment'.tr()), - content: Text('Are you sure you want to cancel this payment?'.tr()), + title: Text('Cancel Payment'.tr), + content: Text('Are you sure you want to cancel this payment?'.tr), actions: [ TextButton( child: Text('No', style: TextStyle(color: Colors.green)), onPressed: () => Get.back(), ), TextButton( - child: Text('Yes'.tr(), style: TextStyle(color: Colors.red)), + child: Text('Yes'.tr, style: TextStyle(color: Colors.red)), onPressed: () { timer?.cancel(); Get.back(); // close dialog @@ -190,7 +190,7 @@ class _OrangeMoneyScreenState extends State { // import 'dart:convert'; // import 'package:customer/models/payment_model/orange_money.dart'; // import 'package:flutter/material.dart'; -// import 'package:get/get.dart' hide Trans;// import 'package:http/http.dart' as http; +// import 'package:get/get.dart';// import 'package:http/http.dart' as http; // import 'package:webview_flutter/webview_flutter.dart'; // // class OrangeMoneyScreen extends StatefulWidget { @@ -336,14 +336,14 @@ class _OrangeMoneyScreenState extends State { // barrierDismissible: true, // user must tap button! // builder: (BuildContext context) { // return AlertDialog( -// title: Text('Cancel Payment'.tr()), +// title: Text('Cancel Payment'.tr), // content: SingleChildScrollView( -// child: Text("cancelPayment?".tr()), +// child: Text("cancelPayment?".tr), // ), // actions: [ // TextButton( // child: Text( -// 'Cancel'.tr(), +// 'Cancel'.tr, // style: const TextStyle(color: Colors.red), // ), // onPressed: () { @@ -353,7 +353,7 @@ class _OrangeMoneyScreenState extends State { // ), // TextButton( // child: Text( -// 'Continue'.tr(), +// 'Continue'.tr, // style: const TextStyle(color: Colors.green), // ), // onPressed: () { diff --git a/lib/payment/paystack/pay_stack_screen.dart b/lib/payment/paystack/pay_stack_screen.dart index 51d3854..07786cc 100644 --- a/lib/payment/paystack/pay_stack_screen.dart +++ b/lib/payment/paystack/pay_stack_screen.dart @@ -2,9 +2,9 @@ import 'dart:async'; import 'package:customer/payment/paystack/paystack_url_genrater.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:webview_flutter/webview_flutter.dart'; class PayStackScreen extends StatefulWidget { @@ -95,7 +95,7 @@ class _PayStackScreenState extends State { child: Scaffold( appBar: AppBar( backgroundColor: AppThemeData.grey50, - title: Text("Payment".tr()), + title: Text("Payment".tr), centerTitle: false, leading: GestureDetector( onTap: () { diff --git a/lib/payment/xenditScreen.dart b/lib/payment/xenditScreen.dart index 0f3b178..84b058c 100644 --- a/lib/payment/xenditScreen.dart +++ b/lib/payment/xenditScreen.dart @@ -3,9 +3,9 @@ import 'dart:convert'; import 'dart:developer'; import 'package:customer/payment/xenditModel.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:http/http.dart' as http; import 'package:webview_flutter/webview_flutter.dart'; @@ -127,12 +127,12 @@ class _XenditScreenState extends State { barrierDismissible: true, // user must tap button! builder: (BuildContext context) { return AlertDialog( - title: Text('Cancel Payment'.tr()), - content: SingleChildScrollView(child: Text("Cancel Payment?".tr())), + title: Text('Cancel Payment'.tr), + content: SingleChildScrollView(child: Text("Cancel Payment?".tr)), actions: [ TextButton( child: Text( - 'Cancel'.tr(), + 'Cancel'.tr, style: const TextStyle(color: Colors.red), ), onPressed: () { @@ -142,7 +142,7 @@ class _XenditScreenState extends State { ), TextButton( child: Text( - 'Continue'.tr(), + 'Continue'.tr, style: const TextStyle(color: Colors.green), ), onPressed: () { diff --git a/lib/screen_ui/auth_screens/forgot_password_screen.dart b/lib/screen_ui/auth_screens/forgot_password_screen.dart index e1ab3ad..24c08a0 100644 --- a/lib/screen_ui/auth_screens/forgot_password_screen.dart +++ b/lib/screen_ui/auth_screens/forgot_password_screen.dart @@ -1,9 +1,10 @@ import 'package:customer/constant/const_texts.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/forgot_password_controller.dart'; import '../../controllers/theme_controller.dart'; import '../../themes/app_them_data.dart'; @@ -38,7 +39,7 @@ class ForgotPasswordScreen extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ Text( - ConstTexts.skip.tr(), + ConstTexts.skip.tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -74,7 +75,7 @@ class ForgotPasswordScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - ConstTexts.enterYourregisteredEmail.tr(), + ConstTexts.enterYourregisteredEmail.tr, style: AppThemeData.boldTextStyle( fontSize: 24, color: @@ -85,14 +86,14 @@ class ForgotPasswordScreen extends StatelessWidget { ), const SizedBox(height: 24), TextFieldWidget( - title: ConstTexts.emailAddress.tr(), + title: ConstTexts.emailAddress.tr, hintText: "abdusalom@gmail.com", controller: controller.emailEditingController.value, ), const SizedBox(height: 30), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.sendLink.tr(), + title: ConstTexts.sendLink.tr, onPress: controller.forgotPassword, color: isDark @@ -112,7 +113,7 @@ class ForgotPasswordScreen extends StatelessWidget { child: Center( child: Text.rich( TextSpan( - text: ConstTexts.rememberPassword.tr(), + text: ConstTexts.rememberPassword.tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -121,7 +122,7 @@ class ForgotPasswordScreen extends StatelessWidget { ), children: [ TextSpan( - text: ConstTexts.login.tr(), + text: ConstTexts.login.tr, style: AppThemeData.mediumTextStyle( color: AppThemeData.ecommerce300, decoration: TextDecoration.underline, @@ -130,7 +131,7 @@ class ForgotPasswordScreen extends StatelessWidget { recognizer: TapGestureRecognizer() ..onTap = () { - Get.offAll(() => const LoginScreen()); + Get.offAll(LoginScreen()); }, ), ], diff --git a/lib/screen_ui/auth_screens/login_screen.dart b/lib/screen_ui/auth_screens/login_screen.dart index 832426a..c20f8b9 100644 --- a/lib/screen_ui/auth_screens/login_screen.dart +++ b/lib/screen_ui/auth_screens/login_screen.dart @@ -3,7 +3,8 @@ import 'dart:io'; import 'package:customer/constant/const_texts.dart'; import 'package:customer/screen_ui/auth_screens/sign_up_screen.dart'; import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -13,7 +14,7 @@ import '../../controllers/theme_controller.dart'; import '../../themes/app_them_data.dart'; import '../../themes/round_button_fill.dart'; import '../../themes/text_field_widget.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'forgot_password_screen.dart'; import 'mobile_login_screen.dart'; @@ -38,7 +39,7 @@ class LoginScreen extends StatelessWidget { child: Row( children: [ Text( - ConstTexts.skip.tr(), + ConstTexts.skip.tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -72,7 +73,7 @@ class LoginScreen extends StatelessWidget { children: [ const SizedBox(height: 20), Text( - ConstTexts.loginToExplore.tr(), + ConstTexts.loginToExplore.tr, style: AppThemeData.boldTextStyle( fontSize: 24, color: @@ -83,15 +84,15 @@ class LoginScreen extends StatelessWidget { ), const SizedBox(height: 24), TextFieldWidget( - title: ConstTexts.emailAddress.tr(), + title: ConstTexts.emailAddress.tr, hintText: "abdusalom@gmail.com", controller: controller.emailController.value, focusNode: controller.emailFocusNode, ), const SizedBox(height: 15), TextFieldWidget( - title: ConstTexts.password.tr(), - hintText: ConstTexts.enterPassword.tr(), + title: ConstTexts.password.tr, + hintText: ConstTexts.enterPassword.tr, controller: controller.passwordController.value, obscureText: controller.passwordVisible.value, focusNode: controller.passwordFocusNode, @@ -133,7 +134,7 @@ class LoginScreen extends StatelessWidget { () => const ForgotPasswordScreen(), ), child: Text( - ConstTexts.forgotPassword.tr(), + ConstTexts.forgotPassword.tr, style: AppThemeData.semiBoldTextStyle( color: AppThemeData.info400, ), @@ -143,7 +144,7 @@ class LoginScreen extends StatelessWidget { const SizedBox(height: 20), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.login.tr(), + title: ConstTexts.login.tr, onPress: controller.loginWithEmail, color: isDark @@ -168,7 +169,7 @@ class LoginScreen extends StatelessWidget { ), const SizedBox(width: 15), Text( - ConstTexts.orContinueWith.tr(), + ConstTexts.orContinueWith.tr, style: AppThemeData.regularTextStyle( color: isDark @@ -192,7 +193,7 @@ class LoginScreen extends StatelessWidget { const SizedBox(height: 25), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.mobileNumber.tr(), + title: ConstTexts.mobileNumber.tr, onPress: () => Get.to(() => const MobileLoginScreen()), isRight: false, @@ -218,7 +219,7 @@ class LoginScreen extends StatelessWidget { Expanded( child: RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.withGoogle.tr(), + title: ConstTexts.withGoogle.tr, textColor: isDark ? AppThemeData.grey100 @@ -242,7 +243,7 @@ class LoginScreen extends StatelessWidget { ? Expanded( child: RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.withApple.tr(), + title: ConstTexts.withApple.tr, isCenter: true, textColor: isDark @@ -273,7 +274,7 @@ class LoginScreen extends StatelessWidget { child: Center( child: Text.rich( TextSpan( - text: "${ConstTexts.dontHaveAccount.tr()} ", + text: "${ConstTexts.dontHaveAccount.tr} ", style: AppThemeData.mediumTextStyle( color: isDark @@ -282,7 +283,7 @@ class LoginScreen extends StatelessWidget { ), children: [ TextSpan( - text: ConstTexts.signUp.tr(), + text: ConstTexts.signUp.tr, style: AppThemeData.mediumTextStyle( color: AppThemeData.ecommerce300, decoration: TextDecoration.underline, @@ -290,7 +291,7 @@ class LoginScreen extends StatelessWidget { recognizer: TapGestureRecognizer() ..onTap = () { - Get.offAll(() => const SignUpScreen()); + Get.offAll(SignUpScreen()); }, ), ], diff --git a/lib/screen_ui/auth_screens/mobile_login_screen.dart b/lib/screen_ui/auth_screens/mobile_login_screen.dart index 9c9c368..bb60041 100644 --- a/lib/screen_ui/auth_screens/mobile_login_screen.dart +++ b/lib/screen_ui/auth_screens/mobile_login_screen.dart @@ -2,12 +2,13 @@ import 'package:country_code_picker/country_code_picker.dart'; import 'package:customer/constant/const_texts.dart'; import 'package:customer/screen_ui/auth_screens/sign_up_screen.dart'; import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/assets.dart'; import '../../constant/constant.dart'; import '../../controllers/mobile_login_controller.dart'; @@ -55,7 +56,7 @@ class MobileLoginScreen extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ Text( - ConstTexts.skip.tr(), + ConstTexts.skip.tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -91,7 +92,7 @@ class MobileLoginScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - ConstTexts.useYourMobileNumber.tr(), + ConstTexts.useYourMobileNumber.tr, style: AppThemeData.boldTextStyle( fontSize: 24, color: @@ -102,8 +103,8 @@ class MobileLoginScreen extends StatelessWidget { ), const SizedBox(height: 25), TextFieldWidget( - title: ConstTexts.mobileNumber.tr(), - hintText: ConstTexts.enterMobileNumber.tr(), + title: ConstTexts.mobileNumber.tr, + hintText: ConstTexts.enterMobileNumber.tr, controller: controller.mobileController.value, textInputType: const TextInputType.numberWithOptions( @@ -182,7 +183,7 @@ class MobileLoginScreen extends StatelessWidget { const SizedBox(height: 30), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.sendCode.tr(), + title: ConstTexts.sendCode.tr, onPress: controller.sendOtp, color: isDark @@ -207,7 +208,7 @@ class MobileLoginScreen extends StatelessWidget { ), const SizedBox(width: 15), Text( - ConstTexts.orContinueWith.tr(), + ConstTexts.orContinueWith.tr, style: AppThemeData.regularTextStyle( color: isDark @@ -229,7 +230,7 @@ class MobileLoginScreen extends StatelessWidget { const SizedBox(height: 25), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.emailAddress.tr(), + title: ConstTexts.emailAddress.tr, onPress: () => Get.to(() => const SignUpScreen()), isRight: false, isCenter: true, @@ -257,7 +258,7 @@ class MobileLoginScreen extends StatelessWidget { child: Center( child: Text.rich( TextSpan( - text: "${ConstTexts.dontHaveAccount.tr()} ", + text: "${ConstTexts.dontHaveAccount.tr} ", style: AppThemeData.mediumTextStyle( color: isDark @@ -266,7 +267,7 @@ class MobileLoginScreen extends StatelessWidget { ), children: [ TextSpan( - text: ConstTexts.signUp.tr(), + text: ConstTexts.signUp.tr, style: AppThemeData.mediumTextStyle( color: AppThemeData.ecommerce300, decoration: TextDecoration.underline, @@ -276,7 +277,7 @@ class MobileLoginScreen extends StatelessWidget { recognizer: TapGestureRecognizer() ..onTap = () { - Get.offAll(() => const SignUpScreen()); + Get.offAll(SignUpScreen()); }, ), ], diff --git a/lib/screen_ui/auth_screens/otp_verification_screen.dart b/lib/screen_ui/auth_screens/otp_verification_screen.dart index 0def8c1..54d4231 100644 --- a/lib/screen_ui/auth_screens/otp_verification_screen.dart +++ b/lib/screen_ui/auth_screens/otp_verification_screen.dart @@ -1,10 +1,11 @@ import 'package:customer/constant/const_texts.dart'; import 'package:customer/screen_ui/auth_screens/sign_up_screen.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; import '../../constant/assets.dart'; import '../../controllers/otp_verification_controller.dart'; @@ -51,7 +52,7 @@ class OtpVerificationScreen extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ Text( - ConstTexts.skip.tr(), + ConstTexts.skip.tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -87,7 +88,7 @@ class OtpVerificationScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "${ConstTexts.enterOtpSent.tr()} ${controller.countryCode} ${controller.maskPhoneNumber(controller.phoneNumber.value)}", + "${ConstTexts.enterOtpSent.tr} ${controller.countryCode} ${controller.maskPhoneNumber(controller.phoneNumber.value)}", style: AppThemeData.boldTextStyle( fontSize: 24, color: @@ -165,7 +166,7 @@ class OtpVerificationScreen extends StatelessWidget { controller.sendOTP(); }, child: Text( - ConstTexts.resendOTP.tr(), + ConstTexts.resendOTP.tr, style: AppThemeData.semiBoldTextStyle( color: AppThemeData.info400, fontSize: 16, @@ -180,7 +181,7 @@ class OtpVerificationScreen extends StatelessWidget { /// Verify Button RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.verify.tr(), + title: ConstTexts.verify.tr, onPress: controller.verifyOtp, color: isDark @@ -200,7 +201,7 @@ class OtpVerificationScreen extends StatelessWidget { child: Center( child: Text.rich( TextSpan( - text: "${ConstTexts.dontHaveAccount.tr()} ", + text: "${ConstTexts.dontHaveAccount.tr} ", style: AppThemeData.mediumTextStyle( color: isDark @@ -209,17 +210,14 @@ class OtpVerificationScreen extends StatelessWidget { ), children: [ TextSpan( - text: ConstTexts.signUp.tr(), + text: ConstTexts.signUp.tr, style: AppThemeData.mediumTextStyle( color: AppThemeData.ecommerce300, decoration: TextDecoration.underline, ), recognizer: TapGestureRecognizer() - ..onTap = - () => Get.offAll( - () => const SignUpScreen(), - ), + ..onTap = () => Get.offAll(SignUpScreen()), ), ], ), diff --git a/lib/screen_ui/auth_screens/sign_up_screen.dart b/lib/screen_ui/auth_screens/sign_up_screen.dart index 9ea4b1f..a46a796 100644 --- a/lib/screen_ui/auth_screens/sign_up_screen.dart +++ b/lib/screen_ui/auth_screens/sign_up_screen.dart @@ -1,7 +1,8 @@ import 'package:country_code_picker/country_code_picker.dart'; import 'package:customer/constant/const_texts.dart'; import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -13,7 +14,7 @@ import '../../controllers/theme_controller.dart'; import '../../themes/app_them_data.dart'; import '../../themes/round_button_fill.dart'; import '../../themes/text_field_widget.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'login_screen.dart'; import 'mobile_login_screen.dart'; @@ -45,7 +46,7 @@ class SignUpScreen extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ Text( - ConstTexts.skip.tr(), + ConstTexts.skip.tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -78,7 +79,7 @@ class SignUpScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - ConstTexts.signUpToExplore.tr(), + ConstTexts.signUpToExplore.tr, style: AppThemeData.boldTextStyle( fontSize: 24, color: @@ -93,7 +94,7 @@ class SignUpScreen extends StatelessWidget { children: [ Expanded( child: TextFieldWidget( - title: ConstTexts.firstName.tr(), + title: ConstTexts.firstName.tr, hintText: "Abdusalom", controller: controller.firstNameController.value, ), @@ -101,7 +102,7 @@ class SignUpScreen extends StatelessWidget { const SizedBox(width: 10), Expanded( child: TextFieldWidget( - title: ConstTexts.lastName.tr(), + title: ConstTexts.lastName.tr, hintText: "G'ayratov", controller: controller.lastNameController.value, ), @@ -110,15 +111,15 @@ class SignUpScreen extends StatelessWidget { ), const SizedBox(height: 15), TextFieldWidget( - title: ConstTexts.emailAddress.tr(), + title: ConstTexts.emailAddress.tr, hintText: "abdusalom@gmail.com", controller: controller.emailController.value, focusNode: controller.emailFocusNode, ), const SizedBox(height: 15), TextFieldWidget( - title: ConstTexts.mobileNumber.tr(), - hintText: ConstTexts.enterMobileNumber.tr(), + title: ConstTexts.mobileNumber.tr, + hintText: ConstTexts.enterMobileNumber.tr, enable: controller.type.value == "mobileNumber" ? false @@ -195,8 +196,8 @@ class SignUpScreen extends StatelessWidget { ), const SizedBox(height: 15), TextFieldWidget( - title: ConstTexts.password.tr(), - hintText: ConstTexts.enterPassword.tr(), + title: ConstTexts.password.tr, + hintText: ConstTexts.enterPassword.tr, controller: controller.passwordController.value, obscureText: controller.passwordVisible.value, focusNode: controller.passwordFocusNode, @@ -232,8 +233,8 @@ class SignUpScreen extends StatelessWidget { ), const SizedBox(height: 15), TextFieldWidget( - title: ConstTexts.confirmPassword.tr(), - hintText: ConstTexts.enterConfirmPassword.tr(), + title: ConstTexts.confirmPassword.tr, + hintText: ConstTexts.enterConfirmPassword.tr, controller: controller.confirmPasswordController.value, obscureText: controller.conformPasswordVisible.value, suffix: Padding( @@ -268,14 +269,14 @@ class SignUpScreen extends StatelessWidget { ), const SizedBox(height: 15), TextFieldWidget( - title: ConstTexts.referralCode.tr(), - hintText: ConstTexts.enterReferralCode.tr(), + title: ConstTexts.referralCode.tr, + hintText: ConstTexts.enterReferralCode.tr, controller: controller.referralController.value, ), const SizedBox(height: 40), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.signUp.tr(), + title: ConstTexts.signUp.tr, onPress: () => controller.signUp(), color: isDark @@ -300,7 +301,7 @@ class SignUpScreen extends StatelessWidget { ), const SizedBox(width: 15), Text( - ConstTexts.orContinueWith.tr(), + ConstTexts.orContinueWith.tr, style: AppThemeData.regularTextStyle( color: isDark @@ -322,7 +323,7 @@ class SignUpScreen extends StatelessWidget { const SizedBox(height: 25), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.mobileNumber.tr(), + title: ConstTexts.mobileNumber.tr, onPress: () => Get.to(() => const MobileLoginScreen()), isRight: false, isCenter: true, @@ -347,7 +348,7 @@ class SignUpScreen extends StatelessWidget { child: Center( child: Text.rich( TextSpan( - text: ConstTexts.alreadyHaveAccount.tr(), + text: ConstTexts.alreadyHaveAccount.tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -356,7 +357,7 @@ class SignUpScreen extends StatelessWidget { ), children: [ TextSpan( - text: ConstTexts.login.tr(), + text: ConstTexts.login.tr, style: AppThemeData.mediumTextStyle( color: AppThemeData.ecommerce300, decoration: TextDecoration.underline, @@ -366,7 +367,7 @@ class SignUpScreen extends StatelessWidget { recognizer: TapGestureRecognizer() ..onTap = () { - Get.offAll(() => const LoginScreen()); + Get.offAll(LoginScreen()); }, ), ], diff --git a/lib/screen_ui/cab_service_screens/Intercity_home_screen.dart b/lib/screen_ui/cab_service_screens/Intercity_home_screen.dart index 33fcf94..3cf353d 100644 --- a/lib/screen_ui/cab_service_screens/Intercity_home_screen.dart +++ b/lib/screen_ui/cab_service_screens/Intercity_home_screen.dart @@ -14,12 +14,12 @@ import 'package:customer/themes/round_button_border.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:customer/utils/utils.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:geocoding/geocoding.dart' as get_cord_address; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:flutter_map/flutter_map.dart' as flutterMap; import 'package:latlong2/latlong.dart' as latlong; @@ -280,7 +280,7 @@ class IntercityHomeScreen extends StatelessWidget { controller.setDepartureMarker(lat, lng); } else { ShowToastDialog.showToast( - ConstTexts.serviceIsUnavailable.tr(), + ConstTexts.serviceIsUnavailable.tr, ); } } @@ -313,7 +313,7 @@ class IntercityHomeScreen extends StatelessWidget { ); } else { ShowToastDialog.showToast( - ConstTexts.serviceIsUnavailable.tr(), + ConstTexts.serviceIsUnavailable.tr, ); } } @@ -323,7 +323,7 @@ class IntercityHomeScreen extends StatelessWidget { child: TextFieldWidget( controller: controller.sourceTextEditController.value, - hintText: ConstTexts.pickUpLocation.tr(), + hintText: ConstTexts.pickUpLocation.tr, enable: false, prefix: Padding( padding: EdgeInsets.only(left: 10, right: 10), @@ -387,7 +387,7 @@ class IntercityHomeScreen extends StatelessWidget { .value, // backgroundColor: AppThemeData.grey50, // borderColor: AppThemeData.grey50, - hintText: ConstTexts.destinationLocation.tr(), + hintText: ConstTexts.destinationLocation.tr, enable: false, prefix: const Padding( padding: EdgeInsets.only(left: 10, right: 10), @@ -424,7 +424,7 @@ class IntercityHomeScreen extends StatelessWidget { Align( alignment: Alignment.centerLeft, child: Text( - ConstTexts.popularDestinations.tr(), + ConstTexts.popularDestinations.tr, style: AppThemeData.boldTextStyle( fontSize: 16, color: AppThemeData.grey900, @@ -576,7 +576,7 @@ class IntercityHomeScreen extends StatelessWidget { SizedBox(height: 10), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.continueT.tr(), + title: ConstTexts.continueT.tr, onPress: () { if (controller .sourceTextEditController @@ -584,7 +584,7 @@ class IntercityHomeScreen extends StatelessWidget { .text .isEmpty) { ShowToastDialog.showToast( - ConstTexts.plsSelectSourceLocation.tr(), + ConstTexts.plsSelectSourceLocation.tr, ); } else if (controller .destinationTextEditController @@ -592,7 +592,7 @@ class IntercityHomeScreen extends StatelessWidget { .text .isEmpty) { ShowToastDialog.showToast( - ConstTexts.plsSelectDestinationLocations.tr(), + ConstTexts.plsSelectDestinationLocations.tr, ); } else { controller.bottomSheetType.value = "vehicleSelection"; @@ -650,7 +650,7 @@ class IntercityHomeScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.symmetric(vertical: 10), child: Text( - ConstTexts.selectVehicleType.tr(), + ConstTexts.selectVehicleType.tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: @@ -824,7 +824,7 @@ class IntercityHomeScreen extends StatelessWidget { Obx( () => RoundedButtonFill( borderRadius: 10.r, - title: 'pay_amount'.tr(namedArgs: { + title: 'pay_amount'.trParams({ 'amount': controller.selectedVehicleType.value.id == null ? Constant.amountShow(amount: "0.0") : Constant.amountShow( @@ -842,7 +842,7 @@ class IntercityHomeScreen extends StatelessWidget { controller.bottomSheetType.value = "payment"; } else { ShowToastDialog.showToast( - ConstTexts.plsSelectVehicleTypeFirst.tr(), + ConstTexts.plsSelectVehicleTypeFirst.tr, ); } }, @@ -884,7 +884,7 @@ class IntercityHomeScreen extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - ConstTexts.selectPaymentMethod.tr(), + ConstTexts.selectPaymentMethod.tr, style: AppThemeData.mediumTextStyle( fontSize: 18, color: @@ -914,7 +914,7 @@ class IntercityHomeScreen extends StatelessWidget { controller: scrollController, children: [ Text( - ConstTexts.prefferedPayment.tr(), + ConstTexts.prefferedPayment.tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( fontSize: 15, @@ -994,7 +994,7 @@ class IntercityHomeScreen extends StatelessWidget { children: [ const SizedBox(height: 10), Text( - ConstTexts.otherPaymentOptions.tr(), + ConstTexts.otherPaymentOptions.tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( fontSize: 15, @@ -1150,13 +1150,13 @@ class IntercityHomeScreen extends StatelessWidget { ), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.continueT.tr(), + title: ConstTexts.continueT.tr, color: AppThemeData.primary300, textColor: AppThemeData.grey900, onPress: () async { if (controller.selectedPaymentMethod.value.isEmpty) { ShowToastDialog.showToast( - ConstTexts.plsSelectPaymentMethod.tr(), + ConstTexts.plsSelectPaymentMethod.tr, ); return; } @@ -1165,7 +1165,7 @@ class IntercityHomeScreen extends StatelessWidget { controller.userModel.value.walletAmount ?? 0; if (walletAmount <= 0) { ShowToastDialog.showToast( - ConstTexts.insufficientWallet.tr(), + ConstTexts.insufficientWallet.tr, ); return; } @@ -1321,7 +1321,7 @@ class IntercityHomeScreen extends StatelessWidget { .sourceTextEditController .value, hintText: - ConstTexts.pickUpLocation.tr(), + ConstTexts.pickUpLocation.tr, enable: false, prefix: const Padding( padding: EdgeInsets.only( @@ -1404,8 +1404,7 @@ class IntercityHomeScreen extends StatelessWidget { // backgroundColor: AppThemeData.grey50, // borderColor: AppThemeData.grey50, hintText: - ConstTexts.destinationLocation - .tr(), + ConstTexts.destinationLocation.tr, enable: false, prefix: const Padding( padding: EdgeInsets.only( @@ -1453,7 +1452,7 @@ class IntercityHomeScreen extends StatelessWidget { children: [ Expanded( child: Text( - ConstTexts.promoCode.tr(), + ConstTexts.promoCode.tr, style: AppThemeData.boldTextStyle( fontSize: 16, color: @@ -1483,15 +1482,14 @@ class IntercityHomeScreen extends StatelessWidget { controller.calculateTotalAmount(); } else { ShowToastDialog.showToast( - ConstTexts.thisOfferNotEligible - .tr(), + ConstTexts.thisOfferNotEligible.tr, ); } } }); }, child: Text( - ConstTexts.viewAll.tr(), + ConstTexts.viewAll.tr, style: AppThemeData.boldTextStyle( decoration: TextDecoration.underline, fontSize: 14, @@ -1552,7 +1550,7 @@ class IntercityHomeScreen extends StatelessWidget { decoration: InputDecoration( border: InputBorder.none, hintText: - ConstTexts.writeCoupon.tr(), + ConstTexts.writeCoupon.tr, contentPadding: EdgeInsets.only( bottom: 10, ), @@ -1569,7 +1567,7 @@ class IntercityHomeScreen extends StatelessWidget { ), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.redeemNow.tr(), + title: ConstTexts.redeemNow.tr, width: 27.w, fontSizes: 14, @@ -1623,18 +1621,17 @@ class IntercityHomeScreen extends StatelessWidget { ShowToastDialog.showToast( ConstTexts .thisOfferNotEligible - .tr(), + .tr, ); } } else { ShowToastDialog.showToast( - ConstTexts.couponExpired.tr(), + ConstTexts.couponExpired.tr, ); } } else { ShowToastDialog.showToast( - ConstTexts.invalidCouponCode - .tr(), + ConstTexts.invalidCouponCode.tr, ); } }, @@ -1668,7 +1665,7 @@ class IntercityHomeScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - ConstTexts.orderSummary.tr(), + ConstTexts.orderSummary.tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: @@ -1688,7 +1685,7 @@ class IntercityHomeScreen extends StatelessWidget { MainAxisAlignment.spaceBetween, children: [ Text( - ConstTexts.subtotal.tr(), + ConstTexts.subtotal.tr, style: AppThemeData.mediumTextStyle( fontSize: 16, color: @@ -1726,7 +1723,7 @@ class IntercityHomeScreen extends StatelessWidget { Row( children: [ Text( - ConstTexts.discount.tr(), + ConstTexts.discount.tr, style: AppThemeData.mediumTextStyle( fontSize: 16, @@ -1845,7 +1842,7 @@ class IntercityHomeScreen extends StatelessWidget { MainAxisAlignment.spaceBetween, children: [ Text( - ConstTexts.orderTotal.tr(), + ConstTexts.orderTotal.tr, style: AppThemeData.mediumTextStyle( fontSize: 16, color: @@ -2035,7 +2032,7 @@ class IntercityHomeScreen extends StatelessWidget { ), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.confirmBooking.tr(), + title: ConstTexts.confirmBooking.tr, onPress: () async { controller.placeOrder(); }, @@ -2091,7 +2088,7 @@ class IntercityHomeScreen extends StatelessWidget { ), SizedBox(height: 30), Text( - ConstTexts.waitingForDriver.tr(), + ConstTexts.waitingForDriver.tr, style: AppThemeData.mediumTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -2100,7 +2097,7 @@ class IntercityHomeScreen extends StatelessWidget { Image.asset('assets/loader.gif', width: 250), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.cancelRide.tr(), + title: ConstTexts.cancelRide.tr, onPress: () async { try { // 1. Update current order status @@ -2150,7 +2147,7 @@ class IntercityHomeScreen extends StatelessWidget { // 5. Optional feedback ShowToastDialog.showToast( - ConstTexts.riderCancelledSucces.tr(), + ConstTexts.riderCancelledSucces.tr, ); Get.back(); CabDashboardController cabDashboardController = Get.put( @@ -2158,9 +2155,7 @@ class IntercityHomeScreen extends StatelessWidget { ); cabDashboardController.selectedIndex.value = 0; } catch (e) { - ShowToastDialog.showToast( - ConstTexts.failedToCancel.tr(), - ); + ShowToastDialog.showToast(ConstTexts.failedToCancel.tr); } }, color: AppThemeData.danger300, @@ -2258,7 +2253,7 @@ class IntercityHomeScreen extends StatelessWidget { controller .sourceTextEditController .value, - hintText: ConstTexts.pickUpLocation.tr(), + hintText: ConstTexts.pickUpLocation.tr, enable: false, readOnly: true, prefix: const Padding( @@ -2307,7 +2302,7 @@ class IntercityHomeScreen extends StatelessWidget { // backgroundColor: AppThemeData.grey50, // borderColor: AppThemeData.grey50, hintText: - ConstTexts.destinationLocation.tr(), + ConstTexts.destinationLocation.tr, enable: false, readOnly: true, prefix: const Padding( @@ -2454,7 +2449,7 @@ class IntercityHomeScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - ConstTexts.orderSummary.tr(), + ConstTexts.orderSummary.tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: @@ -2474,7 +2469,7 @@ class IntercityHomeScreen extends StatelessWidget { MainAxisAlignment.spaceBetween, children: [ Text( - ConstTexts.subtotal.tr(), + ConstTexts.subtotal.tr, style: AppThemeData.mediumTextStyle( fontSize: 16, color: @@ -2510,7 +2505,7 @@ class IntercityHomeScreen extends StatelessWidget { MainAxisAlignment.spaceBetween, children: [ Text( - ConstTexts.discount.tr(), + ConstTexts.discount.tr, style: AppThemeData.mediumTextStyle( fontSize: 16, color: @@ -2599,7 +2594,7 @@ class IntercityHomeScreen extends StatelessWidget { MainAxisAlignment.spaceBetween, children: [ Text( - ConstTexts.orderTotal.tr(), + ConstTexts.orderTotal.tr, style: AppThemeData.mediumTextStyle( fontSize: 16, color: @@ -2775,7 +2770,7 @@ class IntercityHomeScreen extends StatelessWidget { icon: Icon(Icons.call, color: Colors.white), onPress: () async { ShowToastDialog.showLoader( - ConstTexts.pleaseWait.tr(), + ConstTexts.pleaseWait.tr, ); LocationData location = @@ -2802,8 +2797,9 @@ class IntercityHomeScreen extends StatelessWidget { content: Builder( builder: (context) { return Text( - ConstTexts.yourSosRequest - .tr(), + ConstTexts + .yourSosRequest + .tr, ); }, ), @@ -2825,7 +2821,7 @@ class IntercityHomeScreen extends StatelessWidget { return Text( ConstTexts .yourSosrequestAlreadySubmitted - .tr(), + .tr, ); }, ), @@ -2855,7 +2851,7 @@ class IntercityHomeScreen extends StatelessWidget { controller.currentOrder.value.paymentStatus == false) { return RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.payNow.tr(), + title: ConstTexts.payNow.tr, onPress: () async { if (controller.selectedPaymentMethod.value == PaymentGateway.stripe.name) { @@ -2928,7 +2924,7 @@ class IntercityHomeScreen extends StatelessWidget { if (value == null) { Get.back(); ShowToastDialog.showToast( - ConstTexts.somethingWentWrong.tr(), + ConstTexts.somethingWentWrong.tr, ); } else { CreateRazorPayOrderModel result = value; @@ -2942,7 +2938,7 @@ class IntercityHomeScreen extends StatelessWidget { }); } else { ShowToastDialog.showToast( - ConstTexts.plsSelectPaymentMethod.tr(), + ConstTexts.plsSelectPaymentMethod.tr, ); } }, diff --git a/lib/screen_ui/cab_service_screens/cab_booking_screen.dart b/lib/screen_ui/cab_service_screens/cab_booking_screen.dart index 56de16c..93ed78c 100644 --- a/lib/screen_ui/cab_service_screens/cab_booking_screen.dart +++ b/lib/screen_ui/cab_service_screens/cab_booking_screen.dart @@ -14,11 +14,10 @@ import 'package:customer/themes/round_button_border.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:customer/utils/utils.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:flutter_map/flutter_map.dart' as flutterMap; import 'package:latlong2/latlong.dart' as latlong; @@ -286,7 +285,7 @@ class CabBookingScreen extends StatelessWidget { controller.setDepartureMarker(lat, lng); } else { ShowToastDialog.showToast( - ConstTexts.serviceIsUnavailable.tr(), + ConstTexts.serviceIsUnavailable.tr, ); } } @@ -319,7 +318,7 @@ class CabBookingScreen extends StatelessWidget { ); } else { ShowToastDialog.showToast( - ConstTexts.serviceIsUnavailable.tr(), + ConstTexts.serviceIsUnavailable.tr, ); } } @@ -330,7 +329,7 @@ class CabBookingScreen extends StatelessWidget { controller: controller.sourceTextEditController.value, // backgroundColor: AppThemeData.cardColor, - hintText: ConstTexts.pickUpLocation.tr(), + hintText: ConstTexts.pickUpLocation.tr, enable: false, prefix: Padding( padding: EdgeInsets.only(left: 10, right: 10), @@ -394,7 +393,7 @@ class CabBookingScreen extends StatelessWidget { .value, // backgroundColor: AppThemeData.grey50, // borderColor: AppThemeData.grey50, - hintText: ConstTexts.destinationLocation.tr(), + hintText: ConstTexts.destinationLocation.tr, // backgroundColor: AppThemeData.cardColor, enable: false, prefix: const Padding( @@ -431,7 +430,7 @@ class CabBookingScreen extends StatelessWidget { SizedBox(height: 15), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.continueT.tr(), + title: ConstTexts.continueT.tr, onPress: () { if (controller .sourceTextEditController @@ -439,7 +438,7 @@ class CabBookingScreen extends StatelessWidget { .text .isEmpty) { ShowToastDialog.showToast( - ConstTexts.plsSelectSourceLocation.tr(), + ConstTexts.plsSelectSourceLocation.tr, ); } else if (controller .destinationTextEditController @@ -447,7 +446,7 @@ class CabBookingScreen extends StatelessWidget { .text .isEmpty) { ShowToastDialog.showToast( - ConstTexts.plsSelectDestinationLocations.tr(), + ConstTexts.plsSelectDestinationLocations.tr, ); } else { controller.bottomSheetType.value = "vehicleSelection"; @@ -506,7 +505,7 @@ class CabBookingScreen extends StatelessWidget { Padding( padding: EdgeInsetsGeometry.symmetric(horizontal: 16.r), child: Text( - ConstTexts.selectVehicleType.tr(), + ConstTexts.selectVehicleType.tr, style: AppThemeData.boldTextStyle( fontSize: 18.sp, color: @@ -668,15 +667,21 @@ class CabBookingScreen extends StatelessWidget { child: Obx( () => RoundedButtonFill( borderRadius: 10.r, - title: 'pay_amount'.tr(namedArgs: { - 'amount': controller.selectedVehicleType.value.id == null - ? Constant.amountShow(amount: "0.0") - : Constant.amountShow( - amount: controller - .getAmount(controller.selectedVehicleType.value) - .toString(), - ), -}), + title: 'pay_amount'.trParams({ + 'amount': + controller.selectedVehicleType.value.id == null + ? Constant.amountShow(amount: "0.0") + : Constant.amountShow( + amount: + controller + .getAmount( + controller + .selectedVehicleType + .value, + ) + .toString(), + ), + }), onPress: () async { if (controller.selectedVehicleType.value.id != null) { @@ -684,7 +689,7 @@ class CabBookingScreen extends StatelessWidget { controller.bottomSheetType.value = "payment"; } else { ShowToastDialog.showToast( - ConstTexts.plsSelectVehicleTypeFirst.tr(), + ConstTexts.plsSelectVehicleTypeFirst.tr, ); } }, @@ -904,13 +909,13 @@ class CabBookingScreen extends StatelessWidget { ), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.continueT.tr(), + title: ConstTexts.continueT.tr, color: AppThemeData.mainColor, textColor: AppThemeData.grey50, onPress: () async { if (controller.selectedPaymentMethod.value.isEmpty) { ShowToastDialog.showToast( - ConstTexts.plsSelectPaymentMethod.tr(), + ConstTexts.plsSelectPaymentMethod.tr, ); return; } @@ -919,7 +924,7 @@ class CabBookingScreen extends StatelessWidget { controller.userModel.value.walletAmount ?? 0; if (walletAmount <= 0) { ShowToastDialog.showToast( - ConstTexts.insufficientWallet.tr(), + ConstTexts.insufficientWallet.tr, ); return; } @@ -1059,7 +1064,7 @@ class CabBookingScreen extends StatelessWidget { .sourceTextEditController .value, hintText: - ConstTexts.pickUpLocation.tr(), + ConstTexts.pickUpLocation.tr, enable: false, prefix: const Padding( padding: EdgeInsets.only( @@ -1142,8 +1147,7 @@ class CabBookingScreen extends StatelessWidget { // backgroundColor: AppThemeData.grey50, // borderColor: AppThemeData.grey50, hintText: - ConstTexts.destinationLocation - .tr(), + ConstTexts.destinationLocation.tr, enable: false, prefix: const Padding( padding: EdgeInsets.only( @@ -1190,7 +1194,7 @@ class CabBookingScreen extends StatelessWidget { children: [ Expanded( child: Text( - ConstTexts.promoCode.tr(), + ConstTexts.promoCode.tr, style: AppThemeData.boldTextStyle( fontSize: 16, color: @@ -1224,15 +1228,14 @@ class CabBookingScreen extends StatelessWidget { controller.calculateTotalAmount(); } else { ShowToastDialog.showToast( - ConstTexts.thisOfferNotEligible - .tr(), + ConstTexts.thisOfferNotEligible.tr, ); } } }); }, child: Text( - ConstTexts.viewAll.tr(), + ConstTexts.viewAll.tr, style: AppThemeData.boldTextStyle( decoration: TextDecoration.underline, fontSize: 14, @@ -1293,7 +1296,7 @@ class CabBookingScreen extends StatelessWidget { decoration: InputDecoration( border: InputBorder.none, hintText: - ConstTexts.writeCoupon.tr(), + ConstTexts.writeCoupon.tr, contentPadding: EdgeInsets.only( bottom: 10, ), @@ -1310,7 +1313,7 @@ class CabBookingScreen extends StatelessWidget { ), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.redeemNow.tr(), + title: ConstTexts.redeemNow.tr, width: 27.w, fontSizes: 14, onPress: () async { @@ -1321,8 +1324,9 @@ class CabBookingScreen extends StatelessWidget { .trim() .isEmpty) { ShowToastDialog.showToast( - ConstTexts.plsEnterCouponCode - .tr(), + ConstTexts + .plsEnterCouponCode + .tr, ); return; } @@ -1374,26 +1378,24 @@ class CabBookingScreen extends StatelessWidget { controller .calculateTotalAmount(); ShowToastDialog.showToast( - ConstTexts.couponApplied - .tr(), + ConstTexts.couponApplied.tr, ); controller.update(); } else { ShowToastDialog.showToast( ConstTexts .thisOfferNotEligible - .tr(), + .tr, ); } } else { ShowToastDialog.showToast( - ConstTexts.couponExpired.tr(), + ConstTexts.couponExpired.tr, ); } } else { ShowToastDialog.showToast( - ConstTexts.invalidCouponCode - .tr(), + ConstTexts.invalidCouponCode.tr, ); } }, @@ -1426,7 +1428,7 @@ class CabBookingScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - ConstTexts.orderSummary.tr(), + ConstTexts.orderSummary.tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: @@ -1446,7 +1448,7 @@ class CabBookingScreen extends StatelessWidget { MainAxisAlignment.spaceBetween, children: [ Text( - ConstTexts.subtotal.tr(), + ConstTexts.subtotal.tr, style: AppThemeData.mediumTextStyle( fontSize: 16, color: @@ -1484,7 +1486,7 @@ class CabBookingScreen extends StatelessWidget { Row( children: [ Text( - ConstTexts.discount.tr(), + ConstTexts.discount.tr, style: AppThemeData.mediumTextStyle( fontSize: 16, @@ -1603,7 +1605,7 @@ class CabBookingScreen extends StatelessWidget { MainAxisAlignment.spaceBetween, children: [ Text( - ConstTexts.orderTotal.tr(), + ConstTexts.orderTotal.tr, style: AppThemeData.mediumTextStyle( fontSize: 16, color: @@ -1779,8 +1781,10 @@ class CabBookingScreen extends StatelessWidget { controller.selectedPaymentMethod.value == "cod" ? "Наличными" - : controller.selectedPaymentMethod.value - .tr(), + : controller + .selectedPaymentMethod + .value + .tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( fontSize: 16, @@ -1798,7 +1802,7 @@ class CabBookingScreen extends StatelessWidget { ), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.confirmBooking.tr(), + title: ConstTexts.confirmBooking.tr, onPress: () async { controller.placeOrder(); }, @@ -1854,7 +1858,7 @@ class CabBookingScreen extends StatelessWidget { ), SizedBox(height: 30), Text( - ConstTexts.waitingForDriver.tr(), + ConstTexts.waitingForDriver.tr, style: AppThemeData.boldTextStyle( fontSize: 18.sp, color: @@ -1866,7 +1870,7 @@ class CabBookingScreen extends StatelessWidget { Image.asset('assets/loader.gif', width: 250), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.cancelRide.tr(), + title: ConstTexts.cancelRide.tr, color: AppThemeData.mainColor, textColor: AppThemeData.surface, onPress: () async { @@ -1913,7 +1917,7 @@ class CabBookingScreen extends StatelessWidget { await FireStoreUtils.updateUser(Constant.userModel!); } ShowToastDialog.showToast( - ConstTexts.riderCancelledSucces.tr(), + ConstTexts.riderCancelledSucces.tr, ); // Get.offAll(const CabDashboardScreen()); Get.back(); @@ -1922,9 +1926,7 @@ class CabBookingScreen extends StatelessWidget { ); cabDashboardController.selectedIndex.value = 0; } catch (e) { - ShowToastDialog.showToast( - ConstTexts.failedToCancel.tr(), - ); + ShowToastDialog.showToast(ConstTexts.failedToCancel.tr); } }, ), @@ -2019,7 +2021,7 @@ class CabBookingScreen extends StatelessWidget { controller .sourceTextEditController .value, - hintText: ConstTexts.pickUpLocation.tr(), + hintText: ConstTexts.pickUpLocation.tr, enable: false, readOnly: true, prefix: const Padding( @@ -2067,7 +2069,7 @@ class CabBookingScreen extends StatelessWidget { // backgroundColor: AppThemeData.grey50, // borderColor: AppThemeData.grey50, hintText: - ConstTexts.destinationLocation.tr(), + ConstTexts.destinationLocation.tr, enable: false, readOnly: true, prefix: const Padding( @@ -2280,7 +2282,7 @@ class CabBookingScreen extends StatelessWidget { InkWell( onTap: () async { ShowToastDialog.showLoader( - ConstTexts.pleaseWait.tr(), + ConstTexts.pleaseWait.tr, ); UserModel? customer = @@ -2491,7 +2493,7 @@ class CabBookingScreen extends StatelessWidget { ), ), Text( - ConstTexts.change.tr(), + ConstTexts.change.tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( fontSize: 16, @@ -2525,7 +2527,7 @@ class CabBookingScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - ConstTexts.orderSummary.tr(), + ConstTexts.orderSummary.tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: @@ -2545,7 +2547,7 @@ class CabBookingScreen extends StatelessWidget { MainAxisAlignment.spaceBetween, children: [ Text( - ConstTexts.subtotal.tr(), + ConstTexts.subtotal.tr, style: AppThemeData.mediumTextStyle( fontSize: 16, color: @@ -2581,7 +2583,7 @@ class CabBookingScreen extends StatelessWidget { MainAxisAlignment.spaceBetween, children: [ Text( - ConstTexts.discount.tr(), + ConstTexts.discount.tr, style: AppThemeData.mediumTextStyle( fontSize: 16, color: @@ -2670,7 +2672,7 @@ class CabBookingScreen extends StatelessWidget { MainAxisAlignment.spaceBetween, children: [ Text( - ConstTexts.orderTotal.tr(), + ConstTexts.orderTotal.tr, style: AppThemeData.mediumTextStyle( fontSize: 16, color: @@ -2718,7 +2720,7 @@ class CabBookingScreen extends StatelessWidget { icon: const Icon(Icons.call, color: Colors.white), onPress: () async { ShowToastDialog.showLoader( - ConstTexts.pleaseWait.tr(), + ConstTexts.pleaseWait.tr, ); LocationData location = @@ -2740,7 +2742,7 @@ class CabBookingScreen extends StatelessWidget { ScaffoldMessenger.of(context).showSnackBar( SnackBar( content: Text( - ConstTexts.yourSosRequest.tr(), + ConstTexts.yourSosRequest.tr, ), backgroundColor: Colors.green, duration: Duration(seconds: 3), @@ -2754,7 +2756,7 @@ class CabBookingScreen extends StatelessWidget { content: Text( ConstTexts .yourSosrequestAlreadySubmitted - .tr(), + .tr, ), backgroundColor: Colors.red, duration: Duration(seconds: 3), @@ -2777,7 +2779,7 @@ class CabBookingScreen extends StatelessWidget { controller.currentOrder.value.paymentStatus == false) { return RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.payNow.tr(), + title: ConstTexts.payNow.tr, onPress: () async { if (controller.selectedPaymentMethod.value == PaymentGateway.stripe.name) { @@ -2822,8 +2824,9 @@ class CabBookingScreen extends StatelessWidget { Constant.userModel!.walletAmount! < controller.totalAmount.value) { ShowToastDialog.showToast( - ConstTexts.youDoNothaveSufficientwalletBalance - .tr(), + ConstTexts + .youDoNothaveSufficientwalletBalance + .tr, ); } else { controller.completeOrder(); @@ -2859,7 +2862,7 @@ class CabBookingScreen extends StatelessWidget { if (value == null) { Get.back(); ShowToastDialog.showToast( - ConstTexts.somethingWentWrong.tr(), + ConstTexts.somethingWentWrong.tr, ); } else { CreateRazorPayOrderModel result = value; @@ -2873,7 +2876,7 @@ class CabBookingScreen extends StatelessWidget { }); } else { ShowToastDialog.showToast( - ConstTexts.plsSelectPaymentMethod.tr(), + ConstTexts.plsSelectPaymentMethod.tr, ); } }, @@ -3007,7 +3010,7 @@ class CabBookingScreen extends StatelessWidget { : Expanded( child: Text( value.name == "cod" - ? ConstTexts.cash.tr() + ? ConstTexts.cash.tr : value.name.capitalizeString(), textAlign: TextAlign.start, style: AppThemeData.semiBoldTextStyle( diff --git a/lib/screen_ui/cab_service_screens/cab_coupon_code_screen.dart b/lib/screen_ui/cab_service_screens/cab_coupon_code_screen.dart index c74bdb0..013c0fe 100644 --- a/lib/screen_ui/cab_service_screens/cab_coupon_code_screen.dart +++ b/lib/screen_ui/cab_service_screens/cab_coupon_code_screen.dart @@ -7,9 +7,9 @@ import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/widget/my_separator.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class CabCouponCodeScreen extends StatelessWidget { const CabCouponCodeScreen({super.key}); @@ -52,7 +52,7 @@ class CabCouponCodeScreen extends StatelessWidget { ), const SizedBox(width: 10), Text( - ConstTexts.coupon.tr(), + ConstTexts.coupon.tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -67,7 +67,7 @@ class CabCouponCodeScreen extends StatelessWidget { ? Constant.loader() : controller.cabCouponList.isEmpty ? Constant.showEmptyView( - message: ConstTexts.couponNotFound.tr(), + message: ConstTexts.couponNotFound.tr, ) : ListView.builder( shrinkWrap: true, @@ -182,7 +182,7 @@ class CabCouponCodeScreen extends StatelessWidget { Get.back(result: couponModel); }, child: Text( - ConstTexts.tapToApply.tr(), + ConstTexts.tapToApply.tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, diff --git a/lib/screen_ui/cab_service_screens/cab_dashboard_screen.dart b/lib/screen_ui/cab_service_screens/cab_dashboard_screen.dart index 2e29d07..f591e5f 100644 --- a/lib/screen_ui/cab_service_screens/cab_dashboard_screen.dart +++ b/lib/screen_ui/cab_service_screens/cab_dashboard_screen.dart @@ -3,11 +3,11 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/cab_dashboard_controller.dart'; import 'package:customer/controllers/theme_controller.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class CabDashboardScreen extends StatelessWidget { const CabDashboardScreen({super.key}); @@ -52,21 +52,21 @@ class CabDashboardScreen extends StatelessWidget { isDark, index: 0, assetIcon: "assets/icons/ic_home_cab.svg", - label: ConstTexts.home.tr(), + label: ConstTexts.home.tr, controller: controller, ), navigationBarItem( isDark, index: 1, assetIcon: "assets/icons/ic_booking_cab.svg", - label: ConstTexts.myBookings.tr(), + label: ConstTexts.myBookings.tr, controller: controller, ), navigationBarItem( isDark, index: 2, assetIcon: "assets/icons/ic_profile.svg", - label: ConstTexts.profile.tr(), + label: ConstTexts.profile.tr, controller: controller, ), ] @@ -75,28 +75,28 @@ class CabDashboardScreen extends StatelessWidget { isDark, index: 0, assetIcon: "assets/icons/ic_home_cab.svg", - label: ConstTexts.home.tr(), + label: ConstTexts.home.tr, controller: controller, ), navigationBarItem( isDark, index: 1, assetIcon: "assets/icons/ic_booking_cab.svg", - label: ConstTexts.myBookings.tr(), + label: ConstTexts.myBookings.tr, controller: controller, ), navigationBarItem( isDark, index: 2, assetIcon: "assets/icons/ic_wallet_cab.svg", - label: ConstTexts.wallet.tr(), + label: ConstTexts.wallet.tr, controller: controller, ), navigationBarItem( isDark, index: 3, assetIcon: "assets/icons/ic_profile.svg", - label: ConstTexts.profile.tr(), + label: ConstTexts.profile.tr, controller: controller, ), ], diff --git a/lib/screen_ui/cab_service_screens/cab_home_screen.dart b/lib/screen_ui/cab_service_screens/cab_home_screen.dart index bf9e6d9..a498ceb 100644 --- a/lib/screen_ui/cab_service_screens/cab_home_screen.dart +++ b/lib/screen_ui/cab_service_screens/cab_home_screen.dart @@ -5,12 +5,13 @@ import 'package:customer/controllers/theme_controller.dart'; import 'package:customer/models/banner_model.dart'; import 'package:customer/screen_ui/auth_screens/login_screen.dart'; import 'package:customer/themes/app_them_data.dart'; +import 'package:customer/utils/app_router.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'Intercity_home_screen.dart'; import 'cab_booking_screen.dart'; @@ -52,7 +53,7 @@ class CabHomeScreen extends HookWidget { Get.offAll(const LoginScreen()); }, child: Text( - ConstTexts.login.tr(), + ConstTexts.login.tr, textAlign: TextAlign.center, style: AppThemeData.boldTextStyle( color: AppThemeData.grey900, @@ -99,7 +100,7 @@ class CabHomeScreen extends HookWidget { children: [ SizedBox(height: 20), Text( - ConstTexts.cabServiceType.tr(), + ConstTexts.cabServiceType.tr, style: AppThemeData.boldTextStyle( color: isDark @@ -123,7 +124,7 @@ class CabHomeScreen extends HookWidget { CrossAxisAlignment.start, children: [ Text( - ConstTexts.everyRideVerified.tr(), + ConstTexts.everyRideVerified.tr, style: AppThemeData.boldTextStyle( color: isDark @@ -133,7 +134,7 @@ class CabHomeScreen extends HookWidget { ), ), Text( - ConstTexts.allDriversIDCheck.tr(), + ConstTexts.allDriversIDCheck.tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -171,7 +172,7 @@ class CabHomeScreen extends HookWidget { Constant.sectionConstantModel!.rideType == "both" || Constant.sectionConstantModel!.rideType == "ride" ? _cabOptionMaker( - title: ConstTexts.aroundTheCity.tr(), + title: ConstTexts.aroundTheCity.tr, isMain: false, image: "assets/images/taxi_option.png", useGradient: false, @@ -182,7 +183,7 @@ class CabHomeScreen extends HookWidget { ) : Expanded(child: SizedBox()), _cabOptionMaker( - title: ConstTexts.intercity.tr(), + title: ConstTexts.intercity.tr, isMain: false, useGradient: false, image: "assets/images/outer_city_taxi_option.png", diff --git a/lib/screen_ui/cab_service_screens/cab_order_details.dart b/lib/screen_ui/cab_service_screens/cab_order_details.dart index 1e3b71a..2574520 100644 --- a/lib/screen_ui/cab_service_screens/cab_order_details.dart +++ b/lib/screen_ui/cab_service_screens/cab_order_details.dart @@ -1,10 +1,10 @@ import 'package:customer/constant/const_texts.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/cab_order_details_controller.dart'; import '../../controllers/theme_controller.dart'; @@ -64,7 +64,7 @@ class CabOrderDetails extends StatelessWidget { ), const SizedBox(width: 10), Text( - ConstTexts.rideDetails.tr(), + ConstTexts.rideDetails.tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -98,7 +98,7 @@ class CabOrderDetails extends StatelessWidget { width: double.infinity, padding: const EdgeInsets.all(16), child: Text( - "${ConstTexts.orderId.tr()} ${Constant.orderId(orderId: controller.cabOrder.value.id.toString())}", + "${ConstTexts.orderId.tr} ${Constant.orderId(orderId: controller.cabOrder.value.id.toString())}", textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -131,7 +131,7 @@ class CabOrderDetails extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "${ConstTexts.bookingData.tr()} ${controller.formatDate(controller.cabOrder.value.scheduleDateTime!)}", + "${ConstTexts.bookingData.tr} ${controller.formatDate(controller.cabOrder.value.scheduleDateTime!)}", textAlign: TextAlign.start, style: TextStyle( @@ -436,7 +436,7 @@ class CabOrderDetails extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - ConstTexts.rideAndFareSummary.tr(), + ConstTexts.rideAndFareSummary.tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: @@ -590,9 +590,10 @@ class CabOrderDetails extends StatelessWidget { .isNotEmpty ? ConstTexts .updateReview - .tr() - : ConstTexts.addReview - .tr(), + .tr + : ConstTexts + .addReview + .tr, onPress: () async { final result = await Get.to( () => CabReviewScreen(), @@ -642,8 +643,7 @@ class CabOrderDetails extends StatelessWidget { ), child: RoundedButtonFill( borderRadius: 10.r, - title: - ConstTexts.complain.tr(), + title: ConstTexts.complain.tr, onPress: () async { Get.to( () => ComplainScreen(), @@ -721,7 +721,7 @@ class CabOrderDetails extends StatelessWidget { InkWell( onTap: () async { ShowToastDialog.showLoader( - ConstTexts.pleaseWait.tr(), + ConstTexts.pleaseWait.tr, ); UserModel? customer = @@ -828,14 +828,14 @@ class CabOrderDetails extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ _iconTile( - "${double.parse(controller.cabOrder.value.distance.toString()).toStringAsFixed(2)} ${ConstTexts.km.tr()}", - ConstTexts.distance.tr(), + "${double.parse(controller.cabOrder.value.distance.toString()).toStringAsFixed(2)} ${ConstTexts.km.tr}", + ConstTexts.distance.tr, "assets/icons/ic_distance_parcel.svg", isDark, ), _iconTile( controller.cabOrder.value.duration ?? '--', - ConstTexts.duration.tr(), + ConstTexts.duration.tr, "assets/icons/ic_duration.svg", isDark, ), @@ -870,7 +870,7 @@ class CabOrderDetails extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - ConstTexts.orderSummary.tr(), + ConstTexts.orderSummary.tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: AppThemeData.grey500, @@ -880,7 +880,7 @@ class CabOrderDetails extends StatelessWidget { // Subtotal _summaryTile( - ConstTexts.subtotal.tr(), + ConstTexts.subtotal.tr, Constant.amountShow( amount: controller.subTotal.value.toString(), ), @@ -889,7 +889,7 @@ class CabOrderDetails extends StatelessWidget { // Discount _summaryTile( - ConstTexts.discount.tr(), + ConstTexts.discount.tr, Constant.amountShow( amount: controller.discount.value.toString(), ), @@ -939,7 +939,7 @@ class CabOrderDetails extends StatelessWidget { // Total _summaryTile( - ConstTexts.orderTotal.tr(), + ConstTexts.orderTotal.tr, Constant.amountShow( amount: controller.totalAmount.value.toString(), @@ -1004,7 +1004,7 @@ class CabOrderDetails extends StatelessWidget { Text( value, style: AppThemeData.semiBoldTextStyle( - fontSize: title == ConstTexts.orderTotal.tr() ? 18 : 16, + fontSize: title == ConstTexts.orderTotal.tr ? 18 : 16, color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900, ), ), diff --git a/lib/screen_ui/cab_service_screens/cab_review_screen.dart b/lib/screen_ui/cab_service_screens/cab_review_screen.dart index ef6ee21..9ce4651 100644 --- a/lib/screen_ui/cab_service_screens/cab_review_screen.dart +++ b/lib/screen_ui/cab_service_screens/cab_review_screen.dart @@ -1,10 +1,10 @@ import 'package:customer/constant/const_texts.dart'; import 'package:customer/controllers/cab_review_controller.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_rating_bar/flutter_rating_bar.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/theme_controller.dart'; import '../../themes/app_them_data.dart'; @@ -37,8 +37,8 @@ class CabReviewScreen extends StatelessWidget { ), title: Text( controller.ratingModel.value != null - ? ConstTexts.updateReview.tr() - : ConstTexts.addReview.tr(), + ? ConstTexts.updateReview.tr + : ConstTexts.addReview.tr, style: TextStyle( color: isDark ? Colors.white : Colors.black, fontSize: 16, @@ -138,7 +138,7 @@ class CabReviewScreen extends StatelessWidget { Padding( padding: const EdgeInsets.only(top: 16), child: Text( - ConstTexts.howWasTrip.tr(), + ConstTexts.howWasTrip.tr, style: TextStyle( fontSize: 18, color: @@ -153,7 +153,7 @@ class CabReviewScreen extends StatelessWidget { Padding( padding: const EdgeInsets.only(top: 8), child: Text( - ConstTexts.yourFeedbackWillHelp.tr(), + ConstTexts.yourFeedbackWillHelp.tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -171,7 +171,7 @@ class CabReviewScreen extends StatelessWidget { Padding( padding: const EdgeInsets.only(top: 20), child: Text( - ConstTexts.rateFor.tr(), + ConstTexts.rateFor.tr, style: TextStyle( fontSize: 16, color: @@ -230,7 +230,7 @@ class CabReviewScreen extends StatelessWidget { Padding( padding: const EdgeInsets.all(20.0), child: TextFieldWidget( - hintText: ConstTexts.typeComment.tr(), + hintText: ConstTexts.typeComment.tr, controller: controller.comment.value, maxLine: 5, ), @@ -244,8 +244,8 @@ class CabReviewScreen extends StatelessWidget { title: controller.ratingModel.value != null - ? ConstTexts.updateReview.tr() - : ConstTexts.addReview.tr(), + ? ConstTexts.updateReview.tr + : ConstTexts.addReview.tr, color: AppThemeData.primary300, textColor: isDark diff --git a/lib/screen_ui/cab_service_screens/complain_screen.dart b/lib/screen_ui/cab_service_screens/complain_screen.dart index b3019ce..898bf8f 100644 --- a/lib/screen_ui/cab_service_screens/complain_screen.dart +++ b/lib/screen_ui/cab_service_screens/complain_screen.dart @@ -1,8 +1,8 @@ import 'package:customer/constant/const_texts.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/complain_controller.dart'; import '../../controllers/theme_controller.dart'; import '../../themes/app_them_data.dart'; @@ -50,7 +50,7 @@ class ComplainScreen extends StatelessWidget { ), const SizedBox(width: 10), Text( - ConstTexts.complain.tr(), + ConstTexts.complain.tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -69,16 +69,16 @@ class ComplainScreen extends StatelessWidget { children: [ Obx( () => TextFieldWidget( - title: ConstTexts.title.tr(), - hintText: ConstTexts.title.tr(), + title: ConstTexts.title.tr, + hintText: ConstTexts.title.tr, controller: controller.title.value, ), ), const SizedBox(height: 10), Obx( () => TextFieldWidget( - title: ConstTexts.complain.tr(), - hintText: ConstTexts.typeDescription.tr(), + title: ConstTexts.complain.tr, + hintText: ConstTexts.typeDescription.tr, controller: controller.comment.value, maxLine: 8, ), @@ -86,7 +86,7 @@ class ComplainScreen extends StatelessWidget { const SizedBox(height: 20), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.save.tr(), + title: ConstTexts.save.tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () => controller.submitComplain(), diff --git a/lib/screen_ui/cab_service_screens/my_cab_booking_screen.dart b/lib/screen_ui/cab_service_screens/my_cab_booking_screen.dart index de98f82..5f427aa 100644 --- a/lib/screen_ui/cab_service_screens/my_cab_booking_screen.dart +++ b/lib/screen_ui/cab_service_screens/my_cab_booking_screen.dart @@ -6,10 +6,11 @@ import 'package:customer/screen_ui/auth_screens/login_screen.dart'; import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/show_toast_dialog.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/my_cab_booking_controller.dart'; import '../../controllers/theme_controller.dart'; @@ -46,7 +47,7 @@ class MyCabBookingScreen extends StatelessWidget { children: [ const SizedBox(width: 10), Text( - ConstTexts.rideHistory.tr(), + ConstTexts.rideHistory.tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -101,7 +102,7 @@ class MyCabBookingScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( - ConstTexts.plsLoginToAcc.tr(), + ConstTexts.plsLoginToAcc.tr, style: TextStyle( color: isDark @@ -113,7 +114,7 @@ class MyCabBookingScreen extends StatelessWidget { ), const SizedBox(height: 5), Text( - ConstTexts.youAreNotLoggedIn.tr(), + ConstTexts.youAreNotLoggedIn.tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -127,7 +128,7 @@ class MyCabBookingScreen extends StatelessWidget { const SizedBox(height: 20), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.login.tr(), + title: ConstTexts.login.tr, width: 55, height: 5.5, color: AppThemeData.primary300, @@ -147,7 +148,7 @@ class MyCabBookingScreen extends StatelessWidget { if (orders.isEmpty) { return Center( child: Text( - ConstTexts.noOrderfound.tr(), + ConstTexts.noOrderfound.tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -405,7 +406,7 @@ class MyCabBookingScreen extends StatelessWidget { order.paymentStatus == false ? RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.payNow.tr(), + title: ConstTexts.payNow.tr, onPress: () async { controller .selectedPaymentMethod @@ -471,7 +472,7 @@ class MyCabBookingScreen extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - ConstTexts.selectPaymentMethod.tr(), + ConstTexts.selectPaymentMethod.tr, style: AppThemeData.mediumTextStyle( fontSize: 18, color: @@ -495,7 +496,7 @@ class MyCabBookingScreen extends StatelessWidget { controller: scrollController, children: [ Text( - ConstTexts.prefferedPayment.tr(), + ConstTexts.prefferedPayment.tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( fontSize: 15, @@ -567,7 +568,7 @@ class MyCabBookingScreen extends StatelessWidget { children: [ const SizedBox(height: 10), Text( - ConstTexts.otherPaymentOptions.tr(), + ConstTexts.otherPaymentOptions.tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( fontSize: 15, @@ -716,13 +717,13 @@ class MyCabBookingScreen extends StatelessWidget { ), RoundedButtonFill( borderRadius: 10.r, - title: ConstTexts.continueT.tr(), + title: ConstTexts.continueT.tr, color: AppThemeData.primary300, textColor: AppThemeData.grey900, onPress: () async { if (controller.selectedPaymentMethod.value.isEmpty) { ShowToastDialog.showToast( - ConstTexts.plsSelectPaymentMethod.tr(), + ConstTexts.plsSelectPaymentMethod.tr, ); } else { if (controller.selectedPaymentMethod.value == @@ -768,7 +769,7 @@ class MyCabBookingScreen extends StatelessWidget { Constant.userModel!.walletAmount! < controller.totalAmount.value) { ShowToastDialog.showToast( - ConstTexts.youDoNothaveSufficientwalletBalance.tr(), + ConstTexts.youDoNothaveSufficientwalletBalance.tr, ); } else { controller.completeOrder(); @@ -804,7 +805,7 @@ class MyCabBookingScreen extends StatelessWidget { if (value == null) { Get.back(); ShowToastDialog.showToast( - ConstTexts.somethingWentWrong.tr(), + ConstTexts.somethingWentWrong.tr, ); } else { CreateRazorPayOrderModel result = value; @@ -816,7 +817,7 @@ class MyCabBookingScreen extends StatelessWidget { }); } else { ShowToastDialog.showToast( - ConstTexts.plsSelectPaymentMethod.tr(), + ConstTexts.plsSelectPaymentMethod.tr, ); } } diff --git a/lib/screen_ui/ecommarce/all_brand_product_screen.dart b/lib/screen_ui/ecommarce/all_brand_product_screen.dart index 0545863..3cadbc7 100644 --- a/lib/screen_ui/ecommarce/all_brand_product_screen.dart +++ b/lib/screen_ui/ecommarce/all_brand_product_screen.dart @@ -9,7 +9,7 @@ import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class AllBrandProductScreen extends StatelessWidget { const AllBrandProductScreen({super.key}); diff --git a/lib/screen_ui/ecommarce/all_category_product_screen.dart b/lib/screen_ui/ecommarce/all_category_product_screen.dart index 30afacd..26e4825 100644 --- a/lib/screen_ui/ecommarce/all_category_product_screen.dart +++ b/lib/screen_ui/ecommarce/all_category_product_screen.dart @@ -9,7 +9,7 @@ import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class AllCategoryProductScreen extends StatelessWidget { const AllCategoryProductScreen({super.key}); diff --git a/lib/screen_ui/ecommarce/dash_board_e_commerce_screen.dart b/lib/screen_ui/ecommarce/dash_board_e_commerce_screen.dart index dfdbdc0..8e42832 100644 --- a/lib/screen_ui/ecommarce/dash_board_e_commerce_screen.dart +++ b/lib/screen_ui/ecommarce/dash_board_e_commerce_screen.dart @@ -2,10 +2,10 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/dash_board_controller.dart'; import 'package:customer/controllers/dash_board_ecommarce_controller.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/theme_controller.dart'; class DashBoardEcommerceScreen extends StatelessWidget { @@ -52,28 +52,28 @@ class DashBoardEcommerceScreen extends StatelessWidget { isDark, index: 0, assetIcon: "assets/icons/ic_home.svg", - label: 'Home'.tr(), + label: 'Home'.tr, controller: controller, ), navigationBarItem( isDark, index: 1, assetIcon: "assets/icons/ic_fav.svg", - label: 'Favourites'.tr(), + label: 'Favourites'.tr, controller: controller, ), navigationBarItem( isDark, index: 2, assetIcon: "assets/icons/ic_orders.svg", - label: 'Orders'.tr(), + label: 'Orders'.tr, controller: controller, ), navigationBarItem( isDark, index: 3, assetIcon: "assets/icons/ic_profile.svg", - label: 'Profile'.tr(), + label: 'Profile'.tr, controller: controller, ), ] @@ -82,35 +82,35 @@ class DashBoardEcommerceScreen extends StatelessWidget { isDark, index: 0, assetIcon: "assets/icons/ic_home.svg", - label: 'Home'.tr(), + label: 'Home'.tr, controller: controller, ), navigationBarItem( isDark, index: 1, assetIcon: "assets/icons/ic_fav.svg", - label: 'Favourites'.tr(), + label: 'Favourites'.tr, controller: controller, ), navigationBarItem( isDark, index: 2, assetIcon: "assets/icons/ic_wallet.svg", - label: 'Wallet'.tr(), + label: 'Wallet'.tr, controller: controller, ), navigationBarItem( isDark, index: 3, assetIcon: "assets/icons/ic_orders.svg", - label: 'Orders'.tr(), + label: 'Orders'.tr, controller: controller, ), navigationBarItem( isDark, index: 4, assetIcon: "assets/icons/ic_profile.svg", - label: 'Profile'.tr(), + label: 'Profile'.tr, controller: controller, ), ], diff --git a/lib/screen_ui/ecommarce/home_e_commerce_screen.dart b/lib/screen_ui/ecommarce/home_e_commerce_screen.dart index 7e4dae3..720d510 100644 --- a/lib/screen_ui/ecommarce/home_e_commerce_screen.dart +++ b/lib/screen_ui/ecommarce/home_e_commerce_screen.dart @@ -28,17 +28,18 @@ import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_border.dart'; import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/themes/text_field_widget.dart'; +import 'package:customer/utils/app_router.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:customer/widget/osm_map/map_picker_page.dart'; import 'package:customer/widget/place_picker/location_picker_screen.dart'; import 'package:customer/widget/place_picker/selected_location_model.dart'; import 'package:customer/widget/video_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:geocoding/geocoding.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:url_launcher/url_launcher.dart'; class HomeECommerceScreen extends StatelessWidget { @@ -76,7 +77,7 @@ class HomeECommerceScreen extends StatelessWidget { Get.offAll(const LoginScreen()); }, child: Text( - "Login".tr(), + "Login".tr, textAlign: TextAlign.center, style: AppThemeData.semiBoldTextStyle( color: @@ -109,7 +110,7 @@ class HomeECommerceScreen extends StatelessWidget { } else { Constant.checkPermission( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); // ✅ declare it once here! ShippingAddress shippingAddress = ShippingAddress(); @@ -296,7 +297,7 @@ class HomeECommerceScreen extends StatelessWidget { ); }, child: TextFieldWidget( - hintText: 'Search the store, item and more...'.tr(), + hintText: 'Search the store, item and more...'.tr, controller: null, enable: false, backgroundColor: AppThemeData.grey50, @@ -333,7 +334,7 @@ class HomeECommerceScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Category".tr(), + "Category".tr, textAlign: TextAlign.start, style: AppThemeData.semiBoldTextStyle( color: @@ -349,7 +350,7 @@ class HomeECommerceScreen extends StatelessWidget { Get.to(const ViewAllCategoryScreen()); }, child: Text( - "View all".tr(), + "View all".tr, textAlign: TextAlign.start, style: AppThemeData.semiBoldTextStyle( decoration: TextDecoration.underline, @@ -464,7 +465,7 @@ class HomeECommerceScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Highlights for you".tr(), + "Highlights for you".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -489,7 +490,7 @@ class HomeECommerceScreen extends StatelessWidget { }); }, child: Text( - "View all".tr(), + "View all".tr, textAlign: TextAlign.center, style: TextStyle( fontFamily: @@ -545,7 +546,7 @@ class HomeECommerceScreen extends StatelessWidget { Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Text( - "New Arrivals".tr(), + "New Arrivals".tr, textAlign: TextAlign.start, style: AppThemeData.semiBoldTextStyle( color: @@ -592,14 +593,14 @@ class HomeECommerceScreen extends StatelessWidget { isDark ? AppThemeData.greyDark200 : AppThemeData.grey200, - title: 'View All Arrivals'.tr(), + title: 'View All Arrivals'.tr, onPress: () { Get.to( RestaurantListScreen(), arguments: { "vendorList": controller.newArrivalRestaurantList, - "title": "New Arrivals".tr(), + "title": "New Arrivals".tr, }, ); }, @@ -612,7 +613,7 @@ class HomeECommerceScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Top Brands".tr(), + "Top Brands".tr, textAlign: TextAlign.start, style: AppThemeData.semiBoldTextStyle( color: @@ -776,7 +777,7 @@ class HomeECommerceScreen extends StatelessWidget { ), Text( "Style up with the latest fits, now at unbeatable prices." - .tr(), + .tr, textAlign: TextAlign.start, style: AppThemeData.regularTextStyle( @@ -1168,7 +1169,7 @@ class HomeECommerceScreen extends StatelessWidget { // children: [ // Expanded( // child: Text( - // "Highlights for you".tr(), + // "Highlights for you".tr, // textAlign: TextAlign.start, // style: TextStyle( // fontFamily: AppThemeData.semiBold, @@ -1184,7 +1185,7 @@ class HomeECommerceScreen extends StatelessWidget { // }); // }, // child: Text( - // "View all".tr(), + // "View all".tr, // textAlign: TextAlign.center, // style: TextStyle( // fontFamily: AppThemeData.regular, @@ -1225,7 +1226,7 @@ class HomeECommerceScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "All Store".tr(), + "All Store".tr, textAlign: TextAlign.start, style: AppThemeData.semiBoldTextStyle( color: @@ -1387,7 +1388,7 @@ class HomeECommerceScreen extends StatelessWidget { isDark ? AppThemeData.greyDark200 : AppThemeData.grey200, - title: 'View All Stores'.tr(), + title: 'View All Stores'.tr, onPress: () { Get.to( const RestaurantListScreen(), @@ -1526,7 +1527,7 @@ class BannerView extends StatelessWidget { return InkWell( onTap: () async { if (bannerModel.redirect_type == "store") { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( bannerModel.redirect_id.toString(), @@ -1538,7 +1539,7 @@ class BannerView extends StatelessWidget { arguments: {"vendorModel": vendorModel}, ); } else if (bannerModel.redirect_type == "product") { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); ProductModel? productModel = await FireStoreUtils.getProductById( bannerModel.redirect_id.toString(), @@ -1558,7 +1559,7 @@ class BannerView extends StatelessWidget { if (await canLaunchUrl(uri)) { await launchUrl(uri); } else { - ShowToastDialog.showToast("Could not launch".tr()); + ShowToastDialog.showToast("Could not launch".tr); } } }, @@ -1632,7 +1633,7 @@ class BannerBottomView extends StatelessWidget { return InkWell( onTap: () async { if (bannerModel.redirect_type == "store") { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( bannerModel.redirect_id.toString(), @@ -1644,7 +1645,7 @@ class BannerBottomView extends StatelessWidget { arguments: {"vendorModel": vendorModel}, ); } else if (bannerModel.redirect_type == "product") { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); ProductModel? productModel = await FireStoreUtils.getProductById( bannerModel.redirect_id.toString(), @@ -1664,7 +1665,7 @@ class BannerBottomView extends StatelessWidget { if (await canLaunchUrl(uri)) { await launchUrl(uri); } else { - ShowToastDialog.showToast("Could not launch".tr()); + ShowToastDialog.showToast("Could not launch".tr); } } }, @@ -1729,7 +1730,7 @@ class AdvertisementHomeCard extends StatelessWidget { final isDark = themeController.isDark.value; return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( model.vendorId!, ); diff --git a/lib/screen_ui/location_enable_screens/address_list_screen.dart b/lib/screen_ui/location_enable_screens/address_list_screen.dart index f8eca2e..accfd1f 100644 --- a/lib/screen_ui/location_enable_screens/address_list_screen.dart +++ b/lib/screen_ui/location_enable_screens/address_list_screen.dart @@ -6,11 +6,11 @@ import 'package:customer/models/user_model.dart'; import 'package:customer/screen_ui/location_enable_screens/enter_manually_location.dart'; import 'package:customer/themes/app_them_data.dart' show AppThemeData; import 'package:customer/themes/round_button_fill.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class AddressListScreen extends StatelessWidget { const AddressListScreen({super.key}); @@ -40,7 +40,7 @@ class AddressListScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "My Addresses".tr(), + "My Addresses".tr, style: AppThemeData.boldTextStyle( fontSize: 24, color: @@ -52,7 +52,7 @@ class AddressListScreen extends StatelessWidget { const SizedBox(height: 5), Text( "Allows users to view, manage, add, or edit delivery addresses." - .tr(), + .tr, style: AppThemeData.mediumTextStyle( fontSize: 14, color: AppThemeData.grey600, @@ -63,7 +63,7 @@ class AddressListScreen extends StatelessWidget { child: controller.shippingAddressList.isEmpty ? Constant.showEmptyView( - message: "Address not found".tr(), + message: "Address not found".tr, ) : ListView.separated( itemCount: @@ -143,7 +143,7 @@ class AddressListScreen extends StatelessWidget { vertical: 5, ), child: Text( - "Default".tr(), + "Default".tr, style: AppThemeData.semiBoldTextStyle( fontSize: 12, color: diff --git a/lib/screen_ui/location_enable_screens/enter_manually_location.dart b/lib/screen_ui/location_enable_screens/enter_manually_location.dart index ff1f41e..d2d154a 100644 --- a/lib/screen_ui/location_enable_screens/enter_manually_location.dart +++ b/lib/screen_ui/location_enable_screens/enter_manually_location.dart @@ -6,10 +6,10 @@ import 'package:customer/utils/utils.dart'; import 'package:customer/widget/osm_map/map_picker_page.dart'; import 'package:customer/widget/place_picker/location_picker_screen.dart'; import 'package:customer/widget/place_picker/selected_location_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/enter_manually_location_controller.dart'; import '../../controllers/theme_controller.dart'; import '../../themes/app_them_data.dart'; @@ -49,8 +49,8 @@ class EnterManuallyLocationScreen extends StatelessWidget { children: [ Text( controller.mode == "Edit" - ? "Edit Address".tr() - : "Add a New Address".tr(), + ? "Edit Address".tr + : "Add a New Address".tr, style: AppThemeData.boldTextStyle( fontSize: 24, color: @@ -62,7 +62,7 @@ class EnterManuallyLocationScreen extends StatelessWidget { const SizedBox(height: 10), Text( "Enter your location details so we can deliver your orders quickly and accurately." - .tr(), + .tr, style: AppThemeData.mediumTextStyle( fontSize: 14, color: AppThemeData.grey600, @@ -73,7 +73,7 @@ class EnterManuallyLocationScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Set as Default Address".tr(), + "Set as Default Address".tr, style: AppThemeData.mediumTextStyle( fontSize: 14, color: AppThemeData.grey600, @@ -154,8 +154,8 @@ class EnterManuallyLocationScreen extends StatelessWidget { ); }, child: TextFieldWidget( - title: "Choose Location".tr(), - hintText: "Choose Location".tr(), + title: "Choose Location".tr, + hintText: "Choose Location".tr, readOnly: true, enable: false, controller: null, @@ -234,8 +234,8 @@ class EnterManuallyLocationScreen extends StatelessWidget { ), const SizedBox(height: 15), TextFieldWidget( - title: "Flat/House/Floor/Building*".tr(), - hintText: "Enter address details".tr(), + title: "Flat/House/Floor/Building*".tr, + hintText: "Enter address details".tr, controller: controller .houseBuildingTextEditingController @@ -243,15 +243,15 @@ class EnterManuallyLocationScreen extends StatelessWidget { ), const SizedBox(height: 15), TextFieldWidget( - title: "Area/Sector/Locality*".tr(), - hintText: "Enter area/locality".tr(), + title: "Area/Sector/Locality*".tr, + hintText: "Enter area/locality".tr, controller: controller.localityEditingController.value, ), const SizedBox(height: 15), TextFieldWidget( - title: "Nearby Landmark".tr(), - hintText: "Add a landmark".tr(), + title: "Nearby Landmark".tr, + hintText: "Add a landmark".tr, controller: controller.landmarkEditingController.value, ), @@ -259,7 +259,7 @@ class EnterManuallyLocationScreen extends StatelessWidget { Container(height: 1, color: AppThemeData.grey200), const SizedBox(height: 25), Text( - "Save Address As".tr(), + "Save Address As".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: AppThemeData.grey900, @@ -314,14 +314,14 @@ class EnterManuallyLocationScreen extends StatelessWidget { const SizedBox(height: 30), RoundedButtonFill( borderRadius: 10.r, - title: "Save Address".tr(), + title: "Save Address".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () async { if (controller.location.value.latitude == null || controller.location.value.longitude == null) { ShowToastDialog.showToast( - "Please select Location".tr(), + "Please select Location".tr, ); } else if (controller .houseBuildingTextEditingController @@ -330,7 +330,7 @@ class EnterManuallyLocationScreen extends StatelessWidget { .isEmpty) { ShowToastDialog.showToast( "Please Enter Flat / House / Floor / Building" - .tr(), + .tr, ); } else if (controller .localityEditingController @@ -338,12 +338,10 @@ class EnterManuallyLocationScreen extends StatelessWidget { .text .isEmpty) { ShowToastDialog.showToast( - "Please Enter Area / Sector / Locality".tr(), + "Please Enter Area / Sector / Locality".tr, ); } else { - ShowToastDialog.showLoader( - "Please wait...".tr(), - ); + ShowToastDialog.showLoader("Please wait...".tr); //Common values controller.shippingModel.value.location = diff --git a/lib/screen_ui/location_enable_screens/location_permission_screen.dart b/lib/screen_ui/location_enable_screens/location_permission_screen.dart index dd6adaf..1491fa7 100644 --- a/lib/screen_ui/location_enable_screens/location_permission_screen.dart +++ b/lib/screen_ui/location_enable_screens/location_permission_screen.dart @@ -7,15 +7,16 @@ import 'package:customer/screen_ui/service_home_screen/service_list_screen.dart' import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/show_toast_dialog.dart'; +import 'package:customer/utils/app_router.dart'; import 'package:customer/widget/osm_map/map_picker_page.dart'; import 'package:customer/widget/place_picker/location_picker_screen.dart'; import 'package:customer/widget/place_picker/selected_location_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:geocoding/geocoding.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/assets.dart'; import '../../utils/utils.dart'; @@ -40,7 +41,7 @@ class LocationPermissionScreen extends StatelessWidget { Padding( padding: const EdgeInsets.symmetric(horizontal: 25), child: Text( - ConstTexts.enableLocation.tr(), + ConstTexts.enableLocation.tr, style: AppThemeData.boldTextStyle( fontSize: 24.sp, color: @@ -55,7 +56,7 @@ class LocationPermissionScreen extends StatelessWidget { Padding( padding: const EdgeInsets.symmetric(horizontal: 50), child: Text( - ConstTexts.allowLocation.tr(), + ConstTexts.allowLocation.tr, style: AppThemeData.mediumTextStyle( fontSize: 16.sp, color: @@ -70,12 +71,12 @@ class LocationPermissionScreen extends StatelessWidget { RoundedButtonFill( borderRadius: 10.r, fontSizes: 14.sp, - title: ConstTexts.useCurrentLocation.tr(), + title: ConstTexts.useCurrentLocation.tr, onPress: () async { Constant.checkPermission( context: context, onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); ShippingAddress addressModel = ShippingAddress(); try { await Geolocator.requestPermission(); @@ -139,12 +140,12 @@ class LocationPermissionScreen extends StatelessWidget { RoundedButtonFill( borderRadius: 10.r, fontSizes: 14.sp, - title: ConstTexts.setFromMap.tr(), + title: ConstTexts.setFromMap.tr, onPress: () async { Constant.checkPermission( context: context, onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); ShippingAddress addressModel = ShippingAddress(); try { await Geolocator.requestPermission(); @@ -232,7 +233,7 @@ class LocationPermissionScreen extends StatelessWidget { }); }, child: Text( - ConstTexts.enterManuallyLocation.tr(), + ConstTexts.enterManuallyLocation.tr, style: AppThemeData.semiBoldTextStyle( fontSize: 16.sp, color: diff --git a/lib/screen_ui/maintenance_mode_screen/maintenance_mode_screen.dart b/lib/screen_ui/maintenance_mode_screen/maintenance_mode_screen.dart index 7a67cfc..188dc9e 100644 --- a/lib/screen_ui/maintenance_mode_screen/maintenance_mode_screen.dart +++ b/lib/screen_ui/maintenance_mode_screen/maintenance_mode_screen.dart @@ -1,7 +1,7 @@ import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class MaintenanceModeScreen extends StatelessWidget { const MaintenanceModeScreen({super.key}); @@ -23,7 +23,7 @@ class MaintenanceModeScreen extends StatelessWidget { ), const SizedBox(height: 20), Text( - "We'll be back soon!".tr(), + "We'll be back soon!".tr, style: const TextStyle(fontSize: 24, fontWeight: FontWeight.bold), ), const SizedBox(height: 10), @@ -31,7 +31,7 @@ class MaintenanceModeScreen extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 20.0), child: Text( "Sorry for the inconvenience but we're performing some maintenance at the moment. We'll be back online shortly!" - .tr(), + .tr, textAlign: TextAlign.center, style: const TextStyle(fontSize: 16), ), diff --git a/lib/screen_ui/multi_vendor_service/advertisement_screens/all_advertisement_screen.dart b/lib/screen_ui/multi_vendor_service/advertisement_screens/all_advertisement_screen.dart index 8585299..720e34a 100644 --- a/lib/screen_ui/multi_vendor_service/advertisement_screens/all_advertisement_screen.dart +++ b/lib/screen_ui/multi_vendor_service/advertisement_screens/all_advertisement_screen.dart @@ -6,10 +6,10 @@ import 'package:customer/models/vendor_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../service/fire_store_utils.dart'; import '../../../themes/show_toast_dialog.dart'; @@ -34,7 +34,7 @@ class AllAdvertisementScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Highlights for you".tr(), + "Highlights for you".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -48,7 +48,7 @@ class AllAdvertisementScreen extends StatelessWidget { ? Constant.loader() : controller.advertisementList.isEmpty ? Constant.showEmptyView( - message: "Highlights for you not found.".tr(), + message: "Highlights for you not found.".tr, ) : Padding( padding: const EdgeInsets.symmetric(horizontal: 16), @@ -86,7 +86,7 @@ class AdvertisementCard extends StatelessWidget { final isDark = themeController.isDark.value; return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( model.vendorId!, ); diff --git a/lib/screen_ui/multi_vendor_service/cart_screen/cart_screen.dart b/lib/screen_ui/multi_vendor_service/cart_screen/cart_screen.dart index 85e802c..47499f8 100644 --- a/lib/screen_ui/multi_vendor_service/cart_screen/cart_screen.dart +++ b/lib/screen_ui/multi_vendor_service/cart_screen/cart_screen.dart @@ -14,12 +14,12 @@ import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/text_field_widget.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../models/user_model.dart'; import '../../../service/fire_store_utils.dart'; @@ -48,7 +48,7 @@ class CartScreen extends StatelessWidget { ), body: cartItem.isEmpty - ? Constant.showEmptyView(message: "Item Not available".tr()) + ? Constant.showEmptyView(message: "Item Not available".tr) : SingleChildScrollView( child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -76,7 +76,7 @@ class CartScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "Service not available in this area" - .tr(), + .tr, ); } } @@ -501,7 +501,7 @@ class CartScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "Out of stock" - .tr(), + .tr, ); } } else { @@ -527,7 +527,7 @@ class CartScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "Out of stock" - .tr(), + .tr, ); } } @@ -554,7 +554,7 @@ class CartScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "Out of stock" - .tr(), + .tr, ); } } @@ -597,7 +597,7 @@ class CartScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Variants".tr(), + "Variants".tr, textAlign: TextAlign.start, style: TextStyle( @@ -687,7 +687,7 @@ class CartScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Addons".tr(), + "Addons".tr, textAlign: TextAlign.start, style: TextStyle( @@ -822,8 +822,8 @@ class CartScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "${'Delivery Type'.tr()} (${controller.selectedFoodType.value})" - .tr(), + "${'Delivery Type'.tr} (${controller.selectedFoodType.value})" + .tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -858,7 +858,7 @@ class CartScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Instant Delivery".tr(), + "Instant Delivery".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -874,7 +874,7 @@ class CartScreen extends StatelessWidget { ), const SizedBox(height: 5), Text( - "Standard".tr(), + "Standard".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -894,7 +894,7 @@ class CartScreen extends StatelessWidget { Radio( value: controller.deliveryType.value, - groupValue: "instant".tr(), + groupValue: "instant".tr, activeColor: AppThemeData.primary300, onChanged: (value) { @@ -928,7 +928,7 @@ class CartScreen extends StatelessWidget { }, minDateTime: DateTime.now(), displaySubmitButton: true, - pickerTitle: Text('Schedule Time'.tr()), + pickerTitle: Text('Schedule Time'.tr), buttonSingleColor: AppThemeData.primary300, ).show(context); @@ -943,7 +943,7 @@ class CartScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Schedule Time".tr(), + "Schedule Time".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -959,7 +959,7 @@ class CartScreen extends StatelessWidget { ), const SizedBox(height: 5), Text( - "${'Your preferred time'.tr()} ${controller.deliveryType.value == "schedule" ? Constant.timestampToDateTime(Timestamp.fromDate(controller.scheduleDateTime.value)) : ""}", + "${'Your preferred time'.tr} ${controller.deliveryType.value == "schedule" ? Constant.timestampToDateTime(Timestamp.fromDate(controller.scheduleDateTime.value)) : ""}", textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -977,7 +977,7 @@ class CartScreen extends StatelessWidget { ), Radio( value: controller.deliveryType.value, - groupValue: "schedule".tr(), + groupValue: "schedule".tr, activeColor: AppThemeData.primary300, onChanged: (value) { controller.deliveryType.value = @@ -998,7 +998,7 @@ class CartScreen extends StatelessWidget { .value, displaySubmitButton: true, pickerTitle: Text( - 'Schedule Time'.tr(), + 'Schedule Time'.tr, ), buttonSingleColor: AppThemeData.primary300, @@ -1020,7 +1020,7 @@ class CartScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Offers & Benefits".tr(), + "Offers & Benefits".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -1066,7 +1066,7 @@ class CartScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Apply Coupons".tr(), + "Apply Coupons".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -1095,7 +1095,7 @@ class CartScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Bill Details".tr(), + "Bill Details".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -1139,7 +1139,7 @@ class CartScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Item totals".tr(), + "Item totals".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -1180,7 +1180,7 @@ class CartScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Delivery Fee".tr(), + "Delivery Fee".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -1203,7 +1203,7 @@ class CartScreen extends StatelessWidget { Constant.isSelfDeliveryFeature == true) ? Text( - 'Free Delivery'.tr(), + 'Free Delivery'.tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -1251,7 +1251,7 @@ class CartScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Coupon Discount".tr(), + "Coupon Discount".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -1294,7 +1294,7 @@ class CartScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Special Discount".tr(), + "Special Discount".tr, textAlign: TextAlign.start, style: TextStyle( @@ -1352,7 +1352,7 @@ class CartScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Delivery Tips".tr(), + "Delivery Tips".tr, textAlign: TextAlign.start, style: TextStyle( @@ -1382,7 +1382,7 @@ class CartScreen extends StatelessWidget { .calculatePrice(); }, child: Text( - "Remove".tr(), + "Remove".tr, textAlign: TextAlign.start, style: TextStyle( @@ -1509,7 +1509,7 @@ class CartScreen extends StatelessWidget { children: [ Expanded( child: Text( - "To Pay".tr(), + "To Pay".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -1561,7 +1561,7 @@ class CartScreen extends StatelessWidget { children: [ const SizedBox(height: 20), Text( - "Thanks with a tip!".tr(), + "Thanks with a tip!".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -1606,7 +1606,7 @@ class CartScreen extends StatelessWidget { Expanded( child: Text( "Around the clock, our delivery partners make it happen. Show gratitude with a tip.." - .tr(), + .tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -1858,7 +1858,7 @@ class CartScreen extends StatelessWidget { ), child: Center( child: Text( - 'Other'.tr(), + 'Other'.tr, style: TextStyle( color: isDark @@ -1894,9 +1894,9 @@ class CartScreen extends StatelessWidget { child: Column( children: [ TextFieldWidget( - title: 'Remarks'.tr(), + title: 'Remarks'.tr, controller: controller.reMarkController.value, - hintText: 'Write remarks for the store'.tr(), + hintText: 'Write remarks for the store'.tr, maxLine: 4, ), ], @@ -1926,7 +1926,7 @@ class CartScreen extends StatelessWidget { Padding( padding: const EdgeInsets.only(top: 8), child: Text( - "Cashback Offer".tr(), + "Cashback Offer".tr, style: TextStyle( color: isDark @@ -1938,7 +1938,7 @@ class CartScreen extends StatelessWidget { ), ), Text( - "${"Cashback Name :".tr()} ${controller.bestCashback.value.title ?? ''}", + "${"Cashback Name :".tr} ${controller.bestCashback.value.title ?? ''}", style: TextStyle( color: AppThemeData.success300, fontFamily: AppThemeData.semiBold, @@ -1946,7 +1946,7 @@ class CartScreen extends StatelessWidget { ), ), Text( - "${"You will get".tr()} ${Constant.amountShow(amount: controller.bestCashback.value.cashbackValue?.toStringAsFixed(2))} ${"cashback after completing the order.".tr()}", + "${"You will get".tr} ${Constant.amountShow(amount: controller.bestCashback.value.cashbackValue?.toStringAsFixed(2))} ${"cashback after completing the order.".tr}", style: TextStyle( color: AppThemeData.success300, fontFamily: AppThemeData.semiBold, @@ -2115,7 +2115,7 @@ class CartScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Pay Via".tr(), + "Pay Via".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -2176,7 +2176,7 @@ class CartScreen extends StatelessWidget { : isDark ? AppThemeData.grey800 : AppThemeData.grey100, - title: "Pay Now".tr(), + title: "Pay Now".tr, height: 5, color: controller.selectedPaymentMethod.value != @@ -2192,7 +2192,7 @@ class CartScreen extends StatelessWidget { controller.totalAmount.value)) { ShowToastDialog.showToast( "The total price must be greater than or equal to the coupon discount value for the code to apply. Please review your cart total." - .tr(), + .tr, ); return; } @@ -2206,7 +2206,7 @@ class CartScreen extends StatelessWidget { controller.totalAmount.value)) { ShowToastDialog.showToast( "The total price must be greater than or equal to the special discount value for the code to apply. Please review your cart total." - .tr(), + .tr, ); return; } @@ -2329,7 +2329,7 @@ class CartScreen extends StatelessWidget { Get.back(); ShowToastDialog.showToast( "Something went wrong, please contact admin." - .tr(), + .tr, ); } else { CreateRazorPayOrderModel @@ -2347,7 +2347,7 @@ class CartScreen extends StatelessWidget { } else { controller.isOrderPlaced.value = false; ShowToastDialog.showToast( - "Please select payment method".tr(), + "Please select payment method".tr, ); } controller.isOrderPlaced.value = false; @@ -2411,7 +2411,7 @@ class CartScreen extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ TextFieldWidget( - title: 'Tips Amount'.tr(), + title: 'Tips Amount'.tr, controller: controller.tipsController.value, textInputType: const TextInputType.numberWithOptions( signed: true, @@ -2427,7 +2427,7 @@ class CartScreen extends StatelessWidget { vertical: 14, ), child: Text( - Constant.currencyModel!.symbol.tr(), + Constant.currencyModel!.symbol.tr, style: TextStyle( color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, @@ -2436,7 +2436,7 @@ class CartScreen extends StatelessWidget { ), ), ), - hintText: 'Enter Tips Amount'.tr(), + hintText: 'Enter Tips Amount'.tr, ), SizedBox(height: 10), Row( @@ -2444,7 +2444,7 @@ class CartScreen extends StatelessWidget { Expanded( child: RoundedButtonFill( borderRadius: 10.r, - title: "Cancel".tr(), + title: "Cancel".tr, color: isDark ? AppThemeData.grey700 : AppThemeData.grey200, textColor: @@ -2458,13 +2458,13 @@ class CartScreen extends StatelessWidget { Expanded( child: RoundedButtonFill( borderRadius: 10.r, - title: "Add".tr(), + title: "Add".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () async { if (controller.tipsController.value.text.isEmpty) { ShowToastDialog.showToast( - "Please enter tips Amount".tr(), + "Please enter tips Amount".tr, ); } else { controller.deliveryTips.value = double.parse( diff --git a/lib/screen_ui/multi_vendor_service/cart_screen/coupon_list_screen.dart b/lib/screen_ui/multi_vendor_service/cart_screen/coupon_list_screen.dart index 4e7a57e..0a31ba3 100644 --- a/lib/screen_ui/multi_vendor_service/cart_screen/coupon_list_screen.dart +++ b/lib/screen_ui/multi_vendor_service/cart_screen/coupon_list_screen.dart @@ -6,9 +6,9 @@ import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/text_field_widget.dart'; import 'package:customer/widget/my_separator.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../themes/show_toast_dialog.dart'; @@ -31,7 +31,7 @@ class CouponListScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Coupon Code".tr(), + "Coupon Code".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -44,7 +44,7 @@ class CouponListScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: TextFieldWidget( - hintText: 'Enter coupon code'.tr(), + hintText: 'Enter coupon code'.tr, controller: controller.couponCodeController.value, suffix: Padding( padding: const EdgeInsets.symmetric( @@ -59,7 +59,7 @@ class CouponListScreen extends StatelessWidget { .text .isEmpty) { ShowToastDialog.showToast( - "Please enter coupon code".tr(), + "Please enter coupon code".tr, ); return; } @@ -83,15 +83,15 @@ class CouponListScreen extends StatelessWidget { Get.back(); } else { ShowToastDialog.showToast( - "Coupon code not applied".tr(), + "Coupon code not applied".tr, ); } } else { - ShowToastDialog.showToast("Invalid Coupon".tr()); + ShowToastDialog.showToast("Invalid Coupon".tr); } }, child: Text( - "Apply".tr(), + "Apply".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -147,7 +147,7 @@ class CouponListScreen extends StatelessWidget { child: RotatedBox( quarterTurns: -1, child: Text( - "${couponModel.discountType == "Fix Price" ? Constant.amountShow(amount: couponModel.discount) : "${couponModel.discount}%"} ${'Off'.tr()}", + "${couponModel.discountType == "Fix Price" ? Constant.amountShow(amount: couponModel.discount) : "${couponModel.discount}%"} ${'Off'.tr}", textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -221,12 +221,12 @@ class CouponListScreen extends StatelessWidget { Get.back(); } else { ShowToastDialog.showToast( - "Coupon code not applied".tr(), + "Coupon code not applied".tr, ); } }, child: Text( - "Tap To Apply".tr(), + "Tap To Apply".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, diff --git a/lib/screen_ui/multi_vendor_service/cart_screen/oder_placing_screens.dart b/lib/screen_ui/multi_vendor_service/cart_screen/oder_placing_screens.dart index cf4d0bc..3b711ac 100644 --- a/lib/screen_ui/multi_vendor_service/cart_screen/oder_placing_screens.dart +++ b/lib/screen_ui/multi_vendor_service/cart_screen/oder_placing_screens.dart @@ -6,11 +6,12 @@ import 'package:customer/models/cart_product_model.dart'; import 'package:customer/screen_ui/ecommarce/dash_board_e_commerce_screen.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/round_button_fill.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../dash_board_screens/dash_board_screen.dart'; @@ -44,7 +45,7 @@ class OrderPlacingScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Order Placed".tr(), + "Order Placed".tr, textAlign: TextAlign.start, style: TextStyle( color: @@ -58,7 +59,7 @@ class OrderPlacingScreen extends StatelessWidget { ), Text( "Hang tight — your items are being delivered quickly and safely!" - .tr(), + .tr, textAlign: TextAlign.start, style: TextStyle( color: @@ -100,7 +101,7 @@ class OrderPlacingScreen extends StatelessWidget { const SizedBox(width: 10), Expanded( child: Text( - "Order ID".tr(), + "Order ID".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -147,7 +148,7 @@ class OrderPlacingScreen extends StatelessWidget { ), const SizedBox(height: 20), Text( - "Placing your order".tr(), + "Placing your order".tr, textAlign: TextAlign.start, style: TextStyle( color: @@ -161,7 +162,7 @@ class OrderPlacingScreen extends StatelessWidget { ), Text( "Take a moment to review your order before proceeding to checkout." - .tr(), + .tr, textAlign: TextAlign.start, style: TextStyle( color: @@ -203,7 +204,7 @@ class OrderPlacingScreen extends StatelessWidget { const SizedBox(width: 10), Expanded( child: Text( - "Delivery Address".tr(), + "Delivery Address".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -265,7 +266,7 @@ class OrderPlacingScreen extends StatelessWidget { const SizedBox(width: 10), Expanded( child: Text( - "Order Summary".tr(), + "Order Summary".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -299,7 +300,7 @@ class OrderPlacingScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "${cartProductModel.quantity} x".tr(), + "${cartProductModel.quantity} x".tr, textAlign: TextAlign.start, style: TextStyle( color: @@ -312,7 +313,7 @@ class OrderPlacingScreen extends StatelessWidget { ), ), Text( - "${cartProductModel.name}".tr(), + "${cartProductModel.name}".tr, textAlign: TextAlign.start, style: TextStyle( color: @@ -344,7 +345,7 @@ class OrderPlacingScreen extends StatelessWidget { controller.isPlacing.value ? RoundedButtonFill( borderRadius: 10.r, - title: "Track Order".tr(), + title: "Track Order".tr, height: 5.5, color: AppThemeData.primary300, textColor: AppThemeData.grey50, @@ -368,7 +369,7 @@ class OrderPlacingScreen extends StatelessWidget { ) : RoundedButtonFill( borderRadius: 10.r, - title: "Track Order".tr(), + title: "Track Order".tr, height: 5.5, color: isDark diff --git a/lib/screen_ui/multi_vendor_service/cart_screen/select_payment_screen.dart b/lib/screen_ui/multi_vendor_service/cart_screen/select_payment_screen.dart index 8817c3c..3b39149 100644 --- a/lib/screen_ui/multi_vendor_service/cart_screen/select_payment_screen.dart +++ b/lib/screen_ui/multi_vendor_service/cart_screen/select_payment_screen.dart @@ -2,10 +2,10 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/cart_controller.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/round_button_fill.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../wallet_screen/wallet_screen.dart'; @@ -20,13 +20,15 @@ class SelectPaymentScreen extends StatelessWidget { init: CartController(), builder: (controller) { return Scaffold( - backgroundColor: isDark ? AppThemeData.surfaceDark : AppThemeData.surface, + backgroundColor: + isDark ? AppThemeData.surfaceDark : AppThemeData.surface, appBar: AppBar( - backgroundColor: isDark ? AppThemeData.surfaceDark : AppThemeData.surface, + backgroundColor: + isDark ? AppThemeData.surfaceDark : AppThemeData.surface, centerTitle: false, titleSpacing: 0, title: Text( - "Payment Option".tr(), + "Payment Option".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -42,21 +44,23 @@ class SelectPaymentScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Preferred Payment".tr(), + "Preferred Payment".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, fontSize: 16, - color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, + color: + isDark ? AppThemeData.grey50 : AppThemeData.grey900, ), ), - const SizedBox( - height: 10, - ), - if (controller.walletSettingModel.value.isEnabled == true || controller.cashOnDeliverySettingModel.value.isEnabled == true) + const SizedBox(height: 10), + if (controller.walletSettingModel.value.isEnabled == true || + controller.cashOnDeliverySettingModel.value.isEnabled == + true) Container( decoration: ShapeDecoration( - color: isDark ? AppThemeData.grey900 : AppThemeData.grey50, + color: + isDark ? AppThemeData.grey900 : AppThemeData.grey50, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(16), ), @@ -66,7 +70,7 @@ class SelectPaymentScreen extends StatelessWidget { blurRadius: 20, offset: Offset(0, 0), spreadRadius: 0, - ) + ), ], ), child: Padding( @@ -74,40 +78,62 @@ class SelectPaymentScreen extends StatelessWidget { child: Column( children: [ Visibility( - visible: controller.walletSettingModel.value.isEnabled == true, - child: cardDecoration(controller, PaymentGateway.wallet, isDark, "assets/images/ic_wallet.png"), + visible: + controller + .walletSettingModel + .value + .isEnabled == + true, + child: cardDecoration( + controller, + PaymentGateway.wallet, + isDark, + "assets/images/ic_wallet.png", + ), ), Visibility( - visible: controller.cashOnDeliverySettingModel.value.isEnabled == true, - child: cardDecoration(controller, PaymentGateway.cod, isDark, "assets/images/ic_cash.png"), + visible: + controller + .cashOnDeliverySettingModel + .value + .isEnabled == + true, + child: cardDecoration( + controller, + PaymentGateway.cod, + isDark, + "assets/images/ic_cash.png", + ), ), ], ), ), ), - if (controller.walletSettingModel.value.isEnabled == true || controller.cashOnDeliverySettingModel.value.isEnabled == true) + if (controller.walletSettingModel.value.isEnabled == true || + controller.cashOnDeliverySettingModel.value.isEnabled == + true) Column( children: [ - const SizedBox( - height: 10, - ), + const SizedBox(height: 10), Text( - "Other Payment Options".tr(), + "Other Payment Options".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, fontSize: 16, - color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, + color: + isDark + ? AppThemeData.grey50 + : AppThemeData.grey900, ), ), - const SizedBox( - height: 10, - ), + const SizedBox(height: 10), ], ), Container( decoration: ShapeDecoration( - color: isDark ? AppThemeData.grey900 : AppThemeData.grey50, + color: + isDark ? AppThemeData.grey900 : AppThemeData.grey50, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(16), ), @@ -117,7 +143,7 @@ class SelectPaymentScreen extends StatelessWidget { blurRadius: 20, offset: Offset(0, 0), spreadRadius: 0, - ) + ), ], ), child: Padding( @@ -125,62 +151,133 @@ class SelectPaymentScreen extends StatelessWidget { child: Column( children: [ Visibility( - visible: controller.stripeModel.value.isEnabled == true, - child: cardDecoration(controller, PaymentGateway.stripe, isDark, "assets/images/stripe.png"), + visible: + controller.stripeModel.value.isEnabled == true, + child: cardDecoration( + controller, + PaymentGateway.stripe, + isDark, + "assets/images/stripe.png", + ), ), Visibility( - visible: controller.payPalModel.value.isEnabled == true, - child: cardDecoration(controller, PaymentGateway.paypal, isDark, "assets/images/paypal.png"), + visible: + controller.payPalModel.value.isEnabled == true, + child: cardDecoration( + controller, + PaymentGateway.paypal, + isDark, + "assets/images/paypal.png", + ), ), Visibility( - visible: controller.payStackModel.value.isEnable == true, - child: cardDecoration(controller, PaymentGateway.payStack, isDark, "assets/images/paystack.png"), + visible: + controller.payStackModel.value.isEnable == true, + child: cardDecoration( + controller, + PaymentGateway.payStack, + isDark, + "assets/images/paystack.png", + ), ), Visibility( - visible: controller.mercadoPagoModel.value.isEnabled == true, - child: cardDecoration(controller, PaymentGateway.mercadoPago, isDark, "assets/images/mercado-pago.png"), + visible: + controller.mercadoPagoModel.value.isEnabled == + true, + child: cardDecoration( + controller, + PaymentGateway.mercadoPago, + isDark, + "assets/images/mercado-pago.png", + ), ), Visibility( - visible: controller.flutterWaveModel.value.isEnable == true, - child: cardDecoration(controller, PaymentGateway.flutterWave, isDark, "assets/images/flutterwave_logo.png"), + visible: + controller.flutterWaveModel.value.isEnable == + true, + child: cardDecoration( + controller, + PaymentGateway.flutterWave, + isDark, + "assets/images/flutterwave_logo.png", + ), ), Visibility( - visible: controller.payFastModel.value.isEnable == true, - child: cardDecoration(controller, PaymentGateway.payFast, isDark, "assets/images/payfast.png"), + visible: + controller.payFastModel.value.isEnable == true, + child: cardDecoration( + controller, + PaymentGateway.payFast, + isDark, + "assets/images/payfast.png", + ), ), Visibility( - visible: controller.razorPayModel.value.isEnabled == true, - child: cardDecoration(controller, PaymentGateway.razorpay, isDark, "assets/images/razorpay.png"), + visible: + controller.razorPayModel.value.isEnabled == + true, + child: cardDecoration( + controller, + PaymentGateway.razorpay, + isDark, + "assets/images/razorpay.png", + ), ), Visibility( - visible: controller.midTransModel.value.enable == true, - child: cardDecoration(controller, PaymentGateway.midTrans, isDark, "assets/images/midtrans.png"), + visible: + controller.midTransModel.value.enable == true, + child: cardDecoration( + controller, + PaymentGateway.midTrans, + isDark, + "assets/images/midtrans.png", + ), ), Visibility( - visible: controller.orangeMoneyModel.value.enable == true, - child: cardDecoration(controller, PaymentGateway.orangeMoney, isDark, "assets/images/orange_money.png"), + visible: + controller.orangeMoneyModel.value.enable == + true, + child: cardDecoration( + controller, + PaymentGateway.orangeMoney, + isDark, + "assets/images/orange_money.png", + ), ), Visibility( - visible: controller.xenditModel.value.enable == true, - child: cardDecoration(controller, PaymentGateway.xendit, isDark, "assets/images/xendit.png"), + visible: + controller.xenditModel.value.enable == true, + child: cardDecoration( + controller, + PaymentGateway.xendit, + isDark, + "assets/images/xendit.png", + ), ), ], ), ), - ) + ), ], ), ), ), bottomNavigationBar: Container( decoration: BoxDecoration( - color: isDark ? AppThemeData.grey900 : AppThemeData.grey50, borderRadius: const BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20))), + color: isDark ? AppThemeData.grey900 : AppThemeData.grey50, + borderRadius: const BorderRadius.only( + topLeft: Radius.circular(20), + topRight: Radius.circular(20), + ), + ), padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 20), child: Padding( padding: const EdgeInsets.only(bottom: 20), child: RoundedButtonFill( - borderRadius: 10.r, - title: "${'Pay Now'.tr()} | ${Constant.amountShow(amount: controller.totalAmount.value.toString())}".tr(), + borderRadius: 10.r, + title: + "${'Pay Now'.tr} | ${Constant.amountShow(amount: controller.totalAmount.value.toString())}" + .tr, height: 5, color: AppThemeData.primary300, textColor: AppThemeData.grey50, @@ -196,7 +293,12 @@ class SelectPaymentScreen extends StatelessWidget { ); } - Obx cardDecoration(CartController controller, PaymentGateway value, isDark, String image) { + Obx cardDecoration( + CartController controller, + PaymentGateway value, + isDark, + String image, + ) { return Obx( () => Padding( padding: const EdgeInsets.symmetric(vertical: 5), @@ -213,68 +315,89 @@ class SelectPaymentScreen extends StatelessWidget { height: 50, decoration: ShapeDecoration( shape: RoundedRectangleBorder( - side: const BorderSide(width: 1, color: Color(0xFFE5E7EB)), + side: const BorderSide( + width: 1, + color: Color(0xFFE5E7EB), + ), borderRadius: BorderRadius.circular(8), ), ), child: Padding( - padding: EdgeInsets.all(value.name == "payFast" ? 0 : 8.0), - child: Image.asset( - image, + padding: EdgeInsets.all( + value.name == "payFast" ? 0 : 8.0, ), + child: Image.asset(image), ), ), - const SizedBox( - width: 10, - ), + const SizedBox(width: 10), value.name == "wallet" ? Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - value.name.capitalizeString(), - textAlign: TextAlign.start, - style: TextStyle( - fontFamily: AppThemeData.medium, - fontSize: 16, - color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, - ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + value.name.capitalizeString(), + textAlign: TextAlign.start, + style: TextStyle( + fontFamily: AppThemeData.medium, + fontSize: 16, + color: + isDark + ? AppThemeData.grey50 + : AppThemeData.grey900, ), - Text( - Constant.amountShow(amount: controller.userModel.value.walletAmount == null ? '0.0' : controller.userModel.value.walletAmount.toString()), - textAlign: TextAlign.start, - style: TextStyle( - fontFamily: AppThemeData.semiBold, - fontSize: 16, - color: isDark ? AppThemeData.primary300 : AppThemeData.primary300, - ), - ), - ], - ), - ) - : Expanded( - child: Text( - value.name.capitalizeString(), - textAlign: TextAlign.start, - style: TextStyle( - fontFamily: AppThemeData.medium, - fontSize: 16, - color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, ), + Text( + Constant.amountShow( + amount: + controller.userModel.value.walletAmount == + null + ? '0.0' + : controller + .userModel + .value + .walletAmount + .toString(), + ), + textAlign: TextAlign.start, + style: TextStyle( + fontFamily: AppThemeData.semiBold, + fontSize: 16, + color: + isDark + ? AppThemeData.primary300 + : AppThemeData.primary300, + ), + ), + ], + ), + ) + : Expanded( + child: Text( + value.name.capitalizeString(), + textAlign: TextAlign.start, + style: TextStyle( + fontFamily: AppThemeData.medium, + fontSize: 16, + color: + isDark + ? AppThemeData.grey50 + : AppThemeData.grey900, ), ), - const Expanded( - child: SizedBox(), - ), + ), + const Expanded(child: SizedBox()), Radio( value: value.name, groupValue: controller.selectedPaymentMethod.value, - activeColor: isDark ? AppThemeData.primary300 : AppThemeData.primary300, + activeColor: + isDark + ? AppThemeData.primary300 + : AppThemeData.primary300, onChanged: (value) { controller.selectedPaymentMethod.value = value.toString(); }, - ) + ), ], ), ), diff --git a/lib/screen_ui/multi_vendor_service/cashback_screen/cashback_offers_list.dart b/lib/screen_ui/multi_vendor_service/cashback_screen/cashback_offers_list.dart index bc0aea5..f49f5fb 100644 --- a/lib/screen_ui/multi_vendor_service/cashback_screen/cashback_offers_list.dart +++ b/lib/screen_ui/multi_vendor_service/cashback_screen/cashback_offers_list.dart @@ -1,9 +1,9 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/cashback_controller.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; class CashbackOffersListScreen extends StatelessWidget { @@ -21,7 +21,7 @@ class CashbackOffersListScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Cashback Offers".tr(), + "Cashback Offers".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -95,7 +95,7 @@ class CashbackOffersListScreen extends StatelessWidget { ), const SizedBox(height: 6), Text( - "${"Min spent".tr()} ${Constant.amountShow(amount: "${controller.cashbackList[index].minimumPurchaseAmount ?? 0.0}")} | ${"Valid till".tr()} ${Constant.timestampToDateTime2(controller.cashbackList[index].endDate!)}", + "${"Min spent".tr} ${Constant.amountShow(amount: "${controller.cashbackList[index].minimumPurchaseAmount ?? 0.0}")} | ${"Valid till".tr} ${Constant.timestampToDateTime2(controller.cashbackList[index].endDate!)}", style: TextStyle( color: isDark @@ -106,7 +106,7 @@ class CashbackOffersListScreen extends StatelessWidget { ), ), Text( - "${"Maximum cashback up to".tr()} ${Constant.amountShow(amount: "${controller.cashbackList[index].maximumDiscount ?? 0.0}")}", + "${"Maximum cashback up to".tr} ${Constant.amountShow(amount: "${controller.cashbackList[index].maximumDiscount ?? 0.0}")}", style: TextStyle( color: isDark diff --git a/lib/screen_ui/multi_vendor_service/change langauge/change_language_screen.dart b/lib/screen_ui/multi_vendor_service/change langauge/change_language_screen.dart index a78a3fc..05cc06b 100644 --- a/lib/screen_ui/multi_vendor_service/change langauge/change_language_screen.dart +++ b/lib/screen_ui/multi_vendor_service/change langauge/change_language_screen.dart @@ -1,14 +1,14 @@ - import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/change_language_controller.dart'; import 'package:customer/screen_ui/splash_screen/splash_screen.dart'; +import 'package:customer/service/localization_service.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flag/flag_enum.dart'; import 'package:flag/flag_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; class ChangeLanguageScreen extends StatelessWidget { @@ -51,7 +51,7 @@ class ChangeLanguageScreen extends StatelessWidget { // crossAxisAlignment: CrossAxisAlignment.start, // children: [ // Text( - // ConstTexts.changeLanguage.tr(), + // ConstTexts.changeLanguage.tr, // style: TextStyle( // fontSize: 24, // color: @@ -63,7 +63,7 @@ class ChangeLanguageScreen extends StatelessWidget { // ), // ), // Text( - // ConstTexts.selectPrefferedLanguage.tr(), + // ConstTexts.selectPrefferedLanguage.tr, // style: TextStyle( // fontSize: 16, // color: @@ -78,32 +78,35 @@ class ChangeLanguageScreen extends StatelessWidget { // ), // ), _buildLanguageButton( - isActive: context.locale == Locale("uz", "UZ"), + isActive: Get.locale == const Locale("uz", "UZ"), flagCode: FlagsCode.UZ, title: "O'zbekcha", onTap: () async { - await context.setLocale(Locale("uz", "UZ")); - Get.forceAppUpdate(); + LocalizationService.changeLocale( + const Locale('uz', 'UZ'), + ); }, ), _buildDivider(), _buildLanguageButton( - isActive: context.locale == Locale("ru", "RU"), + isActive: Get.locale == const Locale('ru', 'RU'), flagCode: FlagsCode.RU, title: "Русский", onTap: () async { - await context.setLocale(Locale("ru", "RU")); - Get.forceAppUpdate(); + LocalizationService.changeLocale( + const Locale("ru", "RU"), + ); }, ), _buildDivider(), _buildLanguageButton( - isActive: context.locale == Locale("en", "US"), + isActive: Get.locale == const Locale("en", "US"), flagCode: FlagsCode.US, title: "English", onTap: () async { - await context.setLocale(Locale("en", "US")); - Get.forceAppUpdate(); + LocalizationService.changeLocale( + const Locale("en", "US"), + ); }, ), diff --git a/lib/screen_ui/multi_vendor_service/chat_screens/chat_screen.dart b/lib/screen_ui/multi_vendor_service/chat_screens/chat_screen.dart index fc40a8a..0931a83 100644 --- a/lib/screen_ui/multi_vendor_service/chat_screens/chat_screen.dart +++ b/lib/screen_ui/multi_vendor_service/chat_screens/chat_screen.dart @@ -5,13 +5,13 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/chat_controller.dart'; import 'package:customer/models/conversation_model.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import '../../../controllers/theme_controller.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:image_picker/image_picker.dart'; import 'package:intl/intl.dart'; import '../../../service/fire_store_utils.dart'; @@ -68,7 +68,7 @@ class ChatScreen extends StatelessWidget { ); }, onEmpty: Constant.showEmptyView( - message: "No Conversion found".tr(), + message: "No Conversion found".tr, ), // orderBy is compulsory to enable pagination query: FirebaseFirestore.instance @@ -128,7 +128,7 @@ class ChatScreen extends StatelessWidget { ), focusedBorder: InputBorder.none, enabledBorder: InputBorder.none, - hintText: 'Type message here....'.tr(), + hintText: 'Type message here....'.tr, ), onSubmitted: (value) async { if (controller @@ -397,7 +397,7 @@ class ChatScreen extends StatelessWidget { void onCameraClick(BuildContext context, ChatController controller) { final action = CupertinoActionSheet( - message: Text('Send Media'.tr(), style: const TextStyle(fontSize: 15.0)), + message: Text('Send Media'.tr, style: const TextStyle(fontSize: 15.0)), actions: [ CupertinoActionSheetAction( isDefaultAction: false, @@ -414,7 +414,7 @@ class ChatScreen extends StatelessWidget { controller.sendMessage('', url, '', 'image'); } }, - child: Text("Choose image from gallery".tr()), + child: Text("Choose image from gallery".tr), ), CupertinoActionSheetAction( isDefaultAction: false, @@ -439,7 +439,7 @@ class ChatScreen extends StatelessWidget { } } }, - child: Text("Choose video from gallery".tr()), + child: Text("Choose video from gallery".tr), ), CupertinoActionSheetAction( isDestructiveAction: false, @@ -456,7 +456,7 @@ class ChatScreen extends StatelessWidget { controller.sendMessage('', url, '', 'image'); } }, - child: Text("Take a picture".tr()), + child: Text("Take a picture".tr), ), // CupertinoActionSheetAction( // isDestructiveAction: false, @@ -468,11 +468,11 @@ class ChatScreen extends StatelessWidget { // controller.sendMessage('', videoContainer.videoUrl, videoContainer.thumbnailUrl, 'video'); // } // }, - // child: Text("Record video".tr()), + // child: Text("Record video".tr), // ) ], cancelButton: CupertinoActionSheetAction( - child: Text('Cancel'.tr()), + child: Text('Cancel'.tr), onPressed: () { Get.back(); }, diff --git a/lib/screen_ui/multi_vendor_service/chat_screens/driver_inbox_screen.dart b/lib/screen_ui/multi_vendor_service/chat_screens/driver_inbox_screen.dart index 39bf091..05ccb43 100644 --- a/lib/screen_ui/multi_vendor_service/chat_screens/driver_inbox_screen.dart +++ b/lib/screen_ui/multi_vendor_service/chat_screens/driver_inbox_screen.dart @@ -5,9 +5,9 @@ import 'package:customer/models/user_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../service/fire_store_utils.dart'; import '../../../themes/show_toast_dialog.dart'; @@ -29,7 +29,7 @@ class DriverInboxScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Driver Inbox".tr(), + "Driver Inbox".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -46,7 +46,7 @@ class DriverInboxScreen extends StatelessWidget { InboxModel inboxModel = InboxModel.fromJson(data!); return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); UserModel? customer = await FireStoreUtils.getUserProfile( inboxModel.customerId.toString(), @@ -157,7 +157,7 @@ class DriverInboxScreen extends StatelessWidget { ); }, shrinkWrap: true, - onEmpty: Constant.showEmptyView(message: "No Conversion found".tr()), + onEmpty: Constant.showEmptyView(message: "No Conversion found".tr), // orderBy is compulsory to enable pagination query: FirebaseFirestore.instance .collection('chat_driver') diff --git a/lib/screen_ui/multi_vendor_service/chat_screens/restaurant_inbox_screen.dart b/lib/screen_ui/multi_vendor_service/chat_screens/restaurant_inbox_screen.dart index a1d22b5..bdf6d90 100644 --- a/lib/screen_ui/multi_vendor_service/chat_screens/restaurant_inbox_screen.dart +++ b/lib/screen_ui/multi_vendor_service/chat_screens/restaurant_inbox_screen.dart @@ -8,9 +8,9 @@ import 'package:customer/themes/responsive.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:customer/widget/firebase_pagination/src/fireStore_pagination.dart'; import 'package:customer/widget/firebase_pagination/src/models/view_type.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../service/fire_store_utils.dart'; import '../../../themes/show_toast_dialog.dart'; @@ -30,7 +30,7 @@ class RestaurantInboxScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Store Inbox".tr(), + "Store Inbox".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -47,7 +47,7 @@ class RestaurantInboxScreen extends StatelessWidget { InboxModel inboxModel = InboxModel.fromJson(data!); return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); UserModel? customer = await FireStoreUtils.getUserProfile( inboxModel.customerId.toString(), @@ -161,7 +161,7 @@ class RestaurantInboxScreen extends StatelessWidget { ); }, shrinkWrap: true, - onEmpty: Constant.showEmptyView(message: "No Conversion found".tr()), + onEmpty: Constant.showEmptyView(message: "No Conversion found".tr), // orderBy is compulsory to enable pagination query: FirebaseFirestore.instance .collection('chat_store') diff --git a/lib/screen_ui/multi_vendor_service/dash_board_screens/dash_board_screen.dart b/lib/screen_ui/multi_vendor_service/dash_board_screens/dash_board_screen.dart index 0421c23..648c8d7 100644 --- a/lib/screen_ui/multi_vendor_service/dash_board_screens/dash_board_screen.dart +++ b/lib/screen_ui/multi_vendor_service/dash_board_screens/dash_board_screen.dart @@ -1,10 +1,10 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/dash_board_controller.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; class DashBoardScreen extends StatelessWidget { @@ -51,28 +51,28 @@ class DashBoardScreen extends StatelessWidget { isDark, index: 0, assetIcon: "assets/icons/ic_home.svg", - label: 'Home'.tr(), + label: 'Home'.tr, controller: controller, ), navigationBarItem( isDark, index: 1, assetIcon: "assets/icons/ic_fav.svg", - label: 'Favourites'.tr(), + label: 'Favourites'.tr, controller: controller, ), navigationBarItem( isDark, index: 2, assetIcon: "assets/icons/ic_orders.svg", - label: 'Orders'.tr(), + label: 'Orders'.tr, controller: controller, ), navigationBarItem( isDark, index: 3, assetIcon: "assets/icons/ic_profile.svg", - label: 'Profile'.tr(), + label: 'Profile'.tr, controller: controller, ), ] @@ -81,35 +81,35 @@ class DashBoardScreen extends StatelessWidget { isDark, index: 0, assetIcon: "assets/icons/ic_home.svg", - label: 'Home'.tr(), + label: 'Home'.tr, controller: controller, ), navigationBarItem( isDark, index: 1, assetIcon: "assets/icons/ic_fav.svg", - label: 'Favourites'.tr(), + label: 'Favourites'.tr, controller: controller, ), navigationBarItem( isDark, index: 2, assetIcon: "assets/icons/ic_wallet.svg", - label: 'Wallet'.tr(), + label: 'Wallet'.tr, controller: controller, ), navigationBarItem( isDark, index: 3, assetIcon: "assets/icons/ic_orders.svg", - label: 'Orders'.tr(), + label: 'Orders'.tr, controller: controller, ), navigationBarItem( isDark, index: 4, assetIcon: "assets/icons/ic_profile.svg", - label: 'Profile'.tr(), + label: 'Profile'.tr, controller: controller, ), ], diff --git a/lib/screen_ui/multi_vendor_service/dine_in_booking/dine_in_booking_details.dart b/lib/screen_ui/multi_vendor_service/dine_in_booking/dine_in_booking_details.dart index b19398c..bafde44 100644 --- a/lib/screen_ui/multi_vendor_service/dine_in_booking/dine_in_booking_details.dart +++ b/lib/screen_ui/multi_vendor_service/dine_in_booking/dine_in_booking_details.dart @@ -1,10 +1,10 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/dine_in_booking_details_controller.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:url_launcher/url_launcher.dart'; import '../../../controllers/theme_controller.dart'; @@ -26,7 +26,7 @@ class DineInBookingDetails extends StatelessWidget { backgroundColor: isDark ? AppThemeData.surfaceDark : AppThemeData.surface, title: Text( - "Dine in Bookings".tr(), + "Dine in Bookings".tr, style: TextStyle( fontSize: 16, color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, @@ -50,7 +50,7 @@ class DineInBookingDetails extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "${'Order'.tr()} ${Constant.orderId(orderId: controller.bookingModel.value.id.toString())}", + "${'Order'.tr} ${Constant.orderId(orderId: controller.bookingModel.value.id.toString())}", style: TextStyle( fontSize: 18, color: @@ -62,7 +62,7 @@ class DineInBookingDetails extends StatelessWidget { ), ), Text( - "${controller.bookingModel.value.totalGuest} ${'Peoples'.tr()}", + "${controller.bookingModel.value.totalGuest} ${'Peoples'.tr}", style: TextStyle( fontSize: 14, color: @@ -200,7 +200,7 @@ class DineInBookingDetails extends StatelessWidget { ); }, child: Text( - "View in Map".tr(), + "View in Map".tr, style: TextStyle( fontSize: 16, color: @@ -245,7 +245,7 @@ class DineInBookingDetails extends StatelessWidget { } }, child: Text( - "Call Now".tr(), + "Call Now".tr, style: TextStyle( fontSize: 16, color: @@ -269,7 +269,7 @@ class DineInBookingDetails extends StatelessWidget { ), const SizedBox(height: 20), Text( - "Booking Details".tr(), + "Booking Details".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -300,7 +300,7 @@ class DineInBookingDetails extends StatelessWidget { children: [ Expanded( child: Text( - "Name".tr(), + "Name".tr, style: TextStyle( color: isDark @@ -333,7 +333,7 @@ class DineInBookingDetails extends StatelessWidget { children: [ Expanded( child: Text( - "Phone number".tr(), + "Phone number".tr, style: TextStyle( color: isDark @@ -366,7 +366,7 @@ class DineInBookingDetails extends StatelessWidget { children: [ Expanded( child: Text( - "Date and Time".tr(), + "Date and Time".tr, style: TextStyle( color: isDark @@ -401,7 +401,7 @@ class DineInBookingDetails extends StatelessWidget { children: [ Expanded( child: Text( - "Guest".tr(), + "Guest".tr, style: TextStyle( color: isDark @@ -434,7 +434,7 @@ class DineInBookingDetails extends StatelessWidget { children: [ Expanded( child: Text( - "Discount".tr(), + "Discount".tr, style: TextStyle( color: isDark diff --git a/lib/screen_ui/multi_vendor_service/dine_in_booking/dine_in_booking_screen.dart b/lib/screen_ui/multi_vendor_service/dine_in_booking/dine_in_booking_screen.dart index 85e714c..8f45d83 100644 --- a/lib/screen_ui/multi_vendor_service/dine_in_booking/dine_in_booking_screen.dart +++ b/lib/screen_ui/multi_vendor_service/dine_in_booking/dine_in_booking_screen.dart @@ -3,10 +3,10 @@ import 'package:customer/controllers/dine_in_booking_controller.dart'; import 'package:customer/models/dine_in_booking_model.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../themes/app_them_data.dart'; import '../../../widget/my_separator.dart'; @@ -29,7 +29,7 @@ class DineInBookingScreen extends StatelessWidget { backgroundColor: isDark ? AppThemeData.surfaceDark : AppThemeData.surface, title: Text( - "Dine in Bookings".tr(), + "Dine in Bookings".tr, style: TextStyle( fontSize: 16, color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, @@ -83,7 +83,7 @@ class DineInBookingScreen extends StatelessWidget { vertical: 10, ), child: Text( - "Upcoming".tr(), + "Upcoming".tr, textAlign: TextAlign.center, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -126,7 +126,7 @@ class DineInBookingScreen extends StatelessWidget { vertical: 10, ), child: Text( - "History".tr(), + "History".tr, textAlign: TextAlign.center, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -159,7 +159,7 @@ class DineInBookingScreen extends StatelessWidget { ? controller.featureList.isEmpty ? Constant.showEmptyView( message: - "Upcoming Booking not found.".tr(), + "Upcoming Booking not found.".tr, ) : ListView.builder( shrinkWrap: true, @@ -182,7 +182,7 @@ class DineInBookingScreen extends StatelessWidget { ) : controller.historyList.isEmpty ? Constant.showEmptyView( - message: "History not found.".tr(), + message: "History not found.".tr, ) : ListView.builder( itemCount: controller.historyList.length, @@ -319,7 +319,7 @@ class DineInBookingScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Name".tr(), + "Name".tr, style: TextStyle( color: isDark @@ -352,7 +352,7 @@ class DineInBookingScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Guest Number".tr(), + "Guest Number".tr, style: TextStyle( color: isDark diff --git a/lib/screen_ui/multi_vendor_service/dine_in_screeen/book_table_screen.dart b/lib/screen_ui/multi_vendor_service/dine_in_screeen/book_table_screen.dart index a8dcaf3..a029d40 100644 --- a/lib/screen_ui/multi_vendor_service/dine_in_screeen/book_table_screen.dart +++ b/lib/screen_ui/multi_vendor_service/dine_in_screeen/book_table_screen.dart @@ -5,10 +5,10 @@ import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/text_field_widget.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:intl/intl.dart'; import '../../../controllers/theme_controller.dart'; @@ -30,7 +30,7 @@ class BookTableScreen extends StatelessWidget { backgroundColor: isDark ? AppThemeData.surfaceDark : AppThemeData.surface, title: Text( - "Book Table".tr(), + "Book Table".tr, style: TextStyle( fontSize: 16, color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, @@ -62,7 +62,7 @@ class BookTableScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Numbers of Guests".tr(), + "Numbers of Guests".tr, style: TextStyle( fontSize: 16, color: @@ -159,7 +159,7 @@ class BookTableScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "When are you visiting?".tr(), + "When are you visiting?".tr, style: TextStyle( fontSize: 16, color: @@ -239,7 +239,7 @@ class BookTableScreen extends StatelessWidget { .toDate(), ) == 0 - ? "Today".tr() + ? "Today".tr : Constant.calculateDifference( controller .dateList[index] @@ -247,7 +247,7 @@ class BookTableScreen extends StatelessWidget { .toDate(), ) == 1 - ? "Tomorrow".tr() + ? "Tomorrow".tr : DateFormat( 'EEE', ).format( @@ -309,7 +309,7 @@ class BookTableScreen extends StatelessWidget { borderRadius: 10.r, title: "${controller.dateList[index].discountPer}%" - .tr(), + .tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, width: 12, @@ -325,7 +325,7 @@ class BookTableScreen extends StatelessWidget { ), const SizedBox(height: 10), Text( - "Select time slot and scroll to see offers".tr(), + "Select time slot and scroll to see offers".tr, style: TextStyle( fontSize: 16, color: @@ -430,7 +430,7 @@ class BookTableScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Special Occasion".tr(), + "Special Occasion".tr, style: TextStyle( fontSize: 16, color: @@ -447,7 +447,7 @@ class BookTableScreen extends StatelessWidget { controller.selectedOccasion.value = ""; }, child: Text( - "Clear".tr(), + "Clear".tr, style: TextStyle( color: isDark @@ -490,7 +490,7 @@ class BookTableScreen extends StatelessWidget { ), dense: true, title: Text( - //'${controller.occasionList[i]}'.tr(), + //'${controller.occasionList[i]}'.tr, controller.getLocalizedOccasion( controller.occasionList[i], ), @@ -529,7 +529,7 @@ class BookTableScreen extends StatelessWidget { ), dense: true, title: Text( - 'Is this your first visit?'.tr(), + 'Is this your first visit?'.tr, style: TextStyle( fontSize: 16, color: @@ -558,7 +558,7 @@ class BookTableScreen extends StatelessWidget { ), const SizedBox(height: 10), Text( - "Personal Details".tr(), + "Personal Details".tr, style: TextStyle( fontSize: 16, color: @@ -635,7 +635,7 @@ class BookTableScreen extends StatelessWidget { ), const SizedBox(height: 10), Text( - "Additional Requests".tr(), + "Additional Requests".tr, style: TextStyle( fontSize: 16, color: @@ -647,7 +647,7 @@ class BookTableScreen extends StatelessWidget { const SizedBox(height: 10), TextFieldWidget( controller: controller.additionRequestController.value, - hintText: 'Add message here....'.tr(), + hintText: 'Add message here....'.tr, maxLine: 5, ), const SizedBox(height: 20), @@ -662,7 +662,7 @@ class BookTableScreen extends StatelessWidget { padding: const EdgeInsets.only(bottom: 20), child: RoundedButtonFill( borderRadius: 10.r, - title: "Book Now".tr(), + title: "Book Now".tr, height: 5.5, color: AppThemeData.primary300, textColor: AppThemeData.grey50, diff --git a/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_details_screen.dart b/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_details_screen.dart index 3912671..f4aa823 100644 --- a/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_details_screen.dart +++ b/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_details_screen.dart @@ -4,7 +4,7 @@ import 'package:customer/models/favourite_model.dart'; import 'package:customer/models/vendor_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; -import 'package:easy_localization/easy_localization.dart'; + import '../../../controllers/theme_controller.dart'; import '../../../service/fire_store_utils.dart'; import '../../../themes/show_toast_dialog.dart'; @@ -13,7 +13,7 @@ import '../restaurant_details_screen/restaurant_details_screen.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:url_launcher/url_launcher.dart'; import '../review_list_screen/review_list_screen.dart'; import 'book_table_screen.dart'; @@ -364,7 +364,7 @@ class DineInDetailsScreen extends StatelessWidget { ); }, child: Text( - "${controller.vendorModel.value.reviewsCount} ${'Ratings'.tr()}", + "${controller.vendorModel.value.reviewsCount} ${'Ratings'.tr}", style: TextStyle( decoration: TextDecoration.underline, @@ -385,8 +385,8 @@ class DineInDetailsScreen extends StatelessWidget { children: [ Text( controller.isOpen.value - ? "Open".tr() - : "Close".tr(), + ? "Open".tr + : "Close".tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -421,7 +421,7 @@ class DineInDetailsScreen extends StatelessWidget { ); }, child: Text( - "View Timings".tr(), + "View Timings".tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -454,8 +454,8 @@ class DineInDetailsScreen extends StatelessWidget { ), ), Text( - "${Constant.amountShow(amount: controller.vendorModel.value.restaurantCost)} ${'for two'.tr()}" - .tr(), + "${Constant.amountShow(amount: controller.vendorModel.value.restaurantCost)} ${'for two'.tr}" + .tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -477,7 +477,7 @@ class DineInDetailsScreen extends StatelessWidget { children: [ const SizedBox(height: 20), Text( - "Also applicable on food delivery".tr(), + "Also applicable on food delivery".tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -497,7 +497,7 @@ class DineInDetailsScreen extends StatelessWidget { if (Constant.userModel == null) { ShowToastDialog.showToast( "Please log in to the application. You are not logged in." - .tr(), + .tr, ); } else { Get.to( @@ -570,7 +570,7 @@ class DineInDetailsScreen extends StatelessWidget { .start, children: [ Text( - "Table Booking".tr(), + "Table Booking".tr, style: TextStyle( fontSize: 16, color: @@ -588,7 +588,7 @@ class DineInDetailsScreen extends StatelessWidget { ), Text( "Quick Conformations" - .tr(), + .tr, style: TextStyle( fontSize: 12, color: @@ -688,7 +688,7 @@ class DineInDetailsScreen extends StatelessWidget { children: [ Text( "Available food delivery" - .tr(), + .tr, style: TextStyle( fontSize: 16, color: @@ -705,7 +705,7 @@ class DineInDetailsScreen extends StatelessWidget { ), ), Text( - "in 30-45 mins.".tr(), + "in 30-45 mins.".tr, style: TextStyle( fontSize: 12, color: @@ -749,7 +749,7 @@ class DineInDetailsScreen extends StatelessWidget { children: [ const SizedBox(height: 20), Text( - "Menu".tr(), + "Menu".tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -832,7 +832,7 @@ class DineInDetailsScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Location, Timing & Costs".tr(), + "Location, Timing & Costs".tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -902,7 +902,7 @@ class DineInDetailsScreen extends StatelessWidget { ); }, child: Text( - "View on Map".tr(), + "View on Map".tr, textAlign: TextAlign.start, style: TextStyle( fontSize: 16, @@ -939,7 +939,7 @@ class DineInDetailsScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Timing".tr(), + "Timing".tr, textAlign: TextAlign.start, style: TextStyle( fontSize: 16, @@ -956,7 +956,7 @@ class DineInDetailsScreen extends StatelessWidget { InkWell( onTap: () {}, child: Text( - "${controller.vendorModel.value.openDineTime == '' ? "10:00 AM" : controller.vendorModel.value.openDineTime.toString()} ${"To".tr()} ${controller.vendorModel.value.closeDineTime == '' ? "10:00 PM" : controller.vendorModel.value.closeDineTime.toString()}", + "${controller.vendorModel.value.openDineTime == '' ? "10:00 AM" : controller.vendorModel.value.openDineTime.toString()} ${"To".tr} ${controller.vendorModel.value.closeDineTime == '' ? "10:00 PM" : controller.vendorModel.value.closeDineTime.toString()}", textAlign: TextAlign.start, style: TextStyle( fontSize: 16, @@ -1001,7 +1001,7 @@ class DineInDetailsScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Cost for Two".tr(), + "Cost for Two".tr, textAlign: TextAlign.start, style: TextStyle( fontSize: 16, @@ -1016,7 +1016,7 @@ class DineInDetailsScreen extends StatelessWidget { ), ), Text( - "${Constant.amountShow(amount: controller.vendorModel.value.restaurantCost ?? "0.0")} ${'(approx)'.tr()}", + "${Constant.amountShow(amount: controller.vendorModel.value.restaurantCost ?? "0.0")} ${'(approx)'.tr}", textAlign: TextAlign.start, style: TextStyle( fontSize: 16, @@ -1043,7 +1043,7 @@ class DineInDetailsScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Cuisines".tr(), + "Cuisines".tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( diff --git a/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_restaurant_list_screen.dart b/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_restaurant_list_screen.dart index 72ce204..a8651b3 100644 --- a/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_restaurant_list_screen.dart +++ b/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_restaurant_list_screen.dart @@ -6,7 +6,7 @@ import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../service/fire_store_utils.dart'; import '../../../widget/restaurant_image_view.dart'; diff --git a/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_screen.dart b/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_screen.dart index 1fe7b07..b2888cf 100644 --- a/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_screen.dart +++ b/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_screen.dart @@ -9,12 +9,13 @@ import 'package:customer/screen_ui/multi_vendor_service/dine_in_screeen/view_all import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_fill.dart'; +import 'package:customer/utils/app_router.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:url_launcher/url_launcher.dart'; import '../../../controllers/theme_controller.dart'; import '../../../models/banner_model.dart'; @@ -81,7 +82,7 @@ class DineInScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( - "Dine-In Reservations".tr(), + "Dine-In Reservations".tr, style: TextStyle( fontSize: 24, fontFamily: AppThemeData.semiBold, @@ -94,7 +95,7 @@ class DineInScreen extends StatelessWidget { ), Text( "Book a table at your favorite restaurant and enjoy a delightful dining experience." - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle( fontSize: 14, @@ -132,7 +133,7 @@ class DineInScreen extends StatelessWidget { ), const SizedBox(height: 12), Text( - "No Store Found in Your Area".tr(), + "No Store Found in Your Area".tr, style: TextStyle( color: isDark @@ -145,7 +146,7 @@ class DineInScreen extends StatelessWidget { const SizedBox(height: 5), Text( "Currently, there are no available store in your zone. Try changing your location to find nearby options." - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -159,7 +160,7 @@ class DineInScreen extends StatelessWidget { const SizedBox(height: 20), RoundedButtonFill( borderRadius: 10.r, - title: "Change Zone".tr(), + title: "Change Zone".tr, width: 55, height: 5.5, color: AppThemeData.primary300, @@ -183,7 +184,7 @@ class DineInScreen extends StatelessWidget { const SizedBox(height: 10), titleView( isDark, - "Explore the Categories".tr(), + "Explore the Categories".tr, () { Get.to(const ViewAllCategoryDineInScreen()); }, @@ -219,7 +220,7 @@ class DineInScreen extends StatelessWidget { children: [ Expanded( child: Text( - "New Arrivals".tr(), + "New Arrivals".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -245,7 +246,7 @@ class DineInScreen extends StatelessWidget { ); }, child: Text( - "View all".tr(), + "View all".tr, textAlign: TextAlign.center, style: TextStyle( fontFamily: @@ -317,7 +318,7 @@ class DineInScreen extends StatelessWidget { vertical: 10, ), child: Text( - "Popular Stores".tr(), + "Popular Stores".tr, textAlign: TextAlign.center, style: TextStyle( fontFamily: @@ -358,7 +359,7 @@ class DineInScreen extends StatelessWidget { vertical: 10, ), child: Text( - "All Stores".tr(), + "All Stores".tr, textAlign: TextAlign.center, style: TextStyle( fontFamily: @@ -426,7 +427,7 @@ class DineInScreen extends StatelessWidget { onPress!(); }, child: Text( - "View all".tr(), + "View all".tr, textAlign: TextAlign.center, style: TextStyle( fontFamily: AppThemeData.regular, @@ -1293,7 +1294,7 @@ class BannerBottomView extends StatelessWidget { return InkWell( onTap: () async { if (bannerModel.redirect_type == "store") { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( bannerModel.redirect_id.toString(), @@ -1305,7 +1306,7 @@ class BannerBottomView extends StatelessWidget { arguments: {"vendorModel": vendorModel}, ); } else if (bannerModel.redirect_type == "product") { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); ProductModel? productModel = await FireStoreUtils.getProductById( bannerModel.redirect_id.toString(), @@ -1325,7 +1326,7 @@ class BannerBottomView extends StatelessWidget { if (await canLaunchUrl(uri)) { await launchUrl(uri); } else { - ShowToastDialog.showToast("Could not launch".tr()); + ShowToastDialog.showToast("Could not launch".tr); } } }, diff --git a/lib/screen_ui/multi_vendor_service/dine_in_screeen/view_all_category_dine_in_screen.dart b/lib/screen_ui/multi_vendor_service/dine_in_screeen/view_all_category_dine_in_screen.dart index a33b906..538bb0d 100644 --- a/lib/screen_ui/multi_vendor_service/dine_in_screeen/view_all_category_dine_in_screen.dart +++ b/lib/screen_ui/multi_vendor_service/dine_in_screeen/view_all_category_dine_in_screen.dart @@ -3,9 +3,9 @@ import 'package:customer/controllers/view_all_category_controller.dart'; import 'package:customer/models/vendor_category_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../home_screen/category_restaurant_screen.dart'; @@ -26,7 +26,7 @@ class ViewAllCategoryDineInScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Categories".tr(), + "Categories".tr, style: TextStyle( fontSize: 16, color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, diff --git a/lib/screen_ui/multi_vendor_service/edit_profile_screen/edit_profile_screen.dart b/lib/screen_ui/multi_vendor_service/edit_profile_screen/edit_profile_screen.dart index 2811025..2af3d63 100644 --- a/lib/screen_ui/multi_vendor_service/edit_profile_screen/edit_profile_screen.dart +++ b/lib/screen_ui/multi_vendor_service/edit_profile_screen/edit_profile_screen.dart @@ -6,11 +6,11 @@ import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/text_field_widget.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:image_picker/image_picker.dart'; import '../../../controllers/theme_controller.dart'; @@ -38,7 +38,7 @@ class EditProfileScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Profile Information".tr(), + "Profile Information".tr, style: TextStyle( fontSize: 24, color: @@ -49,7 +49,7 @@ class EditProfileScreen extends StatelessWidget { ), Text( "View and update your personal details, contact information, and preferences." - .tr(), + .tr, style: TextStyle( fontSize: 16, color: @@ -118,33 +118,33 @@ class EditProfileScreen extends StatelessWidget { children: [ Expanded( child: TextFieldWidget( - title: 'First Name'.tr(), + title: 'First Name'.tr, controller: controller.firstNameController.value, - hintText: 'First Name'.tr(), + hintText: 'First Name'.tr, ), ), const SizedBox(width: 10), Expanded( child: TextFieldWidget( - title: 'Last Name'.tr(), + title: 'Last Name'.tr, controller: controller.lastNameController.value, - hintText: 'Last Name'.tr(), + hintText: 'Last Name'.tr, ), ), ], ), TextFieldWidget( - title: 'Email'.tr(), + title: 'Email'.tr, textInputType: TextInputType.emailAddress, controller: controller.emailController.value, - hintText: 'Email'.tr(), + hintText: 'Email'.tr, enable: false, ), TextFieldWidget( - title: 'Phone Number'.tr(), + title: 'Phone Number'.tr, textInputType: TextInputType.emailAddress, controller: controller.phoneNumberController.value, - hintText: 'Phone Number'.tr(), + hintText: 'Phone Number'.tr, enable: false, ), ], @@ -158,7 +158,7 @@ class EditProfileScreen extends StatelessWidget { padding: const EdgeInsets.only(bottom: 20), child: RoundedButtonFill( borderRadius: 10.r, - title: "Save Details".tr(), + title: "Save Details".tr, height: 5.5, color: AppThemeData.primary300, textColor: AppThemeData.grey50, @@ -191,7 +191,7 @@ class EditProfileScreen extends StatelessWidget { Padding( padding: const EdgeInsets.only(top: 15), child: Text( - "please select".tr(), + "please select".tr, style: const TextStyle( fontSize: 16, fontWeight: FontWeight.w600, @@ -217,7 +217,7 @@ class EditProfileScreen extends StatelessWidget { Padding( padding: const EdgeInsets.only(top: 3), child: Text( - "camera".tr(), + "camera".tr, style: const TextStyle(), ), ), @@ -243,7 +243,7 @@ class EditProfileScreen extends StatelessWidget { Padding( padding: const EdgeInsets.only(top: 3), child: Text( - "gallery".tr(), + "gallery".tr, style: const TextStyle(), ), ), diff --git a/lib/screen_ui/multi_vendor_service/favourite_screens/favourite_screen.dart b/lib/screen_ui/multi_vendor_service/favourite_screens/favourite_screen.dart index 4eb1bf0..97cf5ba 100644 --- a/lib/screen_ui/multi_vendor_service/favourite_screens/favourite_screen.dart +++ b/lib/screen_ui/multi_vendor_service/favourite_screens/favourite_screen.dart @@ -7,12 +7,13 @@ import 'package:customer/models/vendor_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_fill.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import '../../../controllers/theme_controller.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../service/fire_store_utils.dart'; import '../../../themes/show_toast_dialog.dart'; import '../../../widget/restaurant_image_view.dart'; @@ -47,7 +48,7 @@ class FavouriteScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Your Favourites, All in One Place".tr(), + "Your Favourites, All in One Place".tr, style: TextStyle( fontSize: 24, color: @@ -83,7 +84,7 @@ class FavouriteScreen extends StatelessWidget { ), const SizedBox(height: 12), Text( - "Please Log In to Continue".tr(), + "Please Log In to Continue".tr, style: TextStyle( color: isDark @@ -96,7 +97,7 @@ class FavouriteScreen extends StatelessWidget { const SizedBox(height: 5), Text( "You’re not logged in. Please sign in to access your account and explore all features." - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -109,7 +110,7 @@ class FavouriteScreen extends StatelessWidget { ), const SizedBox(height: 20), RoundedButtonFill( - title: "Log in".tr(), + title: "Log in".tr, width: 55, height: 5.5, color: AppThemeData.primary300, @@ -174,8 +175,7 @@ class FavouriteScreen extends StatelessWidget { vertical: 10, ), child: Text( - "Favourite Store" - .tr(), + "Favourite Store".tr, textAlign: TextAlign.center, style: TextStyle( @@ -226,7 +226,7 @@ class FavouriteScreen extends StatelessWidget { vertical: 10, ), child: Text( - "Favourite Item".tr(), + "Favourite Item".tr, textAlign: TextAlign.center, style: TextStyle( @@ -275,7 +275,7 @@ class FavouriteScreen extends StatelessWidget { ? Constant.showEmptyView( message: "Favourite Store not found." - .tr(), + .tr, ) : ListView.builder( shrinkWrap: true, @@ -501,7 +501,7 @@ class FavouriteScreen extends StatelessWidget { 5, ), Text( - "Free Delivery".tr(), + "Free Delivery".tr, style: TextStyle( fontSize: 14, @@ -699,7 +699,7 @@ class FavouriteScreen extends StatelessWidget { ? Constant.showEmptyView( message: "Favourite Item not found." - .tr(), + .tr, ) : ListView.builder( itemCount: @@ -734,7 +734,7 @@ class FavouriteScreen extends StatelessWidget { .hasError) { return Center( child: Text( - '${"error".tr()}: ${snapshot.error}', + '${"error".tr}: ${snapshot.error}', ), ); } else if (snapshot @@ -833,8 +833,8 @@ class FavouriteScreen extends StatelessWidget { Text( productModel.nonveg == true - ? "Non Veg.".tr() - : "Pure veg.".tr(), + ? "Non Veg.".tr + : "Pure veg.".tr, style: TextStyle( color: productModel.nonveg == diff --git a/lib/screen_ui/multi_vendor_service/forgot_password_screen/forgot_password_screen.dart b/lib/screen_ui/multi_vendor_service/forgot_password_screen/forgot_password_screen.dart index cc6bef3..c09dad0 100644 --- a/lib/screen_ui/multi_vendor_service/forgot_password_screen/forgot_password_screen.dart +++ b/lib/screen_ui/multi_vendor_service/forgot_password_screen/forgot_password_screen.dart @@ -2,10 +2,10 @@ import 'package:customer/controllers/forgot_password_controller.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/text_field_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../themes/show_toast_dialog.dart'; @@ -30,7 +30,7 @@ class ForgotPasswordScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Forgot Password".tr(), + "Forgot Password".tr, style: TextStyle( color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, fontSize: 22, @@ -38,7 +38,7 @@ class ForgotPasswordScreen extends StatelessWidget { ), ), Text( - "No worries!! We’ll send you reset instructions".tr(), + "No worries!! We’ll send you reset instructions".tr, style: TextStyle( color: isDark ? AppThemeData.grey50 : AppThemeData.grey500, fontSize: 16, @@ -47,9 +47,9 @@ class ForgotPasswordScreen extends StatelessWidget { ), const SizedBox(height: 32), TextFieldWidget( - title: 'Email Address'.tr(), + title: 'Email Address'.tr, controller: controller.emailEditingController.value, - hintText: 'Enter email address'.tr(), + hintText: 'Enter email address'.tr, prefix: Padding( padding: const EdgeInsets.all(12), child: SvgPicture.asset( @@ -63,16 +63,14 @@ class ForgotPasswordScreen extends StatelessWidget { ), const SizedBox(height: 32), RoundedButtonFill( - title: "Forgot Password".tr(), + title: "Forgot Password".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () async { if (controller.emailEditingController.value.text .trim() .isEmpty) { - ShowToastDialog.showToast( - "Please enter valid email".tr(), - ); + ShowToastDialog.showToast("Please enter valid email".tr); } else { controller.forgotPassword(); } diff --git a/lib/screen_ui/multi_vendor_service/gift_card/gift_card_screen.dart b/lib/screen_ui/multi_vendor_service/gift_card/gift_card_screen.dart index 921276d..7476061 100644 --- a/lib/screen_ui/multi_vendor_service/gift_card/gift_card_screen.dart +++ b/lib/screen_ui/multi_vendor_service/gift_card/gift_card_screen.dart @@ -8,11 +8,11 @@ import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/text_field_widget.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../themes/show_toast_dialog.dart'; import 'history_gift_card.dart'; @@ -34,7 +34,7 @@ class GiftCardScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Customize Gift Card".tr(), + "Customize Gift Card".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -131,9 +131,9 @@ class GiftCardScreen extends StatelessWidget { ), const SizedBox(height: 20), TextFieldWidget( - title: 'Choose an amount'.tr(), + title: 'Choose an amount'.tr, controller: controller.amountController.value, - hintText: 'Enter gift card amount'.tr(), + hintText: 'Enter gift card amount'.tr, textInputType: const TextInputType.numberWithOptions( signed: true, @@ -151,7 +151,7 @@ class GiftCardScreen extends StatelessWidget { vertical: 14, ), child: Text( - Constant.currencyModel!.symbol.tr(), + Constant.currencyModel!.symbol.tr, style: TextStyle( color: isDark @@ -233,9 +233,9 @@ class GiftCardScreen extends StatelessWidget { ), const SizedBox(height: 40), TextFieldWidget( - title: 'Add Message (Optional)'.tr(), + title: 'Add Message (Optional)'.tr, controller: controller.messageController.value, - hintText: 'Add message here....'.tr(), + hintText: 'Add message here....'.tr, maxLine: 6, ), ], @@ -248,7 +248,7 @@ class GiftCardScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.only(bottom: 20), child: RoundedButtonFill( - title: "Continue".tr(), + title: "Continue".tr, height: 5.5, color: AppThemeData.primary300, textColor: AppThemeData.grey50, @@ -258,13 +258,13 @@ class GiftCardScreen extends StatelessWidget { if (Constant.userModel == null) { ShowToastDialog.showToast( "Please log in to the application. You are not logged in." - .tr(), + .tr, ); } else { giftCardBottomSheet(context, controller); } } else { - ShowToastDialog.showToast("Please enter Amount".tr()); + ShowToastDialog.showToast("Please enter Amount".tr); } }, ), @@ -330,7 +330,7 @@ class GiftCardScreen extends StatelessWidget { ), child: Text( 'Complete payment and share this e-gift card with loved ones using any app' - .tr(), + .tr, style: TextStyle( color: AppThemeData.ecommerce300, fontSize: 14, @@ -344,7 +344,7 @@ class GiftCardScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Bill Details".tr(), + "Bill Details".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -380,7 +380,7 @@ class GiftCardScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Sub Total".tr(), + "Sub Total".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -422,7 +422,7 @@ class GiftCardScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Grand Total".tr(), + "Grand Total".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -466,8 +466,8 @@ class GiftCardScreen extends StatelessWidget { const SizedBox(height: 20), Center( child: Text( - "${'Gift Card expire'.tr()} ${controller.selectedGiftCard.value.expiryDay} ${'days after purchase'.tr()}" - .tr(), + "${'Gift Card expire'.tr} ${controller.selectedGiftCard.value.expiryDay} ${'days after purchase'.tr}" + .tr, textAlign: TextAlign.center, style: TextStyle( fontFamily: AppThemeData.medium, @@ -494,7 +494,7 @@ class GiftCardScreen extends StatelessWidget { padding: const EdgeInsets.only(bottom: 20), child: RoundedButtonFill( title: - "${'Pay'.tr()} ${Constant.amountShow(amount: controller.amountController.value.text)}", + "${'Pay'.tr} ${Constant.amountShow(amount: controller.amountController.value.text)}", height: 5.5, color: AppThemeData.primary300, textColor: AppThemeData.grey50, diff --git a/lib/screen_ui/multi_vendor_service/gift_card/history_gift_card.dart b/lib/screen_ui/multi_vendor_service/gift_card/history_gift_card.dart index 6d92fb3..9cc4e36 100644 --- a/lib/screen_ui/multi_vendor_service/gift_card/history_gift_card.dart +++ b/lib/screen_ui/multi_vendor_service/gift_card/history_gift_card.dart @@ -2,9 +2,9 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/history_gift_card_controller.dart'; import 'package:customer/models/gift_cards_order_model.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../widget/my_separator.dart'; @@ -33,7 +33,7 @@ class HistoryGiftCard extends StatelessWidget { child: controller.giftCardsOrderList.isEmpty ? Constant.showEmptyView( - message: "Purchased Gift card not found".tr(), + message: "Purchased Gift card not found".tr, ) : ListView.builder( itemCount: controller.giftCardsOrderList.length, @@ -111,7 +111,7 @@ class HistoryGiftCard extends StatelessWidget { children: [ Expanded( child: Text( - "Gift Code".tr(), + "Gift Code".tr, style: TextStyle( color: isDark @@ -150,7 +150,7 @@ class HistoryGiftCard extends StatelessWidget { children: [ Expanded( child: Text( - "Gift Pin".tr(), + "Gift Pin".tr, style: TextStyle( color: isDark @@ -272,7 +272,7 @@ class HistoryGiftCard extends StatelessWidget { MainAxisSize.min, children: [ Text( - 'Share'.tr(), + 'Share'.tr, style: TextStyle( color: isDark @@ -298,8 +298,8 @@ class HistoryGiftCard extends StatelessWidget { const Expanded(child: SizedBox()), Text( giftCardOrderModel.redeem == true - ? "Redeemed".tr() - : "Not Redeem".tr(), + ? "Redeemed".tr + : "Not Redeem".tr, style: TextStyle( fontSize: 16, color: diff --git a/lib/screen_ui/multi_vendor_service/gift_card/redeem_gift_card_screen.dart b/lib/screen_ui/multi_vendor_service/gift_card/redeem_gift_card_screen.dart index 04bb55f..b1ccdab 100644 --- a/lib/screen_ui/multi_vendor_service/gift_card/redeem_gift_card_screen.dart +++ b/lib/screen_ui/multi_vendor_service/gift_card/redeem_gift_card_screen.dart @@ -7,11 +7,12 @@ import 'package:customer/models/wallet_transaction_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/text_field_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import '../../../controllers/theme_controller.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../service/fire_store_utils.dart'; import '../../../themes/show_toast_dialog.dart'; import '../dash_board_screens/dash_board_screen.dart'; @@ -43,7 +44,7 @@ class RedeemGiftCardScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Redeem Gift Card".tr(), + "Redeem Gift Card".tr, style: TextStyle( fontSize: 24, color: @@ -54,7 +55,7 @@ class RedeemGiftCardScreen extends StatelessWidget { ), Text( "Enter your gift card code to enjoy discounts and special offers on your orders." - .tr(), + .tr, style: TextStyle( fontSize: 16, color: @@ -65,9 +66,9 @@ class RedeemGiftCardScreen extends StatelessWidget { ), const SizedBox(height: 20), TextFieldWidget( - title: 'Gift Code'.tr(), + title: 'Gift Code'.tr, controller: controller.giftCodeController.value, - hintText: 'Enter gift code'.tr(), + hintText: 'Enter gift code'.tr, textInputType: TextInputType.number, prefix: Padding( padding: const EdgeInsets.all(10), @@ -75,9 +76,9 @@ class RedeemGiftCardScreen extends StatelessWidget { ), ), TextFieldWidget( - title: 'Gift Pin'.tr(), + title: 'Gift Pin'.tr, controller: controller.giftPinController.value, - hintText: 'Enter gift pin'.tr(), + hintText: 'Enter gift pin'.tr, textInputType: TextInputType.number, prefix: Padding( padding: const EdgeInsets.all(10), @@ -94,18 +95,18 @@ class RedeemGiftCardScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.only(bottom: 20), child: RoundedButtonFill( - title: "Redeem".tr(), + title: "Redeem".tr, height: 5.5, color: AppThemeData.primary300, textColor: AppThemeData.grey50, fontSizes: 16, onPress: () async { if (controller.giftCodeController.value.text.isEmpty) { - ShowToastDialog.showToast("Please Enter Gift Code".tr()); + ShowToastDialog.showToast("Please Enter Gift Code".tr); } else if (controller.giftPinController.value.text.isEmpty) { - ShowToastDialog.showToast("Please Enter Gift Pin".tr()); + ShowToastDialog.showToast("Please Enter Gift Pin".tr); } else { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); await FireStoreUtils.checkRedeemCode( controller.giftCodeController.value.text.replaceAll( " ", @@ -117,17 +118,17 @@ class RedeemGiftCardScreen extends StatelessWidget { if (giftCodeModel.redeem == true) { ShowToastDialog.closeLoader(); ShowToastDialog.showToast( - "Gift voucher already redeemed".tr(), + "Gift voucher already redeemed".tr, ); } else if (giftCodeModel.giftPin != controller.giftPinController.value.text) { ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Gift Pin Invalid".tr()); + ShowToastDialog.showToast("Gift Pin Invalid".tr); } else if (giftCodeModel.expireDate!.toDate().isBefore( DateTime.now(), )) { ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Gift Voucher expire".tr()); + ShowToastDialog.showToast("Gift Voucher expire".tr); } else { giftCodeModel.redeem = true; @@ -171,7 +172,7 @@ class RedeemGiftCardScreen extends StatelessWidget { controller.selectedIndex.value = 2; } ShowToastDialog.showToast( - "Voucher redeem successfully".tr(), + "Voucher redeem successfully".tr, ); }); }); @@ -180,7 +181,7 @@ class RedeemGiftCardScreen extends StatelessWidget { } } else { ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Invalid Gift Code".tr()); + ShowToastDialog.showToast("Invalid Gift Code".tr); } }); } diff --git a/lib/screen_ui/multi_vendor_service/gift_card/select_gift_payment_screen.dart b/lib/screen_ui/multi_vendor_service/gift_card/select_gift_payment_screen.dart index 7309bca..01b6fc0 100644 --- a/lib/screen_ui/multi_vendor_service/gift_card/select_gift_payment_screen.dart +++ b/lib/screen_ui/multi_vendor_service/gift_card/select_gift_payment_screen.dart @@ -4,9 +4,9 @@ import 'package:customer/payment/createRazorPayOrderModel.dart'; import 'package:customer/payment/rozorpayConroller.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/round_button_fill.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../themes/show_toast_dialog.dart'; import '../wallet_screen/wallet_screen.dart'; @@ -30,7 +30,7 @@ class SelectGiftPaymentScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Payment Option".tr(), + "Payment Option".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -46,7 +46,7 @@ class SelectGiftPaymentScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Preferred Payment".tr(), + "Preferred Payment".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -102,7 +102,7 @@ class SelectGiftPaymentScreen extends StatelessWidget { ), const SizedBox(height: 10), Text( - "Other Payment Options".tr(), + "Other Payment Options".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -261,7 +261,7 @@ class SelectGiftPaymentScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.only(bottom: 20), child: RoundedButtonFill( - title: "Pay Now".tr(), + title: "Pay Now".tr, height: 5, color: AppThemeData.primary300, textColor: AppThemeData.grey50, @@ -335,8 +335,7 @@ class SelectGiftPaymentScreen extends StatelessWidget { if (value == null) { Get.back(); ShowToastDialog.showToast( - "Something went wrong, please contact admin." - .tr(), + "Something went wrong, please contact admin.".tr, ); } else { CreateRazorPayOrderModel result = value; @@ -348,7 +347,7 @@ class SelectGiftPaymentScreen extends StatelessWidget { }); } else { ShowToastDialog.showToast( - "Please select payment method".tr(), + "Please select payment method".tr, ); } }, diff --git a/lib/screen_ui/multi_vendor_service/home_screen/category_restaurant_screen.dart b/lib/screen_ui/multi_vendor_service/home_screen/category_restaurant_screen.dart index 56c5e78..a951228 100644 --- a/lib/screen_ui/multi_vendor_service/home_screen/category_restaurant_screen.dart +++ b/lib/screen_ui/multi_vendor_service/home_screen/category_restaurant_screen.dart @@ -3,10 +3,10 @@ import 'package:customer/controllers/category_restaurant_controller.dart'; import 'package:customer/models/vendor_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../widget/restaurant_image_view.dart'; import '../restaurant_details_screen/restaurant_details_screen.dart'; @@ -32,7 +32,7 @@ class CategoryRestaurantScreen extends StatelessWidget { controller.isLoading.value ? Constant.loader() : controller.allNearestRestaurant.isEmpty - ? Constant.showEmptyView(message: "No Restaurant found".tr()) + ? Constant.showEmptyView(message: "No Restaurant found".tr) : Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: ListView.builder( @@ -144,7 +144,7 @@ class CategoryRestaurantScreen extends StatelessWidget { width: 5, ), Text( - "Free Delivery".tr(), + "Free Delivery".tr, style: TextStyle( fontSize: 14, color: diff --git a/lib/screen_ui/multi_vendor_service/home_screen/discount_restaurant_list_screen.dart b/lib/screen_ui/multi_vendor_service/home_screen/discount_restaurant_list_screen.dart index 22ef568..2416330 100644 --- a/lib/screen_ui/multi_vendor_service/home_screen/discount_restaurant_list_screen.dart +++ b/lib/screen_ui/multi_vendor_service/home_screen/discount_restaurant_list_screen.dart @@ -6,10 +6,10 @@ import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../restaurant_details_screen/restaurant_details_screen.dart'; @@ -131,7 +131,7 @@ class DiscountRestaurantListScreen extends StatelessWidget { vertical: 4, ), child: Text( - "${offerModel.discountType == "Fix Price" ? Constant.currencyModel!.symbol : ""}${offerModel.discount}${offerModel.discountType == "Percentage" ? "% off".toUpperCase().tr() : " off".toUpperCase().tr()}", + "${offerModel.discountType == "Fix Price" ? Constant.currencyModel!.symbol : ""}${offerModel.discount}${offerModel.discountType == "Percentage" ? "% off".toUpperCase().tr : " off".toUpperCase().tr}", textAlign: TextAlign.start, maxLines: 1, style: TextStyle( diff --git a/lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart b/lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart index 03adfec..579ab1d 100644 --- a/lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart +++ b/lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart @@ -17,19 +17,20 @@ import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/custom_dialog_box.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_fill.dart'; +import 'package:customer/utils/app_router.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:customer/utils/preferences.dart'; import 'package:customer/widget/osm_map/map_picker_page.dart'; import 'package:customer/widget/place_picker/location_picker_screen.dart'; import 'package:customer/widget/place_picker/selected_location_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart' as flutterMap; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:geocoding/geocoding.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:latlong2/latlong.dart' as location; import 'package:url_launcher/url_launcher.dart'; @@ -93,7 +94,7 @@ class HomeScreen extends StatelessWidget { ), const SizedBox(height: 12), Text( - "No Store Found in Your Area".tr(), + "No Store Found in Your Area".tr, style: TextStyle( color: isDark @@ -106,7 +107,7 @@ class HomeScreen extends StatelessWidget { const SizedBox(height: 5), Text( "Currently, there are no available store in your zone. Try changing your location to find nearby options." - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -119,7 +120,7 @@ class HomeScreen extends StatelessWidget { ), const SizedBox(height: 20), RoundedButtonFill( - title: "Change Zone".tr(), + title: "Change Zone".tr, width: 55, height: 5.5, color: AppThemeData.primary300, @@ -230,7 +231,7 @@ class HomeScreen extends StatelessWidget { onTap: () async { ShowToastDialog.showLoader( "Please wait..." - .tr(), + .tr, ); // ✅ declare it once here! @@ -517,7 +518,7 @@ class HomeScreen extends StatelessWidget { true ? 'Искать что угодно' : 'Search the store, item and more...' - .tr(), + .tr, controller: null, enable: false, backgroundColor: @@ -705,8 +706,7 @@ class HomeScreen extends StatelessWidget { children: [ Expanded( child: Text( - "New Arrivals" - .tr(), + "New Arrivals".tr, textAlign: TextAlign .start, @@ -741,7 +741,7 @@ class HomeScreen extends StatelessWidget { }); }, child: Text( - "View all".tr(), + "View all".tr, textAlign: TextAlign .center, @@ -823,7 +823,7 @@ class HomeScreen extends StatelessWidget { Expanded( child: Text( "Highlights for you" - .tr(), + .tr, textAlign: TextAlign .start, @@ -853,7 +853,7 @@ class HomeScreen extends StatelessWidget { }, child: Text( "View all" - .tr(), + .tr, textAlign: TextAlign .center, @@ -969,7 +969,7 @@ class HomeScreen extends StatelessWidget { ), child: Text( "Popular Stores" - .tr(), + .tr, textAlign: TextAlign .center, @@ -1022,7 +1022,7 @@ class HomeScreen extends StatelessWidget { vertical: 10, ), child: Text( - "All Stores".tr(), + "All Stores".tr, textAlign: TextAlign .center, @@ -1210,16 +1210,16 @@ class HomeScreen extends StatelessWidget { isDark ? AppThemeData.greyDark100 : AppThemeData.grey100, - value: controller.selectedOrderTypeValue.value.tr(), + value: controller.selectedOrderTypeValue.value.tr, icon: const Icon(Icons.keyboard_arrow_down), items: - ['Delivery'.tr(), 'TakeAway'.tr()].map(( + ['Delivery'.tr, 'TakeAway'.tr].map(( String value, ) { return DropdownMenuItem( value: value, child: Text( - value.tr(), + value.tr, style: TextStyle( fontFamily: AppThemeData.semiBold, fontSize: 16, @@ -1244,12 +1244,12 @@ class HomeScreen extends StatelessWidget { context: context, builder: (BuildContext context) { return CustomDialogBox( - title: "Alert".tr(), + title: "Alert".tr, descriptions: "Do you really want to change the delivery option? Your cart will be empty." - .tr(), - positiveString: "Ok".tr(), - negativeString: "Cancel".tr(), + .tr, + positiveString: "Ok".tr, + negativeString: "Cancel".tr, positiveClick: () async { await Preferences.setString( Preferences.foodDeliveryType, @@ -1289,7 +1289,7 @@ class HomeScreen extends StatelessWidget { children: [ Expanded( child: Text( - name.tr(), + name.tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.bold, @@ -1302,7 +1302,7 @@ class HomeScreen extends StatelessWidget { onPress!(); }, child: Text( - "View all".tr(), + "View all".tr, textAlign: TextAlign.center, style: TextStyle( fontFamily: AppThemeData.regular, @@ -1476,7 +1476,7 @@ class PopularRestaurant extends StatelessWidget { ), const SizedBox(width: 5), Text( - "Free Delivery".tr(), + "Free Delivery".tr, style: TextStyle( fontSize: 14, color: AppThemeData.carRent600, @@ -1781,7 +1781,7 @@ class AllRestaurant extends StatelessWidget { ), const SizedBox(width: 5), Text( - "Free Delivery".tr(), + "Free Delivery".tr, style: TextStyle( fontSize: 14, color: AppThemeData.carRent600, @@ -2078,7 +2078,7 @@ class NewArrival extends StatelessWidget { ), const SizedBox(width: 4), Text( - "Free Delivery".tr(), + "Free Delivery".tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -2188,7 +2188,7 @@ class AdvertisementHomeCard extends StatelessWidget { final isDark = themeController.isDark.value; return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( model.vendorId!, ); @@ -2501,7 +2501,7 @@ class OfferView extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Upto".tr(), + "Upto".tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -2516,7 +2516,7 @@ class OfferView extends StatelessWidget { ), ), Text( - "${offerModel.discountType == "Fix Price" ? Constant.currencyModel!.symbol : ""}${offerModel.discount}${offerModel.discountType == "Percentage" ? "% off".tr() : "off".tr()}", + "${offerModel.discountType == "Fix Price" ? Constant.currencyModel!.symbol : ""}${offerModel.discount}${offerModel.discountType == "Percentage" ? "% off".tr : "off".tr}", textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -2565,7 +2565,7 @@ class OfferView extends StatelessWidget { ), const SizedBox(width: 5), Text( - "Free Delivery".tr(), + "Free Delivery".tr, style: TextStyle( fontSize: 12, overflow: TextOverflow.ellipsis, @@ -2651,7 +2651,7 @@ class BannerView extends StatelessWidget { return InkWell( onTap: () async { if (bannerModel.redirect_type == "store") { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( bannerModel.redirect_id.toString(), @@ -2663,7 +2663,7 @@ class BannerView extends StatelessWidget { arguments: {"vendorModel": vendorModel}, ); } else if (bannerModel.redirect_type == "product") { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); ProductModel? productModel = await FireStoreUtils.getProductById( bannerModel.redirect_id.toString(), @@ -2683,7 +2683,7 @@ class BannerView extends StatelessWidget { if (await canLaunchUrl(uri)) { await launchUrl(uri); } else { - ShowToastDialog.showToast("Could not launch".tr()); + ShowToastDialog.showToast("Could not launch".tr); } } }, @@ -2757,7 +2757,7 @@ class BannerBottomView extends StatelessWidget { return InkWell( onTap: () async { if (bannerModel.redirect_type == "store") { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( bannerModel.redirect_id.toString(), @@ -2769,7 +2769,7 @@ class BannerBottomView extends StatelessWidget { arguments: {"vendorModel": vendorModel}, ); } else if (bannerModel.redirect_type == "product") { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); ProductModel? productModel = await FireStoreUtils.getProductById( bannerModel.redirect_id.toString(), @@ -2789,7 +2789,7 @@ class BannerBottomView extends StatelessWidget { if (await canLaunchUrl(uri)) { await launchUrl(uri); } else { - ShowToastDialog.showToast("Could not launch".tr()); + ShowToastDialog.showToast("Could not launch".tr); } } }, @@ -2973,7 +2973,7 @@ class StoryView extends StatelessWidget { if (snapshot.hasError) { return Center( child: Text( - '${"Error".tr()}: ${snapshot.error}', + '${"Error".tr}: ${snapshot.error}', ), ); } else if (snapshot.data == null) { @@ -3401,7 +3401,7 @@ class MapView extends StatelessWidget { ), Text( "Free Delivery" - .tr(), + .tr, style: TextStyle( fontSize: 14, diff --git a/lib/screen_ui/multi_vendor_service/home_screen/home_screen_two.dart b/lib/screen_ui/multi_vendor_service/home_screen/home_screen_two.dart index 7641c69..d7cd033 100644 --- a/lib/screen_ui/multi_vendor_service/home_screen/home_screen_two.dart +++ b/lib/screen_ui/multi_vendor_service/home_screen/home_screen_two.dart @@ -18,17 +18,18 @@ import 'package:customer/themes/custom_dialog_box.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/text_field_widget.dart'; +import 'package:customer/utils/app_router.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:customer/utils/preferences.dart'; import 'package:customer/widget/osm_map/map_picker_page.dart'; import 'package:customer/widget/place_picker/location_picker_screen.dart'; import 'package:customer/widget/place_picker/selected_location_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:geocoding/geocoding.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:url_launcher/url_launcher.dart'; import '../../../controllers/theme_controller.dart'; import '../../../models/banner_model.dart'; @@ -73,7 +74,7 @@ class HomeScreenTwo extends StatelessWidget { Image.asset("assets/images/location.gif", height: 120), const SizedBox(height: 12), Text( - "No Store Found in Your Area".tr(), + "No Store Found in Your Area".tr, style: TextStyle( color: isDark @@ -86,7 +87,7 @@ class HomeScreenTwo extends StatelessWidget { const SizedBox(height: 5), Text( "Currently, there are no available store in your zone. Try changing your location to find nearby options." - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -99,7 +100,7 @@ class HomeScreenTwo extends StatelessWidget { ), const SizedBox(height: 20), RoundedButtonFill( - title: "Change Zone".tr(), + title: "Change Zone".tr, width: 55, height: 5.5, color: AppThemeData.primary300, @@ -159,7 +160,7 @@ class HomeScreenTwo extends StatelessWidget { ); }, child: Text( - "Login".tr(), + "Login".tr, textAlign: TextAlign.center, style: TextStyle( @@ -213,8 +214,7 @@ class HomeScreenTwo extends StatelessWidget { Constant.checkPermission( onTap: () async { ShowToastDialog.showLoader( - "Please wait..." - .tr(), + "Please wait...".tr, ); // ✅ declare once for whole method @@ -442,9 +442,9 @@ class HomeScreenTwo extends StatelessWidget { ) == true ? 'Search the dish, foo and more...' - .tr() + .tr : 'Search the store, item and more...' - .tr(), + .tr, controller: null, enable: false, prefix: Padding( @@ -564,7 +564,7 @@ class HomeScreenTwo extends StatelessWidget { Expanded( child: Text( "Highlights for you" - .tr(), + .tr, textAlign: TextAlign .start, @@ -594,7 +594,7 @@ class HomeScreenTwo extends StatelessWidget { }, child: Text( "See all" - .tr(), + .tr, textAlign: TextAlign .center, @@ -786,16 +786,16 @@ class HomeScreenTwo extends StatelessWidget { DropdownButton( isDense: false, underline: const SizedBox(), - value: controller.selectedOrderTypeValue.value.tr(), + value: controller.selectedOrderTypeValue.value.tr, icon: const Icon(Icons.keyboard_arrow_down), items: - ['Delivery'.tr(), 'TakeAway'.tr()].map(( + ['Delivery'.tr, 'TakeAway'.tr].map(( String value, ) { return DropdownMenuItem( value: value, child: Text( - value.tr(), + value.tr, style: TextStyle( fontFamily: AppThemeData.semiBold, fontSize: 16, @@ -820,12 +820,12 @@ class HomeScreenTwo extends StatelessWidget { context: context, builder: (BuildContext context) { return CustomDialogBox( - title: "Alert".tr(), + title: "Alert".tr, descriptions: "Do you really want to change the delivery option? Your cart will be empty." - .tr(), - positiveString: "Ok".tr(), - negativeString: "Cancel".tr(), + .tr, + positiveString: "Ok".tr, + negativeString: "Cancel".tr, positiveClick: () async { await Preferences.setString( Preferences.foodDeliveryType, @@ -887,7 +887,7 @@ class CategoryView extends StatelessWidget { children: [ Expanded( child: Text( - "Our Categories".tr(), + "Our Categories".tr, style: TextStyle( fontFamily: AppThemeData.semiBold, color: @@ -903,7 +903,7 @@ class CategoryView extends StatelessWidget { Get.to(const ViewAllCategoryScreen()); }, child: Text( - "See all".tr(), + "See all".tr, textAlign: TextAlign.center, style: TextStyle( fontFamily: AppThemeData.medium, @@ -918,7 +918,7 @@ class CategoryView extends StatelessWidget { ], ), GradientText( - 'Best Servings Food'.tr(), + 'Best Servings Food'.tr, style: TextStyle( fontSize: 24, fontFamily: 'Inter Tight', @@ -1022,7 +1022,7 @@ class OfferView extends StatelessWidget { children: [ Expanded( child: Text( - "Large Discounts".tr(), + "Large Discounts".tr, style: TextStyle( fontFamily: AppThemeData.semiBold, color: @@ -1045,7 +1045,7 @@ class OfferView extends StatelessWidget { ); }, child: Text( - "See all".tr(), + "See all".tr, textAlign: TextAlign.center, style: TextStyle( fontFamily: AppThemeData.medium, @@ -1060,7 +1060,7 @@ class OfferView extends StatelessWidget { ], ), GradientText( - 'Save Upto 50% Off'.tr(), + 'Save Upto 50% Off'.tr, style: TextStyle( fontSize: 24, fontFamily: 'Inter Tight', @@ -1152,7 +1152,7 @@ class OfferView extends StatelessWidget { const SizedBox(height: 5), RoundedButtonFill( title: - "${offerModel.discountType == "Fix Price" ? Constant.currencyModel!.symbol : ""}${offerModel.discount}${offerModel.discountType == "Percentage" ? "% off".tr() : "off".tr()}", + "${offerModel.discountType == "Fix Price" ? Constant.currencyModel!.symbol : ""}${offerModel.discount}${offerModel.discountType == "Percentage" ? "% off".tr : "off".tr}", color: Colors.primaries[Random().nextInt( Colors.primaries.length, @@ -1207,7 +1207,7 @@ class BannerView extends StatelessWidget { return InkWell( onTap: () async { if (bannerModel.redirect_type == "store") { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( bannerModel.redirect_id.toString(), ); @@ -1218,7 +1218,7 @@ class BannerView extends StatelessWidget { arguments: {"vendorModel": vendorModel}, ); } else if (bannerModel.redirect_type == "product") { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); ProductModel? productModel = await FireStoreUtils.getProductById( bannerModel.redirect_id.toString(), @@ -1237,7 +1237,7 @@ class BannerView extends StatelessWidget { if (await canLaunchUrl(uri)) { await launchUrl(uri); } else { - ShowToastDialog.showToast("Could not launch".tr()); + ShowToastDialog.showToast("Could not launch".tr); } } }, @@ -1288,7 +1288,7 @@ class StoryView extends StatelessWidget { children: [ Expanded( child: Text( - "Stories".tr(), + "Stories".tr, style: TextStyle( fontFamily: AppThemeData.semiBold, color: @@ -1302,7 +1302,7 @@ class StoryView extends StatelessWidget { ], ), GradientText( - 'Best Food Stories Ever'.tr(), + 'Best Food Stories Ever'.tr, style: TextStyle( fontSize: 24, fontFamily: 'Inter Tight', @@ -1370,7 +1370,7 @@ class StoryView extends StatelessWidget { if (snapshot.hasError) { return Center( child: Text( - '${"Error".tr()}: ${snapshot.error}', + '${"Error".tr}: ${snapshot.error}', ), ); } else if (snapshot.data == null) { @@ -1423,7 +1423,7 @@ class StoryView extends StatelessWidget { ), const SizedBox(width: 5), Text( - "${Constant.calculateReview(reviewCount: vendorModel.reviewsCount.toString(), reviewSum: vendorModel.reviewsSum!.toStringAsFixed(0))} ${'reviews'.tr()}", + "${Constant.calculateReview(reviewCount: vendorModel.reviewsCount.toString(), reviewSum: vendorModel.reviewsSum!.toStringAsFixed(0))} ${'reviews'.tr}", textAlign: TextAlign.center, maxLines: 1, @@ -1491,7 +1491,7 @@ class RestaurantView extends StatelessWidget { children: [ Expanded( child: Text( - "Best Restaurants".tr(), + "Best Restaurants".tr, style: TextStyle( fontFamily: AppThemeData.semiBold, color: @@ -1511,7 +1511,7 @@ class RestaurantView extends StatelessWidget { ); }, child: Text( - "See all".tr(), + "See all".tr, textAlign: TextAlign.center, style: TextStyle( fontFamily: AppThemeData.medium, @@ -1613,7 +1613,7 @@ class RestaurantView extends StatelessWidget { CrossAxisAlignment.center, children: [ Text( - "Upto".tr(), + "Upto".tr, textAlign: TextAlign.center, maxLines: 1, style: TextStyle( @@ -1632,7 +1632,7 @@ class RestaurantView extends StatelessWidget { discountAmountTempList .reduce(min) .toString() + - "% OFF".tr(), + "% OFF".tr, textAlign: TextAlign.center, maxLines: 1, style: TextStyle( @@ -1707,7 +1707,7 @@ class RestaurantView extends StatelessWidget { ), const SizedBox(width: 5), Text( - "Free Delivery".tr(), + "Free Delivery".tr, style: TextStyle( overflow: TextOverflow.ellipsis, diff --git a/lib/screen_ui/multi_vendor_service/home_screen/restaurant_list_screen.dart b/lib/screen_ui/multi_vendor_service/home_screen/restaurant_list_screen.dart index 0b80cd0..706f226 100644 --- a/lib/screen_ui/multi_vendor_service/home_screen/restaurant_list_screen.dart +++ b/lib/screen_ui/multi_vendor_service/home_screen/restaurant_list_screen.dart @@ -4,11 +4,11 @@ import 'package:customer/models/favourite_model.dart'; import 'package:customer/models/vendor_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; -import 'package:easy_localization/easy_localization.dart'; + import '../../../controllers/theme_controller.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../service/fire_store_utils.dart'; import '../../../widget/restaurant_image_view.dart'; import '../restaurant_details_screen/restaurant_details_screen.dart'; @@ -217,7 +217,7 @@ class RestaurantListScreen extends StatelessWidget { width: 5, ), Text( - "Free Delivery".tr(), + "Free Delivery".tr, style: TextStyle( fontSize: 14, color: diff --git a/lib/screen_ui/multi_vendor_service/home_screen/story_view.dart b/lib/screen_ui/multi_vendor_service/home_screen/story_view.dart index 6850c56..8374167 100644 --- a/lib/screen_ui/multi_vendor_service/home_screen/story_view.dart +++ b/lib/screen_ui/multi_vendor_service/home_screen/story_view.dart @@ -5,10 +5,10 @@ import 'package:customer/themes/app_them_data.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:customer/widget/story_view/controller/story_controller.dart'; import 'package:customer/widget/story_view/utils.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../service/fire_store_utils.dart'; import '../../../widget/story_view/widgets/story_view.dart'; import '../restaurant_details_screen/restaurant_details_screen.dart'; @@ -117,7 +117,7 @@ class MoreStoriesState extends State { } else { if (snapshot.hasError) { return Center( - child: Text('${"Error".tr()}: ${snapshot.error}'), + child: Text('${"Error".tr}: ${snapshot.error}'), ); return Center(child: Text('Error: ${snapshot.error}')); } else if (snapshot.data == null) { @@ -167,7 +167,7 @@ class MoreStoriesState extends State { ), const SizedBox(width: 5), Text( - "${Constant.calculateReview(reviewCount: vendorModel.reviewsCount.toString(), reviewSum: vendorModel.reviewsSum.toString())} ${'reviews'.tr()}", + "${Constant.calculateReview(reviewCount: vendorModel.reviewsCount.toString(), reviewSum: vendorModel.reviewsSum.toString())} ${'reviews'.tr}", textAlign: TextAlign.center, maxLines: 1, style: const TextStyle( diff --git a/lib/screen_ui/multi_vendor_service/home_screen/view_all_category_screen.dart b/lib/screen_ui/multi_vendor_service/home_screen/view_all_category_screen.dart index 665f863..f0ddbab 100644 --- a/lib/screen_ui/multi_vendor_service/home_screen/view_all_category_screen.dart +++ b/lib/screen_ui/multi_vendor_service/home_screen/view_all_category_screen.dart @@ -3,9 +3,9 @@ import 'package:customer/controllers/view_all_category_controller.dart'; import 'package:customer/models/vendor_category_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import 'category_restaurant_screen.dart'; @@ -26,7 +26,7 @@ class ViewAllCategoryScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Categories".tr(), + "Categories".tr, style: TextStyle( fontSize: 16, color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, diff --git a/lib/screen_ui/multi_vendor_service/order_list_screen/live_tracking_screen.dart b/lib/screen_ui/multi_vendor_service/order_list_screen/live_tracking_screen.dart index 7c561fd..8ea6cf4 100644 --- a/lib/screen_ui/multi_vendor_service/order_list_screen/live_tracking_screen.dart +++ b/lib/screen_ui/multi_vendor_service/order_list_screen/live_tracking_screen.dart @@ -1,10 +1,10 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/live_tracking_controller.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart' as flutterMap; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart' as gmap; import '../../../controllers/theme_controller.dart'; @@ -29,7 +29,7 @@ class LiveTrackingScreen extends StatelessWidget { appBar: AppBar( backgroundColor: isDark ? AppThemeData.surfaceDark : AppThemeData.surface, - title: Text("Live Tracking".tr()), + title: Text("Live Tracking".tr), centerTitle: false, ), body: diff --git a/lib/screen_ui/multi_vendor_service/order_list_screen/order_details_screen.dart b/lib/screen_ui/multi_vendor_service/order_list_screen/order_details_screen.dart index d322880..e01712e 100644 --- a/lib/screen_ui/multi_vendor_service/order_list_screen/order_details_screen.dart +++ b/lib/screen_ui/multi_vendor_service/order_list_screen/order_details_screen.dart @@ -8,10 +8,10 @@ import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:timelines_plus/timelines_plus.dart'; import '../../../controllers/theme_controller.dart'; @@ -41,7 +41,7 @@ class OrderDetailsScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Order Details".tr(), + "Order Details".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -67,8 +67,8 @@ class OrderDetailsScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "${'Order'.tr()} ${Constant.orderId(orderId: controller.orderModel.value.id.toString())}" - .tr(), + "${'Order'.tr} ${Constant.orderId(orderId: controller.orderModel.value.id.toString())}" + .tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -86,7 +86,7 @@ class OrderDetailsScreen extends StatelessWidget { title: controller.orderModel.value.status .toString() - .tr(), + .tr, color: Constant.statusColor( status: controller.orderModel.value.status @@ -228,7 +228,7 @@ class OrderDetailsScreen extends StatelessWidget { : InkWell( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr(), + "Please wait...".tr, ); UserModel? customer = @@ -497,7 +497,7 @@ class OrderDetailsScreen extends StatelessWidget { onTap: () async { ShowToastDialog.showLoader( "Please wait..." - .tr(), + .tr, ); UserModel? @@ -701,7 +701,7 @@ class OrderDetailsScreen extends StatelessWidget { ), const SizedBox(width: 5), Text( - "Order Delivered.".tr(), + "Order Delivered.".tr, textAlign: TextAlign.right, style: TextStyle( @@ -743,8 +743,8 @@ class OrderDetailsScreen extends StatelessWidget { const SizedBox(width: 5), Expanded( child: Text( - "${'Your Order has been Preparing and assign to the driver'.tr()}\n${'Preparation Time'.tr()} ${controller.orderModel.value.estimatedTimeToPrepare}" - .tr(), + "${'Your Order has been Preparing and assign to the driver'.tr}\n${'Preparation Time'.tr} ${controller.orderModel.value.estimatedTimeToPrepare}" + .tr, textAlign: TextAlign.start, style: TextStyle( @@ -902,8 +902,7 @@ class OrderDetailsScreen extends StatelessWidget { InkWell( onTap: () async { ShowToastDialog.showLoader( - "Please wait..." - .tr(), + "Please wait...".tr, ); UserModel? customer = @@ -1002,7 +1001,7 @@ class OrderDetailsScreen extends StatelessWidget { ), const SizedBox(height: 14), Text( - "Your Order".tr(), + "Your Order".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -1246,7 +1245,7 @@ class OrderDetailsScreen extends StatelessWidget { alignment: Alignment.centerRight, child: RoundedButtonFill( - title: "Rate us".tr(), + title: "Rate us".tr, height: 3.8, width: 20, color: @@ -1298,7 +1297,7 @@ class OrderDetailsScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Variants".tr(), + "Variants".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -1381,7 +1380,7 @@ class OrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Addons".tr(), + "Addons".tr, textAlign: TextAlign.start, style: TextStyle( @@ -1512,7 +1511,7 @@ class OrderDetailsScreen extends StatelessWidget { // crossAxisAlignment: CrossAxisAlignment.start, // children: [ // Text( - // "Delivery Man".tr(), + // "Delivery Man".tr, // textAlign: TextAlign.start, // style: TextStyle( // fontFamily: AppThemeData.semiBold, @@ -1531,7 +1530,7 @@ class OrderDetailsScreen extends StatelessWidget { // ], // ), Text( - "Bill Details".tr(), + "Bill Details".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -1567,7 +1566,7 @@ class OrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Item totals".tr(), + "Item totals".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.regular, @@ -1606,7 +1605,7 @@ class OrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Delivery Fee".tr(), + "Delivery Fee".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -1626,7 +1625,7 @@ class OrderDetailsScreen extends StatelessWidget { ?.isSelfDelivery == true) ? Text( - 'Free Delivery'.tr(), + 'Free Delivery'.tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -1684,7 +1683,7 @@ class OrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Coupon Discount".tr(), + "Coupon Discount".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.regular, @@ -1726,7 +1725,7 @@ class OrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Special Discount".tr(), + "Special Discount".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -1781,7 +1780,7 @@ class OrderDetailsScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Delivery Tips".tr(), + "Delivery Tips".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -1913,7 +1912,7 @@ class OrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - "To Pay".tr(), + "To Pay".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.regular, @@ -1949,7 +1948,7 @@ class OrderDetailsScreen extends StatelessWidget { ), const SizedBox(height: 14), Text( - "Order Details".tr(), + "Order Details".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -1985,7 +1984,7 @@ class OrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Delivery type".tr(), + "Delivery type".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.regular, @@ -2000,14 +1999,14 @@ class OrderDetailsScreen extends StatelessWidget { Text( controller.orderModel.value.takeAway == true - ? "TakeAway".tr() + ? "TakeAway".tr : controller .orderModel .value .scheduleTime == null - ? "Standard".tr() - : "Schedule".tr(), + ? "Standard".tr + : "Schedule".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -2033,7 +2032,7 @@ class OrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Payment Method".tr(), + "Payment Method".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.regular, @@ -2070,7 +2069,7 @@ class OrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Date and Time".tr(), + "Date and Time".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.regular, @@ -2112,7 +2111,7 @@ class OrderDetailsScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Phone Number".tr(), + "Phone Number".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: @@ -2159,7 +2158,7 @@ class OrderDetailsScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Remarks".tr(), + "Remarks".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -2228,7 +2227,7 @@ class OrderDetailsScreen extends StatelessWidget { controller.orderModel.value.status == Constant.orderInTransit ? RoundedButtonFill( - title: "Track Order".tr(), + title: "Track Order".tr, height: 5.5, color: AppThemeData.warning300, textColor: AppThemeData.grey900, @@ -2242,7 +2241,7 @@ class OrderDetailsScreen extends StatelessWidget { }, ) : RoundedButtonFill( - title: "Reorder".tr(), + title: "Reorder".tr, height: 5.5, color: AppThemeData.primary300, textColor: AppThemeData.grey50, @@ -2256,7 +2255,7 @@ class OrderDetailsScreen extends StatelessWidget { cartProductModel: element, ); ShowToastDialog.showToast( - "Item Added In a cart".tr(), + "Item Added In a cart".tr, ); } }, diff --git a/lib/screen_ui/multi_vendor_service/order_list_screen/order_screen.dart b/lib/screen_ui/multi_vendor_service/order_list_screen/order_screen.dart index 5853553..3e3cdaa 100644 --- a/lib/screen_ui/multi_vendor_service/order_list_screen/order_screen.dart +++ b/lib/screen_ui/multi_vendor_service/order_list_screen/order_screen.dart @@ -5,10 +5,11 @@ import 'package:customer/models/order_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_fill.dart'; +import 'package:customer/utils/app_router.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../themes/show_toast_dialog.dart'; import '../../../widget/my_separator.dart'; @@ -44,7 +45,7 @@ class OrderScreen extends StatelessWidget { Image.asset("assets/images/login.gif", height: 120), const SizedBox(height: 12), Text( - "Please Log In to Continue".tr(), + "Please Log In to Continue".tr, style: TextStyle( color: isDark @@ -57,7 +58,7 @@ class OrderScreen extends StatelessWidget { const SizedBox(height: 5), Text( "You’re not logged in. Please sign in to access your account and explore all features." - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -70,7 +71,7 @@ class OrderScreen extends StatelessWidget { ), const SizedBox(height: 20), RoundedButtonFill( - title: "Log in".tr(), + title: "Log in".tr, width: 55, height: 5.5, color: AppThemeData.primary300, @@ -96,7 +97,7 @@ class OrderScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "My Order".tr(), + "My Order".tr, style: TextStyle( fontSize: 24, color: @@ -109,7 +110,7 @@ class OrderScreen extends StatelessWidget { ), Text( "Keep track your delivered, In Progress and Rejected item all in just one place." - .tr(), + .tr, style: TextStyle( color: isDark @@ -171,12 +172,12 @@ class OrderScreen extends StatelessWidget { padding: const EdgeInsets.symmetric( horizontal: 18, ), - child: Tab(text: 'All'.tr()), + child: Tab(text: 'All'.tr), ), - Tab(text: 'In Progress'.tr()), - Tab(text: 'Delivered'.tr()), - Tab(text: 'Cancelled'.tr()), - Tab(text: 'Rejected'.tr()), + Tab(text: 'In Progress'.tr), + Tab(text: 'Delivered'.tr), + Tab(text: 'Cancelled'.tr), + Tab(text: 'Rejected'.tr), ], ), ), @@ -186,7 +187,7 @@ class OrderScreen extends StatelessWidget { children: [ controller.allList.isEmpty ? Constant.showEmptyView( - message: "Order Not Found".tr(), + message: "Order Not Found".tr, ) : RefreshIndicator( onRefresh: @@ -210,7 +211,7 @@ class OrderScreen extends StatelessWidget { ), controller.inProgressList.isEmpty ? Constant.showEmptyView( - message: "Order Not Found".tr(), + message: "Order Not Found".tr, ) : RefreshIndicator( onRefresh: @@ -237,7 +238,7 @@ class OrderScreen extends StatelessWidget { ), controller.deliveredList.isEmpty ? Constant.showEmptyView( - message: "Order Not Found".tr(), + message: "Order Not Found".tr, ) : RefreshIndicator( onRefresh: @@ -264,7 +265,7 @@ class OrderScreen extends StatelessWidget { ), controller.cancelledList.isEmpty ? Constant.showEmptyView( - message: "Order Not Found".tr(), + message: "Order Not Found".tr, ) : RefreshIndicator( onRefresh: @@ -291,7 +292,7 @@ class OrderScreen extends StatelessWidget { ), controller.rejectedList.isEmpty ? Constant.showEmptyView( - message: "Order Not Found".tr(), + message: "Order Not Found".tr, ) : RefreshIndicator( onRefresh: @@ -498,12 +499,12 @@ class OrderScreen extends StatelessWidget { for (var element in orderModel.products!) { controller.addToCart(cartProductModel: element); ShowToastDialog.showToast( - "Item Added In a cart".tr(), + "Item Added In a cart".tr, ); } }, child: Text( - "Reorder".tr(), + "Reorder".tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -528,7 +529,7 @@ class OrderScreen extends StatelessWidget { ); }, child: Text( - "Track Order".tr(), + "Track Order".tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -553,7 +554,7 @@ class OrderScreen extends StatelessWidget { // Get.off(const OrderPlacingScreen(), arguments: {"orderModel": orderModel}); }, child: Text( - "View Details".tr(), + "View Details".tr, textAlign: TextAlign.center, style: TextStyle( color: diff --git a/lib/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart b/lib/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart index f725837..5e73807 100644 --- a/lib/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart +++ b/lib/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart @@ -5,7 +5,8 @@ import 'package:customer/screen_ui/on_demand_service/worker_inbox_screen.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/custom_dialog_box.dart'; import 'package:customer/themes/responsive.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:in_app_review/in_app_review.dart'; import '../../../controllers/theme_controller.dart'; import '../../../service/fire_store_utils.dart'; @@ -24,7 +25,7 @@ import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:share_plus/share_plus.dart'; import '../terms_and_condition/terms_and_condition_screen.dart'; @@ -54,7 +55,7 @@ class ProfileScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "My Profile".tr(), + "My Profile".tr, style: TextStyle( fontSize: 24, color: @@ -67,7 +68,7 @@ class ProfileScreen extends StatelessWidget { ), Text( "Manage your personal information, preferences, and settings all in one place." - .tr(), + .tr, style: TextStyle( fontSize: 16, color: @@ -80,7 +81,7 @@ class ProfileScreen extends StatelessWidget { ), const SizedBox(height: 20), Text( - "General Information".tr(), + "General Information".tr, style: TextStyle( fontSize: 12, color: @@ -116,7 +117,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/images/ic_profile.svg", - "Profile Information".tr(), + "Profile Information".tr, () { Get.to(const EditProfileScreen()); }, @@ -129,7 +130,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/images/ic_dinin.svg", - "Dine-In".tr(), + "Dine-In".tr, () { Get.to(const DineInScreen()); }, @@ -138,7 +139,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/images/ic_gift.svg", - "Gift Card".tr(), + "Gift Card".tr, () { Get.to(const GiftCardScreen()); }, @@ -148,7 +149,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_cashback_Offer.svg", - "Cashback Offers".tr(), + "Cashback Offers".tr, () { Get.to( const CashbackOffersListScreen(), @@ -165,7 +166,7 @@ class ProfileScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Bookings Information".tr(), + "Bookings Information".tr, style: TextStyle( fontSize: 12, color: @@ -199,7 +200,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_dinin_order.svg", - "Dine-In Booking".tr(), + "Dine-In Booking".tr, () { Get.to( const DineInBookingScreen(), @@ -215,7 +216,7 @@ class ProfileScreen extends StatelessWidget { : const SizedBox(), const SizedBox(height: 10), Text( - "Preferences".tr(), + "Preferences".tr, style: TextStyle( fontSize: 12, color: @@ -249,7 +250,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_change_language.svg", - "Change Language".tr(), + "Change Language".tr, () { Get.to(const ChangeLanguageScreen()); }, @@ -258,7 +259,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_light_dark.svg", - "Dark Mode".tr(), + "Dark Mode".tr, () {}, ), ], @@ -267,7 +268,7 @@ class ProfileScreen extends StatelessWidget { ), const SizedBox(height: 10), Text( - "Social".tr(), + "Social".tr, style: TextStyle( fontSize: 12, color: @@ -303,7 +304,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_refer.svg", - "Refer a Friend".tr(), + "Refer a Friend".tr, () { Get.to(const ReferFriendScreen()); }, @@ -312,11 +313,11 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_share.svg", - "Share app".tr(), + "Share app".tr, () { Share.share( - '${'Check out Foodie, your ultimate food delivery application!'.tr()} \n\n${'Google Play:'.tr()} ${Constant.googlePlayLink} \n\n${'App Store:'.tr()} ${Constant.appStoreLink}', - subject: 'Look what I made!'.tr(), + '${'Check out Foodie, your ultimate food delivery application!'.tr} \n\n${'Google Play:'.tr} ${Constant.googlePlayLink} \n\n${'App Store:'.tr} ${Constant.appStoreLink}', + subject: 'Look what I made!'.tr, ); }, ), @@ -324,7 +325,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_rate.svg", - "Rate the app".tr(), + "Rate the app".tr, () { final InAppReview inAppReview = InAppReview.instance; @@ -342,7 +343,7 @@ class ProfileScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Communication".tr(), + "Communication".tr, style: TextStyle( fontSize: 12, color: @@ -376,7 +377,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_restaurant_chat.svg", - "Store Inbox".tr(), + "Store Inbox".tr, () { Get.to( const RestaurantInboxScreen(), @@ -387,7 +388,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_restaurant_driver.svg", - "Driver Inbox".tr(), + "Driver Inbox".tr, () { Get.to(const DriverInboxScreen()); }, @@ -396,7 +397,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_restaurant_chat.svg", - "Provider Inbox".tr(), + "Provider Inbox".tr, () { Get.to( const ProviderInboxScreen(), @@ -407,7 +408,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_restaurant_driver.svg", - "Worker Inbox".tr(), + "Worker Inbox".tr, () { Get.to(const WorkerInboxScreen()); }, @@ -420,7 +421,7 @@ class ProfileScreen extends StatelessWidget { ], ), Text( - "Legal".tr(), + "Legal".tr, style: TextStyle( fontSize: 12, color: @@ -454,7 +455,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_privacy_policy.svg", - "Privacy Policy".tr(), + "Privacy Policy".tr, () { Get.to( const TermsAndConditionScreen( @@ -467,7 +468,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_tearm_condition.svg", - "Terms and Conditions".tr(), + "Terms and Conditions".tr, () { Get.to( const TermsAndConditionScreen( @@ -505,7 +506,7 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_logout.svg", - "Log In".tr(), + "Log In".tr, () { Get.offAll(const LoginScreen()); }, @@ -514,18 +515,18 @@ class ProfileScreen extends StatelessWidget { isDark, controller, "assets/icons/ic_logout.svg", - "Log out".tr(), + "Log out".tr, () { showDialog( context: context, builder: (BuildContext context) { return CustomDialogBox( - title: "Log out".tr(), + title: "Log out".tr, descriptions: "Are you sure you want to log out? You will need to enter your credentials to log back in." - .tr(), - positiveString: "Log out".tr(), - negativeString: "Cancel".tr(), + .tr, + positiveString: "Log out".tr, + negativeString: "Cancel".tr, positiveClick: () async { Constant.userModel!.fcmToken = ""; @@ -569,15 +570,15 @@ class ProfileScreen extends StatelessWidget { context: context, builder: (BuildContext context) { return CustomDialogBox( - title: "Delete Account".tr(), + title: "Delete Account".tr, descriptions: "Are you sure you want to delete your account? This action is irreversible and will permanently remove all your data." - .tr(), - positiveString: "Delete".tr(), - negativeString: "Cancel".tr(), + .tr, + positiveString: "Delete".tr, + negativeString: "Cancel".tr, positiveClick: () async { ShowToastDialog.showLoader( - "Please wait...".tr(), + "Please wait...".tr, ); await controller .deleteUserFromServer(); @@ -588,12 +589,12 @@ class ProfileScreen extends StatelessWidget { if (value == true) { ShowToastDialog.showToast( "Account deleted successfully" - .tr(), + .tr, ); Get.offAll(const LoginScreen()); } else { ShowToastDialog.showToast( - "Contact Administrator".tr(), + "Contact Administrator".tr, ); } }); @@ -620,7 +621,7 @@ class ProfileScreen extends StatelessWidget { ), const SizedBox(width: 10), Text( - "Delete Account".tr(), + "Delete Account".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -679,7 +680,7 @@ class ProfileScreen extends StatelessWidget { SvgPicture.asset( image, colorFilter: - title == "Log In".tr() || title == "Cashbacks".tr() + title == "Log In".tr || title == "Cashbacks".tr ? const ColorFilter.mode( AppThemeData.success500, BlendMode.srcIn, @@ -691,15 +692,15 @@ class ProfileScreen extends StatelessWidget { const SizedBox(width: 10), Expanded( child: Text( - title.tr(), + title.tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, fontSize: 16, color: - title == "Log out".tr() + title == "Log out".tr ? AppThemeData.danger300 - : title == "Log In".tr() + : title == "Log In".tr ? AppThemeData.success500 : (isDark ? AppThemeData.grey100 @@ -707,7 +708,7 @@ class ProfileScreen extends StatelessWidget { ), ), ), - title == "Dark Mode".tr() + title == "Dark Mode".tr ? Transform.scale( scale: 0.8, child: Obx( diff --git a/lib/screen_ui/multi_vendor_service/rate_us_screen/rate_product_screen.dart b/lib/screen_ui/multi_vendor_service/rate_us_screen/rate_product_screen.dart index 3dfc208..5902970 100644 --- a/lib/screen_ui/multi_vendor_service/rate_us_screen/rate_product_screen.dart +++ b/lib/screen_ui/multi_vendor_service/rate_us_screen/rate_product_screen.dart @@ -6,11 +6,11 @@ import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_rating_bar/flutter_rating_bar.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:image_picker/image_picker.dart'; import '../../../controllers/theme_controller.dart'; @@ -35,7 +35,7 @@ class RateProductScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Rate the item".tr(), + "Rate the item".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -75,7 +75,7 @@ class RateProductScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Rate for".tr(), + "Rate for".tr, style: TextStyle( color: isDark @@ -86,8 +86,7 @@ class RateProductScreen extends StatelessWidget { ), ), Text( - "${controller.productModel.value.name}" - .tr(), + "${controller.productModel.value.name}".tr, style: TextStyle( color: isDark @@ -249,7 +248,7 @@ class RateProductScreen extends StatelessWidget { const SizedBox(height: 10), Text( "Choose a image and upload here" - .tr(), + .tr, style: TextStyle( color: isDark @@ -261,7 +260,7 @@ class RateProductScreen extends StatelessWidget { ), const SizedBox(height: 5), Text( - "JPEG, PNG".tr(), + "JPEG, PNG".tr, style: TextStyle( fontSize: 12, color: @@ -274,7 +273,7 @@ class RateProductScreen extends StatelessWidget { ), const SizedBox(height: 10), RoundedButtonFill( - title: "Brows Image".tr(), + title: "Brows Image".tr, color: AppThemeData.primary50, width: 30, height: 5, @@ -423,7 +422,7 @@ class RateProductScreen extends StatelessWidget { enabledBorder: InputBorder.none, errorBorder: InputBorder.none, border: InputBorder.none, - hintText: "Type comment".tr(), + hintText: "Type comment".tr, hintStyle: TextStyle( fontSize: 14, color: @@ -449,7 +448,7 @@ class RateProductScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.only(bottom: 20), child: RoundedButtonFill( - title: "Submit Review".tr(), + title: "Submit Review".tr, height: 5.5, color: AppThemeData.primary300, textColor: AppThemeData.grey50, @@ -483,7 +482,7 @@ class RateProductScreen extends StatelessWidget { Padding( padding: const EdgeInsets.only(top: 15), child: Text( - "Please Select".tr(), + "Please Select".tr, style: TextStyle( color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, @@ -510,7 +509,7 @@ class RateProductScreen extends StatelessWidget { ), Padding( padding: const EdgeInsets.only(top: 3), - child: Text("Camera".tr()), + child: Text("Camera".tr), ), ], ), @@ -533,7 +532,7 @@ class RateProductScreen extends StatelessWidget { ), Padding( padding: const EdgeInsets.only(top: 3), - child: Text("Gallery".tr()), + child: Text("Gallery".tr), ), ], ), diff --git a/lib/screen_ui/multi_vendor_service/refer_friend_screen/refer_friend_screen.dart b/lib/screen_ui/multi_vendor_service/refer_friend_screen/refer_friend_screen.dart index 799ae8c..f2ce0e2 100644 --- a/lib/screen_ui/multi_vendor_service/refer_friend_screen/refer_friend_screen.dart +++ b/lib/screen_ui/multi_vendor_service/refer_friend_screen/refer_friend_screen.dart @@ -3,11 +3,11 @@ import 'package:customer/controllers/refer_friend_controller.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_fill.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:share_plus/share_plus.dart'; import '../../../controllers/theme_controller.dart'; @@ -66,7 +66,7 @@ class ReferFriendScreen extends StatelessWidget { ), const SizedBox(height: 10), Text( - "Refer your friend and earn".tr(), + "Refer your friend and earn".tr, style: TextStyle( fontSize: 22, color: @@ -79,7 +79,7 @@ class ReferFriendScreen extends StatelessWidget { ), const SizedBox(width: 4), Text( - "${Constant.amountShow(amount: Constant.sectionConstantModel!.referralAmount)} ${'Each🎉'.tr()}", + "${Constant.amountShow(amount: Constant.sectionConstantModel!.referralAmount)} ${'Each🎉'.tr}", style: TextStyle( fontSize: 24, color: @@ -92,7 +92,7 @@ class ReferFriendScreen extends StatelessWidget { ), const SizedBox(height: 32), Text( - "Invite Friends & Businesses".tr(), + "Invite Friends & Businesses".tr, style: TextStyle( fontSize: 16, color: @@ -105,8 +105,8 @@ class ReferFriendScreen extends StatelessWidget { ), const SizedBox(height: 8), Text( - "${'Invite your friends to sign up with Foodie using your code, and you’ll earn'.tr()} ${Constant.amountShow(amount: Constant.sectionConstantModel!.referralAmount)} ${'after their Success the first order! 💸🍔'.tr()}" - .tr(), + "${'Invite your friends to sign up with Foodie using your code, and you’ll earn'.tr} ${Constant.amountShow(amount: Constant.sectionConstantModel!.referralAmount)} ${'after their Success the first order! 💸🍔'.tr}" + .tr, textAlign: TextAlign.center, style: TextStyle( fontSize: 16, @@ -180,7 +180,7 @@ class ReferFriendScreen extends StatelessWidget { ), ); ShowToastDialog.showToast( - "Copied".tr(), + "Copied".tr, ); }, child: const Icon( @@ -214,7 +214,7 @@ class ReferFriendScreen extends StatelessWidget { vertical: 30, ), child: Text( - "or".tr(), + "or".tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -241,13 +241,13 @@ class ReferFriendScreen extends StatelessWidget { ), ), RoundedButtonFill( - title: "Share Code".tr(), + title: "Share Code".tr, width: 55, color: AppThemeData.ecommerce300, textColor: AppThemeData.grey50, onPress: () async { await Share.share( - "${"Hey there, thanks for choosing Foodie. Hope you love our product. If you do, share it with your friends using code".tr()} ${controller.referralModel.value.referralCode.toString()} ${"and get".tr()}${Constant.amountShow(amount: Constant.sectionConstantModel!.referralAmount.toString())} ${"when order completed".tr()}", + "${"Hey there, thanks for choosing Foodie. Hope you love our product. If you do, share it with your friends using code".tr} ${controller.referralModel.value.referralCode.toString()} ${"and get".tr}${Constant.amountShow(amount: Constant.sectionConstantModel!.referralAmount.toString())} ${"when order completed".tr}", ); }, ), diff --git a/lib/screen_ui/multi_vendor_service/restaurant_details_screen/restaurant_details_screen.dart b/lib/screen_ui/multi_vendor_service/restaurant_details_screen/restaurant_details_screen.dart index 0112d26..c7b9011 100644 --- a/lib/screen_ui/multi_vendor_service/restaurant_details_screen/restaurant_details_screen.dart +++ b/lib/screen_ui/multi_vendor_service/restaurant_details_screen/restaurant_details_screen.dart @@ -13,11 +13,11 @@ import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/text_field_widget.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../service/fire_store_utils.dart'; import '../../../themes/show_toast_dialog.dart'; @@ -52,7 +52,7 @@ class RestaurantDetailsScreen extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - '${cartItem.length} ${"items".tr()}', + '${cartItem.length} ${"items".tr}', style: TextStyle( fontFamily: AppThemeData.medium, color: AppThemeData.grey50, @@ -60,7 +60,7 @@ class RestaurantDetailsScreen extends StatelessWidget { ), ), Text( - 'View Cart'.tr(), + 'View Cart'.tr, style: TextStyle( fontFamily: AppThemeData.semiBold, color: AppThemeData.grey50, @@ -124,7 +124,7 @@ class RestaurantDetailsScreen extends StatelessWidget { ), const SizedBox(width: 5), Text( - "Free Delivery".tr(), + "Free Delivery".tr, style: TextStyle( fontSize: 14, color: AppThemeData.carRent600, @@ -484,7 +484,7 @@ class RestaurantDetailsScreen extends StatelessWidget { ); }, child: Text( - "${controller.vendorModel.value.reviewsCount} ${'Ratings'.tr()}", + "${controller.vendorModel.value.reviewsCount} ${'Ratings'.tr}", style: TextStyle( decoration: TextDecoration.underline, @@ -510,8 +510,8 @@ class RestaurantDetailsScreen extends StatelessWidget { children: [ Text( controller.isOpen.value - ? "Open".tr() - : "Close".tr(), + ? "Open".tr + : "Close".tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -547,7 +547,7 @@ class RestaurantDetailsScreen extends StatelessWidget { .isEmpty) { ShowToastDialog.showToast( "Timing is not added by store" - .tr(), + .tr, ); } else { timeShowBottomSheet( @@ -557,7 +557,7 @@ class RestaurantDetailsScreen extends StatelessWidget { } }, child: Text( - "View Timings".tr(), + "View Timings".tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -600,7 +600,7 @@ class RestaurantDetailsScreen extends StatelessWidget { const SizedBox(height: 20), Text( "Also applicable on table booking" - .tr(), + .tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -673,8 +673,7 @@ class RestaurantDetailsScreen extends StatelessWidget { .start, children: [ Text( - "Table Booking" - .tr(), + "Table Booking".tr, style: TextStyle( fontSize: 16, color: @@ -693,7 +692,7 @@ class RestaurantDetailsScreen extends StatelessWidget { ), Text( "Quick Conformations" - .tr(), + .tr, style: TextStyle( fontSize: 12, color: @@ -729,7 +728,7 @@ class RestaurantDetailsScreen extends StatelessWidget { children: [ const SizedBox(height: 20), Text( - "Additional Offers".tr(), + "Additional Offers".tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -751,7 +750,7 @@ class RestaurantDetailsScreen extends StatelessWidget { ), const SizedBox(height: 20), Text( - "Menu".tr(), + "Menu".tr, textAlign: TextAlign.start, maxLines: 1, style: TextStyle( @@ -771,8 +770,7 @@ class RestaurantDetailsScreen extends StatelessWidget { controller .searchEditingController .value, - hintText: - 'Search the item and more...'.tr(), + hintText: 'Search the item and more...'.tr, onchange: (value) { controller.searchProduct(value); }, @@ -866,7 +864,7 @@ class RestaurantDetailsScreen extends StatelessWidget { ), const SizedBox(width: 8), Text( - 'Veg'.tr(), + 'Veg'.tr, style: TextStyle( color: isDark @@ -962,7 +960,7 @@ class RestaurantDetailsScreen extends StatelessWidget { ), const SizedBox(width: 8), Text( - 'Non Veg'.tr(), + 'Non Veg'.tr, style: TextStyle( color: isDark @@ -1372,7 +1370,7 @@ class CouponListView extends StatelessWidget { Clipboard.setData( ClipboardData(text: offerModel.code.toString()), ).then((value) { - ShowToastDialog.showToast("Copied".tr()); + ShowToastDialog.showToast("Copied".tr); }); }, child: Row( @@ -1573,8 +1571,8 @@ class ProductListView extends StatelessWidget { const SizedBox(width: 5), Text( productModel.nonveg == true - ? "Non Veg.".tr() - : "Pure veg.".tr(), + ? "Non Veg.".tr + : "Pure veg.".tr, style: TextStyle( color: productModel.nonveg == true @@ -1709,7 +1707,7 @@ class ProductListView extends StatelessWidget { ), const SizedBox(width: 8), Text( - "Info".tr(), + "Info".tr, maxLines: 2, style: TextStyle( overflow: TextOverflow.ellipsis, @@ -1833,7 +1831,7 @@ class ProductListView extends StatelessWidget { .addOnsTitle! .isNotEmpty) ? RoundedButtonFill( - title: "Add".tr(), + title: "Add".tr, width: 10, height: 4, color: @@ -2121,7 +2119,7 @@ class ProductListView extends StatelessWidget { } else { ShowToastDialog.showToast( "Out of stock" - .tr(), + .tr, ); } }, @@ -2139,7 +2137,7 @@ class ProductListView extends StatelessWidget { ), ) : RoundedButtonFill( - title: "Add".tr(), + title: "Add".tr, width: 10, height: 4, color: @@ -2173,7 +2171,7 @@ class ProductListView extends StatelessWidget { } else { ShowToastDialog.showToast( "Out of stock" - .tr(), + .tr, ); } }, @@ -2245,7 +2243,7 @@ class ProductListView extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Product Information's".tr(), + "Product Information's".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.bold, @@ -2282,7 +2280,7 @@ class ProductListView extends StatelessWidget { children: [ Expanded( child: Text( - "Gram".tr(), + "Gram".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.regular, @@ -2319,7 +2317,7 @@ class ProductListView extends StatelessWidget { children: [ Expanded( child: Text( - "Calories".tr(), + "Calories".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.regular, @@ -2356,7 +2354,7 @@ class ProductListView extends StatelessWidget { children: [ Expanded( child: Text( - "Proteins".tr(), + "Proteins".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.regular, @@ -2393,7 +2391,7 @@ class ProductListView extends StatelessWidget { children: [ Expanded( child: Text( - "Fats".tr(), + "Fats".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.regular, @@ -2429,7 +2427,7 @@ class ProductListView extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Specification".tr(), + "Specification".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -2497,7 +2495,7 @@ class ProductListView extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Brand".tr(), + "Brand".tr, textAlign: TextAlign.start, style: TextStyle( fontWeight: FontWeight.w700, @@ -2528,7 +2526,7 @@ class ProductListView extends StatelessWidget { : const SizedBox(), const SizedBox(height: 20), RoundedButtonFill( - title: "Back".tr(), + title: "Back".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () async { @@ -2788,7 +2786,7 @@ class ProductDetailsView extends StatelessWidget { ), child: Text( "Required • Select any 1 option" - .tr(), + .tr, style: TextStyle( fontSize: 12, overflow: TextOverflow.ellipsis, @@ -3031,7 +3029,7 @@ class ProductDetailsView extends StatelessWidget { horizontal: 12, ), child: Text( - "Addons".tr(), + "Addons".tr, style: TextStyle( fontSize: 16, overflow: TextOverflow.ellipsis, @@ -3207,9 +3205,7 @@ class ProductDetailsView extends StatelessWidget { controller.quantity.value += 1; controller.update(); } else { - ShowToastDialog.showToast( - "Out of stock".tr(), - ); + ShowToastDialog.showToast("Out of stock".tr); } } else { int totalQuantity = int.parse( @@ -3230,9 +3226,7 @@ class ProductDetailsView extends StatelessWidget { controller.quantity.value += 1; controller.update(); } else { - ShowToastDialog.showToast( - "Out of stock".tr(), - ); + ShowToastDialog.showToast("Out of stock".tr); } } }, @@ -3253,8 +3247,8 @@ class ProductDetailsView extends StatelessWidget { flex: 2, child: RoundedButtonFill( title: - "${'Add item'.tr()} ${Constant.amountShow(amount: controller.calculatePrice(productModel))}" - .tr(), + "${'Add item'.tr} ${Constant.amountShow(amount: controller.calculatePrice(productModel))}" + .tr, height: 5.5, color: AppThemeData.primary300, textColor: AppThemeData.grey50, diff --git a/lib/screen_ui/multi_vendor_service/review_list_screen/review_list_screen.dart b/lib/screen_ui/multi_vendor_service/review_list_screen/review_list_screen.dart index 27fa696..0150348 100644 --- a/lib/screen_ui/multi_vendor_service/review_list_screen/review_list_screen.dart +++ b/lib/screen_ui/multi_vendor_service/review_list_screen/review_list_screen.dart @@ -6,12 +6,12 @@ import 'package:customer/models/rating_model.dart'; import 'package:customer/models/review_attribute_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter_rating_bar/flutter_rating_bar.dart'; import '../../../controllers/theme_controller.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../service/fire_store_utils.dart'; import '../chat_screens/full_screen_image_viewer.dart'; @@ -34,7 +34,7 @@ class ReviewListScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Reviews".tr(), + "Reviews".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -47,7 +47,7 @@ class ReviewListScreen extends StatelessWidget { controller.isLoading.value ? Constant.loader() : controller.ratingList.isEmpty - ? Constant.showEmptyView(message: "No Review found".tr()) + ? Constant.showEmptyView(message: "No Review found".tr) : Padding( padding: const EdgeInsets.symmetric( horizontal: 16, @@ -121,7 +121,7 @@ class ReviewListScreen extends StatelessWidget { snapshot.data!.data()!, ); return Text( - '${'Rate for'.tr()} - ${model.name ?? ''}', + '${'Rate for'.tr} - ${model.name ?? ''}', style: TextStyle( color: isDark diff --git a/lib/screen_ui/multi_vendor_service/scan_qrcode_screen/scan_qr_code_screen.dart b/lib/screen_ui/multi_vendor_service/scan_qrcode_screen/scan_qr_code_screen.dart index 2a63623..56ce1ca 100644 --- a/lib/screen_ui/multi_vendor_service/scan_qrcode_screen/scan_qr_code_screen.dart +++ b/lib/screen_ui/multi_vendor_service/scan_qrcode_screen/scan_qr_code_screen.dart @@ -1,9 +1,9 @@ import 'package:customer/controllers/scan_qr_code_controller.dart'; import 'package:customer/models/vendor_model.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:qr_code_dart_scan/qr_code_dart_scan.dart'; import '../../../controllers/theme_controller.dart'; @@ -27,7 +27,7 @@ class ScanQrCodeScreen extends StatelessWidget { backgroundColor: isDark ? AppThemeData.surfaceDark : AppThemeData.surface, title: Text( - "Scan QR Code".tr(), + "Scan QR Code".tr, style: TextStyle( fontSize: 16, color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, @@ -42,13 +42,13 @@ class ScanQrCodeScreen extends StatelessWidget { // if TypeScan.takePicture will try decode when click to take a picture(default TypeScan.live) onCapture: (Result result) { Get.back(); - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); if (controller.allNearestRestaurant.isNotEmpty) { if (controller.allNearestRestaurant .where((vendor) => vendor.id == result.text) .isEmpty) { ShowToastDialog.closeLoader(); - ShowToastDialog.showToast("Store is not available".tr()); + ShowToastDialog.showToast("Store is not available".tr); return; } VendorModel storeModel = controller.allNearestRestaurant @@ -61,7 +61,7 @@ class ScanQrCodeScreen extends StatelessWidget { ); } else { Get.back(); - ShowToastDialog.showToast("Store is not available".tr()); + ShowToastDialog.showToast("Store is not available".tr); } }, ), diff --git a/lib/screen_ui/multi_vendor_service/search_screen/search_screen.dart b/lib/screen_ui/multi_vendor_service/search_screen/search_screen.dart index 0968a8b..b1992ab 100644 --- a/lib/screen_ui/multi_vendor_service/search_screen/search_screen.dart +++ b/lib/screen_ui/multi_vendor_service/search_screen/search_screen.dart @@ -5,12 +5,12 @@ import 'package:customer/models/vendor_model.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/text_field_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import '../../../controllers/theme_controller.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../service/fire_store_utils.dart'; import '../../../widget/restaurant_image_view.dart'; import '../restaurant_details_screen/restaurant_details_screen.dart'; @@ -37,7 +37,7 @@ class SearchScreen extends StatelessWidget { ) == true ? "Find your favorite products and nearby stores" - : "Search Item & Store".tr(), + : "Search Item & Store".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -55,8 +55,8 @@ class SearchScreen extends StatelessWidget { ?.toLowerCase() .contains('restaurants') == true - ? 'Find your favorite products and nearby stores'.tr() - : 'Search the store and item'.tr(), + ? 'Find your favorite products and nearby stores'.tr + : 'Search the store and item'.tr, prefix: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: SvgPicture.asset("assets/icons/ic_search.svg"), @@ -87,7 +87,7 @@ class SearchScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Store".tr(), + "Store".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -230,7 +230,7 @@ class SearchScreen extends StatelessWidget { ), Text( "Free Delivery" - .tr(), + .tr, style: TextStyle( fontSize: 14, color: @@ -427,7 +427,7 @@ class SearchScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Items".tr(), + "Items".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -526,9 +526,9 @@ class SearchScreen extends StatelessWidget { productModel.nonveg == true ? "Non Veg." - .tr() + .tr : "Pure veg." - .tr(), + .tr, style: TextStyle( color: productModel.nonveg == diff --git a/lib/screen_ui/multi_vendor_service/terms_and_condition/terms_and_condition_screen.dart b/lib/screen_ui/multi_vendor_service/terms_and_condition/terms_and_condition_screen.dart index f1ded87..fab46d9 100644 --- a/lib/screen_ui/multi_vendor_service/terms_and_condition/terms_and_condition_screen.dart +++ b/lib/screen_ui/multi_vendor_service/terms_and_condition/terms_and_condition_screen.dart @@ -1,8 +1,8 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:flutter_html/flutter_html.dart'; import '../../../controllers/theme_controller.dart'; @@ -32,7 +32,7 @@ class TermsAndConditionScreen extends StatelessWidget { ), ), title: Text( - type == "privacy" ? "Privacy Policy".tr() : "Terms & Conditions".tr(), + type == "privacy" ? "Privacy Policy".tr : "Terms & Conditions".tr, style: TextStyle( color: isDark ? AppThemeData.grey100 : AppThemeData.grey800, fontFamily: AppThemeData.bold, diff --git a/lib/screen_ui/multi_vendor_service/wallet_screen/payment_list_screen.dart b/lib/screen_ui/multi_vendor_service/wallet_screen/payment_list_screen.dart index 6178b1d..26caea8 100644 --- a/lib/screen_ui/multi_vendor_service/wallet_screen/payment_list_screen.dart +++ b/lib/screen_ui/multi_vendor_service/wallet_screen/payment_list_screen.dart @@ -6,10 +6,10 @@ import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_scr import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/text_field_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../themes/show_toast_dialog.dart'; @@ -30,7 +30,7 @@ class PaymentListScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Top up Wallet".tr(), + "Top up Wallet".tr, style: TextStyle( fontSize: 16, color: isDark ? AppThemeData.grey50 : AppThemeData.grey900, @@ -46,8 +46,8 @@ class PaymentListScreen extends StatelessWidget { Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: TextFieldWidget( - title: 'Amount'.tr(), - hintText: 'Enter Amount'.tr(), + title: 'Amount'.tr, + hintText: 'Enter Amount'.tr, controller: controller.topUpAmountController.value, textInputType: const TextInputType.numberWithOptions( decimal: true, @@ -74,7 +74,7 @@ class PaymentListScreen extends StatelessWidget { vertical: 10, ), child: Text( - "Select Top up Options".tr(), + "Select Top up Options".tr, style: TextStyle( fontSize: 16, color: @@ -208,14 +208,14 @@ class PaymentListScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.only(bottom: 20), child: RoundedButtonFill( - title: "Top-up".tr(), + title: "Top-up".tr, height: 5.5, color: AppThemeData.primary300, textColor: AppThemeData.grey50, fontSizes: 16, onPress: () async { if (controller.topUpAmountController.value.text.isEmpty) { - ShowToastDialog.showToast("Please Enter Amount".tr()); + ShowToastDialog.showToast("Please Enter Amount".tr); } else { if (double.parse( controller.topUpAmountController.value.text, @@ -289,7 +289,7 @@ class PaymentListScreen extends StatelessWidget { Get.back(); ShowToastDialog.showToast( "Something went wrong, please contact admin." - .tr(), + .tr, ); } else { CreateRazorPayOrderModel result = value; @@ -305,12 +305,12 @@ class PaymentListScreen extends StatelessWidget { }); } else { ShowToastDialog.showToast( - "Please select payment method".tr(), + "Please select payment method".tr, ); } } else { ShowToastDialog.showToast( - "${'Please Enter minimum amount of'.tr()} ${Constant.amountShow(amount: Constant.minimumAmountToDeposit)}", + "${'Please Enter minimum amount of'.tr} ${Constant.amountShow(amount: Constant.minimumAmountToDeposit)}", ); } } diff --git a/lib/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart b/lib/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart index ffa4627..832f7fa 100644 --- a/lib/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart +++ b/lib/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart @@ -4,7 +4,8 @@ import 'package:customer/models/wallet_transaction_model.dart'; import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/payment_list_screen.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/round_button_fill.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import '../../../constant/collection_name.dart'; import '../../../controllers/theme_controller.dart'; import '../../../models/cab_order_model.dart'; @@ -23,7 +24,7 @@ import '../../rental_service/rental_order_details_screen.dart'; import '../order_list_screen/order_details_screen.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class WalletScreen extends StatelessWidget { const WalletScreen({super.key}); @@ -51,7 +52,7 @@ class WalletScreen extends StatelessWidget { Image.asset("assets/images/login.gif", height: 120), const SizedBox(height: 12), Text( - "Please Log In to Continue".tr(), + "Please Log In to Continue".tr, style: TextStyle( color: isDark @@ -64,7 +65,7 @@ class WalletScreen extends StatelessWidget { const SizedBox(height: 5), Text( "You’re not logged in. Please sign in to access your account and explore all features." - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -77,7 +78,7 @@ class WalletScreen extends StatelessWidget { ), const SizedBox(height: 20), RoundedButtonFill( - title: "Log in".tr(), + title: "Log in".tr, width: 55, height: 5.5, color: AppThemeData.primary300, @@ -111,7 +112,7 @@ class WalletScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "My Wallet".tr(), + "My Wallet".tr, style: TextStyle( fontSize: 24, color: @@ -124,7 +125,7 @@ class WalletScreen extends StatelessWidget { ), Text( "Keep track of your balance, transactions, and payment methods all in one place." - .tr(), + .tr, style: TextStyle( color: isDark @@ -165,7 +166,7 @@ class WalletScreen extends StatelessWidget { child: Column( children: [ Text( - "My Wallet".tr(), + "My Wallet".tr, maxLines: 1, style: TextStyle( color: @@ -203,7 +204,7 @@ class WalletScreen extends StatelessWidget { horizontal: 80, ), child: RoundedButtonFill( - title: "Top up".tr(), + title: "Top up".tr, color: AppThemeData.warning300, textColor: AppThemeData.grey900, onPress: () { @@ -222,7 +223,7 @@ class WalletScreen extends StatelessWidget { child: controller.walletTransactionList.isEmpty ? Constant.showEmptyView( - message: "Transaction not found".tr(), + message: "Transaction not found".tr, ) : Padding( padding: const EdgeInsets.symmetric( @@ -307,7 +308,7 @@ class WalletScreen extends StatelessWidget { ); break; default: - ShowToastDialog.showToast("Order details not available".tr()); + ShowToastDialog.showToast("Order details not available".tr); } } }, diff --git a/lib/screen_ui/on_boarding_screen/on_boarding_screen.dart b/lib/screen_ui/on_boarding_screen/on_boarding_screen.dart index 1f87e22..b549d97 100644 --- a/lib/screen_ui/on_boarding_screen/on_boarding_screen.dart +++ b/lib/screen_ui/on_boarding_screen/on_boarding_screen.dart @@ -1,8 +1,9 @@ import 'package:customer/constant/assets.dart'; import 'package:customer/themes/round_button_fill.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/on_boarding_controller.dart'; import '../../themes/app_them_data.dart'; import '../../utils/network_image_widget.dart'; @@ -96,7 +97,7 @@ class OnboardingScreen extends StatelessWidget { const SizedBox(height: 20), controller.currentPage.value == pageCount - 1 ? RoundedButtonFill( - title: "Let’s Get Started".tr(), + title: "Let’s Get Started".tr, onPress: () { _finish(); }, @@ -106,7 +107,7 @@ class OnboardingScreen extends StatelessWidget { children: [ Expanded( child: RoundedButtonFill( - title: "Skip".tr(), + title: "Skip".tr, onPress: () => _finish(), color: AppThemeData.grey50, textColor: AppThemeData.grey900, @@ -115,7 +116,7 @@ class OnboardingScreen extends StatelessWidget { const SizedBox(width: 20), Expanded( child: RoundedButtonFill( - title: "Next".tr(), + title: "Next".tr, onPress: () { controller.nextPage(); }, @@ -137,6 +138,6 @@ class OnboardingScreen extends StatelessWidget { Future _finish() async { await Preferences.setBoolean(Preferences.isFinishOnBoardingKey, true); - Get.offAll(() => const LoginScreen()); + Get.offAll(LoginScreen()); } } diff --git a/lib/screen_ui/on_demand_service/favourite_ondemand_screen.dart b/lib/screen_ui/on_demand_service/favourite_ondemand_screen.dart index e9fe212..4744a1c 100644 --- a/lib/screen_ui/on_demand_service/favourite_ondemand_screen.dart +++ b/lib/screen_ui/on_demand_service/favourite_ondemand_screen.dart @@ -9,9 +9,10 @@ import 'package:customer/screen_ui/on_demand_service/on_demand_details_screen.da import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/round_button_fill.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class FavouriteOndemandScreen extends StatelessWidget { const FavouriteOndemandScreen({super.key}); @@ -35,7 +36,7 @@ class FavouriteOndemandScreen extends StatelessWidget { children: [ const SizedBox(width: 10), Text( - "Favourite Services".tr(), + "Favourite Services".tr, style: TextStyle( fontFamily: AppThemeData.semiBold, color: @@ -60,7 +61,7 @@ class FavouriteOndemandScreen extends StatelessWidget { Image.asset("assets/images/login.gif", height: 120), const SizedBox(height: 12), Text( - "Please Log In to Continue".tr(), + "Please Log In to Continue".tr, style: TextStyle( color: isDark @@ -73,7 +74,7 @@ class FavouriteOndemandScreen extends StatelessWidget { const SizedBox(height: 5), Text( "You’re not logged in. Please sign in to access your account and explore all features." - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -86,7 +87,7 @@ class FavouriteOndemandScreen extends StatelessWidget { ), const SizedBox(height: 20), RoundedButtonFill( - title: "Log in".tr(), + title: "Log in".tr, width: 55, height: 5.5, color: AppThemeData.primary300, @@ -106,7 +107,7 @@ class FavouriteOndemandScreen extends StatelessWidget { child: controller.lstFav.isEmpty ? Constant.showEmptyView( - message: "Favourite Service not found.".tr(), + message: "Favourite Service not found.".tr, ) : ListView.builder( shrinkWrap: true, @@ -603,7 +604,7 @@ class FavouriteOndemandScreen extends StatelessWidget { return Text( provider.priceUnit == 'Fixed' ? Constant.amountShow(amount: provider.price) - : '${Constant.amountShow(amount: provider.price ?? "0")}/${'hr'.tr()}', + : '${Constant.amountShow(amount: provider.price ?? "0")}/${'hr'.tr}', style: TextStyle( fontSize: 14, fontWeight: FontWeight.bold, @@ -616,7 +617,7 @@ class FavouriteOndemandScreen extends StatelessWidget { Text( provider.priceUnit == 'Fixed' ? Constant.amountShow(amount: provider.disPrice ?? '0') - : '${Constant.amountShow(amount: provider.disPrice)}/${'hr'.tr()}', + : '${Constant.amountShow(amount: provider.disPrice)}/${'hr'.tr}', style: TextStyle( fontSize: 14, fontWeight: FontWeight.bold, @@ -627,7 +628,7 @@ class FavouriteOndemandScreen extends StatelessWidget { Text( provider.priceUnit == 'Fixed' ? Constant.amountShow(amount: provider.price) - : '${Constant.amountShow(amount: provider.price ?? "0")}/${'hr'.tr()}', + : '${Constant.amountShow(amount: provider.price ?? "0")}/${'hr'.tr}', style: const TextStyle( fontSize: 12, color: Colors.grey, diff --git a/lib/screen_ui/on_demand_service/my_booking_on_demand_screen.dart b/lib/screen_ui/on_demand_service/my_booking_on_demand_screen.dart index 24eae6e..655f22c 100644 --- a/lib/screen_ui/on_demand_service/my_booking_on_demand_screen.dart +++ b/lib/screen_ui/on_demand_service/my_booking_on_demand_screen.dart @@ -1,7 +1,7 @@ import 'package:cached_network_image/cached_network_image.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:intl/intl.dart'; import '../../constant/constant.dart'; import '../../controllers/my_booking_on_demand_controller.dart'; @@ -35,7 +35,7 @@ class MyBookingOnDemandScreen extends StatelessWidget { title: Padding( padding: const EdgeInsets.only(bottom: 10), child: Text( - "Booking History".tr(), + "Booking History".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -75,7 +75,7 @@ class MyBookingOnDemandScreen extends StatelessWidget { if (orders.isEmpty) { return Center( child: Text( - "No ride found".tr(), + "No ride found".tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -274,7 +274,7 @@ class MyBookingOnDemandScreen extends StatelessWidget { .otp! .isNotEmpty) Text( - "${'OTP :'.tr()} ${onProviderOrder.otp}", + "${'OTP :'.tr} ${onProviderOrder.otp}", style: AppThemeData.mediumTextStyle( fontSize: 14, color: @@ -324,7 +324,7 @@ class MyBookingOnDemandScreen extends StatelessWidget { return Text( order.provider.priceUnit == 'Fixed' ? Constant.amountShow(amount: price) - : "${Constant.amountShow(amount: price)}/${'hr'.tr()}", + : "${Constant.amountShow(amount: price)}/${'hr'.tr}", style: AppThemeData.mediumTextStyle( fontSize: 16, color: AppThemeData.primary300, @@ -402,14 +402,14 @@ class MyBookingOnDemandScreen extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - label.tr(), + label.tr, style: AppThemeData.mediumTextStyle( fontSize: 14, color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900, ), ), Text( - value.tr(), + value.tr, style: AppThemeData.regularTextStyle( fontSize: 14, color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900, diff --git a/lib/screen_ui/on_demand_service/on_demand_booking_screen.dart b/lib/screen_ui/on_demand_service/on_demand_booking_screen.dart index db6fa1b..a59f56c 100644 --- a/lib/screen_ui/on_demand_service/on_demand_booking_screen.dart +++ b/lib/screen_ui/on_demand_service/on_demand_booking_screen.dart @@ -1,10 +1,10 @@ import 'package:bottom_picker/bottom_picker.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:geocoding/geocoding.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/theme_controller.dart'; import '../../controllers/on_demand_booking_controller.dart'; @@ -60,7 +60,7 @@ class OnDemandBookingScreen extends StatelessWidget { ), const SizedBox(width: 10), Text( - "Book Service".tr(), + "Book Service".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -77,7 +77,7 @@ class OnDemandBookingScreen extends StatelessWidget { children: [ // Services Section Text( - "Services".tr(), + "Services".tr, style: AppThemeData.semiBoldTextStyle( fontSize: 18, color: @@ -209,7 +209,7 @@ class OnDemandBookingScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Address".tr(), + "Address".tr, style: AppThemeData.semiBoldTextStyle( fontSize: 18, color: @@ -237,7 +237,7 @@ class OnDemandBookingScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "Service not available in this area" - .tr(), + .tr, ); } } @@ -246,7 +246,7 @@ class OnDemandBookingScreen extends StatelessWidget { Constant.checkPermission( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr(), + "Please wait...".tr, ); ShippingAddress shippingAddress = @@ -362,8 +362,8 @@ class OnDemandBookingScreen extends StatelessWidget { ), const SizedBox(height: 15), TextFieldWidget( - title: "Description".tr(), - hintText: "Enter Description".tr(), + title: "Description".tr, + hintText: "Enter Description".tr, controller: controller.descriptionController.value, maxLine: 5, ), @@ -405,8 +405,8 @@ class OnDemandBookingScreen extends StatelessWidget { ).show(context); }, child: TextFieldWidget( - title: "Booking Date & Slot".tr(), - hintText: "Choose Date and Time".tr(), + title: "Booking Date & Slot".tr, + hintText: "Choose Date and Time".tr, controller: controller.dateTimeController.value, enable: false, ), @@ -440,7 +440,7 @@ class OnDemandBookingScreen extends StatelessWidget { Padding( padding: EdgeInsets.symmetric(vertical: 10), child: Text( - "Price Detail".tr(), + "Price Detail".tr, style: AppThemeData.semiBoldTextStyle( fontSize: 16, color: @@ -460,7 +460,7 @@ class OnDemandBookingScreen extends StatelessWidget { bottomNavigationBar: Padding( padding: const EdgeInsets.all(20.0), child: RoundedButtonFill( - title: "Confirm".tr(), + title: "Confirm".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () => controller.confirmBooking(context), @@ -506,8 +506,8 @@ class OnDemandBookingScreen extends StatelessWidget { margin: const EdgeInsets.only(top: 3), child: Text( coupon.discountType == "Fix Price" - ? "${Constant.amountShow(amount: coupon.discount.toString())} ${'OFF'.tr()}" - : "${coupon.discount} ${'% Off'.tr()}", + ? "${Constant.amountShow(amount: coupon.discount.toString())} ${'OFF'.tr}" + : "${coupon.discount} ${'% Off'.tr}", style: TextStyle( fontWeight: FontWeight.bold, letterSpacing: 0.7, @@ -543,7 +543,7 @@ class OnDemandBookingScreen extends StatelessWidget { color: AppThemeData.grey50, ), Text( - "valid till ".tr() + + "valid till ".tr + controller.getDate( coupon.expiresAt!.toDate().toString(), ), @@ -595,7 +595,7 @@ class OnDemandBookingScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Promo Code".tr(), + "Promo Code".tr, style: AppThemeData.mediumTextStyle( fontSize: 18, color: @@ -607,7 +607,7 @@ class OnDemandBookingScreen extends StatelessWidget { ), const SizedBox(height: 5), Text( - "Apply promo code".tr(), + "Apply promo code".tr, style: AppThemeData.mediumTextStyle( fontSize: 15, color: @@ -701,7 +701,7 @@ class OnDemandBookingScreen extends StatelessWidget { Container( padding: const EdgeInsets.only(top: 20), child: Text( - 'Redeem Your Coupons'.tr(), + 'Redeem Your Coupons'.tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -719,7 +719,7 @@ class OnDemandBookingScreen extends StatelessWidget { right: 22, ), child: Text( - "Voucher or Coupon code".tr(), + "Voucher or Coupon code".tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -763,7 +763,7 @@ class OnDemandBookingScreen extends StatelessWidget { controller: controller.couponTextController.value, decoration: InputDecoration( border: InputBorder.none, - hintText: "Write Coupon Code".tr(), + hintText: "Write Coupon Code".tr, hintStyle: AppThemeData.mediumTextStyle( color: isDark @@ -784,7 +784,7 @@ class OnDemandBookingScreen extends StatelessWidget { right: 15, ), child: RoundedButtonFill( - title: "REDEEM NOW".tr(), + title: "REDEEM NOW".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () { @@ -803,7 +803,7 @@ class OnDemandBookingScreen extends StatelessWidget { Get.back(); } else { ShowToastDialog.showToast( - "Applied coupon not valid.".tr(), + "Applied coupon not valid.".tr, ); } }, @@ -833,7 +833,7 @@ class OnDemandBookingScreen extends StatelessWidget { children: [ const SizedBox(height: 5), rowText( - "Price".tr(), + "Price".tr, Constant.amountShow(amount: controller.price.value.toString()), isDark, ), @@ -851,7 +851,7 @@ class OnDemandBookingScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "${"Discount".tr()} ${controller.discountType.value == 'Percentage' || controller.discountType.value == 'Percent' ? "(${controller.discountLabel.value}%)" : "(${Constant.amountShow(amount: controller.discountLabel.value)})"}", + "${"Discount".tr} ${controller.discountType.value == 'Percentage' || controller.discountType.value == 'Percent' ? "(${controller.discountLabel.value}%)" : "(${Constant.amountShow(amount: controller.discountLabel.value)})"}", style: TextStyle( color: isDark @@ -881,7 +881,7 @@ class OnDemandBookingScreen extends StatelessWidget { : const SizedBox(), const Divider(), rowText( - "SubTotal".tr(), + "SubTotal".tr, Constant.amountShow(amount: controller.subTotal.value.toString()), isDark, ), @@ -938,7 +938,7 @@ class OnDemandBookingScreen extends StatelessWidget { }, ), rowText( - "Total Amount".tr(), + "Total Amount".tr, Constant.amountShow( amount: controller.totalAmount.value.toString(), ), @@ -958,13 +958,13 @@ class OnDemandBookingScreen extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - title.tr(), + title.tr, style: AppThemeData.mediumTextStyle( color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900, ), ), Text( - value.tr(), + value.tr, style: AppThemeData.mediumTextStyle( color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900, ), diff --git a/lib/screen_ui/on_demand_service/on_demand_category_screen.dart b/lib/screen_ui/on_demand_service/on_demand_category_screen.dart index a5e20c6..afb4375 100644 --- a/lib/screen_ui/on_demand_service/on_demand_category_screen.dart +++ b/lib/screen_ui/on_demand_service/on_demand_category_screen.dart @@ -1,8 +1,8 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:customer/screen_ui/on_demand_service/view_category_service_screen.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/on_demand_category_controller.dart'; import '../../controllers/theme_controller.dart'; @@ -55,7 +55,7 @@ class OnDemandCategoryScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Explore services".tr(), + "Explore services".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -63,7 +63,7 @@ class OnDemandCategoryScreen extends StatelessWidget { ), Text( "Explore services tailored for you—quick, easy, and personalized." - .tr(), + .tr, maxLines: 1, overflow: TextOverflow.ellipsis, style: AppThemeData.boldTextStyle( @@ -90,7 +90,7 @@ class OnDemandCategoryScreen extends StatelessWidget { child: Column( children: [ controller.categories.isEmpty - ? Center(child: Text("No Categories".tr())) + ? Center(child: Text("No Categories".tr)) : GridView.builder( padding: const EdgeInsets.all(5), itemCount: controller.categories.length, diff --git a/lib/screen_ui/on_demand_service/on_demand_dashboard_screen.dart b/lib/screen_ui/on_demand_service/on_demand_dashboard_screen.dart index 60749e6..bb7b781 100644 --- a/lib/screen_ui/on_demand_service/on_demand_dashboard_screen.dart +++ b/lib/screen_ui/on_demand_service/on_demand_dashboard_screen.dart @@ -2,10 +2,10 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/cab_dashboard_controller.dart'; import 'package:customer/controllers/theme_controller.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/on_demand_dashboard_controller.dart'; class OnDemandDashboardScreen extends StatelessWidget { @@ -52,28 +52,28 @@ class OnDemandDashboardScreen extends StatelessWidget { isDark, index: 0, assetIcon: "assets/icons/ic_home_cab.svg", - label: 'Home'.tr(), + label: 'Home'.tr, controller: controller, ), navigationBarItem( isDark, index: 1, assetIcon: "assets/icons/ic_fav.svg", - label: 'Favourites'.tr(), + label: 'Favourites'.tr, controller: controller, ), navigationBarItem( isDark, index: 2, assetIcon: "assets/icons/ic_booking_cab.svg", - label: 'My Bookings'.tr(), + label: 'My Bookings'.tr, controller: controller, ), navigationBarItem( isDark, index: 3, assetIcon: "assets/icons/ic_profile.svg", - label: 'Profile'.tr(), + label: 'Profile'.tr, controller: controller, ), ] @@ -82,14 +82,14 @@ class OnDemandDashboardScreen extends StatelessWidget { isDark, index: 0, assetIcon: "assets/icons/ic_home_cab.svg", - label: 'Home'.tr(), + label: 'Home'.tr, controller: controller, ), navigationBarItem( isDark, index: 1, assetIcon: "assets/icons/ic_fav.svg", - label: 'Favourites'.tr(), + label: 'Favourites'.tr, controller: controller, ), @@ -97,21 +97,21 @@ class OnDemandDashboardScreen extends StatelessWidget { isDark, index: 2, assetIcon: "assets/icons/ic_booking_cab.svg", - label: 'My Bookings'.tr(), + label: 'My Bookings'.tr, controller: controller, ), navigationBarItem( isDark, index: 3, assetIcon: "assets/icons/ic_wallet_cab.svg", - label: 'Wallet'.tr(), + label: 'Wallet'.tr, controller: controller, ), navigationBarItem( isDark, index: 4, assetIcon: "assets/icons/ic_profile.svg", - label: 'Profile'.tr(), + label: 'Profile'.tr, controller: controller, ), ], diff --git a/lib/screen_ui/on_demand_service/on_demand_details_screen.dart b/lib/screen_ui/on_demand_service/on_demand_details_screen.dart index dcfbca1..b524540 100644 --- a/lib/screen_ui/on_demand_service/on_demand_details_screen.dart +++ b/lib/screen_ui/on_demand_service/on_demand_details_screen.dart @@ -1,10 +1,11 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:customer/constant/constant.dart'; import 'package:customer/screen_ui/on_demand_service/provider_screen.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_rating_bar/flutter_rating_bar.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:intl/intl.dart'; import '../../controllers/theme_controller.dart'; import '../../models/provider_serivce_model.dart'; @@ -42,7 +43,7 @@ class OnDemandDetailsScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.stretch, children: [ RoundedButtonFill( - title: "Book Now".tr(), + title: "Book Now".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () async { @@ -132,7 +133,7 @@ class OnDemandDetailsScreen extends StatelessWidget { vertical: 10, ), child: Text( - controller.isOpen.value ? "Open".tr() : "Close".tr(), + controller.isOpen.value ? "Open".tr : "Close".tr, style: const TextStyle( fontWeight: FontWeight.bold, color: Colors.white, @@ -177,7 +178,7 @@ class OnDemandDetailsScreen extends StatelessWidget { ? Constant.amountShow( amount: provider.price ?? '0', ) - : '${Constant.amountShow(amount: provider.price ?? '0')}/${'hr'.tr()}', + : '${Constant.amountShow(amount: provider.price ?? '0')}/${'hr'.tr}', style: TextStyle( fontSize: 18, fontFamily: AppThemeData.regular, @@ -195,7 +196,7 @@ class OnDemandDetailsScreen extends StatelessWidget { ? Constant.amountShow( amount: provider.disPrice ?? '0', ) - : '${Constant.amountShow(amount: provider.disPrice ?? '0')}/${'hr'.tr()}', + : '${Constant.amountShow(amount: provider.disPrice ?? '0')}/${'hr'.tr}', style: TextStyle( fontSize: 18, fontFamily: AppThemeData.regular, @@ -213,7 +214,7 @@ class OnDemandDetailsScreen extends StatelessWidget { ? Constant.amountShow( amount: provider.price ?? '0', ) - : '${Constant.amountShow(amount: provider.price ?? '0')}/${'hr'.tr()}', + : '${Constant.amountShow(amount: provider.price ?? '0')}/${'hr'.tr}', style: const TextStyle( fontWeight: FontWeight.bold, fontSize: 18, @@ -271,7 +272,7 @@ class OnDemandDetailsScreen extends StatelessWidget { ), const SizedBox(width: 10), Text( - "(${provider.reviewsCount} ${'Reviews'.tr()})", + "(${provider.reviewsCount} ${'Reviews'.tr})", style: TextStyle( letterSpacing: 0.5, fontSize: 16, @@ -342,7 +343,7 @@ class OnDemandDetailsScreen extends StatelessWidget { ); }, child: Text( - "View Timing".tr(), + "View Timing".tr, style: const TextStyle( fontWeight: FontWeight.bold, color: Colors.green, @@ -451,7 +452,7 @@ class OnDemandDetailsScreen extends StatelessWidget { borderRadius: BorderRadius.circular(10), ), child: Text( - title.tr(), + title.tr, style: TextStyle( fontWeight: FontWeight.bold, color: @@ -475,7 +476,7 @@ class OnDemandDetailsScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - (providerModel.description ?? '').tr(), + (providerModel.description ?? '').tr, style: TextStyle( color: isDark ? Colors.white : Colors.black, fontSize: 14, @@ -620,7 +621,7 @@ class OnDemandDetailsScreen extends StatelessWidget { final photos = controller.provider.photos; if (photos.isEmpty) { - return Center(child: Text("No Image Found".tr())); + return Center(child: Text("No Image Found".tr)); } return GridView.builder( @@ -686,7 +687,7 @@ class OnDemandDetailsScreen extends StatelessWidget { height: 200, child: Center( child: Text( - "No review Found".tr(), + "No review Found".tr, style: AppThemeData.mediumTextStyle( color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900, ), @@ -810,7 +811,7 @@ class OnDemandDetailsScreen extends StatelessWidget { Padding( padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16), child: Text( - "Service Timing".tr(), + "Service Timing".tr, style: TextStyle( fontSize: 18, fontWeight: FontWeight.bold, @@ -826,7 +827,7 @@ class OnDemandDetailsScreen extends StatelessWidget { Expanded( child: _timeCard( context, - "Start Time : ".tr(), + "Start Time : ".tr, provider.startTime.toString(), isDark, ), @@ -835,7 +836,7 @@ class OnDemandDetailsScreen extends StatelessWidget { Expanded( child: _timeCard( context, - "End Time : ".tr(), + "End Time : ".tr, provider.endTime.toString(), isDark, ), @@ -846,7 +847,7 @@ class OnDemandDetailsScreen extends StatelessWidget { Padding( padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16), child: Text( - "Service Days".tr(), + "Service Days".tr, style: TextStyle( fontSize: 18, fontWeight: FontWeight.bold, diff --git a/lib/screen_ui/on_demand_service/on_demand_home_screen.dart b/lib/screen_ui/on_demand_service/on_demand_home_screen.dart index 0fea656..0391771 100644 --- a/lib/screen_ui/on_demand_service/on_demand_home_screen.dart +++ b/lib/screen_ui/on_demand_service/on_demand_home_screen.dart @@ -11,16 +11,17 @@ import 'package:customer/screen_ui/on_demand_service/view_category_service_scree import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/show_toast_dialog.dart'; +import 'package:customer/utils/app_router.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:customer/widget/osm_map/map_picker_page.dart'; import 'package:customer/widget/place_picker/location_picker_screen.dart'; import 'package:customer/widget/place_picker/selected_location_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:geocoding/geocoding.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/on_demand_home_controller.dart'; import '../../models/category_model.dart'; import '../../models/provider_serivce_model.dart'; @@ -76,7 +77,7 @@ class OnDemandHomeScreen extends StatelessWidget { ? InkWell( onTap: () => Get.offAll(const LoginScreen()), child: Text( - "Login".tr(), + "Login".tr, style: AppThemeData.boldTextStyle( color: AppThemeData.grey900, fontSize: 12, @@ -104,7 +105,7 @@ class OnDemandHomeScreen extends StatelessWidget { Constant.checkPermission( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr(), + "Please wait...".tr, ); // ✅ declare it once here! @@ -240,7 +241,7 @@ class OnDemandHomeScreen extends StatelessWidget { Image.asset("assets/images/location.gif", height: 120), const SizedBox(height: 12), Text( - "No Store Found in Your Area".tr(), + "No Store Found in Your Area".tr, style: TextStyle( color: isDark @@ -253,7 +254,7 @@ class OnDemandHomeScreen extends StatelessWidget { const SizedBox(height: 5), Text( "Currently, there are no available store in your zone. Try changing your location to find nearby options." - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -266,7 +267,7 @@ class OnDemandHomeScreen extends StatelessWidget { ), const SizedBox(height: 20), RoundedButtonFill( - title: "Change Zone".tr(), + title: "Change Zone".tr, width: 55, height: 5.5, color: AppThemeData.primary300, @@ -308,7 +309,7 @@ class OnDemandHomeScreen extends StatelessWidget { child: controller.categories.isEmpty ? Constant.showEmptyView( - message: "No Categories".tr(), + message: "No Categories".tr, ) : Padding( padding: const EdgeInsets.symmetric( @@ -388,7 +389,7 @@ class OnDemandHomeScreen extends StatelessWidget { width: 70, child: Center( child: Text( - "View All".tr(), + "View All".tr, textAlign: TextAlign.center, maxLines: 1, @@ -416,7 +417,7 @@ class OnDemandHomeScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Most Popular services".tr(), + "Most Popular services".tr, style: TextStyle( color: isDark ? Colors.white : Colors.black, @@ -431,7 +432,7 @@ class OnDemandHomeScreen extends StatelessWidget { Get.to(() => ViewAllPopularServiceScreen()); }, child: Text( - "View all".tr(), + "View all".tr, style: TextStyle( color: AppThemeData.primary300, fontSize: 14, @@ -444,7 +445,7 @@ class OnDemandHomeScreen extends StatelessWidget { ), ), controller.providerList.isEmpty - ? Center(child: Text("No Services Found".tr())) + ? Center(child: Text("No Services Found".tr)) : ListView.builder( shrinkWrap: true, padding: EdgeInsets.zero, @@ -772,7 +773,7 @@ class ServiceView extends StatelessWidget { return Text( provider.priceUnit == 'Fixed' ? Constant.amountShow(amount: provider.price) - : '${Constant.amountShow(amount: provider.price ?? "0")}/${'hr'.tr()}', + : '${Constant.amountShow(amount: provider.price ?? "0")}/${'hr'.tr}', style: TextStyle( fontSize: 14, fontWeight: FontWeight.bold, @@ -785,7 +786,7 @@ class ServiceView extends StatelessWidget { Text( provider.priceUnit == 'Fixed' ? Constant.amountShow(amount: provider.disPrice ?? '0') - : '${Constant.amountShow(amount: provider.disPrice)}/${'hr'.tr()}', + : '${Constant.amountShow(amount: provider.disPrice)}/${'hr'.tr}', style: TextStyle( fontSize: 14, fontWeight: FontWeight.bold, diff --git a/lib/screen_ui/on_demand_service/on_demand_order_details_screen.dart b/lib/screen_ui/on_demand_service/on_demand_order_details_screen.dart index 9db13d4..231adc9 100644 --- a/lib/screen_ui/on_demand_service/on_demand_order_details_screen.dart +++ b/lib/screen_ui/on_demand_service/on_demand_order_details_screen.dart @@ -1,8 +1,8 @@ import 'package:clipboard/clipboard.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:intl/intl.dart'; import '../../controllers/on_demand_order_details_controller.dart'; import '../../controllers/theme_controller.dart'; @@ -56,7 +56,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { ), const SizedBox(width: 10), Text( - "Order Details".tr(), + "Order Details".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -100,7 +100,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - 'Cancel Reason'.tr(), + 'Cancel Reason'.tr, style: AppThemeData.mediumTextStyle( fontSize: 15, color: @@ -155,7 +155,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { MainAxisAlignment.spaceBetween, children: [ Text( - 'Booking ID'.tr(), + 'Booking ID'.tr, style: AppThemeData.mediumTextStyle( fontSize: 15, color: @@ -175,7 +175,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { ).then((value) { SnackBar snackBar = SnackBar( content: Text( - "Booking ID Copied".tr(), + "Booking ID Copied".tr, textAlign: TextAlign.center, style: AppThemeData.mediumTextStyle( @@ -207,7 +207,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { ), SizedBox(height: 10), Text( - "${'Booking Address :'.tr()} ${controller.onProviderOrder.value?.address?.getFullAddress()}", + "${'Booking Address :'.tr} ${controller.onProviderOrder.value?.address?.getFullAddress()}", style: AppThemeData.mediumTextStyle( fontSize: 15, color: @@ -296,7 +296,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { top: 6, ), child: Text( - '${'Date:'.tr()} ', + '${'Date:'.tr} ', style: AppThemeData.regularTextStyle( fontSize: 14, @@ -350,7 +350,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { top: 6, ), child: Text( - '${'Time:'.tr()} ', + '${'Time:'.tr} ', style: AppThemeData.regularTextStyle( fontSize: 14, @@ -422,7 +422,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { Padding( padding: EdgeInsets.symmetric(vertical: 10), child: Text( - 'About Worker'.tr(), + 'About Worker'.tr, style: AppThemeData.semiBoldTextStyle( fontSize: 16, color: @@ -674,7 +674,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { ), ), child: Text( - 'Add Review'.tr(), + 'Add Review'.tr, style: AppThemeData.regularTextStyle( fontSize: 16, @@ -754,7 +754,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { ), SizedBox(width: 10), Text( - 'Call'.tr(), + 'Call'.tr, style: AppThemeData.semiBoldTextStyle( fontSize: 16, color: @@ -771,7 +771,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { child: ElevatedButton( onPressed: () async { ShowToastDialog.showLoader( - "Please wait...".tr(), + "Please wait...".tr, ); ShowToastDialog.closeLoader(); @@ -844,7 +844,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { ), SizedBox(width: 10), Text( - 'Chat'.tr(), + 'Chat'.tr, style: AppThemeData.semiBoldTextStyle( fontSize: 16, color: @@ -870,7 +870,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { Padding( padding: EdgeInsets.symmetric(vertical: 10), child: Text( - "About provider".tr(), + "About provider".tr, style: AppThemeData.semiBoldTextStyle( fontSize: 16, color: @@ -1064,7 +1064,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { ), ), child: Text( - 'Add Review'.tr(), + 'Add Review'.tr, style: AppThemeData.regularTextStyle( fontSize: 16, color: @@ -1130,7 +1130,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { ), SizedBox(width: 10), Text( - 'Call'.tr(), + 'Call'.tr, style: AppThemeData.semiBoldTextStyle( fontSize: 16, @@ -1192,7 +1192,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { child: ElevatedButton( onPressed: () async { ShowToastDialog.showLoader( - "Please wait...".tr(), + "Please wait...".tr, ); ShowToastDialog.closeLoader(); @@ -1260,7 +1260,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { ), SizedBox(width: 10), Text( - 'Chat'.tr(), + 'Chat'.tr, style: AppThemeData.semiBoldTextStyle( fontSize: 16, @@ -1297,7 +1297,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { Padding( padding: EdgeInsets.symmetric(vertical: 10), child: Text( - "Price Detail".tr(), + "Price Detail".tr, style: AppThemeData.semiBoldTextStyle( fontSize: 16, color: @@ -1362,7 +1362,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { Padding( padding: EdgeInsets.symmetric(vertical: 16), child: Text( - "Price Detail".tr(), + "Price Detail".tr, style: AppThemeData.semiBoldTextStyle( fontSize: 16, color: @@ -1405,7 +1405,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { MainAxisAlignment.spaceBetween, children: [ Text( - "Total Extra Charges : ".tr(), + "Total Extra Charges : ".tr, style: TextStyle( color: isDark @@ -1442,7 +1442,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Extra charge Notes : ".tr(), + "Extra charge Notes : ".tr, style: TextStyle( color: isDark @@ -1518,7 +1518,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { ? Row( children: [ Text( - "New Date : ".tr(), + "New Date : ".tr, style: TextStyle( color: isDark @@ -1564,7 +1564,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { vertical: 10, ), child: RoundedButtonFill( - title: "Cancel Booking".tr(), + title: "Cancel Booking".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () { @@ -1590,7 +1590,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { ? Padding( padding: const EdgeInsets.symmetric(vertical: 10), child: RoundedButtonFill( - title: 'Pay Extra Amount'.tr(), + title: 'Pay Extra Amount'.tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () async { @@ -1633,7 +1633,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { vertical: 10, ), child: RoundedButtonFill( - title: 'Pay Now'.tr(), + title: 'Pay Now'.tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () async { @@ -1728,8 +1728,8 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { margin: const EdgeInsets.only(top: 3), child: Text( coupon.discountType == "Fix Price" - ? "${Constant.amountShow(amount: coupon.discount.toString())} ${'OFF'.tr()}" - : "${coupon.discount} ${'% Off'.tr()}", + ? "${Constant.amountShow(amount: coupon.discount.toString())} ${'OFF'.tr}" + : "${coupon.discount} ${'% Off'.tr}", style: TextStyle( fontWeight: FontWeight.bold, letterSpacing: 0.7, @@ -1765,7 +1765,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { color: AppThemeData.grey50, ), Text( - "valid till ".tr() + + "valid till ".tr + controller.getDate( coupon.expiresAt!.toDate().toString(), ), @@ -1821,7 +1821,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Promo Code".tr(), + "Promo Code".tr, style: AppThemeData.mediumTextStyle( fontSize: 18, color: @@ -1833,7 +1833,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { ), const SizedBox(height: 5), Text( - "Apply promo code".tr(), + "Apply promo code".tr, style: AppThemeData.mediumTextStyle( fontSize: 15, color: @@ -1928,7 +1928,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { Container( padding: const EdgeInsets.only(top: 20), child: Text( - 'Redeem Your Coupons'.tr(), + 'Redeem Your Coupons'.tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -1946,7 +1946,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { right: 22, ), child: Text( - "Voucher or Coupon code".tr(), + "Voucher or Coupon code".tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -1990,7 +1990,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { controller: controller.couponTextController.value, decoration: InputDecoration( border: InputBorder.none, - hintText: "Write Coupon Code".tr(), + hintText: "Write Coupon Code".tr, hintStyle: AppThemeData.mediumTextStyle( color: isDark @@ -2011,7 +2011,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { right: 15, ), child: RoundedButtonFill( - title: "REDEEM NOW".tr(), + title: "REDEEM NOW".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () { @@ -2043,7 +2043,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { } else { print("❌ No matching coupon found"); ShowToastDialog.showToast( - "Applied coupon not valid.".tr(), + "Applied coupon not valid.".tr, ); } }, @@ -2073,7 +2073,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { children: [ const SizedBox(height: 5), rowText( - "Price".tr(), + "Price".tr, //Constant.amountShow(amount: controller.price.value.toString()), controller.onProviderOrder.value?.provider.disPrice == "" || controller.onProviderOrder.value?.provider.disPrice == "0" @@ -2095,7 +2095,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "${"Discount".tr()} ${controller.discountType.value == 'Percentage' || controller.discountType.value == 'Percent' ? "(${controller.discountLabel.value}%)" : "(${Constant.amountShow(amount: controller.discountLabel.value)})"}", + "${"Discount".tr} ${controller.discountType.value == 'Percentage' || controller.discountType.value == 'Percent' ? "(${controller.discountLabel.value}%)" : "(${Constant.amountShow(amount: controller.discountLabel.value)})"}", style: TextStyle( color: isDark @@ -2125,7 +2125,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { : const SizedBox(), const Divider(), rowText( - "SubTotal".tr(), + "SubTotal".tr, Constant.amountShow(amount: controller.subTotal.value.toString()), isDark, ), @@ -2183,7 +2183,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { ), // Total Amount rowText( - "Total Amount".tr(), + "Total Amount".tr, Constant.amountShow( amount: controller.totalAmount.value.toString(), ), @@ -2227,7 +2227,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { AlertDialog( backgroundColor: isDark ? AppThemeData.greyDark50 : AppThemeData.grey50, title: Text( - 'Please give reason for canceling this Booking'.tr(), + 'Please give reason for canceling this Booking'.tr, style: AppThemeData.mediumTextStyle( fontSize: 16, color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900, @@ -2237,26 +2237,26 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { controller: controller.cancelBookingController.value, maxLines: 5, decoration: InputDecoration( - hintText: "Specify your reason here".tr(), + hintText: "Specify your reason here".tr, border: OutlineInputBorder(borderRadius: BorderRadius.circular(7)), ), ), actions: [ TextButton( onPressed: () => Get.back(), - child: Text('Cancel'.tr(), style: TextStyle(color: Colors.red)), + child: Text('Cancel'.tr, style: TextStyle(color: Colors.red)), ), TextButton( onPressed: () async { if (controller.cancelBookingController.value.text .trim() .isEmpty) { - ShowToastDialog.showToast("Please enter reason".tr()); + ShowToastDialog.showToast("Please enter reason".tr); } else { await controller.cancelBooking(); } }, - child: Text('Continue'.tr(), style: TextStyle(color: Colors.green)), + child: Text('Continue'.tr, style: TextStyle(color: Colors.green)), ), ], ), diff --git a/lib/screen_ui/on_demand_service/on_demand_payment_screen.dart b/lib/screen_ui/on_demand_service/on_demand_payment_screen.dart index c99539a..f455175 100644 --- a/lib/screen_ui/on_demand_service/on_demand_payment_screen.dart +++ b/lib/screen_ui/on_demand_service/on_demand_payment_screen.dart @@ -1,7 +1,7 @@ import 'package:customer/constant/constant.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/0n_demand_payment_controller.dart'; import '../../controllers/theme_controller.dart'; import '../../payment/createRazorPayOrderModel.dart'; @@ -53,7 +53,7 @@ class OnDemandPaymentScreen extends StatelessWidget { ), const SizedBox(width: 10), Text( - "Select Payment Method".tr(), + "Select Payment Method".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -79,7 +79,7 @@ class OnDemandPaymentScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Preferred Payment".tr(), + "Preferred Payment".tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( fontSize: 15, @@ -158,7 +158,7 @@ class OnDemandPaymentScreen extends StatelessWidget { children: [ const SizedBox(height: 10), Text( - "Other Payment Options".tr(), + "Other Payment Options".tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( fontSize: 15, @@ -329,7 +329,7 @@ class OnDemandPaymentScreen extends StatelessWidget { ), SizedBox(height: 20), RoundedButtonFill( - title: "Continue".tr(), + title: "Continue".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey900, onPress: () async { @@ -400,12 +400,12 @@ class OnDemandPaymentScreen extends StatelessWidget { if (walletAmount == 0) { ShowToastDialog.showToast( "Wallet balance is 0. Please recharge wallet." - .tr(), + .tr, ); } else if (walletAmount < totalAmount) { ShowToastDialog.showToast( "Insufficient wallet balance. Please add funds." - .tr(), + .tr, ); } else { controller.placeOrder(); @@ -461,7 +461,7 @@ class OnDemandPaymentScreen extends StatelessWidget { Get.back(); ShowToastDialog.showToast( "Something went wrong, please contact admin." - .tr(), + .tr, ); } else { CreateRazorPayOrderModel result = @@ -476,7 +476,7 @@ class OnDemandPaymentScreen extends StatelessWidget { } else { controller.isOrderPlaced.value = false; ShowToastDialog.showToast( - "Please select payment method".tr(), + "Please select payment method".tr, ); } controller.isOrderPlaced.value = false; diff --git a/lib/screen_ui/on_demand_service/on_demand_review_screen.dart b/lib/screen_ui/on_demand_service/on_demand_review_screen.dart index 0b7a998..04c83e0 100644 --- a/lib/screen_ui/on_demand_service/on_demand_review_screen.dart +++ b/lib/screen_ui/on_demand_service/on_demand_review_screen.dart @@ -1,7 +1,6 @@ -import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_rating_bar/flutter_rating_bar.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/on_demand_review_controller.dart'; import '../../controllers/theme_controller.dart'; @@ -53,8 +52,8 @@ class OnDemandReviewScreen extends StatelessWidget { const SizedBox(width: 10), Text( controller.ratingModel.value != null - ? "Update Review".tr() - : "Add Review".tr(), + ? "Update Review".tr + : "Add Review".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -97,7 +96,7 @@ class OnDemandReviewScreen extends StatelessWidget { child: Column( children: [ Text( - 'Rate for'.tr(), + 'Rate for'.tr, style: AppThemeData.mediumTextStyle( fontSize: 18, color: @@ -154,7 +153,7 @@ class OnDemandReviewScreen extends StatelessWidget { Padding( padding: EdgeInsets.all(20.0), child: TextFieldWidget( - hintText: "Type comment....".tr(), + hintText: "Type comment....".tr, controller: controller.comment, maxLine: 5, ), @@ -165,8 +164,8 @@ class OnDemandReviewScreen extends StatelessWidget { title: controller.ratingModel.value != null - ? "Update Review".tr() - : "Add Review".tr(), + ? "Update Review".tr + : "Add Review".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: controller.submitReview, diff --git a/lib/screen_ui/on_demand_service/provider_inbox_screen.dart b/lib/screen_ui/on_demand_service/provider_inbox_screen.dart index c0474bd..652b98a 100644 --- a/lib/screen_ui/on_demand_service/provider_inbox_screen.dart +++ b/lib/screen_ui/on_demand_service/provider_inbox_screen.dart @@ -8,9 +8,9 @@ import 'package:customer/themes/responsive.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:customer/widget/firebase_pagination/src/fireStore_pagination.dart'; import 'package:customer/widget/firebase_pagination/src/models/view_type.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../service/fire_store_utils.dart'; import '../../../themes/show_toast_dialog.dart'; @@ -29,7 +29,7 @@ class ProviderInboxScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Provider Inbox".tr(), + "Provider Inbox".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -46,7 +46,7 @@ class ProviderInboxScreen extends StatelessWidget { InboxModel inboxModel = InboxModel.fromJson(data!); return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); UserModel? customer = await FireStoreUtils.getUserProfile( inboxModel.customerId.toString(), @@ -157,7 +157,7 @@ class ProviderInboxScreen extends StatelessWidget { ); }, shrinkWrap: true, - onEmpty: Constant.showEmptyView(message: "No Conversion found".tr()), + onEmpty: Constant.showEmptyView(message: "No Conversion found".tr), // orderBy is compulsory to enable pagination query: FirebaseFirestore.instance .collection('chat_provider') diff --git a/lib/screen_ui/on_demand_service/provider_screen.dart b/lib/screen_ui/on_demand_service/provider_screen.dart index e38223b..d352d47 100644 --- a/lib/screen_ui/on_demand_service/provider_screen.dart +++ b/lib/screen_ui/on_demand_service/provider_screen.dart @@ -1,9 +1,9 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/screen_ui/on_demand_service/on_demand_home_screen.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/provider_controller.dart'; import '../../controllers/theme_controller.dart'; import '../../models/provider_serivce_model.dart'; @@ -143,7 +143,7 @@ class ProviderScreen extends StatelessWidget { const Divider(), const SizedBox(height: 10), controller.providerList.isEmpty - ? Center(child: Text("No Services Found".tr())) + ? Center(child: Text("No Services Found".tr)) : Expanded( child: ListView.builder( itemCount: controller.providerList.length, diff --git a/lib/screen_ui/on_demand_service/view_all_popular_service_screen.dart b/lib/screen_ui/on_demand_service/view_all_popular_service_screen.dart index 287ddba..6ccb52a 100644 --- a/lib/screen_ui/on_demand_service/view_all_popular_service_screen.dart +++ b/lib/screen_ui/on_demand_service/view_all_popular_service_screen.dart @@ -1,7 +1,7 @@ import 'package:customer/screen_ui/on_demand_service/on_demand_home_screen.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/theme_controller.dart'; import '../../controllers/view_all_popular_service_controller.dart'; @@ -50,7 +50,7 @@ class ViewAllPopularServiceScreen extends StatelessWidget { ), const SizedBox(width: 10), Text( - "All Services".tr(), + "All Services".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -71,7 +71,7 @@ class ViewAllPopularServiceScreen extends StatelessWidget { child: Column( children: [ TextFieldWidget( - hintText: "Search Service".tr(), + hintText: "Search Service".tr, controller: controller.searchTextFiledController.value, onchange: @@ -83,7 +83,7 @@ class ViewAllPopularServiceScreen extends StatelessWidget { ? Expanded( child: Center( child: Constant.showEmptyView( - message: "No service Found".tr(), + message: "No service Found".tr, ), ), ) diff --git a/lib/screen_ui/on_demand_service/view_category_service_screen.dart b/lib/screen_ui/on_demand_service/view_category_service_screen.dart index 467d535..d2165c1 100644 --- a/lib/screen_ui/on_demand_service/view_category_service_screen.dart +++ b/lib/screen_ui/on_demand_service/view_category_service_screen.dart @@ -1,6 +1,5 @@ -import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/theme_controller.dart'; import '../../controllers/view_category_service_controller.dart'; @@ -64,7 +63,7 @@ class ViewCategoryServiceListScreen extends StatelessWidget { controller.isLoading.value ? Constant.loader() : controller.providerList.isEmpty - ? Constant.showEmptyView(message: "No Service Found".tr()) + ? Constant.showEmptyView(message: "No Service Found".tr) : Padding( padding: const EdgeInsets.symmetric( horizontal: 16, diff --git a/lib/screen_ui/on_demand_service/worker_inbox_screen.dart b/lib/screen_ui/on_demand_service/worker_inbox_screen.dart index e74599c..72a945b 100644 --- a/lib/screen_ui/on_demand_service/worker_inbox_screen.dart +++ b/lib/screen_ui/on_demand_service/worker_inbox_screen.dart @@ -8,9 +8,9 @@ import 'package:customer/themes/responsive.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:customer/widget/firebase_pagination/src/fireStore_pagination.dart'; import 'package:customer/widget/firebase_pagination/src/models/view_type.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../../controllers/theme_controller.dart'; import '../../../service/fire_store_utils.dart'; import '../../../themes/show_toast_dialog.dart'; @@ -29,7 +29,7 @@ class WorkerInboxScreen extends StatelessWidget { centerTitle: false, titleSpacing: 0, title: Text( - "Worker Inbox".tr(), + "Worker Inbox".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, @@ -46,7 +46,7 @@ class WorkerInboxScreen extends StatelessWidget { InboxModel inboxModel = InboxModel.fromJson(data!); return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr()); + ShowToastDialog.showLoader("Please wait...".tr); UserModel? customer = await FireStoreUtils.getUserProfile( inboxModel.customerId.toString(), @@ -160,7 +160,7 @@ class WorkerInboxScreen extends StatelessWidget { ); }, shrinkWrap: true, - onEmpty: Constant.showEmptyView(message: "No Conversion found".tr()), + onEmpty: Constant.showEmptyView(message: "No Conversion found".tr), // orderBy is compulsory to enable pagination query: FirebaseFirestore.instance .collection('chat_worker') diff --git a/lib/screen_ui/parcel_service/book_parcel_screen.dart b/lib/screen_ui/parcel_service/book_parcel_screen.dart index cc14c4e..5c0e10c 100644 --- a/lib/screen_ui/parcel_service/book_parcel_screen.dart +++ b/lib/screen_ui/parcel_service/book_parcel_screen.dart @@ -4,11 +4,11 @@ import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/utils/utils.dart'; import 'package:dotted_border/dotted_border.dart'; import 'package:dropdown_textfield/dropdown_textfield.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/book_parcel_controller.dart'; import '../../controllers/theme_controller.dart'; @@ -65,14 +65,14 @@ class BookParcelScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Book Your Document Delivery".tr(), + "Book Your Document Delivery".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, ), ), Text( - "Schedule a secure and timely pickup & delivery".tr(), + "Schedule a secure and timely pickup & delivery".tr, maxLines: 1, overflow: TextOverflow.ellipsis, style: AppThemeData.mediumTextStyle( @@ -100,7 +100,7 @@ class BookParcelScreen extends StatelessWidget { const SizedBox(height: 16), buildInfoSectionView( - title: "Sender Information".tr(), + title: "Sender Information".tr, locationController: controller.senderLocationController.value, nameController: controller.senderNameController.value, mobileController: controller.senderMobileController.value, @@ -134,7 +134,7 @@ class BookParcelScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "Service is unavailable at the selected address." - .tr(), + .tr, ); } } @@ -162,7 +162,7 @@ class BookParcelScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "Service is unavailable at the selected address." - .tr(), + .tr, ); } // ✅ <-- Add this @@ -173,7 +173,7 @@ class BookParcelScreen extends StatelessWidget { ), const SizedBox(height: 16), buildInfoSectionView( - title: "Receiver Information".tr(), + title: "Receiver Information".tr, locationController: controller.receiverLocationController.value, nameController: controller.receiverNameController.value, @@ -209,7 +209,7 @@ class BookParcelScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "Service is unavailable at the selected address." - .tr(), + .tr, ); } } @@ -237,7 +237,7 @@ class BookParcelScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "Service is unavailable at the selected address." - .tr(), + .tr, ); } } @@ -249,7 +249,7 @@ class BookParcelScreen extends StatelessWidget { const SizedBox(height: 15), RoundedButtonFill( - title: "Continue".tr(), + title: "Continue".tr, onPress: () { controller.bookNow(); }, @@ -283,7 +283,7 @@ class BookParcelScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Select delivery type".tr(), + "Select delivery type".tr, style: AppThemeData.boldTextStyle( color: isDark ? AppThemeData.greyDark500 : AppThemeData.grey500, fontSize: 13, @@ -305,7 +305,7 @@ class BookParcelScreen extends StatelessWidget { const SizedBox(width: 20), Expanded( child: Text( - "As soon as possible".tr(), + "As soon as possible".tr, style: AppThemeData.semiBoldTextStyle( color: isDark @@ -348,7 +348,7 @@ class BookParcelScreen extends StatelessWidget { const SizedBox(width: 20), Expanded( child: Text( - "Scheduled".tr(), + "Scheduled".tr, style: AppThemeData.semiBoldTextStyle( color: isDark @@ -377,7 +377,7 @@ class BookParcelScreen extends StatelessWidget { GestureDetector( onTap: () => controller.pickScheduledDate(context), child: TextFieldWidget( - hintText: "When to pickup at this address".tr(), + hintText: "When to pickup at this address".tr, controller: controller.scheduledDateController.value, enable: false, backgroundColor: @@ -398,7 +398,7 @@ class BookParcelScreen extends StatelessWidget { GestureDetector( onTap: () => controller.pickScheduledTime(context), child: TextFieldWidget( - hintText: "When to pickup at this address".tr(), + hintText: "When to pickup at this address".tr, controller: controller.scheduledTimeController.value, enable: false, // onchange: (v) => controller.pickScheduledTime(context), @@ -439,7 +439,7 @@ class BookParcelScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Upload parcel image".tr(), + "Upload parcel image".tr, style: AppThemeData.boldTextStyle( color: isDark ? AppThemeData.greyDark500 : AppThemeData.grey500, fontSize: 13, @@ -469,7 +469,7 @@ class BookParcelScreen extends StatelessWidget { ), const SizedBox(height: 10), Text( - "Upload Parcel Image".tr(), + "Upload Parcel Image".tr, style: AppThemeData.mediumTextStyle( fontSize: 16, color: @@ -480,7 +480,7 @@ class BookParcelScreen extends StatelessWidget { ), const SizedBox(height: 4), Text( - "Supported: .jpg, .jpeg, .png".tr(), + "Supported: .jpg, .jpeg, .png".tr, style: AppThemeData.semiBoldTextStyle( fontSize: 12, color: @@ -490,7 +490,7 @@ class BookParcelScreen extends StatelessWidget { ), ), Text( - "Max size 1MB".tr(), + "Max size 1MB".tr, style: AppThemeData.semiBoldTextStyle( fontSize: 12, color: @@ -501,7 +501,7 @@ class BookParcelScreen extends StatelessWidget { ), const SizedBox(height: 8), RoundedButtonFill( - title: "Browse Image".tr(), + title: "Browse Image".tr, onPress: () { controller.onCameraClick(Get.context!); }, @@ -597,7 +597,7 @@ class BookParcelScreen extends StatelessWidget { GestureDetector( onTap: onTap, child: TextFieldWidget( - hintText: "Your Location".tr(), + hintText: "Your Location".tr, controller: locationController, suffix: const Padding( @@ -614,7 +614,7 @@ class BookParcelScreen extends StatelessWidget { const SizedBox(height: 10), TextFieldWidget( - hintText: "Name".tr(), + hintText: "Name".tr, controller: nameController, backgroundColor: isDark ? AppThemeData.surfaceDark : AppThemeData.surface, @@ -624,7 +624,7 @@ class BookParcelScreen extends StatelessWidget { const SizedBox(height: 10), TextFieldWidget( - hintText: "Enter Mobile number".tr(), + hintText: "Enter Mobile number".tr, controller: mobileController, textInputType: TextInputType.number, inputFormatters: [ @@ -686,7 +686,7 @@ class BookParcelScreen extends StatelessWidget { clearOption: false, enableSearch: false, textFieldDecoration: InputDecoration( - hintText: "Select parcel Weight".tr(), + hintText: "Select parcel Weight".tr, hintStyle: AppThemeData.regularTextStyle( fontSize: 14, color: @@ -715,9 +715,9 @@ class BookParcelScreen extends StatelessWidget { dropDownList: controller.parcelWeight.map((e) { return DropDownValueModel( - name: e.title ?? 'Normal'.tr(), + name: e.title ?? 'Normal'.tr, value: - e.title ?? 'Normal'.tr(), // safer to use title string + e.title ?? 'Normal'.tr, // safer to use title string ); }).toList(), onChanged: (val) { @@ -734,7 +734,7 @@ class BookParcelScreen extends StatelessWidget { const SizedBox(height: 10), TextFieldWidget( - hintText: "Notes (Optional)".tr(), + hintText: "Notes (Optional)".tr, controller: noteController, backgroundColor: isDark ? AppThemeData.surfaceDark : AppThemeData.surface, diff --git a/lib/screen_ui/parcel_service/home_parcel_screen.dart b/lib/screen_ui/parcel_service/home_parcel_screen.dart index b9ad4e1..151cf78 100644 --- a/lib/screen_ui/parcel_service/home_parcel_screen.dart +++ b/lib/screen_ui/parcel_service/home_parcel_screen.dart @@ -1,9 +1,8 @@ import 'package:customer/constant/constant.dart'; -import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:geocoding/geocoding.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/home_parcel_controller.dart'; import '../../controllers/theme_controller.dart'; import '../../models/banner_model.dart'; @@ -73,7 +72,7 @@ class HomeParcelScreen extends StatelessWidget { Get.offAll(const LoginScreen()); }, child: Text( - "Login".tr(), + "Login".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: AppThemeData.grey900, @@ -100,7 +99,7 @@ class HomeParcelScreen extends StatelessWidget { Constant.checkPermission( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr(), + "Please wait...".tr, ); ShippingAddress shippingAddress = @@ -222,7 +221,7 @@ class HomeParcelScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "What are you sending?".tr(), + "What are you sending?".tr, style: AppThemeData.mediumTextStyle( fontSize: 18, color: diff --git a/lib/screen_ui/parcel_service/my_booking_screen.dart b/lib/screen_ui/parcel_service/my_booking_screen.dart index 25c4509..f5348c3 100644 --- a/lib/screen_ui/parcel_service/my_booking_screen.dart +++ b/lib/screen_ui/parcel_service/my_booking_screen.dart @@ -1,9 +1,10 @@ import 'package:customer/screen_ui/auth_screens/login_screen.dart'; import 'package:customer/screen_ui/parcel_service/parcel_order_details.dart'; import 'package:customer/themes/round_button_fill.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/parcel_my_booking_controller.dart'; import '../../controllers/theme_controller.dart'; @@ -36,7 +37,7 @@ class MyBookingScreen extends StatelessWidget { children: [ const SizedBox(width: 10), Text( - "Parcel History".tr(), + "Parcel History".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -75,7 +76,7 @@ class MyBookingScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( - "Please Log In to Continue".tr(), + "Please Log In to Continue".tr, style: TextStyle( color: isDark @@ -88,7 +89,7 @@ class MyBookingScreen extends StatelessWidget { const SizedBox(height: 5), Text( "You’re not logged in. Please sign in to access your account and explore all features." - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -101,7 +102,7 @@ class MyBookingScreen extends StatelessWidget { ), const SizedBox(height: 20), RoundedButtonFill( - title: "Log in".tr(), + title: "Log in".tr, width: 55, height: 5.5, color: AppThemeData.primary300, @@ -121,7 +122,7 @@ class MyBookingScreen extends StatelessWidget { if (orders.isEmpty) { return Center( child: Text( - "No orders found".tr(), + "No orders found".tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -169,7 +170,7 @@ class MyBookingScreen extends StatelessWidget { bottom: 8.0, ), child: Text( - "${'Order Date:'.tr()}${order.isSchedule == true ? controller.formatDate(order.createdAt!) : controller.formatDate(order.senderPickupDateTime!)}", + "${'Order Date:'.tr}${order.isSchedule == true ? controller.formatDate(order.createdAt!) : controller.formatDate(order.senderPickupDateTime!)}", style: AppThemeData.mediumTextStyle( fontSize: 14, color: AppThemeData.info400, @@ -230,7 +231,7 @@ class MyBookingScreen extends StatelessWidget { children: [ _infoSection( "Pickup Address (Sender):" - .tr(), + .tr, order.sender?.name ?? '', order.sender?.address ?? '', order.sender?.phone ?? '', @@ -243,7 +244,7 @@ class MyBookingScreen extends StatelessWidget { const SizedBox(height: 16), _infoSection( "Delivery Address (Receiver):" - .tr(), + .tr, order.receiver?.name ?? '', order.receiver?.address ?? '', diff --git a/lib/screen_ui/parcel_service/order_successfully_placed.dart b/lib/screen_ui/parcel_service/order_successfully_placed.dart index cbccb86..12a0a2a 100644 --- a/lib/screen_ui/parcel_service/order_successfully_placed.dart +++ b/lib/screen_ui/parcel_service/order_successfully_placed.dart @@ -1,7 +1,8 @@ import 'package:customer/screen_ui/parcel_service/parcel_dashboard_screen.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/round_button_fill.dart'; import '../../controllers/parcel_dashboard_controller.dart'; @@ -31,7 +32,7 @@ class OrderSuccessfullyPlaced extends StatelessWidget { Padding( padding: const EdgeInsets.symmetric(horizontal: 25), child: Text( - "Your Order Has Been Placed!".tr(), + "Your Order Has Been Placed!".tr, style: AppThemeData.boldTextStyle( fontSize: 22, color: @@ -47,7 +48,7 @@ class OrderSuccessfullyPlaced extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 50), child: Text( "We’ve received your parcel booking and it’s now being processed. You can track its status in real time." - .tr(), + .tr, style: AppThemeData.mediumTextStyle( fontSize: 16, color: @@ -60,7 +61,7 @@ class OrderSuccessfullyPlaced extends StatelessWidget { ), const SizedBox(height: 30), RoundedButtonFill( - title: "Track Your Order".tr(), + title: "Track Your Order".tr, onPress: () { print("Tracking Order: $parcelOrder"); //Get.to(() => TrackOrderScreen(), arguments: {'order': parcelOrder}); diff --git a/lib/screen_ui/parcel_service/parcel_coupon_screen.dart b/lib/screen_ui/parcel_service/parcel_coupon_screen.dart index 5393cc6..f5f6fcb 100644 --- a/lib/screen_ui/parcel_service/parcel_coupon_screen.dart +++ b/lib/screen_ui/parcel_service/parcel_coupon_screen.dart @@ -6,9 +6,9 @@ import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/widget/my_separator.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class ParcelCouponScreen extends StatelessWidget { const ParcelCouponScreen({super.key}); @@ -51,7 +51,7 @@ class ParcelCouponScreen extends StatelessWidget { ), const SizedBox(width: 10), Text( - "Coupon".tr(), + "Coupon".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -65,7 +65,7 @@ class ParcelCouponScreen extends StatelessWidget { controller.isLoading.value ? Constant.loader() : controller.cabCouponList.isEmpty - ? Constant.showEmptyView(message: "Coupon not found".tr()) + ? Constant.showEmptyView(message: "Coupon not found".tr) : ListView.builder( shrinkWrap: true, itemCount: controller.cabCouponList.length, @@ -108,7 +108,7 @@ class ParcelCouponScreen extends StatelessWidget { child: RotatedBox( quarterTurns: -1, child: Text( - "${couponModel.discountType == "Fix Price" ? Constant.amountShow(amount: couponModel.discount) : "${couponModel.discount}%"} ${'Off'.tr()}", + "${couponModel.discountType == "Fix Price" ? Constant.amountShow(amount: couponModel.discount) : "${couponModel.discount}%"} ${'Off'.tr}", textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -179,7 +179,7 @@ class ParcelCouponScreen extends StatelessWidget { Get.back(result: couponModel); }, child: Text( - "Tap To Apply".tr(), + "Tap To Apply".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, diff --git a/lib/screen_ui/parcel_service/parcel_dashboard_screen.dart b/lib/screen_ui/parcel_service/parcel_dashboard_screen.dart index 2fe7a4a..2166de8 100644 --- a/lib/screen_ui/parcel_service/parcel_dashboard_screen.dart +++ b/lib/screen_ui/parcel_service/parcel_dashboard_screen.dart @@ -2,10 +2,10 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/parcel_dashboard_controller.dart'; import 'package:customer/controllers/theme_controller.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class ParcelDashboardScreen extends StatelessWidget { const ParcelDashboardScreen({super.key}); @@ -53,21 +53,21 @@ class ParcelDashboardScreen extends StatelessWidget { isDark, index: 0, assetIcon: "assets/icons/ic_home_parcel.svg", - label: 'Home'.tr(), + label: 'Home'.tr, controller: controller, ), navigationBarItem( isDark, index: 1, assetIcon: "assets/icons/ic_mybooking_parcel.svg", - label: 'My Bookings'.tr(), + label: 'My Bookings'.tr, controller: controller, ), navigationBarItem( isDark, index: 2, assetIcon: "assets/icons/ic_profile_parcel.svg", - label: 'Profile'.tr(), + label: 'Profile'.tr, controller: controller, ), ] @@ -76,28 +76,28 @@ class ParcelDashboardScreen extends StatelessWidget { isDark, index: 0, assetIcon: "assets/icons/ic_home_parcel.svg", - label: 'Home'.tr(), + label: 'Home'.tr, controller: controller, ), navigationBarItem( isDark, index: 1, assetIcon: "assets/icons/ic_mybooking_parcel.svg", - label: 'My Bookings'.tr(), + label: 'My Bookings'.tr, controller: controller, ), navigationBarItem( isDark, index: 2, assetIcon: "assets/icons/ic_wallet_parcel.svg", - label: 'Wallet'.tr(), + label: 'Wallet'.tr, controller: controller, ), navigationBarItem( isDark, index: 3, assetIcon: "assets/icons/ic_profile_parcel.svg", - label: 'Profile'.tr(), + label: 'Profile'.tr, controller: controller, ), ], @@ -120,8 +120,8 @@ class ParcelDashboardScreen extends StatelessWidget { padding: const EdgeInsets.symmetric(vertical: 5), child: SvgPicture.asset( assetIcon, - height: label == 'Wallet'.tr() ? 18 : 22, - width: label == 'Wallet'.tr() ? 18 : 22, + height: label == 'Wallet'.tr ? 18 : 22, + width: label == 'Wallet'.tr ? 18 : 22, color: controller.selectedIndex.value == index ? isDark diff --git a/lib/screen_ui/parcel_service/parcel_order_confirmation.dart b/lib/screen_ui/parcel_service/parcel_order_confirmation.dart index 1d76a34..82da970 100644 --- a/lib/screen_ui/parcel_service/parcel_order_confirmation.dart +++ b/lib/screen_ui/parcel_service/parcel_order_confirmation.dart @@ -1,10 +1,10 @@ import 'package:customer/models/coupon_model.dart'; import 'package:customer/screen_ui/parcel_service/parcel_coupon_screen.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/parcel_order_confirmation_controller.dart'; import '../../controllers/theme_controller.dart'; @@ -56,7 +56,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { ), const SizedBox(width: 10), Text( - "Order Confirmation".tr(), + "Order Confirmation".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -134,7 +134,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ _infoSection( - "Pickup Address (Sender):".tr(), + "Pickup Address (Sender):".tr, controller .parcelOrder .value @@ -160,7 +160,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { ), const SizedBox(height: 16), _infoSection( - "Delivery Address (Receiver):".tr(), + "Delivery Address (Receiver):".tr, controller .parcelOrder .value @@ -211,15 +211,15 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ _iconTile( - "${controller.parcelOrder.value.distance ?? '--'} ${'KM'.tr()}", - "Distance".tr(), + "${controller.parcelOrder.value.distance ?? '--'} ${'KM'.tr}", + "Distance".tr, "assets/icons/ic_distance_parcel.svg", isDark, ), _iconTile( controller.parcelOrder.value.parcelWeight ?? '--', - "Weight".tr(), + "Weight".tr, "assets/icons/ic_weight_parcel.svg", isDark, ), @@ -227,7 +227,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { Constant.amountShow( amount: controller.parcelOrder.value.subTotal, ), - "Rate".tr(), + "Rate".tr, "assets/icons/ic_rate_parcel.svg", isDark, ), @@ -241,7 +241,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Coupons".tr(), + "Coupons".tr, style: AppThemeData.boldTextStyle( fontSize: 16, color: @@ -270,14 +270,14 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "This offer not eligible for this booking" - .tr(), + .tr, ); } } }); }, child: Text( - "View All".tr(), + "View All".tr, style: AppThemeData.boldTextStyle( decoration: TextDecoration.underline, fontSize: 14, @@ -328,7 +328,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { fontSize: 16, ), decoration: InputDecoration( - hintText: "Write coupon code".tr(), + hintText: "Write coupon code".tr, hintStyle: AppThemeData.mediumTextStyle( fontSize: 16, color: AppThemeData.parcelService500, @@ -338,7 +338,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { ), ), RoundedButtonFill( - title: "Redeem now".tr(), + title: "Redeem now".tr, onPress: () { if (controller.couponList .where( @@ -381,18 +381,18 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "This offer not eligible for this booking" - .tr(), + .tr, ); } } else { ShowToastDialog.showToast( "This coupon code has been expired" - .tr(), + .tr, ); } } else { ShowToastDialog.showToast( - "Invalid coupon code".tr(), + "Invalid coupon code".tr, ); } }, @@ -427,7 +427,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Order Summary".tr(), + "Order Summary".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: AppThemeData.grey500, @@ -437,7 +437,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { // Subtotal _summaryTile( - "Subtotal".tr(), + "Subtotal".tr, Constant.amountShow( amount: controller.subTotal.value.toString(), ), @@ -447,7 +447,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { // Discount _summaryTile( - "Discount".tr(), + "Discount".tr, "-${Constant.amountShow(amount: controller.discount.value.toString())}", isDark, AppThemeData.dangerDark300, @@ -481,7 +481,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { // Total _summaryTile( - "Order Total".tr(), + "Order Total".tr, Constant.amountShow( amount: controller.totalAmount.value.toString(), @@ -513,7 +513,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { children: [ // Title Text( - "Payment by".tr(), + "Payment by".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: @@ -550,7 +550,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { ), const SizedBox(width: 6), Text( - "Sender".tr(), + "Sender".tr, style: AppThemeData.semiBoldTextStyle( fontSize: 16, color: @@ -589,7 +589,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { ), const SizedBox(width: 6), Text( - "Receiver".tr(), + "Receiver".tr, style: AppThemeData.semiBoldTextStyle( fontSize: 16, color: @@ -613,8 +613,8 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { RoundedButtonFill( title: controller.paymentBy.value == "Sender" - ? "Select Payment Method".tr() - : "Continue".tr(), + ? "Select Payment Method".tr + : "Continue".tr, onPress: () async { if (controller.paymentBy.value == "Sender") { Get.bottomSheet( @@ -768,7 +768,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "Select Payment Method".tr(), + "Select Payment Method".tr, style: AppThemeData.mediumTextStyle( fontSize: 18, color: @@ -791,7 +791,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { controller: scrollController, children: [ Text( - "Preferred Payment".tr(), + "Preferred Payment".tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( fontSize: 15, @@ -860,7 +860,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { true) const SizedBox(height: 10), Text( - "Other Payment Options".tr(), + "Other Payment Options".tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( fontSize: 15, @@ -1006,7 +1006,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { ), ), RoundedButtonFill( - title: "Continue".tr(), + title: "Continue".tr, color: AppThemeData.taxiBooking300, textColor: AppThemeData.grey900, onPress: () async { @@ -1061,7 +1061,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { 0.0; if (walletBalance < amountToPay) { ShowToastDialog.showToast( - "Insufficient wallet balance".tr(), + "Insufficient wallet balance".tr, ); return; } @@ -1101,8 +1101,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { if (value == null) { Get.back(); ShowToastDialog.showToast( - "Something went wrong, please contact admin." - .tr(), + "Something went wrong, please contact admin.".tr, ); } else { CreateRazorPayOrderModel result = value; @@ -1114,7 +1113,7 @@ class ParcelOrderConfirmationScreen extends StatelessWidget { }); } else { ShowToastDialog.showToast( - "Please select payment method".tr(), + "Please select payment method".tr, ); } }, diff --git a/lib/screen_ui/parcel_service/parcel_order_details.dart b/lib/screen_ui/parcel_service/parcel_order_details.dart index 9a801bd..398c4b1 100644 --- a/lib/screen_ui/parcel_service/parcel_order_details.dart +++ b/lib/screen_ui/parcel_service/parcel_order_details.dart @@ -1,9 +1,9 @@ import 'package:customer/screen_ui/parcel_service/parcel_review_screen.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/parcel_order_details_controller.dart'; import '../../controllers/theme_controller.dart'; @@ -62,7 +62,7 @@ class ParcelOrderDetails extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Order Details".tr(), + "Order Details".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -70,7 +70,7 @@ class ParcelOrderDetails extends StatelessWidget { ), Text( "Your parcel is on the way. Track it in real time below." - .tr(), + .tr, maxLines: 1, overflow: TextOverflow.ellipsis, style: AppThemeData.mediumTextStyle( @@ -110,8 +110,8 @@ class ParcelOrderDetails extends StatelessWidget { width: double.infinity, padding: const EdgeInsets.all(16), child: Text( - "${'Order Id:'.tr()} ${Constant.orderId(orderId: controller.parcelOrder.value.id.toString())}" - .tr(), + "${'Order Id:'.tr} ${Constant.orderId(orderId: controller.parcelOrder.value.id.toString())}" + .tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -187,7 +187,7 @@ class ParcelOrderDetails extends StatelessWidget { CrossAxisAlignment.start, children: [ _infoSection( - "Pickup Address (Sender):".tr(), + "Pickup Address (Sender):".tr, controller .parcelOrder .value @@ -213,7 +213,7 @@ class ParcelOrderDetails extends StatelessWidget { ), const SizedBox(height: 16), _infoSection( - "Delivery Address (Receiver):".tr(), + "Delivery Address (Receiver):".tr, controller .parcelOrder .value @@ -250,7 +250,7 @@ class ParcelOrderDetails extends StatelessWidget { Padding( padding: const EdgeInsets.only(bottom: 8.0), child: Text( - "${'Schedule Pickup time:'.tr()} ${controller.formatDate(controller.parcelOrder.value.senderPickupDateTime!)}", + "${'Schedule Pickup time:'.tr} ${controller.formatDate(controller.parcelOrder.value.senderPickupDateTime!)}", style: AppThemeData.mediumTextStyle( fontSize: 14, color: AppThemeData.info400, @@ -261,7 +261,7 @@ class ParcelOrderDetails extends StatelessWidget { Padding( padding: const EdgeInsets.only(bottom: 8.0), child: Text( - "${'Order Date:'.tr()}${controller.parcelOrder.value.isSchedule == true ? controller.formatDate(controller.parcelOrder.value.createdAt!) : controller.formatDate(controller.parcelOrder.value.senderPickupDateTime!)}", + "${'Order Date:'.tr}${controller.parcelOrder.value.isSchedule == true ? controller.formatDate(controller.parcelOrder.value.createdAt!) : controller.formatDate(controller.parcelOrder.value.senderPickupDateTime!)}", style: AppThemeData.mediumTextStyle( fontSize: 14, color: AppThemeData.info400, @@ -274,7 +274,7 @@ class ParcelOrderDetails extends StatelessWidget { MainAxisAlignment.spaceBetween, children: [ Text( - "Parcel Type:".tr(), + "Parcel Type:".tr, style: AppThemeData.semiBoldTextStyle( fontSize: 16, color: @@ -381,14 +381,14 @@ class ParcelOrderDetails extends StatelessWidget { children: [ _iconTile( "${controller.parcelOrder.value.distance ?? '--'} ${Constant.distanceType}", - "Distance".tr(), + "Distance".tr, "assets/icons/ic_distance_parcel.svg", isDark, ), _iconTile( controller.parcelOrder.value.parcelWeight ?? '--', - "Weight".tr(), + "Weight".tr, "assets/icons/ic_weight_parcel.svg", isDark, ), @@ -396,7 +396,7 @@ class ParcelOrderDetails extends StatelessWidget { Constant.amountShow( amount: controller.parcelOrder.value.subTotal, ), - "Rate".tr(), + "Rate".tr, "assets/icons/ic_rate_parcel.svg", isDark, ), @@ -426,7 +426,7 @@ class ParcelOrderDetails extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "About Driver".tr(), + "About Driver".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: @@ -524,8 +524,8 @@ class ParcelOrderDetails extends StatelessWidget { .value .id! .isNotEmpty - ? 'Update Review'.tr() - : 'Add Review'.tr(), + ? 'Update Review'.tr + : 'Add Review'.tr, onPress: () async { final result = await Get.to( () => ParcelReviewScreen(), @@ -604,7 +604,7 @@ class ParcelOrderDetails extends StatelessWidget { InkWell( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr(), + "Please wait...".tr, ); UserModel? customer = @@ -709,7 +709,7 @@ class ParcelOrderDetails extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Order Summary".tr(), + "Order Summary".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: AppThemeData.grey500, @@ -719,7 +719,7 @@ class ParcelOrderDetails extends StatelessWidget { // Subtotal _summaryTile( - "Subtotal".tr(), + "Subtotal".tr, Constant.amountShow( amount: controller.subTotal.value.toString(), ), @@ -728,7 +728,7 @@ class ParcelOrderDetails extends StatelessWidget { // Discount _summaryTile( - "Discount".tr(), + "Discount".tr, Constant.amountShow( amount: controller.discount.value.toString(), ), @@ -778,7 +778,7 @@ class ParcelOrderDetails extends StatelessWidget { // Total _summaryTile( - "Order Total".tr(), + "Order Total".tr, Constant.amountShow( amount: controller.totalAmount.value.toString(), @@ -796,7 +796,7 @@ class ParcelOrderDetails extends StatelessWidget { ? Padding( padding: const EdgeInsets.all(16.0), child: RoundedButtonFill( - title: "Cancel Parcel".tr(), + title: "Cancel Parcel".tr, onPress: () { controller.cancelParcelOrder(); }, @@ -838,7 +838,7 @@ class ParcelOrderDetails extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Parcel Status Timeline".tr(), + "Parcel Status Timeline".tr, style: AppThemeData.semiBoldTextStyle( color: isDark @@ -859,7 +859,7 @@ class ParcelOrderDetails extends StatelessWidget { height: 80, child: Center( child: Text( - "No status updates yet".tr(), + "No status updates yet".tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -1011,7 +1011,7 @@ class ParcelOrderDetails extends StatelessWidget { Text( value, style: AppThemeData.semiBoldTextStyle( - fontSize: title == "Order Total".tr() ? 18 : 16, + fontSize: title == "Order Total".tr ? 18 : 16, color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900, ), ), diff --git a/lib/screen_ui/parcel_service/parcel_review_screen.dart b/lib/screen_ui/parcel_service/parcel_review_screen.dart index 8a829c4..62a4bae 100644 --- a/lib/screen_ui/parcel_service/parcel_review_screen.dart +++ b/lib/screen_ui/parcel_service/parcel_review_screen.dart @@ -1,8 +1,8 @@ import 'package:customer/controllers/parcel_review_controller.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_rating_bar/flutter_rating_bar.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/theme_controller.dart'; import '../../themes/app_them_data.dart'; @@ -36,8 +36,8 @@ class ParcelReviewScreen extends StatelessWidget { title: Text( controller.ratingModel.value != null && controller.ratingModel.value!.id!.isNotEmpty - ? "Update Review".tr() - : "Add Review".tr(), + ? "Update Review".tr + : "Add Review".tr, style: TextStyle( color: isDark ? Colors.white : Colors.black, fontSize: 16, @@ -104,7 +104,7 @@ class ParcelReviewScreen extends StatelessWidget { Padding( padding: const EdgeInsets.only(top: 16), child: Text( - 'How is your trip?'.tr(), + 'How is your trip?'.tr, style: TextStyle( fontSize: 18, color: @@ -120,7 +120,7 @@ class ParcelReviewScreen extends StatelessWidget { padding: const EdgeInsets.only(top: 8), child: Text( 'Your feedback will help us improve \n driving experience better' - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -138,7 +138,7 @@ class ParcelReviewScreen extends StatelessWidget { Padding( padding: const EdgeInsets.only(top: 20), child: Text( - 'Rate for'.tr(), + 'Rate for'.tr, style: TextStyle( fontSize: 16, color: @@ -197,7 +197,7 @@ class ParcelReviewScreen extends StatelessWidget { Padding( padding: const EdgeInsets.all(20.0), child: TextFieldWidget( - hintText: "Type comment....".tr(), + hintText: "Type comment....".tr, controller: controller.comment.value, maxLine: 5, ), @@ -210,8 +210,8 @@ class ParcelReviewScreen extends StatelessWidget { title: controller.ratingModel.value != null - ? "Update Review".tr() - : "Add Review".tr(), + ? "Update Review".tr + : "Add Review".tr, color: AppThemeData.primary300, textColor: isDark diff --git a/lib/screen_ui/rental_service/my_rental_booking_screen.dart b/lib/screen_ui/rental_service/my_rental_booking_screen.dart index 11c5f77..321b8ad 100644 --- a/lib/screen_ui/rental_service/my_rental_booking_screen.dart +++ b/lib/screen_ui/rental_service/my_rental_booking_screen.dart @@ -4,9 +4,10 @@ import 'package:customer/screen_ui/auth_screens/login_screen.dart'; import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/screen_ui/rental_service/rental_order_details_screen.dart'; import 'package:customer/themes/round_button_fill.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/my_rental_booking_controller.dart'; import '../../controllers/theme_controller.dart'; @@ -38,7 +39,7 @@ class MyRentalBookingScreen extends StatelessWidget { children: [ const SizedBox(width: 10), Text( - "Rental History".tr(), + "Rental History".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -75,7 +76,7 @@ class MyRentalBookingScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( - "Please Log In to Continue".tr(), + "Please Log In to Continue".tr, style: TextStyle( color: isDark @@ -88,7 +89,7 @@ class MyRentalBookingScreen extends StatelessWidget { const SizedBox(height: 5), Text( "You’re not logged in. Please sign in to access your account and explore all features." - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -101,7 +102,7 @@ class MyRentalBookingScreen extends StatelessWidget { ), const SizedBox(height: 20), RoundedButtonFill( - title: "Log in".tr(), + title: "Log in".tr, width: 55, height: 5.5, color: AppThemeData.primary300, @@ -122,7 +123,7 @@ class MyRentalBookingScreen extends StatelessWidget { if (orders.isEmpty) { return Center( child: Text( - "No orders found".tr(), + "No orders found".tr, style: AppThemeData.mediumTextStyle( color: isDark @@ -272,7 +273,7 @@ class MyRentalBookingScreen extends StatelessWidget { ), const SizedBox(height: 12), Text( - "Vehicle Type :".tr(), + "Vehicle Type :".tr, style: AppThemeData.boldTextStyle( fontSize: 16, color: @@ -387,7 +388,7 @@ class MyRentalBookingScreen extends StatelessWidget { ), ), Text( - "Package info :".tr(), + "Package info :".tr, style: AppThemeData.boldTextStyle( fontSize: 16, color: @@ -471,7 +472,7 @@ class MyRentalBookingScreen extends StatelessWidget { .isEnableOTPTripStartForRental == true) Text( - "${'OTP :'.tr()} ${order.otpCode}", + "${'OTP :'.tr} ${order.otpCode}", style: AppThemeData.boldTextStyle( fontSize: 16, color: diff --git a/lib/screen_ui/rental_service/rental_conformation_screen.dart b/lib/screen_ui/rental_service/rental_conformation_screen.dart index 92ac2a1..03832eb 100644 --- a/lib/screen_ui/rental_service/rental_conformation_screen.dart +++ b/lib/screen_ui/rental_service/rental_conformation_screen.dart @@ -4,10 +4,10 @@ import 'package:customer/screen_ui/rental_service/rental_coupon_screen.dart'; import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/utils/network_image_widget.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/rental_conformation_controller.dart'; import '../../controllers/theme_controller.dart'; import '../../themes/app_them_data.dart'; @@ -56,7 +56,7 @@ class RentalConformationScreen extends StatelessWidget { ), const SizedBox(width: 10), Text( - "Confirm Rent a Car".tr(), + "Confirm Rent a Car".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -156,7 +156,7 @@ class RentalConformationScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Your Preference".tr(), + "Your Preference".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: @@ -256,7 +256,7 @@ class RentalConformationScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Vehicle Type".tr(), + "Vehicle Type".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: @@ -330,7 +330,7 @@ class RentalConformationScreen extends StatelessWidget { children: [ Expanded( child: Text( - "Coupons".tr(), + "Coupons".tr, style: AppThemeData.boldTextStyle( fontSize: 16, color: @@ -359,14 +359,14 @@ class RentalConformationScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "This offer not eligible for this booking" - .tr(), + .tr, ); } } }); }, child: Text( - "View All".tr(), + "View All".tr, style: AppThemeData.boldTextStyle( decoration: TextDecoration.underline, fontSize: 14, @@ -416,7 +416,7 @@ class RentalConformationScreen extends StatelessWidget { color: AppThemeData.grey900, ), decoration: InputDecoration( - hintText: "Write coupon code".tr(), + hintText: "Write coupon code".tr, hintStyle: AppThemeData.mediumTextStyle( fontSize: 16, color: AppThemeData.parcelService500, @@ -426,7 +426,7 @@ class RentalConformationScreen extends StatelessWidget { ), ), RoundedButtonFill( - title: "Redeem now".tr(), + title: "Redeem now".tr, onPress: () { if (controller.couponList .where( @@ -470,18 +470,18 @@ class RentalConformationScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "This offer not eligible for this booking" - .tr(), + .tr, ); } } else { ShowToastDialog.showToast( "This coupon code has been expired" - .tr(), + .tr, ); } } else { ShowToastDialog.showToast( - "Invalid coupon code".tr(), + "Invalid coupon code".tr, ); } }, @@ -516,7 +516,7 @@ class RentalConformationScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Order Summary".tr(), + "Order Summary".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: AppThemeData.grey500, @@ -526,7 +526,7 @@ class RentalConformationScreen extends StatelessWidget { // Subtotal _summaryTile( - "Subtotal".tr(), + "Subtotal".tr, Constant.amountShow( amount: controller.subTotal.value.toString(), @@ -537,7 +537,7 @@ class RentalConformationScreen extends StatelessWidget { // Discount _summaryTile( - "Discount".tr(), + "Discount".tr, Constant.amountShow( amount: controller.discount.value.toString(), @@ -590,7 +590,7 @@ class RentalConformationScreen extends StatelessWidget { // Total _summaryTile( - "Order Total".tr(), + "Order Total".tr, Constant.amountShow( amount: controller.totalAmount.value.toString(), @@ -603,7 +603,7 @@ class RentalConformationScreen extends StatelessWidget { ), SizedBox(height: 20), RoundedButtonFill( - title: "Book now".tr(), + title: "Book now".tr, onPress: () { controller.placeOrder(); }, diff --git a/lib/screen_ui/rental_service/rental_coupon_screen.dart b/lib/screen_ui/rental_service/rental_coupon_screen.dart index c1e2c6b..dbd31ce 100644 --- a/lib/screen_ui/rental_service/rental_coupon_screen.dart +++ b/lib/screen_ui/rental_service/rental_coupon_screen.dart @@ -6,9 +6,9 @@ import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/widget/my_separator.dart'; import 'package:dotted_border/dotted_border.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; class RentalCouponScreen extends StatelessWidget { const RentalCouponScreen({super.key}); @@ -51,7 +51,7 @@ class RentalCouponScreen extends StatelessWidget { ), const SizedBox(width: 10), Text( - "Coupon".tr(), + "Coupon".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -65,7 +65,7 @@ class RentalCouponScreen extends StatelessWidget { controller.isLoading.value ? Constant.loader() : controller.cabCouponList.isEmpty - ? Constant.showEmptyView(message: "Coupon not found".tr()) + ? Constant.showEmptyView(message: "Coupon not found".tr) : ListView.builder( shrinkWrap: true, itemCount: controller.cabCouponList.length, @@ -108,7 +108,7 @@ class RentalCouponScreen extends StatelessWidget { child: RotatedBox( quarterTurns: -1, child: Text( - "${couponModel.discountType == "Fix Price" ? Constant.amountShow(amount: couponModel.discount) : "${couponModel.discount}%"} ${'Off'.tr()}", + "${couponModel.discountType == "Fix Price" ? Constant.amountShow(amount: couponModel.discount) : "${couponModel.discount}%"} ${'Off'.tr}", textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.semiBold, @@ -179,7 +179,7 @@ class RentalCouponScreen extends StatelessWidget { Get.back(result: couponModel); }, child: Text( - "Tap To Apply".tr(), + "Tap To Apply".tr, textAlign: TextAlign.start, style: TextStyle( fontFamily: AppThemeData.medium, diff --git a/lib/screen_ui/rental_service/rental_dashboard_screen.dart b/lib/screen_ui/rental_service/rental_dashboard_screen.dart index 549f827..4d7d14a 100644 --- a/lib/screen_ui/rental_service/rental_dashboard_screen.dart +++ b/lib/screen_ui/rental_service/rental_dashboard_screen.dart @@ -2,10 +2,10 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/cab_dashboard_controller.dart'; import 'package:customer/controllers/theme_controller.dart'; import 'package:customer/themes/app_them_data.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/cab_rental_dashboard_controllers.dart'; class RentalDashboardScreen extends StatelessWidget { @@ -52,21 +52,21 @@ class RentalDashboardScreen extends StatelessWidget { isDark, index: 0, assetIcon: "assets/icons/ic_home_cab.svg", - label: 'Home'.tr(), + label: 'Home'.tr, controller: controller, ), navigationBarItem( isDark, index: 1, assetIcon: "assets/icons/ic_booking_cab.svg", - label: 'My Bookings'.tr(), + label: 'My Bookings'.tr, controller: controller, ), navigationBarItem( isDark, index: 2, assetIcon: "assets/icons/ic_profile.svg", - label: 'Profile'.tr(), + label: 'Profile'.tr, controller: controller, ), ] @@ -75,28 +75,28 @@ class RentalDashboardScreen extends StatelessWidget { isDark, index: 0, assetIcon: "assets/icons/ic_home_cab.svg", - label: 'Home'.tr(), + label: 'Home'.tr, controller: controller, ), navigationBarItem( isDark, index: 1, assetIcon: "assets/icons/ic_booking_cab.svg", - label: 'My Bookings'.tr(), + label: 'My Bookings'.tr, controller: controller, ), navigationBarItem( isDark, index: 2, assetIcon: "assets/icons/ic_wallet_cab.svg", - label: 'Wallet'.tr(), + label: 'Wallet'.tr, controller: controller, ), navigationBarItem( isDark, index: 3, assetIcon: "assets/icons/ic_profile.svg", - label: 'Profile'.tr(), + label: 'Profile'.tr, controller: controller, ), ], diff --git a/lib/screen_ui/rental_service/rental_home_screen.dart b/lib/screen_ui/rental_service/rental_home_screen.dart index 0ba3a0d..9da2218 100644 --- a/lib/screen_ui/rental_service/rental_home_screen.dart +++ b/lib/screen_ui/rental_service/rental_home_screen.dart @@ -1,8 +1,9 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:customer/constant/constant.dart'; -import 'package:easy_localization/easy_localization.dart'; +import 'package:customer/utils/app_router.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/rental_home_controller.dart'; import '../../controllers/theme_controller.dart'; import '../../models/rental_vehicle_type.dart'; @@ -71,7 +72,7 @@ class RentalHomeScreen extends StatelessWidget { Get.offAll(const LoginScreen()); }, child: Text( - "Login".tr(), + "Login".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: AppThemeData.grey900, @@ -131,7 +132,7 @@ class RentalHomeScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "Service is unavailable at the selected address." - .tr(), + .tr, ); } } @@ -167,7 +168,7 @@ class RentalHomeScreen extends StatelessWidget { } else { ShowToastDialog.showToast( "Service is unavailable at the selected address." - .tr(), + .tr, ); } } @@ -178,8 +179,8 @@ class RentalHomeScreen extends StatelessWidget { child: TextFieldWidget( controller: controller.sourceTextEditController.value, - hintText: "Your current location".tr(), - title: "Pickup Location".tr(), + hintText: "Your current location".tr, + title: "Pickup Location".tr, enable: false, prefix: Padding( padding: EdgeInsets.only(left: 10, right: 10), @@ -196,7 +197,7 @@ class RentalHomeScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( - "Select Your Vehicle Type".tr(), + "Select Your Vehicle Type".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: @@ -407,20 +408,20 @@ class RentalHomeScreen extends StatelessWidget { ), const SizedBox(height: 25), RoundedButtonFill( - title: "Continue".tr(), + title: "Continue".tr, onPress: () async { final sourceText = controller.sourceTextEditController.value.text .trim(); if (Constant.userModel == null) { ShowToastDialog.showToast( - "Please login to continue".tr(), + "Please login to continue".tr, ); return; } if (sourceText.isEmpty) { ShowToastDialog.showToast( - "Please select source location".tr(), + "Please select source location".tr, ); return; } @@ -428,7 +429,7 @@ class RentalHomeScreen extends StatelessWidget { if (controller.selectedVehicleType.value == null) { ShowToastDialog.showToast( - "Please select a vehicle type".tr(), + "Please select a vehicle type".tr, ); return; } @@ -438,7 +439,7 @@ class RentalHomeScreen extends StatelessWidget { if (controller.rentalPackages.isEmpty) { ShowToastDialog.showToast( "No preference available for the selected vehicle type" - .tr(), + .tr, ); return; } @@ -502,7 +503,7 @@ class RentalHomeScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.symmetric(vertical: 10), child: Text( - "Select Preferences".tr(), + "Select Preferences".tr, style: TextStyle( fontWeight: FontWeight.bold, fontSize: 18, @@ -627,7 +628,7 @@ class RentalHomeScreen extends StatelessWidget { const SizedBox(height: 10), RoundedButtonFill( - title: "Continue".tr(), + title: "Continue".tr, onPress: () { Get.bottomSheet( paymentBottomSheet(context, controller, isDark), @@ -675,7 +676,7 @@ class RentalHomeScreen extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "Select Payment Method".tr(), + "Select Payment Method".tr, style: AppThemeData.mediumTextStyle( fontSize: 18, color: @@ -699,7 +700,7 @@ class RentalHomeScreen extends StatelessWidget { controller: scrollController, children: [ Text( - "Preferred Payment".tr(), + "Preferred Payment".tr, style: AppThemeData.boldTextStyle( fontSize: 15, color: @@ -772,7 +773,7 @@ class RentalHomeScreen extends StatelessWidget { children: [ const SizedBox(height: 10), Text( - "Other Payment Options".tr(), + "Other Payment Options".tr, style: AppThemeData.boldTextStyle( fontSize: 15, color: @@ -923,13 +924,13 @@ class RentalHomeScreen extends StatelessWidget { // Continue button RoundedButtonFill( - title: "Continue".tr(), + title: "Continue".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey900, onPress: () async { if (controller.selectedPaymentMethod.value.isEmpty) { ShowToastDialog.showToast( - "Please select a payment method".tr(), + "Please select a payment method".tr, ); return; } @@ -948,7 +949,7 @@ class RentalHomeScreen extends StatelessWidget { if (walletAmount < baseFare) { ShowToastDialog.showToast( - "You do not have sufficient wallet balance".tr(), + "You do not have sufficient wallet balance".tr, ); return; } diff --git a/lib/screen_ui/rental_service/rental_order_details_screen.dart b/lib/screen_ui/rental_service/rental_order_details_screen.dart index a6c0821..74edf80 100644 --- a/lib/screen_ui/rental_service/rental_order_details_screen.dart +++ b/lib/screen_ui/rental_service/rental_order_details_screen.dart @@ -7,11 +7,11 @@ import 'package:customer/screen_ui/rental_service/rental_review_screen.dart'; import 'package:customer/themes/responsive.dart'; import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/utils/network_image_widget.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/rental_order_details_controller.dart'; import '../../controllers/theme_controller.dart'; import '../../models/user_model.dart'; @@ -64,7 +64,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { ), const SizedBox(width: 10), Text( - "Order Details".tr(), + "Order Details".tr, style: AppThemeData.boldTextStyle( fontSize: 18, color: AppThemeData.grey900, @@ -110,7 +110,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - "${'Booking Id :'.tr()} ${controller.order.value.id}", + "${'Booking Id :'.tr} ${controller.order.value.id}", style: AppThemeData.semiBoldTextStyle( fontSize: 16, @@ -134,7 +134,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { ); ShowToastDialog.showToast( "Booking ID copied to clipboard" - .tr(), + .tr, ); }, child: Icon(Icons.copy), @@ -233,7 +233,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Your Preference".tr(), + "Your Preference".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: @@ -344,7 +344,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "About Driver".tr(), + "About Driver".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: @@ -496,8 +496,8 @@ class RentalOrderDetailsScreen extends StatelessWidget { .value .id! .isNotEmpty - ? 'Update Review'.tr() - : 'Add Review'.tr(), + ? 'Update Review'.tr + : 'Add Review'.tr, onPress: () async { final result = await Get.to( () => @@ -588,7 +588,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { InkWell( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr(), + "Please wait...".tr, ); UserModel? customer = @@ -703,7 +703,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Vehicle Type".tr(), + "Vehicle Type".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: @@ -808,7 +808,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Rental Details".tr(), + "Rental Details".tr, style: AppThemeData.boldTextStyle( fontSize: 16, color: @@ -831,7 +831,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - 'Rental Package'.tr(), + 'Rental Package'.tr, textAlign: TextAlign.start, style: AppThemeData.mediumTextStyle( @@ -852,7 +852,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { .rentalPackageModel! .name .toString() - .tr(), + .tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( @@ -876,7 +876,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - 'Rental Package Price'.tr(), + 'Rental Package Price'.tr, textAlign: TextAlign.start, style: AppThemeData.mediumTextStyle( @@ -899,7 +899,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { .rentalPackageModel! .baseFare .toString(), - ).tr(), + ).tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( @@ -923,7 +923,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - '${'Including'.tr()} ${Constant.distanceType.tr()}', + '${'Including'.tr} ${Constant.distanceType.tr}', textAlign: TextAlign.start, style: AppThemeData.mediumTextStyle( @@ -939,7 +939,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { ), Text( "${controller.order.value.rentalPackageModel!.includedDistance.toString()} ${Constant.distanceType}" - .tr(), + .tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( @@ -963,7 +963,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - 'Including Hours'.tr(), + 'Including Hours'.tr, textAlign: TextAlign.start, style: AppThemeData.mediumTextStyle( @@ -978,8 +978,8 @@ class RentalOrderDetailsScreen extends StatelessWidget { ), ), Text( - "${controller.order.value.rentalPackageModel!.includedHours.toString()} ${'Hr'.tr()}" - .tr(), + "${controller.order.value.rentalPackageModel!.includedHours.toString()} ${'Hr'.tr}" + .tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( @@ -1003,7 +1003,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - '${'Extra'.tr()} ${Constant.distanceType}', + '${'Extra'.tr} ${Constant.distanceType}', textAlign: TextAlign.start, style: AppThemeData.mediumTextStyle( @@ -1065,7 +1065,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { children: [ Expanded( child: Text( - 'Extra Minutes'.tr(), + 'Extra Minutes'.tr, textAlign: TextAlign.start, style: AppThemeData.mediumTextStyle( @@ -1080,7 +1080,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { ), ), Text( - "${controller.order.value.endTime == null ? "0" : (((controller.order.value.endTime!.toDate().difference(controller.order.value.startTime!.toDate()).inMinutes) - (int.parse(controller.order.value.rentalPackageModel!.includedHours.toString()) * 60)).clamp(0, double.infinity).toInt().toString())} ${'Min'.tr()}", + "${controller.order.value.endTime == null ? "0" : (((controller.order.value.endTime!.toDate().difference(controller.order.value.startTime!.toDate()).inMinutes) - (int.parse(controller.order.value.rentalPackageModel!.includedHours.toString()) * 60)).clamp(0, double.infinity).toInt().toString())} ${'Min'.tr}", textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( @@ -1121,7 +1121,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { CrossAxisAlignment.start, children: [ Text( - "Order Summary".tr(), + "Order Summary".tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: AppThemeData.grey500, @@ -1130,7 +1130,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { const SizedBox(height: 8), _summaryTile( - "Subtotal".tr(), + "Subtotal".tr, Constant.amountShow( amount: controller.subTotal.value @@ -1140,7 +1140,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { null, ), _summaryTile( - "Discount".tr(), + "Discount".tr, Constant.amountShow( amount: controller.discount.value @@ -1189,7 +1189,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { const Divider(), _summaryTile( - "Order Total".tr(), + "Order Total".tr, Constant.amountShow( amount: controller.totalAmount.value @@ -1237,7 +1237,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { .isEmpty) { ShowToastDialog.showToast( "You are not able to pay now until driver adds kilometer" - .tr(), + .tr, ); } else { Get.bottomSheet( @@ -1338,7 +1338,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "Select Payment Method".tr(), + "Select Payment Method".tr, style: AppThemeData.mediumTextStyle( fontSize: 18, color: @@ -1362,7 +1362,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { controller: scrollController, children: [ Text( - "Preferred Payment".tr(), + "Preferred Payment".tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( fontSize: 15, @@ -1434,7 +1434,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { children: [ const SizedBox(height: 10), Text( - "Other Payment Options".tr(), + "Other Payment Options".tr, textAlign: TextAlign.start, style: AppThemeData.boldTextStyle( fontSize: 15, @@ -1582,13 +1582,13 @@ class RentalOrderDetailsScreen extends StatelessWidget { ), ), RoundedButtonFill( - title: "Continue".tr(), + title: "Continue".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey900, onPress: () async { if (controller.selectedPaymentMethod.value.isEmpty) { ShowToastDialog.showToast( - "Please select a payment method".tr(), + "Please select a payment method".tr, ); } else { if (controller.selectedPaymentMethod.value == @@ -1634,7 +1634,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { Constant.userModel!.walletAmount! < controller.totalAmount.value) { ShowToastDialog.showToast( - "You do not have sufficient wallet balance".tr(), + "You do not have sufficient wallet balance".tr, ); } else { controller.completeOrder(); @@ -1674,7 +1674,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { Get.back(); ShowToastDialog.showToast( "Something went wrong, please contact admin." - .tr(), + .tr, ); } else { CreateRazorPayOrderModel result = value; @@ -1686,7 +1686,7 @@ class RentalOrderDetailsScreen extends StatelessWidget { }); } else { ShowToastDialog.showToast( - "Please select payment method".tr(), + "Please select payment method".tr, ); } } diff --git a/lib/screen_ui/rental_service/rental_review_screen.dart b/lib/screen_ui/rental_service/rental_review_screen.dart index d5fd8fb..140776d 100644 --- a/lib/screen_ui/rental_service/rental_review_screen.dart +++ b/lib/screen_ui/rental_service/rental_review_screen.dart @@ -1,7 +1,6 @@ -import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_rating_bar/flutter_rating_bar.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../constant/constant.dart'; import '../../controllers/rental_review_controller.dart'; import '../../controllers/theme_controller.dart'; @@ -35,8 +34,8 @@ class RentalReviewScreen extends StatelessWidget { ), title: Text( controller.ratingModel.value != null - ? "Update Review".tr() - : "Add Review".tr(), + ? "Update Review".tr + : "Add Review".tr, style: TextStyle( color: isDark ? Colors.white : Colors.black, fontSize: 16, @@ -136,7 +135,7 @@ class RentalReviewScreen extends StatelessWidget { Padding( padding: const EdgeInsets.only(top: 16), child: Text( - 'How is your trip?'.tr(), + 'How is your trip?'.tr, style: TextStyle( fontSize: 18, color: @@ -152,7 +151,7 @@ class RentalReviewScreen extends StatelessWidget { padding: const EdgeInsets.only(top: 8), child: Text( 'Your feedback will help us improve \n driving experience better' - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle( color: @@ -170,7 +169,7 @@ class RentalReviewScreen extends StatelessWidget { Padding( padding: const EdgeInsets.only(top: 20), child: Text( - 'Rate for'.tr(), + 'Rate for'.tr, style: TextStyle( fontSize: 16, color: @@ -229,7 +228,7 @@ class RentalReviewScreen extends StatelessWidget { Padding( padding: const EdgeInsets.all(20.0), child: TextFieldWidget( - hintText: "Type comment....".tr(), + hintText: "Type comment....".tr, controller: controller.comment.value, maxLine: 5, ), diff --git a/lib/screen_ui/service_home_screen/service_list_screen.dart b/lib/screen_ui/service_home_screen/service_list_screen.dart index 6b45339..ec76d86 100644 --- a/lib/screen_ui/service_home_screen/service_list_screen.dart +++ b/lib/screen_ui/service_home_screen/service_list_screen.dart @@ -1,10 +1,10 @@ import 'dart:developer'; import 'package:customer/constant/const_texts.dart'; import 'package:customer/models/section_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/service_list_controller.dart'; import '../../themes/app_them_data.dart'; import '../../utils/network_image_widget.dart'; @@ -68,7 +68,7 @@ class ServiceListScreen extends StatelessWidget { Padding( padding: EdgeInsets.symmetric(horizontal: 16.r), child: Text( - ConstTexts.otherServices.tr(), + ConstTexts.otherServices.tr, style: TextStyle( fontFamily: AppThemeData.bold, fontWeight: FontWeight.w700, @@ -82,23 +82,23 @@ class ServiceListScreen extends StatelessWidget { // Other Services Section _otherServicesCardMaker( image: "assets/images/garderob_img.png", - title: ConstTexts.updateYourWardrobe.tr(), - subtitle: ConstTexts.weDeliverSafely.tr(), + title: ConstTexts.updateYourWardrobe.tr, + subtitle: ConstTexts.weDeliverSafely.tr, ), _otherServicesCardMaker( image: "assets/images/keys_img.png", - title: ConstTexts.rent.tr(), - subtitle: ConstTexts.hugeSelectionOfAds.tr(), + title: ConstTexts.rent.tr, + subtitle: ConstTexts.hugeSelectionOfAds.tr, ), _otherServicesCardMaker( image: "assets/images/cosmetics_img.png", - title: ConstTexts.cosmetics.tr(), - subtitle: ConstTexts.moreThan1000Products.tr(), + title: ConstTexts.cosmetics.tr, + subtitle: ConstTexts.moreThan1000Products.tr, ), _otherServicesCardMaker( image: "assets/images/products_img.png", - title: ConstTexts.foodProducts.tr(), - subtitle: ConstTexts.moreThan1000Products.tr(), + title: ConstTexts.foodProducts.tr, + subtitle: ConstTexts.moreThan1000Products.tr, ), SizedBox(height: 45.h), ], @@ -209,7 +209,7 @@ class ServiceListScreen extends StatelessWidget { spacing: 12.r, children: [ _mainCardsMaker( - title: ConstTexts.foodDelivery.tr(), + title: ConstTexts.foodDelivery.tr, image: "assets/images/food_img.png", // onTap: () { // log("Main Card Tapped"); @@ -227,7 +227,7 @@ class ServiceListScreen extends StatelessWidget { // }, ), _mainCardsMaker( - title: ConstTexts.delivery.tr(), + title: ConstTexts.delivery.tr, image: "assets/images/delivery_img.png", onTap: () { log("Main Card Tapped"); @@ -276,7 +276,7 @@ class ServiceListScreen extends StatelessWidget { Expanded( child: Text( maxLines: 2, - ConstTexts.bookingTaxi.tr(), + ConstTexts.bookingTaxi.tr, style: TextStyle( overflow: TextOverflow.ellipsis, fontFamily: AppThemeData.bold, diff --git a/lib/screen_ui/splash_screen/splash_screen.dart b/lib/screen_ui/splash_screen/splash_screen.dart index 3e6951f..4777563 100644 --- a/lib/screen_ui/splash_screen/splash_screen.dart +++ b/lib/screen_ui/splash_screen/splash_screen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../../controllers/splash_controller.dart'; import '../../themes/app_them_data.dart'; diff --git a/lib/service/cart_provider.dart b/lib/service/cart_provider.dart index bc2ccdb..08f4e54 100644 --- a/lib/service/cart_provider.dart +++ b/lib/service/cart_provider.dart @@ -3,9 +3,9 @@ import 'dart:developer'; import 'package:customer/constant/constant.dart'; import 'package:customer/models/cart_product_model.dart'; import 'package:customer/themes/custom_dialog_box.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'database_helper.dart'; class CartProvider with ChangeNotifier { @@ -56,12 +56,12 @@ class CartProvider with ChangeNotifier { context: context, builder: (BuildContext context) { return CustomDialogBox( - title: "Alert".tr(), + title: "Alert".tr, descriptions: "Your cart already contains items from another restaurant. Would you like to replace them with items from this restaurant instead?" - .tr(), - positiveString: "Add".tr(), - negativeString: "Cancel".tr(), + .tr, + positiveString: "Add".tr, + negativeString: "Cancel".tr, positiveClick: () async { cartItem.clear(); _cartItems.clear(); diff --git a/lib/service/fire_store_utils.dart b/lib/service/fire_store_utils.dart index d5d0d23..558cb8d 100644 --- a/lib/service/fire_store_utils.dart +++ b/lib/service/fire_store_utils.dart @@ -9,12 +9,12 @@ import 'package:customer/models/rental_order_model.dart'; import 'package:customer/models/rental_package_model.dart'; import 'package:customer/models/user_model.dart'; import 'package:customer/models/zone_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:firebase_auth/firebase_auth.dart' as auth; import 'package:firebase_storage/firebase_storage.dart'; import 'package:flutter/cupertino.dart'; import 'package:geocoding/geocoding.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:intl/intl.dart'; import 'package:uuid/uuid.dart'; import 'package:video_compress/video_compress.dart'; @@ -205,7 +205,7 @@ class FireStoreUtils { .set(ratingModel.toJson()); } catch (e, s) { print('FireStoreUtils.referralAdd $e $s'); - return "Couldn't review".tr(); + return "Couldn't review".tr; } return null; } @@ -2069,7 +2069,7 @@ class FireStoreUtils { File image, BuildContext context, ) async { - ShowToastDialog.showLoader("Please wait".tr()); + ShowToastDialog.showLoader("Please wait".tr); var uniqueID = const Uuid().v4(); Reference upload = FirebaseStorage.instance.ref().child( 'images/$uniqueID.png', @@ -2404,8 +2404,8 @@ class FireStoreUtils { // userId: FireStoreUtils.getCurrentUid(), // isTopup: false, // orderId: orderModel.id, - // note: "Order Amount debited".tr(), - // paymentStatus: "success".tr(), + // note: "Order Amount debited".tr, + // paymentStatus: "success".tr, // ); // // await FireStoreUtils.setWalletTransaction(transactionModel).then((value) async { @@ -2950,12 +2950,12 @@ class FireStoreUtils { String firstHTML = """ - + - + """; @@ -3000,12 +3000,12 @@ class FireStoreUtils { } String product = """ - + - + """; htmlList.add(product); diff --git a/lib/service/localization_service.dart b/lib/service/localization_service.dart index 92cfb47..cfd87c1 100644 --- a/lib/service/localization_service.dart +++ b/lib/service/localization_service.dart @@ -1,20 +1,37 @@ +import 'dart:convert'; +import 'package:flutter/services.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; -import '../lang/app_en.dart'; +import 'package:get/get.dart'; class LocalizationService extends Translations { - // Default locale - static const locale = Locale('en', 'US'); + static Map> _keys = {}; - static final locales = [const Locale('en')]; + static const fallbackLocale = Locale('en', 'US'); + + static const supportedLocales = [ + Locale('en', 'US'), + Locale('uz', 'UZ'), + Locale('ru', 'RU'), + ]; - // Keys and their translations - // Translations are separated maps in `lang` file @override - Map> get keys => {'en_US': enUS}; + Map> get keys => _keys; - // Gets locale from language, and updates the locale - void changeLocale(String lang) { - Get.updateLocale(Locale(lang)); + // Load JSONs before starting the app + static Future init() async { + _keys = { + "en_US": await _loadJson("assets/translations/en.json"), + "uz_UZ": await _loadJson("assets/translations/uz.json"), + "ru_RU": await _loadJson("assets/translations/ru.json"), + }; + } + + static Future> _loadJson(String path) async { + final data = await rootBundle.loadString(path); + return Map.from(json.decode(data)); + } + + static void changeLocale(Locale locale) { + Get.updateLocale(locale); } } diff --git a/lib/themes/custom_dialog_box.dart b/lib/themes/custom_dialog_box.dart index 9b3d6da..ccfffcd 100644 --- a/lib/themes/custom_dialog_box.dart +++ b/lib/themes/custom_dialog_box.dart @@ -1,7 +1,7 @@ import 'package:customer/themes/responsive.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../controllers/theme_controller.dart'; import 'app_them_data.dart'; @@ -53,7 +53,7 @@ class CustomDialogBox extends StatelessWidget { const SizedBox(height: 20), if (title.isNotEmpty) Text( - title.tr(), + title.tr, style: AppThemeData.boldTextStyle( fontSize: 20, color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900, @@ -62,7 +62,7 @@ class CustomDialogBox extends StatelessWidget { const SizedBox(height: 5), if (descriptions.isNotEmpty) Text( - descriptions.tr(), + descriptions.tr, textAlign: TextAlign.center, style: AppThemeData.regularTextStyle( fontSize: 14, @@ -87,7 +87,7 @@ class CustomDialogBox extends StatelessWidget { ), child: Center( child: Text( - negativeString.tr(), + negativeString.tr, textAlign: TextAlign.center, style: AppThemeData.mediumTextStyle( fontSize: 14, @@ -114,7 +114,7 @@ class CustomDialogBox extends StatelessWidget { ), child: Center( child: Text( - 'Confirm'.tr(), + 'Confirm'.tr, textAlign: TextAlign.center, style: AppThemeData.mediumTextStyle( fontSize: 14, diff --git a/lib/themes/easy_loading_config.dart b/lib/themes/easy_loading_config.dart index 6735481..a48db16 100644 --- a/lib/themes/easy_loading_config.dart +++ b/lib/themes/easy_loading_config.dart @@ -1,7 +1,7 @@ import 'package:customer/themes/app_them_data.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../controllers/theme_controller.dart'; Future configEasyLoading() async { diff --git a/lib/themes/round_button_border.dart b/lib/themes/round_button_border.dart index 3b1eb2c..12d0c61 100644 --- a/lib/themes/round_button_border.dart +++ b/lib/themes/round_button_border.dart @@ -1,8 +1,8 @@ import 'package:customer/controllers/theme_controller.dart'; import 'package:customer/themes/responsive.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'app_them_data.dart'; class RoundedButtonBorder extends StatelessWidget { @@ -65,7 +65,7 @@ class RoundedButtonBorder extends StatelessWidget { ), isCenter == true ? Text( - title.tr(), + title.tr, textAlign: TextAlign.center, style: AppThemeData.semiBoldTextStyle( fontSize: fontSizes ?? 14, @@ -76,7 +76,7 @@ class RoundedButtonBorder extends StatelessWidget { child: Padding( padding: EdgeInsets.only(right: isRight == null ? 0 : 30), child: Text( - title.tr(), + title.tr, textAlign: TextAlign.center, style: AppThemeData.semiBoldTextStyle( fontSize: fontSizes ?? 14, diff --git a/lib/themes/round_button_fill.dart b/lib/themes/round_button_fill.dart index 4b50524..7ae0005 100644 --- a/lib/themes/round_button_fill.dart +++ b/lib/themes/round_button_fill.dart @@ -1,7 +1,7 @@ import 'package:customer/themes/responsive.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'app_them_data.dart'; class RoundedButtonFill extends StatelessWidget { @@ -62,7 +62,7 @@ class RoundedButtonFill extends StatelessWidget { ), isCenter == true ? Text( - title.tr(), + title.tr, textAlign: TextAlign.center, style: AppThemeData.semiBoldTextStyle( fontSize: fontSizes ?? 16, @@ -73,7 +73,7 @@ class RoundedButtonFill extends StatelessWidget { child: Padding( padding: EdgeInsets.only(right: isRight == null ? 0 : 30), child: Text( - title.tr(), + title.tr, textAlign: TextAlign.center, style: AppThemeData.semiBoldTextStyle( fontSize: fontSizes ?? 16, diff --git a/lib/themes/text_field_widget.dart b/lib/themes/text_field_widget.dart index 44c3e57..8b53c35 100644 --- a/lib/themes/text_field_widget.dart +++ b/lib/themes/text_field_widget.dart @@ -1,8 +1,7 @@ -import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../controllers/theme_controller.dart'; import 'app_them_data.dart'; @@ -104,7 +103,7 @@ class _TextFieldWidgetState extends State { children: [ if (widget.title != null) ...[ Text( - widget.title!.tr(), + widget.title!.tr, style: AppThemeData.boldTextStyle( fontSize: 14, color: isDark ? AppThemeData.greyDark800 : AppThemeData.grey800, @@ -166,7 +165,7 @@ class _TextFieldWidgetState extends State { borderRadius: BorderRadius.circular(8), borderSide: BorderSide(color: borderColor), ), - hintText: widget.hintText.tr(), + hintText: widget.hintText.tr, hintStyle: AppThemeData.regularTextStyle( fontSize: 14.sp, color: hintColor, diff --git a/lib/utils/notification_service.dart b/lib/utils/notification_service.dart index 1832fcb..8b13c65 100644 --- a/lib/utils/notification_service.dart +++ b/lib/utils/notification_service.dart @@ -9,25 +9,51 @@ Future firebaseMessageBackgroundHandle(RemoteMessage message) async { } class NotificationService { - FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin(); + FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = + FlutterLocalNotificationsPlugin(); Future initInfo() async { - await FirebaseMessaging.instance.setForegroundNotificationPresentationOptions(alert: true, badge: true, sound: true); - var request = await FirebaseMessaging.instance.requestPermission(alert: true, announcement: false, badge: true, carPlay: false, criticalAlert: false, provisional: false, sound: true); + await FirebaseMessaging.instance + .setForegroundNotificationPresentationOptions( + alert: true, + badge: true, + sound: true, + ); + var request = await FirebaseMessaging.instance.requestPermission( + alert: true, + announcement: false, + badge: true, + carPlay: false, + criticalAlert: false, + provisional: false, + sound: true, + ); - if (request.authorizationStatus == AuthorizationStatus.authorized || request.authorizationStatus == AuthorizationStatus.provisional) { - const AndroidInitializationSettings initializationSettingsAndroid = AndroidInitializationSettings('@mipmap/ic_launcher'); + if (request.authorizationStatus == AuthorizationStatus.authorized || + request.authorizationStatus == AuthorizationStatus.provisional) { + const AndroidInitializationSettings initializationSettingsAndroid = + AndroidInitializationSettings('@mipmap/ic_launcher'); var iosInitializationSettings = const DarwinInitializationSettings(); - final InitializationSettings initializationSettings = InitializationSettings(android: initializationSettingsAndroid, iOS: iosInitializationSettings); - await flutterLocalNotificationsPlugin.initialize(initializationSettings, onDidReceiveNotificationResponse: (payload) {}); + final InitializationSettings initializationSettings = + InitializationSettings( + android: initializationSettingsAndroid, + iOS: iosInitializationSettings, + ); + await flutterLocalNotificationsPlugin.initialize( + initializationSettings, + onDidReceiveNotificationResponse: (payload) {}, + ); setupInteractedMessage(); } } Future setupInteractedMessage() async { - RemoteMessage? initialMessage = await FirebaseMessaging.instance.getInitialMessage(); + RemoteMessage? initialMessage = + await FirebaseMessaging.instance.getInitialMessage(); if (initialMessage != null) { - FirebaseMessaging.onBackgroundMessage((message) => firebaseMessageBackgroundHandle(message)); + FirebaseMessaging.onBackgroundMessage( + (message) => firebaseMessageBackgroundHandle(message), + ); } FirebaseMessaging.onMessage.listen((RemoteMessage message) { @@ -103,18 +129,38 @@ class NotificationService { log('Got a message whilst in the foreground!'); log('Message data: ${message.notification!.body.toString()}'); try { - AndroidNotificationChannel channel = const AndroidNotificationChannel('0', 'eMart customer', description: 'Show eMart Notification', importance: Importance.max); - AndroidNotificationDetails notificationDetails = AndroidNotificationDetails( - channel.id, - channel.name, - channelDescription: 'your channel Description', - importance: Importance.high, - priority: Priority.high, - ticker: 'ticker', + AndroidNotificationChannel channel = const AndroidNotificationChannel( + '0', + 'eMart customer', + description: 'Show eMart Notification', + importance: Importance.max, + ); + AndroidNotificationDetails notificationDetails = + AndroidNotificationDetails( + channel.id, + channel.name, + channelDescription: 'your channel Description', + importance: Importance.high, + priority: Priority.high, + ticker: 'ticker', + ); + const DarwinNotificationDetails darwinNotificationDetails = + DarwinNotificationDetails( + presentAlert: true, + presentBadge: true, + presentSound: true, + ); + NotificationDetails notificationDetailsBoth = NotificationDetails( + android: notificationDetails, + iOS: darwinNotificationDetails, + ); + await FlutterLocalNotificationsPlugin().show( + 0, + message.notification!.title, + message.notification!.body, + notificationDetailsBoth, + payload: jsonEncode(message.data), ); - const DarwinNotificationDetails darwinNotificationDetails = DarwinNotificationDetails(presentAlert: true, presentBadge: true, presentSound: true); - NotificationDetails notificationDetailsBoth = NotificationDetails(android: notificationDetails, iOS: darwinNotificationDetails); - await FlutterLocalNotificationsPlugin().show(0, message.notification!.title, message.notification!.body, notificationDetailsBoth, payload: jsonEncode(message.data)); } on Exception catch (e) { log(e.toString()); } diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 8b44e86..97b5582 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -1,7 +1,8 @@ import 'package:customer/constant/constant.dart'; import 'package:customer/widget/place_picker/selected_location_model.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:geolocator/geolocator.dart'; +import 'package:get/get.dart'; import 'package:map_launcher/map_launcher.dart'; import '../themes/show_toast_dialog.dart'; @@ -37,7 +38,9 @@ class Utils { if (permission == LocationPermission.deniedForever) { // Permissions are denied forever, handle appropriately. - return Future.error('Location permissions are permanently denied, we cannot request permissions.'); + return Future.error( + 'Location permissions are permanently denied, we cannot request permissions.', + ); } // When we reach here, permissions are granted and we can @@ -45,12 +48,16 @@ class Utils { return await Geolocator.getCurrentPosition(); } - static Future getAddressFromCoordinates(double lat, double lng) async { + static Future getAddressFromCoordinates( + double lat, + double lng, + ) async { try { List placemarks = await placemarkFromCoordinates(lat, lng); if (placemarks.isNotEmpty) { Placemark place = placemarks.first; - String address = "${place.name ?? ''}, ${place.subLocality ?? ''}, ${place.locality ?? ''}, ${place.administrativeArea ?? ''}, ${place.country ?? ''}"; + String address = + "${place.name ?? ''}, ${place.subLocality ?? ''}, ${place.locality ?? ''}, ${place.administrativeArea ?? ''}, ${place.country ?? ''}"; return address; } return "Unknown location"; @@ -59,67 +66,122 @@ class Utils { } } - static Future redirectMap({required String name, required double latitude, required double longLatitude}) async { + static Future redirectMap({ + required String name, + required double latitude, + required double longLatitude, + }) async { if (Constant.mapType == "google") { bool? isAvailable = await MapLauncher.isMapAvailable(MapType.google); if (isAvailable == true) { - await MapLauncher.showDirections(mapType: MapType.google, directionsMode: DirectionsMode.driving, destinationTitle: name, destination: Coords(latitude, longLatitude)); + await MapLauncher.showDirections( + mapType: MapType.google, + directionsMode: DirectionsMode.driving, + destinationTitle: name, + destination: Coords(latitude, longLatitude), + ); } else { - ShowToastDialog.showToast("Google map is not installed".tr()); + ShowToastDialog.showToast("Google map is not installed".tr); } } else if (Constant.mapType == "googleGo") { bool? isAvailable = await MapLauncher.isMapAvailable(MapType.googleGo); if (isAvailable == true) { - await MapLauncher.showDirections(mapType: MapType.googleGo, directionsMode: DirectionsMode.driving, destinationTitle: name, destination: Coords(latitude, longLatitude)); + await MapLauncher.showDirections( + mapType: MapType.googleGo, + directionsMode: DirectionsMode.driving, + destinationTitle: name, + destination: Coords(latitude, longLatitude), + ); } else { - ShowToastDialog.showToast("Google Go map is not installed".tr()); + ShowToastDialog.showToast("Google Go map is not installed".tr); } } else if (Constant.mapType == "waze") { bool? isAvailable = await MapLauncher.isMapAvailable(MapType.waze); if (isAvailable == true) { - await MapLauncher.showDirections(mapType: MapType.waze, directionsMode: DirectionsMode.driving, destinationTitle: name, destination: Coords(latitude, longLatitude)); + await MapLauncher.showDirections( + mapType: MapType.waze, + directionsMode: DirectionsMode.driving, + destinationTitle: name, + destination: Coords(latitude, longLatitude), + ); } else { - ShowToastDialog.showToast("Waze is not installed".tr()); + ShowToastDialog.showToast("Waze is not installed".tr); } } else if (Constant.mapType == "mapswithme") { bool? isAvailable = await MapLauncher.isMapAvailable(MapType.mapswithme); if (isAvailable == true) { - await MapLauncher.showDirections(mapType: MapType.mapswithme, directionsMode: DirectionsMode.driving, destinationTitle: name, destination: Coords(latitude, longLatitude)); + await MapLauncher.showDirections( + mapType: MapType.mapswithme, + directionsMode: DirectionsMode.driving, + destinationTitle: name, + destination: Coords(latitude, longLatitude), + ); } else { - ShowToastDialog.showToast("Mapswithme is not installed".tr()); + ShowToastDialog.showToast("Mapswithme is not installed".tr); } } else if (Constant.mapType == "yandexNavi") { bool? isAvailable = await MapLauncher.isMapAvailable(MapType.yandexNavi); if (isAvailable == true) { - await MapLauncher.showDirections(mapType: MapType.yandexNavi, directionsMode: DirectionsMode.driving, destinationTitle: name, destination: Coords(latitude, longLatitude)); + await MapLauncher.showDirections( + mapType: MapType.yandexNavi, + directionsMode: DirectionsMode.driving, + destinationTitle: name, + destination: Coords(latitude, longLatitude), + ); } else { - ShowToastDialog.showToast("YandexNavi is not installed".tr()); + ShowToastDialog.showToast("YandexNavi is not installed".tr); } } else if (Constant.mapType == "yandexMaps") { bool? isAvailable = await MapLauncher.isMapAvailable(MapType.yandexMaps); if (isAvailable == true) { - await MapLauncher.showDirections(mapType: MapType.yandexMaps, directionsMode: DirectionsMode.driving, destinationTitle: name, destination: Coords(latitude, longLatitude)); + await MapLauncher.showDirections( + mapType: MapType.yandexMaps, + directionsMode: DirectionsMode.driving, + destinationTitle: name, + destination: Coords(latitude, longLatitude), + ); } else { - ShowToastDialog.showToast("yandexMaps map is not installed".tr()); + ShowToastDialog.showToast("yandexMaps map is not installed".tr); } } } - static String formatAddress({required SelectedLocationModel selectedLocation}) { + static String formatAddress({ + required SelectedLocationModel selectedLocation, + }) { List parts = []; - if (selectedLocation.address!.name != null && selectedLocation.address!.name!.isNotEmpty) parts.add(selectedLocation.address!.name!); - if (selectedLocation.address!.subThoroughfare != null && selectedLocation.address!.subThoroughfare!.isNotEmpty) parts.add(selectedLocation.address!.subThoroughfare!); - if (selectedLocation.address!.thoroughfare != null && selectedLocation.address!.thoroughfare!.isNotEmpty) parts.add(selectedLocation.address!.thoroughfare!); - if (selectedLocation.address!.subLocality != null && selectedLocation.address!.subLocality!.isNotEmpty) parts.add(selectedLocation.address!.subLocality!); - if (selectedLocation.address!.locality != null && selectedLocation.address!.locality!.isNotEmpty) parts.add(selectedLocation.address!.locality!); - if (selectedLocation.address!.subAdministrativeArea != null && selectedLocation.address!.subAdministrativeArea!.isNotEmpty) { + if (selectedLocation.address!.name != null && + selectedLocation.address!.name!.isNotEmpty) + parts.add(selectedLocation.address!.name!); + if (selectedLocation.address!.subThoroughfare != null && + selectedLocation.address!.subThoroughfare!.isNotEmpty) + parts.add(selectedLocation.address!.subThoroughfare!); + if (selectedLocation.address!.thoroughfare != null && + selectedLocation.address!.thoroughfare!.isNotEmpty) + parts.add(selectedLocation.address!.thoroughfare!); + if (selectedLocation.address!.subLocality != null && + selectedLocation.address!.subLocality!.isNotEmpty) + parts.add(selectedLocation.address!.subLocality!); + if (selectedLocation.address!.locality != null && + selectedLocation.address!.locality!.isNotEmpty) + parts.add(selectedLocation.address!.locality!); + if (selectedLocation.address!.subAdministrativeArea != null && + selectedLocation.address!.subAdministrativeArea!.isNotEmpty) { parts.add(selectedLocation.address!.subAdministrativeArea!); } - if (selectedLocation.address!.administrativeArea != null && selectedLocation.address!.administrativeArea!.isNotEmpty) parts.add(selectedLocation.address!.administrativeArea!); - if (selectedLocation.address!.postalCode != null && selectedLocation.address!.postalCode!.isNotEmpty) parts.add(selectedLocation.address!.postalCode!); - if (selectedLocation.address!.country != null && selectedLocation.address!.country!.isNotEmpty) parts.add(selectedLocation.address!.country!); - if (selectedLocation.address!.isoCountryCode != null && selectedLocation.address!.isoCountryCode!.isNotEmpty) parts.add(selectedLocation.address!.isoCountryCode!); + if (selectedLocation.address!.administrativeArea != null && + selectedLocation.address!.administrativeArea!.isNotEmpty) + parts.add(selectedLocation.address!.administrativeArea!); + if (selectedLocation.address!.postalCode != null && + selectedLocation.address!.postalCode!.isNotEmpty) + parts.add(selectedLocation.address!.postalCode!); + if (selectedLocation.address!.country != null && + selectedLocation.address!.country!.isNotEmpty) + parts.add(selectedLocation.address!.country!); + if (selectedLocation.address!.isoCountryCode != null && + selectedLocation.address!.isoCountryCode!.isNotEmpty) + parts.add(selectedLocation.address!.isoCountryCode!); return parts.join(', '); } diff --git a/lib/widget/firebase_pagination/src/widgets/defaults/empty_screen.dart b/lib/widget/firebase_pagination/src/widgets/defaults/empty_screen.dart index 576c3e6..4598366 100644 --- a/lib/widget/firebase_pagination/src/widgets/defaults/empty_screen.dart +++ b/lib/widget/firebase_pagination/src/widgets/defaults/empty_screen.dart @@ -1,7 +1,7 @@ // Flutter Packages -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; /// A [Widget] to show when there is no data to display. class EmptyScreen extends StatelessWidget { @@ -10,6 +10,6 @@ class EmptyScreen extends StatelessWidget { @override Widget build(BuildContext context) { - return Center(child: Text('Nothing found here...'.tr())); + return Center(child: Text('Nothing found here...'.tr)); } } diff --git a/lib/widget/osm_map/map_controller.dart b/lib/widget/osm_map/map_controller.dart index d08d846..7f528fb 100644 --- a/lib/widget/osm_map/map_controller.dart +++ b/lib/widget/osm_map/map_controller.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'package:customer/widget/osm_map/place_model.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:http/http.dart' as http; import '../../utils/utils.dart'; import 'package:latlong2/latlong.dart'; diff --git a/lib/widget/osm_map/map_picker_page.dart b/lib/widget/osm_map/map_picker_page.dart index 6b65246..d5014a1 100644 --- a/lib/widget/osm_map/map_picker_page.dart +++ b/lib/widget/osm_map/map_picker_page.dart @@ -3,11 +3,11 @@ import 'dart:developer'; import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/widget/osm_map/map_controller.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:latlong2/latlong.dart'; import '../../controllers/theme_controller.dart'; @@ -28,7 +28,7 @@ class MapPickerPage extends StatelessWidget { // centerTitle: false, // titleSpacing: 0, // title: Text( - // "PickUp Location".tr(), + // "PickUp Location".tr, // textAlign: TextAlign.start, // style: TextStyle( // fontFamily: AppThemeData.medium, @@ -98,7 +98,7 @@ class MapPickerPage extends StatelessWidget { isDark ? AppThemeData.grey900 : AppThemeData.grey900, ), decoration: InputDecoration( - hintText: 'Search location...'.tr(), + hintText: 'Search location...'.tr, hintStyle: TextStyle( color: isDark @@ -157,8 +157,8 @@ class MapPickerPage extends StatelessWidget { children: [ Text( controller.pickedPlace.value != null - ? "Picked Location:".tr() - : "No Location Picked".tr(), + ? "Picked Location:".tr + : "No Location Picked".tr, style: AppThemeData.boldTextStyle( color: AppThemeData.grey900, fontSize: 17.sp, @@ -178,7 +178,7 @@ class MapPickerPage extends StatelessWidget { children: [ Expanded( child: RoundedButtonFill( - title: "Confirm Location".tr(), + title: "Confirm Location".tr, color: AppThemeData.mainColor, textColor: AppThemeData.grey50, borderRadius: 12, diff --git a/lib/widget/permission_dialog.dart b/lib/widget/permission_dialog.dart index e499e38..f26e0e2 100644 --- a/lib/widget/permission_dialog.dart +++ b/lib/widget/permission_dialog.dart @@ -1,7 +1,6 @@ -import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import '../themes/app_them_data.dart'; import '../themes/round_button_fill.dart'; @@ -29,7 +28,7 @@ class PermissionDialog extends StatelessWidget { const SizedBox(height: 20), Text( 'You denied location permission forever. Please allow location permission from your app settings and receive more accurate delivery.' - .tr(), + .tr, textAlign: TextAlign.center, style: TextStyle(fontSize: 18), ), @@ -48,14 +47,14 @@ class PermissionDialog extends StatelessWidget { ), minimumSize: const Size(1, 50), ), - child: Text('close'.tr()), + child: Text('close'.tr), onPressed: () => Navigator.pop(context), ), ), const SizedBox(width: 10), Expanded( child: RoundedButtonFill( - title: "Settings".tr(), + title: "Settings".tr, color: AppThemeData.grey900, textColor: AppThemeData.grey50, onPress: () async { diff --git a/lib/widget/place_picker/location_controller.dart b/lib/widget/place_picker/location_controller.dart index 70a4ab8..7721776 100644 --- a/lib/widget/place_picker/location_controller.dart +++ b/lib/widget/place_picker/location_controller.dart @@ -1,5 +1,5 @@ import 'package:customer/widget/place_picker/selected_location_model.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:geolocator/geolocator.dart'; import 'package:geocoding/geocoding.dart'; diff --git a/lib/widget/place_picker/location_picker_screen.dart b/lib/widget/place_picker/location_picker_screen.dart index e00f665..e1190e4 100644 --- a/lib/widget/place_picker/location_picker_screen.dart +++ b/lib/widget/place_picker/location_picker_screen.dart @@ -4,11 +4,11 @@ import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/widget/place_picker/location_controller.dart'; import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/theme_controller.dart'; -import 'package:easy_localization/easy_localization.dart'; + import 'package:flutter/material.dart'; import 'package:flutter_google_places_hoc081098/flutter_google_places_hoc081098.dart'; import 'package:flutter_google_places_hoc081098/google_maps_webservice_places.dart'; -import 'package:get/get.dart' hide Trans; +import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; final GoogleMapsPlaces _places = GoogleMapsPlaces(apiKey: Constant.mapAPIKey); @@ -131,7 +131,7 @@ class LocationPickerScreen extends StatelessWidget { children: [ Icon(Icons.search), SizedBox(width: 8), - Text("Search place...".tr()), + Text("Search place...".tr), ], ), ), diff --git a/lib/widget/story_view/widgets/story_image.dart b/lib/widget/story_view/widgets/story_image.dart index 9a193a5..5d8ef01 100644 --- a/lib/widget/story_view/widgets/story_image.dart +++ b/lib/widget/story_view/widgets/story_image.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'dart:ui' as ui; -import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart'; +import 'package:get/get.dart'; import '../controller/story_controller.dart'; import '../utils.dart'; @@ -28,7 +28,10 @@ class ImageLoader { onComplete(); } - final fileStream = DefaultCacheManager().getFileStream(url, headers: requestHeaders as Map?); + final fileStream = DefaultCacheManager().getFileStream( + url, + headers: requestHeaders as Map?, + ); fileStream.listen( (fileResponse) { @@ -44,13 +47,18 @@ class ImageLoader { state = LoadState.success; - ui.instantiateImageCodec(imageBytes).then((codec) { - frames = codec; - onComplete(); - }, onError: (error) { - state = LoadState.failure; - onComplete(); - }); + ui + .instantiateImageCodec(imageBytes) + .then( + (codec) { + frames = codec; + onComplete(); + }, + onError: (error) { + state = LoadState.failure; + onComplete(); + }, + ); }, onError: (error) { state = LoadState.failure; @@ -92,10 +100,7 @@ class StoryImage extends StatefulWidget { Key? key, }) { return StoryImage( - ImageLoader( - url, - requestHeaders: requestHeaders, - ), + ImageLoader(url, requestHeaders: requestHeaders), controller: controller, fit: fit, loadingWidget: loadingWidget, @@ -120,7 +125,9 @@ class StoryImageState extends State { super.initState(); if (widget.controller != null) { - _streamSubscription = widget.controller!.playbackNotifier.listen((playbackState) { + _streamSubscription = widget.controller!.playbackNotifier.listen(( + playbackState, + ) { // for the case of gifs we need to pause/play if (widget.imageLoader.frames == null) { return; @@ -167,7 +174,9 @@ class StoryImageState extends State { void forward() async { _timer?.cancel(); - if (widget.controller != null && widget.controller!.playbackNotifier.stream.value == PlaybackState.pause) { + if (widget.controller != null && + widget.controller!.playbackNotifier.stream.value == + PlaybackState.pause) { return; } @@ -185,22 +194,20 @@ class StoryImageState extends State { Widget getContentView() { switch (widget.imageLoader.state) { case LoadState.success: - return RawImage( - image: currentFrame, - fit: widget.fit, - ); + return RawImage(image: currentFrame, fit: widget.fit); case LoadState.failure: return Center( - child: widget.errorWidget ?? - Text( - "Image failed to load.".tr(), - style: TextStyle( - color: Colors.white, - ), - )); + child: + widget.errorWidget ?? + Text( + "Image failed to load.".tr, + style: TextStyle(color: Colors.white), + ), + ); default: return Center( - child: widget.loadingWidget ?? + child: + widget.loadingWidget ?? const SizedBox( width: 70, height: 70, diff --git a/pubspec.lock b/pubspec.lock index c0f8f59..dcfcb6d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -329,22 +329,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" - easy_localization: - dependency: "direct main" - description: - name: easy_localization - sha256: "2ccdf9db8fe4d9c5a75c122e6275674508fd0f0d49c827354967b8afcc56bbed" - url: "https://pub.dev" - source: hosted - version: "3.0.8" - easy_logger: - dependency: transitive - description: - name: easy_logger - sha256: c764a6e024846f33405a2342caf91c62e357c24b02c04dbc712ef232bf30ffb7 - url: "https://pub.dev" - source: hosted - version: "0.0.2" enum_to_string: dependency: transitive description: @@ -707,14 +691,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.1" - flutter_phoenix: - dependency: "direct main" - description: - name: flutter_phoenix - sha256: "39589dac934ea476d0e43fb60c1ddfba58f14960743640c8250dea11c4333378" - url: "https://pub.dev" - source: hosted - version: "1.1.1" flutter_plugin_android_lifecycle: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index bce9ddd..9de4c23 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -88,11 +88,10 @@ dependencies: flutter_google_places_hoc081098: ^2.0.0 flutter_screenutil: ^5.9.3 flutter_hooks: ^0.21.3+1 - easy_localization: ^3.0.8 flutter_localization: ^0.3.3 country_flags: ^4.1.0 flag: ^7.0.2 - flutter_phoenix: ^1.1.1 + dependency_overrides: webview_flutter: ^4.9.0
Product Name
 Quantity
 Price
 Total
${orderModel.provider.title} ${orderModel.quantity} ${Constant.amountShow(amount: (orderModel.provider.disPrice == "" || orderModel.provider.disPrice == "0") ? orderModel.provider.price.toString() : orderModel.provider.disPrice.toString())} ${Constant.amountShow(amount: (total).toString())}