From cd81372fc6dad55572e226ec924e8e3906c8247b Mon Sep 17 00:00:00 2001 From: aamir-csol Date: Thu, 9 Oct 2025 11:21:07 +0300 Subject: [PATCH 01/22] family screen add fixes & remove & switch & widgets --- .../medical_file/medical_file_view_model.dart | 7 +-- .../medical_file/medical_file_page.dart | 4 +- lib/presentation/my_family/my_family.dart | 24 ++++++--- .../my_family/widget/family_cards.dart | 53 ++++++++++--------- lib/services/dialog_service.dart | 22 +++++--- 5 files changed, 63 insertions(+), 47 deletions(-) diff --git a/lib/features/medical_file/medical_file_view_model.dart b/lib/features/medical_file/medical_file_view_model.dart index db2d7fe..e4dc854 100644 --- a/lib/features/medical_file/medical_file_view_model.dart +++ b/lib/features/medical_file/medical_file_view_model.dart @@ -59,6 +59,7 @@ class MedicalFileViewModel extends ChangeNotifier { _selectedFamilyFileTabIndex = value; notifyListeners(); } + } static final DialogService _dialogService = getIt.get(); @@ -89,7 +90,6 @@ class MedicalFileViewModel extends ChangeNotifier { void onFamilyFileTabChange(int index) { setSelectedFamilyFileTabIndex = index; - notifyListeners(); } setIsPatientVaccineListLoading(bool isLoading) { @@ -439,9 +439,6 @@ class MedicalFileViewModel extends ChangeNotifier { ); } - - - Future addFamilyFile({required OTPTypeEnum otpTypeEnum}) async { LoaderBottomSheet.showLoader(); AuthenticationViewModel authVM = getIt.get(); @@ -597,7 +594,7 @@ class MedicalFileViewModel extends ChangeNotifier { getFamilyFiles(status: 0); getAllPendingRecordsByResponseId(); LoaderBottomSheet.hideLoader(); - onFamilyFileTabChange(0); + // onFamilyFileTabChange(0); } }, ); diff --git a/lib/presentation/medical_file/medical_file_page.dart b/lib/presentation/medical_file/medical_file_page.dart index 1eff927..19d4335 100644 --- a/lib/presentation/medical_file/medical_file_page.dart +++ b/lib/presentation/medical_file/medical_file_page.dart @@ -114,8 +114,8 @@ class _MedicalFilePageState extends State { ).onPress(() { DialogService dialogService = getIt.get(); dialogService.showFamilyBottomSheetWithoutH( - label: "Who do you want to book for?".needTranslation, - message: "This clinic or doctor is only available for the below eligible profiles.".needTranslation, + label: "Family Members".needTranslation, + message: "Choose a profile to swithc family file.".needTranslation, onSwitchPress: (FamilyFileResponseModelLists profile) { medicalFileViewModel.switchFamilyFiles(responseID: profile.responseId, patientID: profile.patientId, phoneNumber: profile.mobileNumber); }, diff --git a/lib/presentation/my_family/my_family.dart b/lib/presentation/my_family/my_family.dart index f9c4799..9b8014a 100644 --- a/lib/presentation/my_family/my_family.dart +++ b/lib/presentation/my_family/my_family.dart @@ -46,7 +46,11 @@ class _FamilyMedicalScreenState extends State { void initState() { super.initState(); medicalVM = context.read(); + WidgetsBinding.instance.addPostFrameCallback((_) { + medicalVM?.onFamilyFileTabChange(0); + }); } + @override Widget build(BuildContext context) { @@ -84,13 +88,17 @@ class _FamilyMedicalScreenState extends State { children: [ appState.isChildLoggedIn ? SizedBox() - : CustomTabBar( - activeBackgroundColor: AppColors.secondaryLightRedColor, - activeTextColor: AppColors.primaryRedColor, - tabs: [CustomTabBarModel(null, LocaleKeys.family.tr()), CustomTabBarModel(null, LocaleKeys.request.tr())], - onTabChange: (index) { - medicalVM!.onFamilyFileTabChange(index); - }, + : Selector( + selector: (_, model) => model.getSelectedFamilyFileTabIndex, + builder: (context, selectedIndex, child) => CustomTabBar( + activeBackgroundColor: AppColors.secondaryLightRedColor, + activeTextColor: AppColors.primaryRedColor, + // selectedIndex: selectedIndex, + tabs: [CustomTabBarModel(null, LocaleKeys.family.tr()), CustomTabBarModel(null, LocaleKeys.request.tr())], + onTabChange: (index) { + medicalVM!.onFamilyFileTabChange(index); + }, + ), ), appState.isChildLoggedIn ? SizedBox() : SizedBox(height: 25.h), Selector(selector: (_, model) => model.getSelectedFamilyFileTabIndex, builder: (context, selectedIndex, child) => getFamilyTabs(index: selectedIndex)), @@ -118,7 +126,7 @@ class _FamilyMedicalScreenState extends State { case 1: return FamilyCards( profiles: medicalVM!.pendingFamilyFiles, - isRequestDesign: true, + isRequestDesign: medicalVM!.getSelectedFamilyFileTabIndex == 1, onSelect: (FamilyFileResponseModelLists profile) { medicalVM!.acceptRejectFileFromFamilyMembers(id: profile.id, status: 3); }, diff --git a/lib/presentation/my_family/widget/family_cards.dart b/lib/presentation/my_family/widget/family_cards.dart index 9b1fb4b..50aec1c 100644 --- a/lib/presentation/my_family/widget/family_cards.dart +++ b/lib/presentation/my_family/widget/family_cards.dart @@ -14,6 +14,7 @@ import 'package:hmg_patient_app_new/services/dialog_service.dart'; import 'package:hmg_patient_app_new/services/navigation_service.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; +import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart'; import 'package:hmg_patient_app_new/widgets/chip/custom_chip_widget.dart'; class FamilyCards extends StatefulWidget { @@ -88,9 +89,9 @@ class _FamilyCardsState extends State { crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, children: [ - CustomChipWidget( - height: 30.h, - chipType: ChipTypeEnum.alert, + AppCustomChipWidget( + // height: 30.h, + // chipType: ChipTypeEnum.alert, backgroundColor: profile.status == FamilyFileEnum.pending.toInt ? AppColors.alertLightColor.withValues(alpha: 0.20) : profile.status == FamilyFileEnum.rejected.toInt @@ -98,10 +99,10 @@ class _FamilyCardsState extends State { : profile.status == FamilyFileEnum.active.toInt ? AppColors.lightGreenColor : AppColors.lightGrayBGColor, - chipText: profile.statusDescription ?? "N/A", - iconAsset: null, - isShowBorder: false, - borderRadius: 8.h, + labelText: profile.statusDescription ?? "N/A", + // iconAsset: null, + // isShowBorder: false, + // borderRadius: 8.h, textColor: profile.status == FamilyFileEnum.pending.toInt ? AppColors.alertLightColor : profile.status == FamilyFileEnum.rejected.toInt @@ -116,14 +117,14 @@ class _FamilyCardsState extends State { .toText12(isBold: false, isCenter: false, maxLine: 1, fontWeight: FontWeight.w500, color: AppColors.greyTextColor), ]), SizedBox(height: 8.h), - CustomChipWidget( - height: 30.h, - chipType: ChipTypeEnum.alert, + AppCustomChipWidget( + // height: 30.h, + // chipType: ChipTypeEnum.alert, backgroundColor: AppColors.lightGrayBGColor, - chipText: "Medical File: ${profile.responseId ?? "N/A"}", - iconAsset: null, - isShowBorder: false, - borderRadius: 8.h, + labelText: "Medical File: ${profile.responseId ?? "N/A"}", + // iconAsset: null, + // isShowBorder: false, + // borderRadius: 8.h, textColor: AppColors.textColor), ], ), @@ -172,22 +173,22 @@ class _FamilyCardsState extends State { SizedBox(height: 8.h), (profile.patientName ?? "Unknown").toText14(isBold: false, isCenter: true, maxlines: 1, weight: FontWeight.w600), SizedBox(height: 8.h), - CustomChipWidget( - chipType: ChipTypeEnum.alert, + AppCustomChipWidget( + // chipType: ChipTypeEnum.alert, backgroundColor: AppColors.lightGrayBGColor, - chipText: "Relation:${profile.relationship ?? "N/A"}", - iconAsset: AppAssets.heart, - isShowBorder: false, - borderRadius: 8.h, + labelText: "Relation:${profile.relationship ?? "N/A"}", + icon: AppAssets.heart, + // isShowBorder: false, + // borderRadius: 8.h, textColor: AppColors.textColor), widget.isShowDetails ? SizedBox(height: 4.h) : SizedBox(), widget.isShowDetails - ? CustomChipWidget( - chipType: ChipTypeEnum.alert, + ? AppCustomChipWidget( + // chipType: ChipTypeEnum.alert, backgroundColor: AppColors.lightGrayBGColor, - chipText: "Age:${profile.age ?? "N/A"} Years", - isShowBorder: false, - borderRadius: 8.h, + labelText: "Age:${profile.age ?? "N/A"} Years", + // isShowBorder: false, + // borderRadius: 8.h, textColor: AppColors.textColor, ) : SizedBox(), @@ -208,6 +209,7 @@ class _FamilyCardsState extends State { textColor: isActive || !canSwitch ? AppColors.greyTextColor : AppColors.primaryRedColor, fontSize: 13.h, icon: isActive ? AppAssets.activeCheck : AppAssets.switch_user, + iconSize: 18.h, iconColor: isActive || !canSwitch ? (isActive ? null : AppColors.greyTextColor) : AppColors.primaryRedColor, padding: EdgeInsets.symmetric(vertical: 0, horizontal: 0), ).paddingOnly(top: 0, bottom: 0), @@ -318,6 +320,7 @@ class _FamilyCardsState extends State { backgroundColor: AppColors.lightGreenButtonColor, borderColor: AppColors.lightGreenButtonColor, textColor: AppColors.textGreenColor, + borderWidth: 0, icon: null, ), ), diff --git a/lib/services/dialog_service.dart b/lib/services/dialog_service.dart index 915f795..6c232f5 100644 --- a/lib/services/dialog_service.dart +++ b/lib/services/dialog_service.dart @@ -112,13 +112,21 @@ class DialogServiceImp implements DialogService { if (context == null) return; showCommonBottomSheetWithoutHeight(context, title: label ?? "", - child: FamilyCards( - profiles: profiles, - onSelect: (FamilyFileResponseModelLists profile) { - onSwitchPress(profile); - }, - onRemove: (FamilyFileResponseModelLists profile) {}, - isShowDetails: false, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + (message).toText16(isBold: false, color: AppColors.textColor), + SizedBox(height: 24.h), + FamilyCards( + profiles: profiles, + onSelect: (FamilyFileResponseModelLists profile) { + onSwitchPress(profile); + }, + onRemove: (FamilyFileResponseModelLists profile) {}, + isShowDetails: false, + ), + ], ), callBackFunc: () {}); } From 987fe73128664902b3bc503c5a87743de8ac42cc Mon Sep 17 00:00:00 2001 From: aamir-csol Date: Sun, 19 Oct 2025 10:20:47 +0300 Subject: [PATCH 02/22] family screen add fixes & remove & switch & widgets --- lib/core/utils/size_utils.dart | 1 + lib/core/utils/utils.dart | 2 +- lib/presentation/authentication/login.dart | 17 ++++------- .../authentication/quick_login.dart | 30 +++++++++---------- lib/presentation/authentication/register.dart | 7 ++--- .../authentication/register_step2.dart | 20 ++++++------- .../medical_file/medical_file_page.dart | 16 ++++------ .../my_family/widget/family_cards.dart | 8 ++--- 8 files changed, 43 insertions(+), 58 deletions(-) diff --git a/lib/core/utils/size_utils.dart b/lib/core/utils/size_utils.dart index 0be751e..f2ba0e8 100644 --- a/lib/core/utils/size_utils.dart +++ b/lib/core/utils/size_utils.dart @@ -129,6 +129,7 @@ class SizeUtils { } log("longerSide: $longerSide"); + log("shorterSide: $shorterSide"); log("isTablet: $isTablet"); } } diff --git a/lib/core/utils/utils.dart b/lib/core/utils/utils.dart index a88d9c2..54d3131 100644 --- a/lib/core/utils/utils.dart +++ b/lib/core/utils/utils.dart @@ -315,7 +315,7 @@ class Utils { crossAxisAlignment: CrossAxisAlignment.center, children: [ SizedBox(height: isSmallWidget ? 0.h : 48.h), - Lottie.asset(AppAnimations.noData, repeat: false, reverse: false, frameRate: FrameRate(60), width: width.h, height: height.h, fit: BoxFit.fill), + Lottie.asset(AppAnimations.noData, repeat: false, reverse: false, frameRate: FrameRate(60), width: width, height: height, fit: BoxFit.cover), SizedBox(height: 16.h), (noDataText ?? LocaleKeys.noDataAvailable.tr()) .toText16(weight: FontWeight.w500, color: AppColors.greyTextColor, isCenter: true) diff --git a/lib/presentation/authentication/login.dart b/lib/presentation/authentication/login.dart index 7e5f4a1..a97cbb9 100644 --- a/lib/presentation/authentication/login.dart +++ b/lib/presentation/authentication/login.dart @@ -87,10 +87,10 @@ class LoginScreenState extends State { isAllowLeadingIcon: true, padding: EdgeInsets.symmetric(vertical: 8.h, horizontal: 10.h), leadingIcon: AppAssets.student_card, - errorMessage: "Please enter a valid national ID or file number", + errorMessage: "Please enter a valid national ID or file number".needTranslation, hasError: false, ), - SizedBox(height: 16.h), // Adjusted to sizer unit (approx 16px) + SizedBox(height: 16.h), CustomButton( height: 50.h, text: LocaleKeys.login.tr(), @@ -109,17 +109,12 @@ class LoginScreenState extends State { } }, ), - SizedBox(height: 10.h), // Adjusted to sizer unit (approx 14px) + SizedBox(height: 10.h), Center( child: RichText( textAlign: TextAlign.center, text: TextSpan( - style: context.dynamicTextStyle( - color: Colors.black, - fontSize: 14.f, // Adjusted to sizer unit - height: 26 / 16, // This height is a ratio, may need re-evaluation - fontWeight: FontWeight.w500, - ), + style: context.dynamicTextStyle(color: Colors.black, fontSize: 14.f, height: 26 / 16, fontWeight: FontWeight.w500), children: [ TextSpan(text: LocaleKeys.dontHaveAccount.tr(), style: context.dynamicTextStyle()), TextSpan(text: " "), @@ -139,9 +134,9 @@ class LoginScreenState extends State { ), ], ), - ).withVerticalPadding(2), // Adjusted to sizer unit + ).withVerticalPadding(2.h), ), - SizedBox(height: 20.h), // Adjusted to sizer unit (approx 14px) + SizedBox(height: 20.h), ], ), ), diff --git a/lib/presentation/authentication/quick_login.dart b/lib/presentation/authentication/quick_login.dart index f10d84f..9a12e13 100644 --- a/lib/presentation/authentication/quick_login.dart +++ b/lib/presentation/authentication/quick_login.dart @@ -25,14 +25,14 @@ class QuickLoginState extends State { Widget build(BuildContext context) { NavigationService navigationService = getIt.get(); return Container( - decoration: const BoxDecoration( + decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.only( - topLeft: Radius.circular(24), - topRight: Radius.circular(24), + topLeft: Radius.circular(24.r), + topRight: Radius.circular(24.r), ), ), - padding: const EdgeInsets.all(24), + padding: EdgeInsets.all(24.w), child: Column( mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.center, @@ -50,7 +50,7 @@ class QuickLoginState extends State { child: Utils.buildSvgWithAssets(icon: AppAssets.cross_circle)), ], ), - Utils.showLottie(context: context, assetPath: AppAnimations.checkmark, width: 120, height: 120, repeat: true), + Utils.showLottie(context: context, assetPath: AppAnimations.checkmark, width: 120.w, height: 120.h, repeat: true), LocaleKeys.allSet.tr().toText16(textAlign: TextAlign.center, weight: FontWeight.w500) // Text( // ' TranslationBase.of(context).allSet', @@ -67,7 +67,7 @@ class QuickLoginState extends State { mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Image.asset(AppAssets.lockIcon, height: 100), + Image.asset(AppAssets.lockIcon, height: 100.h), SizedBox(height: 10.h), LocaleKeys.enableQuickLogin.tr().toText26(isBold: true), // Text( @@ -89,7 +89,7 @@ class QuickLoginState extends State { // height: 1.5, // ), //), - const SizedBox(height: 24), + SizedBox(height: 24.h), // Buttons Row( mainAxisAlignment: MainAxisAlignment.end, @@ -115,15 +115,13 @@ class QuickLoginState extends State { children: [ Expanded( child: CustomButton( - text: LocaleKeys.notNow.tr(), - onPressed: () { - Navigator.pop(context, "true"); - }, - backgroundColor: Color(0xffFEE9EA), - borderColor: Color(0xffFEE9EA), - textColor: Colors.red, - // icon: "assets/images/svg/apple-finder.svg", - )), + text: LocaleKeys.notNow.tr(), + onPressed: () { + Navigator.pop(context, "true"); + }, + backgroundColor: Color(0xffFEE9EA), + borderColor: Color(0xffFEE9EA), + textColor: Colors.red)), ], ), ], diff --git a/lib/presentation/authentication/register.dart b/lib/presentation/authentication/register.dart index 9551ba1..f04f7dd 100644 --- a/lib/presentation/authentication/register.dart +++ b/lib/presentation/authentication/register.dart @@ -78,8 +78,7 @@ class _RegisterNew extends State { mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Utils.showLottie( - context: context, assetPath: 'assets/animations/lottie/register.json', width: 200.h, height: 200.h, fit: BoxFit.cover, repeat: true), + Utils.showLottie(context: context, assetPath: 'assets/animations/lottie/register.json', width: 200.w, height: 200.h, fit: BoxFit.cover, repeat: true), SizedBox(height: 16.h), LocaleKeys.prepareToElevate.tr().toText32(isBold: true), SizedBox(height: 24.h), @@ -113,7 +112,7 @@ class _RegisterNew extends State { Divider(height: 1), TextInputWidget( labelText: LocaleKeys.dob.tr(), - hintText: "11 July, 1994", + hintText: "11 July, 1994".needTranslation, controller: authVm.dobController, focusNode: _dobFocusNode, isEnable: true, @@ -240,7 +239,7 @@ class _RegisterNew extends State { ), ), ), - SizedBox(height: 30), + SizedBox(height: 30.h), ], ), ), diff --git a/lib/presentation/authentication/register_step2.dart b/lib/presentation/authentication/register_step2.dart index 3466497..71cef96 100644 --- a/lib/presentation/authentication/register_step2.dart +++ b/lib/presentation/authentication/register_step2.dart @@ -69,7 +69,7 @@ class _RegisterNew extends State { height: double.infinity, child: SingleChildScrollView( reverse: false, - padding: EdgeInsets.only(left: 24.h, right: 24.h, top: 0.h), + padding: EdgeInsets.only(left: 24.w, right: 24.w, top: 0.h), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -98,7 +98,7 @@ class _RegisterNew extends State { leadingIcon: AppAssets.user_circle, labelColor: AppColors.textColor, ).paddingSymmetrical(0.h, 16.h), - Divider(height: 1, color: AppColors.greyColor), + Divider(height: 1.h, color: AppColors.greyColor), TextInputWidget( labelText: LocaleKeys.nationalIdNumber.tr(), hintText: authVM!.isUserFromUAE() ? appState.getUserRegistrationPayload.patientIdentificationId.toString() : (appState.getNHICUserData.idNumber ?? ""), @@ -130,7 +130,7 @@ class _RegisterNew extends State { hasSelectionCustomIcon: true, isAllowRadius: false, labelColor: AppColors.textColor, - padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0), + padding: EdgeInsets.only(top: 8.h, bottom: 8.h, left: 0, right: 0), selectionCustomIcon: AppAssets.arrow_down, leadingIcon: AppAssets.user_full, ).withVerticalPadding(8); @@ -167,7 +167,7 @@ class _RegisterNew extends State { hasSelectionCustomIcon: true, isAllowRadius: false, labelColor: AppColors.textColor, - padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0), + padding: EdgeInsets.only(top: 8.h, bottom: 8.h, left: 0, right: 0), selectionCustomIcon: AppAssets.arrow_down, leadingIcon: AppAssets.smart_phone, ).withVerticalPadding(8); @@ -188,7 +188,7 @@ class _RegisterNew extends State { leadingIcon: AppAssets.smart_phone, onChange: (value) {}) .paddingSymmetrical(0.h, 16.h), - Divider(height: 1, color: AppColors.greyColor), + Divider(height: 1.h, color: AppColors.greyColor), authVM!.isUserFromUAE() ? Selector? countriesList, NationalityCountries? selectedCountry, bool isArabic})>( selector: (context, authViewModel) { @@ -217,10 +217,10 @@ class _RegisterNew extends State { hasSelectionCustomIcon: true, labelColor: AppColors.textColor, isAllowRadius: false, - padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0), + padding: EdgeInsets.only(top: 8.h, bottom: 8.h, left: 0, right: 0), selectionCustomIcon: AppAssets.arrow_down, leadingIcon: AppAssets.globe, - ).withVerticalPadding(8); + ).withVerticalPadding(8.h); }, ) : TextInputWidget( @@ -256,7 +256,7 @@ class _RegisterNew extends State { leadingIcon: AppAssets.call) .paddingSymmetrical(0.h, 16.h), Divider( - height: 1, + height: 1.h, color: AppColors.greyColor, ), TextInputWidget( @@ -292,9 +292,7 @@ class _RegisterNew extends State { iconColor: AppColors.primaryRedColor, ), ), - SizedBox( - width: 16, - ), + SizedBox(width: 16.w), Expanded( child: CustomButton( backgroundColor: AppColors.primaryRedColor, diff --git a/lib/presentation/medical_file/medical_file_page.dart b/lib/presentation/medical_file/medical_file_page.dart index cea3cf1..a435f83 100644 --- a/lib/presentation/medical_file/medical_file_page.dart +++ b/lib/presentation/medical_file/medical_file_page.dart @@ -235,8 +235,7 @@ class _MedicalFilePageState extends State { iconColor: insuranceVM.isInsuranceExpired ? AppColors.primaryRedColor : AppColors.successColor, textColor: insuranceVM.isInsuranceExpired ? AppColors.primaryRedColor : AppColors.successColor, iconSize: 12.w, - backgroundColor: - insuranceVM.isInsuranceExpired ? AppColors.primaryRedColor.withOpacity(0.1) : AppColors.successColor.withOpacity(0.1), + backgroundColor: insuranceVM.isInsuranceExpired ? AppColors.primaryRedColor.withOpacity(0.1) : AppColors.successColor.withOpacity(0.1), labelPadding: EdgeInsetsDirectional.only(start: 4.w, end: 8.w), ); }), @@ -517,11 +516,7 @@ class _MedicalFilePageState extends State { Transform.flip( flipX: appState.isArabic(), child: Utils.buildSvgWithAssets( - icon: AppAssets.forward_arrow_icon_small, - width: 15.w, - height: 15.h, - fit: BoxFit.contain, - iconColor: AppColors.textColor)), + icon: AppAssets.forward_arrow_icon_small, width: 15.w, height: 15.h, fit: BoxFit.contain, iconColor: AppColors.textColor)), ], ).onPress(() { prescriptionVM.setPrescriptionsDetailsLoading(); @@ -597,8 +592,8 @@ class _MedicalFilePageState extends State { context, noDataText: "You don't have any prescriptions yet.".needTranslation, isSmallWidget: true, - width: 62.w, - height: 62.h, + width: 30.w, + height: 30.h, ), ).paddingSymmetrical(24.w, 0.h); }), @@ -811,8 +806,7 @@ class _MedicalFilePageState extends State { insuranceViewModel.setIsInsuranceUpdateDetailsLoading(true); insuranceViewModel.getPatientInsuranceDetailsForUpdate( appState.getAuthenticatedUser()!.patientId.toString(), appState.getAuthenticatedUser()!.patientIdentificationNo.toString()); - showCommonBottomSheetWithoutHeight(context, - child: PatientInsuranceCardUpdateCard(), callBackFunc: () {}, title: "", isCloseButtonVisible: false, isFullScreen: false); + showCommonBottomSheetWithoutHeight(context, child: PatientInsuranceCardUpdateCard(), callBackFunc: () {}, title: "", isCloseButtonVisible: false, isFullScreen: false); }, backgroundColor: AppColors.bgGreenColor.withOpacity(0.20), borderColor: AppColors.bgGreenColor.withOpacity(0.0), diff --git a/lib/presentation/my_family/widget/family_cards.dart b/lib/presentation/my_family/widget/family_cards.dart index 50aec1c..dfa7d0d 100644 --- a/lib/presentation/my_family/widget/family_cards.dart +++ b/lib/presentation/my_family/widget/family_cards.dart @@ -141,10 +141,10 @@ class _FamilyCardsState extends State { physics: NeverScrollableScrollPhysics(), itemCount: widget.profiles.length, gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 2, + crossAxisCount: isTablet ? 3 : 2, crossAxisSpacing: 10.h, mainAxisSpacing: 10.h, - childAspectRatio: widget.isShowDetails ? 0.56.h : 0.65.h, + childAspectRatio: widget.isShowDetails ? 0.56 : 0.65, ), padding: EdgeInsets.only(bottom: 20.h), itemBuilder: (context, index) { @@ -153,8 +153,8 @@ class _FamilyCardsState extends State { final isParentUser = appState.getAuthenticatedUser()?.isParentUser ?? false; final canSwitch = isParentUser || (!isParentUser && profile.responseId == appState.getSuperUserID); return Container( - padding: EdgeInsets.symmetric(vertical: 15.h, horizontal: 15.h), - decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24), + padding: EdgeInsets.symmetric(vertical: 15.h, horizontal: 15.w), + decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.r), child: Opacity( opacity: isActive || profile.status == FamilyFileEnum.pending.toInt || !canSwitch ? 0.4 : 1.0, // Fade all content if active child: Stack( From e113c4c1ee61846de83bf0395131336c5581e03b Mon Sep 17 00:00:00 2001 From: aamir-csol Date: Thu, 30 Oct 2025 14:23:46 +0300 Subject: [PATCH 03/22] updates & fixes & RRT Flow --- ios/Runner/AppDelegate.swift | 3 + lib/core/api_consts.dart | 2 +- lib/core/dependencies.dart | 6 +- .../authentication/authentication_repo.dart | 6 +- .../authentication_view_model.dart | 13 +- .../emergency_services_view_model.dart | 26 +- .../medical_file/medical_file_view_model.dart | 8 +- .../RRT/rrt_request_type_select.dart | 171 ++++++++++-- .../call_ambulance/call_ambulance_page.dart | 243 ++++++---------- .../requesting_services_page.dart | 17 +- .../call_ambulance/tracking_screen.dart | 261 ++++++++---------- .../emergency_services_page.dart | 154 ++++------- lib/presentation/my_family/my_family.dart | 2 +- lib/widgets/appbar/collapsing_list_view.dart | 1 + lib/widgets/common_bottom_sheet.dart | 81 +++--- .../ExpandableBottomSheet.dart | 2 +- lib/widgets/radio/custom_radio_button.dart | 26 +- 17 files changed, 507 insertions(+), 515 deletions(-) diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 69204f3..3d76a5f 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -2,6 +2,8 @@ import Flutter import UIKit import FirebaseCore import FirebaseMessaging +import GoogleMaps + @main @objc class AppDelegate: FlutterAppDelegate { @@ -10,6 +12,7 @@ import FirebaseMessaging didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { FirebaseApp.configure() + GMSServices.provideAPIKey("AIzaSyDiXnCO00li4V7Ioa2YZ_M4ECxRsu_P9tA") GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index ed2bba1..304b633 100644 --- a/lib/core/api_consts.dart +++ b/lib/core/api_consts.dart @@ -729,7 +729,7 @@ var GET_PRESCRIPTION_INSTRUCTIONS_PDF = 'Services/ChatBot_Service.svc/REST/Chatb class ApiConsts { static const maxSmallScreen = 660; - static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod; + static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat; // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT diff --git a/lib/core/dependencies.dart b/lib/core/dependencies.dart index a82a9ad..7c8083d 100644 --- a/lib/core/dependencies.dart +++ b/lib/core/dependencies.dart @@ -158,7 +158,8 @@ class AppDependencies { ); getIt.registerLazySingleton( - () => BookAppointmentsViewModel(bookAppointmentsRepo: getIt(), errorHandlerService: getIt(), navigationService: getIt(), myAppointmentsViewModel: getIt(), locationUtils: getIt(), dialogService: getIt()), + () => BookAppointmentsViewModel( + bookAppointmentsRepo: getIt(), errorHandlerService: getIt(), navigationService: getIt(), myAppointmentsViewModel: getIt(), locationUtils: getIt(), dialogService: getIt()), ); getIt.registerLazySingleton( @@ -185,8 +186,7 @@ class AppDependencies { ); getIt.registerLazySingleton( - () => - AppointmentViaRegionViewmodel( + () => AppointmentViaRegionViewmodel( navigationService: getIt(), appState: getIt(), ), diff --git a/lib/features/authentication/authentication_repo.dart b/lib/features/authentication/authentication_repo.dart index d566996..6266afb 100644 --- a/lib/features/authentication/authentication_repo.dart +++ b/lib/features/authentication/authentication_repo.dart @@ -101,10 +101,7 @@ class AuthenticationRepoImp implements AuthenticationRepo { } @override - Future>> checkPatientAuthentication({ - required dynamic checkPatientAuthenticationReq, - String? languageID, - }) async { + Future>> checkPatientAuthentication({required dynamic checkPatientAuthenticationReq, String? languageID}) async { int isOutKsa = (checkPatientAuthenticationReq.zipCode == '966' || checkPatientAuthenticationReq.zipCode == '+966') ? 0 : 1; checkPatientAuthenticationReq.patientOutSA = isOutKsa; try { @@ -149,7 +146,6 @@ class AuthenticationRepoImp implements AuthenticationRepo { sendActivationCodeReq.isDentalAllowedBackend = false; final payload = sendActivationCodeReq.toJson(); if (isFormFamilyFile) { - payload.remove("MobileNo"); payload.remove("NationalID"); payload.remove("SMSSignature"); diff --git a/lib/features/authentication/authentication_view_model.dart b/lib/features/authentication/authentication_view_model.dart index 8be2b8e..6af1132 100644 --- a/lib/features/authentication/authentication_view_model.dart +++ b/lib/features/authentication/authentication_view_model.dart @@ -851,16 +851,13 @@ class AuthenticationViewModel extends ChangeNotifier { request['isRegister'] = true; _appState.setAppAuthToken = response['LogInTokenID']; if (isPatientOutsideSA(request: response)) { - print("=======OUT SA======="); sendActivationCode( - otpTypeEnum: OTPTypeEnumExtension.fromInt(request["OTP_SendType"]), - nationalIdOrFileNumber: request["PatientIdentificationID"].toString(), - phoneNumber: request["PatientMobileNumber"].toString(), - payload: request, - isForRegister: true, - ); + otpTypeEnum: OTPTypeEnumExtension.fromInt(request["OTP_SendType"]), + nationalIdOrFileNumber: request["PatientIdentificationID"].toString(), + phoneNumber: request["PatientMobileNumber"].toString(), + payload: request, + isForRegister: true); } else { - print("=======IN SA======="); chekUserNHICData(request: request); } } diff --git a/lib/features/emergency_services/emergency_services_view_model.dart b/lib/features/emergency_services/emergency_services_view_model.dart index 77e5823..5d02ca3 100644 --- a/lib/features/emergency_services/emergency_services_view_model.dart +++ b/lib/features/emergency_services/emergency_services_view_model.dart @@ -25,6 +25,7 @@ class EmergencyServicesViewModel extends ChangeNotifier { final LocationUtils? locationUtils; final AppState appState; bool isERListLoading = false; + bool isTermsAccepted = false; List nearestERList = []; List nearestERFilteredList = []; @@ -47,11 +48,14 @@ class EmergencyServicesViewModel extends ChangeNotifier { required this.appState, }); - get isGMSAvailable - { + get isGMSAvailable { return appState.isGMSAvailable; } + void onTermAccepted() { + isTermsAccepted = !isTermsAccepted; + notifyListeners(); + } Future getRRTProcedures({Function(dynamic)? onSuccess, Function(String)? onError}) async { RRTProceduresList.clear(); @@ -89,6 +93,10 @@ class EmergencyServicesViewModel extends ChangeNotifier { }); } + void moveToNextStep() { + navServices.push(CustomPageRoute(page: CallAmbulancePage(isFromRRT: true))); + } + void filterErList(String query) { print("the query is $query"); if (query.isEmpty) { @@ -149,8 +157,7 @@ class EmergencyServicesViewModel extends ChangeNotifier { } GMSMapServices.CameraPosition getGMSLocation() { - return GMSMapServices.CameraPosition( - target: GMSMapServices.LatLng(appState.userLat, appState.userLong), zoom: 18); + return GMSMapServices.CameraPosition(target: GMSMapServices.LatLng(appState.userLat, appState.userLong), zoom: 18); } handleGMSMapCameraMoved(GMSMapServices.CameraPosition value) { @@ -158,9 +165,7 @@ class EmergencyServicesViewModel extends ChangeNotifier { } HMSCameraServices.CameraPosition getHMSLocation() { - return HMSCameraServices.CameraPosition( - target: HMSCameraServices.LatLng(appState.userLat, appState.userLong),zoom: 18); - + return HMSCameraServices.CameraPosition(target: HMSCameraServices.LatLng(appState.userLat, appState.userLong), zoom: 18); } handleHMSMapCameraMoved(HMSCameraServices.CameraPosition value) { @@ -173,11 +178,8 @@ class EmergencyServicesViewModel extends ChangeNotifier { onSuccess: (position) { updateBottomSheetState(BottomSheetType.FIXED); navServices.push( - CustomPageRoute( - page: CallAmbulancePage(), direction: AxisDirection.down - ), + CustomPageRoute(page: CallAmbulancePage(), direction: AxisDirection.down), ); - }); } @@ -187,8 +189,6 @@ class EmergencyServicesViewModel extends ChangeNotifier { } void setIsGMSAvailable(bool value) { - notifyListeners(); - } } diff --git a/lib/features/medical_file/medical_file_view_model.dart b/lib/features/medical_file/medical_file_view_model.dart index f0263f9..3e67a0e 100644 --- a/lib/features/medical_file/medical_file_view_model.dart +++ b/lib/features/medical_file/medical_file_view_model.dart @@ -59,7 +59,6 @@ class MedicalFileViewModel extends ChangeNotifier { _selectedFamilyFileTabIndex = value; notifyListeners(); } - } static final DialogService _dialogService = getIt.get(); @@ -486,6 +485,13 @@ class MedicalFileViewModel extends ChangeNotifier { }); } + Future clearAuthValues() async { + authVM.nationalIdController.clear(); + authVM.phoneNumberController.clear(); + authVM.emailController.clear(); + authVM.dobController.clear(); + } + Future handleFamilyFileRequestOTPVerification() async { LoaderBottomSheet.showLoader(); if (!_appState.getIsChildLoggedIn) { diff --git a/lib/presentation/emergency_services/RRT/rrt_request_type_select.dart b/lib/presentation/emergency_services/RRT/rrt_request_type_select.dart index 0e23d49..fd93f8e 100644 --- a/lib/presentation/emergency_services/RRT/rrt_request_type_select.dart +++ b/lib/presentation/emergency_services/RRT/rrt_request_type_select.dart @@ -1,9 +1,18 @@ +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_export.dart'; +import 'package:hmg_patient_app_new/core/dependencies.dart'; +import 'package:hmg_patient_app_new/core/utils/utils.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/features/emergency_services/emergency_services_view_model.dart'; +import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; +import 'package:hmg_patient_app_new/presentation/emergency_services/call_ambulance/call_ambulance_page.dart'; +import 'package:hmg_patient_app_new/services/navigation_service.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; +import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; import 'package:hmg_patient_app_new/widgets/radio/custom_radio_button.dart'; import 'package:provider/provider.dart'; @@ -13,32 +22,160 @@ class RrtRequestTypeSelect extends StatelessWidget { @override Widget build(BuildContext context) { // return Consumer(builder: (context, emergencyServicesVM, child) { + // NavigationService navService = getIt(); + // EmergencyServicesViewModel erServiceVm = Provider.of(context); return Column( children: [ + Padding( + padding: EdgeInsets.only(left: 24, right: 24, bottom: 24), + child: Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 20.r), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + CustomRadioOption(value: "", groupValue: "", onChanged: (value) {}, text: "Home Visit Emergency".needTranslation).paddingSymmetrical(16, 24), + Divider(height: 1, color: Color(0xFFD2D2D2).withValues(alpha: 0.3)).paddingSymmetrical(16, 0), + CustomRadioOption(value: "", groupValue: "", onChanged: (value) {}, text: "COVID-19 (24 Hour) Home Visit".needTranslation).paddingSymmetrical(16, 24), + Divider(height: 1, color: Color(0xFFD2D2D2).withValues(alpha: 0.3)).paddingSymmetrical(16, 0), + CustomRadioOption(value: "", groupValue: "", onChanged: (value) {}, text: "COVID-19 (6 Hour) Home Visit".needTranslation).paddingSymmetrical(16, 24), + ], + ), + ), + ), + Padding( + padding: EdgeInsets.only(left: 24, right: 24, bottom: 24), + child: GestureDetector( + onTap: context.read().onTermAccepted, + child: Row( + children: [ + Selector( + selector: (_, vm) => vm.isTermsAccepted, + shouldRebuild: (previous, next) => previous != next, + builder: (context, isTermsAccepted, child) { + return AnimatedContainer( + duration: const Duration(milliseconds: 200), + height: 24.h, + width: 24.h, + decoration: BoxDecoration( + color: isTermsAccepted ? AppColors.primaryRedColor : Colors.transparent, + borderRadius: BorderRadius.circular(6), + border: Border.all(color: isTermsAccepted ? AppColors.primaryRedBorderColor : AppColors.greyColor, width: 2.h), + ), + child: isTermsAccepted ? Icon(Icons.check, size: 16.f, color: Colors.white) : null, + ); + }, + ), + SizedBox(width: 12.h), + Row( + children: [ + Text( + LocaleKeys.iAcceptThe.tr(), + style: context.dynamicTextStyle(fontSize: 14.f, fontWeight: FontWeight.w500, color: Color(0xFF2E3039)), + ), + GestureDetector( + onTap: () { + // Navigate to terms and conditions page + Navigator.of(context).pushNamed('/terms'); + }, + child: Text( + LocaleKeys.termsConditoins.tr(), + style: context.dynamicTextStyle( + fontSize: 14.f, fontWeight: FontWeight.w500, color: AppColors.primaryRedColor, decoration: TextDecoration.underline, decorationColor: AppColors.primaryRedBorderColor), + ), + ), + ], + ), + ], + ), + ), + ), Container( - padding: EdgeInsets.all(16.h), - height: 200.h, decoration: RoundedRectangleBorder().toSmoothCornerDecoration( color: AppColors.whiteColor, borderRadius: 24.h, + hasShadow: true, ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - CustomRadioOption( - value: "", - groupValue: "", - onChanged: (value) {}, - text: "Home Visit Emergency", - ) - ], - ), - ], + child: SizedBox( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // if (widget.patientAppointmentHistoryResponseModel.nextAction == 15 || widget.patientAppointmentHistoryResponseModel.nextAction == 20) + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + "Total amount to pay".needTranslation.toText18(isBold: true), + Utils.getPaymentAmountWithSymbol("1000".toString().toText16(isBold: true), AppColors.blackColor, 13, isSaudiCurrency: true), + ], + ), + SizedBox(height: 4.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded(child: "Amount will be paid at the hospital".toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor)), + "VAT 15%(${150})".needTranslation.toText14(isBold: true, color: AppColors.greyTextColor, letterSpacing: -2), + ], + ), + SizedBox(height: 18.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + SizedBox( + width: 150.h, + child: Utils.getPaymentMethods(), + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Utils.getPaymentAmountWithSymbol("1,150".toString().toText24(isBold: true), AppColors.blackColor, 17, isSaudiCurrency: true), + ], + ), + ], + ) + ], + ).paddingOnly(left: 16.h, top: 24.h, right: 16.h, bottom: 0.h), + // AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel) + CustomButton( + text: LocaleKeys.next.tr(), + onPressed: () { + // navService.pop(); + context.read().moveToNextStep(); + }, + backgroundColor: AppColors.primaryRedColor, + borderColor: AppColors.primaryRedColor, + textColor: AppColors.whiteColor, + fontSize: 16, + fontWeight: FontWeight.w500, + borderRadius: 12, + padding: EdgeInsets.fromLTRB(10, 0, 10, 0), + height: 50.h, + iconColor: AppColors.whiteColor, + iconSize: 18.h, + ).paddingSymmetrical(16.h, 24.h) + // : CustomButton( + // text: AppointmentType.getNextActionText(widget.patientAppointmentHistoryResponseModel.nextAction), + // onPressed: () { + // myAppointmentsViewModel.setIsAppointmentDataToBeLoaded(true); + // handleAppointmentNextAction(widget.patientAppointmentHistoryResponseModel.nextAction); + // }, + // backgroundColor: AppointmentType.getNextActionButtonColor(widget.patientAppointmentHistoryResponseModel.nextAction), + // borderColor: AppointmentType.getNextActionButtonColor(widget.patientAppointmentHistoryResponseModel.nextAction).withOpacity(0.01), + // textColor: widget.patientAppointmentHistoryResponseModel.nextAction == 15 ? AppColors.textColor : AppColors.whiteColor, + // fontSize: 16, + // fontWeight: FontWeight.w500, + // borderRadius: 12, + // padding: EdgeInsets.fromLTRB(10, 0, 10, 0), + // height: 50.h, + // icon: AppointmentType.getNextActionIcon(widget.patientAppointmentHistoryResponseModel.nextAction), + // iconColor: AppColors.whiteColor, + // iconSize: 18.h, + // ).paddingSymmetrical(16.h, 24.h), + ], + ), ), ), - SizedBox(height: 32.h), ], ); // }); diff --git a/lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart b/lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart index eb36f92..63cb4e6 100644 --- a/lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart +++ b/lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart @@ -2,6 +2,7 @@ import 'dart:io'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; +import 'package:google_places_flutter/model/prediction.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_export.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; @@ -26,40 +27,38 @@ import 'package:provider/provider.dart'; import '../../../widgets/common_bottom_sheet.dart'; import 'widgets/AddressItem.dart'; -class CallAmbulancePage extends StatelessWidget { +class CallAmbulancePage extends StatefulWidget { + bool? isFromRRT; + + CallAmbulancePage({super.key, this.isFromRRT = false}); + + @override + State createState() => _CallAmbulancePageState(); +} + +class _CallAmbulancePageState extends State { + TextEditingController addressController = TextEditingController(); + @override Widget build(BuildContext context) { return Scaffold( bottomSheet: ExpandableBottomSheet( - bottomSheetType: - context.watch().bottomSheetType, + bottomSheetType: context.watch().bottomSheetType, children: { - BottomSheetType.EXPANDED: ExpanedBottomSheet(context), - BottomSheetType.FIXED: FixedBottomSheet(context), + BottomSheetType.EXPANDED: expandedBottomSheet(context), + BottomSheetType.FIXED: fixedBottomSheet(context), }, ), body: Stack( children: [ - if (context.read().isGMSAvailable || - Platform.isIOS) - GMSMap( - currentLocation: - context.read().getGMSLocation(), - onCameraMoved: (value) => context - .read() - .handleGMSMapCameraMoved(value)) + if (context.read().isGMSAvailable || Platform.isIOS) + GMSMap(currentLocation: context.read().getGMSLocation(), onCameraMoved: (value) => context.read().handleGMSMapCameraMoved(value)) else - HMSMap( - currentLocation: - context.read().getHMSLocation(), - onCameraMoved: (value) => context - .read() - .handleHMSMapCameraMoved(value)), + HMSMap(currentLocation: context.read().getHMSLocation(), onCameraMoved: (value) => context.read().handleHMSMapCameraMoved(value)), Align( alignment: AlignmentDirectional.topStart, - child: Utils.buildSvgWithAssets( - icon: AppAssets.closeBottomNav, width: 32.h, height: 32.h), - ).paddingOnly(top: 51.h, left: 24.h).onPress((){ + child: Utils.buildSvgWithAssets(icon: AppAssets.closeBottomNav, width: 32.h, height: 32.h), + ).paddingOnly(top: 51.h, left: 24.h).onPress(() { Navigator.pop(context); }) ], @@ -67,13 +66,12 @@ class CallAmbulancePage extends StatelessWidget { ); } - Widget FixedBottomSheet(BuildContext context) { + Widget fixedBottomSheet(BuildContext context) { return GestureDetector( - onVerticalDragUpdate: (details){ + onVerticalDragUpdate: (details) { print("the delta is ${details.delta.dy}"); - if(details.delta.dy<0){ - + if (details.delta.dy < 0) { context.read().updateBottomSheetState(BottomSheetType.EXPANDED); } }, @@ -84,15 +82,11 @@ class CallAmbulancePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.end, children: [ - Padding( - - padding: EdgeInsetsDirectional.only(end:24.h, bottom: 24.h), + Padding( + padding: EdgeInsetsDirectional.only(end: 24.h, bottom: 24.h), child: DecoratedBox( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.whiteColor, borderRadius: 12.h), - child: Utils.buildSvgWithAssets( - icon: AppAssets.locate_me, width: 24.h, height: 24.h) - .paddingAll(12.h), + decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 12.h), + child: Utils.buildSvgWithAssets(icon: AppAssets.locate_me, width: 24.h, height: 24.h).paddingAll(12.h), ), ), ], @@ -110,15 +104,15 @@ class CallAmbulancePage extends StatelessWidget { // ), // ), // ), - // .paddingOnly(right: 24.h, bottom: 24.h), + // .paddingOnly(right: 24.h, bottom: 24.h), Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, spacing: 24.h, children: [ TextInputWidget( - labelText: "Enter Pickup Location Manually".needTranslation, - hintText: "Enter Pickup Location".needTranslation, + labelText: widget.isFromRRT! ? "Type Address".needTranslation : "Enter Pickup Location Manually".needTranslation, + hintText: widget.isFromRRT! ? "Enter street or area name".needTranslation : "Enter Pickup Location".needTranslation, leadingIcon: AppAssets.location_pickup, isAllowLeadingIcon: true, isEnable: false, @@ -126,50 +120,27 @@ class CallAmbulancePage extends StatelessWidget { autoFocus: false, isBorderAllowed: false, keyboardType: TextInputType.text, - padding: EdgeInsets.symmetric( - vertical: ResponsiveExtension(10).h, - horizontal: ResponsiveExtension(15).h, - ), - ).onPress(() { - context - .read() - .updateBottomSheetState(BottomSheetType.EXPANDED); - }).paddingOnly(right: 24.h, left: 24.h), + controller: addressController, + padding: EdgeInsets.symmetric(vertical: ResponsiveExtension(8).h, horizontal: ResponsiveExtension(12).h), + ).paddingOnly(right: 24.h, left: 24.h), SizedBox( height: 200.h, child: DecoratedBox( decoration: RoundedRectangleBorder().toSmoothCornerDecoration( color: AppColors.scaffoldBgColor, - customBorder: BorderRadius.only( - topLeft: Radius.circular(24.h), - topRight: Radius.circular(24.h), - ), + customBorder: BorderRadius.only(topLeft: Radius.circular(24.h), topRight: Radius.circular(24.h)), ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, - spacing: 24.h, + spacing: 4, children: [ - Column( - spacing: 4.h, - children: [ - "Select Pickup Location".needTranslation.toText21( - weight: FontWeight.w600, - color: AppColors.textColor, - ), - " Please select the location of pickup" - .needTranslation - .toText12( - fontWeight: FontWeight.w500, - color: AppColors.greyTextColor, - ) - ], - ), + "Select Pickup Location".needTranslation.toText21(weight: FontWeight.w600, color: AppColors.textColor), + " Please select the location of pickup".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor), + SizedBox(height: 20.h), CustomButton( text: "Select Location".needTranslation, onPressed: () { - context - .read() - .updateBottomSheetState(BottomSheetType.EXPANDED); + context.read().updateBottomSheetState(BottomSheetType.EXPANDED); }) ], ).paddingOnly(top: 24.h, bottom: 32.h, left: 24.h, right: 24.h), @@ -182,23 +153,20 @@ class CallAmbulancePage extends StatelessWidget { ); } - Widget ExpanedBottomSheet(BuildContext context) { + Widget expandedBottomSheet(BuildContext context) { return GestureDetector( - onVerticalDragUpdate: (details){ - if(details.delta.dy>0){ - context.read().updateBottomSheetState(BottomSheetType.FIXED); - } - }, + onVerticalDragUpdate: (details) { + if (details.delta.dy > 0) { + context.read().updateBottomSheetState(BottomSheetType.FIXED); + } + }, child: Column( mainAxisSize: MainAxisSize.min, children: [ DecoratedBox( decoration: RoundedRectangleBorder().toSmoothCornerDecoration( color: AppColors.scaffoldBgColor, - customBorder: BorderRadius.only( - topLeft: Radius.circular(24.h), - topRight: Radius.circular(24.h), - ), + customBorder: BorderRadius.only(topLeft: Radius.circular(24.h), topRight: Radius.circular(24.h)), ), child: Column( children: [ @@ -207,17 +175,12 @@ class CallAmbulancePage extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, spacing: 16.h, children: [ - "Select Pickup Location".needTranslation.toText21( - weight: FontWeight.w600, - color: AppColors.textColor, - ), + "Select Pickup Location".needTranslation.toText21(weight: FontWeight.w600, color: AppColors.textColor), locationsSections(context), - hospitalAndPickUpSection(context), - + widget.isFromRRT! ? SizedBox() : hospitalAndPickUpSection(context), ], - ).paddingOnly(top: 24.h, bottom: 32.h,left: 24.h, right: 24.h), + ).paddingOnly(top: 24.h, bottom: 32.h, left: 24.h, right: 24.h), ), - bottomPriceContent(context) ], ), @@ -249,8 +212,7 @@ class CallAmbulancePage extends StatelessWidget { shrinkWrap: true, itemCount: 3, itemBuilder: (__, index) { - if (index == - 2) // todo means the end of the list so handle as per the viewmodel + if (index == 2) // todo means the end of the list so handle as per the viewmodel { return CustomButton( height: 40.h, @@ -264,11 +226,8 @@ class CallAmbulancePage extends StatelessWidget { } else { return AddressItem( isSelected: index == 0, - address: - "Flat No 301, Building No 12, Palm Spring Apartment, Sector 45, Gurugram, Haryana 122003", - title: index == 0 - ? "Home".needTranslation - : "Work".needTranslation, + address: "Flat No 301, Building No 12, Palm Spring Apartment, Sector 45, Gurugram, Haryana 122003", + title: index == 0 ? "Home".needTranslation : "Work".needTranslation, onTap: () {}, ); } @@ -293,11 +252,9 @@ class CallAmbulancePage extends StatelessWidget { subTitle: "hospital".needTranslation, leadingIcon: AppAssets.hospital, ), - Utils.buildSvgWithAssets(icon: AppAssets.down_cheveron, - width: 24.h, height: 24.h) - .paddingAll(16.h) + Utils.buildSvgWithAssets(icon: AppAssets.down_cheveron, width: 24.h, height: 24.h).paddingAll(16.h) ], - ).onPress((){ + ).onPress(() { showHospitalBottomSheet(context); }), SizedBox(height: 16.h), @@ -307,7 +264,6 @@ class CallAmbulancePage extends StatelessWidget { thickness: 1, ), SizedBox(height: 16.h), - Row( children: [ hospitalAndPickUpItemContent( @@ -317,8 +273,8 @@ class CallAmbulancePage extends StatelessWidget { ), CustomSwitch( value: context.watch().isGMSAvailable, - onChanged: (value){ - context.read().setIsGMSAvailable( value); + onChanged: (value) { + context.read().setIsGMSAvailable(value); }, ) ], @@ -378,68 +334,49 @@ class CallAmbulancePage extends StatelessWidget { mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.end, children: [ - DecoratedBox( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.scaffoldBgColor, - customBorder: BorderRadius.only( - topLeft: Radius.circular(24.h), - topRight: Radius.circular(24.h), - ), - hasShadow: true - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - spacing: 12.h, + DecoratedBox( + decoration: RoundedRectangleBorder() + .toSmoothCornerDecoration(color: AppColors.scaffoldBgColor, customBorder: BorderRadius.only(topLeft: Radius.circular(24.h), topRight: Radius.circular(24.h)), hasShadow: true), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + spacing: 12.h, + children: [ + Row( children: [ - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - spacing: 4.h, + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + spacing: 4.h, + children: [ + "Total amount to pay".needTranslation.toText18(weight: FontWeight.w600, color: AppColors.textColor), + Row( children: [ - "Total amount to pay".needTranslation.toText18( - weight: FontWeight.w600, - color: AppColors.textColor, - ), - Row( - children: [ - Utils.buildSvgWithAssets(icon: AppAssets.warning, - height: 18.h, width: 18.h), - SizedBox(width: 4.h,), - "Amount will be paid at the hospital" - .needTranslation - .toText12( - fontWeight: FontWeight.w500, - color: AppColors.greyTextColor, - ), - ], - ) + Utils.buildSvgWithAssets(icon: AppAssets.warning, height: 18.h, width: 18.h), + SizedBox(width: 4.h), + "Amount will be paid at the hospital".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor), ], - ), - ), - "\$250".toText24( - fontWeight: FontWeight.w600, - color: AppColors.textColor, - ) - ], + ) + ], + ), ), - CustomButton( - text: "Submit Request".needTranslation, - onPressed: () { - Navigator.push(context, CustomPageRoute(page: RequestingServicesPage())); - }) + Utils.getPaymentAmountWithSymbol("250".toString().toText24(isBold: true), AppColors.blackColor, 17, isSaudiCurrency: true), ], - ).paddingOnly(top: 24.h, bottom: 12.h, left: 24.h, right: 24.h), - ), + ), + CustomButton( + text: "Submit Request".needTranslation, + onPressed: () { + Navigator.push(context, CustomPageRoute(page: RequestingServicesPage())); + }) + ], + ).paddingOnly(top: 24.h, bottom: 24.h, left: 24.h, right: 24.h), + ), ], ); } - showHospitalBottomSheet(BuildContext context){ + showHospitalBottomSheet(BuildContext context) { showCommonBottomSheetWithoutHeight( - title: - LocaleKeys.selectHospital.tr(), + title: LocaleKeys.selectHospital.tr(), context, child: HospitalBottomSheetBody(), isFullScreen: false, diff --git a/lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart b/lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart index 7f79be0..10c139c 100644 --- a/lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart +++ b/lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart @@ -7,11 +7,12 @@ import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/presentation/emergency_services/call_ambulance/tracking_screen.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; -import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart' - show CustomPageRoute; +import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart' show CustomPageRoute; import 'package:lottie/lottie.dart'; class RequestingServicesPage extends StatefulWidget { + RequestingServicesPage({super.key}); + @override State createState() => _RequestingServicesPageState(); } @@ -20,8 +21,7 @@ class _RequestingServicesPageState extends State { @override void initState() { Timer(Duration(seconds: 3), () { - Navigator.pushReplacement( - context, CustomPageRoute(page: TrackingScreen())); + Navigator.pushReplacement(context, CustomPageRoute(page: TrackingScreen())); }); super.initState(); } @@ -32,14 +32,7 @@ class _RequestingServicesPageState extends State { color: AppColors.scaffoldBgColor, child: Stack( children: [ - Lottie.asset(AppAnimations.loadingAnimation, - width: 80.h, - height: 80.h, - repeat: true, - reverse: false, - frameRate: FrameRate(60), - fit: BoxFit.fill) - .center, + Lottie.asset(AppAnimations.loadingAnimation, width: 80.h, height: 80.h, repeat: true, reverse: false, frameRate: FrameRate(60), fit: BoxFit.fill).center, Positioned( bottom: 1, child: "Submitting your request. \nPlease wait for a moment" diff --git a/lib/presentation/emergency_services/call_ambulance/tracking_screen.dart b/lib/presentation/emergency_services/call_ambulance/tracking_screen.dart index a48ca10..483da07 100644 --- a/lib/presentation/emergency_services/call_ambulance/tracking_screen.dart +++ b/lib/presentation/emergency_services/call_ambulance/tracking_screen.dart @@ -20,38 +20,37 @@ import 'package:lottie/lottie.dart'; import 'package:provider/provider.dart'; class TrackingScreen extends StatelessWidget { - final OrderTrackingState state = OrderTrackingState.ended; + final OrderTrackingState state = OrderTrackingState.waitingForCall; + @override Widget build(BuildContext context) { - return Scaffold( - bottomNavigationBar: Visibility( - visible: state == OrderTrackingState.ended, - child: SafeArea( - child: CustomButton( - height: 56.h, - backgroundColor: AppColors.bgGreenColor, - borderColor: Colors.transparent, - text: "Close".needTranslation, - textColor: AppColors.whiteColor, - onPressed: () {}, - ).paddingOnly(left:16.h,right:16.h), - ), + return CollapsingListView( + title: "Tracking Details".needTranslation, + bottomChild: Visibility( + visible: state == OrderTrackingState.ended, + child: CustomButton( + height: 50.h, + backgroundColor: AppColors.bgGreenColor, + borderColor: Colors.transparent, + text: "Close".needTranslation, + textColor: AppColors.whiteColor, + onPressed: () {}, + ).paddingOnly(left: 16.h, right: 16.h, bottom: 16.h), ), - body: CollapsingListView( - title: "Tracking Details".needTranslation, - child: SingleChildScrollView( - child: Column( - children: [ - animationSection(), - Column( - spacing: 16.h, - children: [OrderStatus(context), OrderTrackingId(), ContactSection()], - ).paddingAll(16.h), - ], - ))), + child: SingleChildScrollView( + child: Column( + children: [ + animationSection(), + Column( + spacing: 16.h, + children: [OrderStatus(context), OrderTrackingId(), ContactSection()], + ).paddingAll(16.h), + ], + )), ); } - animationSection(){ + + animationSection() { switch (state) { case OrderTrackingState.waitingForCall: case OrderTrackingState.dispactched: @@ -59,18 +58,14 @@ class TrackingScreen extends StatelessWidget { return Lottie.asset(AppAnimations.ambulance, repeat: true, reverse: false, width: 260.h, height: 200.h); case OrderTrackingState.ended: default: - return Lottie.asset(AppAnimations.checkmark, repeat: true, width: 260.h, height: 200.h); + return Lottie.asset(AppAnimations.checkmark, repeat: true, width: 260.h, height: 200.h); } } OrderStatus(BuildContext context) { return Container( padding: EdgeInsets.all(16.h), - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.whiteColor, - borderRadius: 20.h, - hasShadow: false, - ), + decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 20.h, hasShadow: false), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -95,7 +90,7 @@ class TrackingScreen extends StatelessWidget { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - SizedBox(height: 16,), + SizedBox(height: 16.h), CustomButton( text: "Cancel Request".needTranslation, onPressed: () async {}, @@ -119,7 +114,7 @@ class TrackingScreen extends StatelessWidget { backgroundColor: AppColors.lightRedButtonColor, borderColor: Colors.transparent, text: "Share Your Live Locatin on Whatsapp".needTranslation, - fontSize: 12.fSize, + fontSize: 12.f, textColor: AppColors.primaryRedColor, iconColor: AppColors.primaryRedColor, onPressed: () {}, @@ -131,11 +126,7 @@ class TrackingScreen extends StatelessWidget { return Column( crossAxisAlignment: CrossAxisAlignment.start, spacing: 12.h, - children: [ - dividerSection, - doctorSection(), - mapSection(context) - ], + children: [dividerSection, doctorSection(), mapSection(context)], ); case OrderTrackingState.ended: default: @@ -170,17 +161,14 @@ class TrackingScreen extends StatelessWidget { return Row( spacing: 16.h, children: [ - Utils.buildImgWithNetwork(url: "", iconColor: Colors.transparent) - .circle(52.h), + Utils.buildImgWithNetwork(url: "", iconColor: Colors.transparent).circle(52.h), Expanded( child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - "Dr. John Doe".toText16( - color: AppColors.textColor, weight: FontWeight.w600), + "Dr. John Doe".toText16(color: AppColors.textColor, weight: FontWeight.w600), SizedBox(height: 4.h), - "MBBS, MD - General Medicine".toText12( - color: AppColors.greyTextColor, fontWeight: FontWeight.w500), + "MBBS, MD - General Medicine".toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500), ], ), ), @@ -204,96 +192,83 @@ class TrackingScreen extends StatelessWidget { Widget mapForRequestedCoordinate(BuildContext context) { // return SizedBox.shrink(); - if (context.read().isGMSAvailable || - Platform.isIOS) - return GMSMap( - myLocationEnabled: false, - currentLocation: - context.read().getGMSLocation(), - onCameraMoved: (value) => context - .read() - .handleGMSMapCameraMoved(value)); - else + if (context.read().isGMSAvailable || Platform.isIOS) { + return GMSMap( + myLocationEnabled: false, + currentLocation: context.read().getGMSLocation(), + onCameraMoved: (value) => context.read().handleGMSMapCameraMoved(value)); + } else { return HMSMap( myLocationEnabled: false, - currentLocation: - context.read().getHMSLocation(), - onCameraMoved: (value) => context - .read() - .handleHMSMapCameraMoved(value)); + currentLocation: context.read().getHMSLocation(), + onCameraMoved: (value) => context.read().handleHMSMapCameraMoved(value)); + } } informationRegardingTrackingSection() { return Column( crossAxisAlignment: CrossAxisAlignment.start, - children: [ - currentStatus(), - SizedBox(height: 4.h), - "You will receive a call from HMG for confirmation ".toText12( - color: AppColors.greyTextColor, fontWeight: FontWeight.w500) - ], + children: [currentStatus(), SizedBox(height: 4.h), "You will receive a call from HMG for confirmation ".toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500)], ); } currentStatus() { - switch (state) { - case OrderTrackingState.waitingForCall: - case OrderTrackingState.dispactched: - return RichText( - text: TextSpan(children: [ - TextSpan( - text: "Please wait for the call".needTranslation, - style: TextStyle( - fontSize: 21.fSize, - fontWeight: FontWeight.w600, - color: AppColors.textColor, - ), - ), - TextSpan( - text: "...".needTranslation, - style: TextStyle( - fontSize: 21.fSize, - fontWeight: FontWeight.w600, - color: AppColors.errorColor, - ), - ), - ]), - ); - case OrderTrackingState.returning: - return RichText( - text: TextSpan(children: [ - TextSpan( - text: "15:30".needTranslation, - style: TextStyle( - fontSize: 21.fSize, - fontWeight: FontWeight.w600, - color: AppColors.textColor, - ), - ), - TextSpan( - text: " mins ".needTranslation, - style: TextStyle( - fontSize: 21.fSize, - fontWeight: FontWeight.w600, - color: AppColors.errorColor, - ), - ), - TextSpan( - text: "to hospital".needTranslation, - style: TextStyle( - fontSize: 21.fSize, - fontWeight: FontWeight.w600, - color: AppColors.textColor, - ), - ), - ]), - ); - case OrderTrackingState.ended: - default: - return "Arrived" - .needTranslation - .toText21(color: AppColors.textColor, weight: FontWeight.w600); - } + switch (state) { + case OrderTrackingState.waitingForCall: + case OrderTrackingState.dispactched: + return RichText( + text: TextSpan(children: [ + TextSpan( + text: "Please wait for the call".needTranslation, + style: TextStyle( + fontSize: 21.f, + fontWeight: FontWeight.w600, + color: AppColors.textColor, + ), + ), + TextSpan( + text: "...".needTranslation, + style: TextStyle( + fontSize: 21.f, + fontWeight: FontWeight.w600, + color: AppColors.errorColor, + ), + ), + ]), + ); + case OrderTrackingState.returning: + return RichText( + text: TextSpan(children: [ + TextSpan( + text: "15:30".needTranslation, + style: TextStyle( + fontSize: 21.f, + fontWeight: FontWeight.w600, + color: AppColors.textColor, + ), + ), + TextSpan( + text: " mins ".needTranslation, + style: TextStyle( + fontSize: 21.f, + fontWeight: FontWeight.w600, + color: AppColors.errorColor, + ), + ), + TextSpan( + text: "to hospital".needTranslation, + style: TextStyle( + fontSize: 21.f, + fontWeight: FontWeight.w600, + color: AppColors.textColor, + ), + ), + ]), + ); + case OrderTrackingState.ended: + default: + return "Arrived".needTranslation.toText21(color: AppColors.textColor, weight: FontWeight.w600); + } } OrderTrackingId() { @@ -308,19 +283,15 @@ class TrackingScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, spacing: 8.h, children: [ - "Req ID:1234567890" - .toText16(color: AppColors.textColor, weight: FontWeight.w600), + "Req ID:1234567890".toText16(color: AppColors.textColor, weight: FontWeight.w600), Row( spacing: 8.h, children: [ - Chip("location name".needTranslation, AppAssets.location_pickup, - AppColors.blackBgColor), - Chip("hotel name ".needTranslation, AppAssets.hospital, - AppColors.blackBgColor), + Chip("location name".needTranslation, AppAssets.location_pickup, AppColors.blackBgColor), + Chip("hotel name ".needTranslation, AppAssets.hospital, AppColors.blackBgColor), ], ), - Chip("hotel name ".needTranslation, AppAssets.hospital, - AppColors.blackBgColor), + Chip("hotel name ".needTranslation, AppAssets.hospital, AppColors.blackBgColor), ], ), ); @@ -350,11 +321,8 @@ class TrackingScreen extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, spacing: 4.h, children: [ - "Contact Rapid Response Team (RRT)".needTranslation.toText14( - color: AppColors.textColor, weight: FontWeight.w600), - "1223456789".needTranslation.toText12( - color: AppColors.primaryRedColor, - fontWeight: FontWeight.w500), + "Contact Rapid Response Team (RRT)".needTranslation.toText14(color: AppColors.textColor, weight: FontWeight.w600), + "1223456789".needTranslation.toText12(color: AppColors.primaryRedColor, fontWeight: FontWeight.w500), SizedBox(height: 8.h), ], ), @@ -390,27 +358,22 @@ class TrackingScreen extends StatelessWidget { getTitle(OrderTrackingState state) { switch (state) { case OrderTrackingState.waitingForCall: - return "Confirmation Call".needTranslation - .toText16(color: AppColors.textColor, weight: FontWeight.w600); + return "Confirmation Call".needTranslation.toText16(color: AppColors.textColor, weight: FontWeight.w600); case OrderTrackingState.dispactched: - return "Pickup Up from Home".needTranslation - .toText16(color: AppColors.textColor, weight: FontWeight.w600); + return "Pickup Up from Home".needTranslation.toText16(color: AppColors.textColor, weight: FontWeight.w600); case OrderTrackingState.returning: - return " On The Way To Hospital".needTranslation - .toText16(color: AppColors.textColor, weight: FontWeight.w600); + return " On The Way To Hospital".needTranslation.toText16(color: AppColors.textColor, weight: FontWeight.w600); case OrderTrackingState.ended: default: - return "Arrived at Hospital".needTranslation - .toText16(color: AppColors.textColor, weight: FontWeight.w600); + return "Arrived at Hospital".needTranslation.toText16(color: AppColors.textColor, weight: FontWeight.w600); } } mapSection(BuildContext context) { - return SizedBox( + return SizedBox( height: 170.h, width: double.infinity, - child: ClipRRect( - borderRadius: BorderRadius.circular(20.h),child: mapForRequestedCoordinate(context)), + child: ClipRRect(borderRadius: BorderRadius.circular(20.h), child: mapForRequestedCoordinate(context)), ); } } diff --git a/lib/presentation/emergency_services/emergency_services_page.dart b/lib/presentation/emergency_services/emergency_services_page.dart index ddea6fd..cf7c4dc 100644 --- a/lib/presentation/emergency_services/emergency_services_page.dart +++ b/lib/presentation/emergency_services/emergency_services_page.dart @@ -67,8 +67,7 @@ class EmergencyServicesPage extends StatelessWidget { showCommonBottomSheetWithoutHeight( context, child: Container( - decoration: - RoundedRectangleBorder().toSmoothCornerDecoration( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( color: AppColors.primaryRedColor, borderRadius: 24.h, ), @@ -92,22 +91,11 @@ class EmergencyServicesPage extends StatelessWidget { }), ], ), - Lottie.asset(AppAnimations.ambulance_alert, - repeat: false, - reverse: false, - frameRate: FrameRate(60), - width: 120.h, - height: 120.h, - fit: BoxFit.contain), + Lottie.asset(AppAnimations.ambulance_alert, repeat: false, reverse: false, frameRate: FrameRate(60), width: 120.h, height: 120.h, fit: BoxFit.contain), SizedBox(height: 8.h), - "Confirmation".needTranslation.toText28( - color: AppColors.whiteColor, isBold: true), + "Confirmation".needTranslation.toText28(color: AppColors.whiteColor, isBold: true), SizedBox(height: 8.h), - "Are you sure you want to call an ambulance?" - .needTranslation - .toText14( - color: AppColors.whiteColor, - weight: FontWeight.w500), + "Are you sure you want to call an ambulance?".needTranslation.toText14(color: AppColors.whiteColor, weight: FontWeight.w500), SizedBox(height: 24.h), CustomButton( text: LocaleKeys.confirm.tr(context: context), @@ -115,15 +103,11 @@ class EmergencyServicesPage extends StatelessWidget { // Navigator.of(context).pop(); showCommonBottomSheetWithoutHeight( - title: - "Transport Options".needTranslation, + title: "Transport Options".needTranslation, context, - child: AmbulanceOptionSelectionBottomSheet( - onTap: () { + child: AmbulanceOptionSelectionBottomSheet(onTap: () { Navigator.of(context).pop(); - context - .read() - .navigateTOAmbulancePage(); + context.read().navigateTOAmbulancePage(); }), isFullScreen: false, isCloseButtonVisible: true, @@ -182,11 +166,7 @@ class EmergencyServicesPage extends StatelessWidget { SizedBox(height: 16.h), Container( padding: EdgeInsets.all(16.h), - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.whiteColor, - borderRadius: 20.h, - hasShadow: false, - ), + decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 20.h, hasShadow: false), child: Row( children: [ Utils.buildSvgWithAssets(icon: AppAssets.rrt_icon, width: 40.h, height: 40.h), @@ -195,8 +175,8 @@ class EmergencyServicesPage extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - "Rapid Response Team (RRT)".toText16(isBold: true, color: AppColors.blackColor), - "Comprehensive medical service for all sorts of urgent and stable cases".toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500), + "Rapid Response Team (RRT)".needTranslation.toText16(isBold: true, color: AppColors.blackColor), + "Comprehensive medical service for all sorts of urgent and stable cases".needTranslation.toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500), ], ), ), @@ -204,71 +184,57 @@ class EmergencyServicesPage extends StatelessWidget { Utils.buildSvgWithAssets(icon: AppAssets.forward_chevron_icon, width: 13.h, height: 13.h), ], ).onPress(() { - showCommonBottomSheetWithoutHeight( - context, - child: Container( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.primaryRedColor, - borderRadius: 24.h, - ), - child: Padding( - padding: EdgeInsets.all(24.h), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - "".toText14(), - Utils.buildSvgWithAssets( - icon: AppAssets.cancel_circle_icon, - iconColor: AppColors.whiteColor, - width: 24.h, - height: 24.h, - fit: BoxFit.contain, - ).onPress(() { + locationUtils!.getLocation( + isShowConfirmDialog: true, + onSuccess: (position) { + showCommonBottomSheetWithoutHeight( + context, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Lottie.asset(AppAnimations.ambulance_alert, repeat: false, reverse: false, frameRate: FrameRate(60), width: 100.h, height: 100.h, fit: BoxFit.contain), + SizedBox(height: 8.h), + "Confirmation".needTranslation.toText28( + color: AppColors.whiteColor, + isBold: true, + ), + SizedBox(height: 8.h), + "Are you sure you want to call Rapid Response Team (RRT)?".needTranslation.toText16(color: AppColors.whiteColor, weight: FontWeight.w500), + SizedBox(height: 24.h), + CustomButton( + text: LocaleKeys.confirm.tr(context: context), + onPressed: () async { Navigator.of(context).pop(); - }), - ], - ), - Lottie.asset(AppAnimations.ambulance_alert, repeat: false, reverse: false, frameRate: FrameRate(60), width: 120.h, height: 120.h, fit: BoxFit.contain), - SizedBox(height: 8.h), - "Confirmation".needTranslation.toText28(color: AppColors.whiteColor, isBold: true), - SizedBox(height: 8.h), - "Are you sure you want to call Rapid Response Team (RRT)?".needTranslation.toText14(color: AppColors.whiteColor, weight: FontWeight.w500), - SizedBox(height: 24.h), - CustomButton( - text: LocaleKeys.confirm.tr(context: context), - onPressed: () async { - Navigator.of(context).pop(); - showCommonBottomSheetWithoutHeight( - title: "Rapid Response Team (RRT)".needTranslation, - context, - child: RrtRequestTypeSelect(), - isFullScreen: false, - isCloseButtonVisible: true, - hasBottomPadding: false, - backgroundColor: AppColors.bottomSheetBgColor, - callBackFunc: () {}, - ); - }, - backgroundColor: AppColors.whiteColor, - borderColor: AppColors.whiteColor, - textColor: AppColors.primaryRedColor, - icon: AppAssets.checkmark_icon, - iconColor: AppColors.primaryRedColor, - ), - SizedBox(height: 8.h), - ], - ), - ), - ), - isFullScreen: false, - isCloseButtonVisible: false, - hasBottomPadding: false, - backgroundColor: AppColors.primaryRedColor, - callBackFunc: () {}, - ); + showCommonBottomSheetWithoutHeight( + title: "Rapid Response Team (RRT)".needTranslation, + context, + child: RrtRequestTypeSelect(), + isFullScreen: false, + isCloseButtonVisible: true, + hasBottomPadding: false, + isDisablePadding: true, + backgroundColor: AppColors.bottomSheetBgColor, + callBackFunc: () {}, + ); + }, + backgroundColor: AppColors.whiteColor, + borderColor: AppColors.whiteColor, + textColor: AppColors.primaryRedColor, + icon: AppAssets.checkmark_icon, + iconColor: AppColors.primaryRedColor, + ), + SizedBox(height: 20.h), + ], + ), + isFullScreen: false, + isCloseButtonVisible: true, + hasBottomPadding: false, + backgroundColor: AppColors.primaryRedColor, + iconColor: Colors.white, + customCloseIcon: AppAssets.cancel_circle_icon, + callBackFunc: () {}, + ); + }); }), ), ], diff --git a/lib/presentation/my_family/my_family.dart b/lib/presentation/my_family/my_family.dart index 194d5e0..781624a 100644 --- a/lib/presentation/my_family/my_family.dart +++ b/lib/presentation/my_family/my_family.dart @@ -50,7 +50,6 @@ class _FamilyMedicalScreenState extends State { medicalVM?.onFamilyFileTabChange(0); }); } - @override Widget build(BuildContext context) { @@ -69,6 +68,7 @@ class _FamilyMedicalScreenState extends State { text: "Add a new family member".needTranslation, onPressed: () { DialogService dialogService = getIt.get(); + medicalVM!.clearAuthValues(); dialogService.showAddFamilyFileSheet( label: "Add Family Member".needTranslation, message: "Please fill the below field to add a new family member to your profile".needTranslation, diff --git a/lib/widgets/appbar/collapsing_list_view.dart b/lib/widgets/appbar/collapsing_list_view.dart index 1574a0a..fc70d03 100644 --- a/lib/widgets/appbar/collapsing_list_view.dart +++ b/lib/widgets/appbar/collapsing_list_view.dart @@ -54,6 +54,7 @@ class CollapsingListView extends StatelessWidget { SliverAppBar( automaticallyImplyLeading: false, pinned: true, + expandedHeight: 100.h, stretch: true, systemOverlayStyle: SystemUiOverlayStyle(statusBarBrightness: Brightness.light), diff --git a/lib/widgets/common_bottom_sheet.dart b/lib/widgets/common_bottom_sheet.dart index 4d0dcf1..7d7bef7 100644 --- a/lib/widgets/common_bottom_sheet.dart +++ b/lib/widgets/common_bottom_sheet.dart @@ -105,17 +105,20 @@ class ButtonSheetContent extends StatelessWidget { } void showCommonBottomSheetWithoutHeight( - BuildContext context, { - required Widget child, - required VoidCallback callBackFunc, - String title = "", - bool isCloseButtonVisible = true, - bool isFullScreen = true, - bool isDismissible = true, - Widget? titleWidget, - bool useSafeArea = false, + BuildContext context, { + required Widget child, + required VoidCallback callBackFunc, + String title = "", + bool isCloseButtonVisible = true, + bool isFullScreen = true, + bool isDismissible = true, + Widget? titleWidget, + bool useSafeArea = false, bool hasBottomPadding = true, Color backgroundColor = AppColors.bottomSheetBgColor, + Color iconColor = const Color(0xff2B353E), + String? customCloseIcon, + bool isDisablePadding = false, }) { showModalBottomSheet( sheetAnimationStyle: AnimationStyle( @@ -145,40 +148,32 @@ void showCommonBottomSheetWithoutHeight( physics: ClampingScrollPhysics(), child: isCloseButtonVisible ? Container( - padding: EdgeInsets.only( - left: 24, - top: 24, - right: 24, - bottom: 12, - ), - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.bottomSheetBgColor, - borderRadius: 24.h, - ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - titleWidget ?? - Expanded( - child: title.toText20(weight: FontWeight.w600), - ), - Utils.buildSvgWithAssets( - icon: AppAssets.close_bottom_sheet_icon, - iconColor: Color(0xff2B353E), - ).onPress(() { - Navigator.of(context).pop(); - }), - ], - ), - SizedBox(height: 16.h), - child, - ], - ), - ) + padding: isDisablePadding ? null : EdgeInsets.only(left: 24, top: 24, right: 24, bottom: 12), + decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: backgroundColor, borderRadius: 24.h), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + titleWidget ?? + Expanded( + child: title.toText20(weight: FontWeight.w600), + ), + Utils.buildSvgWithAssets( + icon: customCloseIcon ?? AppAssets.close_bottom_sheet_icon, + iconColor: iconColor, + ).onPress(() { + Navigator.of(context).pop(); + }), + ], + ).paddingOnly(left: isDisablePadding ? 24 : 0, right: isDisablePadding ? 24 : 0, bottom: isDisablePadding ? 12 : 0, top: isDisablePadding ? 24 : 0), + SizedBox(height: 16.h), + child, + ], + ), + ) : child, ), ), diff --git a/lib/widgets/expandable_bottom_sheet/ExpandableBottomSheet.dart b/lib/widgets/expandable_bottom_sheet/ExpandableBottomSheet.dart index 73a4a47..b18bd58 100644 --- a/lib/widgets/expandable_bottom_sheet/ExpandableBottomSheet.dart +++ b/lib/widgets/expandable_bottom_sheet/ExpandableBottomSheet.dart @@ -10,7 +10,7 @@ class ExpandableBottomSheet extends StatelessWidget { @override Widget build(BuildContext context) { - print("the currently selected item is ${bottomSheetType}"); + print("the currently selected item is $bottomSheetType"); return AnimatedCrossFade( duration: const Duration(milliseconds: 600), firstChild:children[BottomSheetType.FIXED] ?? SizedBox.shrink(), diff --git a/lib/widgets/radio/custom_radio_button.dart b/lib/widgets/radio/custom_radio_button.dart index 080fcb3..a530102 100644 --- a/lib/widgets/radio/custom_radio_button.dart +++ b/lib/widgets/radio/custom_radio_button.dart @@ -11,14 +11,13 @@ class CustomRadioOption extends StatelessWidget { // final Widget child; // The content of your radio option (e.g., Text, Image) - const CustomRadioOption({ - super.key, - required this.value, - required this.groupValue, - required this.onChanged, - // required this.child, - required this.text, - }); + const CustomRadioOption( + {super.key, + required this.value, + required this.groupValue, + required this.onChanged, + // required this.child, + required this.text}); @override Widget build(BuildContext context) { @@ -31,13 +30,12 @@ class CustomRadioOption extends StatelessWidget { child: Row( children: [ Container( - width: 20.h, - height: 20.h, + width: 18.h, + height: 18.h, decoration: BoxDecoration( - shape: BoxShape.circle, - color: isSelected ? AppColors.primaryRedColor : AppColors.whiteColor, - border: Border.all(color: isSelected ? AppColors.primaryRedColor : AppColors.bottomNAVBorder, width: 2.h), - ), + shape: BoxShape.circle, + color: isSelected ? AppColors.primaryRedColor : AppColors.whiteColor, + border: Border.all(color: isSelected ? AppColors.primaryRedColor : AppColors.bottomNAVBorder, width: 2.h)), ), SizedBox(width: 8.h), text.toText16(weight: FontWeight.w500), // The provided content From fee84a292809aba1827864f8e88e059ab9092166 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 23 Nov 2025 15:22:55 +0300 Subject: [PATCH 04/22] Nearest appointment implemented --- lib/core/api_consts.dart | 2 +- lib/core/utils/date_util.dart | 23 +++++++++++++++++++ .../book_appointments_view_model.dart | 8 +++---- .../book_appointment/widgets/doctor_card.dart | 8 +++++++ 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index a1f4062..d555bc4 100644 --- a/lib/core/api_consts.dart +++ b/lib/core/api_consts.dart @@ -711,7 +711,7 @@ var GET_PRESCRIPTION_INSTRUCTIONS_PDF = 'Services/ChatBot_Service.svc/REST/Chatb class ApiConsts { static const maxSmallScreen = 660; - static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat; + static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod; // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT diff --git a/lib/core/utils/date_util.dart b/lib/core/utils/date_util.dart index a918706..e6856db 100644 --- a/lib/core/utils/date_util.dart +++ b/lib/core/utils/date_util.dart @@ -370,6 +370,29 @@ class DateUtil { } } + static String getDateStringForNearestSlot(String date) { + DateTime dateObj = DateUtil.convertStringToDate(date); + return DateUtil.getWeekDay(dateObj.weekday) + + ", " + + dateObj.day.toString() + + " " + + DateUtil.getMonth(dateObj.month) + + " " + + dateObj.year.toString() + + " " + + dateObj.hour.toString() + + ":" + + getMinute(dateObj); + } + + static String getMinute(DateTime dateObj) { + if (dateObj.minute == 0) { + return dateObj.minute.toString() + "0"; + } else { + return dateObj.minute.toString(); + } + } + static String getMonthDayYearLangDateFormatted(DateTime dateTime, String lang) { if (dateTime != null) { return lang == 'en' diff --git a/lib/features/book_appointments/book_appointments_view_model.dart b/lib/features/book_appointments/book_appointments_view_model.dart index a50b683..5d5fc71 100644 --- a/lib/features/book_appointments/book_appointments_view_model.dart +++ b/lib/features/book_appointments/book_appointments_view_model.dart @@ -337,16 +337,14 @@ class BookAppointmentsViewModel extends ChangeNotifier { //TODO: Make the API dynamic with parameters for ProjectID, isNearest, languageID, doctorId, doctorName Future getDoctorsList( - {int projectID = 0, - bool isNearest = false, - int doctorId = 0, + {int projectID = 0, bool isNearest = true, int doctorId = 0, String doctorName = "", Function(dynamic)? onSuccess, Function(String)? onError}) async { doctorsList.clear(); projectID = currentlySelectedHospitalFromRegionFlow != null ? int.parse(currentlySelectedHospitalFromRegionFlow!) : projectID; - final result = await bookAppointmentsRepo.getDoctorsList(selectedClinic.clinicID ?? 0, projectID, isNearest, doctorId, doctorName, - isContinueDentalPlan: isContinueDentalPlan); + final result = + await bookAppointmentsRepo.getDoctorsList(selectedClinic.clinicID ?? 0, projectID, doctorName.isNotEmpty ? false : isNearest, doctorId, doctorName, isContinueDentalPlan: isContinueDentalPlan); result.fold( (failure) async { diff --git a/lib/presentation/book_appointment/widgets/doctor_card.dart b/lib/presentation/book_appointment/widgets/doctor_card.dart index 4cd147a..20b7615 100644 --- a/lib/presentation/book_appointment/widgets/doctor_card.dart +++ b/lib/presentation/book_appointment/widgets/doctor_card.dart @@ -1,6 +1,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; +import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; @@ -114,6 +115,13 @@ class DoctorCard extends StatelessWidget { iconColor: AppColors.ratingColorYellow, labelText: "Rating: ${isLoading ? 4.78 : doctorsListResponseModel.decimalDoctorRate}".needTranslation, ).toShimmer2(isShow: isLoading), + doctorsListResponseModel.nearestFreeSlot != null + ? AppCustomChipWidget( + labelText: (isLoading ? "Cardiologist" : DateUtil.getDateStringForNearestSlot(doctorsListResponseModel.nearestFreeSlot)).needTranslation, + backgroundColor: AppColors.successColor, + textColor: AppColors.whiteColor, + ).toShimmer2(isShow: isLoading) + : SizedBox.shrink(), ], ), SizedBox(height: 12.h), From b90883a5964ef1c94c06e7827b6777e92e2d353d Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 23 Nov 2025 17:01:41 +0300 Subject: [PATCH 05/22] prescription order implementation contd. --- lib/core/api_consts.dart | 2 +- lib/core/dependencies.dart | 2 +- .../emergency_services_view_model.dart | 4 +- .../prescriptions_view_model.dart | 46 +++++++++- ...scription_delivery_order_summary_page.dart | 88 +++++++++++++++++++ .../prescriptions_list_page.dart | 33 ++++--- lib/widgets/map/map_utility_screen.dart | 1 + 7 files changed, 161 insertions(+), 15 deletions(-) create mode 100644 lib/presentation/prescriptions/prescription_delivery_order_summary_page.dart diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index d555bc4..a1f4062 100644 --- a/lib/core/api_consts.dart +++ b/lib/core/api_consts.dart @@ -711,7 +711,7 @@ var GET_PRESCRIPTION_INSTRUCTIONS_PDF = 'Services/ChatBot_Service.svc/REST/Chatb class ApiConsts { static const maxSmallScreen = 660; - static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod; + static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat; // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT diff --git a/lib/core/dependencies.dart b/lib/core/dependencies.dart index 73a93c6..6c45247 100644 --- a/lib/core/dependencies.dart +++ b/lib/core/dependencies.dart @@ -130,7 +130,7 @@ class AppDependencies { ), ); - getIt.registerLazySingleton(() => PrescriptionsViewModel(prescriptionsRepo: getIt(), errorHandlerService: getIt())); + getIt.registerLazySingleton(() => PrescriptionsViewModel(prescriptionsRepo: getIt(), errorHandlerService: getIt(), navServices: getIt())); getIt.registerLazySingleton(() => InsuranceViewModel(insuranceRepo: getIt(), errorHandlerService: getIt())); diff --git a/lib/features/emergency_services/emergency_services_view_model.dart b/lib/features/emergency_services/emergency_services_view_model.dart index ad72ef4..a713003 100644 --- a/lib/features/emergency_services/emergency_services_view_model.dart +++ b/lib/features/emergency_services/emergency_services_view_model.dart @@ -1054,8 +1054,8 @@ class EmergencyServicesViewModel extends ChangeNotifier { bool result = await navServices.push( CustomPageRoute( page: MapUtilityScreen( - confirmButtonString: "Submit Request ".needTranslation, - titleString: "Select Location", + confirmButtonString: "Submit Request".needTranslation, + titleString: "Select Location".needTranslation, subTitleString: "Please select the location".needTranslation, isGmsAvailable: appState.isGMSAvailable, ), diff --git a/lib/features/prescriptions/prescriptions_view_model.dart b/lib/features/prescriptions/prescriptions_view_model.dart index aac25c1..8f3836c 100644 --- a/lib/features/prescriptions/prescriptions_view_model.dart +++ b/lib/features/prescriptions/prescriptions_view_model.dart @@ -1,8 +1,22 @@ +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/app_state.dart'; +import 'package:hmg_patient_app_new/core/dependencies.dart'; +import 'package:hmg_patient_app_new/core/location_util.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; +import 'package:hmg_patient_app_new/features/location/GeocodeResponse.dart'; +import 'package:hmg_patient_app_new/features/location/PlaceDetails.dart'; +import 'package:hmg_patient_app_new/features/location/PlacePrediction.dart'; +import 'package:hmg_patient_app_new/features/location/location_view_model.dart'; import 'package:hmg_patient_app_new/features/prescriptions/models/resp_models/patient_prescriptions_response_model.dart'; import 'package:hmg_patient_app_new/features/prescriptions/models/resp_models/prescription_detail_response_model.dart'; import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_repo.dart'; +import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; +import 'package:hmg_patient_app_new/presentation/prescriptions/prescription_delivery_order_summary_page.dart'; import 'package:hmg_patient_app_new/services/error_handler_service.dart'; +import 'package:hmg_patient_app_new/services/navigation_service.dart'; +import 'package:hmg_patient_app_new/widgets/map/map_utility_screen.dart'; +import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; class PrescriptionsViewModel extends ChangeNotifier { bool isPrescriptionsOrdersLoading = false; @@ -10,6 +24,7 @@ class PrescriptionsViewModel extends ChangeNotifier { PrescriptionsRepo prescriptionsRepo; ErrorHandlerService errorHandlerService; + NavigationService navServices; // Prescription Orders Lists List patientPrescriptionOrders = []; @@ -27,7 +42,9 @@ class PrescriptionsViewModel extends ChangeNotifier { String prescriptionPDFBase64Data = ""; - PrescriptionsViewModel({required this.prescriptionsRepo, required this.errorHandlerService}); + late GeocodeResponse locationGeocodeResponse; + + PrescriptionsViewModel({required this.prescriptionsRepo, required this.errorHandlerService, required this.navServices}); initPrescriptionsViewModel() { patientPrescriptionOrders.clear(); @@ -173,4 +190,31 @@ class PrescriptionsViewModel extends ChangeNotifier { }, ); } + + void initiatePrescriptionDelivery() async { + getIt.get().getLocation( + isShowConfirmDialog: true, + onSuccess: (position) async { + bool result = await navServices.push( + CustomPageRoute( + page: MapUtilityScreen( + confirmButtonString: LocaleKeys.next.tr(), + titleString: "Select Location".needTranslation, + subTitleString: "Please select the location for prescription delivery".needTranslation, + isGmsAvailable: getIt.get().isGMSAvailable, + ), + direction: AxisDirection.down), + ); + print("Location Selected: $result"); + if (result) { + LocationViewModel locationViewModel = getIt.get(); + locationGeocodeResponse = locationViewModel.geocodeResponse!; + navServices.push( + CustomPageRoute( + page: PrescriptionDeliveryOrderSummaryPage(), + ), + ); + } + }); + } } diff --git a/lib/presentation/prescriptions/prescription_delivery_order_summary_page.dart b/lib/presentation/prescriptions/prescription_delivery_order_summary_page.dart new file mode 100644 index 0000000..bd2cf77 --- /dev/null +++ b/lib/presentation/prescriptions/prescription_delivery_order_summary_page.dart @@ -0,0 +1,88 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; +import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_view_model.dart'; +import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; +import 'package:hmg_patient_app_new/theme/colors.dart'; +import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; +import 'package:provider/provider.dart'; + +class PrescriptionDeliveryOrderSummaryPage extends StatelessWidget { + PrescriptionDeliveryOrderSummaryPage({super.key}); + + late PrescriptionsViewModel prescriptionsViewModel; + + @override + Widget build(BuildContext context) { + prescriptionsViewModel = Provider.of(context, listen: false); + return Scaffold( + backgroundColor: AppColors.bgScaffoldColor, + body: Column( + children: [ + Expanded( + child: CollapsingListView( + title: LocaleKeys.deliveryLocation.tr(context: context), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox(height: 16.h), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.r, + hasShadow: true, + ), + child: Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + LocaleKeys.orderSummary.tr(context: context).toText16(isBold: true), + SizedBox(height: 16.h), + ...List.generate( + prescriptionsViewModel.prescriptionDetailsList.length, + (index) => Container( + margin: EdgeInsets.all(0.0), + child: Row( + children: [ + ClipRRect( + borderRadius: BorderRadius.all( + Radius.circular(5.r), + ), + child: Image.network( + prescriptionsViewModel.prescriptionDetailsList[index].imageSRCUrl!, + fit: BoxFit.cover, + width: 60.w, + height: 70.h, + ), + ), + SizedBox( + width: 10.w, + ), + Expanded( + child: Padding( + padding: EdgeInsets.all(8.h), + child: Center( + child: prescriptionsViewModel.prescriptionDetailsList[index].itemDescription!.toText12(), + ), + ), + ), + ], + ), + )) + ], + ), + ), + ), + ], + ).paddingSymmetrical(24.w, 0), + ), + ), + Container() + ], + ), + ); + } +} diff --git a/lib/presentation/prescriptions/prescriptions_list_page.dart b/lib/presentation/prescriptions/prescriptions_list_page.dart index 58c5206..bf89090 100644 --- a/lib/presentation/prescriptions/prescriptions_list_page.dart +++ b/lib/presentation/prescriptions/prescriptions_list_page.dart @@ -6,6 +6,7 @@ import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/dependencies.dart'; +import 'package:hmg_patient_app_new/core/location_util.dart'; import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; @@ -18,6 +19,8 @@ import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; import 'package:hmg_patient_app_new/presentation/prescriptions/prescription_detail_page.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; +import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; +import 'package:hmg_patient_app_new/widgets/map/map_utility_screen.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; import 'package:hmg_patient_app_new/widgets/shimmer/common_shimmer_widget.dart'; import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart'; @@ -237,16 +240,26 @@ class _PrescriptionsListPageState extends State { text: prescription.isHomeMedicineDeliverySupported! ? LocaleKeys.resendOrder.tr(context: context) : LocaleKeys.prescriptionDeliveryError.tr(context: context), - onPressed: () {}, - backgroundColor: prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor.withOpacity(0.15) : AppColors.greyF7Color, - borderColor: AppColors.successColor.withOpacity(0.01), - textColor: prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor : AppColors.textColor.withOpacity(0.35), - fontSize: prescription.isHomeMedicineDeliverySupported! ? 14 : 12, - fontWeight: FontWeight.w500, - borderRadius: 12, - padding: EdgeInsets.fromLTRB(10, 0, 10, 0), - height: 40.h, - icon: AppAssets.prescription_refill_icon, + onPressed: () async { + if (prescription.isHomeMedicineDeliverySupported!) { + LoaderBottomSheet.showLoader(loadingText: "Fetching prescription details...".needTranslation); + await prescriptionsViewModel.getPrescriptionDetails(prescriptionsViewModel.patientPrescriptionOrders[index], + onSuccess: (val) { + LoaderBottomSheet.hideLoader(); + prescriptionsViewModel.initiatePrescriptionDelivery(); + }); + } + }, + backgroundColor: + prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor.withOpacity(0.15) : AppColors.greyF7Color, + borderColor: AppColors.successColor.withOpacity(0.01), + textColor: prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor : AppColors.textColor.withOpacity(0.35), + fontSize: prescription.isHomeMedicineDeliverySupported! ? 14 : 12, + fontWeight: FontWeight.w500, + borderRadius: 12, + padding: EdgeInsets.fromLTRB(10, 0, 10, 0), + height: 40.h, + icon: AppAssets.prescription_refill_icon, iconColor: prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor : AppColors.textColor.withOpacity(0.35), iconSize: 14.h, ), diff --git a/lib/widgets/map/map_utility_screen.dart b/lib/widgets/map/map_utility_screen.dart index 87c99fc..3982180 100644 --- a/lib/widgets/map/map_utility_screen.dart +++ b/lib/widgets/map/map_utility_screen.dart @@ -146,6 +146,7 @@ class MapUtilityScreen extends StatelessWidget { spacing: 24.h, children: [ Column( + crossAxisAlignment: CrossAxisAlignment.start, spacing: 4.h, children: [ titleString.toText21( From bad76059c0acb701faf976c45a56c0554bdee1db Mon Sep 17 00:00:00 2001 From: Haroon Amjad <> Date: Sun, 23 Nov 2025 20:46:58 +0300 Subject: [PATCH 06/22] prescription delivery implementation contd. --- .../prescriptions/prescriptions_repo.dart | 51 +++++- .../prescriptions_view_model.dart | 27 ++++ ...scription_delivery_order_summary_page.dart | 150 ++++++++++++++---- 3 files changed, 194 insertions(+), 34 deletions(-) diff --git a/lib/features/prescriptions/prescriptions_repo.dart b/lib/features/prescriptions/prescriptions_repo.dart index 2e3f1aa..1fe8475 100644 --- a/lib/features/prescriptions/prescriptions_repo.dart +++ b/lib/features/prescriptions/prescriptions_repo.dart @@ -15,7 +15,11 @@ abstract class PrescriptionsRepo { Future>> getPrescriptionInstructionsPDF({required PatientPrescriptionsResponseModel prescriptionsResponseModel}); - Future>> getPrescriptionPDF({required PatientPrescriptionsResponseModel prescriptionsResponseModel, required List prescriptionDetailsList}); + Future>> getPrescriptionPDF( + {required PatientPrescriptionsResponseModel prescriptionsResponseModel, required List prescriptionDetailsList}); + + Future>> submitPrescriptionDeliveryRequest( + {required String latitude, required String longitude, required String appointmentNo, required String dischargeID, required String projectID}); } class PrescriptionsRepoImp implements PrescriptionsRepo { @@ -158,7 +162,8 @@ class PrescriptionsRepoImp implements PrescriptionsRepo { } @override - Future> getPrescriptionPDF({required PatientPrescriptionsResponseModel prescriptionsResponseModel, required List prescriptionDetailsList}) async { + Future> getPrescriptionPDF( + {required PatientPrescriptionsResponseModel prescriptionsResponseModel, required List prescriptionDetailsList}) async { Map mapDevice = { "AppointmentDate": prescriptionsResponseModel.appointmentDate, "ClinicName": prescriptionsResponseModel.clinicDescription, @@ -206,4 +211,46 @@ class PrescriptionsRepoImp implements PrescriptionsRepo { return Left(UnknownFailure(e.toString())); } } + + @override + Future> submitPrescriptionDeliveryRequest( + {required String latitude, required String longitude, required String appointmentNo, required String dischargeID, required String projectID}) async { + Map mapDevice = { + "latitude": latitude, + "longitude": longitude, + "AppointmentNo": appointmentNo, + "DischargeID": dischargeID, + "ProjectID": projectID, + }; + + try { + GenericApiModel? apiResponse; + Failure? failure; + await apiClient.post( + isRCService: true, + ADD_PRESCRIPTION_ORDER_RC, + body: mapDevice, + onFailure: (error, statusCode, {messageStatus, failureType}) { + failure = failureType; + }, + onSuccess: (response, statusCode, {messageStatus, errorMessage}) { + try { + apiResponse = GenericApiModel( + messageStatus: messageStatus, + statusCode: statusCode, + errorMessage: null, + data: response, + ); + } catch (e) { + failure = DataParsingFailure(e.toString()); + } + }, + ); + if (failure != null) return Left(failure!); + if (apiResponse == null) return Left(ServerFailure("Unknown error")); + return Right(apiResponse!); + } catch (e) { + return Left(UnknownFailure(e.toString())); + } + } } diff --git a/lib/features/prescriptions/prescriptions_view_model.dart b/lib/features/prescriptions/prescriptions_view_model.dart index 8f3836c..ca31829 100644 --- a/lib/features/prescriptions/prescriptions_view_model.dart +++ b/lib/features/prescriptions/prescriptions_view_model.dart @@ -191,6 +191,33 @@ class PrescriptionsViewModel extends ChangeNotifier { ); } + Future submitPrescriptionDeliveryRequest( + {required String latitude, + required String longitude, + required String appointmentNo, + required String dischargeID, + required String projectID, + Function(dynamic)? onSuccess, + Function(String)? onError}) async { + final result = await prescriptionsRepo.submitPrescriptionDeliveryRequest(latitude: latitude, longitude: longitude, appointmentNo: appointmentNo, dischargeID: dischargeID, projectID: projectID); + + result.fold( + (failure) async { + onError!(failure.message); + }, + (apiResponse) { + if (apiResponse.messageStatus == 2) { + onError!(apiResponse.errorMessage!); + } else if (apiResponse.messageStatus == 1) { + notifyListeners(); + if (onSuccess != null) { + onSuccess(apiResponse); + } + } + }, + ); + } + void initiatePrescriptionDelivery() async { getIt.get().getLocation( isShowConfirmDialog: true, diff --git a/lib/presentation/prescriptions/prescription_delivery_order_summary_page.dart b/lib/presentation/prescriptions/prescription_delivery_order_summary_page.dart index bd2cf77..0bedbe2 100644 --- a/lib/presentation/prescriptions/prescription_delivery_order_summary_page.dart +++ b/lib/presentation/prescriptions/prescription_delivery_order_summary_page.dart @@ -1,12 +1,17 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_view_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; +import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; +import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; +import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; import 'package:provider/provider.dart'; class PrescriptionDeliveryOrderSummaryPage extends StatelessWidget { @@ -23,7 +28,7 @@ class PrescriptionDeliveryOrderSummaryPage extends StatelessWidget { children: [ Expanded( child: CollapsingListView( - title: LocaleKeys.deliveryLocation.tr(context: context), + title: LocaleKeys.orderSummary.tr(context: context), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -39,39 +44,63 @@ class PrescriptionDeliveryOrderSummaryPage extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - LocaleKeys.orderSummary.tr(context: context).toText16(isBold: true), + LocaleKeys.orderDetail.tr(context: context).toText16(isBold: true), SizedBox(height: 16.h), ...List.generate( - prescriptionsViewModel.prescriptionDetailsList.length, - (index) => Container( - margin: EdgeInsets.all(0.0), - child: Row( - children: [ - ClipRRect( - borderRadius: BorderRadius.all( - Radius.circular(5.r), - ), - child: Image.network( - prescriptionsViewModel.prescriptionDetailsList[index].imageSRCUrl!, - fit: BoxFit.cover, - width: 60.w, - height: 70.h, - ), - ), - SizedBox( - width: 10.w, - ), - Expanded( - child: Padding( - padding: EdgeInsets.all(8.h), - child: Center( - child: prescriptionsViewModel.prescriptionDetailsList[index].itemDescription!.toText12(), - ), - ), - ), - ], + prescriptionsViewModel.prescriptionDetailsList.length, + (index) => Container( + margin: EdgeInsets.all(0.0), + child: Row( + children: [ + ClipRRect( + borderRadius: BorderRadius.all( + Radius.circular(5.r), ), - )) + child: Image.network( + prescriptionsViewModel.prescriptionDetailsList[index].imageSRCUrl!, + fit: BoxFit.cover, + width: 60.w, + height: 70.h, + ), + ), + Expanded( + child: Padding( + padding: EdgeInsets.all(8.h), + child: Center( + child: prescriptionsViewModel.prescriptionDetailsList[index].itemDescription!.trim().toText12(), + ), + ), + ), + ], + ), + ), + ), + ], + ), + ), + ), + SizedBox(height: 16.h), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.r, + hasShadow: true, + ), + child: Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + LocaleKeys.deliveryLocation.tr(context: context).toText16(isBold: true), + SizedBox(height: 16.h), + ClipRRect( + clipBehavior: Clip.hardEdge, + borderRadius: BorderRadius.circular(20.r), + child: Image.network( + "https://maps.googleapis.com/maps/api/staticmap?center=${prescriptionsViewModel.locationGeocodeResponse.results.first.geometry.location.lat},${prescriptionsViewModel.locationGeocodeResponse.results.first.geometry.location.lng}&zoom=15&size=350x165&maptype=roadmap&markers=color:red%7C${prescriptionsViewModel.locationGeocodeResponse.results.first.geometry.location.lat},${prescriptionsViewModel.locationGeocodeResponse.results.first.geometry.location.lng}&key=AIzaSyB6TERnxIr0yJ3qG4ULBZbu0sAD4tGqtng", + fit: BoxFit.contain, + ), + ), ], ), ), @@ -80,7 +109,64 @@ class PrescriptionDeliveryOrderSummaryPage extends StatelessWidget { ).paddingSymmetrical(24.w, 0), ), ), - Container() + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 24.h, + hasShadow: true, + ), + child: CustomButton( + text: LocaleKeys.submit.tr(context: context), + onPressed: () async { + LoaderBottomSheet.showLoader(loadingText: "Submitting your request..."); + await prescriptionsViewModel.submitPrescriptionDeliveryRequest( + latitude: prescriptionsViewModel.locationGeocodeResponse.results.first.geometry.location.lat.toString(), + longitude: prescriptionsViewModel.locationGeocodeResponse.results.first.geometry.location.lng.toString(), + appointmentNo: prescriptionsViewModel.prescriptionDetailsList.first.appointmentNo.toString(), + dischargeID: "0", + projectID: prescriptionsViewModel.prescriptionDetailsList.first.projectID.toString(), + onSuccess: (val) { + LoaderBottomSheet.hideLoader(); + showCommonBottomSheetWithoutHeight( + context, + child: Utils.getSuccessWidget(loadingText: "Request sent successfully.".needTranslation), + callBackFunc: () { + Navigator.of(context).pop(); + }, + title: "", + isCloseButtonVisible: true, + isDismissible: false, + isFullScreen: false, + ); + }, + onError: (err) { + LoaderBottomSheet.hideLoader(); + showCommonBottomSheetWithoutHeight( + context, + child: Utils.getErrorWidget(loadingText: err), + callBackFunc: () { + Navigator.of(context).pop(); + }, + title: "", + isCloseButtonVisible: true, + isDismissible: false, + isFullScreen: false, + ); + }); + }, + backgroundColor: AppColors.successColor, + borderColor: AppColors.successColor.withOpacity(0.01), + textColor: AppColors.whiteColor, + fontSize: 16.f, + fontWeight: FontWeight.w500, + borderRadius: 12.r, + padding: EdgeInsets.fromLTRB(10, 0, 10, 0), + height: 50.h, + icon: AppAssets.prescription_refill_icon, + iconColor: AppColors.whiteColor, + iconSize: 20.h, + ).paddingSymmetrical(24.h, 24.h), + ), ], ), ); From 9fd7f71a3429dae9f89592e9119e78562f2b3ba5 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 24 Nov 2025 17:22:09 +0300 Subject: [PATCH 07/22] prescription delivery implementation contd --- .../prescription_delivery_response_model.dart | 318 ++++++++++++++++++ .../prescriptions/prescriptions_repo.dart | 37 ++ .../prescriptions_view_model.dart | 34 ++ .../appointment_details_page.dart | 4 +- .../widgets/appointment_card.dart | 49 +-- .../book_appointment/widgets/doctor_card.dart | 2 +- .../home/data/landing_page_data.dart | 12 +- lib/presentation/home/landing_page.dart | 20 +- ...rescription_delivery_orders_list_page.dart | 258 ++++++++++++++ .../prescriptions_list_page.dart | 9 + lib/widgets/appbar/collapsing_list_view.dart | 4 +- 11 files changed, 706 insertions(+), 41 deletions(-) create mode 100644 lib/features/prescriptions/models/resp_models/prescription_delivery_response_model.dart create mode 100644 lib/presentation/prescriptions/prescription_delivery_orders_list_page.dart diff --git a/lib/features/prescriptions/models/resp_models/prescription_delivery_response_model.dart b/lib/features/prescriptions/models/resp_models/prescription_delivery_response_model.dart new file mode 100644 index 0000000..c221e90 --- /dev/null +++ b/lib/features/prescriptions/models/resp_models/prescription_delivery_response_model.dart @@ -0,0 +1,318 @@ +class PrescriptionDeliveryResponseModel { + int? iD; + int? patientId; + int? patientOutSa; + bool? isOutPatient; + int? projectId; + int? nearestProjectId; + dynamic longitude; + dynamic latitude; + dynamic appointmentNo; + dynamic dischargeId; + int? statusId; + int? serviceId; + int? channel; + Orderpayment? orderpayment; + dynamic orderselectedservice; + dynamic wforder; + dynamic orderapprovalobj; + String? created; + dynamic createdBy; + dynamic modified; + dynamic modifiedBy; + bool? isDeleted; + String? statusText; + int? paymentStatus; + dynamic clientRequestid; + dynamic paymentStatusText; + String? projectName; + String? nearestProjectName; + dynamic paymentAmount; + WFOrder? wFOrder; + String? serviceText; + bool? isSentForApproval; + int? exaCartOrderId; + bool? isTimer; + int? timeSeconds; + int? totalPendingSeconds; + int? timeMinute; + int? timeHour; + int? timeTotalSeconds; + int? timeTotalMinute; + int? timeTotalHour; + dynamic approvalStatus; + bool? isActive; + int? clickButton; + List? procedures; + dynamic pickupLocation; + dynamic dropOffLocation; + dynamic clinicName; + dynamic doctorName; + dynamic branch; + dynamic time; + dynamic notes; + + PrescriptionDeliveryResponseModel( + {this.iD, + this.patientId, + this.patientOutSa, + this.isOutPatient, + this.projectId, + this.nearestProjectId, + this.longitude, + this.latitude, + this.appointmentNo, + this.dischargeId, + this.statusId, + this.serviceId, + this.channel, + this.orderpayment, + this.orderselectedservice, + this.wforder, + this.orderapprovalobj, + this.created, + this.createdBy, + this.modified, + this.modifiedBy, + this.isDeleted, + this.statusText, + this.paymentStatus, + this.clientRequestid, + this.paymentStatusText, + this.projectName, + this.nearestProjectName, + this.paymentAmount, + this.wFOrder, + this.serviceText, + this.isSentForApproval, + this.exaCartOrderId, + this.isTimer, + this.timeSeconds, + this.totalPendingSeconds, + this.timeMinute, + this.timeHour, + this.timeTotalSeconds, + this.timeTotalMinute, + this.timeTotalHour, + this.approvalStatus, + this.isActive, + this.clickButton, + this.procedures, + this.pickupLocation, + this.dropOffLocation, + this.clinicName, + this.doctorName, + this.branch, + this.time, + this.notes}); + + PrescriptionDeliveryResponseModel.fromJson(Map json) { + iD = json['ID']; + patientId = json['PatientId']; + patientOutSa = json['PatientOutSa']; + isOutPatient = json['IsOutPatient']; + projectId = json['ProjectId']; + nearestProjectId = json['NearestProjectId']; + longitude = json['Longitude']; + latitude = json['Latitude']; + appointmentNo = json['AppointmentNo']; + dischargeId = json['DischargeId']; + statusId = json['StatusId']; + serviceId = json['ServiceId']; + channel = json['Channel']; + orderpayment = json['orderpayment'] != null ? new Orderpayment.fromJson(json['orderpayment']) : null; + orderselectedservice = json['orderselectedservice']; + wforder = json['wforder']; + orderapprovalobj = json['orderapprovalobj']; + created = json['Created']; + createdBy = json['CreatedBy']; + modified = json['Modified']; + modifiedBy = json['ModifiedBy']; + isDeleted = json['IsDeleted']; + statusText = json['StatusText']; + paymentStatus = json['PaymentStatus']; + clientRequestid = json['ClientRequestid']; + paymentStatusText = json['PaymentStatusText']; + projectName = json['ProjectName']; + nearestProjectName = json['NearestProjectName']; + paymentAmount = json['PaymentAmount']; + wFOrder = json['WF_order'] != null ? new WFOrder.fromJson(json['WF_order']) : null; + serviceText = json['ServiceText']; + isSentForApproval = json['isSentForApproval']; + exaCartOrderId = json['ExaCart_OrderId']; + isTimer = json['isTimer']; + timeSeconds = json['TimeSeconds']; + totalPendingSeconds = json['TotalPendingSeconds']; + timeMinute = json['TimeMinute']; + timeHour = json['TimeHour']; + timeTotalSeconds = json['TimeTotalSeconds']; + timeTotalMinute = json['TimeTotalMinute']; + timeTotalHour = json['TimeTotalHour']; + approvalStatus = json['ApprovalStatus']; + isActive = json['isActive']; + clickButton = json['ClickButton']; + pickupLocation = json['PickupLocation']; + dropOffLocation = json['DropOffLocation']; + clinicName = json['clinicName']; + doctorName = json['DoctorName']; + branch = json['Branch']; + time = json['Time']; + notes = json['Notes']; + } + + Map toJson() { + final Map data = new Map(); + data['ID'] = this.iD; + data['PatientId'] = this.patientId; + data['PatientOutSa'] = this.patientOutSa; + data['IsOutPatient'] = this.isOutPatient; + data['ProjectId'] = this.projectId; + data['NearestProjectId'] = this.nearestProjectId; + data['Longitude'] = this.longitude; + data['Latitude'] = this.latitude; + data['AppointmentNo'] = this.appointmentNo; + data['DischargeId'] = this.dischargeId; + data['StatusId'] = this.statusId; + data['ServiceId'] = this.serviceId; + data['Channel'] = this.channel; + if (this.orderpayment != null) { + data['orderpayment'] = this.orderpayment!.toJson(); + } + data['orderselectedservice'] = this.orderselectedservice; + + data['wforder'] = this.wforder; + data['orderapprovalobj'] = this.orderapprovalobj; + data['Created'] = this.created; + data['CreatedBy'] = this.createdBy; + data['Modified'] = this.modified; + data['ModifiedBy'] = this.modifiedBy; + data['IsDeleted'] = this.isDeleted; + data['StatusText'] = this.statusText; + data['PaymentStatus'] = this.paymentStatus; + data['ClientRequestid'] = this.clientRequestid; + data['PaymentStatusText'] = this.paymentStatusText; + data['ProjectName'] = this.projectName; + data['NearestProjectName'] = this.nearestProjectName; + data['PaymentAmount'] = this.paymentAmount; + if (this.wFOrder != null) { + data['WF_order'] = this.wFOrder!.toJson(); + } + data['ServiceText'] = this.serviceText; + data['isSentForApproval'] = this.isSentForApproval; + data['ExaCart_OrderId'] = this.exaCartOrderId; + data['isTimer'] = this.isTimer; + data['TimeSeconds'] = this.timeSeconds; + data['TotalPendingSeconds'] = this.totalPendingSeconds; + data['TimeMinute'] = this.timeMinute; + data['TimeHour'] = this.timeHour; + data['TimeTotalSeconds'] = this.timeTotalSeconds; + data['TimeTotalMinute'] = this.timeTotalMinute; + data['TimeTotalHour'] = this.timeTotalHour; + data['ApprovalStatus'] = this.approvalStatus; + data['isActive'] = this.isActive; + data['ClickButton'] = this.clickButton; + data['PickupLocation'] = this.pickupLocation; + data['DropOffLocation'] = this.dropOffLocation; + data['clinicName'] = this.clinicName; + data['DoctorName'] = this.doctorName; + data['Branch'] = this.branch; + data['Time'] = this.time; + data['Notes'] = this.notes; + return data; + } +} + +class Orderpayment { + int? iD; + int? orderId; + dynamic clientRequestId; + dynamic totalAmount; + int? paymentStatus; + dynamic order; + String? created; + dynamic createdBy; + dynamic modified; + dynamic modifiedBy; + bool? isDeleted; + + Orderpayment({this.iD, this.orderId, this.clientRequestId, this.totalAmount, this.paymentStatus, this.order, this.created, this.createdBy, this.modified, this.modifiedBy, this.isDeleted}); + + Orderpayment.fromJson(Map json) { + iD = json['ID']; + orderId = json['OrderId']; + clientRequestId = json['ClientRequestId']; + totalAmount = json['TotalAmount']; + paymentStatus = json['PaymentStatus']; + order = json['Order']; + created = json['Created']; + createdBy = json['CreatedBy']; + modified = json['Modified']; + modifiedBy = json['ModifiedBy']; + isDeleted = json['IsDeleted']; + } + + Map toJson() { + final Map data = new Map(); + data['ID'] = this.iD; + data['OrderId'] = this.orderId; + data['ClientRequestId'] = this.clientRequestId; + data['TotalAmount'] = this.totalAmount; + data['PaymentStatus'] = this.paymentStatus; + data['Order'] = this.order; + data['Created'] = this.created; + data['CreatedBy'] = this.createdBy; + data['Modified'] = this.modified; + data['ModifiedBy'] = this.modifiedBy; + data['IsDeleted'] = this.isDeleted; + return data; + } +} + +class WFOrder { + dynamic wfButtonsDTO; + int? iD; + int? orderId; + int? previousStep; + int? nextStep; + int? serviceId; + dynamic order; + String? created; + dynamic createdBy; + dynamic modified; + dynamic modifiedBy; + bool? isDeleted; + + WFOrder({this.wfButtonsDTO, this.iD, this.orderId, this.previousStep, this.nextStep, this.serviceId, this.order, this.created, this.createdBy, this.modified, this.modifiedBy, this.isDeleted}); + + WFOrder.fromJson(Map json) { + wfButtonsDTO = json['wf_ButtonsDTO']; + iD = json['ID']; + orderId = json['OrderId']; + previousStep = json['PreviousStep']; + nextStep = json['NextStep']; + serviceId = json['ServiceId']; + order = json['Order']; + created = json['Created']; + createdBy = json['CreatedBy']; + modified = json['Modified']; + modifiedBy = json['ModifiedBy']; + isDeleted = json['IsDeleted']; + } + + Map toJson() { + final Map data = new Map(); + data['wf_ButtonsDTO'] = this.wfButtonsDTO; + data['ID'] = this.iD; + data['OrderId'] = this.orderId; + data['PreviousStep'] = this.previousStep; + data['NextStep'] = this.nextStep; + data['ServiceId'] = this.serviceId; + data['Order'] = this.order; + data['Created'] = this.created; + data['CreatedBy'] = this.createdBy; + data['Modified'] = this.modified; + data['ModifiedBy'] = this.modifiedBy; + data['IsDeleted'] = this.isDeleted; + return data; + } +} diff --git a/lib/features/prescriptions/prescriptions_repo.dart b/lib/features/prescriptions/prescriptions_repo.dart index 1fe8475..f35c705 100644 --- a/lib/features/prescriptions/prescriptions_repo.dart +++ b/lib/features/prescriptions/prescriptions_repo.dart @@ -20,6 +20,8 @@ abstract class PrescriptionsRepo { Future>> submitPrescriptionDeliveryRequest( {required String latitude, required String longitude, required String appointmentNo, required String dischargeID, required String projectID}); + + Future>> getPrescriptionOrdersList(); } class PrescriptionsRepoImp implements PrescriptionsRepo { @@ -253,4 +255,39 @@ class PrescriptionsRepoImp implements PrescriptionsRepo { return Left(UnknownFailure(e.toString())); } } + + @override + Future> getPrescriptionOrdersList() async { + Map mapDevice = {}; + + try { + GenericApiModel? apiResponse; + Failure? failure; + await apiClient.post( + isRCService: true, + GET_ALL_PRESCRIPTION_ORDERS_RC, + body: mapDevice, + onFailure: (error, statusCode, {messageStatus, failureType}) { + failure = failureType; + }, + onSuccess: (response, statusCode, {messageStatus, errorMessage}) { + try { + apiResponse = GenericApiModel( + messageStatus: messageStatus, + statusCode: statusCode, + errorMessage: null, + data: response, + ); + } catch (e) { + failure = DataParsingFailure(e.toString()); + } + }, + ); + if (failure != null) return Left(failure!); + if (apiResponse == null) return Left(ServerFailure("Unknown error")); + return Right(apiResponse!); + } catch (e) { + return Left(UnknownFailure(e.toString())); + } + } } diff --git a/lib/features/prescriptions/prescriptions_view_model.dart b/lib/features/prescriptions/prescriptions_view_model.dart index ca31829..186ecc8 100644 --- a/lib/features/prescriptions/prescriptions_view_model.dart +++ b/lib/features/prescriptions/prescriptions_view_model.dart @@ -9,6 +9,7 @@ import 'package:hmg_patient_app_new/features/location/PlaceDetails.dart'; import 'package:hmg_patient_app_new/features/location/PlacePrediction.dart'; import 'package:hmg_patient_app_new/features/location/location_view_model.dart'; import 'package:hmg_patient_app_new/features/prescriptions/models/resp_models/patient_prescriptions_response_model.dart'; +import 'package:hmg_patient_app_new/features/prescriptions/models/resp_models/prescription_delivery_response_model.dart'; import 'package:hmg_patient_app_new/features/prescriptions/models/resp_models/prescription_detail_response_model.dart'; import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_repo.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; @@ -44,6 +45,9 @@ class PrescriptionsViewModel extends ChangeNotifier { late GeocodeResponse locationGeocodeResponse; + bool isPrescriptionsDeliveryOrdersLoading = false; + List prescriptionsOrderList = []; + PrescriptionsViewModel({required this.prescriptionsRepo, required this.errorHandlerService, required this.navServices}); initPrescriptionsViewModel() { @@ -51,8 +55,10 @@ class PrescriptionsViewModel extends ChangeNotifier { patientPrescriptionOrdersByClinic.clear(); patientPrescriptionOrdersByHospital.clear(); patientPrescriptionOrdersViewList.clear(); + prescriptionsOrderList.clear(); isPrescriptionsOrdersLoading = true; isSortByClinic = true; + isPrescriptionsDeliveryOrdersLoading = true; getPatientPrescriptionOrders(); notifyListeners(); } @@ -244,4 +250,32 @@ class PrescriptionsViewModel extends ChangeNotifier { } }); } + + Future getPrescriptionOrdersList({Function(dynamic)? onSuccess, Function(String)? onError}) async { + prescriptionsOrderList.clear(); + notifyListeners(); + + final result = await prescriptionsRepo.getPrescriptionOrdersList(); + + result.fold( + (failure) async { + isPrescriptionsDeliveryOrdersLoading = false; + notifyListeners(); + onError!(failure.message); + }, + (apiResponse) { + if (apiResponse.messageStatus == 2) { + isPrescriptionsDeliveryOrdersLoading = false; + notifyListeners(); + onError!(apiResponse.errorMessage!); + } else if (apiResponse.messageStatus == 1) { + isPrescriptionsDeliveryOrdersLoading = false; + notifyListeners(); + if (onSuccess != null) { + onSuccess(apiResponse); + } + } + }, + ); + } } diff --git a/lib/presentation/appointments/appointment_details_page.dart b/lib/presentation/appointments/appointment_details_page.dart index e620783..0a1eaf2 100644 --- a/lib/presentation/appointments/appointment_details_page.dart +++ b/lib/presentation/appointments/appointment_details_page.dart @@ -695,8 +695,8 @@ class _AppointmentDetailsPageState extends State { onPressed: () { openDoctorScheduleCalendar(); }, - backgroundColor: AppColors.primaryRedColor, - borderColor: AppColors.primaryRedColor, + backgroundColor: AppColors.successColor, + borderColor: AppColors.successColor, textColor: AppColors.whiteColor, fontSize: 16.f, fontWeight: FontWeight.w500, diff --git a/lib/presentation/appointments/widgets/appointment_card.dart b/lib/presentation/appointments/widgets/appointment_card.dart index 3cf56a6..e301fbf 100644 --- a/lib/presentation/appointments/widgets/appointment_card.dart +++ b/lib/presentation/appointments/widgets/appointment_card.dart @@ -123,14 +123,22 @@ class AppointmentCard extends StatelessWidget { return Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Image.network( - isLoading - ? 'https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png' - : patientAppointmentHistoryResponseModel.doctorImageURL!, - width: 63.h, - height: 63.h, - fit: BoxFit.cover, - ).circle(100).toShimmer2(isShow: isLoading), + Column( + children: [ + Image.network( + isLoading ? 'https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png' : patientAppointmentHistoryResponseModel.doctorImageURL!, + width: 63.h, + height: 63.h, + fit: BoxFit.cover, + ).circle(100).toShimmer2(isShow: isLoading), + SizedBox(height: 12.h), + AppCustomChipWidget( + icon: AppAssets.rating_icon, + iconColor: AppColors.ratingColorYellow, + labelText: isLoading ? "Rating" : "Rating: ${patientAppointmentHistoryResponseModel.decimalDoctorRate}".needTranslation) + .toShimmer2(isShow: isLoading), + ], + ), SizedBox(width: 16.h), Expanded( child: Column( @@ -147,26 +155,29 @@ class AppointmentCard extends StatelessWidget { spacing: 3.h, runSpacing: 4.h, children: [ - if (!isFromHomePage) AppCustomChipWidget(labelText: isLoading ? 'Cardiology' : patientAppointmentHistoryResponseModel.clinicName!) .toShimmer2(isShow: isLoading), - if (!isFromHomePage) AppCustomChipWidget(labelText: isLoading ? 'Olaya' : patientAppointmentHistoryResponseModel.projectName!) .toShimmer2(isShow: isLoading), AppCustomChipWidget( icon: AppAssets.appointment_calendar_icon, labelText: isLoading ? 'Cardiology' - : DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false), + : "${DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false)} ${DateUtil.formatDateToTimeLang(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false)}", ).toShimmer2(isShow: isLoading), - if (!isFromMedicalReport) - AppCustomChipWidget( - icon: AppAssets.appointment_time_icon, - labelText: isLoading - ? 'Cardiology' - : DateUtil.formatDateToTimeLang( - DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false), - ).toShimmer2(isShow: isLoading), + // if (!isFromMedicalReport) + // AppCustomChipWidget( + // icon: AppAssets.appointment_time_icon, + // labelText: isLoading + // ? 'Cardiology' + // : DateUtil.formatDateToTimeLang( + // DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false), + // ).toShimmer2(isShow: isLoading), + // AppCustomChipWidget( + // icon: AppAssets.rating_icon, + // iconColor: AppColors.ratingColorYellow, + // labelText: isLoading ? "Rating" : "Rating: ${patientAppointmentHistoryResponseModel.decimalDoctorRate}".needTranslation) + // .toShimmer2(isShow: isLoading), ], ), ], diff --git a/lib/presentation/book_appointment/widgets/doctor_card.dart b/lib/presentation/book_appointment/widgets/doctor_card.dart index 20b7615..7257dbf 100644 --- a/lib/presentation/book_appointment/widgets/doctor_card.dart +++ b/lib/presentation/book_appointment/widgets/doctor_card.dart @@ -50,7 +50,7 @@ class DoctorCard extends StatelessWidget { : doctorsListResponseModel.doctorImageURL ?? "https://hmgwebservices.com/Images/MobileImages/OALAY/1439.png", width: 63.h, height: 63.h, - fit: BoxFit.fill, + fit: BoxFit.cover, ).circle(100).toShimmer2(isShow: isLoading), SizedBox(width: 8.h), Expanded( diff --git a/lib/presentation/home/data/landing_page_data.dart b/lib/presentation/home/data/landing_page_data.dart index 31b4598..3d74cfd 100644 --- a/lib/presentation/home/data/landing_page_data.dart +++ b/lib/presentation/home/data/landing_page_data.dart @@ -81,7 +81,7 @@ class LandingPageData { ServiceCardData( serviceName: "lab_results", icon: AppAssets.home_lab_result_icon, - title: "My Lab", + title: "Lab", subtitle: "Results", backgroundColor: AppColors.whiteColor, iconColor: AppColors.blackColor, @@ -91,7 +91,7 @@ class LandingPageData { ServiceCardData( serviceName: "radiology_results", icon: AppAssets.home_lab_result_icon, - title: "My Radiology", + title: "Radiology", subtitle: "Results", backgroundColor: AppColors.whiteColor, iconColor: AppColors.blackColor, @@ -101,8 +101,8 @@ class LandingPageData { ServiceCardData( serviceName: "prescriptions", icon: AppAssets.my_prescription_icon, - title: "My", - subtitle: "Prescriptions", + title: "Prescriptions", + subtitle: "Details", backgroundColor: AppColors.whiteColor, iconColor: AppColors.blackColor, textColor: AppColors.blackColor, @@ -112,7 +112,7 @@ class LandingPageData { serviceName: "insurance_update", icon: AppAssets.insurance_update_icon, title: "Insurance", - subtitle: "Update", + subtitle: "Details", backgroundColor: AppColors.whiteColor, iconColor: AppColors.blackColor, textColor: AppColors.blackColor, @@ -131,7 +131,7 @@ class LandingPageData { ServiceCardData( serviceName: "sick_leaves", icon: AppAssets.insurance_update_icon, - title: "My Sick", + title: "Sick", subtitle: "Leaves", backgroundColor: AppColors.whiteColor, iconColor: AppColors.blackColor, diff --git a/lib/presentation/home/landing_page.dart b/lib/presentation/home/landing_page.dart index 1007547..ce2e514 100644 --- a/lib/presentation/home/landing_page.dart +++ b/lib/presentation/home/landing_page.dart @@ -161,12 +161,12 @@ class _LandingPageState extends State { ); }), Utils.buildSvgWithAssets(icon: AppAssets.search_icon, height: 18.h, width: 18.h).onPress(() { - Navigator.of(context).push( - CustomPageRoute( - page: MedicalFilePage(), - // page: LoginScreen(), - ), - ); + // Navigator.of(context).push( + // CustomPageRoute( + // page: MedicalFilePage(), + // // page: LoginScreen(), + // ), + // ); }), Utils.buildSvgWithAssets(icon: AppAssets.contact_icon, height: 18.h, width: 18.h).onPress(() { showCommonBottomSheetWithoutHeight( @@ -246,10 +246,10 @@ class _LandingPageState extends State { indicatorLayout: PageIndicatorLayout.COLOR, axisDirection: AxisDirection.right, controller: _controller, - itemHeight: 200.h, - pagination: const SwiperPagination( + itemHeight: 270.h, + pagination: SwiperPagination( alignment: Alignment.bottomCenter, - margin: EdgeInsets.only(top: 210 + 8 + 24), + margin: EdgeInsets.only(top: 250.h + 8 + 24), builder: DotSwiperPaginationBuilder(color: Color(0xffD9D9D9), activeColor: AppColors.blackBgColor), ), itemBuilder: (BuildContext context, int index) { @@ -304,7 +304,6 @@ class _LandingPageState extends State { ).paddingSymmetrical(24.h, 0.h); }, ), - // Consumer for LiveCare pending request Consumer( builder: (context, immediateLiveCareVM, child) { @@ -422,7 +421,6 @@ class _LandingPageState extends State { : SizedBox(height: 12.h); }, ), - Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ diff --git a/lib/presentation/prescriptions/prescription_delivery_orders_list_page.dart b/lib/presentation/prescriptions/prescription_delivery_orders_list_page.dart new file mode 100644 index 0000000..a2bfa8e --- /dev/null +++ b/lib/presentation/prescriptions/prescription_delivery_orders_list_page.dart @@ -0,0 +1,258 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; +import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/core/utils/utils.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; +import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_view_model.dart'; +import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; +import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart'; +import 'package:hmg_patient_app_new/theme/colors.dart'; +import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; +import 'package:provider/provider.dart'; + +class PrescriptionDeliveryOrdersListPage extends StatelessWidget { + const PrescriptionDeliveryOrdersListPage({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: AppColors.bgScaffoldColor, + body: CollapsingListView( + title: LocaleKeys.orders.tr(context: context), + child: SingleChildScrollView( + child: Consumer(builder: (context, model, child) { + return Column( + children: [ + ListView.builder( + itemCount: model.isPrescriptionsOrdersLoading + ? 4 + : model.patientPrescriptionOrders.isNotEmpty + ? model.patientPrescriptionOrdersViewList.length + : 1, + physics: NeverScrollableScrollPhysics(), + shrinkWrap: true, + padding: const EdgeInsets.only(left: 0, right: 8), + itemBuilder: (context, index) { + return model.isPrescriptionsDeliveryOrdersLoading + ? LabResultItemView( + onTap: () {}, + labOrder: null, + index: index, + isLoading: true, + ) + : model.prescriptionsOrderList.isNotEmpty + ? AnimationConfiguration.staggeredList( + position: index, + duration: const Duration(milliseconds: 500), + child: SlideAnimation( + verticalOffset: 100.0, + child: FadeInAnimation( + child: AnimatedContainer( + duration: Duration(milliseconds: 300), + curve: Curves.easeInOut, + margin: EdgeInsets.symmetric(vertical: 8.h), + decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 20.h, hasShadow: true), + child: InkWell( + onTap: () { + // setState(() { + // expandedIndex = isExpanded ? null : index; + // }); + }, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + // CustomButton( + // text: "${model.patientPrescriptionOrdersViewList[index].prescriptionsList!.length} Prescriptions Available", + // onPressed: () {}, + // backgroundColor: AppColors.greyColor, + // borderColor: AppColors.greyColor, + // textColor: AppColors.blackColor, + // fontSize: 10, + // fontWeight: FontWeight.w500, + // borderRadius: 8, + // padding: EdgeInsets.fromLTRB(10, 0, 10, 0), + // height: 30.h, + // ), + // Icon(isExpanded ? Icons.expand_less : Icons.expand_more), + ], + ), + SizedBox(height: 8.h), + // model.patientPrescriptionOrdersViewList[index].filterName!.toText16(isBold: true) + ], + ), + ), + // AnimatedSwitcher( + // duration: Duration(milliseconds: 500), + // switchInCurve: Curves.easeIn, + // switchOutCurve: Curves.easeOut, + // transitionBuilder: (Widget child, Animation animation) { + // return FadeTransition( + // opacity: animation, + // child: SizeTransition( + // sizeFactor: animation, + // axisAlignment: 0.0, + // child: child, + // ), + // ); + // }, + // child: isExpanded + // ? Container( + // key: ValueKey(index), + // padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 8.h), + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // ...model.patientPrescriptionOrdersViewList[index].prescriptionsList!.map((prescription) { + // return Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Row( + // mainAxisSize: MainAxisSize.min, + // children: [ + // Image.network( + // prescription.doctorImageURL!, + // width: 24.h, + // height: 24.h, + // fit: BoxFit.fill, + // ).circle(100), + // SizedBox(width: 8.h), + // Expanded(child: prescription.doctorName!.toText14(weight: FontWeight.w500)), + // ], + // ), + // SizedBox(height: 8.h), + // Row( + // children: [ + // CustomButton( + // text: DateUtil.formatDateToDate(DateUtil.convertStringToDate(prescription.appointmentDate), false), + // onPressed: () {}, + // backgroundColor: AppColors.greyColor, + // borderColor: AppColors.greyColor, + // textColor: AppColors.blackColor, + // fontSize: 10, + // fontWeight: FontWeight.w500, + // borderRadius: 8, + // padding: EdgeInsets.fromLTRB(10, 0, 10, 0), + // height: 24.h, + // ), + // SizedBox(width: 8.h), + // CustomButton( + // text: model.isSortByClinic ? prescription.name! : prescription.clinicDescription!, + // onPressed: () {}, + // backgroundColor: AppColors.greyColor, + // borderColor: AppColors.greyColor, + // textColor: AppColors.blackColor, + // fontSize: 10, + // fontWeight: FontWeight.w500, + // borderRadius: 8, + // padding: EdgeInsets.fromLTRB(10, 0, 10, 0), + // height: 24.h, + // ), + // ], + // ), + // SizedBox(height: 8.h), + // Row( + // children: [ + // Expanded( + // flex: 6, + // child: CustomButton( + // text: prescription.isHomeMedicineDeliverySupported! + // ? LocaleKeys.resendOrder.tr(context: context) + // : LocaleKeys.prescriptionDeliveryError.tr(context: context), + // onPressed: () async { + // if (prescription.isHomeMedicineDeliverySupported!) { + // LoaderBottomSheet.showLoader(loadingText: "Fetching prescription details...".needTranslation); + // await prescriptionsViewModel.getPrescriptionDetails(prescriptionsViewModel.patientPrescriptionOrders[index], + // onSuccess: (val) { + // LoaderBottomSheet.hideLoader(); + // prescriptionsViewModel.initiatePrescriptionDelivery(); + // }); + // } + // }, + // backgroundColor: + // prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor.withOpacity(0.15) : AppColors.greyF7Color, + // borderColor: AppColors.successColor.withOpacity(0.01), + // textColor: prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor : AppColors.textColor.withOpacity(0.35), + // fontSize: prescription.isHomeMedicineDeliverySupported! ? 14 : 12, + // fontWeight: FontWeight.w500, + // borderRadius: 12, + // padding: EdgeInsets.fromLTRB(10, 0, 10, 0), + // height: 40.h, + // icon: AppAssets.prescription_refill_icon, + // iconColor: prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor : AppColors.textColor.withOpacity(0.35), + // iconSize: 14.h, + // ), + // ), + // SizedBox(width: 8.h), + // Expanded( + // flex: 1, + // child: Container( + // height: 40.h, + // width: 40.w, + // decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + // color: AppColors.textColor, + // borderRadius: 12, + // ), + // child: Padding( + // padding: EdgeInsets.all(12.h), + // child: Transform.flip( + // flipX: appState.isArabic(), + // child: Utils.buildSvgWithAssets( + // icon: AppAssets.forward_arrow_icon_small, + // iconColor: AppColors.whiteColor, + // fit: BoxFit.contain, + // ), + // ), + // ), + // ).onPress(() { + // model.setPrescriptionsDetailsLoading(); + // Navigator.of(context).push( + // CustomPageRoute( + // page: PrescriptionDetailPage( + // prescriptionsResponseModel: prescription, + // isFromAppointments: false, + // ), + // ), + // ); + // }), + // ), + // ], + // ), + // SizedBox(height: 12.h), + // Divider(color: AppColors.borderOnlyColor.withValues(alpha: 0.05), height: 1.h), + // SizedBox(height: 12.h), + // ], + // ); + // }).toList(), + // ], + // ), + // ) + // : SizedBox.shrink(), + // ), + ], + ), + ), + ), + ), + ), + ) + : Utils.getNoDataWidget(context, noDataText: "You don't have any prescription orders yet.".needTranslation); + }, + ).paddingSymmetrical(24.h, 0.h), + ], + ); + }), + ), + ), + ); + } +} diff --git a/lib/presentation/prescriptions/prescriptions_list_page.dart b/lib/presentation/prescriptions/prescriptions_list_page.dart index bf89090..3d631ce 100644 --- a/lib/presentation/prescriptions/prescriptions_list_page.dart +++ b/lib/presentation/prescriptions/prescriptions_list_page.dart @@ -15,6 +15,7 @@ import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_view_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart'; +import 'package:hmg_patient_app_new/presentation/prescriptions/prescription_delivery_orders_list_page.dart'; import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; import 'package:hmg_patient_app_new/presentation/prescriptions/prescription_detail_page.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; @@ -54,6 +55,14 @@ class _PrescriptionsListPageState extends State { backgroundColor: AppColors.bgScaffoldColor, body: CollapsingListView( title: LocaleKeys.prescriptions.tr(context: context), + requests: () { + prescriptionsViewModel.getPrescriptionOrdersList(); + Navigator.of(context).push( + CustomPageRoute( + page: PrescriptionDeliveryOrdersListPage(), + ), + ); + }, child: SingleChildScrollView( child: Consumer(builder: (context, model, child) { return Column( diff --git a/lib/widgets/appbar/collapsing_list_view.dart b/lib/widgets/appbar/collapsing_list_view.dart index 8fa5f99..734fe0f 100644 --- a/lib/widgets/appbar/collapsing_list_view.dart +++ b/lib/widgets/appbar/collapsing_list_view.dart @@ -110,7 +110,7 @@ class CollapsingListView extends StatelessWidget { letterSpacing: -0.5), ).expanded, if (logout != null) actionButton(context, t, title: "Logout".needTranslation, icon: AppAssets.logout).onPress(logout!), - if (report != null) actionButton(context, t, title: "Report".needTranslation, icon: AppAssets.report_icon).onPress(report!), + if (report != null) actionButton(context, t, title: "Feedback".needTranslation, icon: AppAssets.report_icon).onPress(report!), if (history != null) actionButton(context, t, title: "History".needTranslation, icon: AppAssets.insurance_history_icon).onPress(history!), if (instructions != null) actionButton(context, t, title: "Instructions".needTranslation, icon: AppAssets.requests).onPress(instructions!), if (requests != null) actionButton(context, t, title: "Requests".needTranslation, icon: AppAssets.insurance_history_icon).onPress(requests!), @@ -162,7 +162,7 @@ class CollapsingListView extends StatelessWidget { style: context.dynamicTextStyle( color: AppColors.primaryRedColor, letterSpacing: -0.4, - fontSize: (14 - (2 * (1 - t))).f, + fontSize: (12 - (2 * (1 - t))).f, fontWeight: FontWeight.lerp( FontWeight.w300, FontWeight.w500, From 32adf754ce8dab16235bce78f2850ed9a6df874e Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 25 Nov 2025 09:30:21 +0300 Subject: [PATCH 08/22] prescription delivery implemented --- .../prescriptions/prescriptions_repo.dart | 6 +- .../prescriptions_view_model.dart | 2 + ...rescription_delivery_orders_list_page.dart | 191 ++---------------- 3 files changed, 29 insertions(+), 170 deletions(-) diff --git a/lib/features/prescriptions/prescriptions_repo.dart b/lib/features/prescriptions/prescriptions_repo.dart index f35c705..e7a4f07 100644 --- a/lib/features/prescriptions/prescriptions_repo.dart +++ b/lib/features/prescriptions/prescriptions_repo.dart @@ -5,6 +5,7 @@ import 'package:hmg_patient_app_new/core/common_models/generic_api_model.dart'; import 'package:dartz/dartz.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/features/prescriptions/models/resp_models/patient_prescriptions_response_model.dart'; +import 'package:hmg_patient_app_new/features/prescriptions/models/resp_models/prescription_delivery_response_model.dart'; import 'package:hmg_patient_app_new/features/prescriptions/models/resp_models/prescription_detail_response_model.dart'; import 'package:hmg_patient_app_new/services/logger_service.dart'; @@ -272,11 +273,14 @@ class PrescriptionsRepoImp implements PrescriptionsRepo { }, onSuccess: (response, statusCode, {messageStatus, errorMessage}) { try { + + final prescriptionOrders = response['response'].map((item) => PrescriptionDeliveryResponseModel.fromJson(item as Map)).toList().cast(); + apiResponse = GenericApiModel( messageStatus: messageStatus, statusCode: statusCode, errorMessage: null, - data: response, + data: prescriptionOrders, ); } catch (e) { failure = DataParsingFailure(e.toString()); diff --git a/lib/features/prescriptions/prescriptions_view_model.dart b/lib/features/prescriptions/prescriptions_view_model.dart index 186ecc8..693b727 100644 --- a/lib/features/prescriptions/prescriptions_view_model.dart +++ b/lib/features/prescriptions/prescriptions_view_model.dart @@ -252,6 +252,7 @@ class PrescriptionsViewModel extends ChangeNotifier { } Future getPrescriptionOrdersList({Function(dynamic)? onSuccess, Function(String)? onError}) async { + isPrescriptionsDeliveryOrdersLoading = true; prescriptionsOrderList.clear(); notifyListeners(); @@ -270,6 +271,7 @@ class PrescriptionsViewModel extends ChangeNotifier { onError!(apiResponse.errorMessage!); } else if (apiResponse.messageStatus == 1) { isPrescriptionsDeliveryOrdersLoading = false; + prescriptionsOrderList = apiResponse.data!; notifyListeners(); if (onSuccess != null) { onSuccess(apiResponse); diff --git a/lib/presentation/prescriptions/prescription_delivery_orders_list_page.dart b/lib/presentation/prescriptions/prescription_delivery_orders_list_page.dart index a2bfa8e..9f2b2a2 100644 --- a/lib/presentation/prescriptions/prescription_delivery_orders_list_page.dart +++ b/lib/presentation/prescriptions/prescription_delivery_orders_list_page.dart @@ -1,15 +1,19 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; +import 'package:hmg_patient_app_new/core/app_assets.dart'; +import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_view_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; +import 'package:hmg_patient_app_new/presentation/emergency_services/history/widget/RequestStatus.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; +import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart'; import 'package:provider/provider.dart'; class PrescriptionDeliveryOrdersListPage extends StatelessWidget { @@ -26,10 +30,10 @@ class PrescriptionDeliveryOrdersListPage extends StatelessWidget { return Column( children: [ ListView.builder( - itemCount: model.isPrescriptionsOrdersLoading + itemCount: model.isPrescriptionsDeliveryOrdersLoading ? 4 - : model.patientPrescriptionOrders.isNotEmpty - ? model.patientPrescriptionOrdersViewList.length + : model.prescriptionsOrderList.isNotEmpty + ? model.prescriptionsOrderList.length : 1, physics: NeverScrollableScrollPhysics(), shrinkWrap: true, @@ -56,9 +60,6 @@ class PrescriptionDeliveryOrdersListPage extends StatelessWidget { decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 20.h, hasShadow: true), child: InkWell( onTap: () { - // setState(() { - // expandedIndex = isExpanded ? null : index; - // }); }, child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -67,177 +68,20 @@ class PrescriptionDeliveryOrdersListPage extends StatelessWidget { padding: EdgeInsets.all(16.h), child: Column( crossAxisAlignment: CrossAxisAlignment.start, + spacing: 8.h, children: [ + RequestStatus(status: model.prescriptionsOrderList[index].statusId ?? 0), + "Req ID: ${model.prescriptionsOrderList[index].iD}".toText16(color: AppColors.textColor, weight: FontWeight.w600), Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + spacing: 4.w, children: [ - // CustomButton( - // text: "${model.patientPrescriptionOrdersViewList[index].prescriptionsList!.length} Prescriptions Available", - // onPressed: () {}, - // backgroundColor: AppColors.greyColor, - // borderColor: AppColors.greyColor, - // textColor: AppColors.blackColor, - // fontSize: 10, - // fontWeight: FontWeight.w500, - // borderRadius: 8, - // padding: EdgeInsets.fromLTRB(10, 0, 10, 0), - // height: 30.h, - // ), - // Icon(isExpanded ? Icons.expand_less : Icons.expand_more), + chip(Utils.getDayMonthYearDateFormatted(DateTime.tryParse(model.prescriptionsOrderList[index].created!)), AppAssets.calendar, + AppColors.blackBgColor), ], ), - SizedBox(height: 8.h), - // model.patientPrescriptionOrdersViewList[index].filterName!.toText16(isBold: true) ], ), ), - // AnimatedSwitcher( - // duration: Duration(milliseconds: 500), - // switchInCurve: Curves.easeIn, - // switchOutCurve: Curves.easeOut, - // transitionBuilder: (Widget child, Animation animation) { - // return FadeTransition( - // opacity: animation, - // child: SizeTransition( - // sizeFactor: animation, - // axisAlignment: 0.0, - // child: child, - // ), - // ); - // }, - // child: isExpanded - // ? Container( - // key: ValueKey(index), - // padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 8.h), - // child: Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // ...model.patientPrescriptionOrdersViewList[index].prescriptionsList!.map((prescription) { - // return Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // Row( - // mainAxisSize: MainAxisSize.min, - // children: [ - // Image.network( - // prescription.doctorImageURL!, - // width: 24.h, - // height: 24.h, - // fit: BoxFit.fill, - // ).circle(100), - // SizedBox(width: 8.h), - // Expanded(child: prescription.doctorName!.toText14(weight: FontWeight.w500)), - // ], - // ), - // SizedBox(height: 8.h), - // Row( - // children: [ - // CustomButton( - // text: DateUtil.formatDateToDate(DateUtil.convertStringToDate(prescription.appointmentDate), false), - // onPressed: () {}, - // backgroundColor: AppColors.greyColor, - // borderColor: AppColors.greyColor, - // textColor: AppColors.blackColor, - // fontSize: 10, - // fontWeight: FontWeight.w500, - // borderRadius: 8, - // padding: EdgeInsets.fromLTRB(10, 0, 10, 0), - // height: 24.h, - // ), - // SizedBox(width: 8.h), - // CustomButton( - // text: model.isSortByClinic ? prescription.name! : prescription.clinicDescription!, - // onPressed: () {}, - // backgroundColor: AppColors.greyColor, - // borderColor: AppColors.greyColor, - // textColor: AppColors.blackColor, - // fontSize: 10, - // fontWeight: FontWeight.w500, - // borderRadius: 8, - // padding: EdgeInsets.fromLTRB(10, 0, 10, 0), - // height: 24.h, - // ), - // ], - // ), - // SizedBox(height: 8.h), - // Row( - // children: [ - // Expanded( - // flex: 6, - // child: CustomButton( - // text: prescription.isHomeMedicineDeliverySupported! - // ? LocaleKeys.resendOrder.tr(context: context) - // : LocaleKeys.prescriptionDeliveryError.tr(context: context), - // onPressed: () async { - // if (prescription.isHomeMedicineDeliverySupported!) { - // LoaderBottomSheet.showLoader(loadingText: "Fetching prescription details...".needTranslation); - // await prescriptionsViewModel.getPrescriptionDetails(prescriptionsViewModel.patientPrescriptionOrders[index], - // onSuccess: (val) { - // LoaderBottomSheet.hideLoader(); - // prescriptionsViewModel.initiatePrescriptionDelivery(); - // }); - // } - // }, - // backgroundColor: - // prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor.withOpacity(0.15) : AppColors.greyF7Color, - // borderColor: AppColors.successColor.withOpacity(0.01), - // textColor: prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor : AppColors.textColor.withOpacity(0.35), - // fontSize: prescription.isHomeMedicineDeliverySupported! ? 14 : 12, - // fontWeight: FontWeight.w500, - // borderRadius: 12, - // padding: EdgeInsets.fromLTRB(10, 0, 10, 0), - // height: 40.h, - // icon: AppAssets.prescription_refill_icon, - // iconColor: prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor : AppColors.textColor.withOpacity(0.35), - // iconSize: 14.h, - // ), - // ), - // SizedBox(width: 8.h), - // Expanded( - // flex: 1, - // child: Container( - // height: 40.h, - // width: 40.w, - // decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - // color: AppColors.textColor, - // borderRadius: 12, - // ), - // child: Padding( - // padding: EdgeInsets.all(12.h), - // child: Transform.flip( - // flipX: appState.isArabic(), - // child: Utils.buildSvgWithAssets( - // icon: AppAssets.forward_arrow_icon_small, - // iconColor: AppColors.whiteColor, - // fit: BoxFit.contain, - // ), - // ), - // ), - // ).onPress(() { - // model.setPrescriptionsDetailsLoading(); - // Navigator.of(context).push( - // CustomPageRoute( - // page: PrescriptionDetailPage( - // prescriptionsResponseModel: prescription, - // isFromAppointments: false, - // ), - // ), - // ); - // }), - // ), - // ], - // ), - // SizedBox(height: 12.h), - // Divider(color: AppColors.borderOnlyColor.withValues(alpha: 0.05), height: 1.h), - // SizedBox(height: 12.h), - // ], - // ); - // }).toList(), - // ], - // ), - // ) - // : SizedBox.shrink(), - // ), ], ), ), @@ -255,4 +99,13 @@ class PrescriptionDeliveryOrdersListPage extends StatelessWidget { ), ); } + + chip(String title, String iconString, Color iconColor) { + return AppCustomChipWidget( + labelText: title, + icon: iconString, + iconColor: iconColor, + iconSize: 12.h, + ); + } } From f142ff90be32b206f458cb9ea23d7a98f0b8a1fc Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 25 Nov 2025 12:26:22 +0300 Subject: [PATCH 09/22] updates --- .../medical_file/medical_file_page.dart | 34 +++++++++++++++++-- .../medical_file_appointment_card.dart | 4 ++- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/lib/presentation/medical_file/medical_file_page.dart b/lib/presentation/medical_file/medical_file_page.dart index 883ca37..2cf584e 100644 --- a/lib/presentation/medical_file/medical_file_page.dart +++ b/lib/presentation/medical_file/medical_file_page.dart @@ -26,6 +26,7 @@ import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_view_mo import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/presentation/appointments/my_appointments_page.dart'; import 'package:hmg_patient_app_new/presentation/appointments/my_doctors_page.dart'; +import 'package:hmg_patient_app_new/presentation/appointments/widgets/ask_doctor_request_type_select.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/book_appointment_page.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/doctor_profile_page.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/widgets/appointment_calendar.dart'; @@ -407,7 +408,34 @@ class _MedicalFilePageState extends State { onRescheduleTap: () { openDoctorScheduleCalendar(myAppointmentsVM.patientAppointmentsHistoryList[index]); }, - onAskDoctorTap: () {}, + onAskDoctorTap: () async { + LoaderBottomSheet.showLoader(loadingText: "Checking doctor availability...".needTranslation); + await myAppointmentsViewModel.isDoctorAvailable( + projectID: myAppointmentsVM.patientAppointmentsHistoryList[index].projectID, + doctorId: myAppointmentsVM.patientAppointmentsHistoryList[index].doctorID, + clinicId: myAppointmentsVM.patientAppointmentsHistoryList[index].clinicID, + onSuccess: (value) async { + if (value) { + await myAppointmentsViewModel.getAskDoctorRequestTypes(onSuccess: (val) { + LoaderBottomSheet.hideLoader(); + showCommonBottomSheetWithoutHeight( + context, + title: LocaleKeys.askDoctor.tr(context: context), + child: AskDoctorRequestTypeSelect( + askDoctorRequestTypeList: myAppointmentsViewModel.askDoctorRequestTypeList, + myAppointmentsViewModel: myAppointmentsViewModel, + patientAppointmentHistoryResponseModel: myAppointmentsVM.patientAppointmentsHistoryList[index], + ), + callBackFunc: () {}, + isFullScreen: false, + isCloseButtonVisible: true, + ); + }); + } else { + print("Doctor is not available"); + } + }); + }, )), ), ), @@ -544,9 +572,9 @@ class _MedicalFilePageState extends State { }, separatorBuilder: (BuildContext cxt, int index) => SizedBox(height: 16.h), ), - SizedBox(height: 24.h), + SizedBox(height: 8.h), const Divider(color: AppColors.dividerColor), - SizedBox(height: 24.h), + SizedBox(height: 8.h), Row( children: [ Expanded( diff --git a/lib/presentation/medical_file/widgets/medical_file_appointment_card.dart b/lib/presentation/medical_file/widgets/medical_file_appointment_card.dart index 3924761..037860f 100644 --- a/lib/presentation/medical_file/widgets/medical_file_appointment_card.dart +++ b/lib/presentation/medical_file/widgets/medical_file_appointment_card.dart @@ -167,7 +167,9 @@ class MedicalFileAppointmentCard extends StatelessWidget { return DateTime.now().difference(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate)).inDays <= 15 ? CustomButton( text: LocaleKeys.askDoctor.tr(context: context), - onPressed: () {}, + onPressed: () { + onAskDoctorTap(); + }, backgroundColor: AppColors.secondaryLightRedColor, borderColor: AppColors.secondaryLightRedColor, textColor: AppColors.primaryRedColor, From 1e5744cf443c03a489c2abc02ecedba67c06456c Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Thu, 27 Nov 2025 09:49:47 +0300 Subject: [PATCH 10/22] Updates & enhancements --- lib/core/api_consts.dart | 4 +- .../immediate_livecare_view_model.dart | 29 ++ lib/features/lab/lab_view_model.dart | 6 +- .../appointment_details_page.dart | 7 +- .../widgets/appointment_card.dart | 4 +- .../widgets/appointment_doctor_card.dart | 22 +- ...mediate_livecare_pending_request_page.dart | 277 +++++++++--------- lib/presentation/home/landing_page.dart | 181 +++++++----- .../insurance_approval_details_page.dart | 6 +- .../insurance/widgets/insurance_history.dart | 2 +- lib/presentation/lab/lab_orders_page.dart | 2 +- .../medical_file/medical_file_page.dart | 2 +- .../medical_file/widgets/lab_rad_card.dart | 38 +-- lib/widgets/countdown_timer.dart | 111 +++++++ 14 files changed, 433 insertions(+), 258 deletions(-) create mode 100644 lib/widgets/countdown_timer.dart diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index a1f4062..1146736 100644 --- a/lib/core/api_consts.dart +++ b/lib/core/api_consts.dart @@ -711,7 +711,7 @@ var GET_PRESCRIPTION_INSTRUCTIONS_PDF = 'Services/ChatBot_Service.svc/REST/Chatb class ApiConsts { static const maxSmallScreen = 660; - static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat; + static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod; // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT @@ -852,7 +852,7 @@ class ApiConsts { static final String addHHCOrder = 'api/HHC/add'; // ************ static values for Api **************** - static final double appVersionID = 19.3; + static final double appVersionID = 50.3; static final int appChannelId = 3; static final String appIpAddress = "10.20.10.20"; static final String appGeneralId = "Cs2020@2016\$2958"; diff --git a/lib/features/immediate_livecare/immediate_livecare_view_model.dart b/lib/features/immediate_livecare/immediate_livecare_view_model.dart index 599bc39..7e2d7c9 100644 --- a/lib/features/immediate_livecare/immediate_livecare_view_model.dart +++ b/lib/features/immediate_livecare/immediate_livecare_view_model.dart @@ -1,3 +1,5 @@ +import 'dart:async'; + import 'package:flutter/cupertino.dart'; import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/cache_consts.dart'; @@ -36,6 +38,10 @@ class ImmediateLiveCareViewModel extends ChangeNotifier { late AppState _appState; + Duration countdownDuration = Duration(minutes: 1, seconds: 0); + late ValueNotifier durationNotifier; + late Timer timer; + initImmediateLiveCare() { _appState = getIt(); immediateLiveCareClinicsList = []; @@ -144,12 +150,19 @@ class ImmediateLiveCareViewModel extends ChangeNotifier { patientLiveCareHistoryList = apiResponse.data!; if (patientLiveCareHistoryList.isNotEmpty) { if (patientLiveCareHistoryList[0].callStatus! < 4) { + countdownDuration = Duration(seconds: 0); + durationNotifier.dispose(); patientHasPendingLiveCareRequest = true; + countdownDuration = Duration(minutes: patientLiveCareHistoryList.first.watingtimeInteger!, seconds: 0); + durationNotifier = ValueNotifier(countdownDuration); + startTimer(); } else { patientHasPendingLiveCareRequest = false; + timer.cancel(); } } else { patientHasPendingLiveCareRequest = false; + timer.cancel(); } notifyListeners(); if (onSuccess != null) { @@ -159,4 +172,20 @@ class ImmediateLiveCareViewModel extends ChangeNotifier { }, ); } + + void startTimer() { + timer = Timer.periodic(const Duration(seconds: 1), (_) => addTime()); + notifyListeners(); + } + + void addTime() { + final seconds = durationNotifier.value.inSeconds - 1; + if (seconds < 0) { + timer?.cancel(); + // Handle end of timer here + // showEndMessage(); + } else { + durationNotifier.value = Duration(seconds: seconds); + } + } } diff --git a/lib/features/lab/lab_view_model.dart b/lib/features/lab/lab_view_model.dart index bad4f89..079471c 100644 --- a/lib/features/lab/lab_view_model.dart +++ b/lib/features/lab/lab_view_model.dart @@ -77,14 +77,14 @@ class LabViewModel extends ChangeNotifier { required this.navigationService}); initLabProvider() { - // if (isLabNeedToLoad) { + if (isLabNeedToLoad) { patientLabOrders.clear(); filteredLabOrders.clear(); labOrderTests.clear(); isLabOrdersLoading = true; isLabResultsLoading = true; getPatientLabOrders(); - // } + } notifyListeners(); } @@ -94,7 +94,7 @@ class LabViewModel extends ChangeNotifier { } Future getPatientLabOrders({Function(dynamic)? onSuccess, Function(String)? onError}) async { - // if (!isLabNeedToLoad) return; + if (!isLabNeedToLoad) return; isLabOrdersLoading = true; patientLabOrders.clear(); diff --git a/lib/presentation/appointments/appointment_details_page.dart b/lib/presentation/appointments/appointment_details_page.dart index 0a1eaf2..20f5538 100644 --- a/lib/presentation/appointments/appointment_details_page.dart +++ b/lib/presentation/appointments/appointment_details_page.dart @@ -63,10 +63,9 @@ class _AppointmentDetailsPageState extends State { @override void initState() { scheduleMicrotask(() { - // if (AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel)) { - // prescriptionsViewModel.setPrescriptionsDetailsLoading(); - // prescriptionsViewModel.getPrescriptionDetails(getPrescriptionRequestModel()); - // } + if (AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel)) { + + } }); super.initState(); } diff --git a/lib/presentation/appointments/widgets/appointment_card.dart b/lib/presentation/appointments/widgets/appointment_card.dart index e301fbf..5d2ae5c 100644 --- a/lib/presentation/appointments/widgets/appointment_card.dart +++ b/lib/presentation/appointments/widgets/appointment_card.dart @@ -144,9 +144,7 @@ class AppointmentCard extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - (isLoading - ? 'https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png' - : patientAppointmentHistoryResponseModel.doctorNameObj!) + (isLoading ? 'John Doe' : "${patientAppointmentHistoryResponseModel.doctorTitle} ${patientAppointmentHistoryResponseModel.doctorNameObj!}") .toText16(isBold: true, maxlines: 1) .toShimmer2(isShow: isLoading), SizedBox(height: 8.h), diff --git a/lib/presentation/appointments/widgets/appointment_doctor_card.dart b/lib/presentation/appointments/widgets/appointment_doctor_card.dart index 8d0f4e7..b2d74ca 100644 --- a/lib/presentation/appointments/widgets/appointment_doctor_card.dart +++ b/lib/presentation/appointments/widgets/appointment_doctor_card.dart @@ -42,12 +42,18 @@ class AppointmentDoctorCard extends StatelessWidget { Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Image.network( - patientAppointmentHistoryResponseModel.doctorImageURL!, - width: 63.w, - height: 63.h, - fit: BoxFit.cover, - ).circle(100.r), + Column( + children: [ + Image.network( + patientAppointmentHistoryResponseModel.doctorImageURL!, + width: 63.w, + height: 63.h, + fit: BoxFit.cover, + ).circle(100.r), + SizedBox(height: 12.h), + AppCustomChipWidget(icon: AppAssets.rating_icon, iconColor: AppColors.ratingColorYellow, labelText: "Rating: ${patientAppointmentHistoryResponseModel.decimalDoctorRate}"), + ], + ), SizedBox(width: 16.w), Expanded( child: Column( @@ -87,10 +93,6 @@ class AppointmentDoctorCard extends StatelessWidget { !patientAppointmentHistoryResponseModel.isLiveCareAppointment! ? AppColors.greyColor : AppColors.successColor, textColor: !patientAppointmentHistoryResponseModel.isLiveCareAppointment! ? AppColors.textColor : AppColors.whiteColor, ), - AppCustomChipWidget( - icon: AppAssets.rating_icon, - iconColor: AppColors.ratingColorYellow, - labelText: "Rating: ${patientAppointmentHistoryResponseModel.decimalDoctorRate}"), ], ), ], diff --git a/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart b/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart index e9e5c5c..8c8b79c 100644 --- a/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart +++ b/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart @@ -16,6 +16,7 @@ import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart'; +import 'package:hmg_patient_app_new/widgets/countdown_timer.dart'; import 'package:lottie/lottie.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -32,24 +33,24 @@ class _ImmediateLiveCarePendingRequestPageState extends State durationNotifier = ValueNotifier(countdownDuration); - Timer? timer; + // static Duration countdownDuration = Duration(minutes: 1, seconds: 0); + // late ValueNotifier durationNotifier = ValueNotifier(immediateLiveCareViewModel.countdownDuration); + // Timer? timer; @override void initState() { super.initState(); scheduleMicrotask(() { - countdownDuration = Duration(minutes: immediateLiveCareViewModel.patientLiveCareHistoryList[0].watingtimeInteger!, seconds: 0); - durationNotifier = ValueNotifier(countdownDuration); - startTimer(); + // countdownDuration = Duration(minutes: immediateLiveCareViewModel.patientLiveCareHistoryList[0].watingtimeInteger!, seconds: 0); + // durationNotifier = ValueNotifier(immediateLiveCareViewModel.countdownDuration); + // startTimer(); }); } @override void dispose() { - timer?.cancel(); - durationNotifier.dispose(); + // timer?.cancel(); + // durationNotifier.dispose(); super.dispose(); } @@ -85,7 +86,7 @@ class _ImmediateLiveCarePendingRequestPageState extends State( - valueListenable: durationNotifier, + valueListenable: immediateLiveCareVM.durationNotifier, builder: (context, duration, child) { return Column( mainAxisAlignment: MainAxisAlignment.center, @@ -173,133 +174,133 @@ class _ImmediateLiveCarePendingRequestPageState extends State addTime()); - setState(() {}); - } - - void addTime() { - final seconds = durationNotifier.value.inSeconds - 1; - if (seconds < 0) { - timer?.cancel(); - // Handle end of timer here - // showEndMessage(); - } else { - durationNotifier.value = Duration(seconds: seconds); - } - } - - Future _onWillPop() async { - timer?.cancel(); - Navigator.of(context).pop(); - return true; - } - - Widget buildTime(Duration duration) { - String twoDigits(int n) => n.toString().padLeft(2, '0'); - final hours = twoDigits(duration.inHours); - final minutes = twoDigits(duration.inMinutes.remainder(60)); - final seconds = twoDigits(duration.inSeconds.remainder(60)); - - return Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - buildTimeColumn(hours, "Hours".needTranslation), - buildTimeColumn(minutes, "Mins".needTranslation), - buildTimeColumn(seconds, "Secs".needTranslation, isLast: true), - ], - ); - } - - Widget buildTimeColumn(String time, String label, {bool isLast = false}) { - return Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Row( - children: [ - buildDigit(time[0]), - buildDigit(time[1]), - if (!isLast) buildTimeSeparator(), - ], - ), - buildLabel(label), - ], - ); - } - - Widget buildDigit(String digit) { - return Container( - padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4), - // margin: const EdgeInsets.symmetric(horizontal: 2), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - ), - child: ClipRect( - child: AnimatedSwitcher( - duration: const Duration(milliseconds: 600), - switchInCurve: Curves.easeOutExpo, - switchOutCurve: Curves.easeInExpo, - transitionBuilder: (Widget child, Animation animation) { - return Stack( - children: [ - SlideTransition( - position: Tween( - begin: const Offset(0, -1), - end: const Offset(0, 1), - ).animate(CurvedAnimation( - parent: animation, - curve: Curves.easeOutCubic, - )), - child: FadeTransition( - opacity: animation, - child: child, - ), - ), - SlideTransition( - position: Tween( - begin: const Offset(0, -1), - end: const Offset(0, 0), - ).animate(CurvedAnimation( - parent: animation, - curve: Curves.bounceIn, - )), - child: FadeTransition( - opacity: animation, - child: child, - ), - ), - ], - ); - }, - child: Text( - digit, - key: ValueKey(digit), - style: TextStyle( - fontWeight: FontWeight.bold, - color: Colors.black, - fontSize: 20.f, - ), - ), - ), - ), - ); - } - - Widget buildLabel(String label) { - return label.toText14(isBold: true); - } - - Widget buildTimeSeparator() { - return const Padding( - padding: EdgeInsets.symmetric(horizontal: 2.0), - child: Text( - ":", - style: TextStyle( - color: Colors.black, - fontSize: 20, - ), - ), - ); - } + // void startTimer() { + // // timer = Timer.periodic(const Duration(seconds: 1), (_) => addTime()); + // // setState(() {}); + // } + // + // void addTime() { + // final seconds = durationNotifier.value.inSeconds - 1; + // if (seconds < 0) { + // timer?.cancel(); + // // Handle end of timer here + // // showEndMessage(); + // } else { + // durationNotifier.value = Duration(seconds: seconds); + // } + // } + // + // Future _onWillPop() async { + // timer?.cancel(); + // Navigator.of(context).pop(); + // return true; + // } + // + // Widget buildTime(Duration duration) { + // String twoDigits(int n) => n.toString().padLeft(2, '0'); + // final hours = twoDigits(duration.inHours); + // final minutes = twoDigits(duration.inMinutes.remainder(60)); + // final seconds = twoDigits(duration.inSeconds.remainder(60)); + // + // return Row( + // mainAxisAlignment: MainAxisAlignment.center, + // children: [ + // buildTimeColumn(hours, "Hours".needTranslation), + // buildTimeColumn(minutes, "Mins".needTranslation), + // buildTimeColumn(seconds, "Secs".needTranslation, isLast: true), + // ], + // ); + // } + // + // Widget buildTimeColumn(String time, String label, {bool isLast = false}) { + // return Column( + // mainAxisAlignment: MainAxisAlignment.center, + // children: [ + // Row( + // children: [ + // buildDigit(time[0]), + // buildDigit(time[1]), + // if (!isLast) buildTimeSeparator(), + // ], + // ), + // buildLabel(label), + // ], + // ); + // } + // + // Widget buildDigit(String digit) { + // return Container( + // padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4), + // // margin: const EdgeInsets.symmetric(horizontal: 2), + // decoration: BoxDecoration( + // color: Colors.white, + // borderRadius: BorderRadius.circular(8), + // ), + // child: ClipRect( + // child: AnimatedSwitcher( + // duration: const Duration(milliseconds: 600), + // switchInCurve: Curves.easeOutExpo, + // switchOutCurve: Curves.easeInExpo, + // transitionBuilder: (Widget child, Animation animation) { + // return Stack( + // children: [ + // SlideTransition( + // position: Tween( + // begin: const Offset(0, -1), + // end: const Offset(0, 1), + // ).animate(CurvedAnimation( + // parent: animation, + // curve: Curves.easeOutCubic, + // )), + // child: FadeTransition( + // opacity: animation, + // child: child, + // ), + // ), + // SlideTransition( + // position: Tween( + // begin: const Offset(0, -1), + // end: const Offset(0, 0), + // ).animate(CurvedAnimation( + // parent: animation, + // curve: Curves.bounceIn, + // )), + // child: FadeTransition( + // opacity: animation, + // child: child, + // ), + // ), + // ], + // ); + // }, + // child: Text( + // digit, + // key: ValueKey(digit), + // style: TextStyle( + // fontWeight: FontWeight.bold, + // color: Colors.black, + // fontSize: 20.f, + // ), + // ), + // ), + // ), + // ); + // } + // + // Widget buildLabel(String label) { + // return label.toText14(isBold: true); + // } + // + // Widget buildTimeSeparator() { + // return const Padding( + // padding: EdgeInsets.symmetric(horizontal: 2.0), + // child: Text( + // ":", + // style: TextStyle( + // color: Colors.black, + // fontSize: 20, + // ), + // ), + // ); + // } } diff --git a/lib/presentation/home/landing_page.dart b/lib/presentation/home/landing_page.dart index ce2e514..fe0268d 100644 --- a/lib/presentation/home/landing_page.dart +++ b/lib/presentation/home/landing_page.dart @@ -9,6 +9,7 @@ import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/cache_consts.dart'; import 'package:hmg_patient_app_new/core/dependencies.dart'; +import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/int_extensions.dart'; @@ -44,6 +45,7 @@ import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart'; import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; +import 'package:hmg_patient_app_new/widgets/countdown_timer.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; import 'package:hmg_patient_app_new/widgets/routes/spring_page_route_builder.dart'; import 'package:provider/provider.dart'; @@ -253,20 +255,107 @@ class _LandingPageState extends State { builder: DotSwiperPaginationBuilder(color: Color(0xffD9D9D9), activeColor: AppColors.blackBgColor), ), itemBuilder: (BuildContext context, int index) { - return Container( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.whiteColor, - borderRadius: 24.r, - hasShadow: true, - ), - child: AppointmentCard( - patientAppointmentHistoryResponseModel: myAppointmentsVM.patientAppointmentsHistoryList[index], - myAppointmentsViewModel: myAppointmentsViewModel, - bookAppointmentsViewModel: bookAppointmentsViewModel, - isLoading: false, - isFromHomePage: true, - ), - ); + return (immediateLiveCareViewModel.patientHasPendingLiveCareRequest && index == 0) + ? Column( + children: [ + SizedBox(height: 12.h), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.r, + hasShadow: true, + side: BorderSide(color: AppColors.ratingColorYellow, width: 3.h), + ), + child: Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + "Immediate LiveCare Request".needTranslation.toText16(isBold: true), + SizedBox(height: 10.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + AppCustomChipWidget( + labelText: immediateLiveCareViewModel.patientLiveCareHistoryList[0].stringCallStatus, + backgroundColor: AppColors.warningColorYellow.withValues(alpha: 0.20), + textColor: AppColors.alertColor, + ), + SizedBox(width: 8.w), + AppCustomChipWidget( + icon: AppAssets.appointment_calendar_icon, + labelText: DateUtil.formatDateToDate( + DateUtil.convertStringToDate(immediateLiveCareViewModel.patientLiveCareHistoryList[0].arrivalTime), false)), + ], + ), + Utils.buildSvgWithAssets(icon: AppAssets.waiting_icon, width: 24.h, height: 24.h), + // Lottie.asset(AppAnimations.pending_loading_animation, repeat: true, reverse: false, frameRate: FrameRate(60), width: 80.h, height: 80.h, fit: BoxFit.cover), + ], + ), + SizedBox(height: 10.h), + "Hala ${appState.getAuthenticatedUser()!.firstName}!!!".needTranslation.toText16(isBold: true), + SizedBox(height: 8.h), + "Your turn is after ${immediateLiveCareViewModel.patientLiveCareHistoryList[0].patCount} patients.".toText14(isBold: true), + SizedBox(height: 8.h), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + "Expected waiting time: ".toText12(isBold: true), + SizedBox(height: 8.h), + ValueListenableBuilder( + valueListenable: immediateLiveCareViewModel.durationNotifier, + builder: (context, duration, child) { + return Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + buildTime(duration), + ], + ); + }, + ), + SizedBox(height: 12.h), + ], + ), + // CustomButton( + // text: "View Details".needTranslation, + // onPressed: () async { + // Navigator.of(context).push(CustomPageRoute(page: ImmediateLiveCarePendingRequestPage())); + // }, + // backgroundColor: Color(0xffFEE9EA), + // borderColor: Color(0xffFEE9EA), + // textColor: Color(0xffED1C2B), + // fontSize: 14.f, + // fontWeight: FontWeight.w500, + // borderRadius: 12.r, + // padding: EdgeInsets.fromLTRB(10.h, 0, 10.h, 0), + // height: 40.h, + // ), + ], + ), + ), + ).paddingSymmetrical(0.h, 0.h).onPress(() { + Navigator.of(context).push(CustomPageRoute(page: ImmediateLiveCarePendingRequestPage())); + }), + SizedBox(height: 12.h), + ], + ) + : Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 24.r, + hasShadow: true, + ), + child: AppointmentCard( + patientAppointmentHistoryResponseModel: + myAppointmentsVM.patientAppointmentsHistoryList[immediateLiveCareViewModel.patientHasPendingLiveCareRequest ? --index : index], + myAppointmentsViewModel: myAppointmentsViewModel, + bookAppointmentsViewModel: bookAppointmentsViewModel, + isLoading: false, + isFromHomePage: true, + ), + ); }, ) : Container( @@ -304,64 +393,6 @@ class _LandingPageState extends State { ).paddingSymmetrical(24.h, 0.h); }, ), - // Consumer for LiveCare pending request - Consumer( - builder: (context, immediateLiveCareVM, child) { - return immediateLiveCareVM.patientHasPendingLiveCareRequest - ? Column( - children: [ - SizedBox(height: 12.h), - Container( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.whiteColor, - borderRadius: 20.r, - hasShadow: true, - side: BorderSide(color: AppColors.ratingColorYellow, width: 3.h), - ), - width: double.infinity, - child: Padding( - padding: EdgeInsets.all(16.h), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - AppCustomChipWidget( - labelText: immediateLiveCareViewModel.patientLiveCareHistoryList[0].stringCallStatus, - backgroundColor: AppColors.warningColorYellow.withValues(alpha: 0.20), - textColor: AppColors.alertColor, - ), - Utils.buildSvgWithAssets(icon: AppAssets.waiting_icon, width: 24.h, height: 24.h), - // Lottie.asset(AppAnimations.pending_loading_animation, repeat: true, reverse: false, frameRate: FrameRate(60), width: 40.h, height: 40.h, fit: BoxFit.contain), - ], - ), - SizedBox(height: 8.h), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - "You have a pending LiveCare request".needTranslation.toText12(isBold: true), - Utils.buildSvgWithAssets( - icon: AppAssets.forward_arrow_icon_small, - iconColor: AppColors.blackColor, - width: 20.h, - height: 15.h, - fit: BoxFit.contain, - ), - ], - ), - ], - ), - ), - ).paddingSymmetrical(24.h, 0.h).onPress(() { - Navigator.of(context).push(CustomPageRoute(page: ImmediateLiveCarePendingRequestPage())); - }), - SizedBox(height: 12.h), - ], - ) - : SizedBox(height: 12.h); - }, - ), // Consumer for ER Online Check-In pending request Consumer( @@ -421,6 +452,7 @@ class _LandingPageState extends State { : SizedBox(height: 12.h); }, ), + Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -576,10 +608,13 @@ class _LandingPageState extends State { isDone: isDone, onPressed: () { // sharedPref.setBool(HAS_ENABLED_QUICK_LOGIN, true); - authVM.loginWithFingerPrintFace(() { + authVM.loginWithFingerPrintFace(() async { isDone = true; cacheService.saveBool(key: CacheConst.quickLoginEnabled, value: true); setState(() {}); + await Future.delayed(Duration(milliseconds: 3000)).then((value) { + Navigator.pop(context); + }); }); }, ); diff --git a/lib/presentation/insurance/insurance_approval_details_page.dart b/lib/presentation/insurance/insurance_approval_details_page.dart index 437c870..150b15c 100644 --- a/lib/presentation/insurance/insurance_approval_details_page.dart +++ b/lib/presentation/insurance/insurance_approval_details_page.dart @@ -118,7 +118,7 @@ class InsuranceApprovalDetailsPage extends StatelessWidget { ), child: Padding( padding: EdgeInsets.all(16.h), - child: Column( + child: insuranceApprovalResponseModel.apporvalDetails != null ? Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ "Approval Details".toText16(isBold: true), @@ -128,7 +128,7 @@ class InsuranceApprovalDetailsPage extends StatelessWidget { children: [ LocaleKeys.procedureName.tr(context: context).toText14(isBold: true), Expanded( - child: insuranceApprovalResponseModel.apporvalDetails!.procedureName! + child: (insuranceApprovalResponseModel.apporvalDetails!.procedureName ?? "") .toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor, textAlignment: TextAlign.end, maxLine: 2), ), ], @@ -150,7 +150,7 @@ class InsuranceApprovalDetailsPage extends StatelessWidget { ], ), ], - ), + ) : SizedBox.shrink(), ), ) ], diff --git a/lib/presentation/insurance/widgets/insurance_history.dart b/lib/presentation/insurance/widgets/insurance_history.dart index a5114dd..3e6ee86 100644 --- a/lib/presentation/insurance/widgets/insurance_history.dart +++ b/lib/presentation/insurance/widgets/insurance_history.dart @@ -68,7 +68,7 @@ class InsuranceHistory extends StatelessWidget { Row( children: [ CustomButton( - text: insuranceVM.patientInsuranceCardHistoryList[index].statusDescription!, + text: insuranceVM.patientInsuranceCardHistoryList[index].statusDescription ?? "", onPressed: () {}, backgroundColor: AppColors.primaryRedColor.withOpacity(0.1), borderColor: AppColors.primaryRedColor.withOpacity(0.0), diff --git a/lib/presentation/lab/lab_orders_page.dart b/lib/presentation/lab/lab_orders_page.dart index 4ffd979..184f713 100644 --- a/lib/presentation/lab/lab_orders_page.dart +++ b/lib/presentation/lab/lab_orders_page.dart @@ -1 +1 @@ -import 'dart:async'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/dependencies.dart'; import 'package:hmg_patient_app_new/core/enums.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_orders_response_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/features/lab/lab_view_model.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_order_by_test.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart'; import 'package:hmg_patient_app_new/presentation/lab/search_lab_report.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/chip/custom_chip_widget.dart'; import 'package:hmg_patient_app_new/widgets/date_range_selector/viewmodel/date_range_view_model.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart'; import 'package:provider/provider.dart'; import 'package:hmg_patient_app_new/widgets/custom_tab_bar.dart'; import '../../widgets/appbar/collapsing_list_view.dart'; class LabOrdersPage extends StatefulWidget { const LabOrdersPage({super.key}); @override State createState() => _LabOrdersPageState(); } class _LabOrdersPageState extends State { late LabViewModel labProvider; late DateRangeSelectorRangeViewModel rangeViewModel; late AppState _appState; List?> labSuggestions = []; int? expandedIndex; String? selectedFilterText = ''; int activeIndex = 0; @override void initState() { scheduleMicrotask(() { labProvider.initLabProvider(); }); super.initState(); } @override Widget build(BuildContext context) { labProvider = Provider.of(context, listen: false); rangeViewModel = Provider.of(context); _appState = getIt(); return Scaffold( backgroundColor: AppColors.bgScaffoldColor, body: CollapsingListView( title: LocaleKeys.labResults.tr(), search: () async { final lavVM = Provider.of(context, listen: false); if (lavVM.isLabOrdersLoading) { return; } else { String? value = await Navigator.of(context).push( CustomPageRoute( page: SearchLabResultsContent(labSuggestionsList: lavVM.labSuggestions), fullScreenDialog: true, direction: AxisDirection.down, ), ); if (value != null) { selectedFilterText = value; lavVM.filterLabReports(value); } } }, child: SingleChildScrollView( padding: EdgeInsets.all(24.h), physics: NeverScrollableScrollPhysics(), child: Consumer( builder: (context, model, child) { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ CustomTabBar( activeTextColor: Color(0xffED1C2B), activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1), tabs: [ CustomTabBarModel(null, "By Visit".needTranslation), CustomTabBarModel(null, "By Test".needTranslation), // CustomTabBarModel(null, "Completed".needTranslation), ], onTabChange: (index) { activeIndex = index; setState(() {}); }, ), SizedBox(height: 8.h), selectedFilterText!.isNotEmpty ? CustomChipWidget( chipText: selectedFilterText!, chipType: ChipTypeEnum.alert, isSelected: true, ) : SizedBox(), activeIndex == 0 ? ListView.builder( shrinkWrap: true, physics: NeverScrollableScrollPhysics(), padding: EdgeInsets.zero, itemCount: model.isLabOrdersLoading ? 5 : model.patientLabOrders.isNotEmpty ? model.patientLabOrders.length : 1, itemBuilder: (context, index) { final isExpanded = expandedIndex == index; return model.isLabOrdersLoading ? LabResultItemView( onTap: () {}, labOrder: null, index: index, isLoading: true, ) : model.patientLabOrders.isNotEmpty ? AnimationConfiguration.staggeredList( position: index, duration: const Duration(milliseconds: 500), child: SlideAnimation( verticalOffset: 100.0, child: FadeInAnimation( child: LabResultItemView( onTap: () { model.currentlySelectedPatientOrder = model.patientLabOrders[ index]; labProvider.getPatientLabResultByHospital(model.patientLabOrders[ index]); labProvider .getPatientSpecialResult( model.patientLabOrders[ index]); Navigator.push( context, CustomPageRoute( page: LabResultByClinic(labOrder: model.patientLabOrders[index]), )); }, labOrder: model.patientLabOrders[index], index: index, isExpanded: isExpanded), ), ), ) : Utils.getNoDataWidget(context, noDataText: "You don't have any lab results yet.".needTranslation); }, ) : ListView.builder( shrinkWrap: true, physics: NeverScrollableScrollPhysics(), padding: EdgeInsets.zero, itemCount: model.isLabOrdersLoading ? 5 : model.uniqueTests.toList().isNotEmpty ? model.uniqueTests.toList().length : 1, itemBuilder: (context, index) { final isExpanded = expandedIndex == index; return model.isLabOrdersLoading ? LabResultItemView( onTap: () {}, labOrder: null, index: index, isLoading: true, ) : model.uniqueTests.toList().isNotEmpty ? AnimationConfiguration.staggeredList( position: index, duration: const Duration(milliseconds: 500), child: SlideAnimation( verticalOffset: 100.0, child: FadeInAnimation( child: LabOrderByTest( appState: _appState, onTap: () { if (model.uniqueTests.toList()[index].model != null) { rangeViewModel.flush(); model.getPatientLabResult(model.uniqueTests.toList()[index].model!, model.uniqueTests.toList()[index].description!, (_appState.isArabic() ? model.uniqueTests.toList()[index].testDescriptionAr! : model.uniqueTests.toList()[index].testDescriptionEn!)); } }, tests: model.uniqueTests.toList()[index], index: index, isExpanded: isExpanded)), ), ) : Utils.getNoDataWidget(context, noDataText: "You don't have any lab results yet.".needTranslation); }, ) ], ); }, ), ), )); } Color getLabOrderStatusColor(num status) { switch (status) { case 44: return AppColors.warningColorYellow; case 45: return AppColors.warningColorYellow; case 16: return AppColors.successColor; case 17: return AppColors.successColor; default: return AppColors.greyColor; } } String getLabOrderStatusText(num status) { switch (status) { case 44: return LocaleKeys.resultsPending.tr(context: context); case 45: return LocaleKeys.resultsPending.tr(context: context); case 16: return LocaleKeys.resultsAvailable.tr(context: context); case 17: return LocaleKeys.resultsAvailable.tr(context: context); default: return ""; } } getLabSuggestions(LabViewModel model) { if (model.patientLabOrders.isEmpty) { return []; } return model.patientLabOrders.map((m) => m.testDetails).toList(); } } \ No newline at end of file +import 'dart:async'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/dependencies.dart'; import 'package:hmg_patient_app_new/core/enums.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_orders_response_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/features/lab/lab_view_model.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_order_by_test.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart'; import 'package:hmg_patient_app_new/presentation/lab/search_lab_report.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/chip/custom_chip_widget.dart'; import 'package:hmg_patient_app_new/widgets/date_range_selector/viewmodel/date_range_view_model.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart'; import 'package:provider/provider.dart'; import 'package:hmg_patient_app_new/widgets/custom_tab_bar.dart'; import '../../widgets/appbar/collapsing_list_view.dart'; class LabOrdersPage extends StatefulWidget { const LabOrdersPage({super.key}); @override State createState() => _LabOrdersPageState(); } class _LabOrdersPageState extends State { late LabViewModel labProvider; late DateRangeSelectorRangeViewModel rangeViewModel; late AppState _appState; List?> labSuggestions = []; int? expandedIndex; String? selectedFilterText = ''; int activeIndex = 0; @override void initState() { scheduleMicrotask(() { // labProvider.initLabProvider(); }); super.initState(); } @override Widget build(BuildContext context) { labProvider = Provider.of(context, listen: false); rangeViewModel = Provider.of(context); _appState = getIt(); return Scaffold( backgroundColor: AppColors.bgScaffoldColor, body: CollapsingListView( title: LocaleKeys.labResults.tr(), search: () async { final lavVM = Provider.of(context, listen: false); if (lavVM.isLabOrdersLoading) { return; } else { String? value = await Navigator.of(context).push( CustomPageRoute( page: SearchLabResultsContent(labSuggestionsList: lavVM.labSuggestions), fullScreenDialog: true, direction: AxisDirection.down, ), ); if (value != null) { selectedFilterText = value; lavVM.filterLabReports(value); } } }, child: SingleChildScrollView( padding: EdgeInsets.all(24.h), physics: NeverScrollableScrollPhysics(), child: Consumer( builder: (context, model, child) { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ CustomTabBar( activeTextColor: Color(0xffED1C2B), activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1), tabs: [ CustomTabBarModel(null, "By Visit".needTranslation), CustomTabBarModel(null, "By Test".needTranslation), // CustomTabBarModel(null, "Completed".needTranslation), ], onTabChange: (index) { activeIndex = index; setState(() {}); }, ), SizedBox(height: 8.h), selectedFilterText!.isNotEmpty ? CustomChipWidget( chipText: selectedFilterText!, chipType: ChipTypeEnum.alert, isSelected: true, ) : SizedBox(), activeIndex == 0 ? ListView.builder( shrinkWrap: true, physics: NeverScrollableScrollPhysics(), padding: EdgeInsets.zero, itemCount: model.isLabOrdersLoading ? 5 : model.patientLabOrders.isNotEmpty ? model.patientLabOrders.length : 1, itemBuilder: (context, index) { final isExpanded = expandedIndex == index; return model.isLabOrdersLoading ? LabResultItemView( onTap: () {}, labOrder: null, index: index, isLoading: true, ) : model.patientLabOrders.isNotEmpty ? AnimationConfiguration.staggeredList( position: index, duration: const Duration(milliseconds: 500), child: SlideAnimation( verticalOffset: 100.0, child: FadeInAnimation( child: LabResultItemView( onTap: () { model.currentlySelectedPatientOrder = model.patientLabOrders[ index]; labProvider.getPatientLabResultByHospital(model.patientLabOrders[ index]); labProvider .getPatientSpecialResult( model.patientLabOrders[ index]); Navigator.push( context, CustomPageRoute( page: LabResultByClinic(labOrder: model.patientLabOrders[index]), )); }, labOrder: model.patientLabOrders[index], index: index, isExpanded: isExpanded), ), ), ) : Utils.getNoDataWidget(context, noDataText: "You don't have any lab results yet.".needTranslation); }, ) : ListView.builder( shrinkWrap: true, physics: NeverScrollableScrollPhysics(), padding: EdgeInsets.zero, itemCount: model.isLabOrdersLoading ? 5 : model.uniqueTests.toList().isNotEmpty ? model.uniqueTests.toList().length : 1, itemBuilder: (context, index) { final isExpanded = expandedIndex == index; return model.isLabOrdersLoading ? LabResultItemView( onTap: () {}, labOrder: null, index: index, isLoading: true, ) : model.uniqueTests.toList().isNotEmpty ? AnimationConfiguration.staggeredList( position: index, duration: const Duration(milliseconds: 500), child: SlideAnimation( verticalOffset: 100.0, child: FadeInAnimation( child: LabOrderByTest( appState: _appState, onTap: () { if (model.uniqueTests.toList()[index].model != null) { rangeViewModel.flush(); model.getPatientLabResult(model.uniqueTests.toList()[index].model!, model.uniqueTests.toList()[index].description!, (_appState.isArabic() ? model.uniqueTests.toList()[index].testDescriptionAr! : model.uniqueTests.toList()[index].testDescriptionEn!)); } }, tests: model.uniqueTests.toList()[index], index: index, isExpanded: isExpanded)), ), ) : Utils.getNoDataWidget(context, noDataText: "You don't have any lab results yet.".needTranslation); }, ) ], ); }, ), ), )); } Color getLabOrderStatusColor(num status) { switch (status) { case 44: return AppColors.warningColorYellow; case 45: return AppColors.warningColorYellow; case 16: return AppColors.successColor; case 17: return AppColors.successColor; default: return AppColors.greyColor; } } String getLabOrderStatusText(num status) { switch (status) { case 44: return LocaleKeys.resultsPending.tr(context: context); case 45: return LocaleKeys.resultsPending.tr(context: context); case 16: return LocaleKeys.resultsAvailable.tr(context: context); case 17: return LocaleKeys.resultsAvailable.tr(context: context); default: return ""; } } getLabSuggestions(LabViewModel model) { if (model.patientLabOrders.isEmpty) { return []; } return model.patientLabOrders.map((m) => m.testDetails).toList(); } } \ No newline at end of file diff --git a/lib/presentation/medical_file/medical_file_page.dart b/lib/presentation/medical_file/medical_file_page.dart index 2cf584e..1652812 100644 --- a/lib/presentation/medical_file/medical_file_page.dart +++ b/lib/presentation/medical_file/medical_file_page.dart @@ -85,7 +85,6 @@ class _MedicalFilePageState extends State { appState = getIt.get(); scheduleMicrotask(() { if (appState.isAuthenticated) { - labViewModel.initLabProvider(); insuranceViewModel.initInsuranceProvider(); medicalFileViewModel.setIsPatientSickLeaveListLoading(true); medicalFileViewModel.getPatientSickLeaveList(); @@ -458,6 +457,7 @@ class _MedicalFilePageState extends State { labOrderTests: labViewModel.isLabOrdersLoading ? [] : labViewModel.labOrderTests, isLoading: labViewModel.isLabOrdersLoading, ).onPress(() { + labViewModel.initLabProvider(); Navigator.of(context).push( CustomPageRoute( page: LabOrdersPage(), diff --git a/lib/presentation/medical_file/widgets/lab_rad_card.dart b/lib/presentation/medical_file/widgets/lab_rad_card.dart index 1a56baf..696b332 100644 --- a/lib/presentation/medical_file/widgets/lab_rad_card.dart +++ b/lib/presentation/medical_file/widgets/lab_rad_card.dart @@ -43,29 +43,29 @@ class LabRadCard extends StatelessWidget { Flexible(child: labelText.toText14(isBold: true).toShimmer2(isShow: false, radius: 6.r, height: 32.h)), ], ), - SizedBox(height: 16.h), - labOrderTests.isNotEmpty - ? ListView.separated( - scrollDirection: Axis.vertical, - padding: EdgeInsets.zero, - physics: NeverScrollableScrollPhysics(), - shrinkWrap: true, - itemBuilder: (cxt, index) { - return labOrderTests[index] - .toText12(isBold: true, maxLine: 1) - .toShimmer2(isShow: false, radius: 6.r, height: 24.h, width: 120.w) - .toShimmer2(isShow: isLoading); - }, - separatorBuilder: (cxt, index) => SizedBox(height: 8.h), - itemCount: 3, - ) - : "You don't have any records yet".needTranslation.toText13( - color: AppColors.greyTextColor, isCenter: true), + // SizedBox(height: 16.h), + // labOrderTests.isNotEmpty + // ? ListView.separated( + // scrollDirection: Axis.vertical, + // padding: EdgeInsets.zero, + // physics: NeverScrollableScrollPhysics(), + // shrinkWrap: true, + // itemBuilder: (cxt, index) { + // return labOrderTests[index] + // .toText12(isBold: true, maxLine: 1) + // .toShimmer2(isShow: false, radius: 6.r, height: 24.h, width: 120.w) + // .toShimmer2(isShow: isLoading); + // }, + // separatorBuilder: (cxt, index) => SizedBox(height: 8.h), + // itemCount: 3, + // ) + // : "You don't have any records yet".needTranslation.toText13( + // color: AppColors.greyTextColor, isCenter: true), SizedBox(height: 16.h), Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - SizedBox.shrink(), + "View All".toText12(isBold: true), Transform.flip( flipX: appState.isArabic(), child: Utils.buildSvgWithAssets( diff --git a/lib/widgets/countdown_timer.dart b/lib/widgets/countdown_timer.dart new file mode 100644 index 0000000..165a833 --- /dev/null +++ b/lib/widgets/countdown_timer.dart @@ -0,0 +1,111 @@ +import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; + +Widget buildTime(Duration duration, {bool isHomePage = false}) { + String twoDigits(int n) => n.toString().padLeft(2, '0'); + final hours = twoDigits(duration.inHours); + final minutes = twoDigits(duration.inMinutes.remainder(60)); + final seconds = twoDigits(duration.inSeconds.remainder(60)); + + return Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + buildTimeColumn(hours, "Hours".needTranslation), + buildTimeColumn(minutes, "Mins".needTranslation), + buildTimeColumn(seconds, "Secs".needTranslation, isLast: true), + ], + ); +} + +Widget buildTimeColumn(String time, String label, {bool isLast = false}) { + return Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + children: [ + buildDigit(time[0]), + buildDigit(time[1]), + if (!isLast) buildTimeSeparator(), + ], + ), + buildLabel(label), + ], + ); +} + +Widget buildDigit(String digit) { + return Container( + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4), + // margin: const EdgeInsets.symmetric(horizontal: 2), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + ), + child: ClipRect( + child: AnimatedSwitcher( + duration: const Duration(milliseconds: 600), + switchInCurve: Curves.easeOutExpo, + switchOutCurve: Curves.easeInExpo, + transitionBuilder: (Widget child, Animation animation) { + return Stack( + children: [ + SlideTransition( + position: Tween( + begin: const Offset(0, -1), + end: const Offset(0, 1), + ).animate(CurvedAnimation( + parent: animation, + curve: Curves.easeOutCubic, + )), + child: FadeTransition( + opacity: animation, + child: child, + ), + ), + SlideTransition( + position: Tween( + begin: const Offset(0, -1), + end: const Offset(0, 0), + ).animate(CurvedAnimation( + parent: animation, + curve: Curves.bounceIn, + )), + child: FadeTransition( + opacity: animation, + child: child, + ), + ), + ], + ); + }, + child: Text( + digit, + key: ValueKey(digit), + style: TextStyle( + fontWeight: FontWeight.bold, + color: Colors.black, + fontSize: 14.f, + ), + ), + ), + ), + ); +} + +Widget buildLabel(String label) { + return label.toText12(isBold: true); +} + +Widget buildTimeSeparator() { + return const Padding( + padding: EdgeInsets.symmetric(horizontal: 2.0), + child: Text( + ":", + style: TextStyle( + color: Colors.black, + fontSize: 20, + ), + ), + ); +} From e0e41d19007d8677949b3c09851424a1518ac504 Mon Sep 17 00:00:00 2001 From: tahaalam Date: Thu, 27 Nov 2025 16:13:30 +0300 Subject: [PATCH 11/22] calender reminder added on appointment and pescription --- lib/core/utils/calender_utils_new.dart | 130 +++++++++++++++--- .../prescriptions_view_model.dart | 15 ++ .../appointment_details_page.dart | 8 +- .../prescriptions/prescription_item_view.dart | 36 +++-- 4 files changed, 157 insertions(+), 32 deletions(-) diff --git a/lib/core/utils/calender_utils_new.dart b/lib/core/utils/calender_utils_new.dart index b4c4bd7..28084a9 100644 --- a/lib/core/utils/calender_utils_new.dart +++ b/lib/core/utils/calender_utils_new.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:device_calendar_plus/device_calendar_plus.dart'; +import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:jiffy/jiffy.dart' show Jiffy; class CalenderUtilsNew { @@ -25,34 +26,86 @@ class CalenderUtilsNew { } FutureOr createOrUpdateEvent({required String title, required String description, required String location, DateTime? scheduleDateTime, String? eventId, int? reminderMinutes}) async { - print("the reminder minutes are $reminderMinutes"); if (writableCalender.isEmpty) { await getCalenders(); } var writableCalendars = writableCalender.first; - - print("writableCalendars-name: " + writableCalendars.name); - print("writableCalendars-Id: " + writableCalendars.id); - print("writableCalendarsToString: " + writableCalendars.toString()); - print("writableCalendarsToString: " + writableCalendars!.id!); - + String eventResult = ""; CalendarPermissionStatus result = await DeviceCalendar.instance.hasPermissions(); if(result != CalendarPermissionStatus.granted) await DeviceCalendar.instance.requestPermissions(); print(result); - String eventResult = await DeviceCalendar.instance.createEvent( - calendarId: writableCalendars!.id, - title: title, - description: description, - startDate: scheduleDateTime!, - endDate: scheduleDateTime!.add(Duration(minutes: 30)), - reminderMinutes: reminderMinutes - ); - - print("the event Result is ${eventResult}"); - return eventResult.isNotEmpty; + + // String eventId = await getEventIdIfEventExist(title!.split("#").last); + // if (eventId.isEmpty) { + eventResult = await DeviceCalendar.instance.createEvent( + calendarId: writableCalendars!.id, + title: title, + description: description, + startDate: scheduleDateTime!, + endDate: scheduleDateTime!.add(Duration(minutes: 30)), + reminderMinutes: reminderMinutes); + return eventResult.isNotEmpty; + // } + + // await DeviceCalendar.instance.updateEvent( + // eventId: eventId, + // title: title, + // description: description, + // startDate: scheduleDateTime!, + // endDate: scheduleDateTime!.add(Duration(minutes: 30)), + // ); + + // return eventId.isNotEmpty; } + FutureOr createMultipleEvents( + {required int reminderMinutes, + int? frequencyNumber, + required int days, + required String orderDate, + required String itemDescriptionN, + required String route, + Function(String)? onFailure, + String? prescriptionNumber}) async { + DateTime currentDay = DateTime.now(); + DateTime actualDate = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day, 8, 0); + print("the frequency is $frequencyNumber"); + frequencyNumber ??= 2; //Some time frequency number is null so by default will be 2 + int interval = calculateIntervalAsPerFrequency(frequencyNumber); + // int remainingDays = days - (Jiffy.parseFromDateTime(DateTime.now()).diff(Jiffy.parseFromDateTime(DateUtil.convertStringToDate(orderDate)), unit: Unit.day) as int); + Duration difference = (actualDate.difference(DateUtil.convertStringToDate(orderDate))); + int remainingDays = 5; + // if (remainingDays.isNegative) { + // onFailure?.call("Prescription date has been already passed you can not add a reminder for this prescription."); + // return false; + // } + + bool statusOfOperation = false; + + for (int i = 0; i < remainingDays; i++) { + //event for number of days. + for (int j = 0; j < frequencyNumber; j++) { + statusOfOperation = await createOrUpdateEvent( + title: "$itemDescriptionN} Medication about to due for prescription , #$prescriptionNumber", + description: "$itemDescriptionN $frequencyNumber $route ", + scheduleDateTime: actualDate, + location: '', //event id with varitions + reminderMinutes: reminderMinutes + ); + if (!statusOfOperation) return false; + + actualDate = actualDate.add(Duration(hours: interval)); + // if (actualDate.difference(currentDay).inDays == 1) break; + } + // actualDate = actualDate.add(Duration(days: 1)); + } + return statusOfOperation; + } + + int calculateIntervalAsPerFrequency(int frequencyNumber) { + return 24 ~/ frequencyNumber; + } FutureOr> getEvents() async { var availableCalender = writableCalender.first; @@ -64,24 +117,41 @@ class CalenderUtilsNew { FutureOr checkIfEventExist(String admissionId) async { - if(writableCalender.isEmpty)return false; + if (writableCalender.isEmpty) { + await getCalenders(); + } List events = await getEvents(); if(events.isEmpty) return false; for(var event in events){ List title = event.title!.split("#"); - print("the splitted admission id is ${title}"); + if(title.contains(admissionId)) return true; } return false; } + FutureOr getEventIdIfEventExist(String admissionId) async { + if (writableCalender.isEmpty) { + await getCalenders(); + } + List events = await getEvents(); + if (events.isEmpty) return ""; + for (var event in events) { + List title = event.title!.split("#"); + if (title.contains(admissionId)) return event.eventId; + } + return ""; + } + FutureOr checkAndRemove({required String id}) async { - if(writableCalender.isEmpty)return false; + if (writableCalender.isEmpty) { + await getCalenders(); + } List events = await getEvents(); if(events.isEmpty) return false; for(var event in events){ List title = event.title!.split("#"); - print("the splitted admission id is ${title}"); + if(title.contains(id)) { calender.deleteEvent(eventId: event.eventId); return true; @@ -90,5 +160,21 @@ class CalenderUtilsNew { return false; } + FutureOr checkAndRemoveMultipleItems({required String id}) async { + if (writableCalender.isEmpty) { + await getCalenders(); + } + List events = await getEvents(); + if(events.isEmpty) return false; + bool statusOfOperation = false; + for(var event in events){ + List title = event.title.split("#"); + if(title.contains(id)) { + calender.deleteEvent(eventId: event.eventId); + statusOfOperation = true; + } + } + return statusOfOperation; + } } diff --git a/lib/features/prescriptions/prescriptions_view_model.dart b/lib/features/prescriptions/prescriptions_view_model.dart index aac25c1..0e6bce7 100644 --- a/lib/features/prescriptions/prescriptions_view_model.dart +++ b/lib/features/prescriptions/prescriptions_view_model.dart @@ -1,7 +1,10 @@ import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/dependencies.dart'; +import 'package:hmg_patient_app_new/core/utils/calender_utils_new.dart'; import 'package:hmg_patient_app_new/features/prescriptions/models/resp_models/patient_prescriptions_response_model.dart'; import 'package:hmg_patient_app_new/features/prescriptions/models/resp_models/prescription_detail_response_model.dart'; import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_repo.dart'; +import 'package:hmg_patient_app_new/services/dialog_service.dart'; import 'package:hmg_patient_app_new/services/error_handler_service.dart'; class PrescriptionsViewModel extends ChangeNotifier { @@ -40,6 +43,11 @@ class PrescriptionsViewModel extends ChangeNotifier { notifyListeners(); } + + checkIfReminderExistForPrescription(int index) async { + prescriptionDetailsList[index].hasReminder = await CalenderUtilsNew.instance.checkIfEventExist(prescriptionDetailsList[index].itemID?.toString() ?? ""); + } + setPrescriptionsDetailsLoading() { isPrescriptionsDetailsLoading = true; prescriptionDetailsList.clear(); @@ -121,6 +129,9 @@ class PrescriptionsViewModel extends ChangeNotifier { // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {}); } else if (apiResponse.messageStatus == 1) { prescriptionDetailsList = apiResponse.data!; + prescriptionDetailsList.forEach((element) async { + await checkIfReminderExistForPrescription(prescriptionDetailsList.indexOf(element)); + }); isPrescriptionsDetailsLoading = false; notifyListeners(); if (onSuccess != null) { @@ -173,4 +184,8 @@ class PrescriptionsViewModel extends ChangeNotifier { }, ); } + + showError(String errorMessage) { + getIt().showErrorBottomSheet(message: errorMessage); + } } diff --git a/lib/presentation/appointments/appointment_details_page.dart b/lib/presentation/appointments/appointment_details_page.dart index ba110a2..58958ee 100644 --- a/lib/presentation/appointments/appointment_details_page.dart +++ b/lib/presentation/appointments/appointment_details_page.dart @@ -73,7 +73,9 @@ class _AppointmentDetailsPageState extends State { var doesExist = await calendarUtils.checkIfEventExist("${widget.patientAppointmentHistoryResponseModel.appointmentNo}"); print("the appointment reminder exist $doesExist"); myAppointmentsViewModel.setAppointmentReminder(doesExist, widget.patientAppointmentHistoryResponseModel); + setState((){ + }); }); super.initState(); @@ -142,6 +144,10 @@ class _AppointmentDetailsPageState extends State { }, onCancelTap: () async { myAppointmentsViewModel.setIsAppointmentDataToBeLoaded(true); + var isEventAddedOrRemoved = await CalenderUtilsNew.instance.checkAndRemove( id:"${widget.patientAppointmentHistoryResponseModel.appointmentNo}", ); + setState(() { + myAppointmentsViewModel.setAppointmentReminder(isEventAddedOrRemoved, widget.patientAppointmentHistoryResponseModel); + }); LoaderBottomSheet.showLoader(loadingText: "Cancelling Appointment, Please Wait...".needTranslation); await myAppointmentsViewModel.cancelAppointment( patientAppointmentHistoryResponseModel: widget.patientAppointmentHistoryResponseModel, @@ -323,7 +329,7 @@ class _AppointmentDetailsPageState extends State { }else { isEventAddedOrRemoved = await calender.checkAndRemove( id:"${widget.patientAppointmentHistoryResponseModel.appointmentNo}", ); setState(() { - myAppointmentsViewModel.setAppointmentReminder(isEventAddedOrRemoved, widget.patientAppointmentHistoryResponseModel); + myAppointmentsViewModel.setAppointmentReminder(!isEventAddedOrRemoved, widget.patientAppointmentHistoryResponseModel); }); } diff --git a/lib/presentation/prescriptions/prescription_item_view.dart b/lib/presentation/prescriptions/prescription_item_view.dart index acf03f5..39a0b05 100644 --- a/lib/presentation/prescriptions/prescription_item_view.dart +++ b/lib/presentation/prescriptions/prescription_item_view.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_export.dart'; import 'package:hmg_patient_app_new/core/utils/calendar_utils.dart'; +import 'package:hmg_patient_app_new/core/utils/calender_utils_new.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; @@ -10,6 +11,7 @@ import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_view_mo import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; +import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; class PrescriptionItemView extends StatelessWidget { int index; @@ -154,9 +156,14 @@ class PrescriptionItemView extends StatelessWidget { activeTrackColor: AppColors.successColor.withValues(alpha: .15), value: isLoading ? false : prescriptionVM.prescriptionDetailsList[index].hasReminder!, onChanged: (newValue) async { + CalenderUtilsNew calender = CalenderUtilsNew.instance; + if (prescriptionVM.prescriptionDetailsList[index].hasReminder ?? false) { - await checkAndRemove(prescriptionVM.prescriptionDetailsList[index].hasReminder, delete: true); - prescriptionVM.notify(); + LoaderBottomSheet.showLoader(loadingText: "Removing Reminders"); + bool resultValue = await calender.checkAndRemoveMultipleItems(id:prescriptionVM.prescriptionDetailsList[index].itemID.toString()); + + prescriptionVM.setPrescriptionItemReminder(newValue, prescriptionVM.prescriptionDetailsList[index]); + LoaderBottomSheet.hideLoader(); return; } @@ -173,18 +180,29 @@ class PrescriptionItemView extends StatelessWidget { description: "${prescriptionVM.prescriptionDetailsList[index].itemDescription} ${prescriptionVM.prescriptionDetailsList[index].frequency} ${prescriptionVM.prescriptionDetailsList[index].route} ", onSuccess: () { - prescriptionVM.setPrescriptionItemReminder(newValue, prescriptionVM.prescriptionDetailsList[index]); + }, isMultiAllowed: true, - onMultiDateSuccess: (int selectedIndex) { - setCalender(context, - eventId: prescriptionVM.prescriptionDetailsList[index].itemID.toString(), - selectedMinutes: selectedIndex, + onMultiDateSuccess: (int selectedIndex) async{ + bool isEventAdded = await calender.createMultipleEvents( + reminderMinutes: selectedIndex, frequencyNumber: prescriptionVM.prescriptionDetailsList[index].frequencyNumber?.toInt(), - days: prescriptionVM.prescriptionDetailsList[index].days!.toInt(), + days: prescriptionVM.prescriptionDetailsList[index].days!.toInt(), orderDate: prescriptionVM.prescriptionDetailsList[index].orderDate!, itemDescriptionN: prescriptionVM.prescriptionDetailsList[index].itemDescription!, - route: prescriptionVM.prescriptionDetailsList[index].route!); + route: prescriptionVM.prescriptionDetailsList[index].route!, + onFailure: (errorMessage)=> prescriptionVM.showError(errorMessage), + prescriptionNumber: prescriptionVM.prescriptionDetailsList[index].itemID.toString(), + ); + prescriptionVM.setPrescriptionItemReminder(isEventAdded, prescriptionVM.prescriptionDetailsList[index]); + // setCalender(context, + // eventId: prescriptionVM.prescriptionDetailsList[index].itemID.toString(), + // selectedMinutes: selectedIndex, + // frequencyNumber: prescriptionVM.prescriptionDetailsList[index].frequencyNumber?.toInt(), + // days: prescriptionVM.prescriptionDetailsList[index].days!.toInt(), + // orderDate: prescriptionVM.prescriptionDetailsList[index].orderDate!, + // itemDescriptionN: prescriptionVM.prescriptionDetailsList[index].itemDescription!, + // route: prescriptionVM.prescriptionDetailsList[index].route!); }, ); }, From e200479332a321fc0a840c34dc8e57b2962f5518 Mon Sep 17 00:00:00 2001 From: tahaalam Date: Sun, 30 Nov 2025 10:27:42 +0300 Subject: [PATCH 12/22] old calender util deleted --- lib/core/utils/calendar_utils.dart | 316 ------------------ .../appointment_details_page.dart | 3 +- .../prescription_detail_page.dart | 2 - .../prescriptions/prescription_item_view.dart | 4 +- lib/widgets/common_bottom_sheet.dart | 54 +++ 5 files changed, 57 insertions(+), 322 deletions(-) delete mode 100644 lib/core/utils/calendar_utils.dart diff --git a/lib/core/utils/calendar_utils.dart b/lib/core/utils/calendar_utils.dart deleted file mode 100644 index 2068db9..0000000 --- a/lib/core/utils/calendar_utils.dart +++ /dev/null @@ -1,316 +0,0 @@ -import 'dart:async'; -import 'dart:collection'; -import 'dart:convert'; -import 'dart:io'; -import 'dart:ui'; - -import 'package:device_calendar/device_calendar.dart'; -import 'package:flutter/widgets.dart'; -import 'package:hmg_patient_app_new/core/dependencies.dart'; -import 'package:hmg_patient_app_new/core/utils/date_util.dart'; -import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; -import 'package:hmg_patient_app_new/presentation/prescriptions/prescription_reminder_view.dart'; -import 'package:hmg_patient_app_new/services/dialog_service.dart'; -import 'package:hmg_patient_app_new/services/permission_service.dart'; -import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; -import 'package:jiffy/jiffy.dart'; -import 'package:manage_calendar_events/manage_calendar_events.dart' as ios; -import 'package:permission_handler/permission_handler.dart'; -import 'package:timezone/data/latest.dart' as tzl; - -final DeviceCalendarPlugin deviceCalendarPlugin = DeviceCalendarPlugin(); -final ios.CalendarPlugin _myPlugin = ios.CalendarPlugin(); - -class CalendarUtils { - static Completer? _completer; - - dynamic get writableCalendars => calendars.firstWhere((c) => !c.isReadOnly!); - dynamic calendars; - - CalendarUtils._(this.calendars); - - // static Future getInstance() async { - // if (_completer == null) { - // _completer = Completer(); - // print(_completer!.isCompleted); - // try { - // final dynamic calendarsResult; - // if (Platform.isIOS) { - // calendarsResult = await _myPlugin.getCalendars(); - // if (!_completer!.isCompleted) { - // _completer?.complete(CalendarUtils._(await calendarsResult!)); - // } - // } else { - // calendarsResult = await deviceCalendarPlugin.retrieveCalendars(); - // if (!_completer!.isCompleted) { - // _completer?.complete(CalendarUtils._(await calendarsResult.data!)); - // } - // } - // } on Exception catch (e) { - // if (!_completer!.isCompleted) { - // _completer!.completeError(e); - // } - // } - // } - // return _completer!.future; - // } - - static Future getInstance() async { - tzl.initializeTimeZones(); - if (_completer != null) { - return _completer!.future; - } - _completer = Completer(); - try { - final dynamic calendarsResult; - if (Platform.isIOS) { - calendarsResult = await _myPlugin.getCalendars(); - _completer!.complete(CalendarUtils._(calendarsResult)); - } else { - calendarsResult = await deviceCalendarPlugin.retrieveCalendars(); - _completer!.complete(CalendarUtils._(calendarsResult.data)); - } - } catch (e) { - _completer!.completeError(e); - } - - return _completer!.future; - } - - Future createOrUpdateEvents({List? scheduleList, String? title, String? description, List? scheduleDateTime, List? daysOfWeek}) async { - tzl.initializeTimeZones(); - List events = []; - Location _currentLocation; - if (DateTime.now().timeZoneName == "+04") - _currentLocation = getLocation('Asia/Dubai'); - else - _currentLocation = getLocation('Asia/Riyadh'); - - scheduleDateTime!.forEach((element) { - RecurrenceRule recurrenceRule = RecurrenceRule( - // RecurrenceFrequency.Daily, - // daysOfWeek: daysOfWeek, - // endDate: element, - until: element, frequency: Frequency.daily, - ); - //added byAamir Tz Time - Event event = Event(writableCalendars!.id, - recurrenceRule: recurrenceRule, - start: TZDateTime.from(element, _currentLocation), - end: TZDateTime.from(element.add(Duration(minutes: 30)), _currentLocation), - title: title, - description: description); - events.add(event); - }); - - events.forEach((element) { - deviceCalendarPlugin.createOrUpdateEvent(element); - }); - } - - Future createOrUpdateEvent({required String title, required String description, required String location, DateTime? scheduleDateTime, String? eventId}) async { - RecurrenceRule recurrenceRule = RecurrenceRule( - // RecurrenceFrequency.Daily, - // daysOfWeek: daysOfWeek, - // endDate: scheduleDateTime, - until: scheduleDateTime, frequency: Frequency.daily, - ); - - Location _currentLocation; - // if (DateTime.now().timeZoneName == "+04") - // _currentLocation = getLocation('Asia/Dubai'); - // else - _currentLocation = getLocation('Asia/Riyadh'); - - TZDateTime scheduleDateTimeUTZ = TZDateTime.from(scheduleDateTime!, _currentLocation); - - print("writableCalendars-name: " + writableCalendars.name); - print("writableCalendars-Id: " + writableCalendars.id); - print("writableCalendarsToString: " + writableCalendars.toString()); - print("writableCalendarsToString: " + writableCalendars!.id!); - Event event = Event( - writableCalendars!.id, - start: scheduleDateTimeUTZ, - end: scheduleDateTimeUTZ.add(Duration(minutes: 30)), - title: title, - description: description, - ); - - ios.CalendarEvent iosCalEvent = - ios.CalendarEvent(location: location, startDate: scheduleDateTimeUTZ, endDate: scheduleDateTimeUTZ.add(Duration(minutes: 30)), title: title, description: description, isAllDay: false); - - if (Platform.isAndroid) { - Result result = await deviceCalendarPlugin.hasPermissions(); - print(result); - await deviceCalendarPlugin.createOrUpdateEvent(event).catchError((e) { - print("catchError " + e.toString()); - }).whenComplete(() { - print("whenComplete Calender ID " + eventId!); - }); - } else { - await _myPlugin.createEvent(calendarId: writableCalendars.id!, event: iosCalEvent).catchError((e) { - print("catchError " + e.toString()); - }).whenComplete(() { - print("whenComplete Calender ID iOS " + eventId!); - }); - } - } - - deleteEvent(String _calendarId, String _eventId) async { - if (Platform.isIOS) { - await _myPlugin.deleteEvent(calendarId: _calendarId, eventId: _eventId); - } else { - await deviceCalendarPlugin.deleteEvent(_calendarId, _eventId); - } - } - - Future retrieveEvents( - String calendarId, - RetrieveEventsParams retrieveEventsParams, - ) async { - if (Platform.isIOS) { - return await _myPlugin.getEvents(calendarId: calendarId); - } else { - return await deviceCalendarPlugin.retrieveEvents(calendarId, retrieveEventsParams); - } - } - - Future createCalendar( - String calendarName, { - Color? calendarColor, - String? localAccountName, - }) async { - return await deviceCalendarPlugin.createCalendar(calendarName, calendarColor: calendarColor, localAccountName: localAccountName); - } -} - -Future> requestPermissions() async { - var permissionResults = [Permission.calendarFullAccess].request(); - return permissionResults; -} - -showReminderBottomSheet(BuildContext context, DateTime dateTime, String doctorName, String eventId, String appoDateFormatted, String appoTimeFormatted, - {required Function() onSuccess, String? title, String? description, Function(int)? onMultiDateSuccess, bool isMultiAllowed = false}) async { - if (Platform.isAndroid) { - if (await PermissionService.isCalendarPermissionEnabled()) { - _showReminderBottomSheet(context, dateTime, doctorName, eventId, appoDateFormatted, appoTimeFormatted, - onSuccess: onSuccess, title: title, description: description, onMultiDateSuccess: onMultiDateSuccess, isMultiAllowed: isMultiAllowed); - } else { - // Utils.showPermissionConsentDialog(context, TranslationBase.of(context).calendarPermission, () async { - // if (await Permission.calendarFullAccess.request().isGranted) { - // _showReminderDialog(context, dateTime, doctorName, eventId, appoDateFormatted, appoTimeFormatted, - // onSuccess: onSuccess, title: title, description: description, onMultiDateSuccess: onMultiDateSuccess, isMultiAllowed: isMultiAllowed); - // } - // }); - } - } else { - if (await Permission.calendarWriteOnly.request().isGranted) { - if (await Permission.calendarFullAccess.request().isGranted) { - _showReminderBottomSheet(context, dateTime, doctorName, eventId, appoDateFormatted, appoTimeFormatted, - onSuccess: onSuccess, title: title, description: description, onMultiDateSuccess: onMultiDateSuccess, isMultiAllowed: isMultiAllowed); - } - } - } -} - -Future _showReminderBottomSheet(BuildContext providedContext, DateTime dateTime, String doctorName, String eventId, String appoDateFormatted, String appoTimeFormatted, - {required Function onSuccess, String? title, String? description, Function(int)? onMultiDateSuccess, bool? isMultiAllowed}) async { - showCommonBottomSheetWithoutHeight(providedContext, title: "Set the timer of reminder".needTranslation, child: PrescriptionReminderView( - setReminder: (int value) async { - if (!isMultiAllowed!) { - if (onMultiDateSuccess == null) { - CalendarUtils calendarUtils = await CalendarUtils.getInstance(); - await calendarUtils.createOrUpdateEvent( - title: title ?? "You have appointment with Dr. ".needTranslation + doctorName, - description: description ?? "At " + appoDateFormatted + " " + appoTimeFormatted, - scheduleDateTime: dateTime, - eventId: eventId, - location: ''); - onSuccess(); - } - } else { - onMultiDateSuccess!(value); - } - }, - ), callBackFunc: () {}, isFullScreen: false); -} - -setCalender(BuildContext context, - {required String eventId, required int selectedMinutes, int? frequencyNumber, required int days, required String orderDate, required String itemDescriptionN, required String route}) async { - DateTime actualDate = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day, 8, 0); - frequencyNumber ??= 2; //Some time frequency number is null so by default will be 2 - - int remainingDays = days - (Jiffy.parseFromDateTime(DateTime.now()).diff(Jiffy.parseFromDateTime(DateUtil.convertStringToDate(orderDate)), unit: Unit.day) as int); - if (remainingDays.isNegative) { - getIt.get().showErrorBottomSheet(message: "Prescription date has been already passed you can not add a reminder for this prescription."); - return; - } - CalendarUtils calendarUtils = await CalendarUtils.getInstance(); - - try { - for (int i = 0; i < remainingDays; i++) { - //event for number of days. - for (int j = 0; j < frequencyNumber; j++) { - // event for number of times per day. - if (j != 0) { - actualDate.add(new Duration(hours: 8)); // 8 hours addition for daily dose. - } - //Time subtraction from actual reminder time. like before 30, or 1 hour. - - actualDate = Jiffy.parseFromDateTime(actualDate).subtract(minutes: selectedMinutes).dateTime; - - calendarUtils.createOrUpdateEvent( - title: "$itemDescriptionN} Prescription Reminder", - description: "$itemDescriptionN $frequencyNumber $route ", - scheduleDateTime: actualDate, - eventId: eventId + (i.toString() + j.toString()), - location: '', //event id with varitions - ); - - actualDate = DateTime(actualDate.year, actualDate.month, actualDate.day, 8, 0); - } - actualDate = Jiffy.parseFromDateTime(actualDate).add(days: 1).dateTime; - } - } catch (ex) { - getIt.get().showErrorBottomSheet(message: "catch:$ex"); - } -} - -Future checkAndRemove(hasReminder, {bool delete = false, String itemDescriptionN = ""}) async { - final ios.CalendarPlugin _myPlugin = ios.CalendarPlugin(); - CalendarUtils calendarUtils = await CalendarUtils.getInstance(); - DateTime startEventsDate = Jiffy.parseFromDateTime(DateTime.now()).subtract(days: 30).dateTime; - DateTime endEventsDate = Jiffy.parseFromDateTime(DateTime.now()).add(days: 120).dateTime; - RetrieveEventsParams params = RetrieveEventsParams(startDate: startEventsDate, endDate: endEventsDate); - - if (calendarUtils.calendars != null) { - if (Platform.isAndroid) { - await processEvents(calendarUtils.calendars, calendarUtils, params, delete, itemDescriptionN, hasReminder); - } else { - List? iosCalendars = await _myPlugin.getCalendars(); - if (iosCalendars != null) { - await processEvents(iosCalendars.map((cal) => Calendar(id: cal.id, name: cal.name, accountName: cal.accountName)).toList(), calendarUtils, params, delete, itemDescriptionN, hasReminder); - } - } - } -} - -Future processEvents(List calendars, calendarUtils, params, delete, String itemDescriptionN, hasReminder) async { - for (var calendar in calendars) { - Result> events = await calendarUtils.retrieveEvents(calendar.id!, params); - for (var event in events.data!) { - if (event.title!.contains(itemDescriptionN)) { - if (delete) { - await calendarUtils.deleteEvent(calendar, event); - // AppToast.showSuccessToast(message: TranslationBase.of(context).reminderCancelSuccess); - hasReminder = false; - } else { - hasReminder = false; - // setState(() { - // hasReminder = true; - // }); - } - } - } - } -} diff --git a/lib/presentation/appointments/appointment_details_page.dart b/lib/presentation/appointments/appointment_details_page.dart index 58958ee..d80d32e 100644 --- a/lib/presentation/appointments/appointment_details_page.dart +++ b/lib/presentation/appointments/appointment_details_page.dart @@ -8,7 +8,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_state.dart'; -import 'package:hmg_patient_app_new/core/utils/calendar_utils.dart'; import 'package:hmg_patient_app_new/core/utils/calender_utils_new.dart'; import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; @@ -293,7 +292,7 @@ class _AppointmentDetailsPageState extends State { DateTime startDate = DateTime.now(); DateTime endDate = DateUtil.convertStringToDate(widget .patientAppointmentHistoryResponseModel.appointmentDate); - showReminderBottomSheet( + BottomSheetUtils().showReminderBottomSheet( context, endDate, widget.patientAppointmentHistoryResponseModel.doctorNameObj??"", diff --git a/lib/presentation/prescriptions/prescription_detail_page.dart b/lib/presentation/prescriptions/prescription_detail_page.dart index d5e8138..a38ff92 100644 --- a/lib/presentation/prescriptions/prescription_detail_page.dart +++ b/lib/presentation/prescriptions/prescription_detail_page.dart @@ -4,7 +4,6 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; -import 'package:hmg_patient_app_new/core/utils/calendar_utils.dart'; import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; @@ -41,7 +40,6 @@ class _PrescriptionDetailPageState extends State { @override void initState() { - checkAndRemove(false); // locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context); // WidgetsBinding.instance.addPostFrameCallback((_) => locationUtils.getCurrentLocation()); if (!widget.isFromAppointments) { diff --git a/lib/presentation/prescriptions/prescription_item_view.dart b/lib/presentation/prescriptions/prescription_item_view.dart index 39a0b05..100d963 100644 --- a/lib/presentation/prescriptions/prescription_item_view.dart +++ b/lib/presentation/prescriptions/prescription_item_view.dart @@ -2,7 +2,6 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_export.dart'; -import 'package:hmg_patient_app_new/core/utils/calendar_utils.dart'; import 'package:hmg_patient_app_new/core/utils/calender_utils_new.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; @@ -11,6 +10,7 @@ import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_view_mo import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; +import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; class PrescriptionItemView extends StatelessWidget { @@ -169,7 +169,7 @@ class PrescriptionItemView extends StatelessWidget { DateTime startDate = DateTime.now(); DateTime endDate = DateTime(startDate.year, startDate.month, startDate.day + prescriptionVM.prescriptionDetailsList[index].days!.toInt()); - showReminderBottomSheet( + BottomSheetUtils().showReminderBottomSheet( context, endDate, "", diff --git a/lib/widgets/common_bottom_sheet.dart b/lib/widgets/common_bottom_sheet.dart index 99ff230..9312519 100644 --- a/lib/widgets/common_bottom_sheet.dart +++ b/lib/widgets/common_bottom_sheet.dart @@ -1,11 +1,65 @@ +import 'dart:io' show Platform; + import 'package:flutter/material.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_export.dart'; +import 'package:hmg_patient_app_new/core/utils/calender_utils_new.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/presentation/prescriptions/prescription_reminder_view.dart'; +import 'package:hmg_patient_app_new/services/permission_service.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; +import 'package:permission_handler/permission_handler.dart'; + +class BottomSheetUtils{ + showReminderBottomSheet(BuildContext context, DateTime dateTime, String doctorName, String eventId, String appoDateFormatted, String appoTimeFormatted, + {required Function() onSuccess, String? title, String? description, Function(int)? onMultiDateSuccess, bool isMultiAllowed = false}) async { + if (Platform.isAndroid) { + if (await PermissionService.isCalendarPermissionEnabled()) { + _showReminderBottomSheet(context, dateTime, doctorName, eventId, appoDateFormatted, appoTimeFormatted, + onSuccess: onSuccess, title: title, description: description, onMultiDateSuccess: onMultiDateSuccess, isMultiAllowed: isMultiAllowed); + } else { + // Utils.showPermissionConsentDialog(context, TranslationBase.of(context).calendarPermission, () async { + // if (await Permission.calendarFullAccess.request().isGranted) { + // _showReminderDialog(context, dateTime, doctorName, eventId, appoDateFormatted, appoTimeFormatted, + // onSuccess: onSuccess, title: title, description: description, onMultiDateSuccess: onMultiDateSuccess, isMultiAllowed: isMultiAllowed); + // } + // }); + } + } else { + if (await Permission.calendarWriteOnly.request().isGranted) { + if (await Permission.calendarFullAccess.request().isGranted) { + _showReminderBottomSheet(context, dateTime, doctorName, eventId, appoDateFormatted, appoTimeFormatted, + onSuccess: onSuccess, title: title, description: description, onMultiDateSuccess: onMultiDateSuccess, isMultiAllowed: isMultiAllowed); + } + } + } + } + + Future _showReminderBottomSheet(BuildContext providedContext, DateTime dateTime, String doctorName, String eventId, String appoDateFormatted, String appoTimeFormatted, + {required Function onSuccess, String? title, String? description, Function(int)? onMultiDateSuccess, bool? isMultiAllowed}) async { + showCommonBottomSheetWithoutHeight(providedContext, title: "Set the timer of reminder".needTranslation, child: PrescriptionReminderView( + setReminder: (int value) async { + if (!isMultiAllowed!) { + if (onMultiDateSuccess == null) { + CalenderUtilsNew calendarUtils = CalenderUtilsNew.instance; + await calendarUtils.createOrUpdateEvent( + title: title ?? "You have appointment with Dr. ".needTranslation + doctorName, + description: description ?? "At " + appoDateFormatted + " " + appoTimeFormatted, + scheduleDateTime: dateTime, + eventId: eventId, + location: ''); + onSuccess(); + } + } else { + onMultiDateSuccess!(value); + } + }, + ), callBackFunc: () {}, isFullScreen: false); + } +} void showCommonBottomSheet(BuildContext context, {required Widget child, Function(String?)? callBackFunc, From ddac155a6a256152910a96d756578421a2a366fa Mon Sep 17 00:00:00 2001 From: Sultan khan Date: Sun, 30 Nov 2025 11:11:32 +0300 Subject: [PATCH 13/22] silent login case handled. --- lib/core/api_consts.dart | 2 +- lib/features/authentication/authentication_repo.dart | 6 ++++++ lib/presentation/e_referral/new_e_referral.dart | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index 2be40d0..3ae8d4c 100644 --- a/lib/core/api_consts.dart +++ b/lib/core/api_consts.dart @@ -710,7 +710,7 @@ var GET_PRESCRIPTION_INSTRUCTIONS_PDF = 'Services/ChatBot_Service.svc/REST/Chatb class ApiConsts { static const maxSmallScreen = 660; - static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod; + static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat; // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT diff --git a/lib/features/authentication/authentication_repo.dart b/lib/features/authentication/authentication_repo.dart index d566996..6ecf4b1 100644 --- a/lib/features/authentication/authentication_repo.dart +++ b/lib/features/authentication/authentication_repo.dart @@ -265,6 +265,12 @@ class AuthenticationRepoImp implements AuthenticationRepo { newRequest.isDentalAllowedBackend = false; newRequest.forRegisteration = newRequest.isRegister ?? false; newRequest.isRegister = false; + //silent login case removed token and login token + if(newRequest.logInTokenID.isEmpty && newRequest.isSilentLogin == true) { + newRequest.logInTokenID = null; + newRequest.deviceToken = null; + } + } Map familyRequest = {}; diff --git a/lib/presentation/e_referral/new_e_referral.dart b/lib/presentation/e_referral/new_e_referral.dart index c736216..b28b8df 100644 --- a/lib/presentation/e_referral/new_e_referral.dart +++ b/lib/presentation/e_referral/new_e_referral.dart @@ -47,7 +47,9 @@ class _NewReferralPageState extends State { @override void initState() { super.initState(); - _loadData(); + WidgetsBinding.instance.addPostFrameCallback((_) { + _loadData(); + }); } void _handleNextStep() { @@ -144,6 +146,9 @@ class _NewReferralPageState extends State { } void _loadData() { + + + final authVM = context.read(); final habibWalletVM = context.read(); final hmgServicesVM = context.read(); From 36bf63dcde06aba07d09adb01da4d3b5c0f38c0d Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Thu, 4 Dec 2025 12:18:15 +0300 Subject: [PATCH 14/22] Incoming call updates --- android/app/src/main/AndroidManifest.xml | 10 +- assets/images/png/zoom/chat-send@2x.png | Bin 0 -> 1407 bytes assets/images/png/zoom/chat-send@3x.png | Bin 0 -> 1981 bytes assets/images/png/zoom/default-avatar.png | Bin 0 -> 2770 bytes assets/images/png/zoom/hamburger@2x.png | Bin 0 -> 222 bytes assets/images/png/zoom/hamburger@3x.png | Bin 0 -> 412 bytes assets/images/png/zoom/index.ts | 22 + assets/images/png/zoom/locked@2x.png | Bin 0 -> 376 bytes assets/images/png/zoom/locked@3x.png | Bin 0 -> 567 bytes assets/images/png/zoom/more@2x.png | Bin 0 -> 5529 bytes assets/images/png/zoom/more@3x.png | Bin 0 -> 10541 bytes assets/images/png/zoom/mute@2x.png | Bin 0 -> 5853 bytes assets/images/png/zoom/mute@3x.png | Bin 0 -> 11098 bytes assets/images/png/zoom/muted@2x.png | Bin 0 -> 2031 bytes assets/images/png/zoom/muted@3x.png | Bin 0 -> 2083 bytes assets/images/png/zoom/question-ballon@2x.png | Bin 0 -> 877 bytes assets/images/png/zoom/question-ballon@3x.png | Bin 0 -> 1247 bytes assets/images/png/zoom/share-off@2x.png | Bin 0 -> 12954 bytes assets/images/png/zoom/share-off@3x.png | Bin 0 -> 24051 bytes assets/images/png/zoom/share-on@2x.png | Bin 0 -> 9493 bytes assets/images/png/zoom/share-on@3x.png | Bin 0 -> 17857 bytes assets/images/png/zoom/speaker-off.png | Bin 0 -> 2022 bytes assets/images/png/zoom/speaker-on.png | Bin 0 -> 1642 bytes assets/images/png/zoom/switch-camera.png | Bin 0 -> 2187 bytes assets/images/png/zoom/talking@2x.png | Bin 0 -> 2063 bytes assets/images/png/zoom/talking@3x.png | Bin 0 -> 2179 bytes assets/images/png/zoom/unlocked@2x.png | Bin 0 -> 384 bytes assets/images/png/zoom/unlocked@3x.png | Bin 0 -> 634 bytes assets/images/png/zoom/unmute@2x.png | Bin 0 -> 7451 bytes assets/images/png/zoom/unmute@3x.png | Bin 0 -> 13799 bytes assets/images/png/zoom/video-off@2x.png | Bin 0 -> 12830 bytes assets/images/png/zoom/video-off@3x.png | Bin 0 -> 24545 bytes assets/images/png/zoom/video-on@2x.png | Bin 0 -> 13948 bytes assets/images/png/zoom/video-on@3x.png | Bin 0 -> 27205 bytes lib/core/api/api_client.dart | 8 +- lib/core/api_consts.dart | 10 +- lib/core/app_assets.dart | 2 + lib/core/cache_consts.dart | 3 + lib/core/utils/jwt.dart | 38 + lib/core/utils/push_notification_handler.dart | 89 +- lib/core/utils/utils.dart | 6 +- lib/core/utils/zoom_config.dart | 4 + lib/extensions/string_extensions.dart | 4 +- .../book_appointments_view_model.dart | 2 +- .../immediate_livecare_view_model.dart | 3 - .../insurance/insurance_view_model.dart | 2 + lib/features/lab/lab_view_model.dart | 9 +- .../widgets/appointment_card.dart | 57 +- .../ask_doctor_request_type_select.dart | 27 +- lib/presentation/authentication/login.dart | 3 +- .../book_appointment_page.dart | 110 + .../book_appointment/doctor_profile_page.dart | 51 +- .../immediate_livecare_payment_details.dart | 157 +- ...select_immediate_livecare_clinic_page.dart | 29 - .../widgets/livecare_clinic_card.dart | 21 +- .../widgets/select_livecare_call_type.dart | 91 +- lib/presentation/home/landing_page.dart | 43 +- lib/presentation/lab/lab_orders_page.dart | 2 +- .../lab_result_via_clinic/LabResultList.dart | 2 +- .../lab/lab_results/lab_result_details.dart | 137 +- .../medical_file/medical_file_page.dart | 17 +- .../medical_file_appointment_card.dart | 2 +- .../widgets/medical_file_card.dart | 2 +- .../tele_consultation/zoom/call_screen.dart | 1840 +++++++++++++++++ .../tele_consultation/zoom/video_view.dart | 258 +++ lib/routes/app_routes.dart | 5 +- lib/splashPage.dart | 148 +- lib/widgets/chip/app_custom_chip_widget.dart | 8 +- pubspec.yaml | 5 +- 69 files changed, 2907 insertions(+), 320 deletions(-) create mode 100644 assets/images/png/zoom/chat-send@2x.png create mode 100644 assets/images/png/zoom/chat-send@3x.png create mode 100644 assets/images/png/zoom/default-avatar.png create mode 100644 assets/images/png/zoom/hamburger@2x.png create mode 100644 assets/images/png/zoom/hamburger@3x.png create mode 100644 assets/images/png/zoom/index.ts create mode 100644 assets/images/png/zoom/locked@2x.png create mode 100644 assets/images/png/zoom/locked@3x.png create mode 100644 assets/images/png/zoom/more@2x.png create mode 100644 assets/images/png/zoom/more@3x.png create mode 100644 assets/images/png/zoom/mute@2x.png create mode 100644 assets/images/png/zoom/mute@3x.png create mode 100644 assets/images/png/zoom/muted@2x.png create mode 100644 assets/images/png/zoom/muted@3x.png create mode 100644 assets/images/png/zoom/question-ballon@2x.png create mode 100644 assets/images/png/zoom/question-ballon@3x.png create mode 100644 assets/images/png/zoom/share-off@2x.png create mode 100644 assets/images/png/zoom/share-off@3x.png create mode 100644 assets/images/png/zoom/share-on@2x.png create mode 100644 assets/images/png/zoom/share-on@3x.png create mode 100644 assets/images/png/zoom/speaker-off.png create mode 100644 assets/images/png/zoom/speaker-on.png create mode 100644 assets/images/png/zoom/switch-camera.png create mode 100644 assets/images/png/zoom/talking@2x.png create mode 100644 assets/images/png/zoom/talking@3x.png create mode 100644 assets/images/png/zoom/unlocked@2x.png create mode 100644 assets/images/png/zoom/unlocked@3x.png create mode 100644 assets/images/png/zoom/unmute@2x.png create mode 100644 assets/images/png/zoom/unmute@3x.png create mode 100644 assets/images/png/zoom/video-off@2x.png create mode 100644 assets/images/png/zoom/video-off@3x.png create mode 100644 assets/images/png/zoom/video-on@2x.png create mode 100644 assets/images/png/zoom/video-on@3x.png create mode 100644 lib/core/utils/jwt.dart create mode 100644 lib/core/utils/zoom_config.dart create mode 100644 lib/presentation/tele_consultation/zoom/call_screen.dart create mode 100644 lib/presentation/tele_consultation/zoom/video_view.dart diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 6a1c47e..4f7ef74 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -30,9 +30,6 @@ - @@ -91,6 +88,12 @@ + + + + + + @@ -115,6 +118,7 @@ #@0OuK zQkg=kguPM55@!S}4FfF21k&`Cw*`~0A_XllTOQk{mH;g8BVjSolXHZ#mOvtBX9w+u zelhBXeVHc{@?hV{9Y%4Ck;2`Qr+s7d+G{^W*}kqo$;{(X&afz(X>=Br0J~C8s8E5( zl^kB2k&WIgC^*QzDmH~r*OYIqjJ*aaAB5N`d)%9*PG!vSPQ8{|b4yQLUx z7}ADw2qRDk9Hn6ygN#672=KF9Fn$JxKp4azhantkJhCP-_0J)sj0M$!1kyBqd@M*A zfey#GSUnO@#K?OmF!fO{26`h;lqhHQuRW}+@8W*Jfht)4^kab|GXDNcSi0DccHsWg z5=O4t*m!>A({fSbVqbjtGTMdHulC^5xn8KEBV!P`yDF3jv?6`KQ&A$&(%oIm-TV*j z!qOi*P=zuVo0kHOd|!}3Qe6gVhM({5xED+nN@LLa!xF}?+uB5;hQ6 z1+1>CyNXenT-;E8abn40RD(<|ZZ;g3Xuse8d4Ws6Y+?ODv7vqGSnCf;P>r%mItVg% zD%|ELlA#qgiSp;eq71CNvJ&2{6nF!&l$k%3jB=P*T+1g`fd~qiccfLUPNifK=NW96 zC_Yo?PU7+>uSEKN+Lz*9T*NLAL05R_yQdg>yT^Mk`$|Dwfq|0@3+Iy1Rfr0u^o85c5hpDbC=7C`xru1;#wX6WQ;k-EPRluih4Xz) z^_?y+Z?&Y}(k2jzv-^*gc_A>ZXa~fHSAG0YflCSTY8&91MXlIBVQ70)^tBC&y{I1{eY%Z8$yQ z>n+z{sD?BlZM-^2upeNkf!%Qb`fvNEALZrSGz=1ve|GJScd1pWq#eP&g26?A&-(3( zK<;zm0>;%KvehfX?CXnhB(BJpF3xHq&&Bp^^(XrTa-+5=ekM1x&~=FXo+y26XW!Y^ zH$Bjsx3h0qT$IMTOC)iR#MzPOUi(epaEB+-i4VFUCJBl;(yao;A?nTndyAf6ro&1A z62_95`=Y;yNf-?*@unSVGQ5-)iQzJr9ufh3oGyCRplpPzsiy)QBr;11pbH>jK z;Vu)Hc7KRf9u7|7=ua^=JJ(~w9{?1vg%?L{hMqMCv`pYut~LnQ<9|fTEqd)Zrf>iN N002ovPDHLkV1nfGkT(DT literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/chat-send@3x.png b/assets/images/png/zoom/chat-send@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..2c18a6b91d774eee78daab249cfd58d66bd2d366 GIT binary patch literal 1981 zcmV;u2SWIXP)~5JqFYzBoW+jTuX-o4SRoNibL0IS*^ z!-*H)*_3^3#B!C`0m?iM$N!C2dq7nd7LLCd0om7JXdZ-Xt2d90R^F`w;VaMYK!^bt znvNhEU%Pp9aIby#6wHX_J(WZ&8^atoXvFdylIJ{pWoe}B`=vH=f+5FONf`V?WD~2& z_lqC9s7V!8F3SM9naQX@(hx=|$97m|jF%-~*9^gh-n!YY9E)$x9o4;;CT0pR{85 zt2XCRXD0tx$Mw7a;mNZ1;!!xUB;WzvABOPo`%VOfl{W(YzpP;HX$D^6Sq!^Z_sl$2n5>Eu3Fb}3I~nJN9*tsPb(caq+q>2E&D$BbPH!J7E}w%G50i!{#$A7MdQE! zh7TUYms%o!+1{U*F+KMdI^qnPZ>8Y}z7>D@OJBINre$2aI`zso58->Yp4|$c0A14l zUuBXp`N%)dphSCxGe~xkZvWT*{`aPHg5CODzv5Oto)v$q;p7nulY`-g%2+HC$HwWo zjqPfB@5il}{x*U};bQMY`T2gLRDo|R8A;>%xpoYlIaKv=Ig!{^m2|BxRK_^g`Yjft zWJPv(>a}y?hrezsyH7=t-qHW*frdK;D!9TNO1Z>B*hOBIqOpsN9I`O?&n6!JwOLUl zhP&Fs-?ZU!4VGGt?jK(&Gj3G6=fNjw=(ks>m6M$^7G4Uw($cvqtzD%-e&Cu^LuU?3 zt890rrNbHK?FVn55`huSO&7?h6u0sTgkU^hgk2zafZc-IK`PcewHM4y7ntLgbc23Y zGxkDT!Po`fK7Sbf-S5Fo*s6F~p(@%6#+8d^OziQi3STW+PSqZMH#Tz{KN^y?qNQLL zPP^*{8LphDm=zYHonT!3a5EcZwg%{H&;hf01?r~orO-|=w;P>)HzaFiUkj#s3SSB> zU7}l}aSE^7jO2YQm<}m?DKr(Vu@kLoVYeFgorU>1r_c?w6l`HRi+a)373SDi<1iH) zlC`3xVD(st&T%WBeUo%tmZhg4teVkOu$p#PW=^3SuwdGyOtn~8P+VaSJq25@KCRa| zg)c!$)1;%iv|hD2g>DeofpZX2_+m(3!FbAcIf53qb`WVx{;#H>A$u(X^mBz|Gm+mm zZGlM3sLYGoc@ZGHJ{FFDcwPpt;hO$)13{&Q?Cc6i&k9v;vBVH+UofF1LU5L-r-kiD zh_J$@m4ZPJgq@N}hn0ds3k0>yTOn-D!k`5qVJ|pKKEjEmWtcles7`uy?AX@La%6sQ ztW0ro8g1RQRNy`gN<+eSG;#!!HGvrzltxxKrucDt*`kbNe5ctS7!*XzuZ|u6h@b70 zIE0vhK}qD$Yc%)V+IiAC4h@@`!AH!mjUC-KrftE}$RuIgVpoo$GJQy724P&I3M_Ak?3aZbiv&w2KS;?0WE2K}5#on+)}nxtjj+|^@uYN~ zMl`=5d(_dO)LVNU7fvjW%Uv$Q;2~mM#;w6}?^e9tj}gsF_7;n&I5$9kz<_a&O-DFx zu!2}j)mPLC#~0(WM?C`5hH;x^PB6;FtU_wK1X?uyEM`;ao;)lDL!-z#1!gvpxl}3} zEJt0}tm}v`4iI6)2v-+8nKCVXU?RWdR4ol%WY7p#6D-s$gf(Gdbt0YYs;fBR%2grT z;byf<rt=kli`%la&44)wrrey81+-wri0BlM?UH|V zBxi-hV$v=_V`v_3Uo|C-g0h|bZYiGg&f9t3AVer7AQm>UIa^C?s+Ru&>4Y61w>xgF P00000NkvXXu0mjfTrZ#N literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/default-avatar.png b/assets/images/png/zoom/default-avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..c5fd1e71ed2f00f24296dcfac3b371e4ea4cadb8 GIT binary patch literal 2770 zcmai0do&aL8y{I_lKZvBV!dTUOd=(-TqcsRxh+{z?kz)dnKf!6T10Y7C9<_4cOjxo zB+F&T{70qpU8?~cxzu~37{7HFw0+(GlXiTe zKcOw*-Nc6>net^`k-i7XQ2Qw2wCSbGyv-3w#~EX?5~-16LS_q_v{f$DJ#`{>G&V?ST!FF9l+4nvOw~08BY5o?PEpdA` z*1=ensmcpUU-vR*1*V7RHc?VG(xwxRsEr$tB)A(4!#u}}RcraOsie$}5PLs_aN*;l zB*l|`z^?e$@Vrr?MFQ+r9vIVjf&OnmMA>fRGD&1yp4|NB!6>_3CaQFp<93f{4mKay zK9stfUoY^8lx?Y28^)pXtRrmmzI1^?RlA0izJzmg+JC1i;?Jg5B>vo7e|IMGsHTD_oyaJo#-o*@CCo7e+7ZgGT4V zdW6)67WW4KjPfn7mcM=$`Qsoa@9?NMimuWh+&hL6vhw0LSv{oc+O(CtS^b+EA+5tp zsV0Bzc(Uh~G&MN7YrCGBa`_OOh-BEPdh)koL4-*9#M8{WVJ7L)4yDcDTk8p;Xymb) z(Ki1yIP$DUf5C_O8ybO@&=0t;6gbikeqj@O;a8UL1K1g$=iq5<@35Y+4xKwjc38tUg;zlwV8*d)F)u1Z7RA2{N0!b@%~6SO32V#zV3IbssdJMt9M}i--gv#g zb|`5F9N)Y9T3ui>Lt04dNO0RP(@dj{H>A77d15y;RLRS`boyqdA3J4Nd`tX}twe))9cd=hJEPbe1Amqu<=$PYYc=F>LwVN5*bQ?~Ne_O;-VrF$Wa zH1QN(d&BAK-m!}MiTnCv18_z-N_0?jjAqpY^iH3iaJPz!DV4Ne9;z9Svl_bHzyHjV z#e*RvR4Y@xMl@myGJh2BK9Wd%alybaJi{;Dx9H|lvkLwd1wX;}x&M6x;h5z%@x-)G zLo2Ond@2{n2*89W(+BKf$sOr-wAlleheNm4+qgk3zH{HZYFtx~k5s-k1p4uFAO<^= z4_rUu!z@vg&}@*!SB3qH72CT+#QAB43+nXlO^HgX^uIK3nute1fu89UQD)}k())q3 z`{x~g7aeHUT2E@Ijbb>l5+TKviGuSWn}5zRxgq&wy`yed^V$4`Ag6y1Nwe)Ra2>kt zrQLJxw1=gic*!Zl@Hc1uHfy|tyH;u6PkGtp$Z>)mB_n1|368@EF89HVi>Nn_w1&pT zn|svINK18gB-}jtj#1>M?(<@BajshhIBWf7hW-A#wsd0TY=1d1dj(wKfr7_8M6eYc zxar?^eNB7rjC$khVzIRElTiu$Wc+?fC4uD|S3jN60dmZS54=Pqp~-sexqjqWVGxL}rZk5Npv5q9&07x)yV4kaoyD=!P zR<7Gv4@R$}Dj1kxN%VUAwfzj;KnB!9z7TO*Ro@Qv=Jdzs+W*)%GBDn7j;REB$f#2g zH!acA-?Y{SHc#xN78Mn#k~4AB5;6@RRX&5ONxp7X$Xc&m3yp4#YgK$g>i{JsTS>Fu zB=hbpdR&O!kyRG#OED1ve1ZzFL8z!-2V1&r7Y)@%FR7~0xl7nU!QGUZ(z8RkR24P4 zy^7-QIi;iG0+rH6wce&~$+;Szp)vwNVzvLQ4V~Ap(5qfTr(AT{F)#1DPoGcm!Juw+ z?wfA+$bG^uR@qL$9MLFaR{bB>_H3N{y3Lpg;RRuTC`UUNTQ=IC`XBrc4$lAp literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/hamburger@2x.png b/assets/images/png/zoom/hamburger@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9b490c25b08664b424f8089290a444b7ae8a5e1f GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=_q^keENoYnybgM~p)%~~$NQV7+hws%dQ|D% zzm=)|d63M_Vs3^8O^M`nmd9f9BYP|v4w&>9UYAK;w_WF$3`2s8`~%N(0{LOTq=D8m Nc)I$ztaD0e0swXLN7MiS literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/hamburger@3x.png b/assets/images/png/zoom/hamburger@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..434601f96553adf27780028ff7e2d1d4352a7ca6 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG z|B0D_s7n`Znh*-c@}U z{4V%0NN>rx;L9a_fTgElM#F7|oPrv`JqinN>=FF@-}4&hNt-!~?`Tdt3pAF2VTYlw z%F1iM)}$_~*eFxh6?)mETK}T%gs#h3k=jwGmulSGt7JRl{rOL#%dg)m%x_j=t=hWh z-kuhZ#%pYkIve0-1k7{gjcWvZ6rP40fCt}PX(-Y==G5x>zMV6fP z(fpM66YDO7oZkQR%i3wji!>B31_CGWE^?h^PhI%z{>}W_HM{=ryl(hlQG}+|dXN5RD^4D7IGf2~#P%kE x=f**a4UglFH~fCRM#D~$d0!7WBpD7=$TFCP%Jk;%`F0HCEKgTImvv4FO#qKGs7(L> literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/index.ts b/assets/images/png/zoom/index.ts new file mode 100644 index 0000000..fce1d50 --- /dev/null +++ b/assets/images/png/zoom/index.ts @@ -0,0 +1,22 @@ +export const icons = { + chatSend: require('./chat-send.png'), + defaultAvatar: require('./default-avatar.png'), + locked: require('./locked.png'), + more: require('./more.png'), + mute: require('./mute.png'), + muted: require('./muted.png'), + shareOn: require('./share-on.png'), + shareOff: require('./share-off.png'), + speakerOn: require('./speaker-on.png'), + speakerOff: require('./speaker-off.png'), + switchCamera: require('./switch-camera.png'), + hamburger: require('./hamburger.png'), + questionBalloon: require('./question-ballon.png'), + talking: require('./talking.png'), + unmute: require('./unmute.png'), + unlocked: require('./unlocked.png'), + videoOn: require('./video-on.png'), + videoOff: require('./video-off.png'), +}; + +export type IconTypes = keyof typeof icons; diff --git a/assets/images/png/zoom/locked@2x.png b/assets/images/png/zoom/locked@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c6d9806098aabaa3b532d1bc8f2d35f149a5d6f9 GIT binary patch literal 376 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 MWmRMh(*gih#p0{&dIWfFd!F?0ko{ke}u7Jm*7 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 literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/muted@2x.png b/assets/images/png/zoom/muted@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..3504363215daffb7fb1efa511727f642476b49a6 GIT binary patch literal 2031 zcmbVN3v3f*94|25ZcbQWvVq492m`Kn-?hEACuNVetPOO`t-w&k-Q#O_^l``Ct?STW zV&;H=A_0651Rn`17zBwxBuX4Q5+s@t!y_^Bm;?#xmRkbTsX3(iXpbvGdp7oeYx;P zT~}C=Y;JBgH(SiI8YY3$=_Dzdq-g>n2(2Zqb4enumGm-rpeCr2qDyidGZ;BuZqi*i zQkr%lreta3S|&^=U}Tb0NMNQ6mr_7c$l{bHHJUOm3M7oe7>w&0!h$STX_R$YYn1On zon5}m019m&khRgTmRKxnLesqoClCvya9r;5x^3pEk@pK^mNL}QdAlmkVPrf z(idtcXiE@SSO8dHy9P#?chUJf#4~-g|P5e zns7LHn&2!DP=W{;hRUj$r%LEZa?!r5hAI&;QWnNy<)BDdtRO^K0RspJ03uxohMwK)a9{MZrM^DH;~V%y$}z9py5AN%ImI@sBR!uez?hRUHS0(_g{-VbM4z|Zo$%OyK&q4%61NPrf;8&iVyix%!^M3rBkL>yop5hpXM~1^atO&*{0jVp7$LI(uc2 z`%dQ>dWurz>l*m7@A#=4DYRhO_#0QI9nBl=rPp3!K7Xrj!_WI)d8279KZ@LNtF-vb zk}c7Z8@fvJzQZohJ~+_6$$o9pzRpW$!r>P?ib|iDVBPg;d(+hqmWsD5H`mS?RNQS_ zwRijNUyt9J|M3ZBNVi(NaAHwwVDVR79%duA&3od=LmjQ}mA`%N!lJ>K4@};2;bie) dzHFO%$Ml@ z83=49BFJK78kvwtAQ6UUxRAh-0TPLU$O%zEAqFshi!g=FF+g8$w{w_*#3pTD-}}Aa z|M&lR|GrwXylB#d*%J^1ndB|@l*0FXc+X8wgU`Xd=ydoRuNFV6BS?sA>cm z+b@+@8kN3foS=j(yr|RwOEjcHG=k(UimJR&2Mn|Z)Jn1oyWV{SLnYCLRoH!`Pj!QU zRNSb6vc~1*LSvo4irAusXkL_q1R-GXXfza*buQ|{;=CLjo6`h_#vw+X3(GeRqLsc9 z)U9X$Wh^8vkR**dSPRA2Yz&!;(j-k1q@AE>oMJfA#!(J5abeJ!Ci=Nj&ys{K_~pU^ zhM{r<5s5@B5vxVfY6*&ES%Rbqn#Lgl*BfMmkK(dEXPChQbU~9;LsDeaWaMj z(jgZ@YLZsg6Jde@Bci-YP!`g3DGn5cBu))$!MJfzAV3g=fNbaxOC_;tKrs|Opge#& zxqP1i7+Rk%X=79^p-|FvKm5nF(VH-HO+d82UBj#Jih+G^&_PA?!?jwFYmK1G!L z4I`lroVJ!z5bEIQ`=PLCMBd>46D$gxU(rH5bXf}VwSZ9NS`1AFl5;CTMT3T+I_t=J zuiIUsDSjyk7xdDi0@PdRW+;|naN0t}<@$V_SJn+)7J%2|!eDqTk|c7p6$o|*OW`~% zh`5bmS)3&q9%mdZN%6du=N;nkevcxA%_1=O51j{55g^Au@|-mAlcd##gBp^;0crE& zH4a|Ht-PHAj9s*gqcT+TPUd#m$*V$2*a+B_+q7Xc}`V=giwR{!be_ z1tHc^cB6RTtXR*EyT80#-*eEq{j=x&tGd%Fcb}fSZs%aMdESM?gYC0^y*lZ%nz>as z8tp~%e!Nna`_a=yY5l#v6z9QH)ia3CV+991+aK$jdZ6olU#{gvsqEI{eW~5q2XEa7 zzlnS}u`L`~a=^2#b^qj(AN#1|$KL53N8KxGdF$jF?)C5L_T`MDGEPjBx4pObrsB`Y*@=WF_X`)Zvbs~m zZ2Fihvg4CQhi_({t4hfp|JBB=olVm&{?Ik?D0e9*JH2nyHN7=7hPiS!b>XHX(&E*0 zdnU8~rPUjk&R&Bw?2cv2(~;X7Vx0?vN8hy!#47GgUD8)|XK%CnbQe-xB^C6fTcoUS zt6Ot>c6EGNWpuoo41)aaR?2EFzRTqBGTHsxIO2@-fT5@BDo@}4cwxT(vT-S`R2mWdaFTI;q Xu)nIasq@}u^Ed7-T<-axpnAjKgIm$S literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/question-ballon@2x.png b/assets/images/png/zoom/question-ballon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ba79fd3f69cc04edc6d1cc7ca6f10397d919eb90 GIT binary patch literal 877 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 Qk^lez07*qoM6N<$g1%ET>i_@% literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/share-off@3x.png b/assets/images/png/zoom/share-off@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..46989fea832a1a1887951c15bce7192b49ab0f22 GIT binary patch literal 24051 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 Ef+few^#A|> literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/speaker-on.png b/assets/images/png/zoom/speaker-on.png new file mode 100644 index 0000000000000000000000000000000000000000..f3355ba06447cf851a60838598ab248bf30cd48d GIT binary patch literal 1642 zcmV-w29^1VP)hlD&(*LG}Us07W<58EDsi10!8@=j^&lS4B}E zUKL4zD5#ydzDV*Vx{&PrBFCjEUd5q?BJ}|S*%D<*zt5TZ=WsYuNG=L%71m0um08p5 zMvhyK$=b-i)$N}LtPSn^q@d7j;eu6JTcSykrUimR%nSQ=W`fR2K#2BY>NNXE=O8kBWJRS;DUiko%YtxjARZ#JM}iUk0c)%^NL=408Xl1sBnVLg zLa-IG`nY-EBWqm}kk%puM5;C@JLwt~gDepfMPrgwgJ4av`n!1(58yq+N~x4!w4U~Z zL-^}tncqABGk#1{r1Ufqi07=5HG9Yl_)LgK^o_Ahcw7Owcv&4~lYmr?En*xY@+=-F zwun*1D1vyLSRzIhByW9Q7!VPjHq_!o5fD~oiHZlbflKL!9TWtgniUm9Aq@A>?*KL6 z$q=_m3j*i%K>|X&d7NR01{$pdJ?I5ew@M2*NadQ>1AYP)x!?1{vtXk799RUu7Z+$! zci&m^IH*P$q0zXreB;L26Gc%U8wR~RJZyj0>;2m$c|gE3au{rPNJ6|7$^fm_SC1-{ z+E47qWqzM&8ZTbI{_`7>3o6>D{1{DrNA95OrCEFAy+Gjyr_1zW(JyO%WAF0`Z*3Q!+GR>8mJ;#94xAzXxgsiO9ucKen9DOF&sz3R_l14rgZ{*!w3#__xCze8Ktj5cofRk3mBFy4U3j|DM`M(UjM%(lA z?nao!Nq~`?2=ucmdwYNX9>ph4i7qe#4WXTL9Kw8Fm`_Z=I08o`0Mn!nNg|5R^AnMh zp$ijG*Yy`94QoytW>qFFPU5++xD?j)!463RqKrnvttdW^i^z|sWDH=AAmS|&0IRWm z&&oup)&yU@`r{5|hkb~L1%yJP@aX8DEz>l1sTe>rliQe&Bmk^iIXGx2-%3oUQ7{EFFZcp+oEiMH8MJ%Fd`Cfl7!04 z-MbIIEtf0obb!)|a(ssRzo_4z@C+~L}jn%fM zY4@FjkFJk?Wsf~4xnPCt6?vV%Q|qKtgt0;a|i~Fz!_SUvvT+&LdyPg z27)JaFpaXX2x$!S%6IuG0znV4g*c zEgqO=aU~ZK_9ibPV!%M3HGE(2cApeabYyceT0{%eTFd0XjHA)|Dv)~d^uW8EoGJ>k3iHb}VJ0KeT90rKoeHlT}>*Lx3q&oj941WEd o`@QjskWT-99R@!~E3NSRA0w|k&45_Ni~s-t07*qoM6N<$g7ir8`Tzg` literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/switch-camera.png b/assets/images/png/zoom/switch-camera.png new file mode 100644 index 0000000000000000000000000000000000000000..5927b7b7c04840c44f8edc5c71d1f0501eacc12d GIT binary patch literal 2187 zcmV;62z2*}P)JNc95#p1OR;mh36m^yCqtbmv_Nc5wMc0XvbyH>CMC_9`i&kAwbga! z3S*ZVj7DAz{x(SKB=wdq0Lx60X_W>w0FAh?W+1K@AP*LqB*~C{fdL*tk{8=#Ls(>r zBtaH|AS^;=j5`e2;gKK-ZY_gAxN4A^$6aehj!Y8kvc`H`4TOcsjCY5PJOG~=rIb!} zWNW7v4&uAWEPh)7D8@I)flE8FK%CP}X7|u4z%{`d5gTn4;dTiW zz03>Sq299#aMD?P&|Bg~0aA$5r_c5W0+Bnqt`GCWkeze$`P^JKo4Nb)<&y`b1|V>Y zECqJ4rJ>$CPKwam``+;JhX9-BatY*dGqfqH6Czbke3z*id|S~ z>bn6pfE4+j3PL0PNfugdGQUekQ2e|T$&k-eY;|?vN;0{YAURkUt(!FE1+AIi-#JZ=kx#JO{cIT7?+j!2K`xh> z;R~PRXp_)1gc{B9XXW$5et*y(k1zj1a*#$ZEH(B80%3=imrrD~*{|2vm+n=v5R^bZ zUkAU3<|q+)y`HgPu;;cUEA+vI;l9$!m~-bo`ju>E*<3C=v$ponq_`+E`E-4vX`Vhj zX3-$FwYB|7#4jcwbmBzsl-KK>GoF=i^M`7i1G&uP!UGc|o3Q+Fw4Oj|uXSwOL$v zSc*IWJQs;{Jw}qk>z&qOZHdvI+S>h2!u8yGl0#wE{9sU3- zW-s)R)FX!&h%fCa6I5B+8sV6?=Vl_7nbs2+ExaU7HI_3hppHbNgO3Xj-B5iDL7*~l zF+7T4?t7pQjwh2Fv1l|n=CHqYQ!X=HOCkV>#6%F>cXxMtl57Iu;Q904dO3E=7E5bI z8U&`vMX&^a6LE|chQkJ{i>O?Xi5H}FIW`&4jJw5$s<0uw; zI4~y(<5AXi6k+eyUqK+;SQde}K-+;GmdJha zPodC-dx=EyenGN2P+XhDot)r;d4k+cATYXpB?hh>B?-z5Thh0fpQSp1SvAb4@m_*u zuLQ(Z?sG?E%`v>8c6>GSHXOGzC-B}xAcxwtA?69F8Q^+->Z6EWKTJ9ALT%X(wA zJ_+BGee1UVHUpAI#SX2OSvmX>rLupM0LD`_nby*&!;OW|;P$N`s(_MZog^+gfj@)> zx*bS7&}~$L9j&MxNVG*BU{`EwWfEy5j}G&lsKp| zQ0wK$0qWJuk)82hgEbzu6+U1Dkh$to;$4t_SF2pRPM&tZr;TGxc%{{RXKqjGOGweJ7` N002ovPDHLkV1j)V@V5W} literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/talking@2x.png b/assets/images/png/zoom/talking@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..676d61dd40db7350ad48a1c4e08462df482eb1b6 GIT binary patch literal 2063 zcmbVNdrT8|9ItVbA!9n2lg+uE2b(&*-m4tFn^m!`QlSXgNr^_eSKAA1?{;_4QX^qZ z@DY<`f6PaiaSrBV_=r)*f>F#CXN+W-MyE?uj4o^ubvol?7-hdJrNafC*(G=PyWj8g z`+Ps&$M1V|#JFh^gYjSh0tXRq?a{&zcF%h%$g6B{{#y>upt@{8yW{94h?z-MJYrHLGc%jFSB3v8z*ZHh$4qiE!BuGOss!8akoFjov^`gEx@5 zt}-)tx)q1AZnvcN_O*UXviCY(xp}c_Y1WSyB0ZmP(EL4J!h6RX=Q=yzsT>#B@Mqb{ zZ=84A=$?}g)}Ppwy35pi^o3iKm8rz#=}K&47jtde!&4ui<9pmYW}Wqae5Lj6^t-LG z`4iI~ZHpB?y3(DM)6_R*UH8oS!QvGyk4N8FemXXC<(J+i`!iiX6ad~+$f^6}Z6Tk6I;vo{wVTUtJLE%#g3xt-gOwD-5KSk!)I!lzZH@r9c|t6Mj6 z`BB^D3}y1`%U>=UnU`I9w`BZn%lY2a`_%bgI*#3|pLn_GyBjI*SF~r<&z||N4!aOI(l>px6tIr1jgyQO?ySK*nO-;eL^Y^(F^{c3Ulq}tNm z4c)&swvW0ns^g<&DckBNA6;eH?{!|PIK1TG^}YL=uZ_9W*S9R~_EoH|)4J&XIPx_j zhEFNpG@)bXo*d3ry%pQOwYcr-_iNK1P2T}Gb+qpJ`UX+A>8;W- literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/talking@3x.png b/assets/images/png/zoom/talking@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..7028a357f81b95ee98df9ce61c0ba48e6acac7ed GIT binary patch literal 2179 zcmbVO3s4kg9A6Mp@r727uX0(me6+WZd#_vycZkFm%DveL<@huz|IciQjv%BAZ-|zeXe*ee! zpDjyCP8t$5CJKU}A@*6eRPdez?g;~)0?)3vz)0{K=$kcPhM*XedWR*hB{Cr>@;2|x zP%<2^QjF-;(5&d^tqUxwoX6fofB6dDeAJ%UUHEJ(Lq3XIih41v2LN{$7IR|(+^M+$5e zB@Q-daFoGu5;mGOgh8h>;4i@>PU0A@#|RQ73>2=T2qPT45Wps}ZYtF_Gsp$LEJ(JZ z_$UnX`~4cfRwGJT7-2S>F`UFm5(NlUE)WztfC_SKuLTFI!YZIa_>$ z>Cp1O2ta5Zju6K~wRpWD3Ry|a2W|ud@=&zwEbwtyDkqD162m3t1DUa^H$KWLakL^z zPEqvqCMu;@GE5R05}xFs8D3DGnA~RzXQLI)f`GgcD6U5dt&`NMdDD|qaWjSEJy3_p z^6rAZP$NoeorIPmhzFsdXjodI{}aqIlv|X%G;o>s(penl6S5FE6iCV{dPE5j19jTI z^LDE>MH1b-2Q0{`NeQq$(P|*f1_MfJh;F$K2W1yzg%%jjZnGdDJQ|*7Db`>h8QiQ# z4MvhfbtZ;EX_woK>WnmllUmYc()YLv_S-}zPb~sanmOj9L#Iiv*|nhs5KF zn1lQM*&HzXm@4UEmqoYYrzI{v3&idT>JWRBe3{OFy!aCix;ZBR(-P>_j&VOVLr^$rx5Ya% zmVJ|Pb?%`V(N)KH7O#n(iqFfuR6MjkYI{E>G9!Fm+s=~A$dn~tMSZ&TM*p$W*2+;A zCz98GIM?pJo!{EkR=?`-#Mpac*v6&pC2TzT%jlw(gs2sE&HUJ5G1sS5)JDt*g9j4p z-<`fKe)S+|Y}MqI>{+wI!M9o9}w_Op}BgKnU&MRsn_tP3C56;sh()qX1a z!@!@~v})7)OO8Ajx%$NZgQueRj;PrlF%yyo``#*O4R3Ayy`?SPr5)3d9ML8~bCOIQ zx1irF!#}!s<}?3IXG7Ac-Gv92@7lkhp{cTUtmB=6%7WpQW6sa>Y$_unYmOW}y5L-T z)zC4HYFX$w@IrY_ZAQbQ`^)llOD+#SKa~= z-~YU9Kx&<9yL~Hcjh4BPPG2>Ww)IOAE`3oW}6$gPGjY63@z4 z>TS6Y{=u1DR5=8#Qj+nL&f}%E{c$2<;l{<4TTU-&Kf5a`aI>kXvE%iO>CV6I)~z^D z9XW0B-Mk%BHpF$Tzjor-ceAV0uXYX#Piq$WpEvkv%h(-jh1}N6H!C2xctm|#Gm-qQ zvvciaaclKq&RJLXM_f`-PQ~ui@Q>@Hw6?wIvGhg7lf{|KqrSK?a!uWZ1n0>-`@K(U c?+m(PY+1aiseWBVk@}lpPfWJeBxIKS4WWz%;Q#;t literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/unlocked@2x.png b/assets/images/png/zoom/unlocked@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..aa5403e233d941318773bff2b4f94e0a4ec7952a GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=ZP~I_o#8?s3W8Xntj>@2h=&pWc34_icXAr?uZMmVF3%Co7S8a+`+l#X~H* zQ^f583k;5)Fl;bq`*2O8AZ>4v(<9MtK9WWOu4sPwf?hl$>UYWPu>Z- zpwjU3%GM2X9d}yyfHfUsxF>Poc0AjTMb^*G=LsdWzmvJhe)4^Z&i0F;MwylNE-o%6 aUgnAXNt(V<^J;+s#^CAd=d#Wzp$Py)*`5;s literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/unlocked@3x.png b/assets/images/png/zoom/unlocked@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..25f9390fcfb33174c7b8bbd47706043f9f201db4 GIT binary patch literal 634 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG z6tp*KIv9g&Xab#IiERK?$ogUZH(l?>w&*P1YFUW|V2s}MM@qWJUw}qt>JvKE6*t?t$h!u-0>vIWWyV9)_ zy=YNE?6)786W@nws}%J}wZltOrlnc3 z-CbmP%pmDzv&^hyW!o1#Y`3H)?4MzJ(@gG}D38a%1`#5NX^b=X{Jv~5jWM*Y`b+?u z^0exY4EvMf|K!z@)<9>FVdQ&MBb@0DCtGssI20 literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/unmute@2x.png b/assets/images/png/zoom/unmute@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4c6d2393f3c69bb2466ca712cb59e961ffbaea21 GIT binary patch literal 7451 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 Z{|7JK0PZ%-DvbaD002ovPDHLkV1jxkFu?!- literal 0 HcmV?d00001 diff --git a/assets/images/png/zoom/unmute@3x.png b/assets/images/png/zoom/unmute@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..dad68fac22ed2751d3848544478b3030571b5e02 GIT binary patch literal 13799 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%0D^vJ$camn!Z503^UXK^FY5`2 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 value == null); - log("uri: ${Uri.parse(url.trim())}"); - - log("body: ${json.encode(body)}"); final bool networkStatus = await Utils.checkConnection(bypassConnectionCheck: bypassConnectionCheck); @@ -204,7 +200,7 @@ class ApiClientImp implements ApiClient { final int statusCode = response.statusCode; log("uri: ${Uri.parse(url.trim())}"); log("body: ${json.encode(body)}"); - log("response.body: ${response.body}"); + // log("response.body: ${response.body}"); // log("response.body: ${response.body}"); if (statusCode < 200 || statusCode >= 400) { onFailure('Error While Fetching data', statusCode, failureType: StatusCodeFailure("Error While Fetching data")); diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index 417519f..b92461e 100644 --- a/lib/core/api_consts.dart +++ b/lib/core/api_consts.dart @@ -710,7 +710,7 @@ var GET_PRESCRIPTION_INSTRUCTIONS_PDF = 'Services/ChatBot_Service.svc/REST/Chatb class ApiConsts { static const maxSmallScreen = 660; - static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod; + static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat; // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT @@ -749,7 +749,7 @@ class ApiConsts { baseUrl = "https://uat.hmgwebservices.com/"; payFortEnvironment = FortEnvironment.test; applePayMerchantId = "merchant.com.hmgwebservices.uat"; - SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; + SERVICE_URL = 'https://uat.hmgwebservices.com/HMGPayment/pages/SendPayFortRequest.aspx'; TAMARA_URL = "https://epharmacy.hmg.com/tamara/Home/Checkout"; GET_TAMARA_INSTALLMENTS_URL = "https://epharmacy.hmg.com/tamara/Home/getinstallments"; GET_TAMARA_PAYMENT_STATUS = 'https://epharmacy.hmg.com/tamara/api/OnlineTamara/order_status?orderid='; @@ -759,7 +759,7 @@ class ApiConsts { baseUrl = "https://uat.hmgwebservices.com/"; payFortEnvironment = FortEnvironment.test; applePayMerchantId = "merchant.com.hmgwebservices.uat"; - SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; + SERVICE_URL = 'https://uat.hmgwebservices.com/HMGPayment/pages/SendPayFortRequest.aspx'; TAMARA_URL = "https://epharmacy.hmg.com/tamara/Home/Checkout"; GET_TAMARA_INSTALLMENTS_URL = "https://epharmacy.hmg.com/tamara/Home/getinstallments"; GET_TAMARA_PAYMENT_STATUS = 'https://epharmacy.hmg.com/tamara/api/OnlineTamara/order_status?orderid='; @@ -779,7 +779,7 @@ class ApiConsts { baseUrl = "https://uat.hmgwebservices.com/"; payFortEnvironment = FortEnvironment.test; applePayMerchantId = "merchant.com.hmgwebservices.uat"; - SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; + SERVICE_URL = 'https://uat.hmgwebservices.com/HMGPayment/pages/SendPayFortRequest.aspx'; TAMARA_URL = "https://epharmacy.hmg.com/tamara/Home/Checkout"; GET_TAMARA_INSTALLMENTS_URL = "https://epharmacy.hmg.com/tamara/Home/getinstallments"; GET_TAMARA_PAYMENT_STATUS = 'https://epharmacy.hmg.com/tamara/api/OnlineTamara/order_status?orderid='; @@ -789,7 +789,7 @@ class ApiConsts { baseUrl = "https://uat.hmgwebservices.com/"; payFortEnvironment = FortEnvironment.test; applePayMerchantId = "merchant.com.hmgwebservices.uat"; - SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; + SERVICE_URL = 'https://uat.hmgwebservices.com/HMGPayment/pages/SendPayFortRequest.aspx'; TAMARA_URL = "https://epharmacy.hmg.com/tamara/Home/Checkout"; GET_TAMARA_INSTALLMENTS_URL = "https://epharmacy.hmg.com/tamara/Home/getinstallments"; GET_TAMARA_PAYMENT_STATUS = 'https://epharmacy.hmg.com/tamara/api/OnlineTamara/order_status?orderid='; diff --git a/lib/core/app_assets.dart b/lib/core/app_assets.dart index 5fccc6e..613fba1 100644 --- a/lib/core/app_assets.dart +++ b/lib/core/app_assets.dart @@ -175,6 +175,8 @@ class AppAssets { static const String comprehensiveCheckup = '$svgBasePath/comprehensive_checkup.svg'; static const String all_payment_method = '$svgBasePath/all_payment_method.svg'; static const String ic_rrt_vehicle = '$svgBasePath/ic_rrt_vehicle.svg'; + static const String doctor_profile_rating_icon = '$svgBasePath/doctor_profile_rating_icon.svg'; + static const String doctor_profile_reviews_icon = '$svgBasePath/doctor_profile_reviews_icon.svg'; //bottom navigation// diff --git a/lib/core/cache_consts.dart b/lib/core/cache_consts.dart index 66b38d4..bcbb185 100644 --- a/lib/core/cache_consts.dart +++ b/lib/core/cache_consts.dart @@ -74,4 +74,7 @@ class CacheConst { static const String patientOccupationList = 'patient-occupation-list'; static const String hasEnabledQuickLogin = 'has-enabled-quick-login'; static const String quickLoginEnabled = 'quick-login-enabled'; + + static const String zoomRoomID = 'zoom-room-id'; + static String isAppOpenedFromCall = "is_app_opened_from_call"; } diff --git a/lib/core/utils/jwt.dart b/lib/core/utils/jwt.dart new file mode 100644 index 0000000..f82c4e1 --- /dev/null +++ b/lib/core/utils/jwt.dart @@ -0,0 +1,38 @@ +import 'dart:math'; + +import 'package:dart_jsonwebtoken/dart_jsonwebtoken.dart'; +import 'package:hmg_patient_app_new/core/utils/zoom_config.dart'; + +String makeId(int length) { + String result = ""; + String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + int charactersLength = characters.length; + for (var i = 0; i < length; i++) { + result += characters[Random().nextInt(charactersLength)]; + } + return result; +} + +String generateJwt(String sessionName, String roleType) { + try { + var iat = DateTime.now(); + var exp = DateTime.now().add(Duration(days: 2)); + final jwt = JWT( + { + 'app_key': configs["ZOOM_SDK_KEY"], + 'version': 1, + 'user_identity': makeId(10), + 'iat': (iat.millisecondsSinceEpoch / 1000).round(), + 'exp': (exp.millisecondsSinceEpoch / 1000).round(), + 'tpc': sessionName, + 'role_type': int.parse(roleType), + 'cloud_recording_option': 1, + }, + ); + var token = jwt.sign(SecretKey(configs["ZOOM_SDK_SECRET"])); + return token; + } catch (e) { + print(e); + return ''; + } +} diff --git a/lib/core/utils/push_notification_handler.dart b/lib/core/utils/push_notification_handler.dart index 2e0d7c3..ee05335 100644 --- a/lib/core/utils/push_notification_handler.dart +++ b/lib/core/utils/push_notification_handler.dart @@ -8,14 +8,22 @@ import 'package:firebase_messaging/firebase_messaging.dart' as fir; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_callkit_incoming/entities/android_params.dart'; +import 'package:flutter_callkit_incoming/entities/call_kit_params.dart'; +import 'package:flutter_callkit_incoming/entities/ios_params.dart'; +import 'package:flutter_callkit_incoming/entities/notification_params.dart'; +import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart'; import 'package:flutter_ios_voip_kit_karmm/call_state_type.dart'; import 'package:flutter_ios_voip_kit_karmm/flutter_ios_voip_kit.dart'; // import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; +import 'package:get_it/get_it.dart'; import 'package:hmg_patient_app_new/core/utils/local_notifications.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; +import 'package:hmg_patient_app_new/services/cache_service.dart'; import 'package:permission_handler/permission_handler.dart'; +import 'package:uuid/uuid.dart'; import '../cache_consts.dart'; @@ -36,16 +44,83 @@ Future backgroundMessageHandler(dynamic message) async { callPage(String sessionID, String token) async {} _incomingCall(Map data) async { + print('the value of the _incomingCall remote message is $data'); + // LandingPage.incomingCallData = IncomingCallData.fromJson(data); // var dataItem = await AppSharedPreferences().getObject('call_data'); // if(dataItem != null ) return; // to stop repeated attempt to invoke the call // if (LandingPage.isOpenCallPage == false) { // LandingPage.isOpenCallPage = true; + + String roomID = data['session_id'] ?? ''; + + // GetIt.instance().saveString(key: CacheConst.zoomRoomID, value: roomID); + // GetIt.instance().saveBool(key: CacheConst.isAppOpenedFromCall, value: true); + + Utils.saveStringFromPrefs(CacheConst.zoomRoomID, roomID); + Utils.saveBoolFromPrefs(CacheConst.isAppOpenedFromCall, true); + WidgetsFlutterBinding.ensureInitialized(); - // var _currentUuid = Uuid().v4(); - // await FlutterCallkitIncoming.showCallkitIncoming(callKitParams); - // } - // LandingPage.isOpenCallPage = false; + + var _currentUuid = Uuid().v4(); + CallKitParams callKitParams = CallKitParams( + id: _currentUuid, + nameCaller: "Dr Al Habib", + appName: 'Dr Al Habib', + avatar: 'https://play-lh.googleusercontent.com/FBNNpxb7m6eM6wtW7MV1Ffp6OXOGLI38q47zcvP29OCYA1yhYH5mZzl5itZi0TgOyZpG', + // handle: LandingPage.incomingCallData.name, + type: 1, + textAccept: 'Accept', + textDecline: 'Decline', + missedCallNotification: NotificationParams( + showNotification: true, + isShowCallback: false, + subtitle: 'Missed call', + callbackText: '', + ), + callingNotification: const NotificationParams( + showNotification: false, + isShowCallback: true, + subtitle: 'Calling...', + callbackText: 'Hang Up', + ), + duration: 30000, + extra: {'userId': '1a2b3c4d'}, + headers: {'apiKey': 'Abc@123!', 'platform': 'flutter'}, + android: const AndroidParams( + isImportant: true, + isShowFullLockedScreen: true, + isCustomNotification: true, + isShowLogo: false, + logoUrl: "https://play-lh.googleusercontent.com/FBNNpxb7m6eM6wtW7MV1Ffp6OXOGLI38q47zcvP29OCYA1yhYH5mZzl5itZi0TgOyZpG", + ringtonePath: 'system_ringtone_default', + backgroundColor: '#ED1C2B', + backgroundUrl: 'https://saudipedia.com/en/saudipediaen/uploads/images/2024/08/02/97358.jpg', + actionColor: '#4CAF50', + textColor: '#000000', + incomingCallNotificationChannelName: "Incoming Call", + missedCallNotificationChannelName: "Missed Call", + isShowCallID: false), + ios: IOSParams( + iconName: 'Meena Health', + handleType: 'generic', + supportsVideo: true, + maximumCallGroups: 2, + maximumCallsPerCallGroup: 1, + audioSessionMode: 'default', + audioSessionActive: true, + audioSessionPreferredSampleRate: 44100.0, + audioSessionPreferredIOBufferDuration: 0.005, + supportsDTMF: true, + supportsHolding: true, + supportsGrouping: false, + supportsUngrouping: false, + ringtonePath: 'system_ringtone_default', + ), + ); + FlutterCallkitIncoming.unsilenceEvents(); + await FlutterCallkitIncoming.showCallkitIncoming(callKitParams); + await Future.delayed(Duration(milliseconds: 500)); } @@ -224,7 +299,9 @@ class PushNotificationHandler { print('🎈 example: onDidAcceptIncomingCall $uuid - $callerId'); await voIPKit.acceptIncomingCall(callerState: CallStateType.calling); await voIPKit.callConnected(); - await Future.delayed(Duration(seconds: 1)); + await Future.delayed(Duration(seconds: 2)).then((val) async { + await voIPKit.endCall(); + }); // Navigator.pushNamed( // locator().navigatorKey.currentContext!, @@ -232,8 +309,6 @@ class PushNotificationHandler { // arguments: CallArguments("hoover-dam", "123", "Patient", "40", "1", false), // ); - await voIPKit.endCall(); - // Navigator.pushNamed(navigatorKey.currentContext!, VIDEO_CALL_SCREEN, // arguments: VideoArgus( // reservationId: int.parse(callerId), token: null, isVideo: true)); diff --git a/lib/core/utils/utils.dart b/lib/core/utils/utils.dart index e2c11d4..f1e1593 100644 --- a/lib/core/utils/utils.dart +++ b/lib/core/utils/utils.dart @@ -807,7 +807,11 @@ class Utils { static Future checkConnection({bool bypassConnectionCheck = false}) async { if (bypassConnectionCheck) return true; List connectivityResult = await (Connectivity().checkConnectivity()); - if (connectivityResult.contains(ConnectivityResult.mobile) || connectivityResult.contains(ConnectivityResult.wifi)) { + if (connectivityResult.contains(ConnectivityResult.mobile) || + connectivityResult.contains(ConnectivityResult.wifi) || + connectivityResult.contains(ConnectivityResult.ethernet) || + connectivityResult.contains(ConnectivityResult.bluetooth) || + connectivityResult.contains(ConnectivityResult.vpn)) { return true; } else { return false; diff --git a/lib/core/utils/zoom_config.dart b/lib/core/utils/zoom_config.dart new file mode 100644 index 0000000..09370c0 --- /dev/null +++ b/lib/core/utils/zoom_config.dart @@ -0,0 +1,4 @@ +const Map configs = { + 'ZOOM_SDK_KEY': 'b9T74nhfTg-ioP9urm970A', + 'ZOOM_SDK_SECRET': 'KOzmjBNXQ1f4IPHpnngfL29uZvJMufSy2Fk8', +}; diff --git a/lib/extensions/string_extensions.dart b/lib/extensions/string_extensions.dart index 250453d..c2a4a87 100644 --- a/lib/extensions/string_extensions.dart +++ b/lib/extensions/string_extensions.dart @@ -301,14 +301,14 @@ extension EmailValidator on String { fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal)), ); - Widget toText28({Color? color, bool isBold = false, double? height, bool isCenter = false}) => Text( + Widget toText28({Color? color, bool isBold = false, double? height, bool isCenter = false, double? letterSpacing}) => Text( this, textAlign: isCenter ? TextAlign.center : null, style: TextStyle( height: height ?? 23 / 28, color: color ?? AppColors.blackColor, fontSize: 28.f, - letterSpacing: -1, + letterSpacing: letterSpacing ?? -1, fontWeight: isBold ? FontWeight.bold : FontWeight.normal), ); diff --git a/lib/features/book_appointments/book_appointments_view_model.dart b/lib/features/book_appointments/book_appointments_view_model.dart index 5d5fc71..bcc88ff 100644 --- a/lib/features/book_appointments/book_appointments_view_model.dart +++ b/lib/features/book_appointments/book_appointments_view_model.dart @@ -349,8 +349,8 @@ class BookAppointmentsViewModel extends ChangeNotifier { result.fold( (failure) async { isDoctorsListLoading = false; + if (onError != null) onError("No doctors found for the search criteria".needTranslation); - onError!("No doctors found for the search criteria".needTranslation); notifyListeners(); }, (apiResponse) { diff --git a/lib/features/immediate_livecare/immediate_livecare_view_model.dart b/lib/features/immediate_livecare/immediate_livecare_view_model.dart index 7e2d7c9..1baa81b 100644 --- a/lib/features/immediate_livecare/immediate_livecare_view_model.dart +++ b/lib/features/immediate_livecare/immediate_livecare_view_model.dart @@ -151,18 +151,15 @@ class ImmediateLiveCareViewModel extends ChangeNotifier { if (patientLiveCareHistoryList.isNotEmpty) { if (patientLiveCareHistoryList[0].callStatus! < 4) { countdownDuration = Duration(seconds: 0); - durationNotifier.dispose(); patientHasPendingLiveCareRequest = true; countdownDuration = Duration(minutes: patientLiveCareHistoryList.first.watingtimeInteger!, seconds: 0); durationNotifier = ValueNotifier(countdownDuration); startTimer(); } else { patientHasPendingLiveCareRequest = false; - timer.cancel(); } } else { patientHasPendingLiveCareRequest = false; - timer.cancel(); } notifyListeners(); if (onSuccess != null) { diff --git a/lib/features/insurance/insurance_view_model.dart b/lib/features/insurance/insurance_view_model.dart index 8460bd4..30f4c26 100644 --- a/lib/features/insurance/insurance_view_model.dart +++ b/lib/features/insurance/insurance_view_model.dart @@ -78,10 +78,12 @@ class InsuranceViewModel extends ChangeNotifier { // (failure) async => await errorHandlerService.handleError(failure: failure), (failure) async { isInsuranceLoading = false; + isInsuranceDataToBeLoaded = false; notifyListeners(); }, (apiResponse) { if (apiResponse.messageStatus == 2) { + isInsuranceDataToBeLoaded = false; // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {}); } else if (apiResponse.messageStatus == 1) { patientInsuranceList = apiResponse.data!; diff --git a/lib/features/lab/lab_view_model.dart b/lib/features/lab/lab_view_model.dart index 079471c..24aa244 100644 --- a/lib/features/lab/lab_view_model.dart +++ b/lib/features/lab/lab_view_model.dart @@ -77,14 +77,14 @@ class LabViewModel extends ChangeNotifier { required this.navigationService}); initLabProvider() { - if (isLabNeedToLoad) { + // if (isLabNeedToLoad) { patientLabOrders.clear(); filteredLabOrders.clear(); labOrderTests.clear(); isLabOrdersLoading = true; isLabResultsLoading = true; getPatientLabOrders(); - } + // } notifyListeners(); } @@ -94,7 +94,7 @@ class LabViewModel extends ChangeNotifier { } Future getPatientLabOrders({Function(dynamic)? onSuccess, Function(String)? onError}) async { - if (!isLabNeedToLoad) return; + // if (!isLabNeedToLoad) return; isLabOrdersLoading = true; patientLabOrders.clear(); @@ -289,7 +289,7 @@ class LabViewModel extends ChangeNotifier { ); } - Future getPatientLabResult(PatientLabOrdersResponseModel laborder, String procedureName, String testDescription) async { + Future getPatientLabResult(PatientLabOrdersResponseModel laborder, String procedureName, String testDescription, String unitOfMeasure) async { LoaderBottomSheet.showLoader(); mainLabResults.clear(); filteredGraphValues.clear(); @@ -339,6 +339,7 @@ class LabViewModel extends ChangeNotifier { } catch (e) {} }); LabResult recentResult = recentThree.first; + recentResult.uOM = unitOfMeasure; checkIfGraphShouldBeDisplayed(recentResult); recentResult.verifiedOn = resultDate(DateUtil.convertStringToDate(recentResult.verifiedOnDateTime!)); // filteredGraphValues = [filteredGraphValues.first]; diff --git a/lib/presentation/appointments/widgets/appointment_card.dart b/lib/presentation/appointments/widgets/appointment_card.dart index 5d2ae5c..7bc9c62 100644 --- a/lib/presentation/appointments/widgets/appointment_card.dart +++ b/lib/presentation/appointments/widgets/appointment_card.dart @@ -124,19 +124,47 @@ class AppointmentCard extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Image.network( - isLoading ? 'https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png' : patientAppointmentHistoryResponseModel.doctorImageURL!, - width: 63.h, - height: 63.h, - fit: BoxFit.cover, + Stack( + children: [ + Image.network( + isLoading ? 'https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png' : patientAppointmentHistoryResponseModel.doctorImageURL!, + width: 63.w, + height: 63.h, + fit: BoxFit.cover, + ), + Positioned( + bottom: 0, + left: 0, + right: 0, + child: Container( + width: 63.w, + height: 20, + color: AppColors.textColorLight.withValues(alpha: 0.25), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Utils.buildSvgWithAssets( + icon: AppAssets.rating_icon, + width: 12.w, + height: 12.h, + fit: BoxFit.contain, + ), + SizedBox(width: 4.w), + isLoading ? "Rating".toText12() : patientAppointmentHistoryResponseModel.decimalDoctorRate.toString().toText12(), + ], + ), + ), + ) + ], ).circle(100).toShimmer2(isShow: isLoading), - SizedBox(height: 12.h), - AppCustomChipWidget( - icon: AppAssets.rating_icon, - iconColor: AppColors.ratingColorYellow, - labelText: isLoading ? "Rating" : "Rating: ${patientAppointmentHistoryResponseModel.decimalDoctorRate}".needTranslation) - .toShimmer2(isShow: isLoading), + // SizedBox(height: 12.h), + // AppCustomChipWidget( + // icon: AppAssets.rating_icon, + // iconColor: AppColors.ratingColorYellow, + // labelText: isLoading ? "Rating" : "Rating: ${patientAppointmentHistoryResponseModel.decimalDoctorRate}".needTranslation) + // .toShimmer2(isShow: isLoading), ], ), SizedBox(width: 16.h), @@ -163,6 +191,12 @@ class AppointmentCard extends StatelessWidget { ? 'Cardiology' : "${DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false)} ${DateUtil.formatDateToTimeLang(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false)}", ).toShimmer2(isShow: isLoading), + AppCustomChipWidget( + isIconPNG: true, + icon: getIt.get().getAuthenticatedUser()?.gender == 1 ? AppAssets.male_img : AppAssets.femaleImg, + iconSize: 18.h, + labelText: isLoading ? 'Cardiology' : "Patient: ${getIt.get().getAuthenticatedUser()!.firstName!}", + ).toShimmer2(isShow: isLoading), // if (!isFromMedicalReport) // AppCustomChipWidget( // icon: AppAssets.appointment_time_icon, @@ -278,7 +312,6 @@ class AppointmentCard extends StatelessWidget { clinicId: patientAppointmentHistoryResponseModel.clinicID, onSuccess: (value) async { if (value) { - print("Doctor is available"); await myAppointmentsViewModel.getAskDoctorRequestTypes(onSuccess: (val) { LoaderBottomSheet.hideLoader(); showCommonBottomSheetWithoutHeight( diff --git a/lib/presentation/appointments/widgets/ask_doctor_request_type_select.dart b/lib/presentation/appointments/widgets/ask_doctor_request_type_select.dart index 9f06a4d..69cdca3 100644 --- a/lib/presentation/appointments/widgets/ask_doctor_request_type_select.dart +++ b/lib/presentation/appointments/widgets/ask_doctor_request_type_select.dart @@ -79,15 +79,15 @@ class AskDoctorRequestTypeSelect extends StatelessWidget { onPressed: () { Navigator.pop(context); }, - backgroundColor: AppColors.primaryRedColor, - borderColor: AppColors.primaryRedColor, - textColor: AppColors.whiteColor, + backgroundColor: AppColors.secondaryLightRedColor, + borderColor: AppColors.secondaryLightRedColor, + textColor: AppColors.primaryRedColor, icon: AppAssets.cancel, - iconColor: AppColors.whiteColor, + iconColor: AppColors.primaryRedColor, borderRadius: 12.r, - iconSize: 14.h, - fontSize: 14.f, - height: 40.h, + iconSize: 16.5.h, + fontSize: 16.f, + height: 56.h, ), ), SizedBox(width: 8.h), @@ -120,14 +120,15 @@ class AskDoctorRequestTypeSelect extends StatelessWidget { LoaderBottomSheet.hideLoader(); }); }, - backgroundColor: AppColors.bgGreenColor, - borderColor: AppColors.bgGreenColor, - textColor: Colors.white, + backgroundColor: AppColors.bgGreenColor.withValues(alpha: 0.20), + borderColor: AppColors.bgGreenColor.withValues(alpha: 0.0), + textColor: AppColors.bgGreenColor, + iconColor: AppColors.bgGreenColor, icon: AppAssets.confirm, - iconSize: 14.h, + iconSize: 16.5.h, borderRadius: 12.r, - fontSize: 14.f, - height: 40.h, + fontSize: 16.f, + height: 56.h, ), ), ], diff --git a/lib/presentation/authentication/login.dart b/lib/presentation/authentication/login.dart index 7e5f4a1..0fa995d 100644 --- a/lib/presentation/authentication/login.dart +++ b/lib/presentation/authentication/login.dart @@ -1,6 +1,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/dependencies.dart'; @@ -154,7 +155,7 @@ class LoginScreenState extends State { required BuildContext context, required TextEditingController? phoneNumberController, required AuthenticationViewModel authViewModel, - }) { + }) async { AppState appState = getIt(); context.showBottomSheet( isScrollControlled: true, diff --git a/lib/presentation/book_appointment/book_appointment_page.dart b/lib/presentation/book_appointment/book_appointment_page.dart index a66ea4d..8a0f7e7 100644 --- a/lib/presentation/book_appointment/book_appointment_page.dart +++ b/lib/presentation/book_appointment/book_appointment_page.dart @@ -2,20 +2,25 @@ import 'dart:async'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/dependencies.dart'; +import 'package:hmg_patient_app_new/core/utils/size_config.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart'; import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart'; +import 'package:hmg_patient_app_new/features/book_appointments/models/resp_models/doctors_list_response_model.dart'; import 'package:hmg_patient_app_new/features/immediate_livecare/immediate_livecare_view_model.dart'; import 'package:hmg_patient_app_new/features/my_appointments/appointment_via_region_viewmodel.dart'; +import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/presentation/appointments/widgets/faculity_selection/facility_type_selection_widget.dart'; import 'package:hmg_patient_app_new/presentation/appointments/widgets/region_bottomsheet/region_list_widget.dart' show RegionBottomSheetBody; +import 'package:hmg_patient_app_new/presentation/book_appointment/doctor_profile_page.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/livecare/select_immediate_livecare_clinic_page.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/search_doctor_by_name.dart'; @@ -86,6 +91,111 @@ class _BookAppointmentPageState extends State { ).paddingSymmetrical(24.h, 0.h), SizedBox(height: 24.h), getSelectedTabData(bookAppointmentsVM.selectedTabIndex), + SizedBox(height: 24.h), + "Recent Visits".needTranslation.toText18(isBold: true).paddingSymmetrical(24.w, 0.h), + SizedBox(height: 16.h), + Consumer(builder: (context, myAppointmentsVM, child) { + return myAppointmentsVM.isPatientMyDoctorsLoading + ? Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.network( + "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png", + width: 64.w, + height: 64.h, + fit: BoxFit.cover, + ).circle(100).toShimmer2(isShow: true, radius: 50.r), + SizedBox(height: 8.h), + ("Dr. John Smith Smith Smith") + .toString() + .toText12(fontWeight: FontWeight.w500, isCenter: true, maxLine: 2) + .toShimmer2(isShow: true), + ], + ) + : myAppointmentsVM.patientMyDoctorsList.isEmpty + ? Container( + width: SizeConfig.screenWidth, + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 12.r, + hasShadow: false, + ), + child: Utils.getNoDataWidget( + context, + noDataText: "You don't have any completed visits yet".needTranslation, + isSmallWidget: true, + width: 62.w, + height: 62.h, + ), + ).paddingSymmetrical(24.w, 0.h) + : SizedBox( + height: 110.h, + child: ListView.separated( + scrollDirection: Axis.horizontal, + itemCount: myAppointmentsVM.patientMyDoctorsList.length, + shrinkWrap: true, + padding: EdgeInsets.only(left: 24.w, right: 24.w), + itemBuilder: (context, index) { + return AnimationConfiguration.staggeredList( + position: index, + duration: const Duration(milliseconds: 1000), + child: SlideAnimation( + horizontalOffset: 100.0, + child: FadeInAnimation( + child: SizedBox( + // width: 80.w, + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.network( + myAppointmentsVM.patientMyDoctorsList[index].doctorImageURL!, + width: 64.w, + height: 64.h, + fit: BoxFit.cover, + ).circle(100).toShimmer2(isShow: false, radius: 50.r), + SizedBox(height: 8.h), + SizedBox( + width: 80.w, + child: (myAppointmentsVM.patientMyDoctorsList[index].doctorName) + .toString() + .toText12(fontWeight: FontWeight.w500, isCenter: true, maxLine: 2) + .toShimmer2(isShow: false), + ), + ], + ), + ).onPress(() async { + bookAppointmentsViewModel.setSelectedDoctor(DoctorsListResponseModel( + clinicID: myAppointmentsVM.patientMyDoctorsList[index].clinicID, + projectID: myAppointmentsVM.patientMyDoctorsList[index].projectID, + doctorID: myAppointmentsVM.patientMyDoctorsList[index].doctorID, + )); + LoaderBottomSheet.showLoader(); + await bookAppointmentsViewModel.getDoctorProfile(onSuccess: (dynamic respData) { + LoaderBottomSheet.hideLoader(); + Navigator.of(context).push( + CustomPageRoute( + page: DoctorProfilePage(), + ), + ); + }, onError: (err) { + LoaderBottomSheet.hideLoader(); + showCommonBottomSheetWithoutHeight( + context, + child: Utils.getErrorWidget(loadingText: err), + callBackFunc: () {}, + isFullScreen: false, + isCloseButtonVisible: true, + ); + }); + }), + ), + ), + ); + }, + separatorBuilder: (BuildContext cxt, int index) => SizedBox(width: 8.h), + ), + ); + }), ], ); }), diff --git a/lib/presentation/book_appointment/doctor_profile_page.dart b/lib/presentation/book_appointment/doctor_profile_page.dart index 1223842..c3f4ad9 100644 --- a/lib/presentation/book_appointment/doctor_profile_page.dart +++ b/lib/presentation/book_appointment/doctor_profile_page.dart @@ -48,6 +48,7 @@ class DoctorProfilePage extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Row( + crossAxisAlignment: CrossAxisAlignment.start, children: [ Image.network( bookAppointmentsViewModel.doctorsProfileResponseModel.doctorImageURL!, @@ -59,9 +60,12 @@ class DoctorProfilePage extends StatelessWidget { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - ("${bookAppointmentsViewModel.doctorsProfileResponseModel.doctorTitleForProfile} ${bookAppointmentsViewModel.doctorsProfileResponseModel.doctorName}") - .toString() - .toText28(isBold: true), + SizedBox( + width: 220.h, + child: ("${bookAppointmentsViewModel.doctorsProfileResponseModel.doctorTitleForProfile} ${bookAppointmentsViewModel.doctorsProfileResponseModel.doctorName}") + .toString() + .toText24(isBold: true), + ), (bookAppointmentsViewModel.doctorsProfileResponseModel.specialty!.isNotEmpty ? bookAppointmentsViewModel.doctorsProfileResponseModel.specialty!.first : "") .toString() .toText18(weight: FontWeight.w500, color: AppColors.primaryRedColor), @@ -80,18 +84,49 @@ class DoctorProfilePage extends StatelessWidget { SizedBox(height: 12.h), Wrap( direction: Axis.horizontal, - spacing: 3.h, + spacing: 4.h, runSpacing: 4.h, children: [ AppCustomChipWidget( - icon: AppAssets.rating_icon, iconColor: AppColors.ratingColorYellow, - labelText: "Rating: ${bookAppointmentsViewModel.doctorsProfileResponseModel.decimalDoctorRate}".needTranslation, + labelText: "Branch: ${bookAppointmentsViewModel.doctorsProfileResponseModel.projectName}".needTranslation, ), AppCustomChipWidget( - icon: AppAssets.rating_icon, iconColor: AppColors.ratingColorYellow, - labelText: "Reviews: ${bookAppointmentsViewModel.doctorsProfileResponseModel.noOfPatientsRate}".needTranslation, + labelText: "Clinic: ${bookAppointmentsViewModel.doctorsProfileResponseModel.clinicDescription}".needTranslation, + ), + ], + ), + SizedBox(height: 24.h), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Column( + children: [ + Utils.buildSvgWithAssets( + icon: AppAssets.doctor_profile_rating_icon, + width: 48.w, + height: 48.h, + fit: BoxFit.contain, + ), + SizedBox(height: 16.h), + "Ratings".toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor), + bookAppointmentsViewModel.doctorsProfileResponseModel.decimalDoctorRate.toString().toText16(isBold: true, color: AppColors.textColor), + ], + ), + SizedBox(width: 36.w), + Column( + children: [ + Utils.buildSvgWithAssets( + icon: AppAssets.doctor_profile_reviews_icon, + width: 48.w, + height: 48.h, + fit: BoxFit.contain, + ), + SizedBox(height: 16.h), + "Reviews".toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor), + bookAppointmentsViewModel.doctorsProfileResponseModel.noOfPatientsRate.toString().toText16(isBold: true, color: AppColors.textColor), + ], ), ], ), diff --git a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart index af7d053..b586da1 100644 --- a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart +++ b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart @@ -13,13 +13,16 @@ import 'package:hmg_patient_app_new/features/book_appointments/book_appointments import 'package:hmg_patient_app_new/features/immediate_livecare/immediate_livecare_view_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart'; +import 'package:hmg_patient_app_new/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/livecare/widgets/select_livecare_call_type.dart'; +import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; import 'package:hmg_patient_app_new/presentation/insurance/insurance_home_page.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart'; import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; +import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:provider/provider.dart'; @@ -71,37 +74,17 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget { children: [ "${appState.getAuthenticatedUser()!.firstName} ${appState.getAuthenticatedUser()!.lastName}".toText16(isBold: true), SizedBox(height: 8.h), - AppCustomChipWidget(labelText: "${appState.getAuthenticatedUser()!.age} Years Old"), - ], - ), - ], - ), - ), - ), - SizedBox(height: 24.h), - "Clinic Information".needTranslation.toText16(isBold: true), - SizedBox(height: 16.h), - Container( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.whiteColor, - borderRadius: 24.h, - hasShadow: false, - ), - child: Padding( - padding: EdgeInsets.all(16.h), - child: Row( - children: [ - Utils.buildSvgWithAssets(icon: AppAssets.generic_clinic_icon, width: 32.h, height: 32.h, fit: BoxFit.contain), - SizedBox(width: 8.h), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - (appState.isArabic() - ? immediateLiveCareViewModel.immediateLiveCareSelectedClinic.serviceNameN - : immediateLiveCareViewModel.immediateLiveCareSelectedClinic.serviceName)! - .toText16(isBold: true), - // SizedBox(height: 8.h), - // AppCustomChipWidget(labelText: "${appState.getAuthenticatedUser()!.age} Years Old"), + Wrap( + direction: Axis.horizontal, + spacing: 3.h, + runSpacing: 4.h, + children: [ + AppCustomChipWidget(labelText: "${appState.getAuthenticatedUser()!.age} Years Old".needTranslation), + AppCustomChipWidget( + labelText: + "${LocaleKeys.clinic.tr()}: ${(appState.isArabic() ? immediateLiveCareViewModel.immediateLiveCareSelectedClinic.serviceNameN : immediateLiveCareViewModel.immediateLiveCareSelectedClinic.serviceName)!}"), + ], + ), ], ), ], @@ -220,15 +203,81 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget { isSaudiCurrency: immediateLiveCareViewModel.liveCareImmediateAppointmentFeesList.currency!.toLowerCase() == "sar"), ], ).paddingSymmetrical(24.h, 0.h), - CustomButton( - text: LocaleKeys.payNow.tr(context: context), - onPressed: () async { - await askVideoCallPermission().then((val) { - if (val) { - Navigator.of(context).push( - CustomPageRoute( - page: ImmediateLiveCarePaymentPage(), - ), + (immediateLiveCareViewModel.liveCareImmediateAppointmentFeesList.total == "0" || immediateLiveCareViewModel.liveCareImmediateAppointmentFeesList.total == "0.0") + ? CustomButton( + text: LocaleKeys.confirmLiveCare.tr(context: context), + onPressed: () async { + await askVideoCallPermission().then((val) async { + if (val) { + LoaderBottomSheet.showLoader(loadingText: "Confirming LiveCare request, Please wait...".needTranslation); + + await immediateLiveCareViewModel.addNewCallRequestForImmediateLiveCare("${appState.getAuthenticatedUser()!.patientId}${DateTime.now().millisecondsSinceEpoch}"); + await immediateLiveCareViewModel.getPatientLiveCareHistory(); + LoaderBottomSheet.hideLoader(); + if (immediateLiveCareViewModel.patientHasPendingLiveCareRequest) { + Navigator.pushAndRemoveUntil( + context, + CustomPageRoute( + page: LandingNavigation(), + ), + (r) => false); + Navigator.of(context).push( + CustomPageRoute( + page: ImmediateLiveCarePendingRequestPage(), + ), + ); + } else { + showCommonBottomSheetWithoutHeight( + context, + child: Utils.getErrorWidget(loadingText: "Unknown error occurred...".needTranslation), + callBackFunc: () {}, + isFullScreen: false, + isCloseButtonVisible: true, + ); + } + } else { + showCommonBottomSheetWithoutHeight( + title: LocaleKeys.notice.tr(context: context), + context, + child: Utils.getWarningWidget( + loadingText: + "LiveCare requires Camera, Microphone, Location & Notifications permissions to enable virtual consultation between patient & doctor, Please allow these to proceed." + .needTranslation, + isShowActionButtons: true, + onCancelTap: () { + Navigator.pop(context); + }, + onConfirmTap: () async { + openAppSettings(); + }), + callBackFunc: () {}, + isFullScreen: false, + isCloseButtonVisible: true, + ); + } + }); + }, + backgroundColor: AppColors.successColor, + borderColor: AppColors.successColor, + textColor: AppColors.whiteColor, + fontSize: 16, + fontWeight: FontWeight.w500, + borderRadius: 12, + padding: EdgeInsets.fromLTRB(10, 0, 10, 0), + height: 50.h, + icon: AppAssets.livecare_book_icon, + iconColor: AppColors.whiteColor, + iconSize: 18.h, + ).paddingSymmetrical(24.h, 24.h) + : CustomButton( + text: LocaleKeys.payNow.tr(context: context), + onPressed: () async { + await askVideoCallPermission().then((val) { + if (val) { + Navigator.of(context).push( + CustomPageRoute( + page: ImmediateLiveCarePaymentPage(), + ), ); } else { showCommonBottomSheetWithoutHeight( @@ -236,16 +285,17 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget { context, child: Utils.getWarningWidget( loadingText: - "LiveCare requires Camera, Microphone & Location permissions to enable virtual consultation between patient & doctor, Please allow these to proceed.".needTranslation, - isShowActionButtons: true, - onCancelTap: () { - Navigator.pop(context); - }, - onConfirmTap: () async { - openAppSettings(); - }), - callBackFunc: () {}, - isFullScreen: false, + "LiveCare requires Camera, Microphone, Location & Notifications permissions to enable virtual consultation between patient & doctor, Please allow these to proceed." + .needTranslation, + isShowActionButtons: true, + onCancelTap: () { + Navigator.pop(context); + }, + onConfirmTap: () async { + openAppSettings(); + }), + callBackFunc: () {}, + isFullScreen: false, isCloseButtonVisible: true, ); } @@ -272,12 +322,9 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget { } Future askVideoCallPermission() async { - Map statuses = await [ - Permission.camera, - Permission.microphone, - ].request(); + Map statuses = await [Permission.camera, Permission.microphone, Permission.notification].request(); - if (statuses[Permission.camera] == PermissionStatus.granted && statuses[Permission.microphone] == PermissionStatus.granted) { + if (statuses[Permission.camera] == PermissionStatus.granted && statuses[Permission.microphone] == PermissionStatus.granted && statuses[Permission.notification] == PermissionStatus.granted) { // Camera permission granted return true; } else { diff --git a/lib/presentation/book_appointment/livecare/select_immediate_livecare_clinic_page.dart b/lib/presentation/book_appointment/livecare/select_immediate_livecare_clinic_page.dart index 8181d25..15598f3 100644 --- a/lib/presentation/book_appointment/livecare/select_immediate_livecare_clinic_page.dart +++ b/lib/presentation/book_appointment/livecare/select_immediate_livecare_clinic_page.dart @@ -66,35 +66,6 @@ class _SelectImmediateLiveCareClinicPageState extends State(builder: (context, immediateLiveCareVM, child) { return Column( children: [ - // SizedBox(height: 16.h), - // TextInputWidget( - // labelText: LocaleKeys.search.tr(context: context), - // hintText: LocaleKeys.clinicName.tr(context: context), - // controller: searchEditingController, - // isEnable: true, - // prefix: null, - // autoFocus: false, - // isBorderAllowed: false, - // keyboardType: TextInputType.text, - // focusNode: textFocusNode, - // suffix: searchEditingController.text.isNotEmpty - // ? GestureDetector( - // onTap: () { - // searchEditingController.clear(); - // bookAppointmentsViewModel.filterClinics(""); - // textFocusNode.unfocus(); - // }, - // child: Utils.buildSvgWithAssets(icon: AppAssets.close_bottom_sheet_icon, width: 20.h, height: 20.h, fit: BoxFit.scaleDown), - // ) - // : null, - // onChange: (value) { - // bookAppointmentsViewModel.filterClinics(value!); - // }, - // padding: EdgeInsets.symmetric( - // vertical: ResponsiveExtension(10).h, - // horizontal: ResponsiveExtension(15).h, - // ), - // ), ListView.separated( padding: EdgeInsets.only(top: 16.h), shrinkWrap: true, diff --git a/lib/presentation/book_appointment/livecare/widgets/livecare_clinic_card.dart b/lib/presentation/book_appointment/livecare/widgets/livecare_clinic_card.dart index 7385c6b..3913f10 100644 --- a/lib/presentation/book_appointment/livecare/widgets/livecare_clinic_card.dart +++ b/lib/presentation/book_appointment/livecare/widgets/livecare_clinic_card.dart @@ -12,6 +12,7 @@ import 'package:hmg_patient_app_new/features/immediate_livecare/models/resp_mode import 'package:hmg_patient_app_new/features/immediate_livecare/immediate_livecare_view_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; +import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart'; class LiveCareClinicCard extends StatelessWidget { LiveCareClinicCard({super.key, required this.liveCareClinicListResponseModel, required this.isLoading, required this.immediateLiveCareViewModel}); @@ -34,20 +35,12 @@ class LiveCareClinicCard extends StatelessWidget { children: [ Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Utils.buildSvgWithAssets(icon: AppAssets.generic_clinic_icon, width: 24.h, height: 24.h, fit: BoxFit.contain).toShimmer2(isShow: isLoading), - Column( - children: [ - Utils.buildSvgWithAssets( - icon: AppAssets.livecare_online_icon, - width: 16.h, - height: 16.h, - fit: BoxFit.contain, - iconColor: liveCareClinicListResponseModel.isOnline == 1 ? AppColors.successColor : AppColors.primaryRedColor) - .toShimmer2(isShow: isLoading), - SizedBox(height: 4.h), - liveCareClinicListResponseModel.isOnline == 1 - ? LocaleKeys.online.tr(context: context).toText10(isBold: true, color: AppColors.successColor).toShimmer2(isShow: isLoading) - : "Offline".toText10(isBold: true, color: AppColors.primaryRedColor).toShimmer2(isShow: isLoading), - ], + AppCustomChipWidget( + icon: AppAssets.livecare_online_icon, + iconColor: AppColors.whiteColor, + richText: (liveCareClinicListResponseModel.isOnline == 1 ? LocaleKeys.online.tr(context: context) : "Offline".needTranslation).toText10(isBold: true, color: AppColors.whiteColor), + backgroundColor: liveCareClinicListResponseModel.isOnline == 1 ? AppColors.successColor : AppColors.primaryRedColor, + textColor: AppColors.whiteColor, ), ]), SizedBox(height: 8.h), diff --git a/lib/presentation/book_appointment/livecare/widgets/select_livecare_call_type.dart b/lib/presentation/book_appointment/livecare/widgets/select_livecare_call_type.dart index 226ac50..e4d69b1 100644 --- a/lib/presentation/book_appointment/livecare/widgets/select_livecare_call_type.dart +++ b/lib/presentation/book_appointment/livecare/widgets/select_livecare_call_type.dart @@ -1,10 +1,14 @@ import 'package:flutter/cupertino.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; +import 'package:hmg_patient_app_new/core/app_state.dart'; +import 'package:hmg_patient_app_new/core/dependencies.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart'; import 'package:hmg_patient_app_new/features/immediate_livecare/immediate_livecare_view_model.dart'; +import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/presentation/medical_file/widgets/medical_file_card.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; @@ -16,46 +20,30 @@ class SelectLiveCareCallType extends StatelessWidget { @override Widget build(BuildContext context) { //TODO: Replace with actual icons - return GridView( - gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 3, - crossAxisSpacing: 16, - mainAxisSpacing: 16, - mainAxisExtent: 130, - ), - physics: NeverScrollableScrollPhysics(), - padding: EdgeInsets.zero, - shrinkWrap: true, + return Column( children: [ - MedicalFileCard( - label: "Video Call".needTranslation, - textColor: AppColors.blackColor, - backgroundColor: AppColors.whiteColor, - svgIcon: AppAssets.eye_result_icon, - isLargeText: true, - iconSize: 36.h, + checkInOptionCard( + AppAssets.checkin_location_icon, + "Video Call".needTranslation, + "View your nearest HMG locations".needTranslation, ).onPress(() { Navigator.of(context).pop(); immediateLiveCareViewModel.setLiveCareSelectedCallType(1); }), - MedicalFileCard( - label: "Audio Call".needTranslation, - textColor: AppColors.blackColor, - backgroundColor: AppColors.whiteColor, - svgIcon: AppAssets.allergy_info_icon, - isLargeText: true, - iconSize: 36.h, + SizedBox(height: 16.h), + checkInOptionCard( + AppAssets.checkin_location_icon, + "Audio Call".needTranslation, + "Provide your feedback on our services".needTranslation, ).onPress(() { Navigator.of(context).pop(); immediateLiveCareViewModel.setLiveCareSelectedCallType(2); }), - MedicalFileCard( - label: "Phone Call".needTranslation, - textColor: AppColors.blackColor, - backgroundColor: AppColors.whiteColor, - svgIcon: AppAssets.vaccine_info_icon, - isLargeText: true, - iconSize: 36.h, + SizedBox(height: 16.h), + checkInOptionCard( + AppAssets.checkin_location_icon, + "Phone Call".needTranslation, + "Live chat option with HMG".needTranslation, ).onPress(() { Navigator.of(context).pop(); immediateLiveCareViewModel.setLiveCareSelectedCallType(3); @@ -63,4 +51,45 @@ class SelectLiveCareCallType extends StatelessWidget { ], ); } + + Widget checkInOptionCard(String icon, String title, String subTitle) { + return Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.r, + hasShadow: false, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Utils.buildSvgWithAssets(icon: icon, width: 40.h, height: 40.h, fit: BoxFit.fill), + SizedBox(height: 16.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + title.toText16(isBold: true, color: AppColors.textColor), + subTitle.toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor), + ], + ), + ), + Transform.flip( + flipX: getIt.get().isArabic(), + child: Utils.buildSvgWithAssets( + icon: AppAssets.forward_arrow_icon_small, + iconColor: AppColors.blackColor, + width: 18.h, + height: 13.h, + fit: BoxFit.contain, + ), + ), + ], + ), + ], + ).paddingAll(16.h), + ); + } } diff --git a/lib/presentation/home/landing_page.dart b/lib/presentation/home/landing_page.dart index fe0268d..47f8118 100644 --- a/lib/presentation/home/landing_page.dart +++ b/lib/presentation/home/landing_page.dart @@ -40,6 +40,8 @@ import 'package:hmg_patient_app_new/presentation/home/widgets/small_service_card import 'package:hmg_patient_app_new/presentation/home/widgets/welcome_widget.dart'; import 'package:hmg_patient_app_new/presentation/medical_file/medical_file_page.dart'; import 'package:hmg_patient_app_new/presentation/profile_settings/profile_settings.dart'; +import 'package:hmg_patient_app_new/presentation/tele_consultation/zoom/call_screen.dart'; +import 'package:hmg_patient_app_new/routes/app_routes.dart'; import 'package:hmg_patient_app_new/services/cache_service.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; @@ -93,13 +95,13 @@ class _LandingPageState extends State { if (appState.isAuthenticated) { habibWalletVM.initHabibWalletProvider(); habibWalletVM.getPatientBalanceAmount(); + immediateLiveCareViewModel.initImmediateLiveCare(); + immediateLiveCareViewModel.getPatientLiveCareHistory(); myAppointmentsViewModel.initAppointmentsViewModel(); myAppointmentsViewModel.getPatientAppointments(true, false); myAppointmentsViewModel.getPatientMyDoctors(); prescriptionsViewModel.initPrescriptionsViewModel(); insuranceViewModel.initInsuranceProvider(); - immediateLiveCareViewModel.initImmediateLiveCare(); - immediateLiveCareViewModel.getPatientLiveCareHistory(); emergencyServicesViewModel.checkPatientERAdvanceBalance(); } }); @@ -140,10 +142,19 @@ class _LandingPageState extends State { text: LocaleKeys.loginOrRegister.tr(context: context), onPressed: () async { await authVM.onLoginPressed(); + + // Navigator.pushReplacementNamed( + // // context, + // context, + // AppRoutes.zoomCallPage, + // // arguments: CallArguments(appointmentID, "111", "Patient", "40", "1", true, 1), + // arguments: CallArguments("test123", "123", "Patient", "40", "0", true, 1), + // // arguments: CallArguments("SmallDailyStandup9875", "123", "Patient", "40", "0", false, int.parse(widget.incomingCallData!.appointmentNo!)), + // ); }, - backgroundColor: Color(0xffFEE9EA), - borderColor: Color(0xffFEE9EA), - textColor: Color(0xffED1C2B), + backgroundColor: AppColors.secondaryLightRedColor, + borderColor: AppColors.secondaryLightRedColor, + textColor: AppColors.primaryRedColor, fontSize: 14.f, fontWeight: FontWeight.w500, borderRadius: 12.r, @@ -203,8 +214,8 @@ class _LandingPageState extends State { Navigator.of(context).push(CustomPageRoute(page: MyAppointmentsPage())); }), SizedBox(height: 16.h), - Consumer( - builder: (context, myAppointmentsVM, child) { + Consumer2( + builder: (context, myAppointmentsVM, immediateLiveCareVM, child) { return myAppointmentsVM.isMyAppointmentsLoading ? Container( decoration: RoundedRectangleBorder().toSmoothCornerDecoration( @@ -248,14 +259,14 @@ class _LandingPageState extends State { indicatorLayout: PageIndicatorLayout.COLOR, axisDirection: AxisDirection.right, controller: _controller, - itemHeight: 270.h, + itemHeight: 255.h, pagination: SwiperPagination( alignment: Alignment.bottomCenter, - margin: EdgeInsets.only(top: 250.h + 8 + 24), + margin: EdgeInsets.only(top: 240.h + 8 + 24), builder: DotSwiperPaginationBuilder(color: Color(0xffD9D9D9), activeColor: AppColors.blackBgColor), ), itemBuilder: (BuildContext context, int index) { - return (immediateLiveCareViewModel.patientHasPendingLiveCareRequest && index == 0) + return (immediateLiveCareVM.patientHasPendingLiveCareRequest && index == 0) ? Column( children: [ SizedBox(height: 12.h), @@ -279,7 +290,7 @@ class _LandingPageState extends State { Row( children: [ AppCustomChipWidget( - labelText: immediateLiveCareViewModel.patientLiveCareHistoryList[0].stringCallStatus, + labelText: immediateLiveCareVM.patientLiveCareHistoryList[0].stringCallStatus, backgroundColor: AppColors.warningColorYellow.withValues(alpha: 0.20), textColor: AppColors.alertColor, ), @@ -287,7 +298,7 @@ class _LandingPageState extends State { AppCustomChipWidget( icon: AppAssets.appointment_calendar_icon, labelText: DateUtil.formatDateToDate( - DateUtil.convertStringToDate(immediateLiveCareViewModel.patientLiveCareHistoryList[0].arrivalTime), false)), + DateUtil.convertStringToDate(immediateLiveCareVM.patientLiveCareHistoryList[0].arrivalTime), false)), ], ), Utils.buildSvgWithAssets(icon: AppAssets.waiting_icon, width: 24.h, height: 24.h), @@ -297,7 +308,7 @@ class _LandingPageState extends State { SizedBox(height: 10.h), "Hala ${appState.getAuthenticatedUser()!.firstName}!!!".needTranslation.toText16(isBold: true), SizedBox(height: 8.h), - "Your turn is after ${immediateLiveCareViewModel.patientLiveCareHistoryList[0].patCount} patients.".toText14(isBold: true), + "Your turn is after ${immediateLiveCareVM.patientLiveCareHistoryList[0].patCount} patients.".toText14(isBold: true), SizedBox(height: 8.h), Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -305,7 +316,7 @@ class _LandingPageState extends State { "Expected waiting time: ".toText12(isBold: true), SizedBox(height: 8.h), ValueListenableBuilder( - valueListenable: immediateLiveCareViewModel.durationNotifier, + valueListenable: immediateLiveCareVM.durationNotifier, builder: (context, duration, child) { return Column( mainAxisAlignment: MainAxisAlignment.center, @@ -561,7 +572,7 @@ class _LandingPageState extends State { Navigator.of(context).push(CustomPageRoute(page: ServicesPage())); }), ], - ).paddingSymmetrical(24.h, 0.h), + ).paddingSymmetrical(24.w, 0.h), SizedBox( height: 340.h, child: ListView.separated( @@ -613,7 +624,7 @@ class _LandingPageState extends State { cacheService.saveBool(key: CacheConst.quickLoginEnabled, value: true); setState(() {}); await Future.delayed(Duration(milliseconds: 3000)).then((value) { - Navigator.pop(context); + if (mounted) Navigator.pop(context); }); }); }, diff --git a/lib/presentation/lab/lab_orders_page.dart b/lib/presentation/lab/lab_orders_page.dart index 184f713..81c507f 100644 --- a/lib/presentation/lab/lab_orders_page.dart +++ b/lib/presentation/lab/lab_orders_page.dart @@ -1 +1 @@ -import 'dart:async'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/dependencies.dart'; import 'package:hmg_patient_app_new/core/enums.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_orders_response_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/features/lab/lab_view_model.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_order_by_test.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart'; import 'package:hmg_patient_app_new/presentation/lab/search_lab_report.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/chip/custom_chip_widget.dart'; import 'package:hmg_patient_app_new/widgets/date_range_selector/viewmodel/date_range_view_model.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart'; import 'package:provider/provider.dart'; import 'package:hmg_patient_app_new/widgets/custom_tab_bar.dart'; import '../../widgets/appbar/collapsing_list_view.dart'; class LabOrdersPage extends StatefulWidget { const LabOrdersPage({super.key}); @override State createState() => _LabOrdersPageState(); } class _LabOrdersPageState extends State { late LabViewModel labProvider; late DateRangeSelectorRangeViewModel rangeViewModel; late AppState _appState; List?> labSuggestions = []; int? expandedIndex; String? selectedFilterText = ''; int activeIndex = 0; @override void initState() { scheduleMicrotask(() { // labProvider.initLabProvider(); }); super.initState(); } @override Widget build(BuildContext context) { labProvider = Provider.of(context, listen: false); rangeViewModel = Provider.of(context); _appState = getIt(); return Scaffold( backgroundColor: AppColors.bgScaffoldColor, body: CollapsingListView( title: LocaleKeys.labResults.tr(), search: () async { final lavVM = Provider.of(context, listen: false); if (lavVM.isLabOrdersLoading) { return; } else { String? value = await Navigator.of(context).push( CustomPageRoute( page: SearchLabResultsContent(labSuggestionsList: lavVM.labSuggestions), fullScreenDialog: true, direction: AxisDirection.down, ), ); if (value != null) { selectedFilterText = value; lavVM.filterLabReports(value); } } }, child: SingleChildScrollView( padding: EdgeInsets.all(24.h), physics: NeverScrollableScrollPhysics(), child: Consumer( builder: (context, model, child) { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ CustomTabBar( activeTextColor: Color(0xffED1C2B), activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1), tabs: [ CustomTabBarModel(null, "By Visit".needTranslation), CustomTabBarModel(null, "By Test".needTranslation), // CustomTabBarModel(null, "Completed".needTranslation), ], onTabChange: (index) { activeIndex = index; setState(() {}); }, ), SizedBox(height: 8.h), selectedFilterText!.isNotEmpty ? CustomChipWidget( chipText: selectedFilterText!, chipType: ChipTypeEnum.alert, isSelected: true, ) : SizedBox(), activeIndex == 0 ? ListView.builder( shrinkWrap: true, physics: NeverScrollableScrollPhysics(), padding: EdgeInsets.zero, itemCount: model.isLabOrdersLoading ? 5 : model.patientLabOrders.isNotEmpty ? model.patientLabOrders.length : 1, itemBuilder: (context, index) { final isExpanded = expandedIndex == index; return model.isLabOrdersLoading ? LabResultItemView( onTap: () {}, labOrder: null, index: index, isLoading: true, ) : model.patientLabOrders.isNotEmpty ? AnimationConfiguration.staggeredList( position: index, duration: const Duration(milliseconds: 500), child: SlideAnimation( verticalOffset: 100.0, child: FadeInAnimation( child: LabResultItemView( onTap: () { model.currentlySelectedPatientOrder = model.patientLabOrders[ index]; labProvider.getPatientLabResultByHospital(model.patientLabOrders[ index]); labProvider .getPatientSpecialResult( model.patientLabOrders[ index]); Navigator.push( context, CustomPageRoute( page: LabResultByClinic(labOrder: model.patientLabOrders[index]), )); }, labOrder: model.patientLabOrders[index], index: index, isExpanded: isExpanded), ), ), ) : Utils.getNoDataWidget(context, noDataText: "You don't have any lab results yet.".needTranslation); }, ) : ListView.builder( shrinkWrap: true, physics: NeverScrollableScrollPhysics(), padding: EdgeInsets.zero, itemCount: model.isLabOrdersLoading ? 5 : model.uniqueTests.toList().isNotEmpty ? model.uniqueTests.toList().length : 1, itemBuilder: (context, index) { final isExpanded = expandedIndex == index; return model.isLabOrdersLoading ? LabResultItemView( onTap: () {}, labOrder: null, index: index, isLoading: true, ) : model.uniqueTests.toList().isNotEmpty ? AnimationConfiguration.staggeredList( position: index, duration: const Duration(milliseconds: 500), child: SlideAnimation( verticalOffset: 100.0, child: FadeInAnimation( child: LabOrderByTest( appState: _appState, onTap: () { if (model.uniqueTests.toList()[index].model != null) { rangeViewModel.flush(); model.getPatientLabResult(model.uniqueTests.toList()[index].model!, model.uniqueTests.toList()[index].description!, (_appState.isArabic() ? model.uniqueTests.toList()[index].testDescriptionAr! : model.uniqueTests.toList()[index].testDescriptionEn!)); } }, tests: model.uniqueTests.toList()[index], index: index, isExpanded: isExpanded)), ), ) : Utils.getNoDataWidget(context, noDataText: "You don't have any lab results yet.".needTranslation); }, ) ], ); }, ), ), )); } Color getLabOrderStatusColor(num status) { switch (status) { case 44: return AppColors.warningColorYellow; case 45: return AppColors.warningColorYellow; case 16: return AppColors.successColor; case 17: return AppColors.successColor; default: return AppColors.greyColor; } } String getLabOrderStatusText(num status) { switch (status) { case 44: return LocaleKeys.resultsPending.tr(context: context); case 45: return LocaleKeys.resultsPending.tr(context: context); case 16: return LocaleKeys.resultsAvailable.tr(context: context); case 17: return LocaleKeys.resultsAvailable.tr(context: context); default: return ""; } } getLabSuggestions(LabViewModel model) { if (model.patientLabOrders.isEmpty) { return []; } return model.patientLabOrders.map((m) => m.testDetails).toList(); } } \ No newline at end of file +import 'dart:async'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/dependencies.dart'; import 'package:hmg_patient_app_new/core/enums.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_orders_response_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/features/lab/lab_view_model.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_order_by_test.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart'; import 'package:hmg_patient_app_new/presentation/lab/search_lab_report.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/chip/custom_chip_widget.dart'; import 'package:hmg_patient_app_new/widgets/date_range_selector/viewmodel/date_range_view_model.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart'; import 'package:provider/provider.dart'; import 'package:hmg_patient_app_new/widgets/custom_tab_bar.dart'; import '../../widgets/appbar/collapsing_list_view.dart'; class LabOrdersPage extends StatefulWidget { const LabOrdersPage({super.key}); @override State createState() => _LabOrdersPageState(); } class _LabOrdersPageState extends State { late LabViewModel labProvider; late DateRangeSelectorRangeViewModel rangeViewModel; late AppState _appState; List?> labSuggestions = []; int? expandedIndex; String? selectedFilterText = ''; int activeIndex = 0; @override void initState() { scheduleMicrotask(() { labProvider.initLabProvider(); }); super.initState(); } @override Widget build(BuildContext context) { labProvider = Provider.of(context, listen: false); rangeViewModel = Provider.of(context); _appState = getIt(); return Scaffold( backgroundColor: AppColors.bgScaffoldColor, body: CollapsingListView( title: LocaleKeys.labResults.tr(), search: () async { final lavVM = Provider.of(context, listen: false); if (lavVM.isLabOrdersLoading) { return; } else { String? value = await Navigator.of(context).push( CustomPageRoute( page: SearchLabResultsContent(labSuggestionsList: lavVM.labSuggestions), fullScreenDialog: true, direction: AxisDirection.down, ), ); if (value != null) { selectedFilterText = value; lavVM.filterLabReports(value); } } }, child: SingleChildScrollView( padding: EdgeInsets.all(24.h), physics: NeverScrollableScrollPhysics(), child: Consumer( builder: (context, model, child) { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ CustomTabBar( activeTextColor: Color(0xffED1C2B), activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1), tabs: [ CustomTabBarModel(null, "By Visit".needTranslation), CustomTabBarModel(null, "By Test".needTranslation), // CustomTabBarModel(null, "Completed".needTranslation), ], onTabChange: (index) { activeIndex = index; setState(() {}); }, ), SizedBox(height: 8.h), selectedFilterText!.isNotEmpty ? CustomChipWidget( chipText: selectedFilterText!, chipType: ChipTypeEnum.alert, isSelected: true, ) : SizedBox(), activeIndex == 0 ? ListView.builder( shrinkWrap: true, physics: NeverScrollableScrollPhysics(), padding: EdgeInsets.zero, itemCount: model.isLabOrdersLoading ? 5 : model.patientLabOrders.isNotEmpty ? model.patientLabOrders.length : 1, itemBuilder: (context, index) { final isExpanded = expandedIndex == index; return model.isLabOrdersLoading ? LabResultItemView( onTap: () {}, labOrder: null, index: index, isLoading: true, ) : model.patientLabOrders.isNotEmpty ? AnimationConfiguration.staggeredList( position: index, duration: const Duration(milliseconds: 500), child: SlideAnimation( verticalOffset: 100.0, child: FadeInAnimation( child: LabResultItemView( onTap: () { model.currentlySelectedPatientOrder = model.patientLabOrders[ index]; labProvider.getPatientLabResultByHospital(model.patientLabOrders[ index]); labProvider .getPatientSpecialResult( model.patientLabOrders[ index]); Navigator.push( context, CustomPageRoute( page: LabResultByClinic(labOrder: model.patientLabOrders[index]), )); }, labOrder: model.patientLabOrders[index], index: index, isExpanded: isExpanded), ), ), ) : Utils.getNoDataWidget(context, noDataText: "You don't have any lab results yet.".needTranslation); }, ) : ListView.builder( shrinkWrap: true, physics: NeverScrollableScrollPhysics(), padding: EdgeInsets.zero, itemCount: model.isLabOrdersLoading ? 5 : model.uniqueTests.toList().isNotEmpty ? model.uniqueTests.toList().length : 1, itemBuilder: (context, index) { final isExpanded = expandedIndex == index; return model.isLabOrdersLoading ? LabResultItemView( onTap: () {}, labOrder: null, index: index, isLoading: true, ) : model.uniqueTests.toList().isNotEmpty ? AnimationConfiguration.staggeredList( position: index, duration: const Duration(milliseconds: 500), child: SlideAnimation( verticalOffset: 100.0, child: FadeInAnimation( child: LabOrderByTest( appState: _appState, onTap: () { if (model.uniqueTests.toList()[index].model != null) { rangeViewModel.flush(); model.getPatientLabResult(model.uniqueTests.toList()[index].model!, model.uniqueTests.toList()[index].description!, (_appState.isArabic() ? model.uniqueTests.toList()[index].testDescriptionAr! : model.uniqueTests.toList()[index].testDescriptionEn!), ""); } }, tests: model.uniqueTests.toList()[index], index: index, isExpanded: isExpanded)), ), ) : Utils.getNoDataWidget(context, noDataText: "You don't have any lab results yet.".needTranslation); }, ) ], ); }, ), ), )); } Color getLabOrderStatusColor(num status) { switch (status) { case 44: return AppColors.warningColorYellow; case 45: return AppColors.warningColorYellow; case 16: return AppColors.successColor; case 17: return AppColors.successColor; default: return AppColors.greyColor; } } String getLabOrderStatusText(num status) { switch (status) { case 44: return LocaleKeys.resultsPending.tr(context: context); case 45: return LocaleKeys.resultsPending.tr(context: context); case 16: return LocaleKeys.resultsAvailable.tr(context: context); case 17: return LocaleKeys.resultsAvailable.tr(context: context); default: return ""; } } getLabSuggestions(LabViewModel model) { if (model.patientLabOrders.isEmpty) { return []; } return model.patientLabOrders.map((m) => m.testDetails).toList(); } } \ No newline at end of file diff --git a/lib/presentation/lab/lab_result_via_clinic/LabResultList.dart b/lib/presentation/lab/lab_result_via_clinic/LabResultList.dart index 8893ffd..3f05443 100644 --- a/lib/presentation/lab/lab_result_via_clinic/LabResultList.dart +++ b/lib/presentation/lab/lab_result_via_clinic/LabResultList.dart @@ -26,7 +26,7 @@ class LabResultList extends StatelessWidget { shrinkWrap: true,itemCount: list.length,itemBuilder: (____, index) { var labItem = list[index]; return LabOrderResultItem(onTap: () { - model.getPatientLabResult(model.currentlySelectedPatientOrder!, labItem.description ?? "", labItem.packageShortDescription!); + model.getPatientLabResult(model.currentlySelectedPatientOrder!, labItem.description ?? "", labItem.packageShortDescription!, labItem.uOM ?? ""); }, tests: labItem, index: index, diff --git a/lib/presentation/lab/lab_results/lab_result_details.dart b/lib/presentation/lab/lab_results/lab_result_details.dart index 2330d0d..67eae63 100644 --- a/lib/presentation/lab/lab_results/lab_result_details.dart +++ b/lib/presentation/lab/lab_results/lab_result_details.dart @@ -59,115 +59,72 @@ class LabResultDetails extends StatelessWidget { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - recentLabResult.testCode ?? "", - style: TextStyle( - fontSize: 32, - fontFamily: 'Poppins', - fontWeight: FontWeight.w600, - color: AppColors.textColor, - letterSpacing: -2), - ), - Text( - "Result of ${recentLabResult.verifiedOn ?? ""}".needTranslation, - style: TextStyle( - fontSize: 12, - fontFamily: 'Poppins', - fontWeight: FontWeight.w500, - color: AppColors.greyTextColor, - ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + (recentLabResult.testCode ?? "").toText28(isBold: true, color: AppColors.textColor, letterSpacing: -2), + Visibility( + visible: recentLabResult.checkIfGraphShouldBeDisplayed() == true, + child: Column( + spacing: 6.h, + children: [ + context + .read() + .getSeverityText( + recentLabResult.calculatedResultFlag ?? "", + ) + .tr() + .toText10(weight: FontWeight.w500, color: AppColors.greyTextColor), + Utils.buildSvgWithAssets( + icon: AppAssets.lab_result_indicator, + width: 21, + height: 23, + iconColor: context.read().getColor( + recentLabResult.calculatedResultFlag ?? "", + )), + ], + ), + ), + ], ), + SizedBox(height: 4.h), + ("Result of ${recentLabResult.verifiedOn ?? ""}".needTranslation).toText11(weight: FontWeight.w500, color: AppColors.greyTextColor), ], ), - //todo change the text color according to the provided test values Row( crossAxisAlignment: CrossAxisAlignment.center, - children: [ Expanded( child: Row( - mainAxisSize: MainAxisSize.max, children: [ Flexible( - child: Text( - "${recentLabResult.resultValue} ${recentLabResult.uOM}" ?? - "", - style: TextStyle( - fontSize: 24.f, - fontWeight: FontWeight.w600, - fontFamily: 'Poppins', + child: ("${recentLabResult.resultValue} ${recentLabResult.uOM}" ?? "").toText28( + isBold: true, color: context.read().getColor( recentLabResult.calculatedResultFlag ?? "", - ), - letterSpacing: -2, - ), - overflow: TextOverflow.ellipsis, // prevent overflow - maxLines: 1, - softWrap: false, - ), + ), + letterSpacing: -2), ), SizedBox(width: 4.h,), - Expanded( - flex: 2, - child: Visibility( - visible: recentLabResult.referanceRange != null, - child: Text( - "(Reference range ${recentLabResult.referanceRange})".needTranslation, - style: TextStyle( - fontSize: 12.f, - fontWeight: FontWeight.w500, - fontFamily: 'Poppins', - color: AppColors.greyTextColor, - ), - // overflow: TextOverflow.ellipsis, - // maxLines: 2, - softWrap: true, - ), - ), - ), - ], - ), - ), - Visibility( - visible: - recentLabResult.checkIfGraphShouldBeDisplayed() == true, - child: Column( - spacing: 6.h, - children: [ - context - .read() - .getSeverityText( - recentLabResult.calculatedResultFlag ?? "", - ) - .tr() - .toText10( - weight: FontWeight.w500, - color: AppColors.greyTextColor), - Utils.buildSvgWithAssets( - icon: AppAssets.lab_result_indicator, - width: 21, - height: 23, - iconColor: context.read().getColor( - recentLabResult.calculatedResultFlag ?? "", - )), ], ), ), - // SizedBox( - // width: 21, - // child: Utils.buildSvgWithAssets( - // icon: AppAssets.lab_result_indicator, - // width: 21, - // height: 23, - // iconColor: context.read().getColor( - // recentLabResult.calculatedResultFlag ?? "", - // ), - // ), - // ), ], - ) - + ), + Visibility( + visible: recentLabResult.referanceRange != null, + child: Text( + "Reference range: \n${recentLabResult.referanceRange!.trim()}".needTranslation, + style: TextStyle( + fontSize: 12.f, + fontWeight: FontWeight.w500, + fontFamily: 'Poppins', + color: AppColors.greyTextColor, + ), + softWrap: true, + ), + ), ], )); diff --git a/lib/presentation/medical_file/medical_file_page.dart b/lib/presentation/medical_file/medical_file_page.dart index 1652812..7b5341c 100644 --- a/lib/presentation/medical_file/medical_file_page.dart +++ b/lib/presentation/medical_file/medical_file_page.dart @@ -225,9 +225,9 @@ class _MedicalFilePageState extends State { ), AppCustomChipWidget( icon: AppAssets.blood_icon, - labelText: "Blood: ${appState.getUserBloodGroup.isEmpty ? "N/A" : appState.getUserBloodGroup.isEmpty}", + labelText: "Blood: ${appState.getUserBloodGroup.isEmpty ? "N/A" : appState.getUserBloodGroup.isEmpty}".needTranslation, iconColor: AppColors.primaryRedColor, - labelPadding: EdgeInsetsDirectional.only(end: 8.w), + labelPadding: EdgeInsetsDirectional.only(end: 4.w, start: 0.w), ), Consumer(builder: (context, insuranceVM, child) { return AppCustomChipWidget( @@ -390,6 +390,7 @@ class _MedicalFilePageState extends State { : ListView.separated( scrollDirection: Axis.horizontal, shrinkWrap: true, + padding: EdgeInsets.only(left: 24.w, right: 24.w), itemCount: myAppointmentsVM.patientAppointmentsHistoryList.length, itemBuilder: (context, index) { return AnimationConfiguration.staggeredList( @@ -440,9 +441,9 @@ class _MedicalFilePageState extends State { ), ); }, - separatorBuilder: (BuildContext cxt, int index) => SizedBox(width: 12.h), + separatorBuilder: (BuildContext cxt, int index) => SizedBox(width: 16.w), ), - ).paddingSymmetrical(24.w, 0); + ); }), SizedBox(height: 24.h), "Lab & Radiology".needTranslation.toText18(isBold: true).paddingSymmetrical(24.w, 0.h), @@ -695,11 +696,12 @@ class _MedicalFilePageState extends State { ), ).paddingSymmetrical(24.w, 0.h) : SizedBox( - height: 100.h, + height: 110.h, child: ListView.separated( scrollDirection: Axis.horizontal, itemCount: myAppointmentsVM.patientMyDoctorsList.length, shrinkWrap: true, + padding: EdgeInsets.only(left: 24.w, right: 24.w), itemBuilder: (context, index) { return AnimationConfiguration.staggeredList( position: index, @@ -719,7 +721,8 @@ class _MedicalFilePageState extends State { fit: BoxFit.cover, ).circle(100).toShimmer2(isShow: false, radius: 50.r), SizedBox(height: 8.h), - Expanded( + SizedBox( + width: 80.w, child: (myAppointmentsVM.patientMyDoctorsList[index].doctorName) .toString() .toText12(fontWeight: FontWeight.w500, isCenter: true, maxLine: 2) @@ -758,7 +761,7 @@ class _MedicalFilePageState extends State { }, separatorBuilder: (BuildContext cxt, int index) => SizedBox(width: 8.h), ), - ).paddingSymmetrical(24.w, 0); + ); }), SizedBox(height: 24.h), "Others".needTranslation.toText18(isBold: true).paddingSymmetrical(24.w, 0.h), diff --git a/lib/presentation/medical_file/widgets/medical_file_appointment_card.dart b/lib/presentation/medical_file/widgets/medical_file_appointment_card.dart index 037860f..1b09dd5 100644 --- a/lib/presentation/medical_file/widgets/medical_file_appointment_card.dart +++ b/lib/presentation/medical_file/widgets/medical_file_appointment_card.dart @@ -53,7 +53,7 @@ class MedicalFileAppointmentCard extends StatelessWidget { ).toShimmer2(isShow: myAppointmentsViewModel.isMyAppointmentsLoading), SizedBox(height: 16.h), Container( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.r, hasShadow: true), + decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.r, hasShadow: false), width: 200.w, child: Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/presentation/medical_file/widgets/medical_file_card.dart b/lib/presentation/medical_file/widgets/medical_file_card.dart index 8c38363..6343e2a 100644 --- a/lib/presentation/medical_file/widgets/medical_file_card.dart +++ b/lib/presentation/medical_file/widgets/medical_file_card.dart @@ -29,7 +29,7 @@ class MedicalFileCard extends StatelessWidget { decoration: RoundedRectangleBorder().toSmoothCornerDecoration( color: backgroundColor, borderRadius: 12.r, - hasShadow: true + hasShadow: false ), padding: EdgeInsets.all(12.w), child: Column( diff --git a/lib/presentation/tele_consultation/zoom/call_screen.dart b/lib/presentation/tele_consultation/zoom/call_screen.dart new file mode 100644 index 0000000..21ad42f --- /dev/null +++ b/lib/presentation/tele_consultation/zoom/call_screen.dart @@ -0,0 +1,1840 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:io'; + +import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_hooks/flutter_hooks.dart'; +import 'package:flutter_ios_voip_kit_karmm/flutter_ios_voip_kit.dart'; +import 'package:flutter_zoom_videosdk/flutter_zoom_view.dart'; +import 'package:flutter_zoom_videosdk/native/zoom_videosdk.dart'; +import 'package:flutter_zoom_videosdk/native/zoom_videosdk_camera_device.dart'; +import 'package:flutter_zoom_videosdk/native/zoom_videosdk_cmd_channel.dart'; +import 'package:flutter_zoom_videosdk/native/zoom_videosdk_event_listener.dart'; +import 'package:flutter_zoom_videosdk/native/zoom_videosdk_live_transcription_message_info.dart'; +import 'package:flutter_zoom_videosdk/native/zoom_videosdk_share_action.dart'; +import 'package:flutter_zoom_videosdk/native/zoom_videosdk_user.dart'; +import 'package:get_it/get_it.dart'; +import 'package:hmg_patient_app_new/core/app_export.dart'; +import 'package:hmg_patient_app_new/core/cache_consts.dart'; +import 'package:hmg_patient_app_new/core/utils/jwt.dart'; +import 'package:hmg_patient_app_new/core/utils/utils.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; +import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; +import 'package:hmg_patient_app_new/presentation/tele_consultation/zoom/video_view.dart'; +import 'package:hmg_patient_app_new/services/cache_service.dart'; +import 'package:hmg_patient_app_new/theme/colors.dart'; +import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; +import 'package:image_picker/image_picker.dart'; + +class CallScreen extends StatefulHookWidget { + const CallScreen({Key? key}) : super(key: key); + + @override + State createState() => _CallScreenState(); +} + +class _CallScreenState extends State { + static TextEditingController changeNameController = TextEditingController(); + double opacityLevel = 1.0; + + final voIPKit = FlutterIOSVoIPKit.instance; + + bool isScreenBeingShared = false; + + void _changeOpacity() { + setState(() => opacityLevel = opacityLevel == 0 ? 1.0 : 0.0); + } + + @override + Widget build(BuildContext context) { + var zoom = ZoomVideoSdk(); + var eventListener = ZoomVideoSdkEventListener(); + var isInSession = useState(false); + var sessionName = useState(''); + var sessionPassword = useState(''); + var users = useState([]); + var fullScreenUser = useState(null); + var sharingUser = useState(null); + var videoInfo = useState(''); + var isSharing = useState(false); + var isMuted = useState(true); + var isVideoOn = useState(false); + var isSpeakerOn = useState(false); + var isRenameModalVisible = useState(false); + var isRecordingStarted = useState(false); + var isMicOriginalOn = useState(false); + var isMounted = useIsMounted(); + var audioStatusFlag = useState(false); + var videoStatusFlag = useState(false); + var userNameFlag = useState(false); + var userShareStatusFlag = useState(false); + var isReceiveSpokenLanguageContentEnabled = useState(false); + var isVideoMirrored = useState(false); + var isOriginalAspectRatio = useState(false); + var isPiPView = useState(false); + var isSharedCamera = useState(false); + CameraShareView cameraShareView = const CameraShareView(creationParams: {}); + + //hide status bar + SystemChrome.setEnabledSystemUIMode(SystemUiMode.leanBack); + var circleButtonSize = 65.0; + Color backgroundColor = const Color(0xFF232323); + Color buttonBackgroundColor = const Color.fromRGBO(0, 0, 0, 0.6); + Color chatTextColor = const Color(0xFFAAAAAA); + Widget changeNamePopup; + final args = ModalRoute.of(context)!.settings.arguments as CallArguments; + + useEffect(() { + Future.microtask(() async { + var token = generateJwt(args.sessionName, args.role); + + Utils.removeFromPrefs(CacheConst.isAppOpenedFromCall); + + try { + Map SDKaudioOptions = {"connect": true, "mute": false, "autoAdjustSpeakerVolume": false}; + Map SDKvideoOptions = { + "localVideoOn": true, + }; + JoinSessionConfig joinSession = JoinSessionConfig( + sessionName: args.sessionName, + sessionPassword: args.sessionPwd, + token: token, + userName: args.displayName, + audioOptions: SDKaudioOptions, + videoOptions: SDKvideoOptions, + sessionIdleTimeoutMins: int.parse(args.sessionIdleTimeoutMins), + ); + await zoom.joinSession(joinSession); + } catch (e) { + const AlertDialog( + title: Text("Error"), + content: Text("Failed to join the session"), + ); + Future.delayed(const Duration(milliseconds: 1000)).asStream().listen((event) { + Navigator.pushAndRemoveUntil( + context, + CustomPageRoute( + page: LandingNavigation(), + ), + (r) => false); + }); + } + }); + return null; + }, []); + + useEffect(() { + final sessionJoinListener = eventListener.addListener(EventType.onSessionJoin, (data) async { + data = data as Map; + isInSession.value = true; + zoom.session.getSessionName().then((value) => sessionName.value = value!); + sessionPassword.value = await zoom.session.getSessionPassword(); + debugPrint("sessionPhonePasscode: ${await zoom.session.getSessionPhonePasscode()}"); + ZoomVideoSdkUser mySelf = ZoomVideoSdkUser.fromJson(jsonDecode(data['sessionUser'])); + List? remoteUsers = await zoom.session.getRemoteUsers(); + var muted = await mySelf.audioStatus?.isMuted(); + var videoOn = await mySelf.videoStatus?.isOn(); + var speakerOn = await zoom.audioHelper.getSpeakerStatus(); + fullScreenUser.value = mySelf; + remoteUsers?.insert(0, mySelf); + isMuted.value = muted!; + isSpeakerOn.value = speakerOn; + isVideoOn.value = videoOn!; + users.value = remoteUsers!; + isReceiveSpokenLanguageContentEnabled.value = await zoom.liveTranscriptionHelper.isReceiveSpokenLanguageContentEnabled(); + }); + + final sessionLeaveListener = eventListener.addListener(EventType.onSessionLeave, (data) async { + data = data as Map; + debugPrint("onSessionLeave: ${data['reason']}"); + isInSession.value = false; + users.value = []; + fullScreenUser.value = null; + // Navigator.popAndPushNamed( + // context, + // "Join", + // arguments: JoinArguments(args.isJoin, sessionName.value, sessionPassword.value, args.displayName, args.sessionIdleTimeoutMins, args.role), + // ); + Navigator.pushAndRemoveUntil( + context, + CustomPageRoute( + page: LandingNavigation(), + ), + (r) => false); + }); + + final sessionNeedPasswordListener = eventListener.addListener(EventType.onSessionNeedPassword, (data) async { + showDialog( + context: context, + builder: (BuildContext context) => AlertDialog( + title: const Text('Session Need Password'), + content: const Text('Password is required'), + actions: [ + TextButton( + onPressed: () async => { + Navigator.pushAndRemoveUntil( + context, + CustomPageRoute( + page: LandingNavigation(), + ), + (r) => false), + await zoom.leaveSession(false), + }, + child: const Text('OK'), + ), + ], + ), + ); + }); + + final sessionPasswordWrongListener = eventListener.addListener(EventType.onSessionPasswordWrong, (data) async { + showDialog( + context: context, + builder: (BuildContext context) => AlertDialog( + title: const Text('Session Password Incorrect'), + content: const Text('Password is wrong'), + actions: [ + TextButton( + onPressed: () async => { + Navigator.popAndPushNamed(context, 'Join', arguments: JoinArguments(args.isJoin, args.sessionName, "", args.displayName, args.sessionIdleTimeoutMins, args.role)), + await zoom.leaveSession(false), + }, + child: const Text('OK'), + ), + ], + ), + ); + }); + + final userVideoStatusChangedListener = eventListener.addListener(EventType.onUserVideoStatusChanged, (data) async { + data = data as Map; + ZoomVideoSdkUser? mySelf = await zoom.session.getMySelf(); + var userListJson = jsonDecode(data['changedUsers']) as List; + List userList = userListJson.map((userJson) => ZoomVideoSdkUser.fromJson(userJson)).toList(); + for (var user in userList) { + { + if (user.userId == mySelf?.userId) { + mySelf?.videoStatus?.isOn().then((on) => isVideoOn.value = on); + } + } + } + videoStatusFlag.value = !videoStatusFlag.value; + }); + + final userAudioStatusChangedListener = eventListener.addListener(EventType.onUserAudioStatusChanged, (data) async { + data = data as Map; + ZoomVideoSdkUser? mySelf = await zoom.session.getMySelf(); + var userListJson = jsonDecode(data['changedUsers']) as List; + List userList = userListJson.map((userJson) => ZoomVideoSdkUser.fromJson(userJson)).toList(); + for (var user in userList) { + { + if (user.userId == mySelf?.userId) { + mySelf?.audioStatus?.isMuted().then((muted) => isMuted.value = muted); + } + } + } + audioStatusFlag.value = !audioStatusFlag.value; + }); + + final userShareStatusChangeListener = eventListener.addListener(EventType.onUserShareStatusChanged, (data) async { + data = data as Map; + ZoomVideoSdkUser? mySelf = await zoom.session.getMySelf(); + ZoomVideoSdkUser shareUser = ZoomVideoSdkUser.fromJson(jsonDecode(data['user'].toString())); + ZoomVideoSdkShareAction? shareAction = ZoomVideoSdkShareAction.fromJson(jsonDecode(data['shareAction'])); + + if (shareAction.shareStatus == ShareStatus.Start || shareAction.shareStatus == ShareStatus.Resume) { + sharingUser.value = shareUser; + fullScreenUser.value = shareUser; + isSharing.value = (shareUser.userId == mySelf?.userId); + + setState(() { + isScreenBeingShared = true; + }); + Future.delayed(const Duration(seconds: 2), () { + setState(() { + isScreenBeingShared = false; + }); + }); + } else { + sharingUser.value = null; + isSharing.value = false; + isSharedCamera.value = false; + fullScreenUser.value = mySelf; + isScreenBeingShared = false; + setState(() { + isScreenBeingShared = true; + }); + Future.delayed(const Duration(seconds: 2), () { + setState(() { + isScreenBeingShared = false; + }); + }); + } + userShareStatusFlag.value = !userShareStatusFlag.value; + }); + + final shareContentChangedListener = eventListener.addListener(EventType.onShareContentChanged, (data) async { + data = data as Map; + ZoomVideoSdkUser? mySelf = await zoom.session.getMySelf(); + ZoomVideoSdkUser shareUser = ZoomVideoSdkUser.fromJson(jsonDecode(data['user'].toString())); + ZoomVideoSdkShareAction? shareAction = ZoomVideoSdkShareAction.fromJson(jsonDecode(data['shareAction'])); + if (shareAction.shareType == ShareType.Camera) { + debugPrint("Camera share started"); + isSharedCamera.value = (shareUser.userId == mySelf?.userId); + } + }); + + final userJoinListener = eventListener.addListener(EventType.onUserJoin, (data) async { + if (!isMounted()) return; + data = data as Map; + ZoomVideoSdkUser? mySelf = await zoom.session.getMySelf(); + var userListJson = jsonDecode(data['remoteUsers']) as List; + List remoteUserList = userListJson.map((userJson) => ZoomVideoSdkUser.fromJson(userJson)).toList(); + remoteUserList.insert(0, mySelf!); + users.value = remoteUserList; + }); + + final userLeaveListener = eventListener.addListener(EventType.onUserLeave, (data) async { + if (!isMounted()) return; + ZoomVideoSdkUser? mySelf = await zoom.session.getMySelf(); + data = data as Map; + List? remoteUserList = await zoom.session.getRemoteUsers(); + var leftUserListJson = jsonDecode(data['leftUsers']) as List; + List leftUserLis = leftUserListJson.map((userJson) => ZoomVideoSdkUser.fromJson(userJson)).toList(); + if (fullScreenUser.value != null) { + for (var user in leftUserLis) { + { + if (fullScreenUser.value?.userId == user.userId) { + fullScreenUser.value = mySelf; + } + } + } + } else { + fullScreenUser.value = mySelf; + } + remoteUserList?.add(mySelf!); + users.value = remoteUserList!; + }); + + final userNameChangedListener = eventListener.addListener(EventType.onUserNameChanged, (data) async { + if (!isMounted()) return; + data = data as Map; + ZoomVideoSdkUser? changedUser = ZoomVideoSdkUser.fromJson(jsonDecode(data['changedUser'])); + int index; + for (var user in users.value) { + if (user.userId == changedUser.userId) { + index = users.value.indexOf(user); + users.value[index] = changedUser; + } + } + userNameFlag.value = !userNameFlag.value; + }); + + final commandReceived = eventListener.addListener(EventType.onCommandReceived, (data) async { + data = data as Map; + debugPrint("sender: ${ZoomVideoSdkUser.fromJson(jsonDecode(data['sender']))}, command: ${data['command']}"); + }); + + final liveStreamStatusChangeListener = eventListener.addListener(EventType.onLiveStreamStatusChanged, (data) async { + data = data as Map; + debugPrint("onLiveStreamStatusChanged: status: ${data['status']}"); + }); + + final liveTranscriptionStatusChangeListener = eventListener.addListener(EventType.onLiveTranscriptionStatus, (data) async { + data = data as Map; + debugPrint("onLiveTranscriptionStatus: status: ${data['status']}"); + }); + + final cloudRecordingStatusListener = eventListener.addListener(EventType.onCloudRecordingStatus, (data) async { + data = data as Map; + debugPrint("onCloudRecordingStatus: status: ${data['status']}"); + ZoomVideoSdkUser? mySelf = await zoom.session.getMySelf(); + if (data['status'] == RecordingStatus.Start) { + if (mySelf != null && !mySelf.isHost!) { + showDialog( + context: context, + builder: (BuildContext context) => AlertDialog( + content: const Text('The session is being recorded.'), + actions: [ + TextButton( + onPressed: () async { + await zoom.acceptRecordingConsent(); + if (context.mounted) { + Navigator.pop(context); + } + ; + }, + child: const Text('accept'), + ), + TextButton( + onPressed: () async { + String currentConsentType = await zoom.getRecordingConsentType(); + if (currentConsentType == ConsentType.ConsentType_Individual) { + await zoom.declineRecordingConsent(); + Navigator.pop(context); + } else { + await zoom.declineRecordingConsent(); + zoom.leaveSession(false); + if (!context.mounted) return; + Navigator.popAndPushNamed( + context, + "Join", + arguments: JoinArguments(args.isJoin, sessionName.value, sessionPassword.value, args.displayName, args.sessionIdleTimeoutMins, args.role), + ); + } + }, + child: const Text('decline'), + ), + ], + ), + ); + } + isRecordingStarted.value = true; + } else { + isRecordingStarted.value = false; + } + }); + + final liveTranscriptionMsgInfoReceivedListener = eventListener.addListener(EventType.onLiveTranscriptionMsgInfoReceived, (data) async { + data = data as Map; + ZoomVideoSdkLiveTranscriptionMessageInfo? messageInfo = ZoomVideoSdkLiveTranscriptionMessageInfo.fromJson(jsonDecode(data['messageInfo'])); + debugPrint("onLiveTranscriptionMsgInfoReceived: content: ${messageInfo.messageContent}"); + }); + + final inviteByPhoneStatusListener = eventListener.addListener(EventType.onInviteByPhoneStatus, (data) async { + data = data as Map; + debugPrint("onInviteByPhoneStatus: status: ${data['status']}, reason: ${data['reason']}"); + }); + + final multiCameraStreamStatusChangedListener = eventListener.addListener(EventType.onMultiCameraStreamStatusChanged, (data) async { + data = data as Map; + ZoomVideoSdkUser? changedUser = ZoomVideoSdkUser.fromJson(jsonDecode(data['changedUser'])); + var status = data['status']; + for (var user in users.value) { + { + if (changedUser.userId == user.userId) { + if (status == MultiCameraStreamStatus.Joined) { + user.hasMultiCamera = true; + } else if (status == MultiCameraStreamStatus.Left) { + user.hasMultiCamera = false; + } + } + } + } + }); + + final requireSystemPermission = eventListener.addListener(EventType.onRequireSystemPermission, (data) async { + data = data as Map; + ZoomVideoSdkUser? changedUser = ZoomVideoSdkUser.fromJson(jsonDecode(data['changedUser'])); + var permissionType = data['permissionType']; + switch (permissionType) { + case SystemPermissionType.Camera: + showDialog( + context: context, + builder: (BuildContext context) => AlertDialog( + title: const Text("Can't Access Camera"), + content: const Text("please turn on the toggle in system settings to grant permission"), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context, 'OK'), + child: const Text('OK'), + ), + ], + ), + ); + break; + case SystemPermissionType.Microphone: + showDialog( + context: context, + builder: (BuildContext context) => AlertDialog( + title: const Text("Can't Access Microphone"), + content: const Text("please turn on the toggle in system settings to grant permission"), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context, 'OK'), + child: const Text('OK'), + ), + ], + ), + ); + break; + } + }); + + final networkStatusChangeListener = eventListener.addListener(EventType.onUserVideoNetworkStatusChanged, (data) async { + data = data as Map; + ZoomVideoSdkUser? networkUser = ZoomVideoSdkUser.fromJson(jsonDecode(data['user'])); + + if (data['status'] == NetworkStatus.Bad) { + debugPrint("onUserVideoNetworkStatusChanged: status: ${data['status']}, user: ${networkUser.userName}"); + } + }); + + final eventErrorListener = eventListener.addListener(EventType.onError, (data) async { + data = data as Map; + String errorType = data['errorType']; + showDialog( + context: context, + builder: (BuildContext context) => AlertDialog( + title: const Text("Error"), + content: Text(errorType), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context, 'OK'), + child: const Text('OK'), + ), + ], + ), + ); + if (errorType == Errors.SessionJoinFailed || errorType == Errors.SessionDisconnecting) { + Timer( + const Duration(milliseconds: 1000), + () => { + Navigator.popAndPushNamed( + context, + "Join", + arguments: JoinArguments(args.isJoin, sessionName.value, sessionPassword.value, args.displayName, args.sessionIdleTimeoutMins, args.role), + ), + }); + } + }); + + final userRecordingConsentListener = eventListener.addListener(EventType.onUserRecordingConsent, (data) async { + data = data as Map; + ZoomVideoSdkUser? user = ZoomVideoSdkUser.fromJson(jsonDecode(data['user'])); + debugPrint('userRecordingConsentListener: user= ${user.userName}'); + }); + + final callCRCDeviceStatusListener = eventListener.addListener(EventType.onCallCRCDeviceStatusChanged, (data) async { + data = data as Map; + debugPrint('onCallCRCDeviceStatusChanged: status = ${data['status']}'); + }); + + final originalLanguageMsgReceivedListener = eventListener.addListener(EventType.onOriginalLanguageMsgReceived, (data) async { + data = data as Map; + ZoomVideoSdkLiveTranscriptionMessageInfo? messageInfo = ZoomVideoSdkLiveTranscriptionMessageInfo.fromJson(jsonDecode(data['messageInfo'])); + debugPrint("onOriginalLanguageMsgReceived: content: ${messageInfo.messageContent}"); + }); + + final chatPrivilegeChangedListener = eventListener.addListener(EventType.onChatPrivilegeChanged, (data) async { + data = data as Map; + String type = data['privilege']; + debugPrint('chatPrivilegeChangedListener: type= $type'); + }); + + final testMicStatusListener = eventListener.addListener(EventType.onTestMicStatusChanged, (data) async { + data = data as Map; + String status = data['status']; + debugPrint('testMicStatusListener: status= $status'); + }); + + final micSpeakerVolumeChangedListener = eventListener.addListener(EventType.onMicSpeakerVolumeChanged, (data) async { + data = data as Map; + int type = data['micVolume']; + debugPrint('onMicSpeakerVolumeChanged: micVolume= $type, speakerVolume'); + }); + + final cameraControlRequestResultListener = eventListener.addListener(EventType.onCameraControlRequestResult, (data) async { + data = data as Map; + bool approved = data['approved']; + debugPrint('onCameraControlRequestResult: approved= $approved'); + }); + + final callOutUserJoinListener = eventListener.addListener(EventType.onCalloutJoinSuccess, (data) async { + data = data as Map; + String phoneNumber = data['phoneNumber']; + ZoomVideoSdkUser? user = ZoomVideoSdkUser.fromJson(jsonDecode(data['user'])); + debugPrint('onCalloutJoinSuccess: phoneNumber= $phoneNumber, user= ${user.userName}'); + }); + + return () => { + sessionJoinListener.cancel(), + sessionLeaveListener.cancel(), + sessionPasswordWrongListener.cancel(), + sessionNeedPasswordListener.cancel(), + userVideoStatusChangedListener.cancel(), + userAudioStatusChangedListener.cancel(), + userJoinListener.cancel(), + userLeaveListener.cancel(), + userNameChangedListener.cancel(), + userShareStatusChangeListener.cancel(), + liveStreamStatusChangeListener.cancel(), + cloudRecordingStatusListener.cancel(), + inviteByPhoneStatusListener.cancel(), + eventErrorListener.cancel(), + commandReceived.cancel(), + liveTranscriptionStatusChangeListener.cancel(), + liveTranscriptionMsgInfoReceivedListener.cancel(), + multiCameraStreamStatusChangedListener.cancel(), + requireSystemPermission.cancel(), + userRecordingConsentListener.cancel(), + networkStatusChangeListener.cancel(), + callCRCDeviceStatusListener.cancel(), + originalLanguageMsgReceivedListener.cancel(), + chatPrivilegeChangedListener.cancel(), + testMicStatusListener.cancel(), + micSpeakerVolumeChangedListener.cancel(), + cameraControlRequestResultListener.cancel(), + callOutUserJoinListener.cancel(), + shareContentChangedListener.cancel(), + }; + }, [zoom, users.value, isMounted]); + + void selectVirtualBackgroundItem() async { + final ImagePicker picker = ImagePicker(); + // Pick an image. + final XFile? image = await picker.pickImage(source: ImageSource.gallery); + await zoom.virtualBackgroundHelper.addVirtualBackgroundItem(image!.path); + } + + void onPressAudio() async { + ZoomVideoSdkUser? mySelf = await zoom.session.getMySelf(); + if (mySelf != null) { + final audioStatus = mySelf.audioStatus; + if (audioStatus != null) { + var muted = await audioStatus.isMuted(); + if (muted) { + await zoom.audioHelper.unMuteAudio(mySelf.userId); + } else { + await zoom.audioHelper.muteAudio(mySelf.userId); + } + } + } + } + + void onPressVideo() async { + ZoomVideoSdkUser? mySelf = await zoom.session.getMySelf(); + if (mySelf != null) { + final videoStatus = mySelf.videoStatus; + if (videoStatus != null) { + var videoOn = await videoStatus.isOn(); + if (videoOn) { + await zoom.videoHelper.stopVideo(); + } else { + await zoom.videoHelper.startVideo(); + } + } + } + } + + void onPressShare() async { + var isOtherSharing = await zoom.shareHelper.isOtherSharing(); + var isShareLocked = await zoom.shareHelper.isShareLocked(); + String? shareCameraViewResult = Errors.InternalError; + + if (isOtherSharing) { + showDialog( + context: context, + builder: (BuildContext context) => AlertDialog( + title: const Text("Error"), + content: const Text('Other is sharing'), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context, 'OK'), + child: const Text('OK'), + ), + ], + ), + ); + } else if (isShareLocked) { + showDialog( + context: context, + builder: (BuildContext context) => AlertDialog( + title: const Text("Error"), + content: const Text('Share is locked by host'), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context, 'OK'), + child: const Text('OK'), + ), + ], + ), + ); + } else if (isSharing.value) { + zoom.shareHelper.stopShare(); + } else { + List options = [ + ListTile( + title: Text( + 'Share Device Screen', + style: TextStyle( + fontSize: 14, + fontWeight: FontWeight.normal, + color: Colors.black, + ), + ), + onTap: () async => { + zoom.shareHelper.shareScreen(), + Navigator.of(context).pop(), + }, + ), + ListTile( + title: Text( + 'Share Camera', + style: TextStyle( + fontSize: 14, + fontWeight: FontWeight.normal, + color: Colors.black, + ), + ), + onTap: () async => { + shareCameraViewResult = await zoom.shareHelper.startShareCamera(cameraShareView), + debugPrint('start camera: $shareCameraViewResult'), + Navigator.of(context).pop(), + }, + ), + ]; + showDialog( + context: context, + builder: (context) { + return Dialog( + elevation: 0.0, + insetPadding: const EdgeInsets.symmetric(horizontal: 40), + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)), + child: SizedBox( + height: options.length * 60, + child: Scrollbar( + child: ListView( + shrinkWrap: true, + scrollDirection: Axis.vertical, + children: ListTile.divideTiles( + context: context, + tiles: options, + ).toList(), + ), + ), + ), + ); + }); + } + } + + void onSelectedUserVolume(ZoomVideoSdkUser user) async { + var isShareAudio = user.isSharing; + bool canSetVolume = await user.canSetUserVolume(user.userId, isShareAudio); + num userVolume; + + List options = [ + ListTile( + title: Text( + 'Adjust Volume', + style: const TextStyle( + fontSize: 18, + fontWeight: FontWeight.w600, + color: Colors.black, + ), + ), + ), + ListTile( + title: Text( + 'Current volume', + style: const TextStyle( + fontSize: 14, + fontWeight: FontWeight.normal, + color: Colors.black, + ), + ), + onTap: () async => { + debugPrint('user volume'), + userVolume = await user.getUserVolume(user.userId, isShareAudio), + debugPrint('user ${user.userName}\'s volume is ${userVolume!}'), + }, + ), + ]; + if (canSetVolume) { + options.add( + ListTile( + title: Text( + 'Volume up', + style: const TextStyle( + fontSize: 14, + fontWeight: FontWeight.normal, + color: Colors.black, + ), + ), + onTap: () async => { + userVolume = await user.getUserVolume(user.userId, isShareAudio), + if (userVolume < 10) + { + await user.setUserVolume(user.userId, userVolume + 1, isShareAudio), + } + else + { + debugPrint("Cannot volume up."), + } + }, + ), + ); + options.add( + ListTile( + title: Text( + 'Volume down', + style: const TextStyle( + fontSize: 14, + fontWeight: FontWeight.normal, + color: Colors.black, + ), + ), + onTap: () async => { + userVolume = await user.getUserVolume(user.userId, isShareAudio), + if (userVolume > 0) + { + await user.setUserVolume(user.userId, userVolume - 1, isShareAudio), + } + else + { + debugPrint("Cannot volume down."), + } + }, + ), + ); + } + showDialog( + context: context, + builder: (context) { + return Dialog( + elevation: 0.0, + insetPadding: const EdgeInsets.symmetric(horizontal: 40), + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)), + child: SizedBox( + height: options.length * 58, + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + ListView( + shrinkWrap: true, + children: ListTile.divideTiles( + context: context, + tiles: options, + ).toList(), + ), + ], + ), + )); + }); + } + + void onPressCameraList() async { + List options = []; + List cameraList = await zoom.videoHelper.getCameraList(); + for (var camera in cameraList) { + options.add( + ListTile( + title: Text( + camera.deviceName, + style: const TextStyle( + fontSize: 14, + fontWeight: FontWeight.normal, + color: Colors.black, + ), + ), + onTap: () async => { + await zoom.videoHelper.switchCamera(camera.deviceId), + Navigator.of(context).pop(), + }, + ), + ); + } + options.add( + ListTile( + title: Text( + "Cancel", + style: const TextStyle( + fontSize: 14, + fontWeight: FontWeight.normal, + color: Colors.black, + ), + ), + onTap: () async => { + Navigator.of(context).pop(), + }, + ), + ); + showDialog( + context: context, + builder: (context) { + return Dialog( + elevation: 0.0, + insetPadding: const EdgeInsets.symmetric(horizontal: 40), + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)), + child: SizedBox( + height: options.length * 60, + child: Scrollbar( + child: ListView( + shrinkWrap: true, + scrollDirection: Axis.vertical, + children: ListTile.divideTiles( + context: context, + tiles: options, + ).toList(), + ), + ), + ), + ); + }); + } + + // Future onPressMore() async { + // ZoomVideoSdkUser? mySelf = await zoom.session.getMySelf(); + // bool isShareLocked = await zoom.shareHelper.isShareLocked(); + // bool canSwitchSpeaker = await zoom.audioHelper.canSwitchSpeaker(); + // bool canStartRecording = (await zoom.recordingHelper.canStartRecording()) == Errors.Success; + // debugPrint("canStartRecording ${await zoom.recordingHelper.canStartRecording()}"); + // var startLiveTranscription = (await zoom.liveTranscriptionHelper.getLiveTranscriptionStatus()) == LiveTranscriptionStatus.Start; + // bool canStartLiveTranscription = await zoom.liveTranscriptionHelper.canStartLiveTranscription(); + // bool isHost = (mySelf != null) ? (await mySelf.getIsHost()) : false; + // isOriginalAspectRatio.value = await zoom.videoHelper.isOriginalAspectRatioEnabled(); + // bool canCallOutToCRC = await zoom.CRCHelper.isCRCEnabled(); + // bool supportVB = await zoom.virtualBackgroundHelper.isSupportVirtualBackground(); + // List? shareActionList = await mySelf?.getShareActionList(); + // + // List options = [ + // ListTile( + // title: Text( + // 'More', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 18, + // fontWeight: FontWeight.w600, + // color: Colors.black, + // ), + // ), + // ), + // ), + // ListTile( + // title: Text( + // 'Get Chat Privilege', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // debugPrint("Chat Privilege = ${await zoom.chatHelper.getChatPrivilege()}"), + // Navigator.of(context).pop(), + // }, + // ), + // ListTile( + // title: Text( + // 'Get Session Dial-in Number infos', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // debugPrint("session number = ${await zoom.session.getSessionNumber()}"), + // Navigator.of(context).pop(), + // }, + // ), + // ListTile( + // title: Text( + // 'Get Camera List', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // debugPrint("camera list= ${await zoom.videoHelper.getCameraList()}"), + // onPressCameraList(), + // Navigator.of(context).pop(), + // }, + // ), + // ListTile( + // title: Text( + // '${isMicOriginalOn.value ? 'Disable' : 'Enable'} Original Sound', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // debugPrint("${isMicOriginalOn.value}"), + // await zoom.audioSettingHelper.enableMicOriginalInput(!isMicOriginalOn.value), + // isMicOriginalOn.value = await zoom.audioSettingHelper.isMicOriginalInputEnable(), + // debugPrint("Original sound ${isMicOriginalOn.value ? 'Enabled' : 'Disabled'}"), + // Navigator.of(context).pop(), + // }, + // ) + // ]; + // + // if (supportVB) { + // options.add( + // ListTile( + // title: Text( + // 'Add Virtual Background', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // selectVirtualBackgroundItem(), + // Navigator.of(context).pop(), + // }, + // ), + // ); + // } + // + // if (canCallOutToCRC) { + // options.add(ListTile( + // title: Text( + // 'Call-out to CRC devices', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // debugPrint('CRC result = ${await zoom.CRCHelper.callCRCDevice("bjn.vc", ZoomVideoSdkCRCProtocolType.SIP)}'), + // Navigator.of(context).pop(), + // }, + // )); + // options.add(ListTile( + // title: Text( + // 'Cancel call-out to CRC devices', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // debugPrint('cancel result= ${await zoom.CRCHelper.cancelCallCRCDevice()}'), + // Navigator.of(context).pop(), + // }, + // )); + // } + // + // if (canSwitchSpeaker) { + // options.add(ListTile( + // title: Text( + // 'Turn ${isSpeakerOn.value ? 'off' : 'on'} Speaker', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // await zoom.audioHelper.setSpeaker(!isSpeakerOn.value), + // isSpeakerOn.value = await zoom.audioHelper.getSpeakerStatus(), + // debugPrint('Turned ${isSpeakerOn.value ? 'on' : 'off'} Speaker'), + // Navigator.of(context).pop(), + // }, + // )); + // } + // + // if (isHost) { + // options.add(ListTile( + // title: Text( + // '${isShareLocked ? 'Unlock' : 'Lock'} Share', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // debugPrint("isShareLocked = ${await zoom.shareHelper.lockShare(!isShareLocked)}"), + // Navigator.of(context).pop(), + // })); + // options.add(ListTile( + // title: Text( + // 'Change Name', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () => { + // isRenameModalVisible.value = true, + // Navigator.of(context).pop(), + // }, + // )); + // } + // + // if (canStartLiveTranscription) { + // options.add(ListTile( + // title: Text( + // "${startLiveTranscription ? 'Stop' : 'Start'} Live Transcription", + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // if (startLiveTranscription) + // { + // debugPrint('stopLiveTranscription= ${await zoom.liveTranscriptionHelper.stopLiveTranscription()}'), + // } + // else + // { + // debugPrint('startLiveTranscription= ${await zoom.liveTranscriptionHelper.startLiveTranscription()}'), + // }, + // Navigator.of(context).pop(), + // }, + // )); + // options.add(ListTile( + // title: Text( + // '${isReceiveSpokenLanguageContentEnabled.value ? 'Disable' : 'Enable'} receiving original caption', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // await zoom.liveTranscriptionHelper.enableReceiveSpokenLanguageContent(!isReceiveSpokenLanguageContentEnabled.value), + // isReceiveSpokenLanguageContentEnabled.value = await zoom.liveTranscriptionHelper.isReceiveSpokenLanguageContentEnabled(), + // debugPrint("isReceiveSpokenLanguageContentEnabled = ${isReceiveSpokenLanguageContentEnabled.value}"), + // Navigator.of(context).pop(), + // })); + // } + // + // if (canStartRecording) { + // options.add(ListTile( + // title: Text( + // '${isRecordingStarted.value ? 'Stop' : 'Start'} Recording', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // if (!isRecordingStarted.value) + // { + // debugPrint('isRecordingStarted = ${await zoom.recordingHelper.startCloudRecording()}'), + // } + // else + // { + // debugPrint('isRecordingStarted = ${await zoom.recordingHelper.stopCloudRecording()}'), + // }, + // Navigator.of(context).pop(), + // })); + // } + // + // if (Platform.isAndroid) { + // bool isFlashlightSupported = await zoom.videoHelper.isSupportFlashlight(); + // bool isFlashlightOn = await zoom.videoHelper.isFlashlightOn(); + // if (isFlashlightSupported) { + // options.add(ListTile( + // title: Text( + // '${isFlashlightOn ? 'Turn Off' : 'Turn On'} Flashlight', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // if (!isFlashlightOn) + // { + // await zoom.videoHelper.turnOnOrOffFlashlight(true), + // } + // else + // { + // await zoom.videoHelper.turnOnOrOffFlashlight(false), + // }, + // Navigator.of(context).pop(), + // })); + // } + // } + // + // if (Platform.isIOS) { + // options.add(ListTile( + // title: Text( + // '${isPiPView.value ? 'Disable' : 'Enable'} picture in picture view', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // isPiPView.value = !isPiPView.value, + // Navigator.of(context).pop(), + // })); + // } + // + // if (isVideoOn.value) { + // options.add(ListTile( + // title: Text( + // 'Mirror the video', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // await zoom.videoHelper.mirrorMyVideo(!isVideoMirrored.value), + // isVideoMirrored.value = await zoom.videoHelper.isMyVideoMirrored(), + // Navigator.of(context).pop(), + // })); + // options.add(ListTile( + // title: Text( + // '${isOriginalAspectRatio.value ? 'Enable' : 'Disable'} original aspect ratio', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.normal, + // color: Colors.black, + // ), + // ), + // ), + // onTap: () async => { + // await zoom.videoHelper.enableOriginalAspectRatio(!isOriginalAspectRatio.value), + // isOriginalAspectRatio.value = await zoom.videoHelper.isOriginalAspectRatioEnabled(), + // debugPrint("isOriginalAspectRatio= ${isOriginalAspectRatio.value}"), + // Navigator.of(context).pop(), + // })); + // } + // + // showDialog( + // context: context, + // builder: (context) { + // return Dialog( + // elevation: 0.0, + // insetPadding: const EdgeInsets.symmetric(horizontal: 40), + // shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)), + // child: SizedBox( + // height: 500, + // child: Scrollbar( + // child: ListView( + // shrinkWrap: true, + // scrollDirection: Axis.vertical, + // children: ListTile.divideTiles( + // context: context, + // tiles: options, + // ).toList(), + // ), + // ), + // ), + // ); + // }); + // } + + void onLeaveSession(bool isEndSession) async { + await zoom.leaveSession(isEndSession); + Navigator.pushAndRemoveUntil( + context, + CustomPageRoute( + page: LandingNavigation(), + ), + (r) => false); + } + + void showLeaveOptions() async { + ZoomVideoSdkUser? mySelf = await zoom.session.getMySelf(); + bool isHost = await mySelf!.getIsHost(); + + Widget endSession; + Widget leaveSession; + Widget cancel = TextButton( + child: const Text('Cancel'), + onPressed: () { + Navigator.pop(context); //close Dialog + }, + ); + + switch (defaultTargetPlatform) { + case TargetPlatform.android: + endSession = TextButton( + child: const Text('End Session'), + onPressed: () => onLeaveSession(true), + ); + leaveSession = TextButton( + child: const Text('Leave Session'), + onPressed: () => onLeaveSession(false), + ); + break; + default: + endSession = CupertinoActionSheetAction( + isDestructiveAction: true, + child: const Text('End Session'), + onPressed: () => onLeaveSession(true), + ); + leaveSession = CupertinoActionSheetAction( + child: const Text('Leave Session'), + onPressed: () => onLeaveSession(false), + ); + break; + } + + List options = [ + leaveSession, + cancel, + ]; + + if (Platform.isAndroid) { + if (isHost) { + options.removeAt(1); + options.insert(0, endSession); + } + showDialog( + context: context, + builder: (context) { + return AlertDialog( + content: const Text("Do you want to leave this session?"), + shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(2.0))), + actions: options, + ); + }); + } else { + options.removeAt(1); + if (isHost) { + options.insert(1, endSession); + } + showCupertinoModalPopup( + context: context, + builder: (context) => CupertinoActionSheet( + message: const Text('Are you sure that you want to leave the session?'), + actions: options, + cancelButton: cancel, + ), + ); + } + } + + final chatMessageController = TextEditingController(); + + void sendChatMessage(String message) async { + await zoom.chatHelper.sendChatToAll(message); + ZoomVideoSdkUser? self = await zoom.session.getMySelf(); + ZoomVideoSdkCmdChannel cmdChannel = zoom.cmdChannel; + for (var user in users.value) { + if (user.userId != self?.userId) { + await zoom.cmdChannel.sendCommand(user.userId, message); + } + } + chatMessageController.clear(); + // send the chat as a command + } + + void onSelectedUser(ZoomVideoSdkUser user) async { + setState(() { + fullScreenUser.value = user; + }); + } + + changeNamePopup = Center( + child: Stack( + children: [ + Visibility( + visible: isRenameModalVisible.value, + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Container( + alignment: Alignment.bottomLeft, + decoration: const BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(10)), + color: Colors.white, + ), + width: MediaQuery.of(context).size.width - 130, + height: MediaQuery.of(context).size.height * 0.2, + child: Center( + child: (Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top: 20, left: 20), + child: Text( + 'Change Name', + style: const TextStyle( + fontSize: 18, + fontWeight: FontWeight.w500, + ), + ), + ), + Padding( + padding: const EdgeInsets.only(top: 10, left: 20), + child: SizedBox( + width: MediaQuery.of(context).size.width - 230, + child: TextField( + onEditingComplete: () {}, + autofocus: true, + cursorColor: Colors.black, + controller: changeNameController, + decoration: InputDecoration( + isDense: true, + hintText: 'New name', + hintStyle: TextStyle( + fontSize: 14.0, + color: chatTextColor, + ), + ), + ), + ), + ), + Padding( + padding: const EdgeInsets.only(top: 15), + child: Row( + children: [ + Padding( + padding: const EdgeInsets.only(left: 40), + child: InkWell( + child: Text( + 'Apply', + style: const TextStyle( + fontSize: 16, + ), + ), + onTap: () async { + if (fullScreenUser.value != null) { + ZoomVideoSdkUser? mySelf = await zoom.session.getMySelf(); + await zoom.userHelper.changeName((mySelf?.userId)!, changeNameController.text); + changeNameController.clear(); + } + isRenameModalVisible.value = false; + }, + ), + ), + Padding( + padding: const EdgeInsets.only(left: 40), + child: InkWell( + child: Text( + 'Cancel', + style: const TextStyle( + fontSize: 16, + ), + ), + onTap: () async { + isRenameModalVisible.value = false; + }, + ), + ) + ], + ), + ) + ], + )), + ), + ), + ], + )), + ], + ), + ); + + Widget fullScreenView; + Widget smallView; + Widget cameraView; + + if (isInSession.value && fullScreenUser.value != null && users.value.isNotEmpty) { + fullScreenView = AnimatedOpacity( + opacity: opacityLevel, + duration: const Duration(seconds: 3), + child: VideoView( + user: users.value.length > 1 ? users.value[1] : users.value[0], + hasMultiCamera: false, + isPiPView: isPiPView.value, + sharing: sharingUser.value == null ? false : (sharingUser.value?.userId == fullScreenUser.value?.userId), + preview: false, + focused: false, + multiCameraIndex: "0", + videoAspect: VideoAspect.Original, + fullScreen: true, + resolution: VideoResolution.Resolution360, + ), + ); + + smallView = Container( + height: 110, + margin: const EdgeInsets.only(left: 20, right: 20), + alignment: Alignment.center, + child: ListView.separated( + scrollDirection: Axis.horizontal, + itemCount: users.value.length, + itemBuilder: (BuildContext context, int index) { + return InkWell( + onTap: () async { + onSelectedUser(users.value[index]); + }, + onDoubleTap: () async { + onSelectedUserVolume(users.value[index]); + }, + child: Center( + child: VideoView( + user: users.value[index], + hasMultiCamera: false, + isPiPView: false, + sharing: false, + preview: false, + focused: false, + multiCameraIndex: "0", + videoAspect: VideoAspect.Original, + fullScreen: false, + resolution: VideoResolution.Resolution180, + ), + ), + ); + }, + separatorBuilder: (BuildContext context, int index) => const Divider(), + ), + ); + } else { + fullScreenView = Container( + color: Colors.black, + child: const Center( + child: Text( + "Connecting...", + style: TextStyle( + fontSize: 20, + color: Colors.white, + ), + ), + )); + smallView = Container( + height: 110, + color: Colors.transparent, + ); + } + + cameraView = Offstage( + offstage: !isSharedCamera.value, + child: AnimatedOpacity( + opacity: isSharedCamera.value ? 1.0 : 0.0, + duration: const Duration(milliseconds: 300), + child: cameraShareView, + ), + ); + + _changeOpacity; + return Scaffold( + resizeToAvoidBottomInset: false, + backgroundColor: backgroundColor, + body: Stack( + children: [ + // isScreenBeingShared ? fullScreenView : SizedBox.shrink(), + isScreenBeingShared ? SizedBox.shrink() : fullScreenView, + cameraView, + Container( + padding: const EdgeInsets.only(top: 35), + child: Stack( + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Container( + height: 80, + width: 180, + margin: const EdgeInsets.only(top: 16, left: 8), + padding: const EdgeInsets.all(8), + alignment: Alignment.topLeft, + decoration: BoxDecoration( + borderRadius: const BorderRadius.all(Radius.circular(8.0)), + // color: buttonBackgroundColor, + ), + // child: InkWell( + // onTap: () async { + // showDialog( + // context: context, + // builder: (context) { + // return Dialog( + // elevation: 0.0, + // insetPadding: const EdgeInsets.symmetric(horizontal: 40), + // shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)), + // child: FractionallySizedBox( + // heightFactor: 0.2, + // widthFactor: 0.3, + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.stretch, + // children: [ + // ListView( + // shrinkWrap: true, + // children: ListTile.divideTiles( + // context: context, + // tiles: [ + // ListTile( + // title: Text( + // 'Session Information', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 18, + // fontWeight: FontWeight.w600, + // ), + // ), + // ), + // ), + // ListTile( + // title: Text( + // 'Session Name', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // ), + // ), + // ), + // subtitle: Text( + // sessionName.value, + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 12, + // ), + // ), + // ), + // ), + // ListTile( + // title: Text( + // 'Session Password', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // ), + // ), + // ), + // subtitle: Text( + // sessionPassword.value, + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 12, + // ), + // ), + // ), + // ), + // ListTile( + // title: Text( + // 'Participants', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // ), + // ), + // ), + // subtitle: Text( + // '${users.value.length}', + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 12, + // ), + // ), + // ), + // ), + // ], + // ).toList(), + // ), + // ], + // ), + // )); + // }); + // }, + // child: Stack( + // children: [ + // Column( + // children: [ + // const Padding(padding: EdgeInsets.symmetric(vertical: 4)), + // Align( + // alignment: Alignment.centerLeft, + // child: Text( + // sessionName.value, + // overflow: TextOverflow.ellipsis, + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.w600, + // color: Colors.white, + // ), + // ), + // ), + // ), + // const Padding(padding: EdgeInsets.symmetric(vertical: 5)), + // Align( + // alignment: Alignment.centerLeft, + // child: Text( + // "Participants: ${users.value.length}", + // style: GoogleFonts.lato( + // textStyle: const TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.w600, + // color: Colors.white, + // ), + // ), + // ), + // ) + // ], + // ), + // Container( + // alignment: Alignment.centerRight, + // child: Image.asset( + // "assets/icons/unlocked@2x.png", + // height: 22, + // )), + // ], + // ), + // ), + ), + TextButton( + onPressed: (showLeaveOptions), + child: Container( + alignment: Alignment.topRight, + margin: const EdgeInsets.only(top: 16, right: 8), + padding: const EdgeInsets.only(top: 5, bottom: 5, left: 16, right: 16), + height: 28, + decoration: BoxDecoration( + borderRadius: const BorderRadius.all(Radius.circular(20.0)), + color: buttonBackgroundColor, + ), + child: const Text( + "LEAVE", + style: TextStyle( + fontSize: 14, + fontWeight: FontWeight.bold, + color: Color(0xFFE02828), + ), + ), + )), + ], + ), + Align( + alignment: Alignment.centerRight, + child: FractionallySizedBox( + widthFactor: 0.2, + heightFactor: 0.6, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + IconButton( + onPressed: onPressAudio, + icon: isMuted.value ? Image.asset("assets/images/png/zoom/unmute@2x.png") : Image.asset("assets/images/png/zoom/mute@2x.png"), + iconSize: circleButtonSize, + tooltip: isMuted.value == true ? "Unmute" : "Mute", + ), + IconButton( + onPressed: onPressShare, + icon: isSharing.value ? Image.asset("assets/images/png/zoom/share-off@2x.png") : Image.asset("assets/images/png/zoom/share-on@2x.png"), + iconSize: circleButtonSize, + ), + IconButton( + onPressed: onPressVideo, + iconSize: circleButtonSize, + icon: isVideoOn.value ? Image.asset("assets/images/png/zoom/video-off@2x.png") : Image.asset("assets/images/png/zoom/video-on@2x.png"), + ), + Column( + children: [ + IconButton( + onPressed: () async { + onPressCameraList(); + }, + icon: Icon(Icons.cameraswitch, color: Colors.white), + color: Colors.white, + iconSize: 40.h, + ), + "Switch Camera".toText12(color: AppColors.whiteColor, isCenter: true, isBold: true) + ], + ), + ], + ), + )), + Container( + margin: const EdgeInsets.only(left: 16, right: 16, bottom: 40, top: 10), + alignment: Alignment.bottomCenter, + child: SizedBox( + height: MediaQuery.of(context).viewInsets.bottom == 0 ? 65 : MediaQuery.of(context).viewInsets.bottom + 18, + child: TextField( + maxLines: 1, + textAlign: TextAlign.left, + style: TextStyle(color: chatTextColor), + cursorColor: chatTextColor, + textAlignVertical: TextAlignVertical.center, + controller: chatMessageController, + decoration: InputDecoration( + contentPadding: const EdgeInsets.only(left: 16, top: 10, bottom: 10, right: 16), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide(width: 1, color: chatTextColor), //<-- SEE HERE + ), + hintText: 'Type your message here...', + hintStyle: TextStyle( + fontSize: 14.0, + color: chatTextColor, + ), + ), + onSubmitted: (String str) { + sendChatMessage(str); + }, + ), + ), + ), + Container( + alignment: Alignment.bottomLeft, + margin: const EdgeInsets.only(bottom: 120), + child: smallView, + ), + // CommentList(zoom: zoom, eventListener: eventListener), + changeNamePopup, + ], + )), + ], + )); + } +} + +class CallArguments { + final bool isJoin; + final String sessionName; + final String sessionPwd; + final String displayName; + final String sessionIdleTimeoutMins; + final String role; + final int callType; + + CallArguments(this.sessionName, this.sessionPwd, this.displayName, this.sessionIdleTimeoutMins, this.role, this.isJoin, this.callType); +} + +class JoinArguments { + final bool isJoin; + final String sessionName; + final String sessionPwd; + final String displayName; + final String sessionTimeout; + final String roleType; + + JoinArguments(this.isJoin, this.sessionName, this.sessionPwd, this.displayName, this.sessionTimeout, this.roleType); +} diff --git a/lib/presentation/tele_consultation/zoom/video_view.dart b/lib/presentation/tele_consultation/zoom/video_view.dart new file mode 100644 index 0000000..4c1e049 --- /dev/null +++ b/lib/presentation/tele_consultation/zoom/video_view.dart @@ -0,0 +1,258 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; +import 'package:flutter_hooks/flutter_hooks.dart'; +import 'package:flutter_zoom_videosdk/flutter_zoom_view.dart' as FlutterZoomView; +import 'package:flutter_zoom_videosdk/native/zoom_videosdk.dart'; + +const SHOW_TALKING_ICON_DURATION = 2000; + +class VideoView extends FlutterZoomView.ZoomView { + const VideoView({ + super.key, + required super.user, + required super.sharing, + required super.preview, + required super.focused, + required super.hasMultiCamera, + required super.multiCameraIndex, + required super.videoAspect, + required super.fullScreen, + required super.resolution, + required super.isPiPView, + }); + + @override + Widget build(BuildContext context) { + var isVideoOn = useState(false); + var isTalking = useState(false); + var isMuted = useState(false); + var isMounted = useIsMounted(); + var zoom = ZoomVideoSdk(); + var isSharing = useState(false); + user?.audioStatus?.isMuted().then((muted) => isMuted.value = muted); + + useEffect(() { + updateVideoStatus() { + if (user == null) return; + Future.microtask(() async { + if (isMounted()) { + isVideoOn.value = (await user!.videoStatus!.isOn()); + isSharing.value = sharing; + } + }); + } + + resetAudioStatus() { + isTalking.value = false; + isMuted.value = false; + } + + updateAudioStatus() async { + if (!isMounted()) return; + var talking = await user?.audioStatus?.isTalking(); + var muted = await user?.audioStatus?.isMuted(); + isMuted.value = muted!; + isTalking.value = talking!; + if (talking) { + Timer( + const Duration(milliseconds: SHOW_TALKING_ICON_DURATION), + () => { + if (isMounted()) + { + isTalking.value = false, + } + }); + } + } + + updateVideoStatus(); + return null; + }, [zoom, user]); + + ImageIcon audioStatusIcon; + if (isTalking.value) { + audioStatusIcon = const ImageIcon( + AssetImage("assets/images/png/zoom/talking@2x.png"), + ); + } else if (isMuted.value) { + audioStatusIcon = const ImageIcon( + AssetImage("assets/images/png/zoom/muted@2x.png"), + ); + } + // Pass parameters to the platform side. + final Map creationParams = {}; + creationParams.putIfAbsent("userId", () => user?.userId); + creationParams.putIfAbsent("sharing", () => sharing); + creationParams.putIfAbsent("preview", () => preview); + creationParams.putIfAbsent("focused", () => focused); + creationParams.putIfAbsent("hasMultiCamera", () => hasMultiCamera); + if (videoAspect.isEmpty) { + creationParams.putIfAbsent("videoAspect", () => VideoAspect.PanAndScan); + } else { + creationParams.putIfAbsent("videoAspect", () => videoAspect); + } + creationParams.putIfAbsent("fullScreen", () => fullScreen); + if (resolution.isNotEmpty) { + creationParams.putIfAbsent("videoAspect", () => videoAspect); + } + + if (fullScreen) { + if (sharing) { + return Container( + height: MediaQuery.of(context).size.height, + width: MediaQuery.of(context).size.width, + alignment: Alignment.center, + child: FlutterZoomView.View(creationParams: creationParams), + ); + } else if (isVideoOn.value) { + return Container( + height: MediaQuery.of(context).size.height, + width: MediaQuery.of(context).size.width, + alignment: Alignment.center, + child: FlutterZoomView.View(creationParams: creationParams), + ); + } else { + return Container( + margin: const EdgeInsets.symmetric(vertical: 0), + child: Container( + alignment: Alignment.center, + child: const Image( + image: AssetImage("assets/images/png/zoom/default-avatar.png"), + )), + ); + } + } else { + if (isVideoOn.value || sharing) { + return Container( + padding: const EdgeInsets.symmetric(horizontal: 8), + height: 110, + width: 110, + child: Stack( + children: [ + Container( + height: 110, + width: 110, + decoration: BoxDecoration( + color: const Color(0xff232323), + border: Border.all( + color: const Color(0xff666666), + width: 1, + ), + borderRadius: const BorderRadius.all(Radius.circular(8)), + ), + alignment: Alignment.center, + child: FlutterZoomView.View(creationParams: creationParams), + ), + Container( + height: 110, + width: 110, + decoration: const BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(8)), + ), + ), + Container( + alignment: Alignment.bottomCenter, + child: Container( + height: 20, + width: 110, + decoration: const BoxDecoration( + color: Colors.black26, + borderRadius: BorderRadius.all(Radius.circular(8)), + ), + ), + ), + Container( + alignment: Alignment.bottomLeft, + margin: const EdgeInsets.only(left: 5), + child: Text( + user!.userName, + textAlign: TextAlign.left, + style: const TextStyle( + color: Colors.white, + fontSize: 12, + ), + ), + ), + Container( + alignment: Alignment.bottomRight, + margin: const EdgeInsets.only(right: 5, bottom: 5), + // height: 110, + // width: 110, + child: Image( + height: 12, + width: 12, + image: isMuted.value ? const AssetImage("assets/images/png/zoom/muted@2x.png") : const AssetImage("assets/images/png/zoom/talking@2x.png"), + fit: BoxFit.cover, + ), + ) + ], + ), + ); + } else { + return Container( + padding: const EdgeInsets.symmetric(horizontal: 8), + height: 110, + width: 110, + child: Stack( + children: [ + Container( + height: 110, + width: 110, + decoration: BoxDecoration( + color: const Color(0xff232323), + border: Border.all( + color: const Color(0xff666666), + width: 1, + ), + borderRadius: const BorderRadius.all(Radius.circular(8)), + ), + alignment: Alignment.center, + child: Container( + alignment: Alignment.center, + child: const Image( + height: 60, + width: 60, + image: AssetImage("assets/images/png/zoom/default-avatar.png"), + )), + ), + Align( + alignment: Alignment.bottomCenter, + child: Container( + height: 20, + width: 110, + decoration: const BoxDecoration( + color: Colors.black26, + borderRadius: BorderRadius.all(Radius.circular(8)), + ), + ), + ), + Container( + alignment: Alignment.bottomLeft, + margin: const EdgeInsets.only(left: 5), + child: Text( + user!.userName, + textAlign: TextAlign.left, + style: const TextStyle( + color: Colors.white, + fontSize: 12, + ), + ), + ), + Container( + alignment: Alignment.bottomRight, + margin: const EdgeInsets.only(right: 5, bottom: 5), + child: Image( + height: 12, + width: 12, + image: isMuted.value ? const AssetImage("assets/images/png/zoom/muted@2x.png") : const AssetImage("assets/images/png/zoom/talking@2x.png"), + fit: BoxFit.cover, + ), + ), + ], + ), + ); + } + } + } +} diff --git a/lib/routes/app_routes.dart b/lib/routes/app_routes.dart index b37ebfa..ed5c0db 100644 --- a/lib/routes/app_routes.dart +++ b/lib/routes/app_routes.dart @@ -7,6 +7,7 @@ import 'package:hmg_patient_app_new/presentation/e_referral/new_e_referral.dart' import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; import 'package:hmg_patient_app_new/presentation/home_health_care/hhc_procedures_page.dart'; import 'package:hmg_patient_app_new/presentation/medical_file/medical_file_page.dart'; +import 'package:hmg_patient_app_new/presentation/tele_consultation/zoom/call_screen.dart'; import 'package:hmg_patient_app_new/splashPage.dart'; class AppRoutes { @@ -19,6 +20,7 @@ class AppRoutes { static const String eReferralPage = '/erReferralPage'; static const String comprehensiveCheckupPage = '/comprehensiveCheckupPage'; static const String homeHealthCarePage = '/homeHealthCarePage'; + static const String zoomCallPage = '/zoomCallPage'; static Map get routes => { initialRoute: (context) => SplashPage(), @@ -29,6 +31,7 @@ class AppRoutes { medicalFilePage: (context) => MedicalFilePage(), eReferralPage: (context) => NewReferralPage(), comprehensiveCheckupPage: (context) => ComprehensiveCheckupPage(), - homeHealthCarePage: (context) => HhcProceduresPage() + homeHealthCarePage: (context) => HhcProceduresPage(), + zoomCallPage: (context) => CallScreen() }; } diff --git a/lib/splashPage.dart b/lib/splashPage.dart index ba7cefd..b5b752b 100644 --- a/lib/splashPage.dart +++ b/lib/splashPage.dart @@ -4,8 +4,11 @@ import 'dart:io'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_callkit_incoming/entities/call_event.dart'; +import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_zoom_videosdk/native/zoom_videosdk.dart'; +import 'package:get_it/get_it.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_orders_page.dart'; import 'package:hmg_patient_app_new/presentation/onboarding/onboarding_screen.dart'; import 'package:hmg_patient_app_new/presentation/onboarding/splash_animation_screen.dart'; @@ -19,6 +22,9 @@ import 'package:hmg_patient_app_new/features/authentication/authentication_view_ // import 'package:hmg_patient_app_new/presentation/authantication/login.dart'; import 'package:hmg_patient_app_new/presentation/home/landing_page.dart'; import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; +import 'package:hmg_patient_app_new/presentation/tele_consultation/zoom/call_screen.dart'; +import 'package:hmg_patient_app_new/services/cache_service.dart'; +import 'package:hmg_patient_app_new/services/navigation_service.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart'; import 'package:lottie/lottie.dart'; @@ -38,6 +44,7 @@ class _SplashScreenState extends State { late AuthenticationViewModel authVm; Future initializeStuff() async { + listenerEvent(); Timer( Duration(milliseconds: 500), () async { @@ -47,22 +54,155 @@ class _SplashScreenState extends State { ); await authVm.getServicePrivilege(); Timer(Duration(seconds: 2, milliseconds: 500), () async { + bool isAppOpenedFromCall = await GetIt.instance().getBool(key: CacheConst.isAppOpenedFromCall) ?? false; + LocalNotification.init(onNotificationClick: (payload) {}); - if (await Utils.getBoolFromPrefs(CacheConst.firstLaunch)) { - Navigator.of(context).pushReplacement(FadePage(page: SplashAnimationScreen(routeWidget: OnboardingScreen()))); + if (isAppOpenedFromCall) { + navigateToTeleConsult(); } else { - Navigator.of(context).pushReplacement(FadePage(page: SplashAnimationScreen(routeWidget: LandingNavigation()))); + if (await Utils.getBoolFromPrefs(CacheConst.firstLaunch)) { + // Navigator.of(context).pushReplacement(FadePage(page: SplashAnimationScreen(routeWidget: OnboardingScreen()))); + Navigator.of(context).pushReplacement(FadePage(page: OnboardingScreen())); + } else { + // Navigator.of(context).pushReplacement(FadePage(page: SplashAnimationScreen(routeWidget: LandingNavigation()))); + Navigator.of(context).pushReplacement(FadePage(page: LandingNavigation())); + } } }); var zoom = ZoomVideoSdk(); InitConfig initConfig = InitConfig( domain: "zoom.us", - enableLog: true, + enableLog: false, ); zoom.initSdk(initConfig); } + navigateToTeleConsult() async { + String roomID = await Utils.getStringFromPrefs(CacheConst.zoomRoomID); + print('RoomID: $roomID'); + + // GetIt.instance().remove(key: CacheConst.isAppOpenedFromCall); + Utils.removeFromPrefs(CacheConst.isAppOpenedFromCall); + + Navigator.of(GetIt.instance().navigatorKey.currentContext!).pushReplacement(FadePage(page: SplashAnimationScreen(routeWidget: LandingNavigation()))); + Navigator.pushReplacementNamed( + // context, + GetIt.instance().navigatorKey.currentContext!, + AppRoutes.zoomCallPage, + // arguments: CallArguments(appointmentID, "111", "Patient", "40", "1", true, 1), + arguments: CallArguments(roomID, "123", "Patient", "40", "0", true, 1), + // arguments: CallArguments("SmallDailyStandup9875", "123", "Patient", "40", "0", false, int.parse(widget.incomingCallData!.appointmentNo!)), + ); + } + + Future listenerEvent() async { + print('Call Canceled : ------->'); + + try { + FlutterCallkitIncoming.onEvent.listen((event) async { + switch (event!.event) { + case Event.actionCallIncoming: + print('actionCallIncoming Event Received: ------->'); + break; + case Event.actionCallStart: + print('actionCallStart Event Received: ------->'); + break; + case Event.actionCallAccept: + print('actionCallAccept Event Received: ------->'); + FlutterCallkitIncoming.endAllCalls(); + try { + navigateToTeleConsult(); + // String roomID = await Utils.getStringFromPrefs(SharedPrefsConsts.ZOOM_ROOM_ID); + // String roomPass = await Utils.getStringFromPrefs(SharedPrefsConsts.ZOOM_ROOM_PASS); + + // print('RoomID: $roomID'); + // print('RoomPass: $roomPass'); + + // Future.delayed(const Duration(milliseconds: 3000), () async { + // // try { + // // String teleConsultURL = "https://teleconsult.meena-health.com/api/videocall/doVideoCall?roomid="; + // // await Utils.getStringFromPrefs(SharedPrefsConsts.PATIENT_MRN).then((value) { + // // teleConsultURL = teleConsultURL + value; + // // print("TeleConsult URL: $teleConsultURL"); + // // Uri uri = Uri.parse(teleConsultURL); + // // launchUrl(uri, mode: LaunchMode.externalApplication, webOnlyWindowName: "TeleConsult"); + // // }); + // + // // var cameraStatus = await Permission.camera.request(); + // // var micStatus = await Permission.microphone.request(); + // // var permissionStatus = await [Permission.microphone, Permission.camera, Permission.notification].request(); + // // if (permissionStatus[1]?.isDenied == true) { + // // await Permission.camera.request(); + // // } + // // if (permissionStatus[0]?.isDenied == true) { + // // await Permission.microphone.request(); + // // } + // + // Navigator.pushNamed( + // // context, + // navigatorKey.currentContext!, + // AppRoutes.zoomCallPage, + // // arguments: CallArguments(appointmentID, "111", "Patient", "40", "1", true, 1), + // arguments: CallArguments(roomID, roomPass, "Patient", "40", "0", true, 1), + // // arguments: CallArguments("SmallDailyStandup9875", "123", "Patient", "40", "0", false, int.parse(widget.incomingCallData!.appointmentNo!)), + // ); + // // } catch (err) { + // // print(err); + // // } + // }); + // String teleConsultURL = "https://teleconsult.meena-health.com/api/videocall/doVideoCall?roomid="; + // await Utils.getStringFromPrefs(SharedPrefsConsts.PATIENT_MRN).then((value) { + // teleConsultURL = teleConsultURL + value; + // print("TeleConsult URL: $teleConsultURL"); + // Uri uri = Uri.parse(teleConsultURL); + // launchUrl(uri, mode: LaunchMode.inAppBrowserView, webOnlyWindowName: "Test"); + // }); + // navigatorKey.currentState!.pushNamed(AppRoutes.incomingCallScreenRoute); + // await Navigator.pushNamed(context, AppRoutes.incomingCallScreenRoute).then((value) {}); + } catch (e) { + print("ERRORRRR!!! ${e.toString()}"); + // await AppSharedPreferences().setObject('call_data', data); + // var data1 = await AppSharedPreferences().getObject('call_data'); + } + break; + case Event.actionCallDecline: + print('actionCallConnected Event Received: ------->'); + await FlutterCallkitIncoming.endAllCalls(); + GetIt.instance().remove(key: CacheConst.isAppOpenedFromCall); + break; + case Event.actionCallEnded: + break; + case Event.actionCallTimeout: + break; + case Event.actionCallCallback: + break; + case Event.actionCallToggleHold: + break; + case Event.actionCallToggleMute: + break; + case Event.actionCallToggleDmtf: + break; + case Event.actionCallToggleGroup: + break; + case Event.actionCallToggleAudioSession: + break; + case Event.actionDidUpdateDevicePushTokenVoip: + break; + case Event.actionCallCustom: + break; + case Event.actionCallConnected: + print('actionCallConnected Event Received: ------->'); + await FlutterCallkitIncoming.endAllCalls(); + break; + } + }); + } on Exception catch (e) { + print(e); + print("ERRORRRR!!! ${e.toString()}"); + } + } + /// load the Privilege from service Future loadPrivilege() async { // ProjectViewModel projectProvider = Provider.of(context, listen: false); diff --git a/lib/widgets/chip/app_custom_chip_widget.dart b/lib/widgets/chip/app_custom_chip_widget.dart index 6904edc..8be16b7 100644 --- a/lib/widgets/chip/app_custom_chip_widget.dart +++ b/lib/widgets/chip/app_custom_chip_widget.dart @@ -22,6 +22,7 @@ class AppCustomChipWidget extends StatelessWidget { this.deleteIconColor = AppColors.textColor, this.deleteIconHasColor = false, this.padding = EdgeInsets.zero, + this.isIconPNG = false, this.onChipTap, this.labelPadding, this.onDeleteTap, @@ -42,6 +43,7 @@ class AppCustomChipWidget extends StatelessWidget { final OutlinedBorder? shape; final EdgeInsets? padding; final EdgeInsetsDirectional? labelPadding; + final bool isIconPNG; final void Function()? onChipTap; final void Function()? onDeleteTap; @@ -66,8 +68,10 @@ class AppCustomChipWidget extends StatelessWidget { child: icon.isNotEmpty ? Chip( avatar: icon.isNotEmpty - ? Utils.buildSvgWithAssets( - icon: icon, + ? isIconPNG + ? Image.asset(icon, width: iconS, height: iconS) + : Utils.buildSvgWithAssets( + icon: icon, width: iconS, height: iconS, iconColor: iconHasColor ? iconColor : null, diff --git a/pubspec.yaml b/pubspec.yaml index 3d6604c..6f014cb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -59,7 +59,8 @@ dependencies: geolocator: ^14.0.2 dropdown_search: ^6.0.2 google_maps_flutter: ^2.13.1 - flutter_zoom_videosdk: ^2.1.10 + flutter_zoom_videosdk: 2.1.10 + dart_jsonwebtoken: ^3.2.0 dartz: ^0.10.1 equatable: ^2.0.7 google_api_availability: ^5.0.1 @@ -79,6 +80,7 @@ dependencies: path_provider: ^2.0.8 open_filex: ^4.7.0 flutter_swiper_view: ^1.1.8 + flutter_callkit_incoming: ^3.0.0 location: ^8.0.1 gms_check: ^1.0.4 @@ -108,6 +110,7 @@ flutter: - assets/images/png/body_parts/female/ - assets/images/svg/ - assets/images/png/ + - assets/images/png/zoom/ - assets/animations/ - assets/animations/lottie/ From 2b7379c1c3d140d20246586c473beaca7f30e381 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 7 Dec 2025 09:14:17 +0300 Subject: [PATCH 15/22] Waiting appointment implementation in progress --- android/app/proguard-rules.pro | 5 +- .../images/svg/doctor_profile_rating_icon.svg | 4 + .../svg/doctor_profile_reviews_icon.svg | 7 ++ assets/images/svg/waitingAppo.svg | 6 ++ lib/core/app_assets.dart | 1 + .../book_appointments_view_model.dart | 4 + .../waiting_appointment_info.dart | 74 +++++++++++++++++++ .../widgets/appointment_calendar.dart | 53 +++++++++---- 8 files changed, 139 insertions(+), 15 deletions(-) create mode 100644 assets/images/svg/doctor_profile_rating_icon.svg create mode 100644 assets/images/svg/doctor_profile_reviews_icon.svg create mode 100644 assets/images/svg/waitingAppo.svg create mode 100644 lib/presentation/book_appointment/waiting_appointment/waiting_appointment_info.dart diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro index ab7b2ca..9c1827a 100644 --- a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -69,4 +69,7 @@ # Penguin classes -keep class com.peng.pennavmap.models.** { *; } --keep class com.peng.pennavmap.db.** { *; } \ No newline at end of file +-keep class com.peng.pennavmap.db.** { *; } + +-keep class com.hiennv.flutter_callkit_incoming.** { *; } +-keepattributes Signature, Annotation, InnerClasses, EnclosingMethod \ No newline at end of file diff --git a/assets/images/svg/doctor_profile_rating_icon.svg b/assets/images/svg/doctor_profile_rating_icon.svg new file mode 100644 index 0000000..f658411 --- /dev/null +++ b/assets/images/svg/doctor_profile_rating_icon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/svg/doctor_profile_reviews_icon.svg b/assets/images/svg/doctor_profile_reviews_icon.svg new file mode 100644 index 0000000..9ef9f71 --- /dev/null +++ b/assets/images/svg/doctor_profile_reviews_icon.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/svg/waitingAppo.svg b/assets/images/svg/waitingAppo.svg new file mode 100644 index 0000000..c9bd009 --- /dev/null +++ b/assets/images/svg/waitingAppo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/lib/core/app_assets.dart b/lib/core/app_assets.dart index 613fba1..f3ff8fd 100644 --- a/lib/core/app_assets.dart +++ b/lib/core/app_assets.dart @@ -177,6 +177,7 @@ class AppAssets { static const String ic_rrt_vehicle = '$svgBasePath/ic_rrt_vehicle.svg'; static const String doctor_profile_rating_icon = '$svgBasePath/doctor_profile_rating_icon.svg'; static const String doctor_profile_reviews_icon = '$svgBasePath/doctor_profile_reviews_icon.svg'; + static const String waiting_appointment_icon = '$svgBasePath/waitingAppo.svg'; //bottom navigation// diff --git a/lib/features/book_appointments/book_appointments_view_model.dart b/lib/features/book_appointments/book_appointments_view_model.dart index bcc88ff..a97cb82 100644 --- a/lib/features/book_appointments/book_appointments_view_model.dart +++ b/lib/features/book_appointments/book_appointments_view_model.dart @@ -112,6 +112,8 @@ class BookAppointmentsViewModel extends ChangeNotifier { String? selectedClinicForFilters; bool applyFilters = false; + bool isWaitingAppointmentAvailable = false; + ///variables for laser clinic List femaleLaserCategory = [ LaserCategoryType(1, 'bodyString'), @@ -466,6 +468,8 @@ class BookAppointmentsViewModel extends ChangeNotifier { } initialSlotDuration = apiResponse.data["InitialSlotDuration"]; freeSlotsResponse = apiResponse.data['FreeTimeSlots']; + // isWaitingAppointmentAvailable = apiResponse.data["IsAllowToBookWaitingAppointment"]; + isWaitingAppointmentAvailable = true; freeSlotsResponse.forEach((element) { // date = (isLiveCareSchedule != null && isLiveCareSchedule) // ? DateUtil.convertStringToDate(element) diff --git a/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_info.dart b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_info.dart new file mode 100644 index 0000000..d41937d --- /dev/null +++ b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_info.dart @@ -0,0 +1,74 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/app_assets.dart'; +import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/core/utils/utils.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; +import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; +import 'package:hmg_patient_app_new/theme/colors.dart'; +import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; +import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; + +class WaitingAppointmentInfo extends StatelessWidget { + const WaitingAppointmentInfo({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: AppColors.bgScaffoldColor, + body: Column( + children: [ + Expanded( + child: CollapsingListView( + title: "Waiting Appointment".needTranslation, + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox(height: 24.h), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 24.h, + hasShadow: true, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Utils.buildSvgWithAssets(icon: AppAssets.waiting_appointment_icon, width: 48.h, height: 48.h, fit: BoxFit.contain) + ], + ), + ), + ], + ).paddingSymmetrical(24.w, 0), + ), + ), + ), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 24.h, + hasShadow: true, + ), + child: CustomButton( + text: "Continue".needTranslation, + onPressed: () async {}, + backgroundColor: AppColors.primaryRedColor, + borderColor: AppColors.primaryRedColor, + textColor: AppColors.whiteColor, + fontSize: 16, + fontWeight: FontWeight.w500, + borderRadius: 12, + padding: EdgeInsets.fromLTRB(10, 0, 10, 0), + height: 50.h, + icon: AppAssets.calendar, + iconColor: AppColors.whiteColor, + iconSize: 20.h, + ).paddingSymmetrical(24.h, 24.h), + ), + ], + ), + ); + } +} diff --git a/lib/presentation/book_appointment/widgets/appointment_calendar.dart b/lib/presentation/book_appointment/widgets/appointment_calendar.dart index 54ff282..7e2e7ba 100644 --- a/lib/presentation/book_appointment/widgets/appointment_calendar.dart +++ b/lib/presentation/book_appointment/widgets/appointment_calendar.dart @@ -15,6 +15,7 @@ import 'package:hmg_patient_app_new/features/book_appointments/book_appointments import 'package:hmg_patient_app_new/features/book_appointments/models/timeslots.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/review_appointment_page.dart'; +import 'package:hmg_patient_app_new/presentation/book_appointment/waiting_appointment/waiting_appointment_info.dart'; import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; @@ -27,7 +28,7 @@ import 'package:smooth_corner/smooth_corner.dart'; import 'package:syncfusion_flutter_calendar/calendar.dart'; class AppointmentCalendar extends StatefulWidget { - const AppointmentCalendar({super.key}); + AppointmentCalendar({super.key}); @override State createState() => _AppointmentCalendarState(); @@ -54,7 +55,6 @@ class _AppointmentCalendarState extends State { String selectedTime = ""; - bool isWaitingAppointmentAvailable = false; final _selectedDay = DateTime.now(); @override @@ -176,13 +176,22 @@ class _AppointmentCalendarState extends State { text: "Select".needTranslation, onPressed: () async { if (appState.isAuthenticated) { - bookAppointmentsViewModel.setSelectedAppointmentDateTime(selectedDate, selectedTime); - Navigator.of(context).pop(); - Navigator.of(context).push( - CustomPageRoute( - page: ReviewAppointmentPage(), - ), - ); + if(selectedTime == "Waiting Appointment".needTranslation){ + Navigator.of(context).pop(); + Navigator.of(context).push( + CustomPageRoute( + page: WaitingAppointmentInfo(), + ), + ); + } else { + bookAppointmentsViewModel.setSelectedAppointmentDateTime(selectedDate, selectedTime); + Navigator.of(context).pop(); + Navigator.of(context).push( + CustomPageRoute( + page: ReviewAppointmentPage(), + ), + ); + } } else { showCommonBottomSheetWithoutHeight( context, @@ -281,8 +290,8 @@ class _AppointmentCalendarState extends State { openTimeSlotsPickerForDate(DateTime dateStart, List freeSlots) { dayEvents.clear(); DateTime dateStartObj = new DateTime(dateStart.year, dateStart.month, dateStart.day, 0, 0, 0, 0, 0); - if (isWaitingAppointmentAvailable && DateUtils.isSameDay(dateStart, DateTime.now())) { - dayEvents.add(TimeSlot(isoTime: "Waiting Appointment", start: DateTime.now(), end: DateTime.now(), vidaDate: "")); + if (bookAppointmentsViewModel.isWaitingAppointmentAvailable && DateUtils.isSameDay(dateStart, DateTime.now())) { + dayEvents.add(TimeSlot(isoTime: "Waiting Appointment".needTranslation, start: DateTime.now(), end: DateTime.now(), vidaDate: "")); } freeSlots.forEach((v) { if (v.start == dateStartObj) dayEvents.add(v); @@ -321,9 +330,25 @@ class TimeSlotChip extends StatelessWidget { Widget build(BuildContext context) { return GestureDetector( onTap: onTap, - child: Container( - padding: EdgeInsets.symmetric(horizontal: 14.h, vertical: 8.h), - decoration: ShapeDecoration( + child: label == "Waiting Appointment".needTranslation + ? Container( + padding: EdgeInsets.symmetric(horizontal: 14.h, vertical: 8.h), + decoration: ShapeDecoration( + color: isSelected ? AppColors.warningColorYellow : AppColors.whiteColor, + shape: SmoothRectangleBorder( + borderRadius: BorderRadius.circular(8.h), + smoothness: 1, + side: BorderSide(color: isSelected ? AppColors.warningColorYellow : AppColors.borderOnlyColor.withOpacity(0.2), width: 1), + ), + ), + child: label.toText12( + color: isSelected ? AppColors.whiteColor : Colors.black87, + fontWeight: FontWeight.w500, + ), + ) + : Container( + padding: EdgeInsets.symmetric(horizontal: 14.h, vertical: 8.h), + decoration: ShapeDecoration( color: AppColors.whiteColor, shape: SmoothRectangleBorder( borderRadius: BorderRadius.circular(8.h), From 581a4a5a74fcf12afad01a4a64bdf5da437badca Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 7 Dec 2025 12:30:15 +0300 Subject: [PATCH 16/22] WalkIn Appointment implementation done --- .../book_appointments_repo.dart | 157 +++++ .../book_appointments_view_model.dart | 121 ++++ ...ient_appointment_share_response_model.dart | 2 +- .../review_appointment_page.dart | 42 +- .../waiting_appointment_info.dart | 58 +- ...ting_appointment_online_checkin_sheet.dart | 161 +++++ .../waiting_appointment_payment_page.dart | 644 ++++++++++++++++++ .../widgets/appointment_calendar.dart | 3 + lib/presentation/home/landing_page.dart | 2 +- 9 files changed, 1177 insertions(+), 13 deletions(-) create mode 100644 lib/presentation/book_appointment/waiting_appointment/waiting_appointment_online_checkin_sheet.dart create mode 100644 lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart diff --git a/lib/features/book_appointments/book_appointments_repo.dart b/lib/features/book_appointments/book_appointments_repo.dart index 8aafc9b..3683d57 100644 --- a/lib/features/book_appointments/book_appointments_repo.dart +++ b/lib/features/book_appointments/book_appointments_repo.dart @@ -14,6 +14,7 @@ import 'package:hmg_patient_app_new/features/book_appointments/models/resp_model import 'package:hmg_patient_app_new/features/book_appointments/models/resp_models/get_patient_dental_plan_response_model.dart'; import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/hospital_model.dart'; import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_history_response_model.dart'; +import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_share_response_model.dart'; import 'package:hmg_patient_app_new/services/logger_service.dart'; import 'models/resp_models/laser_body_parts.dart'; @@ -84,6 +85,22 @@ abstract class BookAppointmentsRepo { Future>>> getLaserClinics(int laserCategoryID, int projectID, int languageID, {Function(dynamic)? onSuccess, Function(String)? onError}); + + Future>> checkScannedNFCAndQRCode(String nfcCode, int projectId, {Function(dynamic)? onSuccess, Function(String)? onError}); + + Future>> getPatientShareWalkInAppointment({required int projectID, required int clinicID, required int doctorID}); + + Future>> insertSpecificAppointmentForWalkIn( + {required int docID, + required int clinicID, + required int projectID, + required String selectedTime, + required String selectedDate, + required int initialSlotDuration, + required int genderID, + required int userAge, + Function(dynamic)? onSuccess, + Function(String)? onError}); } class BookAppointmentsRepoImp implements BookAppointmentsRepo { @@ -848,4 +865,144 @@ class BookAppointmentsRepoImp implements BookAppointmentsRepo { return Left(UnknownFailure(e.toString())); } } + + @override + Future> checkScannedNFCAndQRCode(String nfcCode, int projectId, {Function(dynamic)? onSuccess, Function(String)? onError}) async { + Map mapDevice = {"NFC_Code": nfcCode, "ProjectID": projectId}; + + try { + GenericApiModel? apiResponse; + Failure? failure; + await apiClient.post( + CHECK_SCANNED_NFC_QR_CODE, + body: mapDevice, + onFailure: (error, statusCode, {messageStatus, failureType}) { + failure = failureType; + }, + onSuccess: (response, statusCode, {messageStatus, errorMessage}) { + try { + apiResponse = GenericApiModel( + messageStatus: messageStatus, + statusCode: statusCode, + errorMessage: null, + data: response, + ); + } catch (e) { + failure = DataParsingFailure(e.toString()); + } + }, + ); + if (failure != null) return Left(failure!); + if (apiResponse == null) return Left(ServerFailure("Unknown error")); + return Right(apiResponse!); + } catch (e) { + return Left(UnknownFailure(e.toString())); + } + } + + @override + Future>> getPatientShareWalkInAppointment({required int projectID, required int clinicID, required int doctorID}) async { + Map mapRequest = {"ProjectID": projectID, "ClinicID": clinicID, "DoctorID": doctorID}; + + try { + GenericApiModel? apiResponse; + Failure? failure; + await apiClient.post( + GET_PATIENT_SHARE_FOR_WALKIN_APPOINTMENT, + body: mapRequest, + onFailure: (error, statusCode, {messageStatus, failureType}) { + failure = failureType; + }, + onSuccess: (response, statusCode, {messageStatus, errorMessage}) { + try { + final list = response['OnlineCheckInAppointmentsWalkInModel']; + if (list == null || list.isEmpty) { + throw Exception("patient share list is empty"); + } + + final patientShareObj = PatientAppointmentShareResponseModel.fromJson(list); + patientShareObj.isCash = response["IsCash"]; + patientShareObj.isEligible = response["IsEligible"]; + patientShareObj.isInsured = response["IsInsured"]; + + apiResponse = GenericApiModel( + messageStatus: messageStatus, + statusCode: statusCode, + errorMessage: null, + data: patientShareObj, + ); + } catch (e) { + failure = DataParsingFailure(e.toString()); + } + }, + ); + if (failure != null) return Left(failure!); + if (apiResponse == null) return Left(ServerFailure("Unknown error")); + return Right(apiResponse!); + } catch (e) { + return Left(UnknownFailure(e.toString())); + } + } + + @override + Future> insertSpecificAppointmentForWalkIn( + {required int docID, + required int clinicID, + required int projectID, + required String selectedTime, + required String selectedDate, + required int initialSlotDuration, + required int genderID, + required int userAge, + Function(dynamic)? onSuccess, + Function(String)? onError}) async { + Map mapDevice = { + "IsForLiveCare": true, + "ProjectID": projectID, + "ClinicID": clinicID, + "DoctorID": docID, + "StartTime": selectedTime, + "SelectedTime": selectedTime, + "EndTime": selectedTime, + "InitialSlotDuration": initialSlotDuration, + "StrAppointmentDate": selectedDate, + "IsVirtual": false, + "BookedBy": 102, + "VisitType": 1, + "VisitFor": 1, + "GenderID": genderID, + "Age": userAge + }; + + try { + GenericApiModel? apiResponse; + Failure? failure; + await apiClient.post( + INSERT_WALKIN_APPOINTMENT, + body: mapDevice, + onFailure: (error, statusCode, {messageStatus, failureType}) { + failure = failureType; + }, + onSuccess: (response, statusCode, {messageStatus, errorMessage}) { + try { + final appointmentNo = response['AppointmentNo']; + + apiResponse = GenericApiModel( + messageStatus: messageStatus, + statusCode: statusCode, + errorMessage: response["ErrorEndUserMessage"], + data: response, + ); + } catch (e) { + failure = DataParsingFailure(e.toString()); + } + }, + ); + if (failure != null) return Left(failure!); + if (apiResponse == null) return Left(ServerFailure("Unknown error")); + return Right(apiResponse!); + } catch (e) { + return Left(UnknownFailure(e.toString())); + } + } } diff --git a/lib/features/book_appointments/book_appointments_view_model.dart b/lib/features/book_appointments/book_appointments_view_model.dart index a97cb82..2413827 100644 --- a/lib/features/book_appointments/book_appointments_view_model.dart +++ b/lib/features/book_appointments/book_appointments_view_model.dart @@ -24,6 +24,7 @@ import 'package:hmg_patient_app_new/features/book_appointments/models/timeslots. import 'package:hmg_patient_app_new/features/my_appointments/models/facility_selection.dart'; import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/doctor_list_api_response.dart'; import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_history_response_model.dart'; +import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_share_response_model.dart'; import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; @@ -114,6 +115,13 @@ class BookAppointmentsViewModel extends ChangeNotifier { bool isWaitingAppointmentAvailable = false; + bool isWaitingAppointmentSelected = false; + int waitingAppointmentProjectID = 0; + DoctorsListResponseModel? waitingAppointmentDoctor; + String waitingAppointmentNFCCode = ""; + + PatientAppointmentShareResponseModel? patientWalkInAppointmentShareResponseModel; + ///variables for laser clinic List femaleLaserCategory = [ LaserCategoryType(1, 'bodyString'), @@ -173,11 +181,32 @@ class BookAppointmentsViewModel extends ChangeNotifier { dentalChiefComplaintsList.clear(); isContinueDentalPlan = false; isChiefComplaintsListLoading = true; + isWaitingAppointmentSelected = false; bodyTypes = [maleLaserCategory, femaleLaserCategory]; // getLocation(); notifyListeners(); } + setIsWaitingAppointmentSelected(bool isWaitingAppointmentSelected) { + this.isWaitingAppointmentSelected = isWaitingAppointmentSelected; + notifyListeners(); + } + + setWaitingAppointmentDoctor(DoctorsListResponseModel waitingAppointmentDoctor) { + this.waitingAppointmentDoctor = waitingAppointmentDoctor; + notifyListeners(); + } + + setWaitingAppointmentNFCCode(String waitingAppointmentNFCCode) { + this.waitingAppointmentNFCCode = waitingAppointmentNFCCode; + notifyListeners(); + } + + setWaitingAppointmentProjectID(int projectID) { + waitingAppointmentProjectID = projectID; + notifyListeners(); + } + setIsDoctorsListLoading(bool value) { if (value) { doctorsList.clear(); @@ -470,6 +499,7 @@ class BookAppointmentsViewModel extends ChangeNotifier { freeSlotsResponse = apiResponse.data['FreeTimeSlots']; // isWaitingAppointmentAvailable = apiResponse.data["IsAllowToBookWaitingAppointment"]; isWaitingAppointmentAvailable = true; + freeSlotsResponse.forEach((element) { // date = (isLiveCareSchedule != null && isLiveCareSchedule) // ? DateUtil.convertStringToDate(element) @@ -1167,4 +1197,95 @@ class BookAppointmentsViewModel extends ChangeNotifier { laserBodyPartsList = []; duration = 0; } + + Future checkScannedNFCAndQRCode(String nfcCode, int projectId, {Function(dynamic)? onSuccess, Function(String)? onError}) async { + final result = await bookAppointmentsRepo.checkScannedNFCAndQRCode(nfcCode, projectId); + + result.fold( + (failure) async { + onError!("Invalid verification point scanned.".needTranslation); + }, + (apiResponse) { + // if (apiResponse.data['returnValue'] == 0) { + // onError!("Invalid verification point scanned.".needTranslation); + // } else if (apiResponse.data['returnValue'] == 1) { + notifyListeners(); + if (onSuccess != null) { + onSuccess(apiResponse); + } + // } + }, + ); + } + + Future getWalkInPatientShareAppointment({Function(dynamic)? onSuccess, Function(String)? onError}) async { + final result = await bookAppointmentsRepo.getPatientShareWalkInAppointment(projectID: waitingAppointmentProjectID, clinicID: selectedDoctor.clinicID!, doctorID: selectedDoctor.doctorID!); + + result.fold( + (failure) async { + if (onError != null) { + onError(failure.message); + } + // await errorHandlerService.handleError( + // failure: failure, + // onOkPressed: () { + // onError!(failure.message); + // }); + }, + (apiResponse) { + if (apiResponse.messageStatus == 2) { + onError!(apiResponse.errorMessage!); + // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {}); + } else if (apiResponse.messageStatus == 1) { + patientWalkInAppointmentShareResponseModel = apiResponse.data!; + notifyListeners(); + if (onSuccess != null) { + onSuccess(apiResponse); + } + } + }, + ); + } + + Future insertSpecificAppointmentForWalkIn({Function(dynamic p1)? onSuccess, Function(dynamic p1)? onError}) async { + _appState = getIt(); + final result = await bookAppointmentsRepo.insertSpecificAppointmentForWalkIn( + docID: selectedDoctor.doctorID!, + clinicID: selectedDoctor.clinicID!, + projectID: selectedDoctor.projectID!, + selectedDate: selectedAppointmentDate, + selectedTime: selectedAppointmentTime, + initialSlotDuration: initialSlotDuration, + genderID: _appState.getAuthenticatedUser()!.gender!, + userAge: _appState.getAuthenticatedUser()!.age!, + onError: onError); + + result.fold( + (failure) async { + print(failure); + }, + (apiResponse) { + if (apiResponse.messageStatus == 2) { + LoadingUtils.hideFullScreenLoader(); + showCommonBottomSheetWithoutHeight( + title: LocaleKeys.notice.tr(context: navigationService.navigatorKey.currentContext!), + navigationService.navigatorKey.currentContext!, + child: Utils.getErrorWidget(loadingText: apiResponse.errorMessage), + callBackFunc: () {}, + isFullScreen: false, + isCloseButtonVisible: true, + ); + } else if (apiResponse.messageStatus == 1) { + if (apiResponse.data == null || apiResponse.data!.isEmpty) { + onError!("Unexpected Error Occurred".needTranslation); + return; + } + notifyListeners(); + if (onSuccess != null) { + onSuccess(apiResponse); + } + } + }, + ); + } } diff --git a/lib/features/my_appointments/models/resp_models/patient_appointment_share_response_model.dart b/lib/features/my_appointments/models/resp_models/patient_appointment_share_response_model.dart index 2021fff..1dc1cbe 100644 --- a/lib/features/my_appointments/models/resp_models/patient_appointment_share_response_model.dart +++ b/lib/features/my_appointments/models/resp_models/patient_appointment_share_response_model.dart @@ -141,7 +141,7 @@ class PatientAppointmentShareResponseModel { doctorID = json['DoctorID']; doctorImageURL = json['DoctorImageURL']; doctorNameObj = json['DoctorNameObj']; - doctorSpeciality = json['DoctorSpeciality'].cast(); + // doctorSpeciality = json['DoctorSpeciality'].cast(); errCode = json['ErrCode']; groupID = json['GroupID']; iSAllowOnlineCheckedIN = json['ISAllowOnlineCheckedIN']; diff --git a/lib/presentation/book_appointment/review_appointment_page.dart b/lib/presentation/book_appointment/review_appointment_page.dart index 0cb4b2d..415d342 100644 --- a/lib/presentation/book_appointment/review_appointment_page.dart +++ b/lib/presentation/book_appointment/review_appointment_page.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/dependencies.dart'; +import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/core/utils/loading_utils.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; @@ -12,11 +13,15 @@ import 'package:hmg_patient_app_new/features/authentication/authentication_view_ import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart'; import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; +import 'package:hmg_patient_app_new/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart'; import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart'; +import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; +import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; +import 'package:hmg_patient_app_new/widgets/loading_dialog.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; import 'package:provider/provider.dart'; @@ -113,10 +118,14 @@ class _ReviewAppointmentPageState extends State { labelText: "${LocaleKeys.branch.tr(context: context)} ${bookAppointmentsViewModel.selectedDoctor.projectName}".needTranslation, ), AppCustomChipWidget( - labelText: "${LocaleKeys.date.tr(context: context)}: ${bookAppointmentsViewModel.selectedAppointmentDate}".needTranslation, + labelText: + "${LocaleKeys.date.tr(context: context)}: ${bookAppointmentsViewModel.isWaitingAppointmentSelected ? DateUtil.formatDateToDate(DateTime.now(), false) : bookAppointmentsViewModel.selectedAppointmentDate}" + .needTranslation, ), AppCustomChipWidget( - labelText: "${LocaleKeys.time.tr(context: context)}: ${bookAppointmentsViewModel.selectedAppointmentTime}".needTranslation, + labelText: + "${LocaleKeys.time.tr(context: context)}: ${bookAppointmentsViewModel.isWaitingAppointmentSelected ? "Waiting Appointment".needTranslation : bookAppointmentsViewModel.selectedAppointmentTime}" + .needTranslation, ), ], ), @@ -185,9 +194,13 @@ class _ReviewAppointmentPageState extends State { hasShadow: true, ), child: CustomButton( - text: LocaleKeys.bookAppo.tr(context: context), + text: bookAppointmentsViewModel.isWaitingAppointmentSelected ? "Add to waiting list" : LocaleKeys.bookAppo.tr(context: context), onPressed: () async { - initiateBookAppointment(); + if (bookAppointmentsViewModel.isWaitingAppointmentSelected) { + getWalkInAppointmentPatientShare(); + } else { + initiateBookAppointment(); + } }, backgroundColor: AppColors.primaryRedColor, borderColor: AppColors.primaryRedColor, @@ -204,6 +217,27 @@ class _ReviewAppointmentPageState extends State { ); } + void getWalkInAppointmentPatientShare() async { + LoaderBottomSheet.showLoader(loadingText: "Fetching Appointment Share...".needTranslation); + await bookAppointmentsViewModel.getWalkInPatientShareAppointment(onSuccess: (val) { + LoaderBottomSheet.hideLoader(); + Navigator.of(context).push( + CustomPageRoute( + page: WaitingAppointmentPaymentPage(), + ), + ); + }, onError: (err) { + LoaderBottomSheet.hideLoader(); + showCommonBottomSheetWithoutHeight( + context, + child: Utils.getErrorWidget(loadingText: err), + callBackFunc: () {}, + isFullScreen: false, + isCloseButtonVisible: true, + ); + }); + } + void initiateBookAppointment() async { LoadingUtils.showFullScreenLoader(barrierDismissible: true, isSuccessDialog: false, loadingText: "Booking your appointment...".needTranslation); myAppointmentsViewModel.setIsAppointmentDataToBeLoaded(true); diff --git a/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_info.dart b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_info.dart index d41937d..f832db6 100644 --- a/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_info.dart +++ b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_info.dart @@ -5,16 +5,23 @@ import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; +import 'package:hmg_patient_app_new/presentation/book_appointment/waiting_appointment/waiting_appointment_online_checkin_sheet.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; +import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; +import 'package:provider/provider.dart'; class WaitingAppointmentInfo extends StatelessWidget { - const WaitingAppointmentInfo({super.key}); + WaitingAppointmentInfo({super.key}); + + late BookAppointmentsViewModel bookAppointmentsViewModel; @override Widget build(BuildContext context) { + bookAppointmentsViewModel = Provider.of(context, listen: false); return Scaffold( backgroundColor: AppColors.bgScaffoldColor, body: Column( @@ -33,11 +40,40 @@ class WaitingAppointmentInfo extends StatelessWidget { borderRadius: 24.h, hasShadow: true, ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Utils.buildSvgWithAssets(icon: AppAssets.waiting_appointment_icon, width: 48.h, height: 48.h, fit: BoxFit.contain) - ], + child: Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Utils.buildSvgWithAssets(icon: AppAssets.waiting_appointment_icon, width: 48.h, height: 48.h, fit: BoxFit.contain), + SizedBox(height: 16.h), + "What is Waiting Appointment?".needTranslation.toText16(isBold: true), + SizedBox(height: 16.h), + "The waiting appointments feature allows you to book an appointment while you are inside the hospital building, and in case there is no available slot in the doctor’s schedule." + .needTranslation + .toText14(isBold: false), + SizedBox(height: 16.h), + "The appointment with the doctor is confirmed, but the time of entry is uncertain.".needTranslation.toText14(isBold: false), + SizedBox(height: 24.h), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Icon( + Icons.warning, + size: 20, + color: AppColors.warningColorYellow, + ), + SizedBox(width: 10.w), + SizedBox( + width: MediaQuery.of(context).size.width * 0.7, + child: "Note: You must have to pay within 10 minutes of booking, otherwise your appointment will be cancelled automatically" + .needTranslation + .toText14(isBold: true, color: AppColors.warningColorYellow), + ), + ], + ), + ], + ), ), ), ], @@ -53,7 +89,15 @@ class WaitingAppointmentInfo extends StatelessWidget { ), child: CustomButton( text: "Continue".needTranslation, - onPressed: () async {}, + onPressed: () async { + showCommonBottomSheetWithoutHeight(context, + title: LocaleKeys.onlineCheckIn.tr(), + child: WaitingAppointmentOnlineCheckinSheet( + bookAppointmentsViewModel: bookAppointmentsViewModel, + ), + callBackFunc: () {}, + isFullScreen: false); + }, backgroundColor: AppColors.primaryRedColor, borderColor: AppColors.primaryRedColor, textColor: AppColors.whiteColor, diff --git a/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_online_checkin_sheet.dart b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_online_checkin_sheet.dart new file mode 100644 index 0000000..965844a --- /dev/null +++ b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_online_checkin_sheet.dart @@ -0,0 +1,161 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_nfc_kit/flutter_nfc_kit.dart'; +import 'package:hmg_patient_app_new/core/app_assets.dart'; +import 'package:hmg_patient_app_new/core/app_state.dart'; +import 'package:hmg_patient_app_new/core/common_models/privilege/ProjectDetailListModel.dart'; +import 'package:hmg_patient_app_new/core/dependencies.dart'; +import 'package:hmg_patient_app_new/core/location_util.dart'; +import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/core/utils/utils.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; +import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart'; +import 'package:hmg_patient_app_new/presentation/book_appointment/review_appointment_page.dart'; +import 'package:hmg_patient_app_new/theme/colors.dart'; +import 'package:barcode_scan2/barcode_scan2.dart'; +import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; +import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; +import 'package:hmg_patient_app_new/widgets/nfc/nfc_reader_sheet.dart'; +import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; + +class WaitingAppointmentOnlineCheckinSheet extends StatelessWidget { + WaitingAppointmentOnlineCheckinSheet({super.key, required this.bookAppointmentsViewModel}); + + BookAppointmentsViewModel bookAppointmentsViewModel; + + bool _supportsNFC = false; + + late LocationUtils locationUtils; + late AppState appState; + ProjectDetailListModel projectDetailListModel = ProjectDetailListModel(); + + @override + Widget build(BuildContext context) { + appState = getIt.get(); + locationUtils = getIt.get(); + locationUtils.isShowConfirmDialog = true; + FlutterNfcKit.nfcAvailability.then((value) { + _supportsNFC = (value == NFCAvailability.available); + }); + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + checkInOptionCard( + AppAssets.checkin_location_icon, + "Live Location".needTranslation, + "Verify your location to be at hospital to check in".needTranslation, + ).onPress(() { + // locationUtils = LocationUtils( + // isShowConfirmDialog: false, + // navigationService: myAppointmentsViewModel.navigationService, + // appState: myAppointmentsViewModel.appState, + // ); + locationUtils.getCurrentLocation(onSuccess: (value) { + projectDetailListModel = Utils.getProjectDetailObj(appState, bookAppointmentsViewModel.waitingAppointmentProjectID); + double dist = Utils.distance(value.latitude, value.longitude, double.parse(projectDetailListModel.latitude!), double.parse(projectDetailListModel.longitude!)).ceilToDouble() * 1000; + print(dist); + if (dist <= projectDetailListModel.geofenceRadius!) { + checkScannedNFCAndQRCode(projectDetailListModel.checkInQrCode!, context); + } else { + showCommonBottomSheetWithoutHeight(context, + title: "Error".needTranslation, + child: Utils.getErrorWidget(loadingText: "Please ensure you're within the hospital location to perform online check-in.".needTranslation), callBackFunc: () { + Navigator.of(context).pop(); + }, isFullScreen: false); + } + }); + }), + SizedBox(height: 16.h), + checkInOptionCard( + AppAssets.checkin_nfc_icon, + "NFC (Near Field Communication)".needTranslation, + "Scan your phone via NFC board to check in".needTranslation, + ).onPress(() { + Future.delayed(const Duration(milliseconds: 500), () { + showNfcReader(context, onNcfScan: (String nfcId) { + Future.delayed(const Duration(milliseconds: 100), () { + checkScannedNFCAndQRCode(nfcId, context); + }); + }, onCancel: () {}); + }); + }), + SizedBox(height: 16.h), + checkInOptionCard( + AppAssets.checkin_qr_icon, + "QR Code".needTranslation, + "Scan QR code with your camera to check in".needTranslation, + ).onPress(() async { + String onlineCheckInQRCode = (await BarcodeScanner.scan().then((value) => value.rawContent)); + if (onlineCheckInQRCode != "") { + checkScannedNFCAndQRCode(onlineCheckInQRCode, context); + } else {} + }), + ], + ); + } + + Widget checkInOptionCard(String icon, String title, String subTitle) { + return Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: false, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Utils.buildSvgWithAssets(icon: icon, width: 40.h, height: 40.h, fit: BoxFit.fill), + SizedBox(height: 16.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + title.toText16(isBold: true, color: AppColors.textColor), + subTitle.toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor), + ], + ), + ), + Transform.flip( + flipX: appState.isArabic(), + child: Utils.buildSvgWithAssets( + icon: AppAssets.forward_arrow_icon_small, + iconColor: AppColors.blackColor, + width: 18.h, + height: 13.h, + fit: BoxFit.contain, + ), + ), + ], + ), + ], + ).paddingAll(16.h), + ); + } + + void checkScannedNFCAndQRCode(String scannedCode, BuildContext context) async { + LoaderBottomSheet.showLoader(loadingText: "Processing Check-In...".needTranslation); + bookAppointmentsViewModel.checkScannedNFCAndQRCode( + scannedCode, + bookAppointmentsViewModel.waitingAppointmentProjectID, + onSuccess: (value) { + LoaderBottomSheet.hideLoader(); + bookAppointmentsViewModel.setIsWaitingAppointmentSelected(true); + Navigator.of(context).push( + CustomPageRoute( + page: ReviewAppointmentPage(), + ), + ); + }, + onError: (err) { + LoaderBottomSheet.hideLoader(); + showCommonBottomSheetWithoutHeight(context, title: "Error".needTranslation, child: Utils.getErrorWidget(loadingText: err), callBackFunc: () { + // Navigator.of(context).pop(); + }, isFullScreen: false); + }, + ); + } +} diff --git a/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart new file mode 100644 index 0000000..8f9943c --- /dev/null +++ b/lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart @@ -0,0 +1,644 @@ +import 'dart:async'; +import 'dart:developer'; +import 'dart:io'; + +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/app_assets.dart'; +import 'package:hmg_patient_app_new/core/app_state.dart'; +import 'package:hmg_patient_app_new/core/cache_consts.dart'; +import 'package:hmg_patient_app_new/core/dependencies.dart'; +import 'package:hmg_patient_app_new/core/enums.dart'; +import 'package:hmg_patient_app_new/core/utils/date_util.dart'; +import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/core/utils/utils.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; +import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart'; +import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_history_response_model.dart'; +import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart'; +import 'package:hmg_patient_app_new/features/payfort/models/apple_pay_request_insert_model.dart'; +import 'package:hmg_patient_app_new/features/payfort/payfort_view_model.dart'; +import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; +import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; +import 'package:hmg_patient_app_new/presentation/insurance/insurance_home_page.dart'; +import 'package:hmg_patient_app_new/theme/colors.dart'; +import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; +import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; +import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; +import 'package:hmg_patient_app_new/widgets/in_app_browser/InAppBrowser.dart'; +import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; +import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; +import 'package:provider/provider.dart'; +import 'package:smooth_corner/smooth_corner.dart'; + +class WaitingAppointmentPaymentPage extends StatefulWidget { + WaitingAppointmentPaymentPage({super.key}); + + // PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel; + + @override + State createState() => _WaitingAppointmentPaymentPageState(); +} + +class _WaitingAppointmentPaymentPageState extends State { + late BookAppointmentsViewModel bookAppointmentsViewModel; + late MyAppointmentsViewModel myAppointmentsViewModel; + late PayfortViewModel payfortViewModel; + late AppState appState; + + MyInAppBrowser? browser; + String selectedPaymentMethod = ""; + + String transID = ""; + + bool isShowTamara = false; + String tamaraPaymentStatus = ""; + String tamaraOrderID = ""; + + @override + void initState() { + scheduleMicrotask(() { + payfortViewModel.initPayfortViewModel(); + payfortViewModel.setIsApplePayConfigurationLoading(false); + // myAppointmentsViewModel.getPatientShareAppointment( + // widget.patientAppointmentHistoryResponseModel.projectID, + // widget.patientAppointmentHistoryResponseModel.clinicID, + // widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(), widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment ?? false, onSuccess: (val) { + // myAppointmentsViewModel.getTamaraInstallmentsDetails().then((val) { + // if (myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax! >= myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel!.minLimit!.amount! && + // myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax! <= myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel!.maxLimit!.amount!) { + // setState(() { + // isShowTamara = true; + // }); + // } + // }); + // }, onError: (err) { + // Navigator.of(context).pop(); + // Navigator.of(context).pop(); + // }); + }); + super.initState(); + } + + @override + Widget build(BuildContext context) { + appState = getIt.get(); + bookAppointmentsViewModel = Provider.of(context); + myAppointmentsViewModel = Provider.of(context); + payfortViewModel = Provider.of(context); + return Scaffold( + backgroundColor: AppColors.bgScaffoldColor, + body: Consumer(builder: (context, bookAppointmentsVM, child) { + return Column( + children: [ + Expanded( + child: CollapsingListView( + title: "Appointment Payment".needTranslation, + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox(height: 24.h), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: false, + ), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Image.asset(AppAssets.mada, width: 72.h, height: 25.h), + SizedBox(height: 16.h), + "Mada".needTranslation.toText16(isBold: true), + ], + ), + SizedBox(width: 8.h), + const Spacer(), + Transform.flip( + flipX: appState.isArabic(), + child: Utils.buildSvgWithAssets( + icon: AppAssets.forward_arrow_icon_small, + iconColor: AppColors.blackColor, + width: 18.h, + height: 13.h, + fit: BoxFit.contain, + ), + ), + ], + ).paddingSymmetrical(16.h, 16.h), + ).paddingSymmetrical(24.h, 0.h).onPress(() { + selectedPaymentMethod = "MADA"; + openPaymentURL("mada"); + }), + SizedBox(height: 16.h), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: false, + ), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Image.asset(AppAssets.visa, width: 50.h, height: 50.h), + SizedBox(width: 8.h), + Image.asset(AppAssets.Mastercard, width: 40.h, height: 40.h), + ], + ), + SizedBox(height: 16.h), + "Visa or Mastercard".needTranslation.toText16(isBold: true), + ], + ), + SizedBox(width: 8.h), + const Spacer(), + Transform.flip( + flipX: appState.isArabic(), + child: Utils.buildSvgWithAssets( + icon: AppAssets.forward_arrow_icon_small, + iconColor: AppColors.blackColor, + width: 18.h, + height: 13.h, + fit: BoxFit.contain, + ), + ), + ], + ).paddingSymmetrical(16.h, 16.h), + ).paddingSymmetrical(24.h, 0.h).onPress(() { + selectedPaymentMethod = "VISA"; + openPaymentURL("visa"); + }), + SizedBox(height: 16.h), + isShowTamara + ? Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: false, + ), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Image.asset(AppAssets.tamara_en, width: 72.h, height: 25.h), + SizedBox(height: 16.h), + "Tamara".needTranslation.toText16(isBold: true), + ], + ), + SizedBox(width: 8.h), + const Spacer(), + Transform.flip( + flipX: appState.isArabic(), + child: Utils.buildSvgWithAssets( + icon: AppAssets.forward_arrow_icon_small, + iconColor: AppColors.blackColor, + width: 18.h, + height: 13.h, + fit: BoxFit.contain, + ), + ), + ], + ).paddingSymmetrical(16.h, 16.h), + ).paddingSymmetrical(24.h, 0.h).onPress(() { + selectedPaymentMethod = "TAMARA"; + openPaymentURL("tamara"); + }) + : SizedBox.shrink(), + ], + ), + ), + ), + ), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 24.h, + hasShadow: false, + ), + child: Consumer(builder: (context, payfortVM, child) { + //TODO: Need to add loading state & animation for Apple Pay Configuration + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + (bookAppointmentsVM.patientWalkInAppointmentShareResponseModel!.isCash ?? true) + ? Container( + height: 50.h, + decoration: ShapeDecoration( + color: AppColors.secondaryLightRedBorderColor, + shape: SmoothRectangleBorder( + borderRadius: BorderRadius.only(topLeft: Radius.circular(24), topRight: Radius.circular(24)), + smoothness: 1, + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + "Insurance expired or inactive".needTranslation.toText14(color: AppColors.primaryRedColor, weight: FontWeight.w500).paddingSymmetrical(24.h, 0.h), + CustomButton( + text: LocaleKeys.updateInsurance.tr(context: context), + onPressed: () { + Navigator.of(context).push( + CustomPageRoute( + page: InsuranceHomePage(), + ), + ); + }, + backgroundColor: AppColors.primaryRedColor, + borderColor: AppColors.secondaryLightRedBorderColor, + textColor: AppColors.whiteColor, + fontSize: 10.f, + fontWeight: FontWeight.w500, + borderRadius: 8, + padding: EdgeInsets.fromLTRB(15, 0, 15, 0), + height: 30.h, + ).paddingSymmetrical(24.h, 0.h), + ], + ), + ) + : const SizedBox(), + SizedBox(height: 24.h), + "Total amount to pay".needTranslation.toText18(isBold: true).paddingSymmetrical(24.h, 0.h), + SizedBox(height: 17.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + "Amount before tax".needTranslation.toText14(isBold: true), + Utils.getPaymentAmountWithSymbol(bookAppointmentsVM.patientWalkInAppointmentShareResponseModel!.patientShare!.toString().toText16(isBold: true), AppColors.blackColor, 13, + isSaudiCurrency: true), + ], + ).paddingSymmetrical(24.h, 0.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + "VAT 15%".needTranslation.toText14(isBold: true, color: AppColors.greyTextColor), + Utils.getPaymentAmountWithSymbol( + bookAppointmentsVM.patientWalkInAppointmentShareResponseModel!.patientTaxAmount!.toString().toText14(isBold: true, color: AppColors.greyTextColor), + AppColors.greyTextColor, + 13, + isSaudiCurrency: true), + ], + ).paddingSymmetrical(24.h, 0.h), + SizedBox(height: 17.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + "".needTranslation.toText14(isBold: true), + Utils.getPaymentAmountWithSymbol( + bookAppointmentsVM.patientWalkInAppointmentShareResponseModel!.patientShareWithTax!.toString().toText24(isBold: true), AppColors.blackColor, 17, + isSaudiCurrency: true), + ], + ).paddingSymmetrical(24.h, 0.h), + Platform.isIOS + ? Utils.buildSvgWithAssets( + icon: AppAssets.apple_pay_button, + width: 200.h, + height: 80.h, + fit: BoxFit.contain, + ).paddingSymmetrical(24.h, 0.h).onPress(() { + // payfortVM.setIsApplePayConfigurationLoading(true); + if (Utils.havePrivilege(103)) { + startApplePay(); + } else { + openPaymentURL("ApplePay"); + } + }) + : SizedBox(height: 12.h), + SizedBox(height: 12.h), + ], + ); + }), + ), + ], + ); + }), + ); + } + + onBrowserLoadStart(String url) { + print("onBrowserLoadStart"); + print(url); + + if (selectedPaymentMethod == "tamara") { + if (Platform.isAndroid) { + Uri uri = new Uri.dataFromString(url); + tamaraPaymentStatus = uri.queryParameters['status']!; + tamaraOrderID = uri.queryParameters['AuthorizePaymentId']!; + } else { + Uri uri = new Uri.dataFromString(url); + tamaraPaymentStatus = uri.queryParameters['paymentStatus']!; + tamaraOrderID = uri.queryParameters['orderId']!; + } + } + + // if(selectedPaymentMethod != "TAMARA") { + MyInAppBrowser.successURLS.forEach((element) { + if (url.contains(element)) { + browser?.close(); + MyInAppBrowser.isPaymentDone = true; + return; + } + }); + // } + + // if(selectedPaymentMethod != "TAMARA") { + MyInAppBrowser.errorURLS.forEach((element) { + if (url.contains(element)) { + browser?.close(); + MyInAppBrowser.isPaymentDone = false; + return; + } + }); + // } + } + + onBrowserExit(bool isPaymentMade) async { + checkPaymentStatus(); + } + + void checkPaymentStatus() async { + LoaderBottomSheet.showLoader(loadingText: "Checking payment status, Please wait...".needTranslation); + if (selectedPaymentMethod == "TAMARA") { + await payfortViewModel.checkTamaraPaymentStatus( + transactionID: transID, + onSuccess: (apiResponse) async { + if (apiResponse.data["status"].toString().toLowerCase() == "success") { + tamaraOrderID = apiResponse.data["tamara_order_id"].toString(); + await payfortViewModel.updateTamaraRequestStatus(responseMessage: "success", status: "14", clientRequestID: transID, tamaraOrderID: tamaraOrderID); + await payfortViewModel.markAppointmentAsTamaraPaid(projectID: bookAppointmentsViewModel.selectedDoctor.projectID!, appointmentNo: DateTime.now().millisecondsSinceEpoch); + // await myAppointmentsViewModel.addAdvanceNumberRequest( + // advanceNumber: "Tamara-Advance-0000", + // paymentReference: tamaraOrderID, + // appointmentNo: widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(), + // onSuccess: (value) async { + // if (widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment!) { + // //TODO: Implement LiveCare Check-In API Call + // await myAppointmentsViewModel.insertLiveCareVIDARequest( + // clientRequestID: tamaraOrderID, + // patientAppointmentHistoryResponseModel: widget.patientAppointmentHistoryResponseModel, + // onSuccess: (apiResponse) { + // Future.delayed(Duration(milliseconds: 500), () { + // LoaderBottomSheet.hideLoader(); + // Navigator.pushAndRemoveUntil( + // context, + // CustomPageRoute( + // page: LandingNavigation(), + // ), + // (r) => false); + // }); + // }, + // onError: (error) {}); + // } else { + // await myAppointmentsViewModel.generateAppointmentQR( + // clinicID: widget.patientAppointmentHistoryResponseModel.clinicID, + // projectID: widget.patientAppointmentHistoryResponseModel.projectID, + // appointmentNo: widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(), + // isFollowUp: myAppointmentsViewModel.patientAppointmentShareResponseModel!.isFollowup!, + // onSuccess: (apiResponse) { + // Future.delayed(Duration(milliseconds: 500), () { + // LoaderBottomSheet.hideLoader(); + // Navigator.pushAndRemoveUntil( + // context, + // CustomPageRoute( + // page: LandingNavigation(), + // ), + // (r) => false); + // }); + // }); + // } + // }); + } else { + await payfortViewModel.updateTamaraRequestStatus(responseMessage: "Failed", status: "00", clientRequestID: transID, tamaraOrderID: tamaraOrderID); + LoaderBottomSheet.hideLoader(); + showCommonBottomSheetWithoutHeight( + context, + child: Utils.getErrorWidget(loadingText: "Payment Failed! Please try again.".needTranslation), + callBackFunc: () {}, + isFullScreen: false, + isCloseButtonVisible: true, + ); + } + }, + onError: (err) { + LoaderBottomSheet.hideLoader(); + showCommonBottomSheetWithoutHeight( + context, + child: Utils.getErrorWidget(loadingText: err), + callBackFunc: () {}, + isFullScreen: false, + isCloseButtonVisible: true, + ); + }); + } else { + await payfortViewModel.checkPaymentStatus( + transactionID: transID, + onSuccess: (apiResponse) async { + print(apiResponse.data); + if (payfortViewModel.payfortCheckPaymentStatusResponseModel!.responseMessage!.toLowerCase() == "success") { + LoaderBottomSheet.hideLoader(); + LoaderBottomSheet.showLoader(loadingText: "Booking Waiting Appointment, Please wait...".needTranslation); + await bookAppointmentsViewModel.insertSpecificAppointmentForWalkIn(onSuccess: (val) async { + String appointmentNo = val.data['AppointmentNo'].toString(); + await myAppointmentsViewModel.createAdvancePayment( + paymentMethodName: selectedPaymentMethod, + projectID: bookAppointmentsViewModel.waitingAppointmentProjectID, + clinicID: bookAppointmentsViewModel.selectedDoctor.clinicID!, + appointmentNo: appointmentNo, + payedAmount: payfortViewModel.payfortCheckPaymentStatusResponseModel!.amount!, + paymentReference: payfortViewModel.payfortCheckPaymentStatusResponseModel!.fortId!, + patientID: appState.getAuthenticatedUser()!.patientId.toString(), + patientType: appState.getAuthenticatedUser()!.patientType!, + onSuccess: (value) async { + print(value); + await myAppointmentsViewModel.addAdvanceNumberRequest( + advanceNumber: Utils.isVidaPlusProject(bookAppointmentsViewModel.waitingAppointmentProjectID) + ? value.data['OnlineCheckInAppointments'][0]['AdvanceNumber_VP'].toString() + : value.data['OnlineCheckInAppointments'][0]['AdvanceNumber'].toString(), + paymentReference: payfortViewModel.payfortCheckPaymentStatusResponseModel!.fortId!, + appointmentNo: appointmentNo, + onSuccess: (value) async { + LoaderBottomSheet.hideLoader(); + sendCheckInRequest(bookAppointmentsViewModel.waitingAppointmentNFCCode, appointmentNo, context); + }); + }); + }); + } else { + showCommonBottomSheetWithoutHeight( + context, + child: Utils.getErrorWidget(loadingText: "Payment Failed! Please try again.".needTranslation), + callBackFunc: () {}, + isFullScreen: false, + isCloseButtonVisible: true, + ); + } + }); + } + } + + openPaymentURL(String paymentMethod) { + browser = MyInAppBrowser(onExitCallback: onBrowserExit, onLoadStartCallback: onBrowserLoadStart, context: context); + transID = Utils.getAppointmentTransID( + bookAppointmentsViewModel.selectedDoctor.projectID!, + bookAppointmentsViewModel.selectedDoctor.clinicID!, + bookAppointmentsViewModel.selectedDoctor.doctorID!, + ); + + //TODO: Need to pass dynamic params to the payment request instead of static values + browser?.openPaymentBrowser( + bookAppointmentsViewModel.patientWalkInAppointmentShareResponseModel!.patientShareWithTax!, + "Appointment check in", + transID, + bookAppointmentsViewModel.selectedDoctor.projectID.toString(), + "CustID_${appState.getAuthenticatedUser()!.patientId.toString()}@HMG.com", + selectedPaymentMethod, + appState.getAuthenticatedUser()!.patientType.toString(), + "${appState.getAuthenticatedUser()!.firstName} ${appState.getAuthenticatedUser()!.lastName}", + appState.getAuthenticatedUser()!.patientId.toString(), + appState.getAuthenticatedUser()!, + browser!, + false, + "2", + "", + context, + "", + "", + "", + "", + "3"); + } + + startApplePay() async { + showCommonBottomSheet(context, + child: Utils.getLoadingWidget(), callBackFunc: (str) {}, title: "", height: ResponsiveExtension.screenHeight * 0.3, isCloseButtonVisible: false, isDismissible: false, isFullScreen: false); + transID = Utils.getAppointmentTransID( + bookAppointmentsViewModel.selectedDoctor.projectID!, + bookAppointmentsViewModel.selectedDoctor.clinicID!, + bookAppointmentsViewModel.selectedDoctor.doctorID!, + ); + + ApplePayInsertRequest applePayInsertRequest = ApplePayInsertRequest(); + + await payfortViewModel.getPayfortConfigurations( + serviceId: ServiceTypeEnum.appointmentPayment.getIdFromServiceEnum(), projectId: bookAppointmentsViewModel.selectedDoctor.projectID!, integrationId: 2); + + applePayInsertRequest.clientRequestID = transID; + applePayInsertRequest.clinicID = bookAppointmentsViewModel.selectedDoctor.clinicID!; + + applePayInsertRequest.currency = appState.getAuthenticatedUser()!.outSa! == 0 ? "SAR" : "AED"; + applePayInsertRequest.customerEmail = "CustID_${appState.getAuthenticatedUser()!.patientId.toString()}@HMG.com"; + applePayInsertRequest.customerID = appState.getAuthenticatedUser()!.patientId.toString(); + applePayInsertRequest.customerName = "${appState.getAuthenticatedUser()!.firstName} ${appState.getAuthenticatedUser()!.lastName}"; + + applePayInsertRequest.deviceToken = await Utils.getStringFromPrefs(CacheConst.pushToken); + applePayInsertRequest.voipToken = await Utils.getStringFromPrefs(CacheConst.voipToken); + applePayInsertRequest.doctorID = bookAppointmentsViewModel.selectedDoctor.doctorID; + applePayInsertRequest.projectID = bookAppointmentsViewModel.selectedDoctor.projectID.toString(); + applePayInsertRequest.serviceID = ServiceTypeEnum.appointmentPayment.getIdFromServiceEnum().toString(); + applePayInsertRequest.channelID = 3; + applePayInsertRequest.patientID = appState.getAuthenticatedUser()!.patientId.toString(); + applePayInsertRequest.patientTypeID = appState.getAuthenticatedUser()!.patientType; + applePayInsertRequest.patientOutSA = appState.getAuthenticatedUser()!.outSa; + applePayInsertRequest.appointmentDate = DateUtil.convertDateToString(DateTime.now()); + applePayInsertRequest.appointmentNo = DateTime.now().millisecondsSinceEpoch; + applePayInsertRequest.orderDescription = "Appointment Payment"; + applePayInsertRequest.liveServiceID = "0"; + applePayInsertRequest.latitude = "0.0"; + applePayInsertRequest.longitude = "0.0"; + applePayInsertRequest.amount = bookAppointmentsViewModel.patientWalkInAppointmentShareResponseModel!.patientShareWithTax!.toString(); + applePayInsertRequest.isSchedule = "0"; + applePayInsertRequest.language = appState.isArabic() ? 'ar' : 'en'; + applePayInsertRequest.languageID = appState.isArabic() ? 1 : 2; + applePayInsertRequest.userName = appState.getAuthenticatedUser()!.patientId; + applePayInsertRequest.responseContinueURL = "http://hmg.com/Documents/success.html"; + applePayInsertRequest.backClickUrl = "http://hmg.com/Documents/success.html"; + applePayInsertRequest.paymentOption = "ApplePay"; + + applePayInsertRequest.isMobSDK = true; + applePayInsertRequest.merchantReference = transID; + applePayInsertRequest.merchantIdentifier = payfortViewModel.payfortProjectDetailsRespModel!.merchantIdentifier; + applePayInsertRequest.commandType = "PURCHASE"; + applePayInsertRequest.signature = payfortViewModel.payfortProjectDetailsRespModel!.signature; + applePayInsertRequest.accessCode = payfortViewModel.payfortProjectDetailsRespModel!.accessCode; + applePayInsertRequest.shaRequestPhrase = payfortViewModel.payfortProjectDetailsRespModel!.shaRequest; + applePayInsertRequest.shaResponsePhrase = payfortViewModel.payfortProjectDetailsRespModel!.shaResponse; + applePayInsertRequest.returnURL = ""; + + //TODO: Need to pass dynamic params to the Apple Pay instead of static values + await payfortViewModel.applePayRequestInsert(applePayInsertRequest: applePayInsertRequest).then((value) { + payfortViewModel.paymentWithApplePay( + customerName: "${appState.getAuthenticatedUser()!.firstName} ${appState.getAuthenticatedUser()!.lastName}", + // customerEmail: projectViewModel.authenticatedUserObject.user.emailAddress, + customerEmail: "CustID_${appState.getAuthenticatedUser()!.patientId.toString()}@HMG.com", + orderDescription: "Appointment Payment", + orderAmount: double.parse(bookAppointmentsViewModel.patientWalkInAppointmentShareResponseModel!.patientShareWithTax!.toString()), + merchantReference: transID, + merchantIdentifier: payfortViewModel.payfortProjectDetailsRespModel!.merchantIdentifier, + applePayAccessCode: payfortViewModel.payfortProjectDetailsRespModel!.accessCode, + applePayShaRequestPhrase: payfortViewModel.payfortProjectDetailsRespModel!.shaRequest, + currency: appState.getAuthenticatedUser()!.outSa! == 0 ? "SAR" : "AED", + onFailed: (failureResult) async { + log("failureResult: ${failureResult.message.toString()}"); + Navigator.of(context).pop(); + showCommonBottomSheetWithoutHeight( + context, + child: Utils.getErrorWidget(loadingText: failureResult.message.toString()), + callBackFunc: () {}, + isFullScreen: false, + isCloseButtonVisible: true, + ); + }, + onSucceeded: (successResult) async { + log("successResult: ${successResult.responseMessage.toString()}"); + selectedPaymentMethod = successResult.paymentOption ?? "VISA"; + checkPaymentStatus(); + }, + // projectId: appo.projectID, + // serviceTypeEnum: ServiceTypeEnum.appointmentPayment, + ); + }); + } + + void sendCheckInRequest(String scannedCode, String appointmentNo, BuildContext context) async { + LoaderBottomSheet.showLoader(loadingText: "Processing Check-In...".needTranslation); + PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel = PatientAppointmentHistoryResponseModel( + appointmentNo: appointmentNo, + clinicID: bookAppointmentsViewModel.selectedDoctor.clinicID, + projectID: bookAppointmentsViewModel.selectedDoctor.projectID, + ); + await myAppointmentsViewModel.sendCheckInNfcRequest( + patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel, + scannedCode: scannedCode, + checkInType: 2, + onSuccess: (apiResponse) { + LoaderBottomSheet.hideLoader(); + showCommonBottomSheetWithoutHeight(context, title: "Success".needTranslation, child: Utils.getSuccessWidget(loadingText: apiResponse.data["SuccessMsg"]), callBackFunc: () { + Navigator.of(context).pop(); + Navigator.pushAndRemoveUntil( + context, + CustomPageRoute( + page: LandingNavigation(), + ), + (r) => false); + }, isFullScreen: false); + }, + onError: (error) { + LoaderBottomSheet.hideLoader(); + showCommonBottomSheetWithoutHeight(context, title: "Error".needTranslation, child: Utils.getErrorWidget(loadingText: error), callBackFunc: () { + Navigator.of(context).pop(); + }, isFullScreen: false); + }, + ); + } + + void insertWalkInAppointment() async {} +} diff --git a/lib/presentation/book_appointment/widgets/appointment_calendar.dart b/lib/presentation/book_appointment/widgets/appointment_calendar.dart index 7e2e7ba..7c4226c 100644 --- a/lib/presentation/book_appointment/widgets/appointment_calendar.dart +++ b/lib/presentation/book_appointment/widgets/appointment_calendar.dart @@ -177,6 +177,9 @@ class _AppointmentCalendarState extends State { onPressed: () async { if (appState.isAuthenticated) { if(selectedTime == "Waiting Appointment".needTranslation){ + bookAppointmentsViewModel.setWaitingAppointmentProjectID(bookAppointmentsViewModel.selectedDoctor.projectID!); + bookAppointmentsViewModel.setWaitingAppointmentDoctor(bookAppointmentsViewModel.selectedDoctor); + Navigator.of(context).pop(); Navigator.of(context).push( CustomPageRoute( diff --git a/lib/presentation/home/landing_page.dart b/lib/presentation/home/landing_page.dart index 47f8118..1b2ce9a 100644 --- a/lib/presentation/home/landing_page.dart +++ b/lib/presentation/home/landing_page.dart @@ -623,7 +623,7 @@ class _LandingPageState extends State { isDone = true; cacheService.saveBool(key: CacheConst.quickLoginEnabled, value: true); setState(() {}); - await Future.delayed(Duration(milliseconds: 3000)).then((value) { + await Future.delayed(Duration(milliseconds: 2000)).then((value) { if (mounted) Navigator.pop(context); }); }); From 5c0d3144d6b6a025727dfb40132c326f1c8490a2 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 7 Dec 2025 12:32:28 +0300 Subject: [PATCH 17/22] iOS App Icons Added --- .../AppIcon.appiconset/Contents.json | 124 +++++++++--------- .../Icon-App-1024x1024@1x.png | Bin 10932 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 295 -> 815 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 406 -> 1980 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 450 -> 3664 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 282 -> 1297 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 462 -> 3517 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 704 -> 5549 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 406 -> 1980 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 586 -> 5858 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 862 -> 11154 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 862 -> 11154 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 1674 -> 20412 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 762 -> 5152 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 1226 -> 16469 bytes .../Icon-App-83.5x83.5@2x.png | Bin 1418 -> 16408 bytes 16 files changed, 65 insertions(+), 59 deletions(-) delete mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index d36b1fa..08f3422 100644 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,122 +1,128 @@ { "images" : [ { - "size" : "20x20", - "idiom" : "iphone", "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" }, { - "size" : "20x20", - "idiom" : "iphone", "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" }, { - "size" : "29x29", - "idiom" : "iphone", "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" + "idiom" : "iphone", + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", - "idiom" : "iphone", "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" }, { - "size" : "29x29", - "idiom" : "iphone", "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" }, { - "size" : "40x40", - "idiom" : "iphone", "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" }, { - "size" : "40x40", - "idiom" : "iphone", "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" }, { - "size" : "60x60", - "idiom" : "iphone", "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" }, { - "size" : "60x60", - "idiom" : "iphone", "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" }, { - "size" : "20x20", - "idiom" : "ipad", "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" }, { - "size" : "20x20", - "idiom" : "ipad", "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" }, { - "size" : "29x29", - "idiom" : "ipad", "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", - "idiom" : "ipad", "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" }, { - "size" : "40x40", - "idiom" : "ipad", "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" }, { - "size" : "40x40", - "idiom" : "ipad", "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" }, { - "size" : "76x76", - "idiom" : "ipad", "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" }, { - "size" : "76x76", - "idiom" : "ipad", "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" }, { - "size" : "83.5x83.5", - "idiom" : "ipad", "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" }, { - "size" : "1024x1024", + "filename" : "icon 1.jpg", "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "1024x1024" + }, + { + "filename" : "Icon-App-76x76@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "76x76" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } } diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png deleted file mode 100644 index dc9ada4725e9b0ddb1deab583e5b5102493aa332..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10932 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 delta 279 zcmV+y0qFj(2B!j$8Gi!+006pI?LPnj0Blf9R7L;)|5U~J`u_j-{Qm)0oAmqtj@kOz z^8J|I`-|B6ht~R5kG+%I`zf~eztraM`u^bc{`dO)zUlmg)%x%C`E}6wSI77~z4s`y z^XT{f(eM4n?EUff`e@AgO~UxV*5*r_%Uhbj5N)LaQj!wdIe!-b004GLL_t&-)18pX z4udcZ1u-#g(~z+5JN*AY5?>Gw7hsN~k)CYt4dQDFxbs5*_&e@Hj)wtt(&JE<3Eq*D z;_gQLvqXoKv=I*gWqM9C(Tvu0>=?hTbOp9!6k6AF;>f6|S5%jGEE}TA9h)e`Yuiu8 d7)l?o1NFcJg%EAfM$P~L002ovPDHLkV1g)Onvnni diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 797d452e458972bab9d994556c8305db4c827017..2e4c79638b62611653dde1e4c3a83e3db156c2ce 100644 GIT binary patch delta 1977 zcmV;q2S)go1H2EA8Gi-<004~sxNQIc010qNS#tmY4#WTe4#WYKD-Ig~00(YKL_t(o zg?*UIZy#3`$3N%J%+Ge~#J@Ok?ACD}EhIE;fv8jn6;XsL)GoSW1smw9e-}amA%R!` z3lI_rfrN^p0wqYEYG60x zA)(np73U>sTC}bawV8`W1gZ)ti--uB2TXxkTfsbY34eR*Hth$S&@_qp6-3e`=`ui! zAZJcfedA@!>RB+EXx*(|AIqL|;*)vSue4X;kSD^?DQeY9V7Q4N}p$JF6`5n}ab5mg` zuU=u{M}I%SJbTffPtzAD3e5aG?VT+s%gnF2iz5*CQlP4kQ&Y^!3Q`skcBB{NW_ptH z`7crb{*P$WI4mzpipyW1c;PwBbcth^wTKB&+y^B0T)GTOa4z2JXnqWqDUkVj@QfTi z0}Jy=`B;$1R|@3GUD?N@5fsQu-@uZwI7kA5UVq3jVm+BOheQuY664V1@{)x~_;Rdp z*}fER)w3AXy%E~ULwci5_%iit>;sZR+Q(2y%ixG!np}tAIyj>N*!xlD!QZ%h=@l^r zYoWDSlaLD8d()lts2s1V@o!v8>v)Y*b6Gq{2dn6#&#=4q;cx~E-fAMAaj!1TO^Aj-AwP}Fbp2Bs5-TMT6@URmyD_}zD_-c;Tso#`hKC~?$=)nQaJJ)GHx`noF z7h;JWqny2gI`sk4G6wYMsvD&upO6ithM_BqUsd_UMLe1W%!3(*j^0;TUF zqe){k;Wv%+As{aJQ^@IBgSHGqGa1&Zfv9ZqNdv8))*l-q_%u&2}mFnBy#NPY>t!t-9 z)1Z6%*u6byTE6w5X1o?jO z)mNxq`8v$aC7XPHh4`};d-opt$v)JzBmU@-6Si)gfFj6bLUHjtT--pyh|sji(g~XD z|HSU@Ig1V~n3^r-ySNxyo_|6$NqV+pR#UsO7`&j0HcdBU1Z6ywX@Im!kfkZIwB$w$ znha_H$}n5xOI*2R0er={1lijBR<2&8;~+BFUeR!m|rE!?2bsZN;2e(36nM! z{U&2vS?9_SMzP&`OanE#LK7QYI=cP1)+~KDXd5-VH*w(XZ4CBEX@3O^63O+6?^9{&3o^|QQbvP(_;U-N&DUn^uqZL1+vLP5LNWvj_WylGKL{j zw%4xcz*0t#)2Aq3x_^dQIpZXczh5L*b#rm^?!VA`yNMtC3x(UD}+03I|?HtmCd;^N-7lyNL~QLuh-^Wo(An=oRhhhhLn zyi1AuE#hJ+xJ~H>7T2@3sFfaPL(azsH29EX1{Qak!C$L>fz(2Q*-0ZWHwcdno0F z=n0m_n)tyT5i&$mX8CW@<5Ae{k2|s;mMEyu%^KrIPNKB;^UD7LX~LPuV~ccd00000 LNkvXXu0mjffbZC^ delta 390 zcmV;10eSws50(Rv8Gi!+006rnNM8T|0E$pdR7L;)|5U~J0au$Tw)XJ){%+3s=lA~6 z@BMVp`S<<*VaoaP`~U3u{%g(ou*=|m)B4`@{`33)?ezIj#Q6OF|6IuUF}e2O>+>eB z?J{?+FLkYu+4_Uk`r_>LHF~flZm0oBf#vr8%vJ>#p~!KNvqGG3)|f1T_)ydeh8$vDceZ>oNbH^|*hJ*t?Yc*1`WB&W>VYVEzu) zq#7;;VjO)t*nbgf(!`OXJBr45rP>>AQr$6c7slJWvbpNW@KTwna6d?PP>hvXCcp=4 zF;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f}@SsdjJ3c diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index 6ed2d933e1120817fe9182483a228007b18ab6ae..59435c76664e6178fd0e1bcaf87e0e2a77d36371 100644 GIT binary patch literal 3664 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 Q00000NkvXXt^-0~g7j^LjQ{`u diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index fe730945a01f64a61e2235dbe3f45b08f7729182..11d35da468554cb49a405a1811c69a89a8781895 100644 GIT binary patch literal 3517 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 delta 447 zcmV;w0YLt}8_ole8Gi!+007oyx*7lg0G3cpR7L;)|5U~J0au$Tw)URh`@-w}Xw3Np zS)Ix4{k7)&ujKrh-TO(x_}20L&+q+}+xr1ilg8}*yXgGl_5RcF{f*iBEV%Z~-t4>5 ziGV;=={^- z?sLQGb)?A{hr$_!z8HbH7kH=vM0x-*R~t>;jsO4v^GQTOR7l6|(&r9>FcgO2dg?%> z;=sK?5%;?Pn^T7LL?Y$@5u?06NuIR*0?Yf$Hf5Afk+lM<^ch*jvO$sU*m9J?JI7eI zGFV6+q|w~e;JI~C4Vf^@d>Wvj=fl`^u9x9wd9R%3*Q+)t%S!MU_`id^@& zY{y7-r98lZX0?YrHlfmwb?#}^1b{8g&KzmkE(L>Z&p6kME1_Z%?`+u)^el0!1<0sd p?Eyu!OMLDifi)An*I;?S-wj=m4RYIt!kPd8002ovPDHLkV1i7_^hp2! diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 321773cd857a8a0f0c9c7d3dc3f5ff4fb298dc10..93523cbe1016ba4a69395cbe51089848aea46ade 100644 GIT binary patch literal 5549 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 delta 691 zcmV;k0!;m_E5HSi8Gi!+002f7DP8~o0Jl&~R7L;)|5U~JDYo_jSDX9(|M~s@SH}2N z#rS{J`h3&+@cRDr`1>4br2|=<_Wb|z`~RBV`-<24{r>;E==`tb{CU#(0alua*7{P! z_>|iF0Z@&o;`@Zw`ed2Hv*!Fwin#$(m7w4Ij@kM+yZ0`*_J0?7s{u=e0YGxN=lnXn z_j;$xb)?A|hr(Z#!1DV3H@o+7qQ_N_ycmMI0acg)Gg|cf|J(EaqTu_A!rvTerUFQQ z05n|zFjFP9FmM0>0mMl}K~z}7?bK^if#bc3@hBPX@I$58-z}(ZZE!t-aOGpjNkbau@>yEzH(5Yj4kZ ziMH32XI!4~gVXNnjAvRx;Sdg^`>2DpUEwoMhTs_stABAHe$v|ToifVv60B@podBTcIqVcr1w`hG7HeY|fvLid#^Ok4NAXIXSt1 Zxpx7IC@PekH?;r&002ovPDHLkV1gyaYiIxf diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index 797d452e458972bab9d994556c8305db4c827017..2e4c79638b62611653dde1e4c3a83e3db156c2ce 100644 GIT binary patch delta 1977 zcmV;q2S)go1H2EA8Gi-<004~sxNQIc010qNS#tmY4#WTe4#WYKD-Ig~00(YKL_t(o zg?*UIZy#3`$3N%J%+Ge~#J@Ok?ACD}EhIE;fv8jn6;XsL)GoSW1smw9e-}amA%R!` z3lI_rfrN^p0wqYEYG60x zA)(np73U>sTC}bawV8`W1gZ)ti--uB2TXxkTfsbY34eR*Hth$S&@_qp6-3e`=`ui! zAZJcfedA@!>RB+EXx*(|AIqL|;*)vSue4X;kSD^?DQeY9V7Q4N}p$JF6`5n}ab5mg` zuU=u{M}I%SJbTffPtzAD3e5aG?VT+s%gnF2iz5*CQlP4kQ&Y^!3Q`skcBB{NW_ptH z`7crb{*P$WI4mzpipyW1c;PwBbcth^wTKB&+y^B0T)GTOa4z2JXnqWqDUkVj@QfTi z0}Jy=`B;$1R|@3GUD?N@5fsQu-@uZwI7kA5UVq3jVm+BOheQuY664V1@{)x~_;Rdp z*}fER)w3AXy%E~ULwci5_%iit>;sZR+Q(2y%ixG!np}tAIyj>N*!xlD!QZ%h=@l^r zYoWDSlaLD8d()lts2s1V@o!v8>v)Y*b6Gq{2dn6#&#=4q;cx~E-fAMAaj!1TO^Aj-AwP}Fbp2Bs5-TMT6@URmyD_}zD_-c;Tso#`hKC~?$=)nQaJJ)GHx`noF z7h;JWqny2gI`sk4G6wYMsvD&upO6ithM_BqUsd_UMLe1W%!3(*j^0;TUF zqe){k;Wv%+As{aJQ^@IBgSHGqGa1&Zfv9ZqNdv8))*l-q_%u&2}mFnBy#NPY>t!t-9 z)1Z6%*u6byTE6w5X1o?jO z)mNxq`8v$aC7XPHh4`};d-opt$v)JzBmU@-6Si)gfFj6bLUHjtT--pyh|sji(g~XD z|HSU@Ig1V~n3^r-ySNxyo_|6$NqV+pR#UsO7`&j0HcdBU1Z6ywX@Im!kfkZIwB$w$ znha_H$}n5xOI*2R0er={1lijBR<2&8;~+BFUeR!m|rE!?2bsZN;2e(36nM! z{U&2vS?9_SMzP&`OanE#LK7QYI=cP1)+~KDXd5-VH*w(XZ4CBEX@3O^63O+6?^9{&3o^|QQbvP(_;U-N&DUn^uqZL1+vLP5LNWvj_WylGKL{j zw%4xcz*0t#)2Aq3x_^dQIpZXczh5L*b#rm^?!VA`yNMtC3x(UD}+03I|?HtmCd;^N-7lyNL~QLuh-^Wo(An=oRhhhhLn zyi1AuE#hJ+xJ~H>7T2@3sFfaPL(azsH29EX1{Qak!C$L>fz(2Q*-0ZWHwcdno0F z=n0m_n)tyT5i&$mX8CW@<5Ae{k2|s;mMEyu%^KrIPNKB;^UD7LX~LPuV~ccd00000 LNkvXXu0mjffbZC^ delta 390 zcmV;10eSws50(Rv8Gi!+006rnNM8T|0E$pdR7L;)|5U~J0au$Tw)XJ){%+3s=lA~6 z@BMVp`S<<*VaoaP`~U3u{%g(ou*=|m)B4`@{`33)?ezIj#Q6OF|6IuUF}e2O>+>eB z?J{?+FLkYu+4_Uk`r_>LHF~flZm0oBf#vr8%vJ>#p~!KNvqGG3)|f1T_)ydeh8$vDceZ>oNbH^|*hJ*t?Yc*1`WB&W>VYVEzu) zq#7;;VjO)t*nbgf(!`OXJBr45rP>>AQr$6c7slJWvbpNW@KTwna6d?PP>hvXCcp=4 zF;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f}@SsdjJ3c diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 502f463a9bc882b461c96aadf492d1729e49e725..00bb8dbd033bc6a2854e3272011ec7b56a1e190a 100644 GIT binary patch literal 5858 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 delta 572 zcmV-C0>k~{Ey@It8Gi!+006nq0-pc?0H{z*R7L;)|5U~JDYo_jSDXF*|5nEMy6F5^ z$M}8I`uzU?*Yf=uXr;5|{0m;6_Wb|A>ik^D_|)+I$?g3CSDK^3+eX0mD!2CP`2NN0 z{dLg!a?km&%iyTt`yiax0acdp`~T(l{$a`ZF1YpsRg(cvjDG_-U$Er-fz#Bw>2W$eUI#iU z)Wdgs8Y3U+A$Gd&{+j)d)BmGKx+43U_!tik_YlN)>$7G!hkE!s;%oku3;IwG3U^2k zw?z+HM)jB{@zFhK8P#KMSytSthr+4!c(5c%+^UBn_j%}l|2+O?a>_7qq7W zmx(qtA2nV^tZlLpy_#$U%ZNx5;$`0L&dZ!@e7rFXPGAOup%q`|03hpdtXsPP0000< KMNUMnLSTZxLp6*5 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 0ec303439225b78712f49115768196d8d76f6790..3eaa1fb65a92fe5fed88b2ffbd811a6c51bcd8ad 100644 GIT binary patch literal 11154 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 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 0ec303439225b78712f49115768196d8d76f6790..3eaa1fb65a92fe5fed88b2ffbd811a6c51bcd8ad 100644 GIT binary patch literal 11154 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 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index e9f5fea27c705180eb716271f41b582e76dcbd90..fd80aa4170174408dbd3cc3f8eeacec3c652bba6 100644 GIT binary patch literal 20412 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 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 8953cba09064923c5daf2d37e7c3c836ccdd794b..47a96a438ff102bec5f5d55dc14f6394bde15af2 100644 GIT binary patch literal 16469 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 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 0467bf12aa4d28f374bb26596605a46dcbb3e7c8..8c4ca7b08ff5f5b2a52c7e99c2aa901581025340 100644 GIT binary patch literal 16408 zcmV+zKP?p|xAyQin8r@QB|)}m)_y_aE<+!9(zBM`{oFf%|s z>{Cb#TLA+gm+4_T=rsTXv_xx>O1tim|54;|n0zT0y7GWlZZ-o<5pJixNNuznBm97N z;eoNXgft$56!82@RsDc&5t}~sJhLtl;zKFHG0nowb)*Yo1vl43LQ1WYM~RBqx^RxHzR>LonnMb%jqCWV6gJ5p1kT!B;LNzMXxp+0 zJS!C^MEL_3-O0Z~NHgS=jFfh^MabP!olIxuPIUEG_m06xA;7U>dRkGP(B8ohkUnoG z@hBup)vG3yhr87B9ARh_Cev*v8p#Uk}Dy>3qrt znCAA9S84_&3r{czv*l0l6*^tiZ{<^v2dllFYmgL0Zd{tM?7rpPL#k5Ljf^fa7N_SuC6CrZc7$P zf1@f>=TU{ra2Ww^?jUAEKYN*gC&>?KqK+gYx${7osV}Th{Ahz0$7e;uI~E_Y47Q=q zW6Y;qt{G|642FN4dM%?cJ69fedo}7K02R*IkyadNvylo<6pNBjC>KPC&Ywh`kn^Jv z0HwrjzPuIk;O5>JL`hq-COpNkgi78%de|z&h=&;ffHjfg(9BT1q{-wl zl#=F&kW*6MfEKe+ro*Lm??Us;jLA|wko0B)LPo9iW`01kCDyP&f3$`Q+Zz!P ziBf-_^jU&k{K3%A!SrQW42JF)3*hICZPt*{Sn$4f=Bh>-pMp z!BLb=F!5Z?z-&J_ORZ6FKw*v>6<;RcRGnsa12i>(3F;=VK5n#!14{>U6gGzqT+LI7 zGb5$5F*0k#N~2*m8c~c;cqVSOi5-fQdS#I`kEzTXNa2O8j7#6y0C+}GI7&yvNU-h` zvn(f*D7UY)x9fF$nc_e8gx=fKJXYPS+ZqPK9FSsr6}BPqs%GXPpUjvz0WR(2 zolf#rW-PIp#_Cb4MyIMm@6wR$$7gKH=GnM-M_yt|nbprOiG?UAWa;}nX+8P{TMQ}VKLS)usUQH*5*3M){TbsQ-)N^y#eVP zz6I}P)_utILk!o*a|U19t6|Djk_TH@&$FR7pm0;UjI}*%nXkBEA%e?hBG*GBIF>+Q zm1`}p;a&Ws%j?)%Ul|j-+cH`U)^|Y{X{kctFY40>JSa2#_)ub@`YvF{a%O`=m`WD~ zvpvUDYiVegerXPvMP-hZD7kDki;CPTIpVe*fzXqC6~z-c!85A{`BayUWl63{T(*ie zm{2Q&6F`C|UB4@{wuH)`Nq)4l2*E`%I!sZFCXcQDRyUK*F9P+%!~~H>!QtW_ zy%BEA6|y7BhiMecGKp}LLz4dTCzcwl%89Ge6>6Q9RKuB3Pey7L&I{am98oz~V!{e` ze6~#047WxLOh$OJ7;&sI!(~I#@C*i1F&c!C&HI@c<%V%mqP(Y@aa?FXwJtEqpyy22 zVun#diZ@BF1CF`UcxzE@dqNUnWRjJ|Cr(ORX}@$|F(@V0EnwWuELPj_nibFK1e-fc zqBS7f+38f0%Pe%1V(K*twe#QJzn-Z?{Q5eOtedf(p`}R}ijPWBRBwhMr&4a8r?YscV{b3bvZ-Fobkxc9WN)3s)e+u@+?`Gr!KQQ@@|4GKxQx=U)9XeyZ`29b)8oq zW)A2ZHYKDPbpDY=ZE&W@52V_%b;F1yx(z-fBPPGOtBqo!ZUmP(bVC?mDuKT@7*#vWKDzgMoSTq0j`TQcoWRjMRV!qQu{_{8 z$*!Vb^Q%3BH_QYs*0PeF;OYkmxv{l6%eazPWO<{og4%p)F;-O@<40L01XwKc;u!xl$4LmMWdV&@s>G{)7-1x zGU(qLUux=5Z4EE)#-nAH9ekQMz6Q;ED0SaG>ejMWdO{%`C5l}QjB456TM`c*CRX$_ zy0exQMR(3Jr?f0&`RehhGR0HIYyy;&vv&Jj8WAX3NU)_0T;l|ytVlTLzeqpd${L22 zidPQ59w_Tzy{*Sc`Lu9-?>5*SZ~}vHJ@ed>aJulT6LRfkDK#CO#p=#GKxfa?owT^s z(~55v61#OyTWKS|Lrf};T*nAMUHDxNmI@8?jC&@e{I+CO4!2mBXb(EN-uaZUr?iyo zVVnh9pkT-L7@q`yrU_?0^kZ0m|2u&FeM@iPKt^=RbW}`}0A|O!u;-c=S6fL;Zr$Iz zF;~Ip_^ueg(l3>*jdTvSy>S&J*9_yN+{VW7QY&tVF1fX97r5O;#+HO`BTWK8dwbaX z!S~_JPk$KGjjuIe#?p3_Jr1Zi$g7bi>#FD8_SV903Cdk>08%e7&jgz6*?=hET@;Ty z+iSi4idYwRdl72WK8|YbF4|3@-3h}Vy%ac~a@w_GC&w$Uz~24u!ND*5E3EIly^lV) ztt}CSl$c3mfVdVcJ*8*%OA(d=L#&sD(kI(`JM|sCa~wL?m4_=CD1gd2Xi|H`Ji8TE z>rC;1=r}0yiW z?PY$6$jGjUBr-0#QiaD2H%>5f8W~QEq@2w)F(VXZox08|BvLx*;4Ien-h(^= z9$R~T`4ew8;1^!R=ITyN z$8_~o0JRrUB8R^uA1~7kf9A}rn77}C^*!H?>5kh#YDV6oHG3yLkX74A=eRY{NH%VO zYWOvRRB)YoWOoUhA4DN>BG8prV(*9U$Jr14*b->Xt>i}<-J>(c9C*70zwjcC{_=~s z^uK=xhoAZk_#5Y&%o+U)>v6s`a`V@p!~Q>hFZMrhKUQzP3)59s%_klro_A4Q%rkNPsE1b@b~@zeDP8&?-{%NOA_uSdR{E~ zHt~GzwK(&^2XOYM{{^NuydJb#nYKiVV$Ty$Sk{x%h#VqZgI&4iVkrfH4Xna;Tee1B zUAdm8%#|>6VBQe&NuH7SbZLJddvEy;ocZvNV|DkN z4E^lZ9FE*eyvS~Ye(vCu#{i}k_TKT`a~-$emKD>~wa})h+$(fXW+So)pP^zG0q5@K z_)jTZ(bY0toJFM`4^N{!1vh#;BMZ31RY8&>O1^$1@L>QnfmZs3%CUgGkVn(vQ-z~x zy~5tx--f;Ke<$dwD?5O8ATkn5umKZs1Uu9YD?wwwQ@(Ua4BWn zg9Gfn`<<9>z6oVP+<6YYRb|`_tkCt=+C*60btm@T`MscZ81{!L@+PCOBY3SRGHV&v zv2*TtA)$3c%^l~shtbq#701WZLRCZST(RObQIx-4+&?x2N7B;cy}b}S>o!Vx#;M zrG|3u;9hbNQHD*4v?4B#pR`5vdD_B`2LB@=z;x~$rkidAsTpliK&|vrz{xl?XcI8K z<{GTtbccyETfBIy-{Si?mU5SrDTtiazfD-L1q~JrZ3WX%&Ia+te6$ZoRDp@d8x!Ej zglK8!gRy+z@A?Ji{cmS;-ba1oOk7wv%)tl`cfz}5>t9SO?#Jka|k{a zYme@)S~+E}UF2EjIprk0c87UUz>Bd^hjz>&aOBM zTIq2tt{f0S&LO9CWJd@9u(t+Xam6A(yTp_|B^vP%BUZUJJtiXwQ{YyP(t(s}=_pw) zk^#&BQBh7a(i<~0MKYBybh_iVHvo5;sQCNiE}JZ+LeF=Lc5TR$B^#3JNrN8vNdcy! z?ESa=EvH@9cv~{6meYLfE@gqYsI$Zp%FE5>JWAn?>qX6lS`yFCt(TF(iMXhzc|9L- zo)?IA6SOc%{#PBR*l;o#5vq34$C;h((s3==y#6LLcAmvp1X)^KUKBRp8QHLizYMBg zteMwM8%m=G<#A=>%bT(~+@!fL)$f5%`K{26Xi|e5P$zRry%3cyA<-m~*WcR_<*(u< zKeMVvA(y=94_3&#&YX8qvJspSizSC1W`GiBI!r}FUj+30yjRIEa;v=%b{q0gimK$zqtZV?Z+Nosk=m8?kU& zkgblX*ms>4!H+E6RCKGkP9u8Ku6)iYG&=Picdgf_r85Xo-JYjN*`pfe7#tg&aqcD1 zC#yD|-#M6^3K9jTxw5AyvsB0Jh+sn|`*Z4s{IAb3UhXdCbJDbE-EMr8VYqnp)PQ z`r}B`BEx`>z*>T@=+UQJ`c^}SydG`0t`qOLQJyyub&dVbUav(lTT0H3lvJ0kBF* zeL73+KB*i$t&y3%%hWeJ)zt#0j&RqaVAVtvKy3kQMJDnkEk$kHpD4)J*C(}xr!n~% zGXNz7DtV5Mx^H=nk(G&E_}|6#M+^JR{tZZgmPoBZR-3vZgrlXe%l0KHEzSaTYE7jP zqa!EJ2VCXeT~sr}V<_gX>vg-pQ*{xP`M5uVA6Tr8LYvFE4(aP^({T4$4a9>=b^zD9 ztwO(&>^tFwK5K9tL^wq?v$BfggyI!BR=VEE9_^T(^=-kAF5)+#NJr^WCH;)v5|UpI z>doGF*}m*4doMPv43+n&Nf1GcDl}uXG#yoidsk9IB$a16T2W`t@ozC0Dh4Hm%C2Ey z!)?-vGa8tCya@M1iS)0VRCvI_Dtl{{l0U-#aVCws^g&@r3ej$6Co~nsWK|x%RU3pg zr$W|Kt7Hi|DWPdZ^^Wj>a8kw`fm97Fm z+t|82y*10${ZjbT8q~YGef##3q99E21f>tO?Rl?!h?dfbs~?G*J>K!WM;ktC z5GOCJw2+cPllN8;73WKus#a2-;nt%0lp31+m9@;0Z(cznv{dX_#V2HGC}vt)Y^}VR z-08+%5&h;uGa!y7=dh8J@<5HR2b(jX13Wi(sdiAVUBdtkSMQD?SWhYVcFOV!}4o)k%i9jJ(wh=7RW!qx<)rX49Q%*}^!Euzg z7daXzQu6}UFCmbH-Wc z5gk;Nbxe3t%FBw+pp^+yNzSn)nRkovb`myn4O=9ucXUot9 z@-TKru5T~|uckXyu9q}`WXN8za!*;+5?Ztj5?tYE1Dt=gyM8yih`wuDqSbVTy^JUX z>(mi>vt4)-xm}L)20odcyYuG(ZB(ebz-bS-sRRuYC|iI$@fO|8F3K^I@`~V`*+sI% z7cXJ^>~lNEOvBrZr>M++5=S~*G4o9sw2d;?fxAqKdVKAgmJWI}({_vPv(JN%juaCm zXrZvZ9l2;7Y4Jk9+SoTEd?3$AQDP;^mDrTy&Q83~4AA-W*gW(I_|hS;zt@1{>Uy+8 zPBL3>&TM5;V;1F{v##px@Ij=$I(j@FPa~!r#o50261Go1J$pTq8nc~T=9MAz8BIPX zqup$+T+FOg5;v~bWFi3D4YrRzfz4OG+JXH0m8Pq%1g2FSrVQP?w7&<|hM-N38;J?`240&brc&*LHZ?0;vj_f$d{Y;OLJ(Yu&^` z`c_y@Nz=_Y0S9L+EFzU0sCy#Nwbx)$FVFpE?hfsm`0x;i|M%0_KK(56?qMlyC`ywW zvVKVx`LZ&>nwlmuVbgG6byQI~fw_|$E zwZ@%95tF@-W=ag4*~j#{Tg{uDFXy4+6D4MBzW8Mve)_ZES6&97=RpfR>Ii5FuJK^y zB&$p&Y*pG^j}>Q+!^+)haK|q;8*KjU3%K~JAH(*^r>do;Z&l~C>YZM93s!Hw3$(wt zAnS#hD-ovGT#LQ8eV2V}olE^=YwdKJ7MQnNY#x0a7k=fV*!=BR0ynWx*C5*|st?Q7 zY5rZ@erTzE;7j%va1(}}gPU=;FT9A0ANvgejQt;eKUQzN9dvLuo&OZNd1X}9nHY>Z zjV91~Rp*~D(ZK=sfAD@Be)_Z6KK4XrFB&Qcg^aNB z4>N;by@1VEzKTm9`%N5v{P(~wf1|^o;QC482)}&|Ub6zqADCySYr1Z|oaAQr!l%Y< z?pHHo``DAX@IQVHM_>3NR`=YE>6)v-@(OAVDi_%OT)de2LpK!Vl|C{_HCjQKUi)o0^Ur?-)6F-Vx=zDW zY@dGtN1yu(Y`^vh_|l~@r1iQQytKRei zh%HAWMX=-m#L(%bCnEJanl#i&;XsrzAVtzYW@IV^WfL;>c9U*9RBVffG=E79St?Q zwK-CBpsZI06?sM)$w41$YAWdka<@h9;q^geMW9$tgQ7dH_p#7w^F83f*njog8c{NH zEAQDebV}&p6imC=X~OF6J8{Lo{WsXZ|2=VhdV<6+zk za|U$74OriPTXWOl*nGTt0q6hSf5gRK`c?2NowyKQQGA(+!<+|n(Cp8oD*Z5h>IXys zr`>Xp)`g3inCuc29#7h_Ws+3XYa~VW67-wN%)wTp7+Y)~dIXn#>l0Xi&s#BFd(G}_ z_c*)yDy;AMb{mxY&eZ`paOwjD0FFNY1ss0zQ?p{4Nuu+g`h2N|3zg9Ik0V9e5?2=1 z87lz!6l>_xgL_r|G?&jYCn<*WPLP;+3gn#ogA`+`oZ^$;d7+8ZuN-E8oFEtCjPyEO zko+b5ym=tJxrXw^3)p<=Z?O5&mum(xd&gH8A_7e*W+R&4R6I>{-ZaheoZO$Vo-iF9 z;qZ?>gYDywt3kr%XEq4#Rf976Dyrx(0!2x*$ly&C zZkT3*No`#$#xNC1TS>hs+=M`+=#>}EvimazQ4M-#!Bm5k)wN=4`@~Z?`hQ=x7EXhl za5rh>6#q$1_4n|%FMS=GFaIr|-MP1NC^EA&i*aXz%Pmo5f|b4sE!}5QdC~rwM+Z97 zDh*JtKui@Ffe9wR$N71%!mp1_X^2^vh{3!Us#khiRVLIu8 z`S$TA=aWKa5~)H8j2N93bDew%S9-YquX5c4J!;~&iLiR9Ld%rv3afY|upEjYkrh@A zsO^8+-bEhaBQ&(8Rd-4*cjB1`D6evY?7c^H;_%kI>V7%zB1*bkF0VITF`I-qO?&=(eN<|J~H;Lbka9& zX!w&pD<9!jG_)pZF=#j~H{Tb8N;b^F$9n?jr@dpHr*azJFrV1SZ6FJfs7)rG^RBj0 z?MTtFQ-dZ~H=1cTh+1LDHzDovsPl<%S1a533^8A2MZ;MlJ26q#zzjeI8?JFH3smWz z4m9U`^8FG{4m{qR=A|TKwiAna)aesOEh|z79yzw?Sfom+j3CuDb1etkI?RIb@;bi7 zI<2(R!Hu0~@HIT8a?UPLCLIdEcwHYuHzx?g*%lht7Pw*>cOHXE56Me)U?oXeP1kILGHYoJr`Um5b&BA*{;kZIJOMX8-^n zzDYzuR7AFTN_aA=Mdg=9o_%pf;F{1l@ucM}i{p*`^wP8$={T>$@#inYCsFeO5v#mC ze)MF_<7Z4R-YwVDP>}jN9|2$j$tTn(nTe$MX0GLMx{ivK7N`)UFerQ$a%&SzXZKk? zqh~O=IQsI&FjtAOh@^P%f>C@?Ia68&zx$9uh%1!^JP1-6?X80zOG`sbO5K9(;YEtt z<0phqCyGjrl~oo&5@-=g@-$ku>?x#ZQEgM&4_wVPNVzdqsa$HLsDD&cEclg8LufgD z%41SF+J?2_f|0|3F6o5i8)=BjrR81)AinycG!oxkj#t~XU`C%K&)3rgru1>1R{sYq zw0cA<#XRJTbO~HMuu@X5t|iZ^IkSgPhA15(vEQaIwNILkgowpz&T#=}a*2%vK{iz~ zL?hP}O{4r}zR2SEUtI?i0jm{=+MktQI&>^6y}Vj}h^WorBTpmXOy2M09=Cs=z7>+DQ|&U9f-PQUToHYW9H=6EBq*?q`tzD`wIbrmvf-Zbn;w`1g@FxVbB03XjB47z#hH6{@;BYyzx7chw4cFv}Fum?(tlx6ai6%C? zq|m*0c72xk>Md{46$e<~cQ5F=Yb)`P;Ck}LjjC;H)y=Z`lGSb413FOckt6;zh~JP& zWShZQe#LfDRszbCnXoR#^GY%>YyKORsS%s%VCc@9rAH1{a7jJLl-=GnS7ZJ5w_&>d z^*im-EG1?JE?mI&`4@l-7hU_g{0V!j73k`#G2L)3wBRGLs$UzO*D?uv?|vuNzwvP# zJ^MU(lVYsCz>Z^=;HLF9e?$m}U- zMMp~@vH%Lt^Rl;x_1o^l*`NI|)^EP6!FaJoyC~@9;YV@dKm8Y6_{gv4XV<%!sTrHU z_$wTK`cH813qOZ5AAA6G#lg-4BMbpn6V80_0c;<80vA8>>)@xKsUopzzSO9)%Jy^| zU^Y79xxmgG2Sk&>%huK}rMVlkLnO1V@(l>e1QkGDLXgA6;)3I#IcOlVlb-1u9ALWf z+kmUCjGwt-29Bb~hAsK&>Z`DN^Ih2g;rC2+EX>Yb;oYh2oN>Yl&EDQN%iza@Z0cBTj zmXfl&=Ax)M##8`h*&(YijD;JTe=x9KV}19Vu=n0~WA&CdgRZ@HR!&EQx3kbnFj`2+ zgpvT@>Z{93w{%UNNr}GiEe9R`@t@+-Z+)VAn?@MgD1l{}s&@~qzw2I1H{H0%;|PBM zK&KW&W57p8;OAe!(O-TMN1y$(`R#HJHhbPc zcf9$tdXw_3ty4X(-UM>NY!%zCR#?6DKAip8pTz#V-wC?*n$VhD zuE!yK>h2W1dI6Vy`xDqc`+OYAG(wh&^}|DKzVu}re&%yH^T7v>&0i>&^$P2|?*#6? zb0@kvNe3~5FI~d+(I;@}w?Bakzw%LRzxD{KMoRl+k{#)K5MscCH*Ff1$27`b3zZ5z zH^#IBb_u{CRf=ZmOt;^LvmgEt_TTrO`L!{fZNFVlq93QMm$r{Tfz4n4EpT{A8V&&E zqqAx^gz{1a)!_*Me&Hn?{pshy>Xk7k;dw+p(NVqtDF4!#Gg#euJI?&XKbzm}bi+B- zOf@ITvXHhqJs?F}ubHw118P(t@2%_EMLh&4P*~2jq(3S&G|zQn(7{>kecwB<_XGbh z+`XAeyGMlw({YZxEv3za4`KVliz%prGKnSZnGZ+IG9c1&Nqv)MvbcBwn};8rAG|vu zUxK^qQNYpqrt8n)%#VK%tNY#ptk$VT9O_h}9IpJNN|myjg6c{Rs!z*P&V=UH?;23$ zw*xxeaufF6^Da!++1T(T7V>f~v~M4OGEFinE@t-z&Uy<{5tsg7mhs% z8d0uYJWlTr_3GA}vH!mJV!HmiJl>2;mcgOpHZi7!;S68>xy=F@*UVx$4PR6QT6k!+ z%6PA;c^;8woavUEuzuTp*$s}K_E|ddv#WBC9-HGAznd$K7wm82xzYcCKn6rZY<_zx2yle7hySo43{qUnhfYS`uyCiKgMJBqvIYg8C z7_{AhFC7k9Mjzg^RvuciYsqc24ra!5+pU;xxoLheue@$X{pm1NJL$X~o?}oK23Cvo z5;)BH!MaU}Ut0>-D_aZ`t~kKzb+?u!qlI*u6QZR$y0~FTuKkfrgdAGnJ(eEV^SqsQ zYFW(|EbZ-Ky6tt~{e6gM)q16u!9@m{+MJmH-J~UJGh3W=GgWgPv9KKjs^uLS`mmic zc=pzy*IW}?fR_7et?@0+KnKc3QW(dFfPG6WgIXSM7;)GBewT2hg%`=QwU;mV)4A(F z>ve5-s_?J;OR|RPfpuu=C)p~kGa=-Cp9)GJ;wZaE`d`zOY?i}DOsnR8_pUST$S5wR3<@@dw@2IN?t&D_38p!lOV}z zy`o)`A06RB)h=lqZ&$^+9Ef)`9e(;+;Yn|Ym>pJr8A^WzEpf! z24tH^u2st}MYiM0+GSX4cF?Hl`x5+}H34y{hEt!#2czoRV&;~zcv&$4 zZVGB-@%?glXuESpm0VfYnPT~6%sWe+35dSlWj%NF@bYNPTEm%HjLNI9n{*@SmQ*Jn zly+$k&3rC@@=CkwjDCr3?Y;rdH$WM<(MDQ$?# z_OCO6BuLEJgrOWqWeoXk&B!Sk?~Zi^mu8htv$EgI?K8oMz{%u`#3=z z_6;;vbjl+$xz}z-d!c$APey^55Z10u{|RdC-kG=HqxROF;qMsRlS?qCHJKv&j~U~} z!b06x)4NzlYtm>aAG1BjSwof6Y59~I=NDtzNjhM3#1B$$jB9xzSy#~L822{rV_}X3 z*ijezc=FU-?`gS2cJRrocvmhT8`F8JGM7_gX&_dp)3$)e-Tsu6BR_o)JJ{f^2`cm? zpiICiM|`5IRtMBu<|4MsAh1DkbHwUj5~~2;OEKU3Va7_r-Yzl<+kKig~4y zSK_IHXz&&+<8e<}_3}rS&{{Oy^r%{rpOKLjkpnL(*v#cAPBs&=nLv3RO%*sajd+|W zI0!}o<5FZMNq>J_c$hX@HR4lJN+{ODZ_DLN-GkNS;Pm6e%XJ=Mo@!9lhPK91U8b+~ zWZM@q+xK&pA^(5b4mT~I3In?$>YPBy|VBcl^?Q*6?cj~>3 zn+%Ze1uaB&QIaQ3_UPKT(z2Sm(+W+F8!^=TP9|xV4wRR#S4>29$m-^_uxH1X>3K}3LlCzOv_;iAI88?#ct zS(2pRLpvw!>WQ(=lGAia6uP`L#QGML&G&|fVYViJ)%8OKPzg|=; zxHX^0Jz%`l?&FpT-T5^(+U%E)Ocdp+G_z43KxPV$LRTrMd3mgsb6MvMMq2)NTpf3V z9#1DZExvnY_S!6=q~s>%L+w7vX`)v9Pb*$G^j-Dj@`H~PdSWxM`O@5MMM=&kD0*u^ zSyDwl8Ur#)tU#*izAbW!|1F-{EG8cdS8a7MSBastk5SeUwfFHdxLhZzPJN&@Cq6*! zAxbHScVw=-cbV5YC5+O;K*dD1CaRRp+@)!}?6{WGOaapaBYT%av8TCkU(w3VbDo6f zlS$=UA8t7HhH~k(>Ta9#95R>S^ zmGfmbKdvMrLHy{xbfg4+*(OZeEw-V4S#d(Qi5g8g?8ZtHH*iXdv3XMZApD6?4qbk zowt4BDIEUcXRv+dxenB99m@K%5<(HIiPd<^*!{i{6CCdlU~ZI7@Cm zg7Gx9y~-!yWpXnkKwg@wFpH*m*=SrK$%?a%FthzgmW?2S%Pe!(SW?#B6xsO1A2`ls zrx?ti*4p0oe-pn!%7_?f=pL^ya0@JqiDVcCqyV+p-)H68x)6e75$A2H& z2fu0>;m4=r%#`PkRT(9*ylkI)9v6S@e_{L7Gg!at?U-)88FcoHrYKTVH3@ynZPA{r zypGMsjH0v?u$q)S#T|0t&opw*+dlR5++S+VS~z5eQLEBqQZZ#MwA{j~d~O9jbL+j% z*9sOZNjn+!lD5>0xM&uksZRH)3Mr&LN?>A1y=RFFm2*zz^L25xgz6QD-t@5*9_QTom(~7}SK=VC zyVLN#lRT_%RhCQTzvfJ<>}-3ZX2z1&C=1rd?uPjG)USigGu=Q&TEXqmg=0o3hvQMJ zo{6y7b6fayk(h5ym{ep05JzES&1a%3Yonr!y3KjL7L;B`Lp3W+C(7|{b5ci*@+x`D z3lmR8j8!C6r<+ZUh_6m!4YmZ|5|r{-%az#dTpZEnhAab9n=&}FGDg2KAnZKF}`<8$(ox0&@oJ2>l6)T{q+pKN}}k!DYviB zz%*P#Ja*h?!CQ3oVH+;JExblyON&;uY2skYQbN#&`KI9ME+xgMXuUQZo=>dkoii?{IEm zX1C?gv@5omC2w9CP;@kp-Pux_9kAlJ0ZT$FjS$XyN6HF&#_eD+wnEr)JCAKnWqi#8 zHTd2NDR=5HE70=Rh7iOLavj_lt4VeIs6o^S)E$)nNZEe9F_7_#Sgmo4;s~GR8P_S9 z18tld%Ru=xi3+V+0}b({M2*7gpasK9L=~q-d&P?Q%oY(eyV_8hngL(=NS5I|YNIO4 z-i#8T1>U_YDY3$&On$%wkQAjllcTNz_v6OQhKX@nWcx0S0iZ82qKEa?b@bzy~VFB5M|6O(46JH2V-R$KRh zu+{LB_r*~ZC3mn||6@O}wVR83A4Lu|16h~-z{|f%e$losii0UJYa*m~8nwKFEYqE& zK56Z{peNY6i&QMp2uZT*P>s=LEfugL>?n?eTC89>!FWF;4P=C5TgfzS5XazaD^0L5 zZ_5h1%-FC|edS4~`9UXStZ4|J0UsH#;aM66xI(S^UCCu_T9Z3Yk!_sm^lDS6#5OT9 z@wv>;HoG0KhqPR`d~?fM25_v)TYPF%k&nk|)2N!II#OfVhl#y52#zvu%5SsoPowea zksFF+W_cbNciAB2HrV4QmQP1HxrXLCZi)-mB~P95(I*_FM|=#^2;!=P5Q`}Wj;NQs zhH?RD2MY+?K{IZt+3RUmhNa@k3~qtVE*oS;8+bg+2fIFjbD^F+=bB8M0Hx5Bq8`1mW4*d#5Ot zqRFm$07>Xqp*?sTgSjkUI z(!pj@PX#YVcibA|)Q0czWxrK|mgf?bTbA zdHHI3ay>kL8uBN{Rb+%!_Hr0zA8@Pma8d99c7ab0aJL^D{^H`J-S5z8Ao&UlM@=UN?J&huk@N$#Zb$d!jyq|Wk>mE@{j-RxmK z4?#T?l`rvWD##WmZNsLUOrPvYco3PG)4w`~Ap5Rdgr<92ot!q$lBCM?Y4p&QwAMRE z++2oj#9XQF<#VM9$FQ{E1%N6-3Zjs7O{lavbTx#0i7>0zocgWijU}> zPJUcuUcynQc+}Rg^+H(nP@I-USz+V(Q4eKU=I7Q8a5=f0k2>W)@8W@K_a!&pDrROt z`HP*FcG6JqM|Vp!j)Sn3GebAA~xuxWDX9jmxfm2`QZUMOp3`o7AtKdPJt7Hb2FclH-Z% zym@D@^m94wo~b!=Bz{-Nd8cjx%U8F*AMxwlnXlI&jduz;N54 zp&FnKY~M@BLYz66tqEyB&-j9^g6ClSjL%FKtWN= zwU(m>sORg-ON6~u>Q->oxa%ppPuesF?aS8BccSLmdm)n_nrN3tHJ`o>gkp+J`-AqF z?(zmf2DsAlY`s)nt<)NU(hkLb`$^RNXfRxd7qe|P7xi3 z(XOU4SrsJBZ^cq%qKpq}@LN@r`Hhx+d;PQw*vWTg<>;M1O|RsdaCDdTs?Oai-Z22q z;u`F7ZAF)IYujaY}?nW zv=VCiRdx7zQs69Vm#Y+nf zyaJILu6J40GIW;d(lCll3^y!Xz(8)OqZM{qCoMFrTDA&04g^$R*nl0++Db)jsaY)p z((AwZ6?(}zxG19{88sk0@a=iz8q>6GXyB{sZr>;+rTmesR6|81URfk}XAIsFA6bYh zhS9t=5Dk1oj}5FDYa`m~xa9lX#v2694&$9L!4g`(OVmU=&bl(I|RrxhL%Rv1pg2?C%nc^t6F^jfZAc5`4 z%QX>%ZbR1x&4a*14hp9+KxCOw^BO4@WuxF=J-0MwAV?|Lj6)!HxZYCc!6Tlt?lHTY zq-0kqDCw1=kWcGmN-vuJRC1ZB1vKaPP1^`=eKJ$4fdd)_Ys8poJZFX2mNwE{iG781 z&h6k9e^tevCX$$Kz`QX~$|C8I>!nO)#B5H7Xn%J m?J}SKvFXIkjOzy~0skLuA0S%=eI^|M0000AJ3O2PMD z$oLqr^>U%d=l1<#%J_z@&PKrZF1Ysc`u@@H{E623uH*YZz4w1BzW*n(@|xWGCA9Sc zMt*e9`2kdxPQ&&>|-UCa7_51w+LUsW@ZzZSW0y$)Hp~e9% zPvP|a03ks1`~K?q{u;6NC8*{AOqIUq{CL&;p56Lf$oQGq^={4hPQv)y=I|4n+?>7F zim=dxt#sqj!A8000D1Nkl*v&^&=|+Hd{KUTbfjFY149`B9Z?JA;JODI|1Ri*a+Z z^#PDGc`IecWa-9LVrC5Yc`M^4C1>fnVoIQkNbF4J1hZR{8AI(*G83SSi04gDEzE4O znmIHdWbzu!0o~cerl;1X52(&2GX1Df7)YyS+AHMCK%#EC)SIp+C1-jvkP=@8QulHV zB+{lQHJX3Uvyw@D_1H_9IT`uctkHDlK-0asdie7--IsyHF3&)stx&Ct9Qmeua`m`$ z1IdA=`>~o{yoG8o-KdZ+Zz1OT4Jo{ZAiRanxq1w|8A$TNPqy$Da<=K7F#WlDSeV?8 zf#lB(>8dy1Ep~k%aVIKtnSU;n%Nh~QzJ<8n^qPMH(P-24A5=>a*R9#QvjzF8n%@1N zw@?CG@6(%>+-0ASK~jEmCV|&a*7-GKT72W<(TbSjf)&Eme6nGE>Gkj4Sq&2e+-G%| z+NM8OOm5zVl9{Z8Dd8A5z3y8mZ=4Bv4%>as_{9cN#bm~;h>62(dqY93Zy}v&c4n($ zVv&CoG~?z9=}cy1a%8Rynx7Bl=Qq8Hv#GCWpDl%I%)DgQtB?d}0E$dW)pQ*y)z&k{ zb*A3**JaZQm{=yp%~uZ`NX<0e4n?NaRx{%bH(iIajGNvnpxOy0%)jxXEG1&U%R}*0(7v|MOC;<~= zXCjn3}VQ-`MO)Jy?KTrtggxbyx9Bv2-SZ99MS z!MEEWV<3%y54UX0x5MHm2wJEBcyw!R)65*VuiPVt3L{i8$K!SsxdDB13e}h|#znim zfX4XFr-+nlMNQ0I1?^Q(${4-OViN1!6d z)+2K|9S)V#DX6HR$b2@N72{Kia9!*mQDq&n2{r`j};V| zuV%_wsP!zB?m%;FeaRe+X47K0e+KE!8C{gAWF8)lCd1u1%~|M!XNRvwvtqy3iz0WS zpWdhn6$hP8PaRBmp)q`#PCA`Vd#Tc$@f1tAcM>f_I@bC)hkI9|o(Iqvo}PPwx_d@r z;T5#w0aR`MiTh`C0rj9v-ax%+eePZBBRe#A0@~{sqCR=@13&;#uuS&+c?p6TD&YIC z+e`8i|D*o={t84pkFEFN*8wW1NMd^gIaE Date: Sun, 7 Dec 2025 16:25:52 +0300 Subject: [PATCH 18/22] Allergies list implemented --- .../authentication/authentication_repo.dart | 8 +- .../get_allergies_response_model.dart | 37 +++++ .../medical_file/medical_file_repo.dart | 41 ++++++ .../medical_file/medical_file_view_model.dart | 32 ++++ .../allergies/allergies_list_page.dart | 138 ++++++++++++++++++ .../medical_file/medical_file_page.dart | 10 +- 6 files changed, 261 insertions(+), 5 deletions(-) create mode 100644 lib/features/book_appointments/models/resp_models/get_allergies_response_model.dart create mode 100644 lib/presentation/allergies/allergies_list_page.dart diff --git a/lib/features/authentication/authentication_repo.dart b/lib/features/authentication/authentication_repo.dart index 6ecf4b1..3194ad7 100644 --- a/lib/features/authentication/authentication_repo.dart +++ b/lib/features/authentication/authentication_repo.dart @@ -266,10 +266,10 @@ class AuthenticationRepoImp implements AuthenticationRepo { newRequest.forRegisteration = newRequest.isRegister ?? false; newRequest.isRegister = false; //silent login case removed token and login token - if(newRequest.logInTokenID.isEmpty && newRequest.isSilentLogin == true) { - newRequest.logInTokenID = null; - newRequest.deviceToken = null; - } + // if(newRequest.logInTokenID.isEmpty && newRequest.isSilentLogin == true) { + // newRequest.logInTokenID = null; + // newRequest.deviceToken = null; + // } } diff --git a/lib/features/book_appointments/models/resp_models/get_allergies_response_model.dart b/lib/features/book_appointments/models/resp_models/get_allergies_response_model.dart new file mode 100644 index 0000000..cd4802f --- /dev/null +++ b/lib/features/book_appointments/models/resp_models/get_allergies_response_model.dart @@ -0,0 +1,37 @@ +class GetAllergiesResponseModel { + int? patientID; + int? allergyDiseaseType; + int? allergyDiseaseID; + String? description; + String? descriptionN; + String? remarks; + + GetAllergiesResponseModel({ + this.patientID, + this.allergyDiseaseType, + this.allergyDiseaseID, + this.description, + this.descriptionN, + this.remarks, + }); + + GetAllergiesResponseModel.fromJson(Map json) { + patientID = json['PatientID']; + allergyDiseaseType = json['AllergyDiseaseType']; + allergyDiseaseID = json['AllergyDiseaseID']; + description = json['Description']; + descriptionN = json['DescriptionN']; + remarks = json['Remarks']; + } + + Map toJson() { + final Map data = new Map(); + data['PatientID'] = this.patientID; + data['AllergyDiseaseType'] = this.allergyDiseaseType; + data['AllergyDiseaseID'] = this.allergyDiseaseID; + data['Description'] = this.description; + data['DescriptionN'] = this.descriptionN; + data['Remarks'] = this.remarks; + return data; + } +} diff --git a/lib/features/medical_file/medical_file_repo.dart b/lib/features/medical_file/medical_file_repo.dart index ab09ca6..bf10e9e 100644 --- a/lib/features/medical_file/medical_file_repo.dart +++ b/lib/features/medical_file/medical_file_repo.dart @@ -5,6 +5,7 @@ import 'package:hmg_patient_app_new/core/common_models/generic_api_model.dart'; import 'package:hmg_patient_app_new/core/exceptions/api_failure.dart'; import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; +import 'package:hmg_patient_app_new/features/book_appointments/models/resp_models/get_allergies_response_model.dart'; import 'package:hmg_patient_app_new/features/medical_file/models/patient_medical_response_model.dart'; import 'package:hmg_patient_app_new/features/medical_file/models/patient_sickleave_response_model.dart'; import 'package:hmg_patient_app_new/features/medical_file/models/patient_vaccine_response_model.dart'; @@ -38,6 +39,8 @@ abstract class MedicalFileRepo { Future>> removeFamilyFile({required int? id}); Future>> acceptRejectFamilyFile({required int? id, required int? status}); + + Future>>> getPatientAllergiesList({Function(dynamic)? onSuccess, Function(String)? onError}); } class MedicalFileRepoImp implements MedicalFileRepo { @@ -549,4 +552,42 @@ class MedicalFileRepoImp implements MedicalFileRepo { return Left(UnknownFailure(e.toString())); } } + + @override + Future>>> getPatientAllergiesList({Function(dynamic)? onSuccess, Function(String)? onError}) async { + Map mapDevice = {"isDentalAllowedBackend": false, "OutSA": 0}; + + try { + GenericApiModel>? apiResponse; + Failure? failure; + await apiClient.post( + GET_PATIENT_ALLERGIES, + body: mapDevice, + onFailure: (error, statusCode, {messageStatus, failureType}) { + failure = failureType; + }, + onSuccess: (response, statusCode, {messageStatus, errorMessage}) { + try { + final list = response['Patient_Allergies']; + + final vaccinesList = list.map((item) => GetAllergiesResponseModel.fromJson(item as Map)).toList().cast(); + + apiResponse = GenericApiModel>( + messageStatus: messageStatus, + statusCode: statusCode, + errorMessage: null, + data: vaccinesList, + ); + } catch (e) { + failure = DataParsingFailure(e.toString()); + } + }, + ); + if (failure != null) return Left(failure!); + if (apiResponse == null) return Left(ServerFailure("Unknown error")); + return Right(apiResponse!); + } catch (e) { + return Left(UnknownFailure(e.toString())); + } + } } diff --git a/lib/features/medical_file/medical_file_view_model.dart b/lib/features/medical_file/medical_file_view_model.dart index 4b5a14c..9ccc735 100644 --- a/lib/features/medical_file/medical_file_view_model.dart +++ b/lib/features/medical_file/medical_file_view_model.dart @@ -9,6 +9,7 @@ import 'package:hmg_patient_app_new/core/utils/request_utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart'; import 'package:hmg_patient_app_new/features/authentication/models/resp_models/authenticated_user_resp_model.dart'; +import 'package:hmg_patient_app_new/features/book_appointments/models/resp_models/get_allergies_response_model.dart'; import 'package:hmg_patient_app_new/features/common/models/family_file_request.dart'; import 'package:hmg_patient_app_new/features/medical_file/medical_file_repo.dart'; import 'package:hmg_patient_app_new/features/medical_file/models/family_file_response_model.dart'; @@ -27,6 +28,7 @@ class MedicalFileViewModel extends ChangeNotifier { bool isPatientSickLeaveListLoading = false; bool isPatientSickLeavePDFLoading = false; bool isPatientMedicalReportsListLoading = false; + bool isPatientAllergiesListLoading = false; MedicalFileRepo medicalFileRepo; ErrorHandlerService errorHandlerService; @@ -34,6 +36,8 @@ class MedicalFileViewModel extends ChangeNotifier { List patientVaccineList = []; List patientSickLeaveList = []; + List patientAllergiesList = []; + List patientMedicalReportList = []; List patientMedicalReportRequestedList = []; @@ -69,8 +73,10 @@ class MedicalFileViewModel extends ChangeNotifier { initMedicalFileProvider() { patientMedicalReportAppointmentHistoryList.clear(); + patientAllergiesList.clear(); isPatientVaccineListLoading = true; isPatientMedicalReportsListLoading = true; + isPatientAllergiesListLoading = true; notifyListeners(); } @@ -162,6 +168,32 @@ class MedicalFileViewModel extends ChangeNotifier { ); } + Future getPatientAllergiesList({Function(dynamic)? onSuccess, Function(String)? onError}) async { + isPatientAllergiesListLoading = true; + patientAllergiesList.clear(); + notifyListeners(); + final result = await medicalFileRepo.getPatientAllergiesList(); + + result.fold( + (failure) async { + isPatientAllergiesListLoading = false; + notifyListeners(); + }, + (apiResponse) { + if (apiResponse.messageStatus == 2) { + // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {}); + } else if (apiResponse.messageStatus == 1) { + patientAllergiesList = apiResponse.data!; + isPatientAllergiesListLoading = false; + notifyListeners(); + if (onSuccess != null) { + onSuccess(apiResponse); + } + } + }, + ); + } + Future getPatientSickLeaveList({Function(dynamic)? onSuccess, Function(String)? onError}) async { patientSickLeaveList.clear(); final result = await medicalFileRepo.getPatientSickLeavesList(); diff --git a/lib/presentation/allergies/allergies_list_page.dart b/lib/presentation/allergies/allergies_list_page.dart new file mode 100644 index 0000000..efcdd0a --- /dev/null +++ b/lib/presentation/allergies/allergies_list_page.dart @@ -0,0 +1,138 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; +import 'package:hmg_patient_app_new/core/app_assets.dart'; +import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/core/utils/utils.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; +import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/features/medical_file/medical_file_view_model.dart'; +import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; +import 'package:hmg_patient_app_new/theme/colors.dart'; +import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; +import 'package:provider/provider.dart'; + +class AllergiesListPage extends StatelessWidget { + AllergiesListPage({super.key}); + + late MedicalFileViewModel medicalFileViewModel; + + @override + Widget build(BuildContext context) { + medicalFileViewModel = Provider.of(context, listen: false); + return Scaffold( + backgroundColor: AppColors.bgScaffoldColor, + body: CollapsingListView( + title: LocaleKeys.allergies.tr(), + child: SingleChildScrollView( + child: Consumer(builder: (context, medicalFileVM, child) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox(height: 16.h), + ListView.separated( + scrollDirection: Axis.vertical, + itemCount: medicalFileVM.isPatientAllergiesListLoading + ? 5 + : medicalFileVM.patientAllergiesList.isNotEmpty + ? medicalFileVM.patientAllergiesList.length + : 1, + shrinkWrap: true, + physics: NeverScrollableScrollPhysics(), + padding: EdgeInsets.only(left: 24.h, right: 24.h), + itemBuilder: (context, index) { + return medicalFileVM.isPatientAllergiesListLoading + ? Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: true, + ), + child: Padding( + padding: EdgeInsets.all(14.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Utils.buildSvgWithAssets(icon: AppAssets.allergy_info_icon, width: 36.w, height: 36.h, fit: BoxFit.contain).toShimmer2(isShow: true), + SizedBox(width: 16.h), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + "Dr John Smith".toText16(isBold: true).toShimmer2(isShow: true), + SizedBox(height: 8.h), + Wrap( + direction: Axis.horizontal, + spacing: 3.h, + runSpacing: 4.h, + children: [ + // AppCustomChipWidget(labelText: "").toShimmer2(isShow: true, width: 16.h), + // AppCustomChipWidget(labelText: "").toShimmer2(isShow: true, width: 16.h), + ], + ), + ], + ), + ), + ], + ), + ], + ), + ), + ) + : medicalFileVM.patientAllergiesList.isNotEmpty + ? AnimationConfiguration.staggeredList( + position: index, + duration: const Duration(milliseconds: 1000), + child: SlideAnimation( + verticalOffset: 100.0, + child: FadeInAnimation( + child: Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: false, + ), + child: Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Utils.buildSvgWithAssets(icon: AppAssets.allergy_info_icon, width: 36.w, height: 36.h, fit: BoxFit.contain), + SizedBox(height: 16.h), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + (medicalFileVM.patientAllergiesList[index].description).toString().toText16(isBold: true).toShimmer2(isShow: false), + (medicalFileVM.patientAllergiesList[index].remarks).toString().toText12(), + ], + ), + ), + ], + ), + ], + ), + ), + ), + ), + ), + ) + : Utils.getNoDataWidget(context, noDataText: "No allergies data found...".needTranslation); + }, + separatorBuilder: (BuildContext cxt, int index) => SizedBox(height: 16.h), + ), + SizedBox(height: 60.h), + ], + ); + }), + ), + ), + ); + } +} diff --git a/lib/presentation/medical_file/medical_file_page.dart b/lib/presentation/medical_file/medical_file_page.dart index 7b5341c..a21e848 100644 --- a/lib/presentation/medical_file/medical_file_page.dart +++ b/lib/presentation/medical_file/medical_file_page.dart @@ -24,6 +24,7 @@ import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/ import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart'; import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_view_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; +import 'package:hmg_patient_app_new/presentation/allergies/allergies_list_page.dart'; import 'package:hmg_patient_app_new/presentation/appointments/my_appointments_page.dart'; import 'package:hmg_patient_app_new/presentation/appointments/my_doctors_page.dart'; import 'package:hmg_patient_app_new/presentation/appointments/widgets/ask_doctor_request_type_select.dart'; @@ -801,7 +802,14 @@ class _MedicalFilePageState extends State { svgIcon: AppAssets.allergy_info_icon, isLargeText: true, iconSize: 36.w, - ), + ).onPress(() { + medicalFileViewModel.getPatientAllergiesList(); + Navigator.of(context).push( + CustomPageRoute( + page: AllergiesListPage(), + ), + ); + }), MedicalFileCard( label: "Vaccine Info".needTranslation, textColor: AppColors.blackColor, From 19365375f610de991decc1e205f12a9a3e2dce15 Mon Sep 17 00:00:00 2001 From: aamir-csol Date: Mon, 8 Dec 2025 10:11:13 +0300 Subject: [PATCH 19/22] medical file changes --- .../medical_file/medical_file_page.dart | 223 ++++++++----- .../medical_file/widgets/lab_rad_card.dart | 73 +++-- lib/widgets/expandable_list_widget.dart | 301 ++++++++++++++++++ 3 files changed, 478 insertions(+), 119 deletions(-) create mode 100644 lib/widgets/expandable_list_widget.dart diff --git a/lib/presentation/medical_file/medical_file_page.dart b/lib/presentation/medical_file/medical_file_page.dart index 883ca37..e1d4ce7 100644 --- a/lib/presentation/medical_file/medical_file_page.dart +++ b/lib/presentation/medical_file/medical_file_page.dart @@ -53,6 +53,7 @@ import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart'; import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; import 'package:hmg_patient_app_new/widgets/custom_tab_bar.dart'; +import 'package:hmg_patient_app_new/widgets/expandable_list_widget.dart'; import 'package:hmg_patient_app_new/widgets/input_widget.dart'; import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; @@ -148,20 +149,6 @@ class _MedicalFilePageState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - SizedBox(height: 16.h), - TextInputWidget( - labelText: LocaleKeys.search.tr(context: context), - hintText: "Type any record".needTranslation, - controller: TextEditingController(), - keyboardType: TextInputType.number, - isEnable: true, - prefix: null, - autoFocus: false, - isBorderAllowed: false, - isAllowLeadingIcon: true, - padding: EdgeInsets.symmetric(vertical: 8.h, horizontal: 8.h), - leadingIcon: AppAssets.student_card, - ).paddingSymmetrical(24.w, 0.0), SizedBox(height: 16.h), Container( width: double.infinity, @@ -236,8 +223,7 @@ class _MedicalFilePageState extends State { iconColor: insuranceVM.isInsuranceExpired ? AppColors.primaryRedColor : AppColors.successColor, textColor: insuranceVM.isInsuranceExpired ? AppColors.primaryRedColor : AppColors.successColor, iconSize: 12.w, - backgroundColor: - insuranceVM.isInsuranceExpired ? AppColors.primaryRedColor.withOpacity(0.1) : AppColors.successColor.withOpacity(0.1), + backgroundColor: insuranceVM.isInsuranceExpired ? AppColors.primaryRedColor.withOpacity(0.1) : AppColors.successColor.withOpacity(0.1), labelPadding: EdgeInsetsDirectional.only(end: 8.w), ); }), @@ -248,27 +234,108 @@ class _MedicalFilePageState extends State { ), ).paddingSymmetrical(24.w, 0.0), SizedBox(height: 16.h), - Consumer(builder: (context, medicalFileVM, child) { - return Column( - children: [ - CustomTabBar( - activeTextColor: AppColors.primaryRedColor, - activeBackgroundColor: AppColors.primaryRedColor.withValues(alpha: .1), - tabs: [ - CustomTabBarModel(AppAssets.myFilesBottom, LocaleKeys.general.tr(context: context).needTranslation), - CustomTabBarModel(AppAssets.insurance, LocaleKeys.insurance.tr(context: context)), - CustomTabBarModel(AppAssets.requests, LocaleKeys.request.tr(context: context).needTranslation), - CustomTabBarModel(AppAssets.more, "More".needTranslation), - ], - onTabChange: (index) { - medicalFileVM.onTabChanged(index); - }, - ).paddingSymmetrical(24.w, 0.0), - SizedBox(height: 24.h), - getSelectedTabData(medicalFileVM.selectedTabIndex), - ], - ); - }), + TextInputWidget( + labelText: LocaleKeys.search.tr(context: context), + hintText: "Type any record".needTranslation, + controller: TextEditingController(), + keyboardType: TextInputType.number, + isEnable: true, + prefix: null, + autoFocus: false, + isBorderAllowed: false, + isAllowLeadingIcon: true, + padding: EdgeInsets.symmetric(vertical: 8.h, horizontal: 8.h), + leadingIcon: AppAssets.student_card, + ).paddingSymmetrical(24.w, 0.0), + SizedBox(height: 16.h), + // Using CustomExpandableList + CustomExpandableList( + expansionMode: ExpansionMode.exactlyOne, + dividerColor: Color(0xFF2B353E1A), + + items: [ + ExpandableListItem( + title: "Medical Services".toText20(weight: FontWeight.w500), + children: [ + SizedBox(height: 10.h), + getSelectedTabData(0), + ], + ), + ExpandableListItem( + title: "Medical Reports".toText20( + weight: FontWeight.w500, + ), + children: [ + SizedBox(height: 10.h), + getSelectedTabData(2), + ]), + ExpandableListItem( + title: "Insurance & Payments".toText20(weight: FontWeight.w500), + children: [ + SizedBox(height: 10.h), + getSelectedTabData(1), + ], + ), + ExpandableListItem( + title: "Tracker & Others".toText20(weight: FontWeight.w500), + children: [ + Text("Blood Report"), + SizedBox(height: 8), + Text("X-Ray Report"), + ], + ), + ], + theme: ExpandableListTheme.custom( + defaultTrailingIcon: Utils.buildSvgWithAssets(icon: AppAssets.arrow_down, height: 22.h, width: 22.w, iconColor: AppColors.textColor), + ), + ).paddingSymmetrical(16.w, 0.0), + + // ExpansionTileList( + // shrinkWrap: true, + // trailing: Icon(Icons.arrow_drop_down), + // expansionMode: ExpansionMode.exactlyOne, + // children: [ + // ExpansionTile( + // title: "Medical Services".toText20(weight: FontWeight.w600, color: AppColors.textColor), + // iconColor: Color(0xFF2E3039), + // trailing: Utils.buildSvgWithAssets(icon: AppAssets.arrow_down, height: 22.h, width: 22.w), + // children: [Text('Child 1')], + // ), + // ExpansionTile( + // title: "Medical Reports".toText20(weight: FontWeight.w600, color: AppColors.textColor), + // children: [Text('Child 2')], + // ), + // ExpansionTile( + // title: "Insurance & Payments".toText20(weight: FontWeight.w600, color: AppColors.textColor), + // children: [Text('Child 3')], + // ), + // ExpansionTile( + // title: "Tracker & Others".toText20(weight: FontWeight.w600, color: AppColors.textColor), + // children: [Text('Child 4')], + // ), + // ], + // ), + // Consumer(builder: (context, medicalFileVM, child) { + // return Column( + // children: [ + // CustomTabBar( + // activeTextColor: AppColors.primaryRedColor, + // activeBackgroundColor: AppColors.primaryRedColor.withValues(alpha: .1), + // tabs: [ + // CustomTabBarModel(AppAssets.myFilesBottom, LocaleKeys.general.tr(context: context).needTranslation), + // CustomTabBarModel(AppAssets.insurance, LocaleKeys.insurance.tr(context: context)), + // CustomTabBarModel(AppAssets.requests, LocaleKeys.request.tr(context: context).needTranslation), + // CustomTabBarModel(AppAssets.more, "More".needTranslation), + // ], + // onTabChange: (index) { + // medicalFileVM.onTabChanged(index); + // }, + // ).paddingSymmetrical(24.w, 0.0), + // SizedBox(height: 24.h), + // getSelectedTabData(medicalFileVM.selectedTabIndex), + // ], + // ); + // }), ], ), ); @@ -324,7 +391,7 @@ class _MedicalFilePageState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - "Appointments & visits".needTranslation.toText18(isBold: true), + "Appointments & visits".needTranslation.toText16(weight: FontWeight.w500, letterSpacing: -0.2), Row( children: [ LocaleKeys.viewAll.tr().toText12(color: AppColors.primaryRedColor, fontWeight: FontWeight.w500), @@ -333,7 +400,7 @@ class _MedicalFilePageState extends State { ], ), ], - ).paddingSymmetrical(24.w, 0.h).onPress(() { + ).paddingSymmetrical(0.w, 0.h).onPress(() { Navigator.of(context).push( CustomPageRoute( page: MyAppointmentsPage(), @@ -356,8 +423,7 @@ class _MedicalFilePageState extends State { ? Container( padding: EdgeInsets.all(12.w), width: MediaQuery.of(context).size.width, - decoration: - RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 12.r, hasShadow: true), + decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 12.r, hasShadow: true), child: Column( children: [ Utils.buildSvgWithAssets(icon: AppAssets.home_calendar_icon, width: 32.h, height: 32.h), @@ -415,10 +481,10 @@ class _MedicalFilePageState extends State { }, separatorBuilder: (BuildContext cxt, int index) => SizedBox(width: 12.h), ), - ).paddingSymmetrical(24.w, 0); + ).paddingSymmetrical(0.w, 0); }), SizedBox(height: 24.h), - "Lab & Radiology".needTranslation.toText18(isBold: true).paddingSymmetrical(24.w, 0.h), + "Lab & Radiology".needTranslation.toText16(weight: FontWeight.w500, letterSpacing: -0.2), SizedBox(height: 16.h), Row( children: [ @@ -437,11 +503,12 @@ class _MedicalFilePageState extends State { ); }), ), - SizedBox(width: 16.h), + SizedBox(width: 8.w), Expanded( child: LabRadCard( icon: AppAssets.radiology_icon, - labelText: LocaleKeys.radiology.tr(context: context), + labelText: "${LocaleKeys.radiology.tr(context: context)} Results".needTranslation, + // labOrderTests: ["Complete blood count", "Creatinine", "Blood Sugar", // labOrderTests: ["Chest X-ray", "Abdominal Ultrasound", "Dental X-ray"], labOrderTests: [], isLoading: false, @@ -454,13 +521,13 @@ class _MedicalFilePageState extends State { }), ), ], - ).paddingSymmetrical(24.w, 0.h), + ).paddingSymmetrical(0.w, 0.h), SizedBox(height: 24.h), - "Active Medications & Prescriptions".needTranslation.toText18(isBold: true).paddingSymmetrical(24.w, 0.h), + "Active Medications & Prescriptions".needTranslation.toText16(weight: FontWeight.w500, letterSpacing: -0.2), SizedBox(height: 16.h), Consumer(builder: (context, prescriptionVM, child) { return prescriptionVM.isPrescriptionsOrdersLoading - ? const CommonShimmerWidget().paddingSymmetrical(24.w, 0.h) + ? const CommonShimmerWidget().paddingSymmetrical(0.w, 0.h) : prescriptionVM.patientPrescriptionOrders.isNotEmpty ? Container( decoration: RoundedRectangleBorder().toSmoothCornerDecoration( @@ -503,13 +570,11 @@ class _MedicalFilePageState extends State { spacing: 3.w, runSpacing: 4.w, children: [ - AppCustomChipWidget( - labelText: prescriptionVM.patientPrescriptionOrders[index].clinicDescription!), + AppCustomChipWidget(labelText: prescriptionVM.patientPrescriptionOrders[index].clinicDescription!), AppCustomChipWidget( icon: AppAssets.doctor_calendar_icon, labelText: DateUtil.formatDateToDate( - DateUtil.convertStringToDate( - prescriptionVM.patientPrescriptionOrders[index].appointmentDate), + DateUtil.convertStringToDate(prescriptionVM.patientPrescriptionOrders[index].appointmentDate), false, ), ), @@ -522,19 +587,13 @@ class _MedicalFilePageState extends State { Transform.flip( flipX: appState.isArabic(), child: Utils.buildSvgWithAssets( - icon: AppAssets.forward_arrow_icon_small, - width: 15.w, - height: 15.h, - fit: BoxFit.contain, - iconColor: AppColors.textColor)), + icon: AppAssets.forward_arrow_icon_small, width: 15.w, height: 15.h, fit: BoxFit.contain, iconColor: AppColors.textColor)), ], ).onPress(() { prescriptionVM.setPrescriptionsDetailsLoading(); Navigator.of(context).push( CustomPageRoute( - page: PrescriptionDetailPage( - isFromAppointments: false, - prescriptionsResponseModel: prescriptionVM.patientPrescriptionOrders[index]), + page: PrescriptionDetailPage(isFromAppointments: false, prescriptionsResponseModel: prescriptionVM.patientPrescriptionOrders[index]), ), ); }), @@ -607,14 +666,14 @@ class _MedicalFilePageState extends State { width: 62.w, height: 62.h, ), - ).paddingSymmetrical(24.w, 0.h); + ).paddingSymmetrical(0.w, 0.h); }), SizedBox(height: 24.h), //My Doctor Section Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - LocaleKeys.myDoctor.tr(context: context).toText18(isBold: true), + LocaleKeys.myDoctor.tr(context: context).toText16(weight: FontWeight.w500, letterSpacing: -0.2), Row( children: [ LocaleKeys.viewAll.tr().toText12(color: AppColors.primaryRedColor, fontWeight: FontWeight.w500), @@ -630,7 +689,7 @@ class _MedicalFilePageState extends State { ); }), ], - ).paddingSymmetrical(24.w, 0.h), + ).paddingSymmetrical(0.w, 0.h), SizedBox(height: 16.h), Consumer(builder: (context, myAppointmentsVM, child) { return myAppointmentsVM.isPatientMyDoctorsLoading @@ -644,10 +703,7 @@ class _MedicalFilePageState extends State { fit: BoxFit.cover, ).circle(100).toShimmer2(isShow: true, radius: 50.r), SizedBox(height: 8.h), - ("Dr. John Smith Smith Smith") - .toString() - .toText12(fontWeight: FontWeight.w500, isCenter: true, maxLine: 2) - .toShimmer2(isShow: true), + ("Dr. John Smith Smith Smith").toString().toText12(fontWeight: FontWeight.w500, isCenter: true, maxLine: 2).toShimmer2(isShow: true), ], ) : myAppointmentsVM.patientMyDoctorsList.isEmpty @@ -665,7 +721,7 @@ class _MedicalFilePageState extends State { width: 62.w, height: 62.h, ), - ).paddingSymmetrical(24.w, 0.h) + ).paddingSymmetrical(0.w, 0.h) : SizedBox( height: 100.h, child: ListView.separated( @@ -730,10 +786,10 @@ class _MedicalFilePageState extends State { }, separatorBuilder: (BuildContext cxt, int index) => SizedBox(width: 8.h), ), - ).paddingSymmetrical(24.w, 0); + ).paddingSymmetrical(0.w, 0); }), SizedBox(height: 24.h), - "Others".needTranslation.toText18(isBold: true).paddingSymmetrical(24.w, 0.h), + "Others".needTranslation.toText16(weight: FontWeight.w500, letterSpacing: -0.2), SizedBox(height: 16.h), GridView( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( @@ -786,7 +842,7 @@ class _MedicalFilePageState extends State { ); }), ], - ).paddingSymmetrical(24.w, 0.0), + ).paddingSymmetrical(0.w, 0.0), SizedBox(height: 24.h), ], ); @@ -801,7 +857,7 @@ class _MedicalFilePageState extends State { labOrder: null, index: index, isLoading: true, - ).paddingSymmetrical(24.w, 0.0) + ).paddingSymmetrical(0.w, 0.0) : insuranceVM.patientInsuranceList.isNotEmpty ? PatientInsuranceCard( insuranceCardDetailsModel: insuranceVM.patientInsuranceList.first, @@ -828,14 +884,9 @@ class _MedicalFilePageState extends State { text: "${LocaleKeys.updateInsurance.tr(context: context)} ${LocaleKeys.updateInsuranceSubtitle.tr(context: context)}", onPressed: () { insuranceViewModel.setIsInsuranceUpdateDetailsLoading(true); - insuranceViewModel.getPatientInsuranceDetailsForUpdate(appState.getAuthenticatedUser()!.patientId.toString(), - appState.getAuthenticatedUser()!.patientIdentificationNo.toString()); - showCommonBottomSheetWithoutHeight(context, - child: PatientInsuranceCardUpdateCard(), - callBackFunc: () {}, - title: "", - isCloseButtonVisible: false, - isFullScreen: false); + insuranceViewModel.getPatientInsuranceDetailsForUpdate( + appState.getAuthenticatedUser()!.patientId.toString(), appState.getAuthenticatedUser()!.patientIdentificationNo.toString()); + showCommonBottomSheetWithoutHeight(context, child: PatientInsuranceCardUpdateCard(), callBackFunc: () {}, title: "", isCloseButtonVisible: false, isFullScreen: false); }, backgroundColor: AppColors.bgGreenColor.withOpacity(0.20), borderColor: AppColors.bgGreenColor.withOpacity(0.0), @@ -847,7 +898,7 @@ class _MedicalFilePageState extends State { height: isFoldable ? 50.h : 40.h, ).paddingOnly(left: 12.w, right: 12.w, bottom: 12.h), ), - ).paddingSymmetrical(24.w, 0.h); + ).paddingSymmetrical(0.w, 0.h); }), SizedBox(height: 10.h), GridView( @@ -902,7 +953,7 @@ class _MedicalFilePageState extends State { iconSize: 36.w, ), ], - ).paddingSymmetrical(24.w, 0.0), + ).paddingSymmetrical(0.w, 0.0), SizedBox(height: 16.h), ], ); @@ -915,12 +966,12 @@ class _MedicalFilePageState extends State { ? PatientSickLeaveCard( patientSickLeavesResponseModel: PatientSickLeavesResponseModel(), isLoading: true, - ).paddingSymmetrical(24.w, 0.0) + ).paddingSymmetrical(0.w, 0.0) : medicalFileVM.patientSickLeaveList.isNotEmpty ? PatientSickLeaveCard( patientSickLeavesResponseModel: medicalFileVM.patientSickLeaveList.first, isLoading: false, - ).paddingSymmetrical(24.w, 0.0) + ).paddingSymmetrical(0.w, 0.0) : Container( decoration: RoundedRectangleBorder().toSmoothCornerDecoration( color: AppColors.whiteColor, @@ -934,7 +985,7 @@ class _MedicalFilePageState extends State { width: 62.w, height: 62.h, ), - ).paddingSymmetrical(24.w, 0.h); + ).paddingSymmetrical(0.w, 0.h); }), SizedBox(height: 16.h), GridView( @@ -987,7 +1038,7 @@ class _MedicalFilePageState extends State { ); }), ], - ).paddingSymmetrical(24.w, 0.0), + ).paddingSymmetrical(0.w, 0.0), SizedBox(height: 24.h), ], ); diff --git a/lib/presentation/medical_file/widgets/lab_rad_card.dart b/lib/presentation/medical_file/widgets/lab_rad_card.dart index 1a56baf..eef73eb 100644 --- a/lib/presentation/medical_file/widgets/lab_rad_card.dart +++ b/lib/presentation/medical_file/widgets/lab_rad_card.dart @@ -27,55 +27,62 @@ class LabRadCard extends StatelessWidget { Widget build(BuildContext context) { AppState appState = getIt.get(); return Container( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 12.r, hasShadow: false), + decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 18.r, hasShadow: false), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( + mainAxisAlignment: MainAxisAlignment.start, children: [ Utils.buildSvgWithAssets( icon: icon, width: 40.w, height: 40.h, - fit: BoxFit.contain, + fit: BoxFit.cover, ).toShimmer2(isShow: false, radius: 12.r), SizedBox(width: 8.w), - Flexible(child: labelText.toText14(isBold: true).toShimmer2(isShow: false, radius: 6.r, height: 32.h)), - ], - ), - SizedBox(height: 16.h), - labOrderTests.isNotEmpty - ? ListView.separated( - scrollDirection: Axis.vertical, - padding: EdgeInsets.zero, - physics: NeverScrollableScrollPhysics(), - shrinkWrap: true, - itemBuilder: (cxt, index) { - return labOrderTests[index] - .toText12(isBold: true, maxLine: 1) - .toShimmer2(isShow: false, radius: 6.r, height: 24.h, width: 120.w) - .toShimmer2(isShow: isLoading); - }, - separatorBuilder: (cxt, index) => SizedBox(height: 8.h), - itemCount: 3, - ) - : "You don't have any records yet".needTranslation.toText13( - color: AppColors.greyTextColor, isCenter: true), - SizedBox(height: 16.h), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - SizedBox.shrink(), + Flexible( + child: labelText.toText12(isBold: true, maxLine: 2), + ), Transform.flip( flipX: appState.isArabic(), - child: Utils.buildSvgWithAssets( - icon: AppAssets.forward_arrow_icon_small, width: 15.w, height: 15.h, fit: BoxFit.contain, iconColor: AppColors.textColor) - .toShimmer2(isShow: false, radius: 12.r), + child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon_small, width: 10.w, height: 10.h, fit: BoxFit.contain, iconColor: AppColors.textColor), ), ], - ) + ), + // SizedBox(height: 16.h), + // labOrderTests.isNotEmpty + // ? ListView.separated( + // scrollDirection: Axis.vertical, + // padding: EdgeInsets.zero, + // physics: NeverScrollableScrollPhysics(), + // shrinkWrap: true, + // itemBuilder: (cxt, index) { + // return labOrderTests[index] + // .toText12(isBold: true, maxLine: 1) + // .toShimmer2(isShow: false, radius: 6.r, height: 24.h, width: 120.w) + // .toShimmer2(isShow: isLoading); + // }, + // separatorBuilder: (cxt, index) => SizedBox(height: 8.h), + // itemCount: 3, + // ) + // : "You don't have any records yet".needTranslation.toText13( + // color: AppColors.greyTextColor, isCenter: true), + // SizedBox(height: 16.h), + // Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // SizedBox.shrink(), + // Transform.flip( + // flipX: appState.isArabic(), + // child: Utils.buildSvgWithAssets( + // icon: AppAssets.forward_arrow_icon_small, width: 15.w, height: 15.h, fit: BoxFit.contain, iconColor: AppColors.textColor) + // .toShimmer2(isShow: false, radius: 12.r), + // ), + // ], + // ) ], - ).paddingAll(16.w), + ).paddingAll(12.w), ); } } diff --git a/lib/widgets/expandable_list_widget.dart b/lib/widgets/expandable_list_widget.dart new file mode 100644 index 0000000..21bbdf6 --- /dev/null +++ b/lib/widgets/expandable_list_widget.dart @@ -0,0 +1,301 @@ +import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; + +// ==================== MAIN CUSTOM WIDGET ==================== + +class CustomExpandableList extends StatefulWidget { + final List items; + final ExpansionMode expansionMode; + final EdgeInsetsGeometry? itemPadding; + final EdgeInsetsGeometry? contentPadding; + final Color? dividerColor; + final double dividerHeight; + final bool showDividers; + final Duration animationDuration; + final Curve animationCurve; + final ExpandableListTheme? theme; + final Function(int index, bool isExpanded)? onItemToggled; + + const CustomExpandableList({ + Key? key, + required this.items, + this.expansionMode = ExpansionMode.multiple, + this.itemPadding, + this.contentPadding, + this.dividerColor, + this.dividerHeight = 1.0, + this.showDividers = true, + this.animationDuration = const Duration(milliseconds: 300), + this.animationCurve = Curves.easeInOut, + this.theme, + this.onItemToggled, + }) : super(key: key); + + @override + _CustomExpandableListState createState() => _CustomExpandableListState(); +} + +class _CustomExpandableListState extends State { + late List _expandedStates; + + @override + void initState() { + super.initState(); + _expandedStates = List.generate( + widget.items.length, + (index) => widget.items[index].initiallyExpanded, + ); + } + + void _toggleItem(int index) { + setState(() { + if (widget.expansionMode == ExpansionMode.exactlyOne) { + // Close all others, open this one + for (int i = 0; i < _expandedStates.length; i++) { + _expandedStates[i] = (i == index) ? !_expandedStates[i] : false; + } + } else if (widget.expansionMode == ExpansionMode.atMostOne) { + // Toggle this one, close if opening another + bool wasExpanded = _expandedStates[index]; + for (int i = 0; i < _expandedStates.length; i++) { + if (i == index) { + _expandedStates[i] = !wasExpanded; + } else if (!wasExpanded) { + _expandedStates[i] = false; + } + } + } else { + // Multiple - just toggle the clicked item + _expandedStates[index] = !_expandedStates[index]; + } + }); + + widget.onItemToggled?.call(index, _expandedStates[index]); + } + + @override + Widget build(BuildContext context) { + final theme = widget.theme ?? ExpandableListTheme.defaultTheme(context); + + return Column( + children: List.generate(widget.items.length, (index) { + final item = widget.items[index]; + final isExpanded = _expandedStates[index]; + final isLast = index == widget.items.length - 1; + + return Column( + children: [ + _ExpandableListItemWidget( + title: item.title, + isExpanded: isExpanded, + onTap: () => _toggleItem(index), + padding: widget.itemPadding, + contentPadding: widget.contentPadding, + theme: theme, + leading: item.leading, + trailing: item.trailing, + backgroundColor: item.backgroundColor, + expandedBackgroundColor: item.expandedBackgroundColor, + animationDuration: widget.animationDuration, + animationCurve: widget.animationCurve, + children: item.children, + ), + if (widget.showDividers && !isLast) + Divider( + height: widget.dividerHeight, + color: widget.dividerColor ?? theme.dividerColor, + ).paddingSymmetrical(12.h,0), + ], + ); + }), + ); + } +} + +// ==================== SUPPORTING WIDGETS ==================== + +class _ExpandableListItemWidget extends StatelessWidget { + final Widget title; + final List children; + final bool isExpanded; + final VoidCallback onTap; + final EdgeInsetsGeometry? padding; + final EdgeInsetsGeometry? contentPadding; + final ExpandableListTheme theme; + final Widget? leading; + final Widget? trailing; + final Color? backgroundColor; + final Color? expandedBackgroundColor; + final Duration animationDuration; + final Curve animationCurve; + + const _ExpandableListItemWidget({ + super.key, + required this.title, + required this.children, + required this.isExpanded, + required this.onTap, + this.padding, + this.contentPadding, + required this.theme, + this.leading, + this.trailing, + this.backgroundColor, + this.expandedBackgroundColor, + required this.animationDuration, + required this.animationCurve, + }); + + @override + Widget build(BuildContext context) { + return Container( + color: isExpanded + ? (expandedBackgroundColor ?? theme.expandedBackgroundColor) + : (backgroundColor ?? theme.backgroundColor), + child: Column( + children: [ + // Header + InkWell( + onTap: onTap, + child: Padding( + padding: padding ?? theme.itemPadding, + child: Row( + children: [ + if (leading != null) ...[ + leading!, + SizedBox(width: theme.leadingSpacing), + ], + Expanded(child: title), + if (trailing != null) + trailing! + else + AnimatedRotation( + turns: isExpanded ? 0.5 : 0.0, + duration: animationDuration, + curve: animationCurve, + child: theme.defaultTrailingIcon, + ), + ], + ), + ), + ), + + // Content + AnimatedSize( + duration: animationDuration, + curve: animationCurve, + child: Container( + constraints: BoxConstraints( + minHeight: isExpanded ? 0.0 : 0.0, + maxHeight: isExpanded ? double.infinity : 0.0, + ), + child: isExpanded + ? Padding( + padding: contentPadding ?? theme.contentPadding, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: children, + ), + ) + : SizedBox.shrink(), + ), + ), + ], + ), + ); + } +} + +// ==================== DATA MODELS ==================== + +class ExpandableListItem { + final Widget title; + final List children; + final Widget? leading; + final Widget? trailing; + final bool initiallyExpanded; + final Color? backgroundColor; + final Color? expandedBackgroundColor; + + const ExpandableListItem({ + required this.title, + required this.children, + this.leading, + this.trailing, + this.initiallyExpanded = false, + this.backgroundColor, + this.expandedBackgroundColor, + }); +} + +// ==================== THEME ==================== + +class ExpandableListTheme { + final Color backgroundColor; + final Color expandedBackgroundColor; + final Color dividerColor; + final Widget defaultTrailingIcon; + final EdgeInsetsGeometry itemPadding; + final EdgeInsetsGeometry contentPadding; + final double leadingSpacing; + + const ExpandableListTheme({ + required this.backgroundColor, + required this.expandedBackgroundColor, + required this.dividerColor, + required this.defaultTrailingIcon, + required this.itemPadding, + required this.contentPadding, + this.leadingSpacing = 12.0, + }); + + factory ExpandableListTheme.defaultTheme(BuildContext context) { + final textColor = Theme.of(context).textTheme.bodyLarge?.color ?? Colors.black; + + return ExpandableListTheme( + backgroundColor: Colors.transparent, + expandedBackgroundColor: Colors.grey.shade50, + dividerColor: Colors.grey.shade300, + defaultTrailingIcon: Icon( + Icons.keyboard_arrow_down, + color: textColor, + size: 24, + ), + itemPadding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0), + contentPadding: const EdgeInsets.only(left: 16.0, right: 16.0, bottom: 16.0), + ); + } + + factory ExpandableListTheme.custom({ + Color? backgroundColor, + Color? expandedBackgroundColor, + Color? dividerColor, + Widget? defaultTrailingIcon, + EdgeInsetsGeometry? itemPadding, + EdgeInsetsGeometry? contentPadding, + double? leadingSpacing, + }) { + return ExpandableListTheme( + backgroundColor: backgroundColor ?? Colors.transparent, + expandedBackgroundColor: expandedBackgroundColor ?? Colors.grey.shade50, + dividerColor: dividerColor ?? Colors.grey.shade300, + defaultTrailingIcon: defaultTrailingIcon ?? + Icon(Icons.keyboard_arrow_down, color: Colors.black, size: 24), + itemPadding: itemPadding ?? const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0), + contentPadding: contentPadding ?? const EdgeInsets.only(left: 16.0, right: 16.0, bottom: 16.0), + leadingSpacing: leadingSpacing ?? 12.0, + ); + } +} + +// ==================== ENUMS ==================== + +enum ExpansionMode { + multiple, // Multiple items can be expanded + exactlyOne, // Exactly one item expanded at a time + atMostOne, // Zero or one item expanded at a time +} + + + From d256eec3929ddeee5354c80be95cb96f957bf5a4 Mon Sep 17 00:00:00 2001 From: aamir-csol Date: Mon, 8 Dec 2025 10:50:33 +0300 Subject: [PATCH 20/22] medical file changes --- lib/core/utils/utils.dart | 2 +- lib/extensions/string_extensions.dart | 2 +- .../medical_file/medical_file_page.dart | 22 ++++--- lib/widgets/expandable_list_widget.dart | 2 +- lib/widgets/input_widget.dart | 58 ++++++++++--------- 5 files changed, 46 insertions(+), 40 deletions(-) diff --git a/lib/core/utils/utils.dart b/lib/core/utils/utils.dart index e2c11d4..0125f00 100644 --- a/lib/core/utils/utils.dart +++ b/lib/core/utils/utils.dart @@ -330,7 +330,7 @@ class Utils { repeat: false, reverse: false, frameRate: FrameRate(60), width: width.h, height: height.h, fit: BoxFit.fill), SizedBox(height: 16.h), (noDataText ?? LocaleKeys.noDataAvailable.tr()) - .toText16(weight: FontWeight.w500, color: AppColors.greyTextColor, isCenter: true) + .toText14(weight: FontWeight.w500, color: AppColors.greyTextColor, isCenter: true) .paddingSymmetrical(64.w, 0.h), SizedBox(height: 16.h), callToActionButton diff --git a/lib/extensions/string_extensions.dart b/lib/extensions/string_extensions.dart index 250453d..328ced5 100644 --- a/lib/extensions/string_extensions.dart +++ b/lib/extensions/string_extensions.dart @@ -263,7 +263,7 @@ extension EmailValidator on String { style: TextStyle(fontSize: 19.f, fontWeight: isBold ? FontWeight.bold : FontWeight.normal, color: color ?? AppColors.blackColor, letterSpacing: -0.4), ); - Widget toText20({Color? color, FontWeight? weight, bool isBold = false}) => Text( + Widget toText20({Color? color, FontWeight? weight, bool isBold = false, }) => Text( this, style: TextStyle( fontSize: 20.f, fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal), color: color ?? AppColors.blackColor, letterSpacing: -0.4), diff --git a/lib/presentation/medical_file/medical_file_page.dart b/lib/presentation/medical_file/medical_file_page.dart index e1d4ce7..538687c 100644 --- a/lib/presentation/medical_file/medical_file_page.dart +++ b/lib/presentation/medical_file/medical_file_page.dart @@ -245,39 +245,43 @@ class _MedicalFilePageState extends State { isBorderAllowed: false, isAllowLeadingIcon: true, padding: EdgeInsets.symmetric(vertical: 8.h, horizontal: 8.h), - leadingIcon: AppAssets.student_card, + leadingIcon: AppAssets.search_icon, + hintColor: AppColors.textColor, ).paddingSymmetrical(24.w, 0.0), SizedBox(height: 16.h), // Using CustomExpandableList CustomExpandableList( expansionMode: ExpansionMode.exactlyOne, dividerColor: Color(0xFF2B353E1A), - + itemPadding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 14.h), items: [ ExpandableListItem( - title: "Medical Services".toText20(weight: FontWeight.w500), + title: "Medical Services".toText18(weight: FontWeight.w600), children: [ SizedBox(height: 10.h), getSelectedTabData(0), ], ), ExpandableListItem( - title: "Medical Reports".toText20( - weight: FontWeight.w500, + title: "Medical Reports".toText18( + weight: FontWeight.w600, ), + expandedBackgroundColor: Colors.transparent, children: [ SizedBox(height: 10.h), getSelectedTabData(2), ]), ExpandableListItem( - title: "Insurance & Payments".toText20(weight: FontWeight.w500), + title: "Insurance & Payments".toText18(weight: FontWeight.w600), + expandedBackgroundColor: Colors.transparent, children: [ SizedBox(height: 10.h), getSelectedTabData(1), ], ), ExpandableListItem( - title: "Tracker & Others".toText20(weight: FontWeight.w500), + title: "Tracker & Others".toText18(weight: FontWeight.w600), + expandedBackgroundColor: Colors.transparent, children: [ Text("Blood Report"), SizedBox(height: 8), @@ -481,9 +485,9 @@ class _MedicalFilePageState extends State { }, separatorBuilder: (BuildContext cxt, int index) => SizedBox(width: 12.h), ), - ).paddingSymmetrical(0.w, 0); + ).paddingSymmetrical(0.w, 0.h); }), - SizedBox(height: 24.h), + SizedBox(height: 10.h), "Lab & Radiology".needTranslation.toText16(weight: FontWeight.w500, letterSpacing: -0.2), SizedBox(height: 16.h), Row( diff --git a/lib/widgets/expandable_list_widget.dart b/lib/widgets/expandable_list_widget.dart index 21bbdf6..b948299 100644 --- a/lib/widgets/expandable_list_widget.dart +++ b/lib/widgets/expandable_list_widget.dart @@ -255,7 +255,7 @@ class ExpandableListTheme { return ExpandableListTheme( backgroundColor: Colors.transparent, - expandedBackgroundColor: Colors.grey.shade50, + expandedBackgroundColor: Colors.transparent, dividerColor: Colors.grey.shade300, defaultTrailingIcon: Icon( Icons.keyboard_arrow_down, diff --git a/lib/widgets/input_widget.dart b/lib/widgets/input_widget.dart index 4b3f091..c1a38ab 100644 --- a/lib/widgets/input_widget.dart +++ b/lib/widgets/input_widget.dart @@ -47,38 +47,40 @@ class TextInputWidget extends StatelessWidget { final bool isMultiline; final int minLines; final int maxLines; + final Color? hintColor; // final List countryList; // final Function(Country)? onCountryChange; - TextInputWidget( - {super.key, - required this.labelText, - required this.hintText, - this.controller, - this.onChange, - this.onCalendarTypeChanged, - this.prefix, - this.isEnable = true, - this.isBorderAllowed = true, - this.isAllowRadius = true, - this.isReadOnly = false, - this.keyboardType = TextInputType.number, - this.focusNode, - this.autoFocus = false, - this.padding, - this.isAllowLeadingIcon = false, - this.leadingIcon, - this.isCountryDropDown = false, - this.hasError = false, - this.errorMessage, - this.onCountryChange, - this.selectionType, - this.fontSize, - this.isWalletAmountInput = false, - this.suffix, - this.labelColor, + TextInputWidget({ + super.key, + required this.labelText, + required this.hintText, + this.controller, + this.onChange, + this.onCalendarTypeChanged, + this.prefix, + this.isEnable = true, + this.isBorderAllowed = true, + this.isAllowRadius = true, + this.isReadOnly = false, + this.keyboardType = TextInputType.number, + this.focusNode, + this.autoFocus = false, + this.padding, + this.isAllowLeadingIcon = false, + this.leadingIcon, + this.isCountryDropDown = false, + this.hasError = false, + this.errorMessage, + this.onCountryChange, + this.selectionType, + this.fontSize, + this.isWalletAmountInput = false, + this.suffix, + this.labelColor, this.onSubmitted, + this.hintColor, // multiline defaults this.isMultiline = false, this.minLines = 3, @@ -274,7 +276,7 @@ class TextInputWidget extends StatelessWidget { decoration: InputDecoration( isDense: true, hintText: hintText, - hintStyle: TextStyle(fontSize: 14.f, height: 21 / 16, fontWeight: FontWeight.w500, color: Color(0xff898A8D), letterSpacing: -0.75), + hintStyle: TextStyle(fontSize: 14.f, height: 21 / 16, fontWeight: FontWeight.w500, color: hintColor != null ? AppColors.textColor : Color(0xff898A8D), letterSpacing: -0.75), prefixIconConstraints: BoxConstraints(minWidth: 30.h), prefixIcon: prefix == null ? null : "+${prefix!}".toText14(letterSpacing: -1, color: AppColors.textColor, weight: FontWeight.w500), contentPadding: EdgeInsets.zero, From 634a138c7f91d701f89b927bc46334ea7c5071d5 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 8 Dec 2025 17:22:56 +0300 Subject: [PATCH 21/22] Queueing system screen implementation contd. --- assets/images/svg/bulb_icon.svg | 5 + assets/images/svg/call_for_doctor.svg | 4 + assets/images/svg/call_for_vitals.svg | 4 + lib/core/app_assets.dart | 3 + .../appointments/appointment_queue_page.dart | 266 ++++++++++++++++++ .../widgets/appointment_card.dart | 127 ++++----- .../book_appointment_page.dart | 10 + .../widgets/patient_insurance_card.dart | 4 +- .../medical_file/medical_file_page.dart | 46 +-- lib/widgets/appbar/collapsing_list_view.dart | 11 +- 10 files changed, 393 insertions(+), 87 deletions(-) create mode 100644 assets/images/svg/bulb_icon.svg create mode 100644 assets/images/svg/call_for_doctor.svg create mode 100644 assets/images/svg/call_for_vitals.svg create mode 100644 lib/presentation/appointments/appointment_queue_page.dart diff --git a/assets/images/svg/bulb_icon.svg b/assets/images/svg/bulb_icon.svg new file mode 100644 index 0000000..62afc17 --- /dev/null +++ b/assets/images/svg/bulb_icon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/svg/call_for_doctor.svg b/assets/images/svg/call_for_doctor.svg new file mode 100644 index 0000000..9644d3a --- /dev/null +++ b/assets/images/svg/call_for_doctor.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/svg/call_for_vitals.svg b/assets/images/svg/call_for_vitals.svg new file mode 100644 index 0000000..ceacdf5 --- /dev/null +++ b/assets/images/svg/call_for_vitals.svg @@ -0,0 +1,4 @@ + + + + diff --git a/lib/core/app_assets.dart b/lib/core/app_assets.dart index f3ff8fd..5bc984a 100644 --- a/lib/core/app_assets.dart +++ b/lib/core/app_assets.dart @@ -178,6 +178,9 @@ class AppAssets { static const String doctor_profile_rating_icon = '$svgBasePath/doctor_profile_rating_icon.svg'; static const String doctor_profile_reviews_icon = '$svgBasePath/doctor_profile_reviews_icon.svg'; static const String waiting_appointment_icon = '$svgBasePath/waitingAppo.svg'; + static const String call_for_vitals = '$svgBasePath/call_for_vitals.svg'; + static const String call_for_doctor = '$svgBasePath/call_for_doctor.svg'; + static const String bulb_icon = '$svgBasePath/bulb_icon.svg'; //bottom navigation// diff --git a/lib/presentation/appointments/appointment_queue_page.dart b/lib/presentation/appointments/appointment_queue_page.dart new file mode 100644 index 0000000..c2765a2 --- /dev/null +++ b/lib/presentation/appointments/appointment_queue_page.dart @@ -0,0 +1,266 @@ +import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/app_assets.dart'; +import 'package:hmg_patient_app_new/core/app_state.dart'; +import 'package:hmg_patient_app_new/core/dependencies.dart'; +import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/core/utils/utils.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; +import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; +import 'package:hmg_patient_app_new/theme/colors.dart'; +import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; +import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; +import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart'; +import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; + +class AppointmentQueuePage extends StatelessWidget { + AppointmentQueuePage({super.key}); + + AppState? appState; + int currentQueueStatus = 0; + + @override + Widget build(BuildContext context) { + currentQueueStatus = 1; + appState = getIt.get(); + return Scaffold( + backgroundColor: AppColors.bgScaffoldColor, + body: Column( + children: [ + Expanded( + child: CollapsingListView( + title: "Queueing".needTranslation, + child: SingleChildScrollView( + child: Padding( + padding: EdgeInsets.all(24.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: false, + side: BorderSide(color: getCardBorderColor(), width: 2.w), + ), + child: Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + AppCustomChipWidget( + labelText: currentQueueStatus == 0 ? "In Queue".needTranslation : "Your Turn".needTranslation, + backgroundColor: getCardBorderColor().withValues(alpha: 0.20), + textColor: getCardBorderColor(), + ), + Utils.buildSvgWithAssets(icon: AppAssets.waiting_icon, width: 24.h, height: 24.h), + ], + ), + SizedBox(height: 10.h), + "Hala ${appState!.getAuthenticatedUser()!.firstName}!!!".needTranslation.toText16(isBold: true), + SizedBox(height: 8.h), + "Thank you for your patience, here is your queue number.".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), + SizedBox(height: 8.h), + "IMD W-A-2".needTranslation.toText32(isBold: true), + SizedBox(height: 8.h), + CustomButton( + text: getCardButtonText(), + onPressed: () {}, + backgroundColor: getCardButtonColor(), + borderColor: getCardButtonColor().withValues(alpha: 0.01), + textColor: getCardButtonTextColor(), + fontSize: 12.f, + fontWeight: FontWeight.w600, + borderRadius: 12.r, + padding: EdgeInsets.symmetric(horizontal: 10.w), + height: 40.h, + iconColor: AppColors.whiteColor, + iconSize: 18.h, + ), + ], + ), + ), + ), + SizedBox(height: 16.h), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: true, + ), + child: Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + "Serving Now".needTranslation.toText16(isBold: true), + SizedBox(height: 18.h), + ListView.separated( + padding: EdgeInsets.zero, + shrinkWrap: true, + itemCount: 3, + physics: NeverScrollableScrollPhysics(), + itemBuilder: (BuildContext context, int index) { + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + "IMD W-A-2".needTranslation.toText17(isBold: true), + Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + "Room: S2".toText12(fontWeight: FontWeight.w500), + SizedBox(width: 8.w), + AppCustomChipWidget( + deleteIcon: AppAssets.call_for_vitals, + labelText: "Call for vital signs".needTranslation, + iconColor: AppColors.primaryRedColor, + textColor: AppColors.primaryRedColor, + iconSize: 14.w, + backgroundColor: AppColors.primaryRedColor.withValues(alpha: 0.1), + labelPadding: EdgeInsetsDirectional.only(start: 8.h, end: -2.h), + ), + ], + ), + ], + ); + }, + separatorBuilder: (BuildContext cxt, int index) => SizedBox(height: 8.h), + ), + ], + ), + ), + ), + SizedBox(height: 16.h), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: true, + ), + child: Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Utils.buildSvgWithAssets(icon: AppAssets.bulb_icon, width: 24.w, height: 24.h), + SizedBox(width: 8.w), + "Things to ask your doctor today".needTranslation.toText16(isBold: true), + ], + ), + SizedBox(height: 8.h), + + // What can I do to improve my overall health? + // Are there any routine screenings I should get? + // What is this medication for? + // Are there any side effects I should know about? + // When should I come back for a follow-up? + + "• ${"What can I do to improve my overall health?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), + SizedBox(height: 4.h), + "• ${"Are there any routine screenings I should get?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), + SizedBox(height: 4.h), + "• ${"What is this medication for?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), + SizedBox(height: 4.h), + "• ${"Are there any side effects I should know about?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), + SizedBox(height: 4.h), + "• ${"When should I come back for a follow-up?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), + + SizedBox(height: 16.h), + ], + ), + ), + ), + ], + ), + ), + ), + ), + ), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 24.r, + hasShadow: true, + ), + child: CustomButton( + text: "Go to homepage".needTranslation, + onPressed: () { + Navigator.pushAndRemoveUntil( + context, + CustomPageRoute( + page: LandingNavigation(), + ), + (r) => false); + }, + backgroundColor: AppColors.primaryRedColor, + borderColor: AppColors.primaryRedColor, + textColor: AppColors.whiteColor, + fontSize: 16.f, + fontWeight: FontWeight.w500, + borderRadius: 12.r, + padding: EdgeInsets.symmetric(horizontal: 10.w), + height: 50.h, + icon: AppAssets.homeBottom, + iconColor: AppColors.whiteColor, + iconSize: 18.h, + ).paddingSymmetrical(16.h, 24.h), + ) + ], + ), + ); + } + + Color getCardBorderColor() { + switch (currentQueueStatus) { + case 0: + return AppColors.ratingColorYellow; + case 1: + return AppColors.primaryRedColor; + case 2: + return AppColors.successColor; + } + return AppColors.textColor; + } + + Color getCardButtonColor() { + switch (currentQueueStatus) { + case 0: + return AppColors.textColor.withValues(alpha: 0.08); + case 1: + return AppColors.primaryRedColor; + case 2: + return AppColors.successColor; + } + return AppColors.primaryRedColor; + } + + Color getCardButtonTextColor() { + switch (currentQueueStatus) { + case 0: + return Color(0xFFA2A2A2); + case 1: + return AppColors.whiteColor; + case 2: + return AppColors.whiteColor; + } + return AppColors.primaryRedColor; + } + + String getCardButtonText() { + switch (currentQueueStatus) { + case 0: + return "Please wait! you will be called for vital signs".needTranslation; + case 1: + return "Please visit Room S5 for vital signs".needTranslation; + case 2: + return "Please visit Room S5 to the Doctor".needTranslation; + } + return ""; + } +} diff --git a/lib/presentation/appointments/widgets/appointment_card.dart b/lib/presentation/appointments/widgets/appointment_card.dart index 7bc9c62..a629944 100644 --- a/lib/presentation/appointments/widgets/appointment_card.dart +++ b/lib/presentation/appointments/widgets/appointment_card.dart @@ -17,6 +17,7 @@ import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_vie import 'package:hmg_patient_app_new/features/my_appointments/utils/appointment_type.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/presentation/appointments/appointment_details_page.dart'; +import 'package:hmg_patient_app_new/presentation/appointments/appointment_queue_page.dart'; import 'package:hmg_patient_app_new/presentation/appointments/widgets/ask_doctor_request_type_select.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/widgets/appointment_calendar.dart'; import 'package:hmg_patient_app_new/presentation/medical_file/eye_measurement_details_page.dart'; @@ -26,6 +27,7 @@ import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart'; import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; +import 'package:smooth_corner/smooth_corner.dart'; class AppointmentCard extends StatelessWidget { final PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel; @@ -124,47 +126,33 @@ class AppointmentCard extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, children: [ - Stack( - children: [ - Image.network( - isLoading ? 'https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png' : patientAppointmentHistoryResponseModel.doctorImageURL!, - width: 63.w, - height: 63.h, - fit: BoxFit.cover, - ), - Positioned( - bottom: 0, - left: 0, - right: 0, - child: Container( - width: 63.w, - height: 20, - color: AppColors.textColorLight.withValues(alpha: 0.25), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Utils.buildSvgWithAssets( - icon: AppAssets.rating_icon, - width: 12.w, - height: 12.h, - fit: BoxFit.contain, - ), - SizedBox(width: 4.w), - isLoading ? "Rating".toText12() : patientAppointmentHistoryResponseModel.decimalDoctorRate.toString().toText12(), - ], - ), - ), - ) - ], + Image.network( + isLoading ? 'https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png' : patientAppointmentHistoryResponseModel.doctorImageURL!, + width: 63.w, + height: 63.h, + fit: BoxFit.cover, ).circle(100).toShimmer2(isShow: isLoading), - // SizedBox(height: 12.h), - // AppCustomChipWidget( - // icon: AppAssets.rating_icon, - // iconColor: AppColors.ratingColorYellow, - // labelText: isLoading ? "Rating" : "Rating: ${patientAppointmentHistoryResponseModel.decimalDoctorRate}".needTranslation) - // .toShimmer2(isShow: isLoading), + Transform.translate( + offset: Offset(0.0, -20.h), + child: Container( + width: 40.w, + height: 40.h, + decoration: BoxDecoration( + color: AppColors.whiteColor, + shape: BoxShape.circle, // Makes the container circular + border: Border.all( + color: AppColors.scaffoldBgColor, // Color of the border + width: 1.5.w, // Width of the border + ), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [Utils.buildSvgWithAssets(icon: AppAssets.rating_icon, width: 15.w, height: 15.h), SizedBox(height: 2.h), "4.7".toText11(isBold: true, color: AppColors.textColor)], + ), + ).circle(100).toShimmer2(isShow: isLoading), + ), ], ), SizedBox(width: 16.h), @@ -304,34 +292,41 @@ class AppointmentCard extends StatelessWidget { if (isRecent) { return CustomButton( text: LocaleKeys.askDoctor.tr(context: context), - onPressed: () async { - LoaderBottomSheet.showLoader(loadingText: "Checking doctor availability...".needTranslation); - await myAppointmentsViewModel.isDoctorAvailable( - projectID: patientAppointmentHistoryResponseModel.projectID, - doctorId: patientAppointmentHistoryResponseModel.doctorID, - clinicId: patientAppointmentHistoryResponseModel.clinicID, - onSuccess: (value) async { - if (value) { - await myAppointmentsViewModel.getAskDoctorRequestTypes(onSuccess: (val) { - LoaderBottomSheet.hideLoader(); - showCommonBottomSheetWithoutHeight( - context, - title: LocaleKeys.askDoctor.tr(context: context), - child: AskDoctorRequestTypeSelect( - askDoctorRequestTypeList: myAppointmentsViewModel.askDoctorRequestTypeList, - myAppointmentsViewModel: myAppointmentsViewModel, - patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel, - ), - callBackFunc: () {}, - isFullScreen: false, - isCloseButtonVisible: true, - ); - }); - } else { - print("Doctor is not available"); - } - }); + onPressed: () { + Navigator.of(context).push( + CustomPageRoute( + page: AppointmentQueuePage(), + ), + ); }, + // onPressed: () async { + // LoaderBottomSheet.showLoader(loadingText: "Checking doctor availability...".needTranslation); + // await myAppointmentsViewModel.isDoctorAvailable( + // projectID: patientAppointmentHistoryResponseModel.projectID, + // doctorId: patientAppointmentHistoryResponseModel.doctorID, + // clinicId: patientAppointmentHistoryResponseModel.clinicID, + // onSuccess: (value) async { + // if (value) { + // await myAppointmentsViewModel.getAskDoctorRequestTypes(onSuccess: (val) { + // LoaderBottomSheet.hideLoader(); + // showCommonBottomSheetWithoutHeight( + // context, + // title: LocaleKeys.askDoctor.tr(context: context), + // child: AskDoctorRequestTypeSelect( + // askDoctorRequestTypeList: myAppointmentsViewModel.askDoctorRequestTypeList, + // myAppointmentsViewModel: myAppointmentsViewModel, + // patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel, + // ), + // callBackFunc: () {}, + // isFullScreen: false, + // isCloseButtonVisible: true, + // ); + // }); + // } else { + // print("Doctor is not available"); + // } + // }); + // }, backgroundColor: AppColors.secondaryLightRedColor, borderColor: AppColors.secondaryLightRedColor, textColor: AppColors.primaryRedColor, diff --git a/lib/presentation/book_appointment/book_appointment_page.dart b/lib/presentation/book_appointment/book_appointment_page.dart index 8a0f7e7..0ad58cc 100644 --- a/lib/presentation/book_appointment/book_appointment_page.dart +++ b/lib/presentation/book_appointment/book_appointment_page.dart @@ -25,6 +25,7 @@ import 'package:hmg_patient_app_new/presentation/book_appointment/livecare/immed import 'package:hmg_patient_app_new/presentation/book_appointment/livecare/select_immediate_livecare_clinic_page.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/search_doctor_by_name.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/select_clinic_page.dart'; +import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; @@ -72,6 +73,15 @@ class _BookAppointmentPageState extends State { backgroundColor: AppColors.bgScaffoldColor, body: CollapsingListView( title: LocaleKeys.bookAppo.tr(context: context), + isLeading: true, + leadingCallback: () { + Navigator.pushAndRemoveUntil( + context, + CustomPageRoute( + page: LandingNavigation(), + ), + (r) => false); + }, child: SingleChildScrollView( child: Consumer(builder: (context, bookAppointmentsVM, child) { return Column( diff --git a/lib/presentation/insurance/widgets/patient_insurance_card.dart b/lib/presentation/insurance/widgets/patient_insurance_card.dart index 5190e5b..3d774d3 100644 --- a/lib/presentation/insurance/widgets/patient_insurance_card.dart +++ b/lib/presentation/insurance/widgets/patient_insurance_card.dart @@ -34,7 +34,7 @@ class PatientInsuranceCard extends StatelessWidget { width: double.infinity, decoration: RoundedRectangleBorder().toSmoothCornerDecoration( color: AppColors.whiteColor, - borderRadius: 24, + borderRadius: 24.r, ), child: Padding( padding: EdgeInsets.all(16.h), @@ -112,6 +112,6 @@ class PatientInsuranceCard extends StatelessWidget { ], ), ), - ).paddingSymmetrical(24.h, 0.h); + ).paddingSymmetrical(0.h, 0.h); } } diff --git a/lib/presentation/medical_file/medical_file_page.dart b/lib/presentation/medical_file/medical_file_page.dart index 4dbc659..5cfbcb9 100644 --- a/lib/presentation/medical_file/medical_file_page.dart +++ b/lib/presentation/medical_file/medical_file_page.dart @@ -30,6 +30,7 @@ import 'package:hmg_patient_app_new/presentation/appointments/my_doctors_page.da import 'package:hmg_patient_app_new/presentation/book_appointment/book_appointment_page.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/doctor_profile_page.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/widgets/appointment_calendar.dart'; +import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; import 'package:hmg_patient_app_new/presentation/insurance/insurance_approvals_page.dart'; import 'package:hmg_patient_app_new/presentation/insurance/insurance_home_page.dart'; import 'package:hmg_patient_app_new/presentation/insurance/widgets/insurance_update_details_card.dart'; @@ -109,25 +110,30 @@ class _MedicalFilePageState extends State { trailing: Row( children: [ Wrap( + spacing: -8.h, + // runSpacing: 0.h, children: [ Utils.buildImgWithAssets( icon: AppAssets.babyGirlImg, - height: 32.h, - border: 1.5, + height: 28.h, + width: 28.w, + border: 1, fit: BoxFit.contain, borderRadius: 50.r, ), Utils.buildImgWithAssets( icon: AppAssets.femaleImg, - height: 32.h, - border: 1.5, + height: 28.h, + width: 28.w, + border: 1, borderRadius: 50.r, fit: BoxFit.contain, ), Utils.buildImgWithAssets( icon: AppAssets.male_img, - height: 32.h, - border: 1.5, + height: 28.h, + width: 28.w, + border: 1, borderRadius: 50.r, fit: BoxFit.contain, ), @@ -146,7 +152,15 @@ class _MedicalFilePageState extends State { }, profiles: medicalFileViewModel.patientFamilyFiles); }), - isLeading: false, + isLeading: true, + leadingCallback: () { + Navigator.pushAndRemoveUntil( + navigationService.navigatorKey.currentContext!, + CustomPageRoute( + page: LandingNavigation(), + ), + (r) => false); + }, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -177,7 +191,7 @@ class _MedicalFilePageState extends State { children: [ AppCustomChipWidget( icon: AppAssets.file_icon, - labelText: "${LocaleKeys.fileNo.tr(context: context)}: ${appState.getAuthenticatedUser()!.patientId}", + labelText: "${LocaleKeys.fileno.tr(context: context)}: ${appState.getAuthenticatedUser()!.patientId}", labelPadding: EdgeInsetsDirectional.only(end: 6.w), onChipTap: () { navigationService.pushPage( @@ -215,7 +229,8 @@ class _MedicalFilePageState extends State { icon: AppAssets.blood_icon, labelText: "Blood: ${appState.getUserBloodGroup.isEmpty ? "N/A" : appState.getUserBloodGroup.isEmpty}", iconColor: AppColors.primaryRedColor, - labelPadding: EdgeInsetsDirectional.only(end: 8.w), + labelPadding: EdgeInsetsDirectional.only(end: 4.w), + padding: EdgeInsets.zero, ), Consumer(builder: (context, insuranceVM, child) { return AppCustomChipWidget( @@ -535,10 +550,7 @@ class _MedicalFilePageState extends State { ? const CommonShimmerWidget().paddingSymmetrical(0.w, 0.h) : prescriptionVM.patientPrescriptionOrders.isNotEmpty ? Container( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: Colors.white, - borderRadius: 12.r, - ), + decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: Colors.white, borderRadius: 20.r, hasShadow: false), child: Padding( padding: EdgeInsets.all(16.w), child: Column( @@ -608,9 +620,9 @@ class _MedicalFilePageState extends State { }, separatorBuilder: (BuildContext cxt, int index) => SizedBox(height: 16.h), ), - SizedBox(height: 24.h), + SizedBox(height: 16.h), const Divider(color: AppColors.dividerColor), - SizedBox(height: 24.h), + SizedBox(height: 16.h), Row( children: [ Expanded( @@ -635,7 +647,7 @@ class _MedicalFilePageState extends State { iconSize: 16.w, ), ), - SizedBox(width: 10.w), + SizedBox(width: 6.w), Expanded( child: CustomButton( text: "All Medications".needTranslation, @@ -657,7 +669,7 @@ class _MedicalFilePageState extends State { ], ), ), - ).paddingSymmetrical(24.w, 0.h) + ).paddingSymmetrical(0.w, 0.h) : Container( decoration: RoundedRectangleBorder().toSmoothCornerDecoration( color: AppColors.whiteColor, diff --git a/lib/widgets/appbar/collapsing_list_view.dart b/lib/widgets/appbar/collapsing_list_view.dart index 734fe0f..cf711a0 100644 --- a/lib/widgets/appbar/collapsing_list_view.dart +++ b/lib/widgets/appbar/collapsing_list_view.dart @@ -25,6 +25,7 @@ class CollapsingListView extends StatelessWidget { Widget? trailing; bool isClose; bool isLeading; + VoidCallback? leadingCallback; CollapsingListView({ super.key, @@ -40,7 +41,7 @@ class CollapsingListView extends StatelessWidget { this.requests, this.isLeading = true, this.trailing, - }); + this.leadingCallback}); @override Widget build(BuildContext context) { @@ -65,7 +66,13 @@ class CollapsingListView extends StatelessWidget { child: IconButton( icon: Utils.buildSvgWithAssets(icon: isClose ? AppAssets.closeBottomNav : AppAssets.arrow_back, width: 32.h, height: 32.h), padding: EdgeInsets.only(left: 12), - onPressed: () => Navigator.pop(context), + onPressed: () { + if(leadingCallback != null) { + leadingCallback!(); + } else { + Navigator.pop(context); + } + }, highlightColor: Colors.transparent, ), ) From e72e67d9bf6931227f23c2a16ff155767b3079a3 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 9 Dec 2025 16:23:47 +0300 Subject: [PATCH 22/22] Appointment Queue implemented, Blood Donation implementation contd. --- .../main/res/values/mapbox_access_token.xml | 3 + assets/images/svg/select_city_icon.svg | 4 + lib/core/app_assets.dart | 1 + lib/core/dependencies.dart | 7 + lib/core/utils/utils.dart | 50 +++ .../blood_donation/blood_donation_repo.dart | 95 ++++ .../blood_donation_view_model.dart | 133 ++++++ .../models/blood_group_list_model.dart | 6 + .../models/blood_group_response_model.dart | 61 +++ .../blood_donation/models/cities_model.dart | 21 + .../book_appointments_view_model.dart | 4 +- .../my_appointments_view_model.dart | 9 + lib/main.dart | 4 + .../appointments/appointment_queue_page.dart | 404 ++++++++---------- .../widgets/appointment_card.dart | 83 ++-- .../appointment_checkin_bottom_sheet.dart | 5 +- .../widgets/appointment_doctor_card.dart | 37 +- .../widgets/appointment_queueing_screen.dart | 0 .../blood_donation/blood_donation_page.dart | 172 ++++++++ .../widgets/city_list_item.dart | 60 +++ .../widgets/select_city_widget.dart | 39 ++ .../widgets/hospital_list_item.dart | 36 -- .../hmg_services/services_page.dart | 10 + lib/presentation/home/landing_page.dart | 85 +++- lib/routes/app_routes.dart | 5 +- 25 files changed, 1015 insertions(+), 319 deletions(-) create mode 100644 android/app/src/main/res/values/mapbox_access_token.xml create mode 100644 assets/images/svg/select_city_icon.svg create mode 100644 lib/features/blood_donation/blood_donation_repo.dart create mode 100644 lib/features/blood_donation/blood_donation_view_model.dart create mode 100644 lib/features/blood_donation/models/blood_group_list_model.dart create mode 100644 lib/features/blood_donation/models/blood_group_response_model.dart create mode 100644 lib/features/blood_donation/models/cities_model.dart delete mode 100644 lib/presentation/appointments/widgets/appointment_queueing_screen.dart create mode 100644 lib/presentation/blood_donation/blood_donation_page.dart create mode 100644 lib/presentation/blood_donation/widgets/city_list_item.dart create mode 100644 lib/presentation/blood_donation/widgets/select_city_widget.dart diff --git a/android/app/src/main/res/values/mapbox_access_token.xml b/android/app/src/main/res/values/mapbox_access_token.xml new file mode 100644 index 0000000..f1daf69 --- /dev/null +++ b/android/app/src/main/res/values/mapbox_access_token.xml @@ -0,0 +1,3 @@ + + sk.eyJ1IjoicndhaWQiLCJhIjoiY2x6NWo0bTMzMWZodzJrcGZpemYzc3Z4dSJ9.uSSZuwNSGCcCdPAiORECmg + \ No newline at end of file diff --git a/assets/images/svg/select_city_icon.svg b/assets/images/svg/select_city_icon.svg new file mode 100644 index 0000000..ff66079 --- /dev/null +++ b/assets/images/svg/select_city_icon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/lib/core/app_assets.dart b/lib/core/app_assets.dart index 5bc984a..95f24ca 100644 --- a/lib/core/app_assets.dart +++ b/lib/core/app_assets.dart @@ -181,6 +181,7 @@ class AppAssets { static const String call_for_vitals = '$svgBasePath/call_for_vitals.svg'; static const String call_for_doctor = '$svgBasePath/call_for_doctor.svg'; static const String bulb_icon = '$svgBasePath/bulb_icon.svg'; + static const String select_city_icon = '$svgBasePath/select_city_icon.svg'; //bottom navigation// diff --git a/lib/core/dependencies.dart b/lib/core/dependencies.dart index 30b4ab7..c7037e5 100644 --- a/lib/core/dependencies.dart +++ b/lib/core/dependencies.dart @@ -5,6 +5,8 @@ import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/location_util.dart'; import 'package:hmg_patient_app_new/features/authentication/authentication_repo.dart'; import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart'; +import 'package:hmg_patient_app_new/features/blood_donation/blood_donation_repo.dart'; +import 'package:hmg_patient_app_new/features/blood_donation/blood_donation_view_model.dart'; import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_repo.dart'; import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart'; import 'package:hmg_patient_app_new/features/common/common_repo.dart'; @@ -116,6 +118,7 @@ class AppDependencies { getIt.registerLazySingleton(() => LocationRepoImpl(apiClient: getIt())); getIt.registerLazySingleton(() => ContactUsRepoImp(loggerService: getIt(), apiClient: getIt())); getIt.registerLazySingleton(() => HmgServicesRepoImp(loggerService: getIt(), apiClient: getIt())); + getIt.registerLazySingleton(() => BloodDonationRepoImp(loggerService: getIt(), apiClient: getIt())); // ViewModels // Global/shared VMs → LazySingleton @@ -224,6 +227,10 @@ class AppDependencies { () => HmgServicesViewModel(bookAppointmentsRepo: getIt(), hmgServicesRepo: getIt(), errorHandlerService: getIt(), navigationService: getIt()), ); + getIt.registerLazySingleton( + () => BloodDonationViewModel(bloodDonationRepo: getIt(), errorHandlerService: getIt(), navigationService: getIt(), dialogService: getIt(), appState: getIt()), + ); + // Screen-specific VMs → Factory // getIt.registerFactory( // () => BookAppointmentsViewModel( diff --git a/lib/core/utils/utils.dart b/lib/core/utils/utils.dart index 852071f..df8cdcb 100644 --- a/lib/core/utils/utils.dart +++ b/lib/core/utils/utils.dart @@ -875,4 +875,54 @@ class Utils { Uri uri = Uri.parse(url); launchUrl(uri, mode: LaunchMode.inAppBrowserView); } + + + static Color getCardBorderColor(int currentQueueStatus) { + switch (currentQueueStatus) { + case 0: + return AppColors.ratingColorYellow; + case 1: + return AppColors.primaryRedColor; + case 2: + return AppColors.successColor; + } + return AppColors.textColor; + } + + static Color getCardButtonColor(int currentQueueStatus) { + switch (currentQueueStatus) { + case 0: + return AppColors.textColor.withValues(alpha: 0.08); + case 1: + return AppColors.primaryRedColor; + case 2: + return AppColors.successColor; + } + return AppColors.primaryRedColor; + } + + static Color getCardButtonTextColor(int currentQueueStatus) { + switch (currentQueueStatus) { + case 0: + return Color(0xFFA2A2A2); + case 1: + return AppColors.whiteColor; + case 2: + return AppColors.whiteColor; + } + return AppColors.primaryRedColor; + } + + static String getCardButtonText(int currentQueueStatus) { + switch (currentQueueStatus) { + case 0: + return "Please wait! you will be called for vital signs".needTranslation; + case 1: + return "Please visit Room S5 for vital signs".needTranslation; + case 2: + return "Please visit Room S5 to the Doctor".needTranslation; + } + return ""; + } + } diff --git a/lib/features/blood_donation/blood_donation_repo.dart b/lib/features/blood_donation/blood_donation_repo.dart new file mode 100644 index 0000000..84997b2 --- /dev/null +++ b/lib/features/blood_donation/blood_donation_repo.dart @@ -0,0 +1,95 @@ +import 'package:dartz/dartz.dart'; +import 'package:hmg_patient_app_new/core/api/api_client.dart'; +import 'package:hmg_patient_app_new/core/api_consts.dart'; +import 'package:hmg_patient_app_new/core/common_models/generic_api_model.dart'; +import 'package:hmg_patient_app_new/core/exceptions/api_failure.dart'; +import 'package:hmg_patient_app_new/features/blood_donation/models/blood_group_response_model.dart'; +import 'package:hmg_patient_app_new/features/blood_donation/models/cities_model.dart'; +import 'package:hmg_patient_app_new/services/logger_service.dart'; + +abstract class BloodDonationRepo { + Future>>> getAllCities(); + + Future>> getPatientBloodGroupDetails(); +} + +class BloodDonationRepoImp implements BloodDonationRepo { + final ApiClient apiClient; + final LoggerService loggerService; + + BloodDonationRepoImp({required this.loggerService, required this.apiClient}); + + @override + Future>>> getAllCities() async { + Map mapDevice = {}; + + try { + GenericApiModel>? apiResponse; + Failure? failure; + await apiClient.post( + GET_CITIES_REQUEST, + body: mapDevice, + onFailure: (error, statusCode, {messageStatus, failureType}) { + failure = failureType; + }, + onSuccess: (response, statusCode, {messageStatus, errorMessage}) { + try { + final list = response['ListCities']; + final citiesList = list.map((item) => CitiesModel.fromJson(item as Map)).toList().cast(); + + apiResponse = GenericApiModel>( + messageStatus: messageStatus, + statusCode: statusCode, + errorMessage: null, + data: citiesList, + ); + } catch (e) { + failure = DataParsingFailure(e.toString()); + } + }, + ); + if (failure != null) return Left(failure!); + if (apiResponse == null) return Left(ServerFailure("Unknown error")); + return Right(apiResponse!); + } catch (e) { + return Left(UnknownFailure(e.toString())); + } + } + + @override + Future>> getPatientBloodGroupDetails() async { + Map mapDevice = {}; + + try { + GenericApiModel? apiResponse; + Failure? failure; + await apiClient.post( + GET_BLOOD_REQUEST, + body: mapDevice, + onFailure: (error, statusCode, {messageStatus, failureType}) { + failure = failureType; + }, + onSuccess: (response, statusCode, {messageStatus, errorMessage}) { + try { + final list = response['List_BloodGroupDetails'][0]; + final patientBloodGroup = List_BloodGroupDetailsModel.fromJson(list); + + apiResponse = GenericApiModel( + messageStatus: messageStatus, + statusCode: statusCode, + errorMessage: null, + data: patientBloodGroup, + ); + } catch (e) { + failure = DataParsingFailure(e.toString()); + } + }, + ); + if (failure != null) return Left(failure!); + if (apiResponse == null) return Left(ServerFailure("Unknown error")); + return Right(apiResponse!); + } catch (e) { + return Left(UnknownFailure(e.toString())); + } + } +} \ No newline at end of file diff --git a/lib/features/blood_donation/blood_donation_view_model.dart b/lib/features/blood_donation/blood_donation_view_model.dart new file mode 100644 index 0000000..7d2e5df --- /dev/null +++ b/lib/features/blood_donation/blood_donation_view_model.dart @@ -0,0 +1,133 @@ +import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/app_state.dart'; +import 'package:hmg_patient_app_new/features/blood_donation/blood_donation_repo.dart'; +import 'package:hmg_patient_app_new/features/blood_donation/models/blood_group_list_model.dart'; +import 'package:hmg_patient_app_new/features/blood_donation/models/blood_group_response_model.dart'; +import 'package:hmg_patient_app_new/features/blood_donation/models/cities_model.dart'; +import 'package:hmg_patient_app_new/services/dialog_service.dart'; +import 'package:hmg_patient_app_new/services/error_handler_service.dart'; +import 'package:hmg_patient_app_new/services/navigation_service.dart'; + +class BloodDonationViewModel extends ChangeNotifier { + final DialogService dialogService; + BloodDonationRepo bloodDonationRepo; + ErrorHandlerService errorHandlerService; + final NavigationService navigationService; + final AppState appState; + + List citiesList = []; + List bloodGroupList = [ + BloodGroupListModel("O+", 0), + BloodGroupListModel("O-", 1), + BloodGroupListModel("AB+", 2), + BloodGroupListModel("AB-", 3), + BloodGroupListModel("A+", 4), + BloodGroupListModel("A-", 5), + BloodGroupListModel("B+", 6), + BloodGroupListModel("B-", 7), + ]; + + late CitiesModel selectedCity; + late BloodGroupListModel selectedBloodGroup; + int _selectedHospitalIndex = 0; + int _selectedBloodTypeIndex = 0; + String _selectedBloodType = ''; + + List_BloodGroupDetailsModel patientBloodGroupDetailsModel = List_BloodGroupDetailsModel(); + + BloodDonationViewModel({required this.bloodDonationRepo, required this.errorHandlerService, required this.navigationService, required this.dialogService, required this.appState}); + + setSelectedCity(CitiesModel city) { + selectedCity = city; + notifyListeners(); + } + + Future getRegionSelectedClinics({Function(dynamic)? onSuccess, Function(String)? onError}) async { + citiesList.clear(); + selectedCity = CitiesModel(); + notifyListeners(); + final result = await bloodDonationRepo.getAllCities(); + + result.fold( + (failure) async { + onError!(failure.message); + }, + (apiResponse) { + if (apiResponse.messageStatus == 2) { + onError!(apiResponse.errorMessage ?? 'An unexpected error occurred'); + } else if (apiResponse.messageStatus == 1) { + citiesList = apiResponse.data!; + notifyListeners(); + if (onSuccess != null) { + onSuccess(apiResponse); + } + } + }, + ); + } + + Future getPatientBloodGroupDetails({Function(dynamic)? onSuccess, Function(String)? onError}) async { + final result = await bloodDonationRepo.getPatientBloodGroupDetails(); + + result.fold( + (failure) async { + onError!(failure.message); + }, + (apiResponse) { + if (apiResponse.messageStatus == 2) { + onError!(apiResponse.errorMessage ?? 'An unexpected error occurred'); + } else if (apiResponse.messageStatus == 1) { + patientBloodGroupDetailsModel = apiResponse.data!; + + CitiesModel citiesModel = CitiesModel(); + citiesModel.iD = getSelectedCityID(); + _selectedHospitalIndex = (citiesModel.iD! - 1); + citiesModel.description = citiesList[_selectedHospitalIndex].description; + citiesModel.descriptionN = citiesList[_selectedHospitalIndex].descriptionN; + selectedCity = citiesModel; + _selectedBloodType = patientBloodGroupDetailsModel.bloodGroup!; + _selectedBloodTypeIndex = getBloodIndex(_selectedBloodType); + + notifyListeners(); + if (onSuccess != null) { + onSuccess(apiResponse); + } + } + }, + ); + } + + int getSelectedCityID() { + int cityID = 1; + citiesList.forEach((element) { + if (element.description == patientBloodGroupDetailsModel.city) { + cityID = element.iD!; + } + }); + return cityID; + } + + int getBloodIndex(String type) { + switch (type) { + case "O+": + return 0; + case "O-": + return 1; + case "AB+": + return 2; + case "AB-": + return 3; + case "A+": + return 4; + case "A-": + return 5; + case "B+": + return 6; + case "B-": + return 7; + + default: + return 0; + } + } +} diff --git a/lib/features/blood_donation/models/blood_group_list_model.dart b/lib/features/blood_donation/models/blood_group_list_model.dart new file mode 100644 index 0000000..9a98cc5 --- /dev/null +++ b/lib/features/blood_donation/models/blood_group_list_model.dart @@ -0,0 +1,6 @@ +class BloodGroupListModel { + String name; + int value; + + BloodGroupListModel(this.name, this.value); +} diff --git a/lib/features/blood_donation/models/blood_group_response_model.dart b/lib/features/blood_donation/models/blood_group_response_model.dart new file mode 100644 index 0000000..ceaca78 --- /dev/null +++ b/lib/features/blood_donation/models/blood_group_response_model.dart @@ -0,0 +1,61 @@ +class List_BloodGroupDetailsModel { + int? iD; + int? patientID; + int? patientType; + bool? patientOutSA; + int? zipCode; + String? cellNumber; + String? cityCode; + String? city; + int? gender; + String? bloodGroup; + String? nationalID; + bool? isActive; + + List_BloodGroupDetailsModel({ + this.iD, + this.patientID, + this.patientType, + this.patientOutSA, + this.zipCode, + this.cellNumber, + this.cityCode, + this.city, + this.gender, + this.bloodGroup, + this.nationalID, + this.isActive, + }); + + List_BloodGroupDetailsModel.fromJson(Map json) { + iD = json['ID']; + patientID = json['PatientID']; + patientType = json['PatientType']; + patientOutSA = json['PatientOutSA']; + zipCode = json['ZipCode']; + cellNumber = json['CellNumber']; + cityCode = json['CityCode']; + city = json['City']; + gender = json['Gender']; + bloodGroup = json['BloodGroup']; + nationalID = json['NationalID']; + isActive = json['IsActive']; + } + + Map toJson() { + final Map data = new Map(); + data['ID'] = this.iD; + data['PatientID'] = this.patientID; + data['PatientType'] = this.patientType; + data['PatientOutSA'] = this.patientOutSA; + data['ZipCode'] = this.zipCode; + data['CellNumber'] = this.cellNumber; + data['CityCode'] = this.cityCode; + data['City'] = this.city; + data['Gender'] = this.gender; + data['BloodGroup'] = this.bloodGroup; + data['NationalID'] = this.nationalID; + data['IsActive'] = this.isActive; + return data; + } +} diff --git a/lib/features/blood_donation/models/cities_model.dart b/lib/features/blood_donation/models/cities_model.dart new file mode 100644 index 0000000..cf7e631 --- /dev/null +++ b/lib/features/blood_donation/models/cities_model.dart @@ -0,0 +1,21 @@ +class CitiesModel { + int? iD; + String? description; + String? descriptionN; + + CitiesModel({this.iD, this.description, this.descriptionN}); + + CitiesModel.fromJson(Map json) { + iD = json['ID']; + description = json['Description']; + descriptionN = json['DescriptionN']; + } + + Map toJson() { + final Map data = new Map(); + data['ID'] = this.iD; + data['Description'] = this.description; + data['DescriptionN'] = this.descriptionN; + return data; + } +} \ No newline at end of file diff --git a/lib/features/book_appointments/book_appointments_view_model.dart b/lib/features/book_appointments/book_appointments_view_model.dart index 2413827..d96cb4f 100644 --- a/lib/features/book_appointments/book_appointments_view_model.dart +++ b/lib/features/book_appointments/book_appointments_view_model.dart @@ -497,8 +497,8 @@ class BookAppointmentsViewModel extends ChangeNotifier { } initialSlotDuration = apiResponse.data["InitialSlotDuration"]; freeSlotsResponse = apiResponse.data['FreeTimeSlots']; - // isWaitingAppointmentAvailable = apiResponse.data["IsAllowToBookWaitingAppointment"]; - isWaitingAppointmentAvailable = true; + isWaitingAppointmentAvailable = apiResponse.data["IsAllowToBookWaitingAppointment"]; + // isWaitingAppointmentAvailable = true; freeSlotsResponse.forEach((element) { // date = (isLiveCareSchedule != null && isLiveCareSchedule) diff --git a/lib/features/my_appointments/my_appointments_view_model.dart b/lib/features/my_appointments/my_appointments_view_model.dart index fa1ad22..71e0312 100644 --- a/lib/features/my_appointments/my_appointments_view_model.dart +++ b/lib/features/my_appointments/my_appointments_view_model.dart @@ -37,6 +37,9 @@ class MyAppointmentsViewModel extends ChangeNotifier { DateTime? start = null; DateTime? end = null; + bool isPatientHasQueueAppointment = false; + int currentQueueStatus = 0; + List patientAppointmentsHistoryList = []; List filteredAppointmentList = []; @@ -85,6 +88,12 @@ class MyAppointmentsViewModel extends ChangeNotifier { isTamaraDetailsLoading = true; isAppointmentPatientShareLoading = true; isEyeMeasurementsAppointmentsLoading = true; + isPatientHasQueueAppointment = false; + notifyListeners(); + } + + setCurrentQueueStatus(int currentQueueStatus) { + this.currentQueueStatus = currentQueueStatus; notifyListeners(); } diff --git a/lib/main.dart b/lib/main.dart index 1af80b6..6a065fe 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -9,6 +9,7 @@ import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/dependencies.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart'; +import 'package:hmg_patient_app_new/features/blood_donation/blood_donation_view_model.dart'; import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart'; import 'package:hmg_patient_app_new/features/contact_us/contact_us_view_model.dart'; import 'package:hmg_patient_app_new/features/doctor_filter/doctor_filter_view_model.dart'; @@ -145,6 +146,9 @@ void main() async { ), ChangeNotifierProvider( create: (_) => getIt.get(), + ), + ChangeNotifierProvider( + create: (_) => getIt.get(), ) ], child: MyApp()), ), diff --git a/lib/presentation/appointments/appointment_queue_page.dart b/lib/presentation/appointments/appointment_queue_page.dart index c2765a2..f48f1eb 100644 --- a/lib/presentation/appointments/appointment_queue_page.dart +++ b/lib/presentation/appointments/appointment_queue_page.dart @@ -6,261 +6,215 @@ import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart'; import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; +import 'package:provider/provider.dart'; class AppointmentQueuePage extends StatelessWidget { AppointmentQueuePage({super.key}); AppState? appState; - int currentQueueStatus = 0; @override Widget build(BuildContext context) { - currentQueueStatus = 1; appState = getIt.get(); return Scaffold( backgroundColor: AppColors.bgScaffoldColor, - body: Column( - children: [ - Expanded( - child: CollapsingListView( - title: "Queueing".needTranslation, - child: SingleChildScrollView( - child: Padding( - padding: EdgeInsets.all(24.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.whiteColor, - borderRadius: 20.h, - hasShadow: false, - side: BorderSide(color: getCardBorderColor(), width: 2.w), - ), - child: Padding( - padding: EdgeInsets.all(16.h), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - AppCustomChipWidget( - labelText: currentQueueStatus == 0 ? "In Queue".needTranslation : "Your Turn".needTranslation, - backgroundColor: getCardBorderColor().withValues(alpha: 0.20), - textColor: getCardBorderColor(), - ), - Utils.buildSvgWithAssets(icon: AppAssets.waiting_icon, width: 24.h, height: 24.h), - ], - ), - SizedBox(height: 10.h), - "Hala ${appState!.getAuthenticatedUser()!.firstName}!!!".needTranslation.toText16(isBold: true), - SizedBox(height: 8.h), - "Thank you for your patience, here is your queue number.".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), - SizedBox(height: 8.h), - "IMD W-A-2".needTranslation.toText32(isBold: true), - SizedBox(height: 8.h), - CustomButton( - text: getCardButtonText(), - onPressed: () {}, - backgroundColor: getCardButtonColor(), - borderColor: getCardButtonColor().withValues(alpha: 0.01), - textColor: getCardButtonTextColor(), - fontSize: 12.f, - fontWeight: FontWeight.w600, - borderRadius: 12.r, - padding: EdgeInsets.symmetric(horizontal: 10.w), - height: 40.h, - iconColor: AppColors.whiteColor, - iconSize: 18.h, - ), - ], + body: Consumer(builder: (context, myAppointmentsVM, child) { + return Column( + children: [ + Expanded( + child: CollapsingListView( + title: "Queueing".needTranslation, + child: SingleChildScrollView( + child: Padding( + padding: EdgeInsets.all(24.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: false, + side: BorderSide(color: Utils.getCardBorderColor(myAppointmentsVM.currentQueueStatus), width: 2.w), ), - ), - ), - SizedBox(height: 16.h), - Container( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.whiteColor, - borderRadius: 20.h, - hasShadow: true, - ), - child: Padding( - padding: EdgeInsets.all(16.h), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - "Serving Now".needTranslation.toText16(isBold: true), - SizedBox(height: 18.h), - ListView.separated( - padding: EdgeInsets.zero, - shrinkWrap: true, - itemCount: 3, - physics: NeverScrollableScrollPhysics(), - itemBuilder: (BuildContext context, int index) { - return Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - "IMD W-A-2".needTranslation.toText17(isBold: true), - Row( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - "Room: S2".toText12(fontWeight: FontWeight.w500), - SizedBox(width: 8.w), - AppCustomChipWidget( - deleteIcon: AppAssets.call_for_vitals, - labelText: "Call for vital signs".needTranslation, - iconColor: AppColors.primaryRedColor, - textColor: AppColors.primaryRedColor, - iconSize: 14.w, - backgroundColor: AppColors.primaryRedColor.withValues(alpha: 0.1), - labelPadding: EdgeInsetsDirectional.only(start: 8.h, end: -2.h), - ), - ], - ), - ], - ); - }, - separatorBuilder: (BuildContext cxt, int index) => SizedBox(height: 8.h), - ), - ], + child: Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + AppCustomChipWidget( + labelText: myAppointmentsVM.currentQueueStatus == 0 ? "In Queue".needTranslation : "Your Turn".needTranslation, + backgroundColor: Utils.getCardBorderColor(myAppointmentsVM.currentQueueStatus).withValues(alpha: 0.20), + textColor: Utils.getCardBorderColor(myAppointmentsVM.currentQueueStatus), + ), + Utils.buildSvgWithAssets(icon: AppAssets.waiting_icon, width: 24.h, height: 24.h), + ], + ), + SizedBox(height: 10.h), + "Hala ${appState!.getAuthenticatedUser()!.firstName}!!!".needTranslation.toText16(isBold: true), + SizedBox(height: 8.h), + "Thank you for your patience, here is your queue number.".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), + SizedBox(height: 8.h), + "IMD W-A-5".needTranslation.toText32(isBold: true), + SizedBox(height: 8.h), + CustomButton( + text: Utils.getCardButtonText(myAppointmentsVM.currentQueueStatus), + onPressed: () {}, + backgroundColor: Utils.getCardButtonColor(myAppointmentsVM.currentQueueStatus), + borderColor: Utils.getCardButtonColor(myAppointmentsVM.currentQueueStatus).withValues(alpha: 0.01), + textColor: Utils.getCardButtonTextColor(myAppointmentsVM.currentQueueStatus), + fontSize: 12.f, + fontWeight: FontWeight.w600, + borderRadius: 12.r, + padding: EdgeInsets.symmetric(horizontal: 10.w), + height: 40.h, + iconColor: AppColors.whiteColor, + iconSize: 18.h, + ), + ], + ), ), ), - ), - SizedBox(height: 16.h), - Container( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.whiteColor, - borderRadius: 20.h, - hasShadow: true, + SizedBox(height: 16.h), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: true, + ), + child: Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + "Serving Now".needTranslation.toText16(isBold: true), + SizedBox(height: 18.h), + ListView.separated( + padding: EdgeInsets.zero, + shrinkWrap: true, + itemCount: 3, + physics: NeverScrollableScrollPhysics(), + itemBuilder: (BuildContext context, int index) { + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + "IMD W-A-2".needTranslation.toText17(isBold: true), + Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + "Room: S2".toText12(fontWeight: FontWeight.w500), + SizedBox(width: 8.w), + AppCustomChipWidget( + deleteIcon: AppAssets.call_for_vitals, + labelText: "Call for vital signs".needTranslation, + iconColor: AppColors.primaryRedColor, + textColor: AppColors.primaryRedColor, + iconSize: 14.w, + backgroundColor: AppColors.primaryRedColor.withValues(alpha: 0.1), + labelPadding: EdgeInsetsDirectional.only(start: 8.h, end: -2.h), + ), + ], + ), + ], + ); + }, + separatorBuilder: (BuildContext cxt, int index) => SizedBox(height: 8.h), + ), + ], + ), + ), ), - child: Padding( - padding: EdgeInsets.all(16.h), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Utils.buildSvgWithAssets(icon: AppAssets.bulb_icon, width: 24.w, height: 24.h), - SizedBox(width: 8.w), - "Things to ask your doctor today".needTranslation.toText16(isBold: true), - ], - ), - SizedBox(height: 8.h), + SizedBox(height: 16.h), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: true, + ), + child: Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Utils.buildSvgWithAssets(icon: AppAssets.bulb_icon, width: 24.w, height: 24.h), + SizedBox(width: 8.w), + "Things to ask your doctor today".needTranslation.toText16(isBold: true), + ], + ), + SizedBox(height: 8.h), - // What can I do to improve my overall health? - // Are there any routine screenings I should get? - // What is this medication for? - // Are there any side effects I should know about? - // When should I come back for a follow-up? + // What can I do to improve my overall health? + // Are there any routine screenings I should get? + // What is this medication for? + // Are there any side effects I should know about? + // When should I come back for a follow-up? - "• ${"What can I do to improve my overall health?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), - SizedBox(height: 4.h), - "• ${"Are there any routine screenings I should get?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), - SizedBox(height: 4.h), - "• ${"What is this medication for?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), - SizedBox(height: 4.h), - "• ${"Are there any side effects I should know about?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), - SizedBox(height: 4.h), - "• ${"When should I come back for a follow-up?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), + "• ${"What can I do to improve my overall health?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), + SizedBox(height: 4.h), + "• ${"Are there any routine screenings I should get?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), + SizedBox(height: 4.h), + "• ${"What is this medication for?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), + SizedBox(height: 4.h), + "• ${"Are there any side effects I should know about?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), + SizedBox(height: 4.h), + "• ${"When should I come back for a follow-up?"}".needTranslation.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), - SizedBox(height: 16.h), - ], + SizedBox(height: 16.h), + ], + ), ), ), - ), - ], + ], + ), ), ), ), ), - ), - Container( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.whiteColor, - borderRadius: 24.r, - hasShadow: true, - ), - child: CustomButton( - text: "Go to homepage".needTranslation, - onPressed: () { - Navigator.pushAndRemoveUntil( - context, - CustomPageRoute( - page: LandingNavigation(), - ), - (r) => false); - }, - backgroundColor: AppColors.primaryRedColor, - borderColor: AppColors.primaryRedColor, - textColor: AppColors.whiteColor, - fontSize: 16.f, - fontWeight: FontWeight.w500, - borderRadius: 12.r, - padding: EdgeInsets.symmetric(horizontal: 10.w), - height: 50.h, - icon: AppAssets.homeBottom, - iconColor: AppColors.whiteColor, - iconSize: 18.h, - ).paddingSymmetrical(16.h, 24.h), - ) - ], - ), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 24.r, + hasShadow: true, + ), + child: CustomButton( + text: "Go to homepage".needTranslation, + onPressed: () { + Navigator.pushAndRemoveUntil( + context, + CustomPageRoute( + page: LandingNavigation(), + ), + (r) => false); + }, + backgroundColor: AppColors.primaryRedColor, + borderColor: AppColors.primaryRedColor, + textColor: AppColors.whiteColor, + fontSize: 16.f, + fontWeight: FontWeight.w500, + borderRadius: 12.r, + padding: EdgeInsets.symmetric(horizontal: 10.w), + height: 50.h, + icon: AppAssets.homeBottom, + iconColor: AppColors.whiteColor, + iconSize: 18.h, + ).paddingSymmetrical(16.h, 24.h), + ) + ], + ); + }), ); } - - Color getCardBorderColor() { - switch (currentQueueStatus) { - case 0: - return AppColors.ratingColorYellow; - case 1: - return AppColors.primaryRedColor; - case 2: - return AppColors.successColor; - } - return AppColors.textColor; - } - - Color getCardButtonColor() { - switch (currentQueueStatus) { - case 0: - return AppColors.textColor.withValues(alpha: 0.08); - case 1: - return AppColors.primaryRedColor; - case 2: - return AppColors.successColor; - } - return AppColors.primaryRedColor; - } - - Color getCardButtonTextColor() { - switch (currentQueueStatus) { - case 0: - return Color(0xFFA2A2A2); - case 1: - return AppColors.whiteColor; - case 2: - return AppColors.whiteColor; - } - return AppColors.primaryRedColor; - } - - String getCardButtonText() { - switch (currentQueueStatus) { - case 0: - return "Please wait! you will be called for vital signs".needTranslation; - case 1: - return "Please visit Room S5 for vital signs".needTranslation; - case 2: - return "Please visit Room S5 to the Doctor".needTranslation; - } - return ""; - } } diff --git a/lib/presentation/appointments/widgets/appointment_card.dart b/lib/presentation/appointments/widgets/appointment_card.dart index a629944..e6b974e 100644 --- a/lib/presentation/appointments/widgets/appointment_card.dart +++ b/lib/presentation/appointments/widgets/appointment_card.dart @@ -17,7 +17,6 @@ import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_vie import 'package:hmg_patient_app_new/features/my_appointments/utils/appointment_type.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/presentation/appointments/appointment_details_page.dart'; -import 'package:hmg_patient_app_new/presentation/appointments/appointment_queue_page.dart'; import 'package:hmg_patient_app_new/presentation/appointments/widgets/ask_doctor_request_type_select.dart'; import 'package:hmg_patient_app_new/presentation/book_appointment/widgets/appointment_calendar.dart'; import 'package:hmg_patient_app_new/presentation/medical_file/eye_measurement_details_page.dart'; @@ -27,7 +26,6 @@ import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart'; import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; -import 'package:smooth_corner/smooth_corner.dart'; class AppointmentCard extends StatelessWidget { final PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel; @@ -133,7 +131,7 @@ class AppointmentCard extends StatelessWidget { width: 63.w, height: 63.h, fit: BoxFit.cover, - ).circle(100).toShimmer2(isShow: isLoading), + ).circle(100.r).toShimmer2(isShow: isLoading), Transform.translate( offset: Offset(0.0, -20.h), child: Container( @@ -149,7 +147,11 @@ class AppointmentCard extends StatelessWidget { ), child: Column( mainAxisAlignment: MainAxisAlignment.center, - children: [Utils.buildSvgWithAssets(icon: AppAssets.rating_icon, width: 15.w, height: 15.h), SizedBox(height: 2.h), "4.7".toText11(isBold: true, color: AppColors.textColor)], + children: [ + Utils.buildSvgWithAssets(icon: AppAssets.rating_icon, width: 15.w, height: 15.h), + SizedBox(height: 2.h), + "${patientAppointmentHistoryResponseModel.decimalDoctorRate}".toText11(isBold: true, color: AppColors.textColor), + ], ), ).circle(100).toShimmer2(isShow: isLoading), ), @@ -169,10 +171,14 @@ class AppointmentCard extends StatelessWidget { spacing: 3.h, runSpacing: 4.h, children: [ - AppCustomChipWidget(labelText: isLoading ? 'Cardiology' : patientAppointmentHistoryResponseModel.clinicName!) - .toShimmer2(isShow: isLoading), - AppCustomChipWidget(labelText: isLoading ? 'Olaya' : patientAppointmentHistoryResponseModel.projectName!) - .toShimmer2(isShow: isLoading), + AppCustomChipWidget( + labelText: isLoading + ? 'Cardiology' + : (patientAppointmentHistoryResponseModel.clinicName!.length > 15 + ? '${patientAppointmentHistoryResponseModel.clinicName!.substring(0, 12)}...' + : patientAppointmentHistoryResponseModel.clinicName!), + ).toShimmer2(isShow: isLoading), + AppCustomChipWidget(labelText: isLoading ? 'Olaya' : patientAppointmentHistoryResponseModel.projectName!).toShimmer2(isShow: isLoading), AppCustomChipWidget( icon: AppAssets.appointment_calendar_icon, labelText: isLoading @@ -292,41 +298,34 @@ class AppointmentCard extends StatelessWidget { if (isRecent) { return CustomButton( text: LocaleKeys.askDoctor.tr(context: context), - onPressed: () { - Navigator.of(context).push( - CustomPageRoute( - page: AppointmentQueuePage(), - ), - ); + onPressed: () async { + LoaderBottomSheet.showLoader(loadingText: "Checking doctor availability...".needTranslation); + await myAppointmentsViewModel.isDoctorAvailable( + projectID: patientAppointmentHistoryResponseModel.projectID, + doctorId: patientAppointmentHistoryResponseModel.doctorID, + clinicId: patientAppointmentHistoryResponseModel.clinicID, + onSuccess: (value) async { + if (value) { + await myAppointmentsViewModel.getAskDoctorRequestTypes(onSuccess: (val) { + LoaderBottomSheet.hideLoader(); + showCommonBottomSheetWithoutHeight( + context, + title: LocaleKeys.askDoctor.tr(context: context), + child: AskDoctorRequestTypeSelect( + askDoctorRequestTypeList: myAppointmentsViewModel.askDoctorRequestTypeList, + myAppointmentsViewModel: myAppointmentsViewModel, + patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel, + ), + callBackFunc: () {}, + isFullScreen: false, + isCloseButtonVisible: true, + ); + }); + } else { + print("Doctor is not available"); + } + }); }, - // onPressed: () async { - // LoaderBottomSheet.showLoader(loadingText: "Checking doctor availability...".needTranslation); - // await myAppointmentsViewModel.isDoctorAvailable( - // projectID: patientAppointmentHistoryResponseModel.projectID, - // doctorId: patientAppointmentHistoryResponseModel.doctorID, - // clinicId: patientAppointmentHistoryResponseModel.clinicID, - // onSuccess: (value) async { - // if (value) { - // await myAppointmentsViewModel.getAskDoctorRequestTypes(onSuccess: (val) { - // LoaderBottomSheet.hideLoader(); - // showCommonBottomSheetWithoutHeight( - // context, - // title: LocaleKeys.askDoctor.tr(context: context), - // child: AskDoctorRequestTypeSelect( - // askDoctorRequestTypeList: myAppointmentsViewModel.askDoctorRequestTypeList, - // myAppointmentsViewModel: myAppointmentsViewModel, - // patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel, - // ), - // callBackFunc: () {}, - // isFullScreen: false, - // isCloseButtonVisible: true, - // ); - // }); - // } else { - // print("Doctor is not available"); - // } - // }); - // }, backgroundColor: AppColors.secondaryLightRedColor, borderColor: AppColors.secondaryLightRedColor, textColor: AppColors.primaryRedColor, diff --git a/lib/presentation/appointments/widgets/appointment_checkin_bottom_sheet.dart b/lib/presentation/appointments/widgets/appointment_checkin_bottom_sheet.dart index 74ab6b7..f430447 100644 --- a/lib/presentation/appointments/widgets/appointment_checkin_bottom_sheet.dart +++ b/lib/presentation/appointments/widgets/appointment_checkin_bottom_sheet.dart @@ -13,6 +13,7 @@ import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_history_response_model.dart'; import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; +import 'package:hmg_patient_app_new/presentation/appointments/appointment_queue_page.dart'; import 'package:hmg_patient_app_new/presentation/appointments/my_appointments_page.dart'; import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; import 'package:hmg_patient_app_new/theme/colors.dart'; @@ -156,7 +157,9 @@ class AppointmentCheckinBottomSheet extends StatelessWidget { ), (r) => false); Navigator.of(context).push( - CustomPageRoute(page: MyAppointmentsPage()), + CustomPageRoute( + page: AppointmentQueuePage(), + ), ); }, isFullScreen: false); }, diff --git a/lib/presentation/appointments/widgets/appointment_doctor_card.dart b/lib/presentation/appointments/widgets/appointment_doctor_card.dart index b2d74ca..96d538b 100644 --- a/lib/presentation/appointments/widgets/appointment_doctor_card.dart +++ b/lib/presentation/appointments/widgets/appointment_doctor_card.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_history_response_model.dart'; @@ -50,8 +51,29 @@ class AppointmentDoctorCard extends StatelessWidget { height: 63.h, fit: BoxFit.cover, ).circle(100.r), - SizedBox(height: 12.h), - AppCustomChipWidget(icon: AppAssets.rating_icon, iconColor: AppColors.ratingColorYellow, labelText: "Rating: ${patientAppointmentHistoryResponseModel.decimalDoctorRate}"), + Transform.translate( + offset: Offset(0.0, -20.h), + child: Container( + width: 40.w, + height: 40.h, + decoration: BoxDecoration( + color: AppColors.whiteColor, + shape: BoxShape.circle, // Makes the container circular + border: Border.all( + color: AppColors.scaffoldBgColor, // Color of the border + width: 1.5.w, // Width of the border + ), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Utils.buildSvgWithAssets(icon: AppAssets.rating_icon, width: 15.w, height: 15.h), + SizedBox(height: 2.h), + "${patientAppointmentHistoryResponseModel.decimalDoctorRate}".toText11(isBold: true, color: AppColors.textColor), + ], + ), + ).circle(100), + ), ], ), SizedBox(width: 16.w), @@ -60,13 +82,16 @@ class AppointmentDoctorCard extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ patientAppointmentHistoryResponseModel.doctorNameObj!.toText16(isBold: true), + SizedBox(height: 8.h), Wrap( direction: Axis.horizontal, spacing: 6.w, runSpacing: 6.h, children: [ AppCustomChipWidget( - labelText: patientAppointmentHistoryResponseModel.clinicName!, + labelText: (patientAppointmentHistoryResponseModel.clinicName!.length > 15 + ? '${patientAppointmentHistoryResponseModel.clinicName!.substring(0, 12)}...' + : patientAppointmentHistoryResponseModel.clinicName!), labelPadding: EdgeInsetsDirectional.only(start: 4.w, end: 4.w), ), AppCustomChipWidget( @@ -75,8 +100,7 @@ class AppointmentDoctorCard extends StatelessWidget { ), AppCustomChipWidget( icon: AppAssets.doctor_calendar_icon, - labelText: - "${DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false)}, ${DateUtil.formatDateToTimeLang( + labelText: "${DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false)} ${DateUtil.formatDateToTimeLang( DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false, )}", @@ -100,8 +124,7 @@ class AppointmentDoctorCard extends StatelessWidget { ), ], ), - SizedBox(height: 16.h), - + SizedBox(height: 8.h), Visibility( visible: renderWidgetForERDisplay == false, child: getAppointmentActionButtons( diff --git a/lib/presentation/appointments/widgets/appointment_queueing_screen.dart b/lib/presentation/appointments/widgets/appointment_queueing_screen.dart deleted file mode 100644 index e69de29..0000000 diff --git a/lib/presentation/blood_donation/blood_donation_page.dart b/lib/presentation/blood_donation/blood_donation_page.dart new file mode 100644 index 0000000..8908652 --- /dev/null +++ b/lib/presentation/blood_donation/blood_donation_page.dart @@ -0,0 +1,172 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/app_assets.dart'; +import 'package:hmg_patient_app_new/core/app_state.dart'; +import 'package:hmg_patient_app_new/core/dependencies.dart'; +import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/core/utils/utils.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; +import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/features/blood_donation/blood_donation_view_model.dart'; +import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; +import 'package:hmg_patient_app_new/presentation/blood_donation/widgets/select_city_widget.dart'; +import 'package:hmg_patient_app_new/theme/colors.dart'; +import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; +import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; +import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; +import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; +import 'package:provider/provider.dart'; + +class BloodDonationPage extends StatelessWidget { + BloodDonationPage({super.key}); + + late AppState appState; + + @override + Widget build(BuildContext context) { + appState = getIt.get(); + return Scaffold( + backgroundColor: AppColors.bgScaffoldColor, + body: Consumer(builder: (context, bloodDonationVM, child) { + return Column( + children: [ + Expanded( + child: CollapsingListView( + title: LocaleKeys.bloodDonation.tr(), + child: Padding( + padding: EdgeInsets.all(24.w), + child: SingleChildScrollView( + child: Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 24.r, + hasShadow: false, + ), + child: Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Utils.buildSvgWithAssets(icon: AppAssets.select_city_icon, width: 40.h, height: 40.h), + SizedBox(width: 12.w), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + LocaleKeys.city.tr().toText16(color: AppColors.textColor, weight: FontWeight.w500), + (appState.isArabic() + ? (bloodDonationVM.selectedCity.descriptionN ?? LocaleKeys.select.tr()) + : bloodDonationVM.selectedCity.description ?? LocaleKeys.select.tr(context: context)) + .toText14(color: AppColors.greyTextColor, weight: FontWeight.w500), + ], + ), + ], + ), + Utils.buildSvgWithAssets(icon: AppAssets.arrow_down, width: 25.h, height: 25.h), + ], + ).onPress(() async { + LoaderBottomSheet.showLoader(loadingText: "Fetching Cities..."); + await bloodDonationVM.getRegionSelectedClinics(onSuccess: (val) { + LoaderBottomSheet.hideLoader(); + showCommonBottomSheetWithoutHeight(context, + title: LocaleKeys.selectCity.tr(context: context), + isDismissible: true, + child: SelectCityWidget( + bloodDonationViewModel: bloodDonationVM, + ), + callBackFunc: () {}); + }, onError: (err) { + LoaderBottomSheet.hideLoader(); + }); + }), + SizedBox(height: 16.h), + Divider(color: AppColors.borderOnlyColor.withValues(alpha: 0.1), height: 1.h), + SizedBox(height: 16.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Utils.buildSvgWithAssets(icon: AppAssets.my_account_icon, width: 40.h, height: 40.h), + SizedBox(width: 12.w), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + LocaleKeys.gender.tr().toText16(color: AppColors.textColor, weight: FontWeight.w500), + "Male".toText14(color: AppColors.greyTextColor, weight: FontWeight.w500), + ], + ), + ], + ), + Utils.buildSvgWithAssets(icon: AppAssets.arrow_down, width: 25.h, height: 25.h), + ], + ), + SizedBox(height: 16.h), + Divider(color: AppColors.borderOnlyColor.withValues(alpha: 0.1), height: 1.h), + SizedBox(height: 16.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Utils.buildSvgWithAssets(icon: AppAssets.my_account_icon, width: 40.h, height: 40.h), + SizedBox(width: 12.w), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + LocaleKeys.bloodType.tr().toText16(color: AppColors.textColor, weight: FontWeight.w500), + "AB+".toText14(color: AppColors.greyTextColor, weight: FontWeight.w500), + ], + ), + ], + ), + Utils.buildSvgWithAssets(icon: AppAssets.arrow_down, width: 25.h, height: 25.h), + ], + ), + ], + ), + ), + ), + ), + ), + ), + ), + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 24.r, + hasShadow: true, + ), + child: SizedBox( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + CustomButton( + text: LocaleKeys.save.tr(), + onPressed: () { + // openDoctorScheduleCalendar(); + }, + backgroundColor: AppColors.primaryRedColor, + borderColor: AppColors.primaryRedColor, + textColor: AppColors.whiteColor, + fontSize: 16.f, + fontWeight: FontWeight.w500, + borderRadius: 12.r, + padding: EdgeInsets.symmetric(horizontal: 10.w), + height: 50.h, + iconSize: 18.h, + ).paddingSymmetrical(16.h, 24.h), + ], + ), + ), + ), + ], + ); + }), + ); + } +} diff --git a/lib/presentation/blood_donation/widgets/city_list_item.dart b/lib/presentation/blood_donation/widgets/city_list_item.dart new file mode 100644 index 0000000..408fb26 --- /dev/null +++ b/lib/presentation/blood_donation/widgets/city_list_item.dart @@ -0,0 +1,60 @@ +import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/app_assets.dart'; +import 'package:hmg_patient_app_new/core/app_export.dart'; +import 'package:hmg_patient_app_new/core/app_state.dart'; +import 'package:hmg_patient_app_new/core/dependencies.dart'; +import 'package:hmg_patient_app_new/core/utils/utils.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; +import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/features/blood_donation/models/cities_model.dart'; +import 'package:hmg_patient_app_new/theme/colors.dart'; + +class CityListItem extends StatelessWidget { + final CitiesModel cityModel; + + late AppState appState; + + CityListItem({super.key, required this.cityModel}); + + @override + Widget build(BuildContext context) { + appState = getIt.get(); + return DecoratedBox( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: false, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + spacing: 8.h, + children: [hospitalName], + ), + ), + Transform.flip( + flipX: appState.isArabic(), + child: Utils.buildSvgWithAssets( + icon: AppAssets.forward_arrow_icon, + iconColor: AppColors.blackColor, + width: 40.h, + height: 40.h, + fit: BoxFit.contain, + ), + ), + ], + ).paddingSymmetrical(16.h, 16.h), + ); + } + + Widget get hospitalName => Row( + children: [ + Expanded( + child: (appState.isArabic() ? cityModel.descriptionN : cityModel.description)!.toText16(color: AppColors.textColor, isBold: true), + ) + ], + ); +} diff --git a/lib/presentation/blood_donation/widgets/select_city_widget.dart b/lib/presentation/blood_donation/widgets/select_city_widget.dart new file mode 100644 index 0000000..a0e8477 --- /dev/null +++ b/lib/presentation/blood_donation/widgets/select_city_widget.dart @@ -0,0 +1,39 @@ +import 'package:flutter/material.dart'; +import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; +import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; +import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/features/blood_donation/blood_donation_view_model.dart'; +import 'package:hmg_patient_app_new/presentation/blood_donation/widgets/city_list_item.dart'; +import 'package:hmg_patient_app_new/theme/colors.dart'; + +class SelectCityWidget extends StatelessWidget { + SelectCityWidget({super.key, required this.bloodDonationViewModel}); + + BloodDonationViewModel bloodDonationViewModel; + + @override + Widget build(BuildContext context) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox(height: 8.h), + SizedBox( + height: MediaQuery.sizeOf(context).height * .4, + child: ListView.separated( + itemBuilder: (_, index) { + return CityListItem( + cityModel: bloodDonationViewModel.citiesList[index], + ).onPress(() { + bloodDonationViewModel.setSelectedCity(bloodDonationViewModel.citiesList[index]); + Navigator.of(context).pop(); + }); + }, + separatorBuilder: (_, __) => SizedBox( + height: 8.h, + ), + itemCount: bloodDonationViewModel.citiesList.length), + ) + ], + ); + } +} diff --git a/lib/presentation/habib_wallet/widgets/hospital_list_item.dart b/lib/presentation/habib_wallet/widgets/hospital_list_item.dart index ae47326..a46f79d 100644 --- a/lib/presentation/habib_wallet/widgets/hospital_list_item.dart +++ b/lib/presentation/habib_wallet/widgets/hospital_list_item.dart @@ -67,40 +67,4 @@ class HospitalListItemAdvancePayment extends StatelessWidget { ) ], ); - -// Widget get distanceInfo => Row( -// children: [ -// Visibility( -// visible: (hospitalModel.distanceInKMs != "0"), -// child: AppCustomChipWidget( -// labelText: "${hospitalData?.distanceInKMs ?? ""} km".needTranslation, -// deleteIcon: AppAssets.location_red, -// deleteIconSize: Size(9, 12), -// backgroundColor: AppColors.secondaryLightRedColor, -// textColor: AppColors.errorColor, -// ), -// ), -// Visibility( -// visible: (hospitalData?.distanceInKMs == "0"), -// child: Row( -// children: [ -// AppCustomChipWidget( -// labelText: "Distance not available".needTranslation, -// textColor: AppColors.blackColor, -// ), -// SizedBox( -// width: 8.h, -// ) -// ], -// )), -// Visibility( -// visible: !isLocationEnabled, -// child: AppCustomChipWidget( -// labelText: "Location turned off".needTranslation, -// deleteIcon: AppAssets.location_unavailable, -// deleteIconSize: Size(9, 12), -// textColor: AppColors.blackColor, -// )), -// ], -// ); } diff --git a/lib/presentation/hmg_services/services_page.dart b/lib/presentation/hmg_services/services_page.dart index fd6e976..1b9f3cd 100644 --- a/lib/presentation/hmg_services/services_page.dart +++ b/lib/presentation/hmg_services/services_page.dart @@ -42,6 +42,16 @@ class ServicesPage extends StatelessWidget { textColor: AppColors.blackColor, route: AppRoutes.homeHealthCarePage, ), + HmgServicesComponentModel( + 3, + "Blood Donation".needTranslation, + "".needTranslation, + AppAssets.emergency_services_icon, + true, + bgColor: AppColors.bgGreenColor, + textColor: AppColors.blackColor, + route: AppRoutes.bloodDonationPage, + ), HmgServicesComponentModel( 11, "Virtual Tour".needTranslation, diff --git a/lib/presentation/home/landing_page.dart b/lib/presentation/home/landing_page.dart index 1b2ce9a..88b9274 100644 --- a/lib/presentation/home/landing_page.dart +++ b/lib/presentation/home/landing_page.dart @@ -266,11 +266,86 @@ class _LandingPageState extends State { builder: DotSwiperPaginationBuilder(color: Color(0xffD9D9D9), activeColor: AppColors.blackBgColor), ), itemBuilder: (BuildContext context, int index) { - return (immediateLiveCareVM.patientHasPendingLiveCareRequest && index == 0) - ? Column( - children: [ - SizedBox(height: 12.h), - Container( + return (myAppointmentsVM.isPatientHasQueueAppointment && index == 0) + ? Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 20.h, + hasShadow: false, + side: BorderSide(color: Utils.getCardBorderColor(myAppointmentsVM.currentQueueStatus), width: 2.w), + ), + child: Padding( + padding: EdgeInsets.all(16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + AppCustomChipWidget( + labelText: myAppointmentsVM.currentQueueStatus == 0 ? "In Queue".needTranslation : "Your Turn".needTranslation, + backgroundColor: Utils.getCardBorderColor(myAppointmentsVM.currentQueueStatus).withValues(alpha: 0.20), + textColor: Utils.getCardBorderColor(myAppointmentsVM.currentQueueStatus), + ), + Utils.buildSvgWithAssets(icon: AppAssets.waiting_icon, width: 24.h, height: 24.h), + ], + ), + SizedBox(height: 10.h), + "Hala ${appState!.getAuthenticatedUser()!.firstName}!!!".needTranslation.toText16(isBold: true), + SizedBox(height: 8.h), + "Thank you for your patience, here is your queue number." + .needTranslation + .toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight), + SizedBox(height: 8.h), + "IMD W-A-5".needTranslation.toText28(isBold: true), + SizedBox(height: 12.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + "Serving Now: ".needTranslation.toText14(isBold: true), + Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + "IMD W-A-2".needTranslation.toText12(isBold: true), + SizedBox(width: 8.w), + AppCustomChipWidget( + deleteIcon: AppAssets.call_for_vitals, + labelText: "Call for vital signs".needTranslation, + iconColor: AppColors.primaryRedColor, + textColor: AppColors.primaryRedColor, + iconSize: 14.w, + backgroundColor: AppColors.primaryRedColor.withValues(alpha: 0.1), + labelPadding: EdgeInsetsDirectional.only(start: 8.h, end: -2.h), + ), + ], + ), + ], + ), + SizedBox(height: 8.h), + CustomButton( + text: Utils.getCardButtonText(myAppointmentsVM.currentQueueStatus), + onPressed: () {}, + backgroundColor: Utils.getCardButtonColor(myAppointmentsVM.currentQueueStatus), + borderColor: Utils.getCardButtonColor(myAppointmentsVM.currentQueueStatus).withValues(alpha: 0.01), + textColor: Utils.getCardButtonTextColor(myAppointmentsVM.currentQueueStatus), + fontSize: 12.f, + fontWeight: FontWeight.w600, + borderRadius: 12.r, + padding: EdgeInsets.symmetric(horizontal: 10.w), + height: 40.h, + iconColor: AppColors.whiteColor, + iconSize: 18.h, + ), + ], + ), + ), + ) + : (immediateLiveCareVM.patientHasPendingLiveCareRequest && index == 0) + ? Column( + children: [ + SizedBox(height: 12.h), + Container( decoration: RoundedRectangleBorder().toSmoothCornerDecoration( color: AppColors.whiteColor, borderRadius: 20.r, diff --git a/lib/routes/app_routes.dart b/lib/routes/app_routes.dart index ed5c0db..d09a6c0 100644 --- a/lib/routes/app_routes.dart +++ b/lib/routes/app_routes.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:hmg_patient_app_new/presentation/authentication/login.dart'; import 'package:hmg_patient_app_new/presentation/authentication/register.dart'; import 'package:hmg_patient_app_new/presentation/authentication/register_step2.dart'; +import 'package:hmg_patient_app_new/presentation/blood_donation/blood_donation_page.dart'; import 'package:hmg_patient_app_new/presentation/comprehensive_checkup/comprehensive_checkup_page.dart'; import 'package:hmg_patient_app_new/presentation/e_referral/new_e_referral.dart'; import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart'; @@ -21,6 +22,7 @@ class AppRoutes { static const String comprehensiveCheckupPage = '/comprehensiveCheckupPage'; static const String homeHealthCarePage = '/homeHealthCarePage'; static const String zoomCallPage = '/zoomCallPage'; + static const String bloodDonationPage = '/bloodDonationPage'; static Map get routes => { initialRoute: (context) => SplashPage(), @@ -32,6 +34,7 @@ class AppRoutes { eReferralPage: (context) => NewReferralPage(), comprehensiveCheckupPage: (context) => ComprehensiveCheckupPage(), homeHealthCarePage: (context) => HhcProceduresPage(), - zoomCallPage: (context) => CallScreen() + zoomCallPage: (context) => CallScreen(), + bloodDonationPage: (context) => BloodDonationPage() }; }