From 6532002cddb2f3617f464611a5b0c736255a330f Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 28 Apr 2026 19:43:23 +0300 Subject: [PATCH 1/3] updates --- assets/langs/ar-SA.json | 3 +- assets/langs/en-US.json | 3 +- lib/generated/locale_keys.g.dart | 2 + .../widgets/appointment_doctor_card.dart | 6 +- .../my_family/widget/family_cards.dart | 68 +++++++------------ 5 files changed, 33 insertions(+), 49 deletions(-) diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index b034ed89..923aa59e 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -1843,5 +1843,6 @@ "weatherIndicators": "طقس", "submitRating": "إرسال التقييم", "maxOneFileAllowed": "يمكن رفع ملف واحد فقط", - "fileSizeExceedsLimit": "يجب ألا يتجاوز حجم الملف 1 ميغابايت" + "fileSizeExceedsLimit": "يجب ألا يتجاوز حجم الملف 1 ميغابايت", + "completedPrescriptionOrder": "تمت الخدمة" } diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json index ece2f0d9..5056b297 100644 --- a/assets/langs/en-US.json +++ b/assets/langs/en-US.json @@ -1833,7 +1833,8 @@ "weatherIndicators": "Weather", "submitRating": "Submit", "maxOneFileAllowed": "Only 1 file can be uploaded", - "fileSizeExceedsLimit": "File size must not exceed 1 MB" + "fileSizeExceedsLimit": "File size must not exceed 1 MB", + "completedPrescriptionOrder": "Completed" } diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index 5ef765b6..30fe1132 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -1834,6 +1834,8 @@ abstract class LocaleKeys { static const liveCareNotificationPermissionsMessage = 'liveCareNotificationPermissionsMessage'; static const weatherIndicators = 'weatherIndicators'; static const submitRating = 'submitRating'; + static const maxOneFileAllowed = 'maxOneFileAllowed'; + static const fileSizeExceedsLimit = 'fileSizeExceedsLimit'; static const completedPrescriptionOrder = 'completedPrescriptionOrder'; } diff --git a/lib/presentation/appointments/widgets/appointment_doctor_card.dart b/lib/presentation/appointments/widgets/appointment_doctor_card.dart index 951583d6..ac346d10 100644 --- a/lib/presentation/appointments/widgets/appointment_doctor_card.dart +++ b/lib/presentation/appointments/widgets/appointment_doctor_card.dart @@ -162,9 +162,11 @@ class AppointmentDoctorCard extends StatelessWidget { ], ), ), - patientAppointmentHistoryResponseModel.isLiveCareAppointment! || + (patientAppointmentHistoryResponseModel.isLiveCareAppointment! || + patientAppointmentHistoryResponseModel.isExecludeDoctor! || patientAppointmentHistoryResponseModel.isClinicReBookingAllowed! == false || - patientAppointmentHistoryResponseModel.isActiveDoctor! == false + patientAppointmentHistoryResponseModel.isActiveDoctor! == false || + !Utils.isClinicAllowedForRebook(patientAppointmentHistoryResponseModel.clinicID)) ? SizedBox.shrink() : Utils.buildSvgWithAssets(icon: AppAssets.doctor_profile_icon, width: 20.h, height: 20.h, fit: BoxFit.scaleDown) .onPress(() async { diff --git a/lib/presentation/my_family/widget/family_cards.dart b/lib/presentation/my_family/widget/family_cards.dart index b648a23a..d263ae55 100644 --- a/lib/presentation/my_family/widget/family_cards.dart +++ b/lib/presentation/my_family/widget/family_cards.dart @@ -471,27 +471,23 @@ class _FamilyCardsState extends State { crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, children: [ - CustomChipWidget( - height: 30.h, - chipType: ChipTypeEnum.alert, - backgroundColor: profile.status == FamilyFileEnum.pending.toInt - ? AppColors.alertLightColor.withValues(alpha: 0.20) - : profile.status == FamilyFileEnum.rejected.toInt - ? AppColors.primaryRedColor.withValues(alpha: 0.20) - : profile.status == FamilyFileEnum.active.toInt - ? AppColors.lightGreenColor - : AppColors.lightGrayBGColor, - chipText: profile.statusDescription ?? " N/A", - iconAsset: null, - isShowBorder: false, - borderRadius: 8.h, + AppCustomChipWidget( + labelText: profile.statusDescription ?? " N/A", + backgroundColor: profile.status == FamilyFileEnum.pending.toInt + ? AppColors.alertLightColor.withValues(alpha: 0.20) + : profile.status == FamilyFileEnum.rejected.toInt + ? AppColors.primaryRedColor.withValues(alpha: 0.20) + : profile.status == FamilyFileEnum.active.toInt + ? AppColors.lightGreenColor + : AppColors.lightGrayBGColor, textColor: profile.status == FamilyFileEnum.pending.toInt ? AppColors.alertLightColor : profile.status == FamilyFileEnum.rejected.toInt - ? AppColors.primaryRedColor - : profile.status == FamilyFileEnum.active.toInt - ? AppColors.textGreenColor - : AppColors.alertColor), + ? AppColors.primaryRedColor + : profile.status == FamilyFileEnum.active.toInt + ? AppColors.textGreenColor + : AppColors.alertColor + ), SizedBox(height: 8.h), Wrap(alignment: WrapAlignment.start, crossAxisAlignment: WrapCrossAlignment.start, runAlignment: WrapAlignment.start, spacing: 0.h, children: [ (profile.patientName ?? "").toText14(isBold: true, isCenter: false, maxlines: 1), @@ -499,15 +495,9 @@ class _FamilyCardsState extends State { .toText12(isCenter: false, maxLine: 1, isBold: true, color: AppColors.greyTextColor), ]), SizedBox(height: 8.h), - CustomChipWidget( - height: 30.h, - chipType: ChipTypeEnum.alert, - backgroundColor: AppColors.lightGrayBGColor, - chipText: "Medical File: ${profile.responseId ?? "N/A"}", - iconAsset: null, - isShowBorder: false, - borderRadius: 8.h, - textColor: AppColors.textColor), + AppCustomChipWidget( + labelText: "Medical File: ${profile.responseId ?? "N/A"}", + ), ], ), ), @@ -802,13 +792,13 @@ class _FamilyCardsState extends State { ], ), if (widget.isShowRemoveButton) ...[ - Positioned( + isParentUser ? Positioned( top: 0, right: 0, child: Utils.buildSvgWithAssets(icon: AppAssets.deleteIcon).onPress(() { if (!isActive) widget.onRemove(profile); }), - ), + ) : SizedBox(), ], ], ), @@ -845,9 +835,8 @@ class _FamilyCardsState extends State { crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, children: [ - CustomChipWidget( - height: 30.h, - chipType: ChipTypeEnum.alert, + AppCustomChipWidget( + labelText: profile.statusDescription ?? "N/A", backgroundColor: profile.status == FamilyFileEnum.pending.toInt ? AppColors.alertLightColor.withValues(alpha: 0.20) : profile.status == FamilyFileEnum.rejected.toInt @@ -855,10 +844,6 @@ 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, textColor: profile.status == FamilyFileEnum.pending.toInt ? AppColors.alertLightColor : profile.status == FamilyFileEnum.rejected.toInt @@ -885,15 +870,8 @@ class _FamilyCardsState extends State { ], ), SizedBox(height: 8.h), - CustomChipWidget( - height: 30.h, - chipType: ChipTypeEnum.alert, - backgroundColor: AppColors.lightGrayBGColor, - chipText: "${LocaleKeys.medicalFile.tr(context: context)}: ${profile.patientId ?? "N/A"}", - iconAsset: null, - isShowBorder: false, - borderRadius: 8.h, - textColor: AppColors.textColor, + AppCustomChipWidget( + labelText: "${LocaleKeys.medicalFile.tr(context: context)}: ${profile.patientId ?? "N/A"}", ), SizedBox(height: 16.h), Row( -- 2.30.2 From 021a835fa80c5a925ce7fed10e875a46d0e9712f Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 29 Apr 2026 15:37:55 +0300 Subject: [PATCH 2/3] updates --- android/app/build.gradle.kts | 3 ++- lib/core/api_consts.dart | 2 +- lib/features/my_invoices/my_invoices_view_model.dart | 4 +++- lib/presentation/authentication/saved_login_screen.dart | 3 +-- .../my_invoices/widgets/invoice_filter_bottom_sheet.dart | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index c1ccc0b9..c70123d4 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -179,7 +179,8 @@ dependencies { implementation("androidx.room:room-runtime:$room_version") annotationProcessor("androidx.room:room-compiler:$room_version") - implementation("net.zetetic:android-database-sqlcipher:4.5.4") +// implementation("net.zetetic:android-database-sqlcipher:4.6.1") + implementation("net.zetetic:sqlcipher-android:4.6.1@aar") implementation("com.intuit.ssp:ssp-android:1.1.0") implementation("com.intuit.sdp:sdp-android:1.1.0") diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index c9c4aaff..6243ab3b 100644 --- a/lib/core/api_consts.dart +++ b/lib/core/api_consts.dart @@ -54,7 +54,7 @@ class ApiConsts { GET_TAMARA_PAYMENT_STATUS = 'https://mdlaboratories.com/tamaralive/api/OnlineTamara/order_status?orderid='; rcBaseUrl = 'https://rc.hmg.com/'; QLINE_URL = "https://qline.hmg.com/api/PatientCall/PatientInQueue_Detail"; - CHAT_URL = "https://chat.hmg.com/Index.aspx?RequestedId="; + CHAT_URL = "https://chat.hmg.com/geneysChat/Index.aspx?RequestedId="; symptomsCheckerApi = symptomsCheckerApiLive; symptomsCheckerUsername = 'mobile_user'; symptomsCheckerPassword = '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92'; diff --git a/lib/features/my_invoices/my_invoices_view_model.dart b/lib/features/my_invoices/my_invoices_view_model.dart index 631efd5b..e191b24d 100644 --- a/lib/features/my_invoices/my_invoices_view_model.dart +++ b/lib/features/my_invoices/my_invoices_view_model.dart @@ -1,4 +1,6 @@ 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/features/my_invoices/models/get_invoice_details_response_model.dart'; import 'package:hmg_patient_app_new/features/my_invoices/models/get_invoices_list_response_model.dart'; import 'package:hmg_patient_app_new/features/my_invoices/my_invoices_repo.dart'; @@ -229,7 +231,7 @@ class MyInvoicesViewModel extends ChangeNotifier { } else if (filterType == InvoiceFilterType.clinic) { itemName = invoice.clinicName; } else if (filterType == InvoiceFilterType.doctor) { - itemName = invoice.doctorName; + itemName = getIt().isArabic() ? invoice.doctorNameN : invoice.doctorName; } if (itemName != null && itemName.isNotEmpty) { diff --git a/lib/presentation/authentication/saved_login_screen.dart b/lib/presentation/authentication/saved_login_screen.dart index 10a69711..7d4d32aa 100644 --- a/lib/presentation/authentication/saved_login_screen.dart +++ b/lib/presentation/authentication/saved_login_screen.dart @@ -100,7 +100,6 @@ class _SavedLogin extends State { child: Column( children: [ // Last login info - show WhatsApp only if isOther AND loginType is SMS - ("${LocaleKeys.lastLoginBy.tr()} ${(isOther == true && loginType == LoginTypeEnum.sms) ? LoginTypeEnum.whatsapp.displayName : loginType.displayName}") .toText14(isBold: true, color: AppColors.greyTextColor, letterSpacing: -1), Directionality( @@ -251,7 +250,7 @@ class _SavedLogin extends State { }), ); }, - height: isFoldable ? 50.h : 40.h, + height: isFoldable ? 56.h : 50.h, backgroundColor: AppColors.whiteColor, borderColor: AppColors.borderOnlyColor, textColor: AppColors.textColor, diff --git a/lib/presentation/my_invoices/widgets/invoice_filter_bottom_sheet.dart b/lib/presentation/my_invoices/widgets/invoice_filter_bottom_sheet.dart index 340f1020..ada8b466 100644 --- a/lib/presentation/my_invoices/widgets/invoice_filter_bottom_sheet.dart +++ b/lib/presentation/my_invoices/widgets/invoice_filter_bottom_sheet.dart @@ -35,7 +35,7 @@ class InvoiceFilterBottomSheet extends StatelessWidget { children: [ TextInputWidget( labelText: LocaleKeys.search.tr(context: context), - hintText: "Search $title", + hintText: "${LocaleKeys.search.tr(context: context)} $title", controller: vm.filterSearchController, onChange: (value) { debouncer.run(() { -- 2.30.2 From 695d6566a19ac000e2eccc9e53f30d5e190fcbfb Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Thu, 30 Apr 2026 12:34:40 +0300 Subject: [PATCH 3/3] updates --- .../my_appointments_view_model.dart | 2 +- .../appointment_details_page.dart | 2 +- .../book_appointment_page.dart | 4 +- .../hmg_services/services_page.dart | 2 +- .../medical_file/medical_file_page.dart | 18 ++++--- .../widgets/health_tools_card.dart | 54 +++++++++---------- .../medical_file/widgets/lab_rad_card.dart | 28 ++++++---- .../medical_file_appointment_card.dart | 8 +-- 8 files changed, 61 insertions(+), 57 deletions(-) diff --git a/lib/features/my_appointments/my_appointments_view_model.dart b/lib/features/my_appointments/my_appointments_view_model.dart index 2fda0505..38336a5a 100644 --- a/lib/features/my_appointments/my_appointments_view_model.dart +++ b/lib/features/my_appointments/my_appointments_view_model.dart @@ -1076,11 +1076,11 @@ class MyAppointmentsViewModel extends ChangeNotifier { notifyListeners(); } else if (apiResponse.messageStatus == 1) { appointmentRatedResponseModel = apiResponse.data!; - isAppointmentRatedResponseLoading = false; notifyListeners(); if (onSuccess != null) { onSuccess(apiResponse.data); } + isAppointmentRatedResponseLoading = false; } }, ); diff --git a/lib/presentation/appointments/appointment_details_page.dart b/lib/presentation/appointments/appointment_details_page.dart index 76790af7..c14897d8 100644 --- a/lib/presentation/appointments/appointment_details_page.dart +++ b/lib/presentation/appointments/appointment_details_page.dart @@ -656,7 +656,7 @@ class _AppointmentDetailsPageState extends State { crossAxisCount: 3, crossAxisSpacing: 16.h, mainAxisSpacing: 16.w, - childAspectRatio: isFoldable ? 1.2 : (isTablet ? 1.1 : 0.78), + childAspectRatio: isFoldable ? 1.2 : (isTablet ? 1.4 : 0.98), ), physics: NeverScrollableScrollPhysics(), padding: EdgeInsets.zero, diff --git a/lib/presentation/book_appointment/book_appointment_page.dart b/lib/presentation/book_appointment/book_appointment_page.dart index b5a39c95..240d2215 100644 --- a/lib/presentation/book_appointment/book_appointment_page.dart +++ b/lib/presentation/book_appointment/book_appointment_page.dart @@ -133,7 +133,7 @@ class _BookAppointmentPageState extends State { children: [ Image.network( "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png", - width: 64.w, + width: 64.h, height: 64.h, fit: BoxFit.cover, ).circle(100).toShimmer2(isShow: true, radius: 50.r), @@ -172,7 +172,7 @@ class _BookAppointmentPageState extends State { ), SizedBox(height: 16.h), SizedBox( - height: 110.h, + height: 115.h, child: ListView.separated( scrollDirection: Axis.horizontal, itemCount: myAppointmentsVM.patientMyDoctorsList.length, diff --git a/lib/presentation/hmg_services/services_page.dart b/lib/presentation/hmg_services/services_page.dart index a2c066f0..b2028dd8 100644 --- a/lib/presentation/hmg_services/services_page.dart +++ b/lib/presentation/hmg_services/services_page.dart @@ -475,7 +475,7 @@ class _ServicesPageState extends State { ConstrainedBox( constraints: BoxConstraints( minHeight: 320.h, - maxHeight: isFoldable ? 400.h : (isTablet ? 360.h : 340.h), + maxHeight: isFoldable ? 380.h : (isTablet ? 370.h : 340.h), ), child: ListView.separated( scrollDirection: Axis.horizontal, diff --git a/lib/presentation/medical_file/medical_file_page.dart b/lib/presentation/medical_file/medical_file_page.dart index f4c05a4b..a403dbb1 100644 --- a/lib/presentation/medical_file/medical_file_page.dart +++ b/lib/presentation/medical_file/medical_file_page.dart @@ -418,7 +418,8 @@ class _MedicalFilePageState extends State { return ConstrainedBox( constraints: BoxConstraints( minHeight: 135.h, - maxHeight: isFoldable ? 160.h : (isTablet ? 165.h : 135.h), + maxHeight: 150.h, + // maxHeight: isFoldable ? 150.h : (isTablet ? 140.h : 140.h), ), child: PageView( controller: hmgServicesVM.vitalSignPageController, @@ -628,6 +629,7 @@ class _MedicalFilePageState extends State { crossAxisCount: 3, crossAxisSpacing: 10.h, mainAxisSpacing: 16.w, + childAspectRatio: isFoldable ? 1.2 : (isTablet ? 1.4 : 0.98), // mainAxisExtent: 120.h, ), physics: NeverScrollableScrollPhysics(), @@ -719,7 +721,7 @@ class _MedicalFilePageState extends State { return ConstrainedBox( constraints: BoxConstraints( minHeight: 150.h, - maxHeight: isFoldable ? 230.h : (isTablet ? 240.h : 180.h), + maxHeight: isFoldable ? 210.h : (isTablet ? 200.h : 180.h), ), child: myAppointmentsVM.isMyAppointmentsLoading ? MedicalFileAppointmentCard( @@ -1173,7 +1175,7 @@ class _MedicalFilePageState extends State { GridView( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 3, - childAspectRatio: 1, + childAspectRatio: isFoldable ? 1.2 : (isTablet ? 1.4 : 0.98), crossAxisSpacing: 10.h, ), physics: NeverScrollableScrollPhysics(), @@ -1277,10 +1279,10 @@ class _MedicalFilePageState extends State { context, noDataText: LocaleKeys.youDontHaveAnySickLeavesYet.tr(context: context), isSmallWidget: true, - width: 62.w, + width: 62.h, height: 62.h, ), - ).paddingSymmetrical(0.w, 0.h); + ); }), SizedBox(height: 16.h), Selector { crossAxisCount: 3, crossAxisSpacing: 10.h, mainAxisSpacing: 16.w, + childAspectRatio: isFoldable ? 1.2 : (isTablet ? 1.4 : 0.98), ), physics: NeverScrollableScrollPhysics(), padding: EdgeInsets.only(top: 12.h), @@ -1625,7 +1628,7 @@ class _MedicalFilePageState extends State { ), child: Utils.buildSvgWithAssets( icon: icon, - width: 22.w, + width: 22.h, height: 22.h, iconColor: scheme.iconFg, fit: BoxFit.contain, @@ -1642,7 +1645,8 @@ class _MedicalFilePageState extends State { icon: getIt.get().isArabic() ? AppAssets.arrow_back : AppAssets.arrow_forward, width: 18.w, height: 18.h), ], ), - SizedBox(height: 14.h), + Spacer(), + // SizedBox(height: 14.h), Container( padding: EdgeInsets.symmetric(horizontal: 6.w, vertical: 6.h), decoration: RoundedRectangleBorder().toSmoothCornerDecoration( diff --git a/lib/presentation/medical_file/widgets/health_tools_card.dart b/lib/presentation/medical_file/widgets/health_tools_card.dart index a66d2471..bd2c6f75 100644 --- a/lib/presentation/medical_file/widgets/health_tools_card.dart +++ b/lib/presentation/medical_file/widgets/health_tools_card.dart @@ -34,39 +34,33 @@ class HealthToolsCard extends StatelessWidget { padding: EdgeInsets.all(12.w), child: Column( crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.center, - mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // Icon container with white background and border - Container( - decoration: RoundedRectangleBorder().toSmoothCornerDecoration( - color: AppColors.whiteColor, - borderRadius: 12.r, - side: BorderSide( - color: AppColors.borderOnlyColor.withValues(alpha: 0.1), - width: 1, - ), - ), - height: 48.w, - width: 48.w, - child: Center( - child: Utils.buildSvgWithAssets( - icon: svgIcon, - width: iconS, - height: iconS, - fit: BoxFit.contain, - applyThemeColor: false, - iconColor: iconColor, - ), - ), + // Icon container with white background and border + Container( + decoration: RoundedRectangleBorder().toSmoothCornerDecoration( + color: AppColors.whiteColor, + borderRadius: 12.r, + side: BorderSide( + color: AppColors.borderOnlyColor.withValues(alpha: 0.1), + width: 1, ), - SizedBox(height: 6.h), - label.toText13(color: textColor, isBold: true, maxLine: 2), - ], + ), + height: 48.h, + width: 48.h, + child: Center( + child: Utils.buildSvgWithAssets( + icon: svgIcon, + width: iconS, + height: iconS, + fit: BoxFit.contain, + applyThemeColor: false, + iconColor: iconColor, + ), + ), ), + SizedBox(height: 6.h), + label.toText13(color: textColor, isBold: true, maxLine: 2), ], ), ); diff --git a/lib/presentation/medical_file/widgets/lab_rad_card.dart b/lib/presentation/medical_file/widgets/lab_rad_card.dart index b107403d..0fcdb24e 100644 --- a/lib/presentation/medical_file/widgets/lab_rad_card.dart +++ b/lib/presentation/medical_file/widgets/lab_rad_card.dart @@ -30,22 +30,28 @@ class LabRadCard extends StatelessWidget { decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 18.r, hasShadow: false), child: Row( mainAxisAlignment: MainAxisAlignment.start, + mainAxisSize: MainAxisSize.max, children: [ - Utils.buildSvgWithAssets( - icon: icon, - width: 40.w, - height: 40.h, - fit: BoxFit.cover, - applyThemeColor: false - ).toShimmer2(isShow: false, radius: 12.r), - SizedBox(width: 8.w), - Flexible( - child: labelText.toText12(isBold: true, maxLine: 2), + Expanded( + child: Row( + children: [ + Utils.buildSvgWithAssets( + icon: icon, + width: 40.w, + height: 40.h, + fit: BoxFit.cover, + applyThemeColor: false + ).toShimmer2(isShow: false, radius: 12.r), + SizedBox(width: 8.w), + Flexible(child: labelText.toText12(isBold: true, maxLine: 2)), + ], + ), ), + SizedBox(width: 12.w), Transform.flip( flipX: appState.isArabic(), - child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon_small, width: 10.w, height: 10.h, fit: BoxFit.contain, iconColor: AppColors.textColor), + child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon_small, width: 12.h, height: 12.h, fit: BoxFit.contain, iconColor: AppColors.textColor), ), ], ).paddingAll(12.w), 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 5a9ae8b6..c0a5492b 100644 --- a/lib/presentation/medical_file/widgets/medical_file_appointment_card.dart +++ b/lib/presentation/medical_file/widgets/medical_file_appointment_card.dart @@ -152,7 +152,7 @@ class _MedicalFileAppointmentCardState extends State backgroundColor: AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel) ? AppColors.greyColor : AppColors.secondaryLightRedColor, textColor: AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel) ? AppColors.textColor : AppColors.primaryRedColor, - padding: EdgeInsets.only(top: 12.h, left: 8.w, right: 8.w, bottom: 8.h), + padding: EdgeInsets.all(8.h), ).toShimmer2(isShow: widget.myAppointmentsViewModel.isMyAppointmentsLoading), SizedBox(height: 16.h), IntrinsicWidth( @@ -310,14 +310,14 @@ class _MedicalFileAppointmentCardState extends State borderRadius: 10.r, ), child: Padding( - padding: EdgeInsets.all(10.w), + padding: EdgeInsets.all(10.h), child: Transform.flip( flipX: appState.isArabic(), child: Utils.buildSvgWithAssets( iconColor: AppColors.whiteColor, icon: AppAssets.forward_arrow_icon_small, - width: 40.h, - height: 40.h, + width: 36.h, + height: 36.h, fit: BoxFit.contain, ), ), -- 2.30.2