Merge branch 'development' into design-changes

design-changes
mosazaid 5 years ago
commit 260c708935

@ -47,9 +47,9 @@ const Map<String, Map<String, String>> localizedValues = {
'radiology': {'en': 'Radiology', 'ar': 'الأشعة'},
'service': {'en': 'Service', 'ar': 'خدمة'},
'referral': {'en': 'Referral', 'ar': 'الإحالة'},
'inPatient': {'en': 'My Patients', 'ar': 'مرضاي'},
'inPatient': {'en': 'My InPatients', 'ar': 'مرضاي'},
'inPatientLabel': {'en': 'InPatients', 'ar': 'المريض الداخلي'},
'inPatientAll': {'en': 'All Patients', 'ar': 'كل المرضى'},
'inPatientAll': {'en': 'All InPatients', 'ar': 'كل المرضى'},
'operations': {'en': 'Operations', 'ar': 'عمليات'},
'patientServices': {'en': 'Patient Services', 'ar': 'خدمات المرضى'},
'searchMedicine': {'en': 'Search Medicines', 'ar': 'بحث عن الدواء'},

@ -76,7 +76,6 @@ class _PatientInPatientScreenState extends State<PatientInPatientScreen> with Si
fontSize: SizeConfig.textMultiplier * 2.8,
fontWeight: FontWeight.bold,
color: Color(0xFF2B353E),
fontFamily: 'Poppins',
),
),
]),
@ -155,7 +154,7 @@ class _PatientInPatientScreenState extends State<PatientInPatientScreen> with Si
children: [
AppText(
title,
fontSize: SizeConfig.textMultiplier * 1.6,
fontSize: SizeConfig.textMultiplier * 1.5,
color: isActive ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
),

@ -181,15 +181,14 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
? SizedBox()
: Container(
margin: EdgeInsets.all(5),
child: Expanded(
child: AppButton(
child: AppButton(
title: TranslationBase.of(context).clearText,
onPressed: () {
setState(() {
progressNoteController.text = '';
});
},
)),
),
),
Container(
margin: EdgeInsets.all(5),

Loading…
Cancel
Save