From 34cc16c24f442e2a1a821e91af19e03f1e43ee0e Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 28 Apr 2026 16:02:44 +0300 Subject: [PATCH] Updates --- assets/langs/ar-SA.json | 3 ++- assets/langs/en-US.json | 3 ++- lib/core/api/api_client.dart | 2 +- lib/core/api_consts.dart | 2 +- lib/core/utils/size_utils.dart | 9 +++++++-- lib/features/hmg_services/hmg_services_repo.dart | 10 +++++----- lib/generated/locale_keys.g.dart | 1 + .../appointments/widgets/appointment_card.dart | 2 +- .../history/widget/RequestStatus.dart | 2 +- lib/presentation/home/landing_page.dart | 4 ++-- .../insurance/widgets/patient_insurance_card.dart | 5 +++-- 11 files changed, 26 insertions(+), 17 deletions(-) diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index f0e830f7..0a8ec974 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -1841,5 +1841,6 @@ "thisAboveInfoPrescription": "تم تحليل الوصفة الطبية هذه بواسطة الذكاء الاصطناعي، وهي لا تُعدّ نصيحة طبية. استشر طبيبك المختص للتشخيص والعلاج.", "liveCareNotificationPermissionsMessage": "يتطلب لايف كير أذونات الإشعارات، يرجى السماح بهذه الأذونات للمتابعة.", "weatherIndicators": "طقس", - "submitRating": "إرسال التقييم" + "submitRating": "إرسال التقييم", + "completedPrescriptionOrder": "تمت الخدمة" } diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json index e17992f9..9b969f79 100644 --- a/assets/langs/en-US.json +++ b/assets/langs/en-US.json @@ -1831,7 +1831,8 @@ "thisAboveInfoPrescription": "This prescription was analyzed by AI, and it is not medical advice. Consult your healthcare provider for diagnosis and treatment.", "liveCareNotificationPermissionsMessage": "LiveCare requires Notifications permission, Please allow to proceed.", "weatherIndicators": "Weather", - "submitRating": "Submit" + "submitRating": "Submit", + "completedPrescriptionOrder": "Completed" } diff --git a/lib/core/api/api_client.dart b/lib/core/api/api_client.dart index 5172f77b..896fe4a4 100644 --- a/lib/core/api/api_client.dart +++ b/lib/core/api/api_client.dart @@ -243,7 +243,7 @@ class ApiClientImp implements ApiClient { http.Response response; try { response = await http.post(Uri.parse(url.trim()), body: requestBody, headers: headers); - debugPrint("response: ${response.body}", wrapWidth: 2048); + // debugPrint("response: ${response.body}", wrapWidth: 2048); } on SocketException catch (e) { final message = e.message.contains('Connection reset by peer') ? LocaleKeys.networkConnectionReset.tr() : LocaleKeys.networkErrorMessage.tr(); onFailure(message, -1, failureType: ConnectivityFailure(message)); diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index db4d6a8c..ab94fecb 100644 --- a/lib/core/api_consts.dart +++ b/lib/core/api_consts.dart @@ -282,7 +282,7 @@ class ApiConsts { static String googleCloudStorageENTranslationFileBaseURL = "https://storage.googleapis.com/hmg-patientapp-translations"; // ************ static values for Api **************** - static final double appVersionID = 20.9; + static final double appVersionID = 21.0; // static final double appVersionID = 50.7; static final int appChannelId = 3; diff --git a/lib/core/utils/size_utils.dart b/lib/core/utils/size_utils.dart index c7f3fa06..7f4013ed 100644 --- a/lib/core/utils/size_utils.dart +++ b/lib/core/utils/size_utils.dart @@ -43,8 +43,13 @@ extension ResponsiveExtension on num { // Enhanced clamping for different device types double clamp; if (SizeUtils.deviceType == DeviceType.tablet || _isFoldable) { - // More conservative scaling for tablets and foldables - clamp = (aspectRatio > 1.5 || aspectRatio < 0.67) ? 1.6 : 1.4; + if (SizeUtils.deviceType != DeviceType.tablet && _isFoldable) { + // clamp = (aspectRatio > 1.5 || aspectRatio < 0.67) ? 1.4 : 1.4; + clamp = 1.1; + } else { + // More conservative scaling for tablets and foldables + clamp = (aspectRatio > 1.5 || aspectRatio < 0.67) ? 1.6 : 1.4; + } } else { // Original logic for phones clamp = (aspectRatio > 1.3 || aspectRatio < 0.77) ? 1.6 : 1.2; diff --git a/lib/features/hmg_services/hmg_services_repo.dart b/lib/features/hmg_services/hmg_services_repo.dart index b70e024c..1484c91f 100644 --- a/lib/features/hmg_services/hmg_services_repo.dart +++ b/lib/features/hmg_services/hmg_services_repo.dart @@ -944,11 +944,11 @@ class HmgServicesRepoImp implements HmgServicesRepo { final vitalSign = VitalSignResModel.fromJson(vitalSignJson); // Debug logging for blood pressure - print('=== Repository Blood Pressure Check ==='); - print('bloodPressureHigher: ${vitalSign.bloodPressureHigher}'); - print('bloodPressureLower: ${vitalSign.bloodPressureLower}'); - print('weightKg: ${vitalSign.weightKg}'); - print('heightCm: ${vitalSign.heightCm}'); + // print('=== Repository Blood Pressure Check ==='); + // print('bloodPressureHigher: ${vitalSign.bloodPressureHigher}'); + // print('bloodPressureLower: ${vitalSign.bloodPressureLower}'); + // print('weightKg: ${vitalSign.weightKg}'); + // print('heightCm: ${vitalSign.heightCm}'); // Check if the record has at least one valid vital sign measurement final hasValidWeight = _isValidValue(vitalSign.weightKg); diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index d5410585..5ef765b6 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -1834,5 +1834,6 @@ abstract class LocaleKeys { static const liveCareNotificationPermissionsMessage = 'liveCareNotificationPermissionsMessage'; static const weatherIndicators = 'weatherIndicators'; static const submitRating = 'submitRating'; + static const completedPrescriptionOrder = 'completedPrescriptionOrder'; } diff --git a/lib/presentation/appointments/widgets/appointment_card.dart b/lib/presentation/appointments/widgets/appointment_card.dart index 000003f1..9b01ce8b 100644 --- a/lib/presentation/appointments/widgets/appointment_card.dart +++ b/lib/presentation/appointments/widgets/appointment_card.dart @@ -251,7 +251,7 @@ class _AppointmentCardState extends State { child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Utils.buildSvgWithAssets(icon: AppAssets.rating_icon, width: 15.w, height: 15.h, iconColor: AppColors.ratingColorYellow), + Utils.buildSvgWithAssets(icon: AppAssets.rating_icon, width: 14.h, height: 14.h, iconColor: AppColors.ratingColorYellow), SizedBox(height: 2.h), (isFoldable || isTablet) ? "${widget.patientAppointmentHistoryResponseModel.decimalDoctorRate}" diff --git a/lib/presentation/emergency_services/history/widget/RequestStatus.dart b/lib/presentation/emergency_services/history/widget/RequestStatus.dart index 849565a7..21a4312b 100644 --- a/lib/presentation/emergency_services/history/widget/RequestStatus.dart +++ b/lib/presentation/emergency_services/history/widget/RequestStatus.dart @@ -24,7 +24,7 @@ class RequestStatus extends StatelessWidget { case 2: //processing return LocaleKeys.underProcessing.tr(); case 3: - return LocaleKeys.completed.tr(); + return LocaleKeys.completedPrescriptionOrder.tr(); case 4: //cancel case 6: case 7: diff --git a/lib/presentation/home/landing_page.dart b/lib/presentation/home/landing_page.dart index 780c4d01..4346d8b5 100644 --- a/lib/presentation/home/landing_page.dart +++ b/lib/presentation/home/landing_page.dart @@ -448,7 +448,7 @@ class _LandingPageState extends State { ).paddingSymmetrical(24.h, 0.h) : isTablet ? SizedBox( - height: isFoldable ? 290.h : 255.h, + height: isTablet ? 290.h : 255.h, child: ListView.separated( scrollDirection: Axis.horizontal, itemCount: 3, @@ -456,7 +456,7 @@ class _LandingPageState extends State { padding: EdgeInsets.only(left: 16.h, right: 16.h), itemBuilder: (context, index) { return SizedBox( - height: isFoldable ? 290.h : 255.h, + height: isTablet ? 290.h : 255.h, width: 250.w, child: getIndexSwiperCard(index), ); diff --git a/lib/presentation/insurance/widgets/patient_insurance_card.dart b/lib/presentation/insurance/widgets/patient_insurance_card.dart index 3734bd95..6fab990c 100644 --- a/lib/presentation/insurance/widgets/patient_insurance_card.dart +++ b/lib/presentation/insurance/widgets/patient_insurance_card.dart @@ -162,10 +162,11 @@ class PatientInsuranceCard extends StatelessWidget { AppCustomChipWidget( icon: AppAssets.doctor_calendar_icon, // labelText: "${LocaleKeys.expiryDate.tr(context: context)} ${DateUtil.formatDateToDate(DateUtil.convertStringToDate(insuranceCardDetailsModel.cardValidTo), false)}", - richText: "${LocaleKeys.expiryDate.tr(context: context)} ${DateUtil.formatDateToDate(DateUtil.convertStringToDate(insuranceCardDetailsModel.cardValidTo), false)}".toText10(isEnglishOnly: true), + richText: + "${LocaleKeys.expiryDate.tr(context: context)} ${DateUtil.formatDateToDate(DateUtil.convertStringToDate(insuranceCardDetailsModel.cardValidTo), false)}".toText10(isBold: true), labelPadding: EdgeInsetsDirectional.only(start: -4.h, end: 8.h), ), - AppCustomChipWidget(richText: LocaleKeys.patientCardID.tr(namedArgs: {'id': insuranceCardDetailsModel.patientCardID ?? ''}, context: context).toText10(isEnglishOnly: true)), + AppCustomChipWidget(richText: LocaleKeys.patientCardID.tr(namedArgs: {'id': insuranceCardDetailsModel.patientCardID ?? ''}, context: context).toText10(isBold: true)), ], ), SizedBox(height: 10.h),