From b2a597bac75ba1b58ba05db762f35b5c23ce0b11 Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Tue, 30 Jul 2024 10:25:31 +0300 Subject: [PATCH] few changes --- lib/config/customer_routes.dart | 4 ++-- .../{provider => branches}/branch_detail_page.dart | 2 +- .../{provider => branches}/provider_profile_page.dart | 0 .../{provider => branches}/sheet/items_list_sheet.dart | 0 lib/views/dashboard/fragments/ads_fragment.dart | 3 +-- .../dashboard/fragments/my_requests_fragment.dart | 5 +---- pubspec.yaml | 10 +++++----- 7 files changed, 10 insertions(+), 14 deletions(-) rename lib/views/{provider => branches}/branch_detail_page.dart (99%) rename lib/views/{provider => branches}/provider_profile_page.dart (100%) rename lib/views/{provider => branches}/sheet/items_list_sheet.dart (100%) diff --git a/lib/config/customer_routes.dart b/lib/config/customer_routes.dart index ead8a64..8dd5b44 100644 --- a/lib/config/customer_routes.dart +++ b/lib/config/customer_routes.dart @@ -1,3 +1,5 @@ +import 'package:car_customer_app/views/branches/branch_detail_page.dart'; +import 'package:car_customer_app/views/branches/provider_profile_page.dart'; import 'package:mc_common_app/views/appointments/appointment_detail_view.dart'; import 'package:mc_common_app/views/appointments/book_appointment_schedules_view.dart'; import 'package:mc_common_app/views/appointments/book_appointment_services_view.dart'; @@ -5,8 +7,6 @@ import 'package:mc_common_app/views/appointments/book_appointments_item_view.dar import 'package:mc_common_app/views/appointments/pick_items_view.dart'; import 'package:mc_common_app/views/appointments/review_appointment_view.dart'; import 'package:car_customer_app/views/dashboard/dashboard_page.dart'; -import 'package:car_customer_app/views/provider/branch_detail_page.dart'; -import 'package:car_customer_app/views/provider/provider_profile_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/models/advertisment_models/ad_details_model.dart'; diff --git a/lib/views/provider/branch_detail_page.dart b/lib/views/branches/branch_detail_page.dart similarity index 99% rename from lib/views/provider/branch_detail_page.dart rename to lib/views/branches/branch_detail_page.dart index 272c9a1..706bf86 100644 --- a/lib/views/provider/branch_detail_page.dart +++ b/lib/views/branches/branch_detail_page.dart @@ -1,5 +1,5 @@ import 'package:mc_common_app/view_models/appointments_view_model.dart'; -import 'package:car_customer_app/views/provider/sheet/items_list_sheet.dart'; +import 'package:car_customer_app/views/branches/sheet/items_list_sheet.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:mc_common_app/classes/consts.dart'; diff --git a/lib/views/provider/provider_profile_page.dart b/lib/views/branches/provider_profile_page.dart similarity index 100% rename from lib/views/provider/provider_profile_page.dart rename to lib/views/branches/provider_profile_page.dart diff --git a/lib/views/provider/sheet/items_list_sheet.dart b/lib/views/branches/sheet/items_list_sheet.dart similarity index 100% rename from lib/views/provider/sheet/items_list_sheet.dart rename to lib/views/branches/sheet/items_list_sheet.dart diff --git a/lib/views/dashboard/fragments/ads_fragment.dart b/lib/views/dashboard/fragments/ads_fragment.dart index b720614..10cde5a 100644 --- a/lib/views/dashboard/fragments/ads_fragment.dart +++ b/lib/views/dashboard/fragments/ads_fragment.dart @@ -89,8 +89,7 @@ class AdsFragment extends StatelessWidget { onFilterTapped: (index, selectedFilterId) => adVM.applyFilterOnExploreAds(createdByRoleFilter: selectedFilterId.toCreatedByRoleEnum()), needLeftPadding: false) .paddingOnly(left: 21), - ], - if (!adVM.isExploreAdsTapped) ...[ + ] else ...[ 16.height, FiltersList( filterList: adVM.myAdsFilterOptions, diff --git a/lib/views/dashboard/fragments/my_requests_fragment.dart b/lib/views/dashboard/fragments/my_requests_fragment.dart index 3ce18db..b0ebe78 100644 --- a/lib/views/dashboard/fragments/my_requests_fragment.dart +++ b/lib/views/dashboard/fragments/my_requests_fragment.dart @@ -12,7 +12,6 @@ import 'package:mc_common_app/widgets/common_widgets/categories_list.dart'; import 'package:provider/provider.dart'; import 'package:easy_localization/easy_localization.dart'; - class MyRequestsFragment extends StatelessWidget { const MyRequestsFragment({super.key}); @@ -54,9 +53,7 @@ class MyRequestsFragment extends StatelessWidget { requestIndex: index, ); }, - separatorBuilder: (context, index) { - return 16.height; - }, + separatorBuilder: (context, index) => 16.height, itemCount: requestsVM.myFilteredRequests.length, padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16, top: 8), ), diff --git a/pubspec.yaml b/pubspec.yaml index cd455aa..501dc8d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,7 +36,7 @@ dependencies: cupertino_icons: ^1.0.2 mc_common_app: - path: /Users/amir/StudioProjects/car_common_app + path: /Volumes/Data/Projects/Flutter/car_common_app dev_dependencies: flutter_test: @@ -77,9 +77,9 @@ flutter: # "family" key with the font family name, and a "fonts" key with a # list giving the asset and other descriptors for the font. For # example: -# fonts: -# - family: Poppins -# fonts: -# - asset: assets/fonts/Poppins-Medium.ttf + # fonts: + # - family: Poppins + # fonts: + # - asset: assets/fonts/Poppins-Medium.ttf # For details regarding fonts from package dependencies, # see https://flutter.dev/custom-fonts/#from-packages