From 772f6caa38e2ebdacbe4de6116a98bb7ab7cae30 Mon Sep 17 00:00:00 2001 From: Sultan khan Date: Mon, 13 Apr 2026 17:29:49 +0300 Subject: [PATCH] updates --- lib/generated/codegen_loader.g.dart | 32 ++++++--- lib/generated/locale_kesy.g.dart | 8 +++ lib/generated/locale_keys.g.dart | 2 + .../widgets/appointment_card.dart | 65 ++++++++++--------- 4 files changed, 69 insertions(+), 38 deletions(-) diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart index 2b55cfc1..b8c7ee0b 100644 --- a/lib/generated/codegen_loader.g.dart +++ b/lib/generated/codegen_loader.g.dart @@ -1190,14 +1190,22 @@ class CodegenLoader extends AssetLoader{ "monitorCholesterolLevels": "راقب مستويات الكوليسترول، وقيّم مخاطر صحة القلب، واتخذ خطوات استباقية للرفاهية.", "triglyceridesFatBlood": "الدهون الثلاثية في الدم", "understandTriglyceridesImpact": "افهم تأثير الدهون الثلاثية على صحة القلب مع رؤى مخصصة وتوصيات الخبراء.", - "bmiCalculator": "حاسبة\nمؤشر كتلة الجسم", - "caloriesCalculator": "حاسبة\nالسعرات الحرارية", - "bmrCalculator": "حاسبة\nمعدل الأيض الأساسي", - "idealBodyWeight": "الوزن المثالي\nللجسم", - "bodyFatCalculator": "حاسبة\nدهون الجسم", - "carbsProteinFat": "الكربوهيدرات\nالبروتين والدهون", - "ovulationPeriod": "فترة\nالإباضة", - "deliveryDueDate": "تاريخ الولادة\nالمتوقع", + "bmiCalculator": "حاسبة مؤشر كتلة الجسم", + "bmiCalculatorDesc": "احسب مؤشر كتلة جسمك لفهم نطاق وزنك الصحي.", + "caloriesCalculator": "حاسبةالسعرات الحرارية", + "caloriesCalculatorDesc": "اكتشف عدد السعرات الحرارية التي تحتاجها يومياً للحفاظ على الوزن أو فقدانه.", + "bmrCalculator": "حاسبة معدل الأيض الأساسي", + "bmrCalculatorDesc": "حدد معدل الأيض الأساسي ومتطلباتك اليومية من الطاقة.", + "idealBodyWeight": "الوزن المثالي للجسم", + "idealBodyWeightDesc": "اكتشف وزنك المثالي بناءً على الطول والعمر وبنية الجسم.", + "bodyFatCalculator": "حاسبة دهون الجسم", + "bodyFatCalculatorDesc": "قدّر نسبة دهون جسمك لتتبع أهداف اللياقة والصحة.", + "carbsProteinFat": "الكربوهيدرات البروتين والدهون", + "carbsProteinFatDesc": "وازن بين العناصر الغذائية مع النسب الصحيحة من الكربوهيدرات والبروتين والدهون.", + "ovulationPeriod": "فترة الإباضة", + "ovulationPeriodDesc": "تتبع فترة خصوبتك وخطط للحمل بدقة.", + "deliveryDueDate": "تاريخ الولادة المتوقع", + "deliveryDueDateDesc": "احسب تاريخ ولادتك المتوقع وراقب مراحل الحمل.", "low": "منخفض", "preDiabetic": "ما قبل السكري", "high": "مرتفع", @@ -2911,13 +2919,21 @@ static const Map _en_US = { "triglyceridesFatBlood": "Triglycerides Fat Blood", "understandTriglyceridesImpact": "Understand triglycerides' impact on heart health with personalized insights and expert recommendations.", "bmiCalculator": "BMI Calculator", + "bmiCalculatorDesc": "Calculate your body mass index to understand your healthy weight range.", "caloriesCalculator": "Calories Calculator", + "caloriesCalculatorDesc": "Find out how many calories you need daily to maintain or lose weight.", "bmrCalculator": "BMR Calculator", + "bmrCalculatorDesc": "Determine your basal metabolic rate and daily energy requirements.", "idealBodyWeight": "Ideal Body Weight", + "idealBodyWeightDesc": "Discover your ideal weight based on height, age, and body structure.", "bodyFatCalculator": "Body Fat Calculator", + "bodyFatCalculatorDesc": "Estimate your body fat percentage to track fitness and health goals.", "carbsProteinFat": "Carbs Protein & Fat", + "carbsProteinFatDesc": "Balance your macros with the right carbs, protein, and fat ratios.", "ovulationPeriod": "Ovulation Period", + "ovulationPeriodDesc": "Track your fertile window and plan for conception with accuracy.", "deliveryDueDate": "Delivery Due Date", + "deliveryDueDateDesc": "Calculate your expected delivery date and monitor pregnancy milestones.", "low": "Low", "preDiabetic": "Pre-diabetic", "high": "High", diff --git a/lib/generated/locale_kesy.g.dart b/lib/generated/locale_kesy.g.dart index 41bfb2b0..06f92632 100644 --- a/lib/generated/locale_kesy.g.dart +++ b/lib/generated/locale_kesy.g.dart @@ -1177,13 +1177,21 @@ abstract class LocaleKeys { static const triglyceridesFatBlood = 'triglyceridesFatBlood'; static const understandTriglyceridesImpact = 'understandTriglyceridesImpact'; static const bmiCalculator = 'bmiCalculator'; + static const bmiCalculatorDesc = 'bmiCalculatorDesc'; static const caloriesCalculator = 'caloriesCalculator'; + static const caloriesCalculatorDesc = 'caloriesCalculatorDesc'; static const bmrCalculator = 'bmrCalculator'; + static const bmrCalculatorDesc = 'bmrCalculatorDesc'; static const idealBodyWeight = 'idealBodyWeight'; + static const idealBodyWeightDesc = 'idealBodyWeightDesc'; static const bodyFatCalculator = 'bodyFatCalculator'; + static const bodyFatCalculatorDesc = 'bodyFatCalculatorDesc'; static const carbsProteinFat = 'carbsProteinFat'; + static const carbsProteinFatDesc = 'carbsProteinFatDesc'; static const ovulationPeriod = 'ovulationPeriod'; + static const ovulationPeriodDesc = 'ovulationPeriodDesc'; static const deliveryDueDate = 'deliveryDueDate'; + static const deliveryDueDateDesc = 'deliveryDueDateDesc'; static const low = 'low'; static const preDiabetic = 'preDiabetic'; static const high = 'high'; diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index 10528bb3..06f92632 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -200,6 +200,7 @@ abstract class LocaleKeys { static const enterEmail = 'enterEmail'; static const family = 'family'; static const familyTitle = 'familyTitle'; + static const familyTitle2 = 'familyTitle2'; static const myFamily = 'myFamily'; static const addNewMember = 'addNewMember'; static const sentRequests = 'sentRequests'; @@ -1235,6 +1236,7 @@ abstract class LocaleKeys { static const hmgServices = 'hmgServices'; static const personalServices = 'personalServices'; static const habibWallet = 'habibWallet'; + static const habibWallet2 = 'habibWallet2'; static const loginToViewWalletBalance = 'loginToViewWalletBalance'; static const loginToViewMedicalFile = 'loginToViewMedicalFile'; static const addMember = 'addMember'; diff --git a/lib/presentation/appointments/widgets/appointment_card.dart b/lib/presentation/appointments/widgets/appointment_card.dart index 8923e9fa..fabb9043 100644 --- a/lib/presentation/appointments/widgets/appointment_card.dart +++ b/lib/presentation/appointments/widgets/appointment_card.dart @@ -28,6 +28,7 @@ import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart'; import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart'; import 'dart:ui' as ui; import 'package:hmg_patient_app_new/presentation/appointments/appointment_payment_page.dart'; +import 'package:lottie/lottie.dart'; class AppointmentCard extends StatefulWidget { final PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel; @@ -705,42 +706,46 @@ class _AppointmentCardState extends State { return Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ - // Message text + Lottie.asset(AppAnimations.warningAnimation, + repeat: false, reverse: false, frameRate: FrameRate(60), width: 100.h, height: 100.h, fit: BoxFit.fill), + SizedBox(height: 12,), LocaleKeys.upcomingPaymentPending.tr(context: context).toText14( color: AppColors.textColor, isCenter: true, ), SizedBox(height: 24.h), + + // Countdown Timer - DD : HH : MM : SS format with labels - Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // Days - _buildTimeUnit( - _timeRemaining != null ? _timeRemaining!.inDays.toString().padLeft(2, '0') : '00', - LocaleKeys.days.tr(context: context), - ), - _buildTimeSeparator(), - // Hours - _buildTimeUnit( - _timeRemaining != null ? _timeRemaining!.inHours.remainder(24).toString().padLeft(2, '0') : '00', - LocaleKeys.hours.tr(context: context), - ), - _buildTimeSeparator(), - // Minutes - _buildTimeUnit( - _timeRemaining != null ? _timeRemaining!.inMinutes.remainder(60).toString().padLeft(2, '0') : '00', - LocaleKeys.minutes.tr(context: context), - ), - _buildTimeSeparator(), - // Seconds - _buildTimeUnit( - _timeRemaining != null ? _timeRemaining!.inSeconds.remainder(60).toString().padLeft(2, '0') : '00', - LocaleKeys.seconds.tr(context: context), - ), - ], - ), + // Row( + // mainAxisAlignment: MainAxisAlignment.center, + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // // Days + // _buildTimeUnit( + // _timeRemaining != null ? _timeRemaining!.inDays.toString().padLeft(2, '0') : '00', + // LocaleKeys.days.tr(context: context), + // ), + // _buildTimeSeparator(), + // // Hours + // _buildTimeUnit( + // _timeRemaining != null ? _timeRemaining!.inHours.remainder(24).toString().padLeft(2, '0') : '00', + // LocaleKeys.hours.tr(context: context), + // ), + // _buildTimeSeparator(), + // // Minutes + // _buildTimeUnit( + // _timeRemaining != null ? _timeRemaining!.inMinutes.remainder(60).toString().padLeft(2, '0') : '00', + // LocaleKeys.minutes.tr(context: context), + // ), + // _buildTimeSeparator(), + // // Seconds + // _buildTimeUnit( + // _timeRemaining != null ? _timeRemaining!.inSeconds.remainder(60).toString().padLeft(2, '0') : '00', + // LocaleKeys.seconds.tr(context: context), + // ), + // ], + // ), SizedBox(height: 24.h), // Green Acknowledge button with checkmark icon CustomButton(