Merge pull request 'abdusalom0516/base/home-screen' (#1) from abdusalom0516/base/home-screen into master

Reviewed-on: #1

assets/translations/en.json

@@ -152,19 +152,6 @@
     "nonVeg": "Non Veg",
     "favourites": "Favourites",
     "orders": "Orders",
-    "takeAway": "TakeAway",
+    "takeAway": "TakeAway"
-    "seeAll": "See All",
-    "bestServingFood": "Best Servings Food",
-    "outCategories": "Our Categories",
-    "saveUpTo50Perc": "Save Up to 50% Off",
-    "stories": "Stories",
-    "bestFoodStories": "Best Food Stories Ever",
-    "error": "Error",
-    "couldNotLaunch": "Could not launch",
-    "exploreCategories": "Explore the Categories",
-    "noStoreFound": "No Store Found in Your Area",
-    "currentlyNoAvailableStoreInZone": "Currently, there are no available store in your zone. Try changing your location to find nearby options.",
-    "dineInReservations":  "Dine-In Reservations",
-    "bookATable":  "Book a table at your favorite restaurant and enjoy a delightful dining experience."
 
 }

lib/constant/const_texts.dart

@@ -152,34 +152,12 @@ class ConstTexts {
   static String favourites = "favourites";
   static String orders = "orders";
   static String takeAway = "takeAway";
-  static String seeAll = "seeAll";
+  // static String allStores = "allStores";
-  static String bestServingFood = "bestServingFood";
+  // static String alert = "alert";
-  static String ourCategories = "outCategories";
+  // static String cancel = "cancel";
-  static String saveUpTo50Perc = "saveUpTo50Perc";
+  // static String ok = "ok";
-  static String error = "error";
+  // static String freeDelivery = "freeDelivery";
-  static String bestFoodStories = "bestFoodStories";
+  // static String upto = "upto";
-  static String doYouWantChangeTheDeliverOption =
+  // static String doYouWantChangeTheDeliverOption = "doYouWantChangeTheDeliverOption";
-      "doYouWantChangeTheDeliverOption";
+  // static String cash = "cash";
-  static String stories = "stories";
-  static String couldNotLaunch = "couldNotLaunch";
-  static String exploreCategories = "exploreCategories";
-  static String changeZone = "Change Zone";
-  static String noStoreFound = "noStoreFound";
-  static String currentlyNoAvailableStoreInZone = "currentlyNoAvailableStoreInZone";
-  static String dineInReservations = "dineInReservations";
-  static String bookATable = "bookATable";
-  // static String orders = "orders";
-  // static String takeAway = "takeAway";
-  // static String seeAll = "seeAll";
-  // static String bestServingFood = "bestServingFood";
-  // static String ourCategories = "outCategories";
-  // static String saveUpTo50Perc = "saveUpTo50Perc";
-  // static String error = "error";
-  // static String bestFoodStories = "bestFoodStories";
-  // static String doYouWantChangeTheDeliverOption =
-  //     "doYouWantChangeTheDeliverOption";
-  // static String stories = "stories";
-  // static String couldNotLaunch = "couldNotLaunch";
-  // static String exploreCategories = "exploreCategories";
-  // static String changeZone = "Change Zone";
 }

lib/controllers/0n_demand_payment_controller.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:customer/constant/const_texts.dart';
+import 'package:customer/utils/app_router.dart';
 
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;

lib/controllers/Intercity_home_controller.dart

