From 57f693e0d951b747116c3a2c10e60372458affd6 Mon Sep 17 00:00:00 2001 From: faizatflutter Date: Thu, 1 Jan 2026 12:41:27 +0300 Subject: [PATCH] fixed the suggested design changes. (Not reminder ones) --- .../hmg_services/services_page.dart | 43 +++++++------------ 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/lib/presentation/hmg_services/services_page.dart b/lib/presentation/hmg_services/services_page.dart index 8525535..1380ad9 100644 --- a/lib/presentation/hmg_services/services_page.dart +++ b/lib/presentation/hmg_services/services_page.dart @@ -79,23 +79,22 @@ class ServicesPage extends StatelessWidget { route: AppRoutes.eReferralPage, ), HmgServicesComponentModel( - 3, - "Blood Donation".needTranslation, - "".needTranslation, - AppAssets.blood_donation_icon, - bgColor: AppColors.bloodDonationCardColor, - true, - route: null, - onTap: () async { - LoaderBottomSheet.showLoader(loadingText: "Fetching Data..."); - await bloodDonationViewModel.getRegionSelectedClinics(onSuccess: (val) async { - // await bloodDonationViewModel.getPatientBloodGroupDetails(onSuccess: (val) { - LoaderBottomSheet.hideLoader(); - Navigator.of(GetIt.instance().navigatorKey.currentContext!).push( - CustomPageRoute( - page: BloodDonationPage(), - ), - ); + 3, + "Blood Donation".needTranslation, + "".needTranslation, + AppAssets.blood_donation_icon, + bgColor: AppColors.bloodDonationCardColor, + true, + route: null, onTap: () async { + LoaderBottomSheet.showLoader(loadingText: "Fetching Data..."); + await bloodDonationViewModel.getRegionSelectedClinics(onSuccess: (val) async { + // await bloodDonationViewModel.getPatientBloodGroupDetails(onSuccess: (val) { + LoaderBottomSheet.hideLoader(); + Navigator.of(GetIt.instance().navigatorKey.currentContext!).push( + CustomPageRoute( + page: BloodDonationPage(), + ), + ); // }, onError: (err) { // LoaderBottomSheet.hideLoader(); // }); @@ -159,30 +158,20 @@ class ServicesPage extends StatelessWidget { route: null, // Set to null since we handle navigation in onTap onTap: () async { LoaderBottomSheet.showLoader(loadingText: "Fetching your water intake details.".needTranslation); - final waterMonitorVM = getIt.get(); final context = getIt.get().navigatorKey.currentContext!; - - // Fetch user details first to check if user has data await waterMonitorVM.fetchUserDetailsForMonitoring( onSuccess: (userDetail) { LoaderBottomSheet.hideLoader(); - - // Navigate based on whether user has data or not if (userDetail == null) { - // No data found, populate form with authenticated user data waterMonitorVM.populateFromAuthenticatedUser(); - // Navigate to settings screen context.navigateWithName(AppRoutes.waterMonitorSettingsScreen); } else { - // Data exists, navigate to consumption screen context.navigateWithName(AppRoutes.waterConsumptionScreen); } }, onError: (error) { LoaderBottomSheet.hideLoader(); - - // On error, navigate to consumption screen (it will handle the error state) context.navigateWithName(AppRoutes.waterConsumptionScreen); }, );