feat: filters added to home page

2025-10-24 14:54:08 +05:00
parent 41d8a38471
commit f2ab615b4e
30 changed files with 1159 additions and 86 deletions
--- a/lib/core/constants/time_delay_cons.dart
+++ b/lib/core/constants/time_delay_cons.dart
@@ -1,4 +1,5 @@
 abstract class TimeDelayConst {
+  static const Duration durationMill150 = Duration(milliseconds: 150);
  static const Duration durationMill300 = Duration(milliseconds: 300);
  static const Duration durationMill800 = Duration(milliseconds: 800);

--- a/lib/core/di/injection_container.config.dart
+++ b/lib/core/di/injection_container.config.dart
@@ -31,9 +31,9 @@ extension GetItInjectableX on _i174.GetIt {
    _i526.EnvironmentFilter? environmentFilter,
  }) {
    final gh = _i526.GetItHelper(this, environment, environmentFilter);
+    gh.factory<_i1007.HomeBloc>(() => _i1007.HomeBloc());
    gh.factory<_i580.MainBloc>(() => _i580.MainBloc());
    gh.factory<_i311.SplashBloc>(() => _i311.SplashBloc());
-    gh.factory<_i1007.HomeBloc>(() => _i1007.HomeBloc());
    gh.singleton<_i306.StorageService>(() => _i306.StorageService());
    gh.singleton<_i152.AppRoutes>(() => _i152.AppRoutes());
    gh.factory<_i942.LanguageBloc>(
--- a/lib/core/l10n/app_localizations.dart
+++ b/lib/core/l10n/app_localizations.dart
@@ -327,6 +327,162 @@ abstract class AppLocalizations {
  /// In en, this message translates to:
  /// **'More'**
  String get more;
+
+  /// No description provided for @orderDetails.
+  ///
+  /// In en, this message translates to:
+  /// **'Order details'**
+  String get orderDetails;
+
+  /// No description provided for @deliverNow.
+  ///
+  /// In en, this message translates to:
+  /// **'Deliver now'**
+  String get deliverNow;
+
+  /// No description provided for @schedule.
+  ///
+  /// In en, this message translates to:
+  /// **'Schedule'**
+  String get schedule;
+
+  /// No description provided for @enterNewAddress.
+  ///
+  /// In en, this message translates to:
+  /// **'Enter a new address'**
+  String get enterNewAddress;
+
+  /// No description provided for @nearby.
+  ///
+  /// In en, this message translates to:
+  /// **'Nearby'**
+  String get nearby;
+
+  /// No description provided for @currentLocation.
+  ///
+  /// In en, this message translates to:
+  /// **'Current location'**
+  String get currentLocation;
+
+  /// No description provided for @enable.
+  ///
+  /// In en, this message translates to:
+  /// **'Enable'**
+  String get enable;
+
+  /// No description provided for @recentLocations.
+  ///
+  /// In en, this message translates to:
+  /// **'Recent locations'**
+  String get recentLocations;
+
+  /// No description provided for @allFilters.
+  ///
+  /// In en, this message translates to:
+  /// **'All filters'**
+  String get allFilters;
+
+  /// No description provided for @sort.
+  ///
+  /// In en, this message translates to:
+  /// **'Sort'**
+  String get sort;
+
+  /// No description provided for @pickedForYou.
+  ///
+  /// In en, this message translates to:
+  /// **'Picked for you (default)'**
+  String get pickedForYou;
+
+  /// No description provided for @mostPopular.
+  ///
+  /// In en, this message translates to:
+  /// **'Most popular'**
+  String get mostPopular;
+
+  /// No description provided for @rating.
+  ///
+  /// In en, this message translates to:
+  /// **'Rating'**
+  String get rating;
+
+  /// No description provided for @deliveryTime.
+  ///
+  /// In en, this message translates to:
+  /// **'Delivery time'**
+  String get deliveryTime;
+
+  /// No description provided for @fromUberEats.
+  ///
+  /// In en, this message translates to:
+  /// **'From Uber Eats'**
+  String get fromUberEats;
+
+  /// No description provided for @deals.
+  ///
+  /// In en, this message translates to:
+  /// **'Deals'**
+  String get deals;
+
+  /// No description provided for @bestOverall.
+  ///
+  /// In en, this message translates to:
+  /// **'Best overall'**
+  String get bestOverall;
+
+  /// No description provided for @priceRange.
+  ///
+  /// In en, this message translates to:
+  /// **'Price range'**
+  String get priceRange;
+
+  /// No description provided for @maxDeliveryFee.
+  ///
+  /// In en, this message translates to:
+  /// **'Max. Delivery Fee'**
+  String get maxDeliveryFee;
+
+  /// No description provided for @dietary.
+  ///
+  /// In en, this message translates to:
+  /// **'Dietary'**
+  String get dietary;
+
+  /// No description provided for @vegetarian.
+  ///
+  /// In en, this message translates to:
+  /// **'Vegetarian'**
+  String get vegetarian;
+
+  /// No description provided for @vegan.
+  ///
+  /// In en, this message translates to:
+  /// **'Vegan'**
+  String get vegan;
+
+  /// No description provided for @glutenFree.
+  ///
+  /// In en, this message translates to:
+  /// **'Gluten-free'**
+  String get glutenFree;
+
+  /// No description provided for @allergyFriendly.
+  ///
+  /// In en, this message translates to:
+  /// **'Allergy friendly'**
+  String get allergyFriendly;
+
+  /// No description provided for @atLeast.
+  ///
+  /// In en, this message translates to:
+  /// **'At least'**
+  String get atLeast;
+
+  /// No description provided for @apply.
+  ///
+  /// In en, this message translates to:
+  /// **'Apply'**
+  String get apply;
 }

 class _AppLocalizationsDelegate
--- a/lib/core/l10n/app_localizations_en.dart
+++ b/lib/core/l10n/app_localizations_en.dart
@@ -126,4 +126,82 @@ class AppLocalizationsEn extends AppLocalizations {

  @override
  String get more => 'More';
+
+  @override
+  String get orderDetails => 'Order details';
+
+  @override
+  String get deliverNow => 'Deliver now';
+
+  @override
+  String get schedule => 'Schedule';
+
+  @override
+  String get enterNewAddress => 'Enter a new address';
+
+  @override
+  String get nearby => 'Nearby';
+
+  @override
+  String get currentLocation => 'Current location';
+
+  @override
+  String get enable => 'Enable';
+
+  @override
+  String get recentLocations => 'Recent locations';
+
+  @override
+  String get allFilters => 'All filters';
+
+  @override
+  String get sort => 'Sort';
+
+  @override
+  String get pickedForYou => 'Picked for you (default)';
+
+  @override
+  String get mostPopular => 'Most popular';
+
+  @override
+  String get rating => 'Rating';
+
+  @override
+  String get deliveryTime => 'Delivery time';
+
+  @override
+  String get fromUberEats => 'From Uber Eats';
+
+  @override
+  String get deals => 'Deals';
+
+  @override
+  String get bestOverall => 'Best overall';
+
+  @override
+  String get priceRange => 'Price range';
+
+  @override
+  String get maxDeliveryFee => 'Max. Delivery Fee';
+
+  @override
+  String get dietary => 'Dietary';
+
+  @override
+  String get vegetarian => 'Vegetarian';
+
+  @override
+  String get vegan => 'Vegan';
+
+  @override
+  String get glutenFree => 'Gluten-free';
+
+  @override
+  String get allergyFriendly => 'Allergy friendly';
+
+  @override
+  String get atLeast => 'At least';
+
+  @override
+  String get apply => 'Apply';
 }
--- a/lib/core/l10n/app_localizations_ru.dart
+++ b/lib/core/l10n/app_localizations_ru.dart
@@ -127,4 +127,82 @@ class AppLocalizationsRu extends AppLocalizations {

  @override
  String get more => 'Ещё';
+
+  @override
+  String get orderDetails => 'Детали заказа';
+
+  @override
+  String get deliverNow => 'Доставить сейчас';
+
+  @override
+  String get schedule => 'Запланировать';
+
+  @override
+  String get enterNewAddress => 'Введите новый адрес';
+
+  @override
+  String get nearby => 'Рядом';
+
+  @override
+  String get currentLocation => 'Текущее местоположение';
+
+  @override
+  String get enable => 'Включить';
+
+  @override
+  String get recentLocations => 'Недавние адреса';
+
+  @override
+  String get allFilters => 'Все фильтры';
+
+  @override
+  String get sort => 'Сортировка';
+
+  @override
+  String get pickedForYou => 'Подобрано для вас (по умолчанию)';
+
+  @override
+  String get mostPopular => 'Самые популярные';
+
+  @override
+  String get rating => 'Рейтинг';
+
+  @override
+  String get deliveryTime => 'Время доставки';
+
+  @override
+  String get fromUberEats => 'От Uber Eats';
+
+  @override
+  String get deals => 'Скидки';
+
+  @override
+  String get bestOverall => 'Лучший выбор';
+
+  @override
+  String get priceRange => 'Диапазон цен';
+
+  @override
+  String get maxDeliveryFee => 'Макс. стоимость доставки';
+
+  @override
+  String get dietary => 'Диета';
+
+  @override
+  String get vegetarian => 'Вегетарианское';
+
+  @override
+  String get vegan => 'Веганское';
+
+  @override
+  String get glutenFree => 'Без глютена';
+
+  @override
+  String get allergyFriendly => 'Без аллергенов';
+
+  @override
+  String get atLeast => 'Kак минимум';
+
+  @override
+  String get apply => 'Применить';
 }
--- a/lib/core/l10n/app_localizations_uz.dart
+++ b/lib/core/l10n/app_localizations_uz.dart
@@ -127,4 +127,82 @@ class AppLocalizationsUz extends AppLocalizations {

  @override
  String get more => 'Ko\'proq';
+
+  @override
+  String get orderDetails => 'Buyurtma tafsilotlari';
+
+  @override
+  String get deliverNow => 'Hozir yetkazish';
+
+  @override
+  String get schedule => 'Rejalashtirish';
+
+  @override
+  String get enterNewAddress => 'Yangi manzil kiriting';
+
+  @override
+  String get nearby => 'Yaqin joylar';
+
+  @override
+  String get currentLocation => 'Joriy joylashuv';
+
+  @override
+  String get enable => 'Yoqqish';
+
+  @override
+  String get recentLocations => 'Yaqinda ishlatilgan manzillar';
+
+  @override
+  String get allFilters => 'Barcha filtrlar';
+
+  @override
+  String get sort => 'Saralash';
+
+  @override
+  String get pickedForYou => 'Siz uchun';
+
+  @override
+  String get mostPopular => 'Eng ommabop';
+
+  @override
+  String get rating => 'Reyting';
+
+  @override
+  String get deliveryTime => 'Yetkazib berish vaqti';
+
+  @override
+  String get fromUberEats => 'Uber Eats dan';
+
+  @override
+  String get deals => 'Aksiyalar';
+
+  @override
+  String get bestOverall => 'Eng yaxshisi';
+
+  @override
+  String get priceRange => 'Narx oralig‘i';
+
+  @override
+  String get maxDeliveryFee => 'Maks. yetkazish narxi';
+
+  @override
+  String get dietary => 'Parhez';
+
+  @override
+  String get vegetarian => 'Vegetarian';
+
+  @override
+  String get vegan => 'Vegan';
+
+  @override
+  String get glutenFree => 'Glutensiz';
+
+  @override
+  String get allergyFriendly => 'Allergiyaga mos';
+
+  @override
+  String get atLeast => 'Kаmida';
+
+  @override
+  String get apply => 'Qo‘llash';
 }
--- a/lib/core/theme/app_colors.dart
+++ b/lib/core/theme/app_colors.dart
@@ -3,6 +3,8 @@ import '../../food_delivery_client.dart';
 abstract class AppColors {
  static const Color cTransparent = Colors.transparent;
  static const Color cRed = Colors.red;
+  static const Color cYellow = Colors.yellow;
+

  static const Color cFFFFFF = Color(0xFFFFFFFF);
  static const Color c000000 = Color(0xFF000000);
--- a/lib/core/theme/app_icons.dart
+++ b/lib/core/theme/app_icons.dart
@@ -23,5 +23,24 @@ abstract class AppIcons {
  static const String icLocation = "$baseUrl/ic_location.svg";
  static const String icArrowBottom = "$baseUrl/ic_arrow_btm.svg";

+  static const String icPicked = "$baseUrl/ic_picked.svg";
+  static const String icMostPopular = "$baseUrl/ic_popular.svg";
+  static const String icStar = "$baseUrl/ic_rating.svg";
+  static const String icDeliveryTime = "$baseUrl/ic_delivery_time.svg";
+  static const String icDeals = "$baseUrl/ic_deals.svg";
+  static const String icClose = "$baseUrl/ic_close.svg";
+  static const String icCurrentLocation = "$baseUrl/ic_current_loc.svg";
+  static const String icEdit = "$baseUrl/ic_edit.svg";
+  static const String icSearch = "$baseUrl/ic_search.svg";
+  static const String icCheck= "$baseUrl/ic_check.svg";
+  static const String icCheck1= "$baseUrl/ic_check1.svg";
+
+
  ///.png icons
+  static const String icBestOverall = "$baseUrl/ic_best.png";
+  static const String icVegetarian = "$baseUrl/ic_vegetarian.png";
+  static const String icVegen = "$baseUrl/ic_vegen.png";
+  static const String icGlutenFree = "$baseUrl/ic_gluten_free.png";
+  static const String icAllergyFriendly = "$baseUrl/ic_allergy_friendly.png";
+  static const String icClock = "$baseUrl/ic_clock.png";
 }
--- a/lib/core/theme/app_textstyles.dart
+++ b/lib/core/theme/app_textstyles.dart
@@ -63,6 +63,20 @@ abstract class AppTextStyles {
    fontWeight: FontWeight.w500,
  );

+  static const TextStyle size20Medium = TextStyle(
+    color: _defaultColor,
+    fontSize: SizesCons.size_20,
+    fontFamily: _fontMedium,
+    fontWeight: FontWeight.w500,
+  );
+
+  static const TextStyle size16Bold= TextStyle(
+    color: _defaultColor,
+    fontSize: SizesCons.size_16,
+    fontFamily: _fontBold,
+    fontWeight: FontWeight.w700,
+  );
+
  static const TextStyle size17Bold = TextStyle(
    color: _defaultColor,
    fontSize: SizesCons.size_17,
--- a/lib/core/utils/app_utils.dart
+++ b/lib/core/utils/app_utils.dart
@@ -1,6 +1,8 @@
 import '../../food_delivery_client.dart';

 abstract class AppUtils {
+  static const SizedBox kSizedBox = SizedBox.shrink();
+
  static const Radius kRadius = Radius.zero;
  static const Radius kRadius8 = Radius.circular(8);
  static const Radius kRadius12 = Radius.circular(12);
@@ -79,6 +81,10 @@ abstract class AppUtils {
  static const BorderRadius kBorderRadius40 = BorderRadius.all(
    Radius.circular(40),
  );
+  static const BorderRadius kBorderRadiusTop20 = BorderRadius.only(
+    topLeft: kRadius20,
+    topRight: kRadius20,
+  );
  static const BorderRadius kBorderRadiusTop20Bottom20 = BorderRadius.only(
    bottomRight: kRadius20,
    topRight: kRadius20,