Merge branch 'schedule' into 'development'

small fix on replay page

See merge request Cloud_Solution/doctor_app_flutter!397
merge-requests/398/merge
Mohammad Aljammal 4 years ago
commit bb2b64179b

@ -817,4 +817,11 @@ const Map<String, Map<String, String>> localizedValues = {
"en": "Extend Sick Leave Request", "en": "Extend Sick Leave Request",
"ar": "تمديد طلب الإجازة المرضية" "ar": "تمديد طلب الإجازة المرضية"
}, },
"unReplied": {
"en": "UnReplied",
"ar": "لم يتم الرد"
},"replied": {
"en": "Replied",
"ar": " تم الرد"
},
}; };

@ -1195,6 +1195,8 @@ class TranslationBase {
String get updateReschedule => String get updateReschedule =>
localizedValues['update-reschedule'][locale.languageCode]; localizedValues['update-reschedule'][locale.languageCode];
String get sickLeave => localizedValues['sick_leave'][locale.languageCode]; String get sickLeave => localizedValues['sick_leave'][locale.languageCode];
String get unReplied => localizedValues['unReplied'][locale.languageCode];
String get replied => localizedValues['replied'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -25,9 +25,9 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
return Container( return Container(
child: CardWithBgWidget( child: CardWithBgWidget(
bgColor: bgColor:
widget.reply.status == 1 widget.reply.status == 2
? Color(0xffc4aa54) ? Color(0xFF2E303A)
: Colors.red[700], : Color(0xFFD02127),
hasBorder: false, hasBorder: false,
widget: Container( widget: Container(
// padding: EdgeInsets.only(left: 20, right: 0, bottom: 0), // padding: EdgeInsets.only(left: 20, right: 0, bottom: 0),
@ -45,15 +45,12 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
color: Colors.black), color: Colors.black),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: widget.reply.infoStatus!=null ? widget.reply.infoStatus :'', text: widget.reply.status==2 ? TranslationBase.of(context).replied :TranslationBase.of(context).unReplied ,
style: TextStyle( style: TextStyle(
color: widget.reply.status != null color: widget.reply.status == 2
? widget.reply.status == 1 ? Color(0xFF2E303A)
? Color(0xffc4aa54) : Color(0xFFD02127),
: widget.reply.status == 2
? Colors.green[700]
: Colors.red[700]
: Colors.grey[500],
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 2.0 * SizeConfig.textMultiplier)), fontSize: 2.0 * SizeConfig.textMultiplier)),

Loading…
Cancel
Save