update local for doctor replay , my schedule and message screen

merge-requests/65/head
her_username 5 years ago
parent 216374aed2
commit b07ff8154c

@ -3,5 +3,13 @@ const Map<String, Map<String, String>> localizedValues = {
'settings': {'en': 'Settings', 'ar': 'الاعدادات'}, 'settings': {'en': 'Settings', 'ar': 'الاعدادات'},
'language': {'en': 'App Language', 'ar': 'لغة التطبيق'}, 'language': {'en': 'App Language', 'ar': 'لغة التطبيق'},
'lanEnglish': {'en': 'English', 'ar': 'English'}, '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': 'ليس لديك أي جدول زمني'},
}; };

@ -1,5 +1,6 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/providers/doctor_reply_provider.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_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_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'; import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
@ -24,7 +25,7 @@ class DoctorReplyScreen extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
_doctorReplyProvider = Provider.of(context); _doctorReplyProvider = Provider.of(context);
return AppScaffold( return AppScaffold(
appBarTitle: 'Doctor Reply', appBarTitle: TranslationBase.of(context).doctorReply,
showAppDrawer: false, showAppDrawer: false,
body:_doctorReplyProvider.isLoading? DrAppCircularProgressIndeicator(): body:_doctorReplyProvider.isLoading? DrAppCircularProgressIndeicator():
_doctorReplyProvider.isError? Center( _doctorReplyProvider.isError? Center(
@ -62,7 +63,7 @@ class DoctorReplyScreen extends StatelessWidget {
Row( Row(
children: [ children: [
AppText( AppText(
'Time', TranslationBase.of(context).time,
fontSize: 2.5 * SizeConfig.textMultiplier, fontSize: 2.5 * SizeConfig.textMultiplier,
), ),
Container( Container(
@ -80,7 +81,7 @@ class DoctorReplyScreen extends StatelessWidget {
Row( Row(
children: [ children: [
AppText( AppText(
'File No', TranslationBase.of(context).fileNo,
fontSize: 2.5 * SizeConfig.textMultiplier, fontSize: 2.5 * SizeConfig.textMultiplier,
), ),
Container( Container(
@ -98,7 +99,7 @@ class DoctorReplyScreen extends StatelessWidget {
Row( Row(
children: [ children: [
AppText( AppText(
'Mobile No', TranslationBase.of(context).mobileNo,
fontSize: 2.5 * SizeConfig.textMultiplier, fontSize: 2.5 * SizeConfig.textMultiplier,
), ),
Container( Container(

@ -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:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -6,7 +7,7 @@ class MessagesScreen extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
current: 1, current: 1,
appBarTitle: 'Messages', appBarTitle: TranslationBase.of(context).messagesScreenToolbarTitle,
body: Center( body: Center(
child: Text('Messages heeer'), child: Text('Messages heeer'),
), ),

@ -1,4 +1,5 @@
import 'package:doctor_app_flutter/providers/schedule_provider.dart'; 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/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -18,7 +19,7 @@ class MyScheduleScreen extends StatelessWidget {
// pageOnly: false, // pageOnly: false,
showBottomBar: false, showBottomBar: false,
showAppDrawer: false, showAppDrawer: false,
appBarTitle: 'My Schedule', appBarTitle: TranslationBase.of(context).mySchedule,
body: scheduleProvider.isLoading body: scheduleProvider.isLoading
? DrAppCircularProgressIndeicator() ? DrAppCircularProgressIndeicator()
: scheduleProvider.isError : scheduleProvider.isError
@ -31,7 +32,7 @@ class MyScheduleScreen extends StatelessWidget {
: scheduleProvider.listDoctorWorkingHoursTable.length == 0 : scheduleProvider.listDoctorWorkingHoursTable.length == 0
? Center( ? Center(
child: AppText( child: AppText(
'You don\'t have any Schedule', TranslationBase.of(context).errorNoSchedule,
color: Theme.of(context).errorColor, color: Theme.of(context).errorColor,
), ),
) )
@ -48,7 +49,7 @@ class MyScheduleScreen extends StatelessWidget {
SizedBox( SizedBox(
height: 20, height: 20,
), ),
AppText('My Schedule', AppText(TranslationBase.of(context).mySchedule,
fontSize: fontSize:
2.5 * SizeConfig.textMultiplier), 2.5 * SizeConfig.textMultiplier),
scheduleListByDate(), scheduleListByDate(),

@ -25,6 +25,21 @@ class TranslationBase {
String get lanArabic => localizedValues['lanArabic'][locale.languageCode]; 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<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -1,7 +1,9 @@
import 'package:doctor_app_flutter/config/size_config.dart'; 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:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart';
/* /*
*@author: Mohammad Aljammal *@author: Mohammad Aljammal
@ -18,6 +20,7 @@ class CardWithBgWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectProvider projectProvider = Provider.of(context);
return Container( return Container(
margin: EdgeInsets.symmetric(vertical: 10.0), margin: EdgeInsets.symmetric(vertical: 10.0),
width: double.infinity, width: double.infinity,
@ -31,15 +34,26 @@ class CardWithBgWidget extends StatelessWidget {
borderRadius: BorderRadius.all(Radius.circular(10.0)), borderRadius: BorderRadius.all(Radius.circular(10.0)),
child: Stack( child: Stack(
children: [ children: [
Positioned( if (projectProvider.isArabic)
child: Container( Positioned(
width: 10, child: Container(
color: Hexcolor('#58434F'), 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( Container(
padding: EdgeInsets.all(15.0), padding: EdgeInsets.all(15.0),
margin: EdgeInsets.only(left: 10), margin: EdgeInsets.only(left: 10),

Loading…
Cancel
Save