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

BASE: Enhance Design.

Browse Source
This commit is contained in:
Abdusalom G'ayratov
2025-12-08 12:05:48 +05:00
parent 3874ef062b
commit 653f1f93bf
34 changed files with 668 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
assets/translations/en.json
View File

@@ -122,5 +122,13 @@
"changeLanguage": "Change Language",
"selectPrefferedLanguage": "Select your preferred language for a personalized app experience."
"selectPrefferedLanguage": "Select your preferred language for a personalized app experience.",
"searchStoreItem": "Search the store, item and more...",
"category": "Category",
"highlightsForU": "Highlights for you",
"newArrival": "New Arrivals",
"topBrands": "Top Brands",
"styleUp": "Style up with the latest fits, now at unbeatable prices.",
"additionlOffers": "Additional Offers"
}

16
lib/constant/const_texts.dart
View File

@@ -122,14 +122,14 @@ class ConstTexts {
static String enterManuallyLocation = "enterManuallyLocation";
static String changeLanguage = "changeLanguage";
static String selectPrefferedLanguage = "selectPrefferedLanguage";
// static String rideDetails = "rideDetails";
// static String youDoNothaveSufficientwalletBalance = "youDoNothaveSufficientwalletBalance";
// static String somethingWentWrong = "somethingWentWrong";
// static String cash = "cash";
// static String hugeSelectionOfAds = "hugeSelectionOfAds";
// static String cosmetics = "cosmetics";
// static String moreThan1000Products = "moreThan1000Products";
// static String foodProducts = "foodProducts";
static String searchStoreItem = "searchStoreItem";
static String category = "category";
static String highlightsForU = "highlightsForU";
static String newArrival = "newArrivals";
static String viewAllArrivals = "View All Arrivals";
static String topBrands = "topBrands";
static String styleUp = "styleUp";
static String additionlOffers = "additionlOffers";
// static String enableLocation = "enableLocation";
// static String allowLocation = "allowLocation";
// static String useCurrentLocation = "useCurrentLocation";

1
lib/controllers/0n_demand_payment_controller.dart
View File

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

1
lib/controllers/cart_controller.dart
View File

@@ -4,6 +4,7 @@ import 'dart:io';
import 'dart:math' as maths;
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/models/cart_product_model.dart';
import 'package:customer/models/coupon_model.dart';

1
lib/controllers/dine_in_restaurant_details_controller.dart
View File

@@ -1,5 +1,6 @@
import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/models/dine_in_booking_model.dart';
import 'package:customer/models/favourite_model.dart';

1
lib/controllers/edit_profile_controller.dart
View File

@@ -1,4 +1,5 @@
import 'dart:io';
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/models/user_model.dart';

1
lib/controllers/forgot_password_controller.dart
View File

@@ -1,3 +1,4 @@
import 'package:customer/constant/const_texts.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';

1
lib/controllers/gift_card_controller.dart
View File

@@ -3,6 +3,7 @@ import 'dart:io';
import 'dart:math' as maths;
import 'dart:math';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/models/gift_cards_model.dart';
import 'package:customer/themes/app_them_data.dart';

1
lib/controllers/on_demand_booking_controller.dart
View File

@@ -1,4 +1,5 @@
import 'package:cloud_firestore/cloud_firestore.dart';
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';

1
lib/controllers/on_demand_order_details_controller.dart
View File

@@ -1,5 +1,6 @@
import 'dart:developer';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/constant/const_texts.dart';
import 'package:customer/models/coupon_model.dart';
import 'package:customer/models/user_model.dart';

1
lib/controllers/parcel_order_confirmation_controller.dart
View File

@@ -3,6 +3,7 @@ import 'dart:developer';
import 'dart:io';
import 'dart:math' as maths;
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/constant/const_texts.dart';
import 'package:customer/models/coupon_model.dart';
import 'package:customer/models/wallet_transaction_model.dart';

1
lib/controllers/rate_product_controller.dart
View File

@@ -1,6 +1,7 @@
import 'dart:developer';
import 'dart:io';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/models/order_model.dart';
import 'package:customer/models/product_model.dart';

1
lib/controllers/service_list_controller.dart
View File

@@ -1,3 +1,4 @@
import 'package:customer/constant/const_texts.dart';
import 'package:customer/models/section_model.dart';
import 'package:customer/screen_ui/cab_service_screens/cab_dashboard_screen.dart';
import 'package:customer/screen_ui/ecommarce/dash_board_e_commerce_screen.dart';

20
lib/screen_ui/ecommarce/home_e_commerce_screen.dart
View File

@@ -298,7 +298,7 @@ class HomeECommerceScreen extends StatelessWidget {
);
},
child: TextFieldWidget(
hintText: 'Search the store, item and more...'.tr,
hintText: ConstTexts.searchStoreItem.tr,
controller: null,
enable: false,
backgroundColor: AppThemeData.grey50,
@@ -335,7 +335,7 @@ class HomeECommerceScreen extends StatelessWidget {
children: [
Expanded(
child: Text(
"Category".tr,
ConstTexts.category.tr,
textAlign: TextAlign.start,
style: AppThemeData.semiBoldTextStyle(
color:
@@ -351,7 +351,7 @@ class HomeECommerceScreen extends StatelessWidget {
Get.to(const ViewAllCategoryScreen());
},
child: Text(
"View all".tr,
ConstTexts.viewAll.tr,
textAlign: TextAlign.start,
style: AppThemeData.semiBoldTextStyle(
decoration: TextDecoration.underline,
@@ -466,7 +466,9 @@ class HomeECommerceScreen extends StatelessWidget {
children: [
Expanded(
child: Text(
"Highlights for you".tr,
ConstTexts
.highlightsForU
.tr,
textAlign: TextAlign.start,
style: TextStyle(
fontFamily:
@@ -547,7 +549,7 @@ class HomeECommerceScreen extends StatelessWidget {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Text(
"New Arrivals".tr,
ConstTexts.newArrival.tr,
textAlign: TextAlign.start,
style: AppThemeData.semiBoldTextStyle(
color:
@@ -594,14 +596,14 @@ class HomeECommerceScreen extends StatelessWidget {
isDark
? AppThemeData.greyDark200
: AppThemeData.grey200,
title: 'View All Arrivals'.tr,
title: ConstTexts.viewAllArrivals.tr,
onPress: () {
Get.to(
RestaurantListScreen(),
arguments: {
"vendorList":
controller.newArrivalRestaurantList,
"title": "New Arrivals".tr,
"title": ConstTexts.newArrival.tr,
},
);
},
@@ -614,7 +616,7 @@ class HomeECommerceScreen extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"Top Brands".tr,
ConstTexts.topBrands.tr,
textAlign: TextAlign.start,
style: AppThemeData.semiBoldTextStyle(
color:
@@ -777,7 +779,7 @@ class HomeECommerceScreen extends StatelessWidget {
),
),
Text(
"Style up with the latest fits, now at unbeatable prices."
ConstTexts.styleUp.tr
.tr,
textAlign: TextAlign.start,
style:

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

@@ -1,3 +1,4 @@
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/models/user_model.dart';
import 'package:customer/service/fire_store_utils.dart';

1
lib/screen_ui/multi_vendor_service/advertisement_screens/all_advertisement_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/advertisement_list_controller.dart';
import 'package:customer/models/advertisement_model.dart';

1
lib/screen_ui/multi_vendor_service/chat_screens/driver_inbox_screen.dart
View File

@@ -1,4 +1,5 @@
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/models/inbox_model.dart';
import 'package:customer/models/user_model.dart';

1
lib/screen_ui/multi_vendor_service/chat_screens/restaurant_inbox_screen.dart
View File

@@ -1,4 +1,5 @@
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/models/inbox_model.dart';
import 'package:customer/models/user_model.dart';

1
lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_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/dine_in_controller.dart';
import 'package:customer/models/favourite_model.dart';

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

@@ -1,4 +1,5 @@
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/controllers/redeem_gift_card_controller.dart';

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

@@ -1,4 +1,5 @@
import 'package:badges/badges.dart' as badges;
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/controllers/map_view_controller.dart';
import 'package:customer/models/advertisement_model.dart';

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

@@ -1,5 +1,6 @@
import 'dart:math';
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/controllers/food_home_controller.dart';
import 'package:customer/models/coupon_model.dart';

1
lib/screen_ui/multi_vendor_service/order_list_screen/order_details_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/order_details_controller.dart';
import 'package:customer/models/cart_product_model.dart';

1
lib/screen_ui/multi_vendor_service/profile_screen/profile_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/my_profile_controller.dart';
import 'package:customer/screen_ui/on_demand_service/provider_inbox_screen.dart';

126
lib/screen_ui/multi_vendor_service/restaurant_details_screen/restaurant_details_screen.dart
View File

@@ -1,4 +1,7 @@
import 'dart:developer';
import 'package:badges/badges.dart' as badges;
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/controllers/restaurant_details_controller.dart';
import 'package:customer/models/cart_product_model.dart';
@@ -728,7 +731,7 @@ class RestaurantDetailsScreen extends StatelessWidget {
children: [
const SizedBox(height: 20),
Text(
"Additional Offers".tr,
ConstTexts.additionlOffers.tr,
textAlign: TextAlign.start,
maxLines: 1,
style: TextStyle(
@@ -1543,7 +1546,11 @@ class ProductListView extends StatelessWidget {
productModel.disPrice.toString(),
);
}
return Padding(
return InkWell(
onTap: () {
log("Product Clicked.");
},
child: Padding(
padding: const EdgeInsets.only(bottom: 20),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
@@ -1577,8 +1584,10 @@ class ProductListView extends StatelessWidget {
color:
productModel.nonveg == true
? AppThemeData.danger300
: AppThemeData.success400,
fontFamily: AppThemeData.semiBold,
: AppThemeData
.success400,
fontFamily:
AppThemeData.semiBold,
fontWeight: FontWeight.w600,
),
),
@@ -1613,20 +1622,25 @@ class ProductListView extends StatelessWidget {
: Row(
children: [
Text(
Constant.amountShow(amount: disPrice),
Constant.amountShow(
amount: disPrice,
),
style: TextStyle(
fontSize: 16,
color:
isDark
? AppThemeData.grey50
: AppThemeData.grey900,
fontFamily: AppThemeData.semiBold,
fontFamily:
AppThemeData.semiBold,
fontWeight: FontWeight.w600,
),
),
const SizedBox(width: 5),
Text(
Constant.amountShow(amount: price),
Constant.amountShow(
amount: price,
),
style: TextStyle(
fontSize: 14,
decoration:
@@ -1639,7 +1653,8 @@ class ProductListView extends StatelessWidget {
isDark
? AppThemeData.grey500
: AppThemeData.grey400,
fontFamily: AppThemeData.semiBold,
fontFamily:
AppThemeData.semiBold,
fontWeight: FontWeight.w600,
),
),
@@ -1760,14 +1775,18 @@ class ProductListView extends StatelessWidget {
if (controller.favouriteItemList
.where(
(p0) =>
p0.productId == productModel.id,
p0.productId ==
productModel.id,
)
.isNotEmpty) {
FavouriteItemModel
favouriteModel = FavouriteItemModel(
productId: productModel.id,
storeId:
controller.vendorModel.value.id,
controller
.vendorModel
.value
.id,
userId:
FireStoreUtils.getCurrentUid(),
);
@@ -1785,7 +1804,10 @@ class ProductListView extends StatelessWidget {
favouriteModel = FavouriteItemModel(
productId: productModel.id,
storeId:
controller.vendorModel.value.id,
controller
.vendorModel
.value
.id,
userId:
FireStoreUtils.getCurrentUid(),
);
@@ -1825,7 +1847,8 @@ class ProductListView extends StatelessWidget {
right: 20,
child:
selectedVariants.isNotEmpty ||
(productModel.addOnsTitle !=
(productModel
.addOnsTitle !=
null &&
productModel
.addOnsTitle!
@@ -1836,21 +1859,27 @@ class ProductListView extends StatelessWidget {
height: 4,
color:
isDark
? AppThemeData.grey900
: AppThemeData.grey50,
? AppThemeData
.grey900
: AppThemeData
.grey50,
textColor:
AppThemeData.primary300,
onPress: () async {
controller.selectedVariants
controller
.selectedVariants
.clear();
controller
.selectedIndexVariants
.clear();
controller.selectedIndexArray
controller
.selectedIndexArray
.clear();
controller.selectedAddOns
.clear();
controller.quantity.value = 1;
controller
.quantity
.value = 1;
if (productModel
.itemAttribute !=
null) {
@@ -1891,17 +1920,20 @@ class ProductListView extends StatelessWidget {
}
}
final bool
productIsInList = cartItem.any(
productIsInList =
cartItem.any(
(product) =>
product.id ==
"${productModel.id}~${productModel.itemAttribute!.variants!.where((element) => element.variantSku == controller.selectedVariants.join('-')).isNotEmpty ? productModel.itemAttribute!.variants!.where((element) => element.variantSku == controller.selectedVariants.join('-')).first.variantId.toString() : ""}",
);
if (productIsInList) {
CartProductModel element =
cartItem.firstWhere(
CartProductModel
element = cartItem
.firstWhere(
(product) =>
product.id ==
product
.id ==
"${productModel.id}~${productModel.itemAttribute!.variants!.where((element) => element.variantSku == controller.selectedVariants.join('-')).isNotEmpty ? productModel.itemAttribute!.variants!.where((element) => element.variantSku == controller.selectedVariants.join('-')).first.variantId.toString() : ""}",
);
controller
@@ -1927,10 +1959,12 @@ class ProductListView extends StatelessWidget {
"${productModel.id}",
)
.isNotEmpty) {
CartProductModel element =
cartItem.firstWhere(
CartProductModel
element = cartItem
.firstWhere(
(product) =>
product.id ==
product
.id ==
"${productModel.id}",
);
controller
@@ -2028,25 +2062,25 @@ class ProductListView extends StatelessWidget {
);
},
child: Icon(
Icons.remove,
Icons
.remove,
color:
isDark
? AppThemeData
.grey50
: AppThemeData
.greyDark50,
? AppThemeData.grey50
: AppThemeData.greyDark50,
),
),
Padding(
padding:
const EdgeInsets.symmetric(
padding: const EdgeInsets.symmetric(
horizontal:
14,
),
child: Text(
cartItem
.where(
(p0) =>
(
p0,
) =>
p0.id ==
productModel.id,
)
@@ -2056,19 +2090,17 @@ class ProductListView extends StatelessWidget {
textAlign:
TextAlign
.start,
maxLines: 1,
maxLines:
1,
style: TextStyle(
fontSize:
16,
overflow:
TextOverflow
.ellipsis,
TextOverflow.ellipsis,
fontFamily:
AppThemeData
.medium,
AppThemeData.medium,
fontWeight:
FontWeight
.w500,
FontWeight.w500,
color:
isDark
? AppThemeData.grey100
@@ -2127,10 +2159,8 @@ class ProductListView extends StatelessWidget {
Icons.add,
color:
isDark
? AppThemeData
.grey50
: AppThemeData
.greyDark50,
? AppThemeData.grey50
: AppThemeData.greyDark50,
),
),
],
@@ -2151,17 +2181,16 @@ class ProductListView extends StatelessWidget {
.primary300,
onPress: () async {
if (1 <=
(productModel
.quantity ??
(productModel.quantity ??
0) ||
(productModel
.quantity ??
(productModel.quantity ??
0) ==
-1) {
controller.addToCart(
productModel:
productModel,
price: price,
price:
price,
discountPrice:
disPrice,
isIncrement:
@@ -2183,6 +2212,7 @@ class ProductListView extends StatelessWidget {
),
],
),
),
);
},
),

1
lib/screen_ui/multi_vendor_service/scan_qrcode_screen/scan_qr_code_screen.dart
View File

@@ -1,3 +1,4 @@
import 'package:customer/constant/const_texts.dart';
import 'package:customer/controllers/scan_qr_code_controller.dart';
import 'package:customer/models/vendor_model.dart';
import 'package:customer/themes/app_them_data.dart';

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

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

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

@@ -1,4 +1,5 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/controllers/theme_controller.dart';
import 'package:customer/models/banner_model.dart';

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

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

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

@@ -1,4 +1,5 @@
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/models/inbox_model.dart';
import 'package:customer/models/user_model.dart';

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

@@ -1,4 +1,5 @@
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/models/inbox_model.dart';
import 'package:customer/models/user_model.dart';

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

@@ -1,3 +1,4 @@
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:flutter/material.dart';
import 'package:geocoding/geocoding.dart';

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

@@ -1,3 +1,4 @@
import 'package:customer/constant/const_texts.dart';
import 'package:customer/screen_ui/parcel_service/parcel_review_screen.dart';
import 'package:dotted_border/dotted_border.dart';

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

@@ -1,3 +1,4 @@
import 'package:customer/constant/const_texts.dart';
import 'package:customer/constant/constant.dart';
import 'package:customer/models/rental_order_model.dart';
import 'package:customer/payment/createRazorPayOrderModel.dart';