diff --git a/lib/config/provider_routes.dart b/lib/config/provider_routes.dart index c9e0dd2..af2ab80 100644 --- a/lib/config/provider_routes.dart +++ b/lib/config/provider_routes.dart @@ -23,6 +23,7 @@ import 'package:flutter/material.dart'; import 'package:mc_common_app/models/appointments_models/appointment_list_model.dart'; import 'package:mc_common_app/models/provider_branches_models/branch_detail_model.dart'; import 'package:mc_common_app/utils/enums.dart'; +import 'package:mc_common_app/views/appointments/appointments_filter_view.dart'; import 'package:mc_common_app/views/setting_options/provider_accepted_requests_view.dart'; class ProviderAppRoutes { @@ -42,6 +43,7 @@ class ProviderAppRoutes { AppRoutes.updateAppointmentPage: (context) => const UpdateAppointmentPage(), AppRoutes.addServiceInAppointment: (context) => AddNewServiceAppointmentPage(ModalRoute.of(context)!.settings.arguments as AppointmentListModel), AppRoutes.mergeAppointments: (context) => const MergeAppointmentListPage(), + AppRoutes.appoinmentSearchFilterPage: (context) => const AppointmentsFilterView(), //Subscriptions AppRoutes.mySubscriptionsPage: (context) => const MySubscriptionsPage(), diff --git a/lib/views/branch_management/branch/branch_list_page.dart b/lib/views/branch_management/branch/branch_list_page.dart index 67c7725..61a4cac 100644 --- a/lib/views/branch_management/branch/branch_list_page.dart +++ b/lib/views/branch_management/branch/branch_list_page.dart @@ -23,7 +23,7 @@ import 'package:mc_common_app/widgets/tab/role_type_tab.dart'; import 'package:provider/provider.dart'; class BranchListPage extends StatelessWidget { - const BranchListPage({Key? key}) : super(key: key); + const BranchListPage({super.key}); void deleteBranchBottomSheet(BuildContext context, int branchID) { return actionConfirmationBottomSheet( diff --git a/lib/views/branch_management/services/create_services_page3.dart b/lib/views/branch_management/services/create_services_page3.dart index 7b0a796..f0f1cb4 100644 --- a/lib/views/branch_management/services/create_services_page3.dart +++ b/lib/views/branch_management/services/create_services_page3.dart @@ -402,7 +402,7 @@ class _CreateServicesPage3State extends State { } catch (e) { Utils.hideLoading(context); log(e.toString()); - Utils.showToast(e.toString() ?? ""); + Utils.showToast(e.toString()); return value; } } diff --git a/lib/views/dashboard/fragments/branch_appointment_fragment.dart b/lib/views/dashboard/fragments/branch_appointment_fragment.dart index 4af787d..f45be98 100644 --- a/lib/views/dashboard/fragments/branch_appointment_fragment.dart +++ b/lib/views/dashboard/fragments/branch_appointment_fragment.dart @@ -8,6 +8,7 @@ import 'package:mc_common_app/models/provider_branches_models/branch_detail_mode import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/utils/enums.dart'; import 'package:mc_common_app/utils/navigator.dart'; +import 'package:mc_common_app/view_models/appointments_view_model.dart'; import 'package:mc_common_app/view_models/service_view_model.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; @@ -20,9 +21,26 @@ class BranchAppointmentFragment extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( - appBar: const CustomAppBar( - title: "Select Branch", + appBar: CustomAppBar( + title: LocaleKeys.selectBranch.tr(), isRemoveBackButton: true, + actions: [ + Consumer(builder: (BuildContext context, AppointmentsVM appointmentsVM, Widget? child) { + return Padding( + padding: EdgeInsets.only(top: appointmentsVM.appointmentFiltersCounter > 0 ? 20 : 0, right: 21), + child: Badge( + isLabelVisible: appointmentsVM.appointmentFiltersCounter > 0, + largeSize: 15, + smallSize: 20, + backgroundColor: MyColors.darkPrimaryColor, + label: Text('${appointmentsVM.appointmentFiltersCounter}'), + child: MyAssets.searchIcon.buildSvg(), + ), + ).onPress(() { + navigateWithName(context, AppRoutes.appoinmentSearchFilterPage); + }); + }), + ], ), body: SizedBox( width: double.infinity, diff --git a/lib/views/dashboard/fragments/home_fragment.dart b/lib/views/dashboard/fragments/home_fragment.dart index 8fe4bb9..4a935ff 100644 --- a/lib/views/dashboard/fragments/home_fragment.dart +++ b/lib/views/dashboard/fragments/home_fragment.dart @@ -101,7 +101,7 @@ class HomeFragment extends StatelessWidget { onSubtitleTapped: () { context.read().onNavbarTapped(3); context.read().updateIsExploreAds(true); - context.read().applyFilterOnExploreAds(createdByRoleFilter: CreatedByRoleEnum.allAds); + context.read().applyFilterOnExploreAds(vehicleBrandId: 0); // allAds }, ).horPaddingMain(), AdsListWidget( @@ -124,7 +124,7 @@ class HomeFragment extends StatelessWidget { onSubtitleTapped: () { context.read().onNavbarTapped(3); context.read().updateIsExploreAds(true); - context.read().applyFilterOnExploreAds(createdByRoleFilter: CreatedByRoleEnum.allAds); + context.read().applyFilterOnExploreAds(vehicleBrandId: 0); // allAds }, ).horPaddingMain(), AdsListWidget(