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

Merge pull request 'MINOR-FIX: Drop Down Issue Fix.' (#2) from abdusalom0516/base/home-screen into master

Browse Source 
Reviewed-on: #2
This commit is contained in:
Abdusalom999
2025-12-09 06:09:23 +00:00
parent 7036468ce7 e4e77356b5
commit 966d9cc187
38 changed files with 60 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/constant/const_texts.dart
View File

@@ -158,6 +158,6 @@ class ConstTexts {
// static String ok = "ok";
// static String freeDelivery = "freeDelivery";
// static String upto = "upto";
// static String doYouWantChangeTheDeliverOption = "doYouWantChangeTheDeliverOption";
static String doYouWantChangeTheDeliverOption = "doYouWantChangeTheDeliverOption";
// static String cash = "cash";
}

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}';

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';

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';

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

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

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';

47
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,
@@ -1216,9 +1226,10 @@ class HomeScreen extends StatelessWidget {
value: controller.selectedOrderTypeValue.value.tr,
icon: const Icon(Icons.keyboard_arrow_down),
items:
<String>[ConstTexts.delivery.tr, ConstTexts.takeAway.tr].map((
String value,
) {
<String>[
ConstTexts.delivery,
ConstTexts.takeAway,
].map((String value) {
return DropdownMenuItem<String>(
value: value,
child: Text(
@@ -1248,9 +1259,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 {
@@ -3268,7 +3280,9 @@ class MapView extends StatelessWidget {
),
colors: [
Colors.black
.withValues(alpha: 0),
.withValues(
alpha: 0,
),
const Color(
0xFF111827,
),
@@ -3403,7 +3417,8 @@ class MapView extends StatelessWidget {
width: 5,
),
Text(
ConstTexts.freeDelivery
ConstTexts
.freeDelivery
.tr,
style: TextStyle(
fontSize:

3
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';
@@ -791,7 +790,7 @@ class HomeScreenTwo extends StatelessWidget {
value: controller.selectedOrderTypeValue.value.tr,
icon: const Icon(Icons.keyboard_arrow_down),
items:
<String>['Delivery'.tr, 'TakeAway'.tr].map((
<String>[ConstTexts.delivery, ConstTexts.takeAway].map((
String value,
) {
return DropdownMenuItem<String>(

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(', ');
}