diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 5f85a120..41dbf5d1 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -4,7 +4,9 @@ const Map> localizedValues = { 'language': {'en': 'App Language', 'ar': 'لغة التطبيق'}, 'lanEnglish': {'en': 'English', 'ar': 'English'}, 'lanArabic': {'en': 'العربية', 'ar': 'العربية'}, - 'doctorReply': {'en': 'Doctor Reply', 'ar': 'رد الطبيب'}, + 'theDoctor': {'en': 'Doctor', 'ar': 'الطبيب'}, + 'reply': {'en': 'Reply', 'ar': 'رد'}, + 'time': {'en': 'Time', 'ar': 'الوقت'}, 'fileNo': {'en': 'File No:', 'ar': 'رقم الملف:'}, 'mobileNo': {'en': 'Mobile No', 'ar': 'رقم الموبايل'}, @@ -30,6 +32,8 @@ const Map> localizedValues = { }, 'outPatients': {'en': 'Out-Patients', 'ar': 'ةالمريض الخارجي'}, 'searchPatient': {'en': 'Search Patient', 'ar': 'البحث عن مريض'}, + 'searchAbout': {'en': 'Search', 'ar': 'البحث عن'}, + 'patient': {'en': 'Patient', 'ar': ' مريض'}, 'labResult': {'en': 'Lab Result', 'ar': 'نتيجة المختبر'}, 'todayStatistics': {'en': 'Today Statistics', 'ar': 'إحصائيات اليوم'}, 'arrived': {'en': 'Arrived', 'ar': 'وصل'}, @@ -59,7 +63,8 @@ const Map> localizedValues = { 'searchMedicineNameHere': {'en': 'Search Medicine ', 'ar': 'ابحث هنا'}, 'youCanFind': {'en': 'You Can Find ', 'ar': 'تستطيع ان تجد '}, 'itemsInSearch': {'en': 'items in search', 'ar': 'عناصر في البحث'}, - 'qrReader': {'en': 'QR Reader', 'ar': 'قارىء رمز الQR'}, + 'qr': {'en': 'QR', 'ar': 'QR'}, + 'reader': {'en': 'Reader', 'ar': 'قارىء رمز ال'}, 'startScanning': {'en': 'Start Scanning', 'ar': 'بدء المسح'}, 'scanQrCode': { 'en': 'scan Qr code to retrieve patient profile', diff --git a/lib/screens/QR_reader_screen.dart b/lib/screens/QR_reader_screen.dart index 927ce478..28c6702a 100644 --- a/lib/screens/QR_reader_screen.dart +++ b/lib/screens/QR_reader_screen.dart @@ -56,7 +56,7 @@ class _QrReaderScreenState extends State { @override Widget build(BuildContext context) { return AppScaffold( - appBarTitle: TranslationBase.of(context).qrReader, + appBarTitle: TranslationBase.of(context).qr+ TranslationBase.of(context).reader, body: Center( child: Container( margin: EdgeInsets.only(top: SizeConfig.realScreenHeight / 7), diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart index bf272837..b793fe5b 100644 --- a/lib/screens/dashboard_screen.dart +++ b/lib/screens/dashboard_screen.dart @@ -651,6 +651,7 @@ class _DashboardScreenState extends State { DashboardItem( child: Column( mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, children: [ Center( child: Icon( @@ -659,12 +660,19 @@ class _DashboardScreenState extends State { color: Colors.black, ), ), - AppText( - TranslationBase - .of(context) - .searchPatient, - color: Colors.black, - textAlign: TextAlign.center, + Column( + children: [ + AppText( + TranslationBase.of(context).searchAbout, + color: Colors.black, + textAlign: TextAlign.center, + ), + AppText( + TranslationBase.of(context).patient, + color: Colors.black, + textAlign: TextAlign.center, + ) + ], ) ], ), @@ -682,12 +690,23 @@ class _DashboardScreenState extends State { size: 50, color: Colors.black, ), - AppText( - TranslationBase - .of(context) - .doctorReply, - textAlign: TextAlign.center, - color: Colors.black, + Column( + children: [ + AppText( + TranslationBase + .of(context) + .theDoctor, + textAlign: TextAlign.center, + color: Colors.black, + ), + AppText( + TranslationBase + .of(context) + .reply, + textAlign: TextAlign.center, + color: Colors.black, + ), + ], ) ], ), @@ -755,12 +774,23 @@ class _DashboardScreenState extends State { size: 50, color: Colors.black, ), - AppText( - TranslationBase - .of(context) - .qrReader, - color: Colors.black, - textAlign: TextAlign.center, + Column( + children: [ + AppText( + TranslationBase + .of(context) + .qr, + color: Colors.black, + textAlign: TextAlign.center, + ), + AppText( + TranslationBase + .of(context) + .reader, + color: Colors.black, + textAlign: TextAlign.center, + ), + ], ) ], ), diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index ebde7a9b..9793bfa3 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -24,7 +24,8 @@ class TranslationBase { String get lanArabic => localizedValues['lanArabic'][locale.languageCode]; - String get doctorReply => localizedValues['doctorReply'][locale.languageCode]; + String get theDoctor => localizedValues['theDoctor'][locale.languageCode]; + String get reply => localizedValues['reply'][locale.languageCode]; String get time => localizedValues['time'][locale.languageCode]; @@ -56,6 +57,10 @@ class TranslationBase { String get outPatients => localizedValues['outPatients'][locale.languageCode]; String get searchPatient => localizedValues['searchPatient'][locale.languageCode]; + String get searchAbout => + localizedValues['searchAbout'][locale.languageCode]; + String get patient => + localizedValues['patient'][locale.languageCode]; String get labResult => localizedValues['labResult'][locale.languageCode]; String get todayStatistics => localizedValues['todayStatistics'][locale.languageCode]; @@ -91,7 +96,8 @@ class TranslationBase { String get youCanFind => localizedValues['youCanFind'][locale.languageCode]; String get itemsInSearch => localizedValues['itemsInSearch'][locale.languageCode]; - String get qrReader => localizedValues['qrReader'][locale.languageCode]; + String get qr => localizedValues['qr'][locale.languageCode]; + String get reader => localizedValues['reader'][locale.languageCode]; String get startScanning => localizedValues['startScanning'][locale.languageCode]; String get scanQrCode => localizedValues['scanQrCode'][locale.languageCode]; diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index 37c0717c..d022b352 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -125,7 +125,7 @@ class _AppDrawerState extends State { ), InkWell( child: DrawerItem( - TranslationBase.of(context).qrReader, DoctorApp.qr_code), + TranslationBase.of(context).qr+ TranslationBase.of(context).reader, DoctorApp.qr_code), onTap: () { Navigator.pop(context); Navigator.of(context).pushNamed(QR_READER);