From eeec5aeb85719e5509860f49a73f4251c8fa93bd Mon Sep 17 00:00:00 2001 From: "Aamir.Muhammad" <> Date: Tue, 23 Jul 2024 16:29:43 +0300 Subject: [PATCH 1/2] appointment slider fix --- lib/views/dashboard/dashboard_page.dart | 1 + lib/views/dashboard/fragments/appointments_fragment.dart | 2 +- lib/views/dashboard/fragments/home_fragment.dart | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/views/dashboard/dashboard_page.dart b/lib/views/dashboard/dashboard_page.dart index 4c227cc..7ad9968 100644 --- a/lib/views/dashboard/dashboard_page.dart +++ b/lib/views/dashboard/dashboard_page.dart @@ -66,6 +66,7 @@ class _DashboardPageState extends State { await appointmentsVM.getMyAppointments(); } + if (appointmentsVM.nearbyBranches.isEmpty) { await appointmentsVM.applyFilterOnBranches(index: 0); // to get all branches! } diff --git a/lib/views/dashboard/fragments/appointments_fragment.dart b/lib/views/dashboard/fragments/appointments_fragment.dart index 7f9d903..868c13b 100644 --- a/lib/views/dashboard/fragments/appointments_fragment.dart +++ b/lib/views/dashboard/fragments/appointments_fragment.dart @@ -40,7 +40,7 @@ class AppointmentsFragment extends StatelessWidget { Expanded( child: RefreshIndicator( onRefresh: () async { - appointmentsVM.getMyAppointments(isNeedToRebuild: true); + appointmentsVM.getMyAppointments(); }, child: appointmentsVM.state == ViewState.busy ? const Center(child: CircularProgressIndicator()) diff --git a/lib/views/dashboard/fragments/home_fragment.dart b/lib/views/dashboard/fragments/home_fragment.dart index e6e6098..11da295 100644 --- a/lib/views/dashboard/fragments/home_fragment.dart +++ b/lib/views/dashboard/fragments/home_fragment.dart @@ -14,7 +14,6 @@ import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; import 'package:provider/provider.dart'; import 'package:easy_localization/easy_localization.dart'; - class HomeFragment extends StatelessWidget { const HomeFragment({Key? key}) : super(key: key); @@ -40,12 +39,12 @@ class HomeFragment extends StatelessWidget { context.read().applyFilterOnAppointmentsVM(appointmentStatusEnum: AppointmentStatusEnum.allAppointments); }, ).horPaddingMain(), - CustomerAppointmentSliderWidget(myUpComingAppointments: context.read().myUpComingAppointments), + CustomerAppointmentSliderWidget(), 7.height, ViewAllWidget( title: LocaleKeys.my_recent_providers.tr().toUpperCase(), subTitle: LocaleKeys.view_all.tr(), - onSubtitleTapped: () { + onSubtitleTapped: () { context.read().onNavbarTapped(0); context.read().applyFilterOnBranches(index: 0); }).horPaddingMain(), From 2f9c07c6d81c1db319454fac4c8f015804dcdd7b Mon Sep 17 00:00:00 2001 From: "Aamir.Muhammad" <> Date: Mon, 12 Aug 2024 10:18:03 +0300 Subject: [PATCH 2/2] changes --- lib/config/customer_dependencies.dart | 2 +- lib/main.dart | 2 +- lib/views/dashboard/fragments/ads_fragment.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/config/customer_dependencies.dart b/lib/config/customer_dependencies.dart index 252b4f9..31ca553 100644 --- a/lib/config/customer_dependencies.dart +++ b/lib/config/customer_dependencies.dart @@ -1,5 +1,5 @@ -import 'package:mc_common_app/config/dependencies.dart'; +import 'package:mc_common_app/config/dependency_injection.dart'; class CustomerDependencies { static void addDependencies() { diff --git a/lib/main.dart b/lib/main.dart index b77fab5..963f693 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -11,7 +11,7 @@ import 'package:mc_common_app/view_models/requests_view_model.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:mc_common_app/classes/app_state.dart'; -import 'package:mc_common_app/config/dependencies.dart'; +import 'package:mc_common_app/config/dependency_injection.dart'; import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/models/general_models/post_params_model.dart'; import 'package:mc_common_app/repositories/ads_repo.dart'; diff --git a/lib/views/dashboard/fragments/ads_fragment.dart b/lib/views/dashboard/fragments/ads_fragment.dart index b720614..91fbf2e 100644 --- a/lib/views/dashboard/fragments/ads_fragment.dart +++ b/lib/views/dashboard/fragments/ads_fragment.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:mc_common_app/classes/app_state.dart'; -import 'package:mc_common_app/config/dependencies.dart'; +import 'package:mc_common_app/config/dependency_injection.dart'; import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart';