diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index 9c1c962..b6fe4bf 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -1499,5 +1499,6 @@ "selectTime": "حدد الوقت", "pleaseWaitYouWillBeCalledForVitalSigns": "يرجى الانتظار! سيتم استدعاؤك لقياس العلامات الحيوية", "pleaseVisitRoomForVitalSigns": "يرجى زيارة الغرفة {roomNumber} لقياس العلامات الحيوية", - "pleaseVisitRoomToTheDoctor": "يرجى زيارة الغرفة {roomNumber} لمقابلة الطبيب" + "pleaseVisitRoomToTheDoctor": "يرجى زيارة الغرفة {roomNumber} لمقابلة الطبيب", + "timeFor": "الوقت" } diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index b3b2edf..b1fd6cf 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -1488,5 +1488,6 @@ abstract class LocaleKeys { static const pleaseWaitYouWillBeCalledForVitalSigns = 'pleaseWaitYouWillBeCalledForVitalSigns'; static const pleaseVisitRoomForVitalSigns = 'pleaseVisitRoomForVitalSigns'; static const pleaseVisitRoomToTheDoctor = 'pleaseVisitRoomToTheDoctor'; + static const timeFor = 'Time for'; } diff --git a/lib/presentation/active_medication/active_medication_page.dart b/lib/presentation/active_medication/active_medication_page.dart index 14da5b0..be6b82a 100644 --- a/lib/presentation/active_medication/active_medication_page.dart +++ b/lib/presentation/active_medication/active_medication_page.dart @@ -393,16 +393,16 @@ class _ActiveMedicationPageState extends State { children: [ AppCustomChipWidget( labelText: - LocaleKeys.route.tr(namedArgs: {'route': med.route ?? ''})), + LocaleKeys.route.tr(namedArgs: {LocaleKeys.route.tr(): med.route ?? ''})), AppCustomChipWidget( labelText: - LocaleKeys.frequency.tr(namedArgs: {'frequency': med.frequency ?? ''})), + LocaleKeys.frequency.tr(namedArgs: {LocaleKeys.frequency.tr(): med.frequency ?? ''})), AppCustomChipWidget( labelText: - LocaleKeys.instruction.tr(namedArgs: {'instruction': med.doseDailyQuantity?.toString() ?? ''})), + LocaleKeys.instruction.tr(namedArgs: {LocaleKeys.instruction.tr(): med.doseDailyQuantity?.toString() ?? ''})), AppCustomChipWidget( labelText: - LocaleKeys.duration.tr(namedArgs: {'days': med.days.toString() ?? ''})), + LocaleKeys.duration.tr(namedArgs: {LocaleKeys.days.tr(): med.days.toString() ?? ''})), ], ), ], @@ -813,7 +813,7 @@ class _ReminderTimerDialogState extends State { text: TextSpan( children: [ TextSpan( - text: "Time for ", + text: LocaleKeys.timeFor.tr(), style: TextStyle( fontSize: 18.f, fontWeight: FontWeight.bold, @@ -842,7 +842,7 @@ class _ReminderTimerDialogState extends State { ), ), TextSpan( - text: " reminder", + text: LocaleKeys.reminder.tr(), style: TextStyle( fontSize: 18.f, fontWeight: FontWeight.bold, diff --git a/lib/presentation/medical_file/medical_file_page.dart b/lib/presentation/medical_file/medical_file_page.dart index ad2461f..cff4169 100644 --- a/lib/presentation/medical_file/medical_file_page.dart +++ b/lib/presentation/medical_file/medical_file_page.dart @@ -859,7 +859,11 @@ class _MedicalFilePageState extends State { Expanded( child: CustomButton( text: LocaleKeys.allMedications.tr(context: context), - onPressed: () {}, + onPressed: () { Navigator.of(context).push( + CustomPageRoute( + page: ActiveMedicationPage(), + ), + );}, backgroundColor: AppColors.secondaryLightRedColor, borderColor: AppColors.secondaryLightRedColor, textColor: AppColors.primaryRedColor,