Abdusalom999/Fondex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Abdusalom999:7036468ce75fea5adbbe48259f3ded21803c980d
Branches Tags
Abdusalom999:master Abdusalom999:abdusalom0516/base/home-screen
...
compare: Abdusalom999:master
Branches Tags
Abdusalom999:master Abdusalom999:abdusalom0516/base/home-screen

8 Commits
7036468ce7 ... master

Author SHA1 Message Date
Abdusalom999
ef34b8eb2a Merge pull request 'BASE: Implement Localization.' (#5) from abdusalom0516/base/home-screen into master 
Reviewed-on: #5
 2025-12-10 07:34:51 +00:00
Abdusalom G'ayratov
297f7c368b BASE: Implement Localization. 2025-12-09 19:06:51 +05:00
Abdusalom999
fe0d9312f9 Merge pull request 'BASE: Implement Localization In Home Screen.' (#4) from abdusalom0516/base/home-screen into master 
Reviewed-on: #4
 2025-12-09 06:43:42 +00:00
Abdusalom G'ayratov
a6109290b3 BASE: Implement Localization In Home Screen. 2025-12-09 11:42:38 +05:00
Abdusalom999
c6514bf023 Merge pull request 'MINOR-FIX: DropDownMenu Problem Fix.' (#3) from abdusalom0516/base/home-screen into master 
Reviewed-on: #3
 2025-12-09 06:34:41 +00:00
Abdusalom G'ayratov
01c625b9c9 MINOR-FIX: DropDownMenu Problem Fix. 2025-12-09 11:34:02 +05:00
Abdusalom999
966d9cc187 Merge pull request 'MINOR-FIX: Drop Down Issue Fix.' (#2) from abdusalom0516/base/home-screen into master 
Reviewed-on: #2
 2025-12-09 06:09:23 +00:00
Abdusalom G'ayratov
e4e77356b5 MINOR-FIX: Drop Down Issue Fix. 2025-12-09 11:08:09 +05:00
41 changed files with 155 additions and 128 deletions
Expand all files Collapse all files

15
assets/translations/en.json
View File

@@ -152,6 +152,19 @@
"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."
}

38
lib/constant/const_texts.dart
View File

@@ -152,12 +152,34 @@ class ConstTexts {
static String favourites = "favourites";
static String orders = "orders";
static String takeAway = "takeAway";
// static String allStores = "allStores";
// static String alert = "alert";
// static String cancel = "cancel";
// static String ok = "ok";
// static String freeDelivery = "freeDelivery";
// static String upto = "upto";
// static String doYouWantChangeTheDeliverOption = "doYouWantChangeTheDeliverOption";
// static String cash = "cash";
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";
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";
}

1
lib/controllers/0n_demand_payment_controller.dart
View File

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

3
lib/controllers/Intercity_home_controller.dart
View File

@@ -833,8 +833,9 @@ 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}';

3
lib/controllers/cab_booking_controller.dart
View File

@@ -824,8 +824,9 @@ 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}';

5
lib/controllers/food_home_controller.dart
View File

@@ -1,6 +1,7 @@
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';
@@ -33,7 +34,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".obs;
Rx<PageController> pageController =
PageController(viewportFraction: 0.877).obs;
@@ -70,7 +71,7 @@ class FoodHomeController extends GetxController {
getCartData();
selectedOrderTypeValue.value = Preferences.getString(
Preferences.foodDeliveryType,
defaultValue: "Delivery",
defaultValue: "delivery",
);
await getZone();
FireStoreUtils.getAllNearestRestaurant().listen((event) async {

1
lib/controllers/login_controller.dart
View File

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

1
lib/controllers/on_demand_booking_controller.dart
View File

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

1
lib/controllers/otp_verification_controller.dart
View File

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

1
lib/controllers/rental_conformation_controller.dart
View File

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

1
lib/controllers/service_list_controller.dart
View File

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

1
lib/controllers/sign_up_controller.dart
View File

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

1
lib/controllers/splash_controller.dart
View File

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

1
lib/screen_ui/auth_screens/forgot_password_screen.dart
View File

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

1
lib/screen_ui/auth_screens/login_screen.dart
View File

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

1
lib/screen_ui/auth_screens/mobile_login_screen.dart
View File

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

1
lib/screen_ui/auth_screens/otp_verification_screen.dart
View File

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

1
lib/screen_ui/auth_screens/sign_up_screen.dart
View File

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

1
lib/screen_ui/cab_service_screens/cab_home_screen.dart
View File

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

1
lib/screen_ui/cab_service_screens/my_cab_booking_screen.dart
View File

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

19
lib/screen_ui/ecommarce/dash_board_e_commerce_screen.dart
View File

@@ -1,3 +1,4 @@
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';
@@ -52,28 +53,28 @@ class DashBoardEcommerceScreen extends StatelessWidget {
isDark,
index: 0,
assetIcon: "assets/icons/ic_home.svg",
label: 'Home'.tr,
label: ConstTexts.home.tr,
controller: controller,
),
navigationBarItem(
isDark,
index: 1,
assetIcon: "assets/icons/ic_fav.svg",
label: 'Favourites'.tr,
label: ConstTexts.favourites.tr,
controller: controller,
),
navigationBarItem(
isDark,
index: 2,
assetIcon: "assets/icons/ic_orders.svg",
label: 'Orders'.tr,
label: ConstTexts.orders.tr,
controller: controller,
),
navigationBarItem(
isDark,
index: 3,
assetIcon: "assets/icons/ic_profile.svg",
label: 'Profile'.tr,
label: ConstTexts.profile.tr,
controller: controller,
),
]
@@ -82,35 +83,35 @@ class DashBoardEcommerceScreen extends StatelessWidget {
isDark,
index: 0,
assetIcon: "assets/icons/ic_home.svg",
label: 'Home'.tr,
label: ConstTexts.home.tr,
controller: controller,
),
navigationBarItem(
isDark,
index: 1,
assetIcon: "assets/icons/ic_fav.svg",
label: 'Favourites'.tr,
label: ConstTexts.favourites.tr,
controller: controller,
),
navigationBarItem(
isDark,
index: 2,
assetIcon: "assets/icons/ic_wallet.svg",
label: 'Wallet'.tr,
label: ConstTexts.wallet.tr,
controller: controller,
),
navigationBarItem(
isDark,
index: 3,
assetIcon: "assets/icons/ic_orders.svg",
label: 'Orders'.tr,
label: ConstTexts.orders.tr,
controller: controller,
),
navigationBarItem(
isDark,
index: 4,
assetIcon: "assets/icons/ic_profile.svg",
label: 'Profile'.tr,
label: ConstTexts.profile.tr,
controller: controller,
),
],

1
lib/screen_ui/location_enable_screens/location_permission_screen.dart
View File

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

1
lib/screen_ui/multi_vendor_service/cart_screen/oder_placing_screens.dart
View File

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

1
lib/screen_ui/multi_vendor_service/change langauge/change_language_screen.dart
View File

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

39
lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_screen.dart
View File

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

1
lib/screen_ui/multi_vendor_service/favourite_screens/favourite_screen.dart
View File

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

1
lib/screen_ui/multi_vendor_service/gift_card/redeem_gift_card_screen.dart
View File

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

58
lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart
View File

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

38
lib/screen_ui/multi_vendor_service/home_screen/home_screen_two.dart
View File

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

1
lib/screen_ui/multi_vendor_service/order_list_screen/order_screen.dart
View File

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

1
lib/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart
View File

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

1
lib/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart
View File

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

1
lib/screen_ui/on_boarding_screen/on_boarding_screen.dart
View File

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

6
lib/screen_ui/on_demand_service/favourite_ondemand_screen.dart
View File

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

1
lib/screen_ui/on_demand_service/on_demand_details_screen.dart
View File

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

1
lib/screen_ui/on_demand_service/on_demand_home_screen.dart
View File

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

1
lib/screen_ui/parcel_service/my_booking_screen.dart
View File

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

1
lib/screen_ui/parcel_service/order_successfully_placed.dart
View File

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

1
lib/screen_ui/rental_service/my_rental_booking_screen.dart
View File

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

1
lib/screen_ui/rental_service/rental_home_screen.dart
View File

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

27
lib/utils/utils.dart
View File

@@ -152,36 +152,45 @@ 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(', ');
}