@@ -833,9 +833,8 @@ class IntercityHomeController extends GetxController {
 
   Future<void> fetchGoogleRouteWithWaypoints() async {
     if (departureLatLong.value.latitude == 0.0 ||
-        destinationLatLong.value.latitude == 0.0) {
+        destinationLatLong.value.latitude == 0.0)
       return;
-    }
 
     final origin =
         '${departureLatLong.value.latitude},${departureLatLong.value.longitude}';

lib/controllers/cab_booking_controller.dart

@@ -824,9 +824,8 @@ class CabBookingController extends GetxController {
 
   Future<void> fetchGoogleRouteWithWaypoints() async {
     if (departureLatLong.value.latitude == 0.0 ||
-        destinationLatLong.value.latitude == 0.0) {
+        destinationLatLong.value.latitude == 0.0)
       return;
-    }
 
     final origin =
         '${departureLatLong.value.latitude},${departureLatLong.value.longitude}';

lib/controllers/food_home_controller.dart

@@ -1,7 +1,6 @@
 import 'dart:developer';
 
 import 'package:cloud_firestore/cloud_firestore.dart';
-import 'package:customer/constant/const_texts.dart';
 import 'package:customer/constant/constant.dart';
 import 'package:customer/controllers/dash_board_controller.dart';
 import 'package:customer/models/advertisement_model.dart';
@@ -34,7 +33,7 @@ class FoodHomeController extends GetxController {
   RxBool isLoading = true.obs;
   RxBool isListView = true.obs;
   RxBool isPopular = true.obs;
-  RxString selectedOrderTypeValue = "delivery".obs;
+  RxString selectedOrderTypeValue = "Delivery".tr.obs;
 
   Rx<PageController> pageController =
       PageController(viewportFraction: 0.877).obs;
@@ -71,7 +70,7 @@ class FoodHomeController extends GetxController {
     getCartData();
     selectedOrderTypeValue.value = Preferences.getString(
       Preferences.foodDeliveryType,
-      defaultValue: "delivery",
+      defaultValue: "Delivery",
     );
     await getZone();
     FireStoreUtils.getAllNearestRestaurant().listen((event) async {

lib/controllers/login_controller.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
+import 'package:customer/utils/app_router.dart';
 
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';

lib/controllers/on_demand_booking_controller.dart

@@ -3,6 +3,7 @@ import 'package:customer/constant/const_texts.dart';
 import 'package:customer/constant/constant.dart';
 import 'package:customer/models/coupon_model.dart';
 import 'package:customer/models/user_model.dart';
+import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

lib/controllers/otp_verification_controller.dart

@@ -1,5 +1,6 @@
 import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
 import 'package:customer/themes/show_toast_dialog.dart';
+import 'package:customer/utils/app_router.dart';
 
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';

lib/controllers/rental_conformation_controller.dart

@@ -5,6 +5,7 @@ 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:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

lib/controllers/service_list_controller.dart

@@ -13,6 +13,7 @@ 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:customer/utils/app_router.dart';
 
 import 'package:firebase_auth/firebase_auth.dart' as auth;
 import 'package:flutter/material.dart';

lib/controllers/sign_up_controller.dart

@@ -1,6 +1,7 @@
 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:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

lib/controllers/splash_controller.dart

@@ -4,6 +4,7 @@ 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';

lib/screen_ui/auth_screens/forgot_password_screen.dart

@@ -1,4 +1,5 @@
 import 'package:customer/constant/const_texts.dart';
+import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';

lib/screen_ui/auth_screens/login_screen.dart

@@ -3,6 +3,7 @@ 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:customer/utils/app_router.dart';
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';

lib/screen_ui/auth_screens/mobile_login_screen.dart

@@ -2,6 +2,7 @@ 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:customer/utils/app_router.dart';
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';

lib/screen_ui/auth_screens/otp_verification_screen.dart

@@ -1,5 +1,6 @@
 import 'package:customer/constant/const_texts.dart';
 import 'package:customer/screen_ui/auth_screens/sign_up_screen.dart';
+import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';

lib/screen_ui/auth_screens/sign_up_screen.dart

@@ -1,6 +1,7 @@
 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:customer/utils/app_router.dart';
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';

lib/screen_ui/cab_service_screens/cab_home_screen.dart

@@ -5,6 +5,7 @@ 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:flutter/material.dart';

lib/screen_ui/cab_service_screens/my_cab_booking_screen.dart

@@ -6,6 +6,7 @@ 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:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';

lib/screen_ui/ecommarce/dash_board_e_commerce_screen.dart

@@ -1,4 +1,3 @@
-import 'package:customer/constant/const_texts.dart';
 import 'package:customer/constant/constant.dart';
 import 'package:customer/controllers/dash_board_controller.dart';
 import 'package:customer/controllers/dash_board_ecommarce_controller.dart';
@@ -53,28 +52,28 @@ class DashBoardEcommerceScreen extends StatelessWidget {
                           isDark,
                           index: 0,
                           assetIcon: "assets/icons/ic_home.svg",
-                          label: ConstTexts.home.tr,
+                          label: 'Home'.tr,
                           controller: controller,
                         ),
                         navigationBarItem(
                           isDark,
                           index: 1,
                           assetIcon: "assets/icons/ic_fav.svg",
-                          label: ConstTexts.favourites.tr,
+                          label: 'Favourites'.tr,
                           controller: controller,
                         ),
                         navigationBarItem(
                           isDark,
                           index: 2,
                           assetIcon: "assets/icons/ic_orders.svg",
-                          label: ConstTexts.orders.tr,
+                          label: 'Orders'.tr,
                           controller: controller,
                         ),
                         navigationBarItem(
                           isDark,
                           index: 3,
                           assetIcon: "assets/icons/ic_profile.svg",
-                          label: ConstTexts.profile.tr,
+                          label: 'Profile'.tr,
                           controller: controller,
                         ),
                       ]
@@ -83,35 +82,35 @@ class DashBoardEcommerceScreen extends StatelessWidget {
                           isDark,
                           index: 0,
                           assetIcon: "assets/icons/ic_home.svg",
-                          label: ConstTexts.home.tr,
+                          label: 'Home'.tr,
                           controller: controller,
                         ),
                         navigationBarItem(
                           isDark,
                           index: 1,
                           assetIcon: "assets/icons/ic_fav.svg",
-                          label: ConstTexts.favourites.tr,
+                          label: 'Favourites'.tr,
                           controller: controller,
                         ),
                         navigationBarItem(
                           isDark,
                           index: 2,
                           assetIcon: "assets/icons/ic_wallet.svg",
-                          label: ConstTexts.wallet.tr,
+                          label: 'Wallet'.tr,
                           controller: controller,
                         ),
                         navigationBarItem(
                           isDark,
                           index: 3,
                           assetIcon: "assets/icons/ic_orders.svg",
-                          label: ConstTexts.orders.tr,
+                          label: 'Orders'.tr,
                           controller: controller,
                         ),
                         navigationBarItem(
                           isDark,
                           index: 4,
                           assetIcon: "assets/icons/ic_profile.svg",
-                          label: ConstTexts.profile.tr,
+                          label: 'Profile'.tr,
                           controller: controller,
                         ),
                       ],

lib/screen_ui/location_enable_screens/location_permission_screen.dart

@@ -7,6 +7,7 @@ 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';

lib/screen_ui/multi_vendor_service/cart_screen/oder_placing_screens.dart

@@ -6,6 +6,7 @@ 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:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';

lib/screen_ui/multi_vendor_service/change langauge/change_language_screen.dart

@@ -1,6 +1,7 @@
 import 'package:customer/constant/const_texts.dart';
 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';
 

lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_screen.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: depend_on_referenced_packages
-
 import 'package:customer/constant/const_texts.dart';
 import 'package:customer/constant/constant.dart';
 import 'package:customer/controllers/dine_in_controller.dart';
@@ -12,7 +10,9 @@ 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:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -83,7 +83,7 @@ class DineInScreen extends StatelessWidget {
                               crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
                                 Text(
-                                  ConstTexts.dineInReservations.tr,
+                                  "Dine-In Reservations".tr,
                                   style: TextStyle(
                                     fontSize: 24,
                                     fontFamily: AppThemeData.semiBold,
@@ -95,7 +95,8 @@ class DineInScreen extends StatelessWidget {
                                   ),
                                 ),
                                 Text(
-                                  ConstTexts.bookATable.tr,
+                                  "Book a table at your favorite restaurant and enjoy a delightful dining experience."
+                                      .tr,
                                   textAlign: TextAlign.center,
                                   style: TextStyle(
                                     fontSize: 14,
@@ -133,7 +134,7 @@ class DineInScreen extends StatelessWidget {
                           ),
                           const SizedBox(height: 12),
                           Text(
-                            ConstTexts.noStoreFound.tr,
+                            "No Store Found in Your Area".tr,
                             style: TextStyle(
                               color:
                                   isDark
@@ -145,7 +146,8 @@ class DineInScreen extends StatelessWidget {
                           ),
                           const SizedBox(height: 5),
                           Text(
-                            ConstTexts.currentlyNoAvailableStoreInZone.tr,
+                            "Currently, there are no available store in your zone. Try changing your location to find nearby options."
+                                .tr,
                             textAlign: TextAlign.center,
                             style: TextStyle(
                               color:
@@ -159,7 +161,7 @@ class DineInScreen extends StatelessWidget {
                           const SizedBox(height: 20),
                           RoundedButtonFill(
                             borderRadius: 10.r,
-                            title: ConstTexts.changeZone.tr,
+                            title: "Change Zone".tr,
                             width: 55,
                             height: 5.5,
                             color: AppThemeData.primary300,
@@ -183,7 +185,7 @@ class DineInScreen extends StatelessWidget {
                                 const SizedBox(height: 10),
                                 titleView(
                                   isDark,
-                                  ConstTexts.exploreCategories.tr,
+                                  "Explore the Categories".tr,
                                   () {
                                     Get.to(const ViewAllCategoryDineInScreen());
                                   },
@@ -219,7 +221,7 @@ class DineInScreen extends StatelessWidget {
                                         children: [
                                           Expanded(
                                             child: Text(
-                                              ConstTexts.newArrivals.tr,
+                                              "New Arrivals".tr,
                                               textAlign: TextAlign.start,
                                               style: TextStyle(
                                                 fontFamily:
@@ -240,13 +242,12 @@ class DineInScreen extends StatelessWidget {
                                                   "vendorList":
                                                       controller
                                                           .newArrivalRestaurantList,
-                                                  "title":
+                                                  "title": "New Arrival",
-                                                      ConstTexts.newArrival.tr,
                                                 },
                                               );
                                             },
                                             child: Text(
-                                              ConstTexts.viewAll.tr,
+                                              "View all".tr,
                                               textAlign: TextAlign.center,
                                               style: TextStyle(
                                                 fontFamily:
@@ -318,7 +319,7 @@ class DineInScreen extends StatelessWidget {
                                               vertical: 10,
                                             ),
                                             child: Text(
-                                              ConstTexts.popularStores.tr,
+                                              "Popular Stores".tr,
                                               textAlign: TextAlign.center,
                                               style: TextStyle(
                                                 fontFamily:
@@ -359,7 +360,7 @@ class DineInScreen extends StatelessWidget {
                                               vertical: 10,
                                             ),
                                             child: Text(
-                                              ConstTexts.allStores.tr,
+                                              "All Stores".tr,
                                               textAlign: TextAlign.center,
                                               style: TextStyle(
                                                 fontFamily:
@@ -427,7 +428,7 @@ class DineInScreen extends StatelessWidget {
             onPress!();
           },
           child: Text(
-            ConstTexts.viewAll.tr,
+            "View all".tr,
             textAlign: TextAlign.center,
             style: TextStyle(
               fontFamily: AppThemeData.regular,
@@ -494,7 +495,7 @@ class PopularRestaurant extends StatelessWidget {
                                   begin: const Alignment(-0.00, -1.00),
                                   end: const Alignment(0, 1),
                                   colors: [
-                                    Colors.black.withValues(alpha: 0),
+                                    Colors.black.withOpacity(0),
                                     const Color(0xFF111827),
                                   ],
                                 ),
@@ -757,7 +758,7 @@ class AllRestaurant extends StatelessWidget {
                                   begin: const Alignment(-0.00, -1.00),
                                   end: const Alignment(0, 1),
                                   colors: [
-                                    Colors.black.withValues(alpha: 0),
+                                    Colors.black.withOpacity(0),
                                     const Color(0xFF111827),
                                   ],
                                 ),
@@ -1019,7 +1020,7 @@ class NewArrival extends StatelessWidget {
                                   begin: const Alignment(0.00, 1.00),
                                   end: const Alignment(0, -1),
                                   colors: [
-                                    Colors.black.withValues(alpha: 0),
+                                    Colors.black.withOpacity(0),
                                     AppThemeData.grey900,
                                   ],
                                 ),
@@ -1326,7 +1327,7 @@ class BannerBottomView extends StatelessWidget {
                     if (await canLaunchUrl(uri)) {
                       await launchUrl(uri);
                     } else {
-                      ShowToastDialog.showToast(ConstTexts.couldNotLaunch.tr);
+                      ShowToastDialog.showToast("Could not launch".tr);
                     }
                   }
                 },

lib/screen_ui/multi_vendor_service/favourite_screens/favourite_screen.dart

@@ -7,6 +7,7 @@ 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:customer/utils/app_router.dart';
 
 import '../../../controllers/theme_controller.dart';
 import 'package:customer/utils/network_image_widget.dart';

lib/screen_ui/multi_vendor_service/gift_card/redeem_gift_card_screen.dart

@@ -8,6 +8,7 @@ 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:customer/utils/app_router.dart';
 
 import '../../../controllers/theme_controller.dart';
 import 'package:flutter/material.dart';

lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart

@@ -19,6 +19,7 @@ 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';
@@ -653,9 +654,7 @@ class HomeScreen extends StatelessWidget {
                                                   children: [
                                                     titleView(
                                                       isDark,
-                                                      ConstTexts
+                                                     ConstTexts.largestDiscounts.tr,
-                                                          .largestDiscounts
-                                                          .tr,
                                                       () {
                                                         Get.to(
                                                           const DiscountRestaurantListScreen(),
@@ -710,9 +709,7 @@ class HomeScreen extends StatelessWidget {
                                                         children: [
                                                           Expanded(
                                                             child: Text(
-                                                              ConstTexts
+                                                             ConstTexts.newArrival.tr,
-                                                                  .newArrival
-                                                                  .tr,
                                                               textAlign:
                                                                   TextAlign
                                                                       .start,
@@ -747,9 +744,7 @@ class HomeScreen extends StatelessWidget {
                                                               });
                                                             },
                                                             child: Text(
-                                                              ConstTexts
+                                                             ConstTexts.viewAll.tr,
-                                                                  .viewAll
-                                                                  .tr,
                                                               textAlign:
                                                                   TextAlign
                                                                       .center,
@@ -830,8 +825,7 @@ class HomeScreen extends StatelessWidget {
                                                               children: [
                                                                 Expanded(
                                                                   child: Text(
-                                                                    ConstTexts
+                                                                    ConstTexts.highlightsForU
-                                                                        .highlightsForU
                                                                         .tr,
                                                                     textAlign:
                                                                         TextAlign
@@ -861,8 +855,7 @@ class HomeScreen extends StatelessWidget {
                                                                     });
                                                                   },
                                                                   child: Text(
-                                                                    ConstTexts
+                                                                   ConstTexts.viewAll
-                                                                        .viewAll
                                                                         .tr,
                                                                     textAlign:
                                                                         TextAlign
@@ -978,8 +971,7 @@ class HomeScreen extends StatelessWidget {
                                                                   vertical: 10,
                                                                 ),
                                                             child: Text(
-                                                              ConstTexts
+                                                              ConstTexts.popularStores
-                                                                  .popularStores
                                                                   .tr,
                                                               textAlign:
                                                                   TextAlign
@@ -1033,9 +1025,7 @@ class HomeScreen extends StatelessWidget {
                                                                   vertical: 10,
                                                                 ),
                                                             child: Text(
-                                                              ConstTexts
+                                                             ConstTexts.allStores.tr,
-                                                                  .allStores
-                                                                  .tr,
                                                               textAlign:
                                                                   TextAlign
                                                                       .center,
@@ -1223,10 +1213,12 @@ class HomeScreen extends StatelessWidget {
                           isDark
                               ? AppThemeData.greyDark100
                               : AppThemeData.grey100,
-                      value: controller.selectedOrderTypeValue.value,
+                      value: controller.selectedOrderTypeValue.value.tr,
                       icon: const Icon(Icons.keyboard_arrow_down),
                       items:
-                          ["delivery", "takeaway"].map((String value) {
+                          <String>[ConstTexts.delivery.tr, ConstTexts.takeAway.tr].map((
+                            String value,
+                          ) {
                             return DropdownMenuItem<String>(
                               value: value,
                               child: Text(
@@ -1256,10 +1248,9 @@ class HomeScreen extends StatelessWidget {
                             builder: (BuildContext context) {
                               return CustomDialogBox(
                                 title: ConstTexts.alert.tr,
-                                descriptions:
+                                descriptions:"",
-                                    ConstTexts
+                                    // ConstTexts.doYouWantChangeTheDeliverOption
-                                        .doYouWantChangeTheDeliverOption
+                                    //     .tr,
-                                        .tr,
                                 positiveString: ConstTexts.ok.tr,
                                 negativeString: ConstTexts.cancel.tr,
                                 positiveClick: () async {
@@ -1388,7 +1379,7 @@ class PopularRestaurant extends StatelessWidget {
                                   begin: const Alignment(-0.00, -1.00),
                                   end: const Alignment(0, 1),
                                   colors: [
-                                    Colors.black.withValues(alpha: 0),
+                                    Colors.black.withOpacity(0),
                                     const Color(0xFF111827),
                                   ],
                                 ),
@@ -1995,7 +1986,7 @@ class NewArrival extends StatelessWidget {
                                   begin: const Alignment(0.00, 1.00),
                                   end: const Alignment(0, -1),
                                   colors: [
-                                    Colors.black.withValues(alpha: 0),
+                                    Colors.black.withOpacity(0),
                                     AppThemeData.grey900,
                                   ],
                                 ),
@@ -2090,7 +2081,7 @@ class NewArrival extends StatelessWidget {
                                 ),
                                 const SizedBox(width: 4),
                                 Text(
-                                  ConstTexts.freeDelivery.tr,
+                                 ConstTexts.freeDelivery.tr,
                                   textAlign: TextAlign.start,
                                   maxLines: 1,
                                   style: TextStyle(
@@ -2218,7 +2209,7 @@ class AdvertisementHomeCard extends StatelessWidget {
           borderRadius: BorderRadius.circular(16),
           boxShadow: [
             BoxShadow(
-              color: Colors.black.withValues(alpha: 0.1),
+              color: Colors.black.withOpacity(0.1),
               blurRadius: isDark ? 6 : 2,
               spreadRadius: 0,
               offset: Offset(0, isDark ? 3 : 1),
@@ -2695,7 +2686,7 @@ class BannerView extends StatelessWidget {
                     if (await canLaunchUrl(uri)) {
                       await launchUrl(uri);
                     } else {
-                      ShowToastDialog.showToast(ConstTexts.couldNotLaunch.tr);
+                      ShowToastDialog.showToast("Could not launch".tr);
                     }
                   }
                 },
@@ -2967,7 +2958,7 @@ class StoryView extends StatelessWidget {
                         height: Responsive.height(100, context),
                         width: Responsive.width(100, context),
                       ),
-                      Container(color: Colors.black.withValues(alpha: 0.30)),
+                      Container(color: Colors.black.withOpacity(0.30)),
                       Padding(
                         padding: const EdgeInsets.symmetric(
                           horizontal: 5,
@@ -2985,7 +2976,7 @@ class StoryView extends StatelessWidget {
                               if (snapshot.hasError) {
                                 return Center(
                                   child: Text(
-                                    '${ConstTexts.error.tr}: ${snapshot.error}',
+                                    '${"Error".tr}: ${snapshot.error}',
                                   ),
                                 );
                               } else if (snapshot.data == null) {
@@ -3277,9 +3268,7 @@ class MapView extends StatelessWidget {
                                                           ),
                                                           colors: [
                                                             Colors.black
-                                                                .withValues(
+                                                                .withValues(alpha: 0),
-                                                                  alpha: 0,
-                                                                ),
                                                             const Color(
                                                               0xFF111827,
                                                             ),
@@ -3414,8 +3403,7 @@ class MapView extends StatelessWidget {
                                                                   width: 5,
                                                                 ),
                                                                 Text(
-                                                                  ConstTexts
+                                                                 ConstTexts.freeDelivery
-                                                                      .freeDelivery
                                                                       .tr,
                                                                   style: TextStyle(
                                                                     fontSize:

lib/screen_ui/multi_vendor_service/home_screen/home_screen_two.dart

@@ -19,6 +19,7 @@ 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';
@@ -787,10 +788,12 @@ class HomeScreenTwo extends StatelessWidget {
                   DropdownButton<String>(
                     isDense: false,
                     underline: const SizedBox(),
-                    value: controller.selectedOrderTypeValue.value,
+                    value: controller.selectedOrderTypeValue.value.tr,
                     icon: const Icon(Icons.keyboard_arrow_down),
                     items:
-                        ["delivery", "takeaway"].map((String value) {
+                        <String>['Delivery'.tr, 'TakeAway'.tr].map((
+                          String value,
+                        ) {
                           return DropdownMenuItem<String>(
                             value: value,
                             child: Text(
@@ -819,11 +822,12 @@ class HomeScreenTwo extends StatelessWidget {
                           context: context,
                           builder: (BuildContext context) {
                             return CustomDialogBox(
-                              title: ConstTexts.alert.tr,
+                              title: "Alert".tr,
                               descriptions:
-                                  ConstTexts.doYouWantChangeTheDeliverOption.tr,
+                                  "Do you really want to change the delivery option? Your cart will be empty."
-                              positiveString: ConstTexts.ok.tr,
+                                      .tr,
-                              negativeString: ConstTexts.cancel.tr,
+                              positiveString: "Ok".tr,
+                              negativeString: "Cancel".tr,
                               positiveClick: () async {
                                 await Preferences.setString(
                                   Preferences.foodDeliveryType,
@@ -885,7 +889,7 @@ class CategoryView extends StatelessWidget {
                     children: [
                       Expanded(
                         child: Text(
-                          ConstTexts.ourCategories.tr,
+                          "Our Categories".tr,
                           style: TextStyle(
                             fontFamily: AppThemeData.semiBold,
                             color:
@@ -901,7 +905,7 @@ class CategoryView extends StatelessWidget {
                           Get.to(const ViewAllCategoryScreen());
                         },
                         child: Text(
-                          ConstTexts.seeAll.tr,
+                          "See all".tr,
                           textAlign: TextAlign.center,
                           style: TextStyle(
                             fontFamily: AppThemeData.medium,
@@ -916,7 +920,7 @@ class CategoryView extends StatelessWidget {
                     ],
                   ),
                   GradientText(
-                    ConstTexts.bestServingFood.tr,
+                    'Best Servings Food'.tr,
                     style: TextStyle(
                       fontSize: 24,
                       fontFamily: 'Inter Tight',
@@ -1020,7 +1024,7 @@ class OfferView extends StatelessWidget {
                     children: [
                       Expanded(
                         child: Text(
-                          ConstTexts.largestDiscounts.tr,
+                          "Large Discounts".tr,
                           style: TextStyle(
                             fontFamily: AppThemeData.semiBold,
                             color:
@@ -1043,7 +1047,7 @@ class OfferView extends StatelessWidget {
                           );
                         },
                         child: Text(
-                          ConstTexts.seeAll.tr,
+                          "See all".tr,
                           textAlign: TextAlign.center,
                           style: TextStyle(
                             fontFamily: AppThemeData.medium,
@@ -1058,7 +1062,7 @@ class OfferView extends StatelessWidget {
                     ],
                   ),
                   GradientText(
-                    ConstTexts.saveUpTo50Perc.tr,
+                    'Save Upto 50% Off'.tr,
                     style: TextStyle(
                       fontSize: 24,
                       fontFamily: 'Inter Tight',
@@ -1116,7 +1120,7 @@ class OfferView extends StatelessWidget {
                                     begin: const Alignment(-0.00, -1.00),
                                     end: const Alignment(0, 1),
                                     colors: [
-                                      Colors.black.withValues(alpha: 0),
+                                      Colors.black.withOpacity(0),
                                       AppThemeData.grey900,
                                     ],
                                   ),
@@ -1286,7 +1290,7 @@ class StoryView extends StatelessWidget {
                   children: [
                     Expanded(
                       child: Text(
-                        ConstTexts.stories.tr,
+                        "Stories".tr,
                         style: TextStyle(
                           fontFamily: AppThemeData.semiBold,
                           color:
@@ -1300,7 +1304,7 @@ class StoryView extends StatelessWidget {
                   ],
                 ),
                 GradientText(
-                  ConstTexts.bestFoodStories.tr,
+                  'Best Food Stories Ever'.tr,
                   style: TextStyle(
                     fontSize: 24,
                     fontFamily: 'Inter Tight',
@@ -1350,7 +1354,7 @@ class StoryView extends StatelessWidget {
                                 height: Responsive.height(100, context),
                                 width: Responsive.width(100, context),
                               ),
-                              Container(color: Colors.black.withValues(alpha: 0.30)),
+                              Container(color: Colors.black.withOpacity(0.30)),
                               Padding(
                                 padding: const EdgeInsets.symmetric(
                                   horizontal: 5,
@@ -1368,7 +1372,7 @@ class StoryView extends StatelessWidget {
                                       if (snapshot.hasError) {
                                         return Center(
                                           child: Text(
-                                            '${ConstTexts.error.tr}: ${snapshot.error}',
+                                            '${"Error".tr}: ${snapshot.error}',
                                           ),
                                         );
                                       } else if (snapshot.data == null) {

lib/screen_ui/multi_vendor_service/order_list_screen/order_screen.dart

@@ -5,6 +5,7 @@ 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:flutter/material.dart';

lib/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart

@@ -6,6 +6,7 @@ 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:customer/utils/app_router.dart';
 
 import 'package:in_app_review/in_app_review.dart';
 import '../../../controllers/theme_controller.dart';

lib/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart

@@ -4,6 +4,7 @@ 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:customer/utils/app_router.dart';
 
 import '../../../constant/collection_name.dart';
 import '../../../controllers/theme_controller.dart';

lib/screen_ui/on_boarding_screen/on_boarding_screen.dart

@@ -1,5 +1,6 @@
 import 'package:customer/constant/assets.dart';
 import 'package:customer/themes/round_button_fill.dart';
+import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

lib/screen_ui/on_demand_service/favourite_ondemand_screen.dart

@@ -320,9 +320,8 @@ class FavouriteOndemandScreen extends StatelessWidget {
                                                                   "",
                                                             ),
                                                         builder: (ctx, snap) {
-                                                          if (!snap.hasData) {
+                                                          if (!snap.hasData)
                                                             return const SizedBox();
-                                                          }
                                                           return Text(
                                                             snap.data?.title ??
                                                                 "",
@@ -554,9 +553,8 @@ class FavouriteOndemandScreen extends StatelessWidget {
                                                               ctx,
                                                               snap,
                                                             ) {
-                                                              if (!snap.hasData) {
+                                                              if (!snap.hasData)
                                                                 return const SizedBox();
-                                                              }
                                                               return Text(
                                                                 snap
                                                                         .data

lib/screen_ui/on_demand_service/on_demand_details_screen.dart

@@ -1,6 +1,7 @@
 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:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_rating_bar/flutter_rating_bar.dart';

lib/screen_ui/on_demand_service/on_demand_home_screen.dart

@@ -12,6 +12,7 @@ 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';

lib/screen_ui/parcel_service/my_booking_screen.dart

@@ -1,6 +1,7 @@
 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:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

lib/screen_ui/parcel_service/order_successfully_placed.dart

@@ -1,4 +1,5 @@
 import 'package:customer/screen_ui/parcel_service/parcel_dashboard_screen.dart';
+import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

lib/screen_ui/rental_service/my_rental_booking_screen.dart

@@ -4,6 +4,7 @@ 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:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

lib/screen_ui/rental_service/rental_home_screen.dart

@@ -1,5 +1,6 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:customer/constant/constant.dart';
+import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

lib/utils/utils.dart

@@ -152,45 +152,36 @@ class Utils {
     List<String> parts = [];
 
     if (selectedLocation.address!.name != null &&
-        selectedLocation.address!.name!.isNotEmpty) {
+        selectedLocation.address!.name!.isNotEmpty)
       parts.add(selectedLocation.address!.name!);
-    }
     if (selectedLocation.address!.subThoroughfare != null &&
-        selectedLocation.address!.subThoroughfare!.isNotEmpty) {
+        selectedLocation.address!.subThoroughfare!.isNotEmpty)
       parts.add(selectedLocation.address!.subThoroughfare!);
-    }
     if (selectedLocation.address!.thoroughfare != null &&
-        selectedLocation.address!.thoroughfare!.isNotEmpty) {
+        selectedLocation.address!.thoroughfare!.isNotEmpty)
       parts.add(selectedLocation.address!.thoroughfare!);
-    }
     if (selectedLocation.address!.subLocality != null &&
-        selectedLocation.address!.subLocality!.isNotEmpty) {
+        selectedLocation.address!.subLocality!.isNotEmpty)
       parts.add(selectedLocation.address!.subLocality!);
-    }
     if (selectedLocation.address!.locality != null &&
-        selectedLocation.address!.locality!.isNotEmpty) {
+        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) {
+        selectedLocation.address!.administrativeArea!.isNotEmpty)
       parts.add(selectedLocation.address!.administrativeArea!);
-    }
     if (selectedLocation.address!.postalCode != null &&
-        selectedLocation.address!.postalCode!.isNotEmpty) {
+        selectedLocation.address!.postalCode!.isNotEmpty)
       parts.add(selectedLocation.address!.postalCode!);
-    }
     if (selectedLocation.address!.country != null &&
-        selectedLocation.address!.country!.isNotEmpty) {
+        selectedLocation.address!.country!.isNotEmpty)
       parts.add(selectedLocation.address!.country!);
-    }
     if (selectedLocation.address!.isoCountryCode != null &&
-        selectedLocation.address!.isoCountryCode!.isNotEmpty) {
+        selectedLocation.address!.isoCountryCode!.isNotEmpty)
       parts.add(selectedLocation.address!.isoCountryCode!);
-    }
 
     return parts.join(', ');
   }