diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index de0b836f..e5d512c1 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1394,6 +1394,25 @@ const Map localizedValues = { "enter-passport-number": {"en": "Please confirm or update your passport number:", "ar": "الرجاء تأكيد أو تحديث رقم جواز السفر الخاص بك:"}, "valid-passport-number": {"en": "Please enter valid passport number", "ar": "الرجاء إدخال رقم جواز سفر صالح"}, "continue-plan": {"en": "Continue with the treatment plan?", "ar": "إكمال الخطة العلاجية؟"}, + "about-app": {"en": "About the app", "ar": "عن التطبيق"}, + "about-points": { + "length": {"en": "16", "ar": "16"}, + "1": {"en": "Online Appointment Booking & rescheduling", "ar": "حجز المواعيد إلكترونياً و إعادة جدولتها"}, + "2": {"en": "Insurance approval status", "ar": "موافقات شركات التأمين الطبية"}, + "3": {"en": "Find A doctor", "ar": "معلومات الأطباء والبحث عنهم وسؤالهم"}, + "4": {"en": "Ask your doctor", "ar": "اسأل طبيبك"}, + "5": {"en": "Medical prescriptions", "ar": "الوصفات الطبية"}, + "6": {"en": "Lab results", "ar": "نتائج التحاليل المخبرية"}, + "7": {"en": "Hospitals contact numbers", "ar": "أرقام هواتف جميع المستشفيات"}, + "8": {"en": "Doctor profiles", "ar": "ملف الطبيب"}, + "9": {"en": "Hospitals locations", "ar": "مواقع المستشفيات على الخريطة"}, + "10": {"en": "Pharmacies Locations", "ar": "مواقع الصيدليات على الخريطة"}, + "11": {"en": "Hospital's Virtual Tour", "ar": "جولة افتراضية داخل المستشفيات"}, + "12": {"en": "Official Social Media", "ar": "مواقع التواصل الاجتماعي الخاصة بالمجموعة"}, + "13": {"en": "Vaccines Schedule", "ar": "جدول التطعيمات"}, + "14": {"en": "Health Calculators", "ar": "حاسبات صحية"}, + "15": {"en": "Other Services", "ar": "خدمات أخرى"} + }, "dental-procedure-list": {"en": "Dental Procedures for this Appointment: ", "ar": "إجراءات الأسنان لهذا الموعد:"}, "time-needed": {"en": "Time Needed:", "ar": "الوقت اللازم:"}, "total-time-needed": {"en": "Total Appointment Time:", "ar": "وقت المواعيد الكلي:"}, diff --git a/lib/pages/MyAppointments/AppointmentDetails.dart b/lib/pages/MyAppointments/AppointmentDetails.dart index cece8636..2cc5020e 100644 --- a/lib/pages/MyAppointments/AppointmentDetails.dart +++ b/lib/pages/MyAppointments/AppointmentDetails.dart @@ -32,7 +32,7 @@ class AppointmentDetails extends StatefulWidget { static bool showFooterButton = false; final int parentIndex; - AppointmentDetails({@required this.appo, this.parentIndex,this.doctorSchedule}); + AppointmentDetails({@required this.appo, this.parentIndex, this.doctorSchedule}); @override _AppointmentDetailsState createState() => _AppointmentDetailsState(); @@ -50,8 +50,7 @@ class _AppointmentDetailsState extends State with SingleTick void initState() { AppointmentDetails.showFooterButton = false; if (widget.doctorSchedule != null) { - _tabController = - new TabController(length: 2, vsync: this, initialIndex: 1); + _tabController = new TabController(length: 2, vsync: this, initialIndex: 1); widget.appo.appointmentDate = widget.doctorSchedule['Date']; } else { _tabController = new TabController(length: 2, vsync: this); @@ -212,8 +211,7 @@ class _AppointmentDetailsState extends State with SingleTick physics: NeverScrollableScrollPhysics(), children: [ AppointmentActions(appo: widget.appo, tabController: _tabController, enableFooterButton: enableFooterButton), - DocAvailableAppointments(doctor: getDoctorObject(),doctorSchedule: widget.doctorSchedule, - isLiveCareAppointment: widget.appo.isLiveCareAppointment) + DocAvailableAppointments(doctor: getDoctorObject(), doctorSchedule: widget.doctorSchedule, isLiveCareAppointment: widget.appo.isLiveCareAppointment) ], controller: _tabController, ), @@ -568,7 +566,7 @@ class _AppointmentDetailsState extends State with SingleTick } void openSchedule() { - Navigator.push(context, FadePage(page: SchedulePage(getDoctorObject()))); + Navigator.push(context, FadePage(page: SchedulePage(doctorList: getDoctorObject()))); } setTab() async { diff --git a/lib/pages/settings/InfoPage.dart b/lib/pages/settings/InfoPage.dart index cb7a8fc6..c835b10e 100644 --- a/lib/pages/settings/InfoPage.dart +++ b/lib/pages/settings/InfoPage.dart @@ -5,10 +5,6 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; class AboutApp extends StatelessWidget { @override Widget build(BuildContext context) { - return AppScaffold( - isShowAppBar: true, - appBarTitle: TranslationBase.of(context).aboutApp, - isShowDecPage: false, - body: Container()); + return AppScaffold(isShowAppBar: true, appBarTitle: TranslationBase.of(context).aboutApp, isShowDecPage: false, body: Container()); } } diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index f50f88bf..8a6a206d 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -2137,6 +2137,8 @@ class TranslationBase { String get validPassportNumber => localizedValues["valid-passport-number"][locale.languageCode]; String get continuePlan => localizedValues["continue-plan"][locale.languageCode]; String get dentalProcedureList => localizedValues["dental-procedure-list"][locale.languageCode]; + String get aboutApp => localizedValues["about-app"][locale.languageCode]; + String get aboutPointsLength => localizedValues["about-points"]['length'][locale.languageCode]; String get timeNeeded => localizedValues["time-needed"][locale.languageCode]; String get totalTimeNeeded => localizedValues["total-time-needed"][locale.languageCode]; } @@ -2156,6 +2158,6 @@ class TranslationBaseDelegate extends LocalizationsDelegate { bool shouldReload(TranslationBaseDelegate old) => false; } -extension xTranslationBase on TranslationBase{ +extension xTranslationBase on TranslationBase { isArabic() => locale.languageCode == "ar"; -} \ No newline at end of file +}