diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 20393d92..93575607 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -3,5 +3,13 @@ const Map> localizedValues = { 'settings': {'en': 'Settings', 'ar': 'الاعدادات'}, 'language': {'en': 'App Language', 'ar': 'لغة التطبيق'}, 'lanEnglish': {'en': 'English', 'ar': 'English'}, - 'lanArabic': {'en': 'العربية', 'ar': 'العربية'} + 'lanArabic': {'en': 'العربية', 'ar': 'العربية'}, + 'doctorReply':{'en': 'Doctor Reply', 'ar': 'رد الطبيب'}, + 'time' :{'en': 'Time','ar':'الوقت'}, + 'fileNo' :{'en':'File No', 'ar':'رقم الملف'}, + 'mobileNo' :{'en':'Mobile No', 'ar':'رقم الموبايل'}, + 'messagesScreenToolbarTitle' : {'en': 'Messages','ar': 'الرسائل' }, + 'mySchedule' : {'en': 'My Schedule', 'ar' : 'جدولي'}, + 'errorNoSchedule' :{'en': 'You don\'t have any Schedule' , 'ar': 'ليس لديك أي جدول زمني'}, + }; diff --git a/lib/screens/doctor/doctor_reply_screen.dart b/lib/screens/doctor/doctor_reply_screen.dart index ad200706..9f73feea 100644 --- a/lib/screens/doctor/doctor_reply_screen.dart +++ b/lib/screens/doctor/doctor_reply_screen.dart @@ -1,5 +1,6 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/providers/doctor_reply_provider.dart'; +import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart'; @@ -24,7 +25,7 @@ class DoctorReplyScreen extends StatelessWidget { Widget build(BuildContext context) { _doctorReplyProvider = Provider.of(context); return AppScaffold( - appBarTitle: 'Doctor Reply', + appBarTitle: TranslationBase.of(context).doctorReply, showAppDrawer: false, body:_doctorReplyProvider.isLoading? DrAppCircularProgressIndeicator(): _doctorReplyProvider.isError? Center( @@ -62,7 +63,7 @@ class DoctorReplyScreen extends StatelessWidget { Row( children: [ AppText( - 'Time', + TranslationBase.of(context).time, fontSize: 2.5 * SizeConfig.textMultiplier, ), Container( @@ -80,7 +81,7 @@ class DoctorReplyScreen extends StatelessWidget { Row( children: [ AppText( - 'File No', + TranslationBase.of(context).fileNo, fontSize: 2.5 * SizeConfig.textMultiplier, ), Container( @@ -98,7 +99,7 @@ class DoctorReplyScreen extends StatelessWidget { Row( children: [ AppText( - 'Mobile No', + TranslationBase.of(context).mobileNo, fontSize: 2.5 * SizeConfig.textMultiplier, ), Container( diff --git a/lib/screens/doctor/message_screen.dart b/lib/screens/doctor/message_screen.dart index 92eb61f3..1321c4fc 100644 --- a/lib/screens/doctor/message_screen.dart +++ b/lib/screens/doctor/message_screen.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; @@ -6,7 +7,7 @@ class MessagesScreen extends StatelessWidget { Widget build(BuildContext context) { return AppScaffold( current: 1, - appBarTitle: 'Messages', + appBarTitle: TranslationBase.of(context).messagesScreenToolbarTitle, body: Center( child: Text('Messages heeer'), ), diff --git a/lib/screens/doctor/my_schedule_screen.dart b/lib/screens/doctor/my_schedule_screen.dart index f4627d6c..b9f60889 100644 --- a/lib/screens/doctor/my_schedule_screen.dart +++ b/lib/screens/doctor/my_schedule_screen.dart @@ -1,4 +1,5 @@ import 'package:doctor_app_flutter/providers/schedule_provider.dart'; +import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:flutter/material.dart'; @@ -18,7 +19,7 @@ class MyScheduleScreen extends StatelessWidget { // pageOnly: false, showBottomBar: false, showAppDrawer: false, - appBarTitle: 'My Schedule', + appBarTitle: TranslationBase.of(context).mySchedule, body: scheduleProvider.isLoading ? DrAppCircularProgressIndeicator() : scheduleProvider.isError @@ -31,7 +32,7 @@ class MyScheduleScreen extends StatelessWidget { : scheduleProvider.listDoctorWorkingHoursTable.length == 0 ? Center( child: AppText( - 'You don\'t have any Schedule', + TranslationBase.of(context).errorNoSchedule, color: Theme.of(context).errorColor, ), ) @@ -48,7 +49,7 @@ class MyScheduleScreen extends StatelessWidget { SizedBox( height: 20, ), - AppText('My Schedule', + AppText(TranslationBase.of(context).mySchedule, fontSize: 2.5 * SizeConfig.textMultiplier), scheduleListByDate(), diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index 1af735a1..b5f75602 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -25,6 +25,21 @@ class TranslationBase { String get lanArabic => localizedValues['lanArabic'][locale.languageCode]; + String get doctorReply => localizedValues['doctorReply'][locale.languageCode]; + + String get time => localizedValues['time'][locale.languageCode]; + + String get fileNo => localizedValues['fileNo'][locale.languageCode]; + + String get mobileNo => localizedValues['mobileNo'][locale.languageCode]; + + String get messagesScreenToolbarTitle => localizedValues['messagesScreenToolbarTitle'][locale.languageCode]; + + String get mySchedule => localizedValues['mySchedule'][locale.languageCode]; + + String get errorNoSchedule => localizedValues['errorNoSchedule'][locale.languageCode]; + + } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/shared/card_with_bg_widget.dart b/lib/widgets/shared/card_with_bg_widget.dart index 07562a5e..39468b83 100644 --- a/lib/widgets/shared/card_with_bg_widget.dart +++ b/lib/widgets/shared/card_with_bg_widget.dart @@ -1,7 +1,9 @@ import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/providers/project_provider.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; +import 'package:provider/provider.dart'; /* *@author: Mohammad Aljammal @@ -18,6 +20,7 @@ class CardWithBgWidget extends StatelessWidget { @override Widget build(BuildContext context) { + ProjectProvider projectProvider = Provider.of(context); return Container( margin: EdgeInsets.symmetric(vertical: 10.0), width: double.infinity, @@ -31,15 +34,26 @@ class CardWithBgWidget extends StatelessWidget { borderRadius: BorderRadius.all(Radius.circular(10.0)), child: Stack( children: [ - Positioned( - child: Container( - width: 10, - color: Hexcolor('#58434F'), + if (projectProvider.isArabic) + Positioned( + child: Container( + width: 10, + color: Hexcolor('#58434F'), + ), + bottom: 0, + top: 0, + right: 0, + ) + else + Positioned( + child: Container( + width: 10, + color: Hexcolor('#58434F'), + ), + bottom: 0, + top: 0, + left: 0, ), - bottom: 0, - top: 0, - left: 0, - ), Container( padding: EdgeInsets.all(15.0), margin: EdgeInsets.only(left: 10),