From 3874ef062b07fc61840d9f9a8f8bbf609f5622fd Mon Sep 17 00:00:00 2001 From: Abdusalom G'ayratov Date: Fri, 5 Dec 2025 16:36:32 +0500 Subject: [PATCH] BASE: Update PLs Wait Loader. --- assets/translations/en.json | 1 - lib/controllers/0n_demand_payment_controller.dart | 2 +- lib/controllers/cart_controller.dart | 2 +- .../dine_in_restaurant_details_controller.dart | 2 +- lib/controllers/edit_profile_controller.dart | 2 +- lib/controllers/forgot_password_controller.dart | 2 +- lib/controllers/gift_card_controller.dart | 2 +- lib/controllers/on_demand_booking_controller.dart | 2 +- .../on_demand_order_details_controller.dart | 2 +- .../parcel_order_confirmation_controller.dart | 2 +- lib/controllers/rate_product_controller.dart | 2 +- lib/controllers/service_list_controller.dart | 2 +- lib/main.dart | 2 +- .../ecommarce/home_e_commerce_screen.dart | 15 +++++++++------ .../enter_manually_location.dart | 4 +++- .../location_permission_screen.dart | 4 ++-- .../all_advertisement_screen.dart | 2 +- .../chat_screens/driver_inbox_screen.dart | 2 +- .../chat_screens/restaurant_inbox_screen.dart | 2 +- .../dine_in_screeen/dine_in_screen.dart | 4 ++-- .../gift_card/redeem_gift_card_screen.dart | 2 +- .../home_screen/home_screen.dart | 10 +++++----- .../home_screen/home_screen_two.dart | 8 +++++--- .../order_list_screen/order_details_screen.dart | 6 ++++-- .../profile_screen/profile_screen.dart | 2 +- .../scan_qrcode_screen/scan_qr_code_screen.dart | 2 +- .../on_demand_booking_screen.dart | 2 +- .../on_demand_service/on_demand_home_screen.dart | 2 +- .../on_demand_order_details_screen.dart | 6 ++++-- .../on_demand_service/provider_inbox_screen.dart | 2 +- .../on_demand_service/worker_inbox_screen.dart | 2 +- .../parcel_service/home_parcel_screen.dart | 2 +- .../parcel_service/parcel_order_details.dart | 2 +- .../rental_order_details_screen.dart | 4 +++- 34 files changed, 61 insertions(+), 49 deletions(-) diff --git a/assets/translations/en.json b/assets/translations/en.json index 57288de..0a541c6 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -123,5 +123,4 @@ "changeLanguage": "Change Language", "selectPrefferedLanguage": "Select your preferred language for a personalized app experience." - } \ No newline at end of file diff --git a/lib/controllers/0n_demand_payment_controller.dart b/lib/controllers/0n_demand_payment_controller.dart index 069ee50..e647f3a 100644 --- a/lib/controllers/0n_demand_payment_controller.dart +++ b/lib/controllers/0n_demand_payment_controller.dart @@ -76,7 +76,7 @@ class OnDemandPaymentController extends GetxController { Future placeOrder() async { if (!isExtra) { // Normal Order - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); onDemandOrderModel.value?.payment_method = selectedPaymentMethod.value; onDemandOrderModel.value?.paymentStatus = diff --git a/lib/controllers/cart_controller.dart b/lib/controllers/cart_controller.dart index 28f87e3..a149ba1 100644 --- a/lib/controllers/cart_controller.dart +++ b/lib/controllers/cart_controller.dart @@ -425,7 +425,7 @@ class CartController extends GetxController { } Future setOrder() async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); if ((Constant.isSubscriptionModelApplied == true || Constant.sectionConstantModel?.adminCommision?.isEnabled == true) && diff --git a/lib/controllers/dine_in_restaurant_details_controller.dart b/lib/controllers/dine_in_restaurant_details_controller.dart index a354e95..da9c1ec 100644 --- a/lib/controllers/dine_in_restaurant_details_controller.dart +++ b/lib/controllers/dine_in_restaurant_details_controller.dart @@ -65,7 +65,7 @@ class DineInRestaurantDetailsController extends GetxController { } Future orderBook() async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); DateTime dt = selectedDate.value.toDate(); String hour = DateFormat("kk:mm").format( diff --git a/lib/controllers/edit_profile_controller.dart b/lib/controllers/edit_profile_controller.dart index 12c2fd4..6fc31a3 100644 --- a/lib/controllers/edit_profile_controller.dart +++ b/lib/controllers/edit_profile_controller.dart @@ -48,7 +48,7 @@ class EditProfileController extends GetxController { } Future saveData() async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); if (Constant().hasValidUrl(profileImage.value) == false && profileImage.value.isNotEmpty) { profileImage.value = await Constant.uploadUserImageToFireStorage( diff --git a/lib/controllers/forgot_password_controller.dart b/lib/controllers/forgot_password_controller.dart index 3936731..ec2a1ca 100644 --- a/lib/controllers/forgot_password_controller.dart +++ b/lib/controllers/forgot_password_controller.dart @@ -21,7 +21,7 @@ class ForgotPasswordController extends GetxController { } try { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); await FirebaseAuth.instance.sendPasswordResetEmail(email: email); ShowToastDialog.closeLoader(); ShowToastDialog.showToast( diff --git a/lib/controllers/gift_card_controller.dart b/lib/controllers/gift_card_controller.dart index c724901..474e983 100644 --- a/lib/controllers/gift_card_controller.dart +++ b/lib/controllers/gift_card_controller.dart @@ -108,7 +108,7 @@ class GiftCardController extends GetxController { } Future setOrder() async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); GiftCardsOrderModel giftCardsOrderModel = GiftCardsOrderModel(); giftCardsOrderModel.id = const Uuid().v4(); giftCardsOrderModel.giftId = selectedGiftCard.value.id.toString(); diff --git a/lib/controllers/on_demand_booking_controller.dart b/lib/controllers/on_demand_booking_controller.dart index 647c514..99fabc7 100644 --- a/lib/controllers/on_demand_booking_controller.dart +++ b/lib/controllers/on_demand_booking_controller.dart @@ -202,7 +202,7 @@ class OnDemandBookingController extends GetxController { }, ); } else { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); OnProviderOrderModel onDemandOrder = OnProviderOrderModel( otp: Constant.getReferralCode(), authorID: FireStoreUtils.getCurrentUid(), diff --git a/lib/controllers/on_demand_order_details_controller.dart b/lib/controllers/on_demand_order_details_controller.dart index c2c7ad1..a6410c3 100644 --- a/lib/controllers/on_demand_order_details_controller.dart +++ b/lib/controllers/on_demand_order_details_controller.dart @@ -172,7 +172,7 @@ class OnDemandOrderDetailsController extends GetxController { final order = onProviderOrder.value; if (order == null) return; - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); try { double total = 0.0; diff --git a/lib/controllers/parcel_order_confirmation_controller.dart b/lib/controllers/parcel_order_confirmation_controller.dart index b76f4dd..25ecfd7 100644 --- a/lib/controllers/parcel_order_confirmation_controller.dart +++ b/lib/controllers/parcel_order_confirmation_controller.dart @@ -136,7 +136,7 @@ class ParcelOrderConfirmationController extends GetxController { } Future placeOrder() async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); try { List parcelImages = []; diff --git a/lib/controllers/rate_product_controller.dart b/lib/controllers/rate_product_controller.dart index d4d5d0c..0c0575d 100644 --- a/lib/controllers/rate_product_controller.dart +++ b/lib/controllers/rate_product_controller.dart @@ -142,7 +142,7 @@ class RateProductController extends GetxController { Future saveRating() async { if (ratings.value != 0.0) { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); productModel.value.reviewsCount = productReviewCount.value + 1; productModel.value.reviewsSum = productReviewSum.value + ratings.value; productModel.value.reviewAttributes = reviewProductAttributes; diff --git a/lib/controllers/service_list_controller.dart b/lib/controllers/service_list_controller.dart index f107978..6535e58 100644 --- a/lib/controllers/service_list_controller.dart +++ b/lib/controllers/service_list_controller.dart @@ -77,7 +77,7 @@ class ServiceListController extends GetxController { SectionModel sectionModel, ) async { try { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); Constant.sectionConstantModel = sectionModel; AppThemeData.primary300 = Color( int.tryParse(sectionModel.color?.replaceFirst("#", "0xff") ?? '') ?? diff --git a/lib/main.dart b/lib/main.dart index 8730cf8..7883818 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -24,7 +24,7 @@ void main() async { options: DefaultFirebaseOptions.currentPlatform, ); - await Preferences.initPref(); + await Preferences.initPref(); Get.put(ThemeController()); await configEasyLoading(); diff --git a/lib/screen_ui/ecommarce/home_e_commerce_screen.dart b/lib/screen_ui/ecommarce/home_e_commerce_screen.dart index 79c5f87..4a60069 100644 --- a/lib/screen_ui/ecommarce/home_e_commerce_screen.dart +++ b/lib/screen_ui/ecommarce/home_e_commerce_screen.dart @@ -1,4 +1,7 @@ +// ignore_for_file: depend_on_referenced_packages + import 'package:badges/badges.dart' as badges; +import 'package:customer/constant/const_texts.dart'; import 'package:customer/constant/constant.dart'; import 'package:customer/controllers/home_e_commerce_controller.dart'; import 'package:customer/controllers/theme_controller.dart'; @@ -108,7 +111,7 @@ class HomeECommerceScreen extends StatelessWidget { } else { Constant.checkPermission( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); // ✅ declare it once here! ShippingAddress shippingAddress = ShippingAddress(); @@ -1525,7 +1528,7 @@ class BannerView extends StatelessWidget { return InkWell( onTap: () async { if (bannerModel.redirect_type == "store") { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( bannerModel.redirect_id.toString(), @@ -1537,7 +1540,7 @@ class BannerView extends StatelessWidget { arguments: {"vendorModel": vendorModel}, ); } else if (bannerModel.redirect_type == "product") { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); ProductModel? productModel = await FireStoreUtils.getProductById( bannerModel.redirect_id.toString(), @@ -1631,7 +1634,7 @@ class BannerBottomView extends StatelessWidget { return InkWell( onTap: () async { if (bannerModel.redirect_type == "store") { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( bannerModel.redirect_id.toString(), @@ -1643,7 +1646,7 @@ class BannerBottomView extends StatelessWidget { arguments: {"vendorModel": vendorModel}, ); } else if (bannerModel.redirect_type == "product") { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); ProductModel? productModel = await FireStoreUtils.getProductById( bannerModel.redirect_id.toString(), @@ -1728,7 +1731,7 @@ class AdvertisementHomeCard extends StatelessWidget { final isDark = themeController.isDark.value; return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( model.vendorId!, ); 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 d2d154a..67ceb0e 100644 --- a/lib/screen_ui/location_enable_screens/enter_manually_location.dart +++ b/lib/screen_ui/location_enable_screens/enter_manually_location.dart @@ -341,7 +341,9 @@ class EnterManuallyLocationScreen extends StatelessWidget { "Please Enter Area / Sector / Locality".tr, ); } else { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader( + ConstTexts.pleaseWait.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 1491fa7..1a7726c 100644 --- a/lib/screen_ui/location_enable_screens/location_permission_screen.dart +++ b/lib/screen_ui/location_enable_screens/location_permission_screen.dart @@ -76,7 +76,7 @@ class LocationPermissionScreen extends StatelessWidget { Constant.checkPermission( context: context, onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); ShippingAddress addressModel = ShippingAddress(); try { await Geolocator.requestPermission(); @@ -145,7 +145,7 @@ class LocationPermissionScreen extends StatelessWidget { Constant.checkPermission( context: context, onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); ShippingAddress addressModel = ShippingAddress(); try { await Geolocator.requestPermission(); 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 720e34a..e66a6c5 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 @@ -86,7 +86,7 @@ class AdvertisementCard extends StatelessWidget { final isDark = themeController.isDark.value; return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( model.vendorId!, ); 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 05ccb43..1d33614 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 @@ -46,7 +46,7 @@ class DriverInboxScreen extends StatelessWidget { InboxModel inboxModel = InboxModel.fromJson(data!); return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); UserModel? customer = await FireStoreUtils.getUserProfile( inboxModel.customerId.toString(), 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 bdf6d90..5485ddd 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 @@ -47,7 +47,7 @@ class RestaurantInboxScreen extends StatelessWidget { InboxModel inboxModel = InboxModel.fromJson(data!); return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); UserModel? customer = await FireStoreUtils.getUserProfile( inboxModel.customerId.toString(), 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 b2888cf..8806a67 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 @@ -1294,7 +1294,7 @@ class BannerBottomView extends StatelessWidget { return InkWell( onTap: () async { if (bannerModel.redirect_type == "store") { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( bannerModel.redirect_id.toString(), @@ -1306,7 +1306,7 @@ class BannerBottomView extends StatelessWidget { arguments: {"vendorModel": vendorModel}, ); } else if (bannerModel.redirect_type == "product") { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); ProductModel? productModel = await FireStoreUtils.getProductById( bannerModel.redirect_id.toString(), 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 b1ccdab..2dc5ca3 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 @@ -106,7 +106,7 @@ class RedeemGiftCardScreen extends StatelessWidget { } else if (controller.giftPinController.value.text.isEmpty) { ShowToastDialog.showToast("Please Enter Gift Pin".tr); } else { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); await FireStoreUtils.checkRedeemCode( controller.giftCodeController.value.text.replaceAll( " ", 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 3736289..61a293c 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 @@ -2190,7 +2190,7 @@ class AdvertisementHomeCard extends StatelessWidget { final isDark = themeController.isDark.value; return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( model.vendorId!, ); @@ -2653,7 +2653,7 @@ class BannerView extends StatelessWidget { return InkWell( onTap: () async { if (bannerModel.redirect_type == "store") { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( bannerModel.redirect_id.toString(), @@ -2665,7 +2665,7 @@ class BannerView extends StatelessWidget { arguments: {"vendorModel": vendorModel}, ); } else if (bannerModel.redirect_type == "product") { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); ProductModel? productModel = await FireStoreUtils.getProductById( bannerModel.redirect_id.toString(), @@ -2759,7 +2759,7 @@ class BannerBottomView extends StatelessWidget { return InkWell( onTap: () async { if (bannerModel.redirect_type == "store") { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( bannerModel.redirect_id.toString(), @@ -2771,7 +2771,7 @@ class BannerBottomView extends StatelessWidget { arguments: {"vendorModel": vendorModel}, ); } else if (bannerModel.redirect_type == "product") { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); ProductModel? productModel = await FireStoreUtils.getProductById( bannerModel.redirect_id.toString(), 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 9ee26f3..86a840e 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 @@ -213,7 +213,9 @@ class HomeScreenTwo extends StatelessWidget { Constant.checkPermission( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr, + ConstTexts + .pleaseWait + .tr, ); // ✅ declare once for whole method @@ -1206,7 +1208,7 @@ class BannerView extends StatelessWidget { return InkWell( onTap: () async { if (bannerModel.redirect_type == "store") { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); VendorModel? vendorModel = await FireStoreUtils.getVendorById( bannerModel.redirect_id.toString(), ); @@ -1217,7 +1219,7 @@ class BannerView extends StatelessWidget { arguments: {"vendorModel": vendorModel}, ); } else if (bannerModel.redirect_type == "product") { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); ProductModel? productModel = await FireStoreUtils.getProductById( bannerModel.redirect_id.toString(), 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 e01712e..d6d041a 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 @@ -228,7 +228,7 @@ class OrderDetailsScreen extends StatelessWidget { : InkWell( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr, + ConstTexts.pleaseWait.tr, ); UserModel? customer = @@ -902,7 +902,9 @@ class OrderDetailsScreen extends StatelessWidget { InkWell( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr, + ConstTexts + .pleaseWait + .tr, ); UserModel? customer = 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 5e73807..afaf8a3 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 @@ -578,7 +578,7 @@ class ProfileScreen extends StatelessWidget { negativeString: "Cancel".tr, positiveClick: () async { ShowToastDialog.showLoader( - "Please wait...".tr, + ConstTexts.pleaseWait.tr, ); await controller .deleteUserFromServer(); 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 56ce1ca..74cca90 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 @@ -42,7 +42,7 @@ 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(ConstTexts.pleaseWait.tr); if (controller.allNearestRestaurant.isNotEmpty) { if (controller.allNearestRestaurant .where((vendor) => vendor.id == result.text) 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 a59f56c..61b4359 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 @@ -246,7 +246,7 @@ class OnDemandBookingScreen extends StatelessWidget { Constant.checkPermission( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr, + ConstTexts.pleaseWait.tr, ); ShippingAddress shippingAddress = 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 0391771..982aa12 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 @@ -105,7 +105,7 @@ class OnDemandHomeScreen extends StatelessWidget { Constant.checkPermission( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr, + ConstTexts.pleaseWait.tr, ); // ✅ declare it once here! 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 231adc9..4687960 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 @@ -771,7 +771,9 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { child: ElevatedButton( onPressed: () async { ShowToastDialog.showLoader( - "Please wait...".tr, + ConstTexts + .pleaseWait + .tr, ); ShowToastDialog.closeLoader(); @@ -1192,7 +1194,7 @@ class OnDemandOrderDetailsScreen extends StatelessWidget { child: ElevatedButton( onPressed: () async { ShowToastDialog.showLoader( - "Please wait...".tr, + ConstTexts.pleaseWait.tr, ); ShowToastDialog.closeLoader(); 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 652b98a..4e21735 100644 --- a/lib/screen_ui/on_demand_service/provider_inbox_screen.dart +++ b/lib/screen_ui/on_demand_service/provider_inbox_screen.dart @@ -46,7 +46,7 @@ class ProviderInboxScreen extends StatelessWidget { InboxModel inboxModel = InboxModel.fromJson(data!); return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); UserModel? customer = await FireStoreUtils.getUserProfile( inboxModel.customerId.toString(), 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 72a945b..b11ad2d 100644 --- a/lib/screen_ui/on_demand_service/worker_inbox_screen.dart +++ b/lib/screen_ui/on_demand_service/worker_inbox_screen.dart @@ -46,7 +46,7 @@ class WorkerInboxScreen extends StatelessWidget { InboxModel inboxModel = InboxModel.fromJson(data!); return InkWell( onTap: () async { - ShowToastDialog.showLoader("Please wait...".tr); + ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr); UserModel? customer = await FireStoreUtils.getUserProfile( inboxModel.customerId.toString(), diff --git a/lib/screen_ui/parcel_service/home_parcel_screen.dart b/lib/screen_ui/parcel_service/home_parcel_screen.dart index 151cf78..c6d9f11 100644 --- a/lib/screen_ui/parcel_service/home_parcel_screen.dart +++ b/lib/screen_ui/parcel_service/home_parcel_screen.dart @@ -99,7 +99,7 @@ class HomeParcelScreen extends StatelessWidget { Constant.checkPermission( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr, + ConstTexts.pleaseWait.tr, ); ShippingAddress shippingAddress = diff --git a/lib/screen_ui/parcel_service/parcel_order_details.dart b/lib/screen_ui/parcel_service/parcel_order_details.dart index 398c4b1..65b0768 100644 --- a/lib/screen_ui/parcel_service/parcel_order_details.dart +++ b/lib/screen_ui/parcel_service/parcel_order_details.dart @@ -604,7 +604,7 @@ class ParcelOrderDetails extends StatelessWidget { InkWell( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr, + ConstTexts.pleaseWait.tr, ); UserModel? customer = 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 74edf80..8662f2b 100644 --- a/lib/screen_ui/rental_service/rental_order_details_screen.dart +++ b/lib/screen_ui/rental_service/rental_order_details_screen.dart @@ -588,7 +588,9 @@ class RentalOrderDetailsScreen extends StatelessWidget { InkWell( onTap: () async { ShowToastDialog.showLoader( - "Please wait...".tr, + ConstTexts + .pleaseWait + .tr, ); UserModel? customer =