Merge branch 'fix_theme_issues' into 'development'

fix theme issues

See merge request Cloud_Solution/diplomatic-quarter!287
merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
commit 0574161ad3

@ -365,7 +365,7 @@ const Map localizedValues = {
'painScale': {'en': 'Pain Scale', 'ar': 'مقياس الألم'}, 'painScale': {'en': 'Pain Scale', 'ar': 'مقياس الألم'},
'weight': {'en': 'Weight', 'ar': 'الوزن'}, 'weight': {'en': 'Weight', 'ar': 'الوزن'},
'height': {'en': 'Height', 'ar': 'الطول'}, 'height': {'en': 'Height', 'ar': 'الطول'},
'heart': {'en': 'Heart', 'ar': 'قلب'}, 'heart': {'en': 'Heart Rate', 'ar': 'معدل النبض'},
"heightUnit": {"en": "height unit", "ar": "وحدة الطول"}, "heightUnit": {"en": "height unit", "ar": "وحدة الطول"},
"weightUnit": {"en": "Weight Unit", "ar": "وحدة الوزن"}, "weightUnit": {"en": "Weight Unit", "ar": "وحدة الوزن"},
"request": {"en": "Request", "ar": "طلبات الاضافة"}, "request": {"en": "Request", "ar": "طلبات الاضافة"},

@ -40,7 +40,7 @@ class _GeneralSettings extends State<GeneralSettings>
return Container( return Container(
child: ListView(scrollDirection: Axis.vertical, children: <Widget>[ child: ListView(scrollDirection: Axis.vertical, children: <Widget>[
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: AppText( child: AppText(
TranslationBase.of(context).modes, TranslationBase.of(context).modes,
@ -48,7 +48,7 @@ class _GeneralSettings extends State<GeneralSettings>
), ),
), ),
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -68,7 +68,7 @@ class _GeneralSettings extends State<GeneralSettings>
], ],
)), )),
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -88,7 +88,7 @@ class _GeneralSettings extends State<GeneralSettings>
], ],
)), )),
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: AppText( child: AppText(
TranslationBase.of(context).blindMode, TranslationBase.of(context).blindMode,
@ -96,7 +96,7 @@ class _GeneralSettings extends State<GeneralSettings>
), ),
), ),
new Container( new Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
child: new Column( child: new Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -179,7 +179,7 @@ class _GeneralSettings extends State<GeneralSettings>
) )
])), ])),
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: AppText( child: AppText(
TranslationBase.of(context).permissions, TranslationBase.of(context).permissions,
@ -187,7 +187,7 @@ class _GeneralSettings extends State<GeneralSettings>
), ),
), ),
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -206,7 +206,7 @@ class _GeneralSettings extends State<GeneralSettings>
], ],
)), )),
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,

@ -35,7 +35,7 @@ defaultTheme({fontName}) {
backgroundColor: Color.fromRGBO(255, 255, 255, 1), backgroundColor: Color.fromRGBO(255, 255, 255, 1),
highlightColor: Colors.grey[100].withOpacity(0.4), highlightColor: Colors.grey[100].withOpacity(0.4),
splashColor: Colors.transparent, splashColor: Colors.transparent,
primaryColor: Color(0xffffffff), primaryColor: Color(0xff515A5D),
buttonColor: Colors.black, buttonColor: Colors.black,
toggleableActiveColor: secondaryColor, toggleableActiveColor: secondaryColor,
indicatorColor: secondaryColor, indicatorColor: secondaryColor,

Loading…
Cancel
Save