design fixes

merge-requests/618/head
mosazaid 5 years ago
parent 55895496e1
commit 68f405cb21

@ -447,7 +447,7 @@ const Map<String, Map<String, String>> localizedValues = {
'en': "Is Sick Leave Required", 'en': "Is Sick Leave Required",
'ar': 'هل الإجازة المرضية مطلوبة' 'ar': 'هل الإجازة المرضية مطلوبة'
}, },
'patientPregnant': {'en': "Patient Pregnant", 'ar': 'حمل المريض'}, 'patientPregnant': {'en': "Patient Pregnant", 'ar': 'المريض حامل'},
'treatmentLine': { 'treatmentLine': {
'en': "Main line of treatment", 'en': "Main line of treatment",
'ar': 'الخط الرئيسي للعلاج' 'ar': 'الخط الرئيسي للعلاج'

@ -44,6 +44,7 @@ class _AdmissionRequestThirdScreenState
String clinicError; String clinicError;
String doctorError; String doctorError;
String sickLeaveCommentError; String sickLeaveCommentError;
String dietTypeError;
String medicalHistoryError; String medicalHistoryError;
String surgicalHistoryError; String surgicalHistoryError;
@ -78,8 +79,6 @@ class _AdmissionRequestThirdScreenState
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
// PatientProfileHeaderNewDesign(
// patient, patientType, arrivalType),
Container( Container(
margin: EdgeInsets.all(16.0), margin: EdgeInsets.all(16.0),
child: Column( child: Column(
@ -87,15 +86,15 @@ class _AdmissionRequestThirdScreenState
children: [ children: [
AppText( AppText(
"${TranslationBase.of(context).admission}", "${TranslationBase.of(context).admission}",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.6, fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w700,
color: Color(0xFF2E303A),
), ),
AppText( AppText(
"${TranslationBase.of(context).request}", TranslationBase.of(context).request,
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 3, fontSize: SizeConfig.textMultiplier * 3,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Color(0xFF2E303A),
) )
], ],
), ),
@ -109,7 +108,7 @@ class _AdmissionRequestThirdScreenState
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context)
.specialityAndDoctorDetail, .specialityAndDoctorDetail,
fontFamily: 'Poppins', color: Color(0xFF2E303A),
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
@ -278,6 +277,7 @@ class _AdmissionRequestThirdScreenState
height: screenSize.height * 0.075, height: screenSize.height * 0.075,
hintText: TranslationBase.of(context).dietType, hintText: TranslationBase.of(context).dietType,
isTextFieldHasSuffix: true, isTextFieldHasSuffix: true,
validationError: dietTypeError,
dropDownText: _selectedDietType != null dropDownText: _selectedDietType != null
? _selectedDietType['nameEn'] ? _selectedDietType['nameEn']
: null, : null,
@ -426,6 +426,11 @@ class _AdmissionRequestThirdScreenState
}else { }else {
sickLeaveCommentError = null; sickLeaveCommentError = null;
} }
if(_selectedDietType == null){
dietTypeError = TranslationBase.of(context).fieldRequired;
}else {
dietTypeError = null;
}
if(_postMedicalHistoryController.text == ""){ if(_postMedicalHistoryController.text == ""){
medicalHistoryError = TranslationBase.of(context).fieldRequired; medicalHistoryError = TranslationBase.of(context).fieldRequired;
}else { }else {

@ -76,15 +76,15 @@ class _AdmissionRequestThirdScreenState
children: [ children: [
AppText( AppText(
"${TranslationBase.of(context).admission}", "${TranslationBase.of(context).admission}",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.6, fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w700,
color: Color(0xFF2E303A),
), ),
AppText( AppText(
"${TranslationBase.of(context).request}", TranslationBase.of(context).request,
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 3, fontSize: SizeConfig.textMultiplier * 3,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Color(0xFF2E303A),
) )
], ],
), ),
@ -96,7 +96,7 @@ class _AdmissionRequestThirdScreenState
children: [ children: [
AppText( AppText(
TranslationBase.of(context).diagnosisDetail, TranslationBase.of(context).diagnosisDetail,
fontFamily: 'Poppins', color: Color(0xFF2E303A),
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),

@ -91,8 +91,6 @@ class _AdmissionRequestSecondScreenState
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
// PatientProfileHeaderNewDesign(
// patient, patientType, arrivalType),
Container( Container(
margin: EdgeInsets.all(16.0), margin: EdgeInsets.all(16.0),
child: Column( child: Column(
@ -100,15 +98,15 @@ class _AdmissionRequestSecondScreenState
children: [ children: [
AppText( AppText(
"${TranslationBase.of(context).admission}", "${TranslationBase.of(context).admission}",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.6, fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w700,
color: Color(0xFF2E303A),
), ),
AppText( AppText(
"${TranslationBase.of(context).request}", TranslationBase.of(context).request,
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 3, fontSize: SizeConfig.textMultiplier * 3,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Color(0xFF2E303A),
) )
], ],
), ),
@ -122,7 +120,7 @@ class _AdmissionRequestSecondScreenState
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context)
.postPlansEstimatedCost, .postPlansEstimatedCost,
fontFamily: 'Poppins', color: Color(0xFF2E303A),
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
@ -170,7 +168,7 @@ class _AdmissionRequestSecondScreenState
), ),
AppText( AppText(
TranslationBase.of(context).otherInformation, TranslationBase.of(context).otherInformation,
fontFamily: 'Poppins', color: Color(0xFF2E303A),
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),

@ -134,7 +134,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
NeverScrollableScrollPhysics(), NeverScrollableScrollPhysics(),
crossAxisSpacing: 10, crossAxisSpacing: 10,
mainAxisSpacing: 10, mainAxisSpacing: 10,
childAspectRatio: 1 / 1.0, childAspectRatio: 1 / 1.01,
crossAxisCount: 3, crossAxisCount: 3,
children: [ children: [
PatientProfileButton( PatientProfileButton(
@ -679,7 +679,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
NeverScrollableScrollPhysics(), NeverScrollableScrollPhysics(),
crossAxisSpacing: 10, crossAxisSpacing: 10,
mainAxisSpacing: 10, mainAxisSpacing: 10,
childAspectRatio: 1 / 1.0, childAspectRatio: 1 / 1.01,
crossAxisCount: 3, crossAxisCount: 3,
children: [ children: [
PatientProfileButton( PatientProfileButton(

@ -1,8 +1,10 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/text_field_error.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_field_error.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import '../app_texts_widget.dart'; import '../app_texts_widget.dart';
@ -50,10 +52,12 @@ class AppTextFieldCustom extends StatefulWidget {
class _AppTextFieldCustomState extends State<AppTextFieldCustom> { class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return Column( return Column(
children: [ children: [
Container( Container(
height: widget.height != 0 ? widget.height + 8 : null, height: widget.height != 0 && widget.maxLines == 1 ? widget.height + 8 : null,
decoration: widget.hasBorder decoration: widget.hasBorder
? TextFieldsUtils.containerBorderDecoration( ? TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff), Color(0Xffffffff),
@ -72,7 +76,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
child: Container( child: Container(
padding: widget.dropDownText == null padding: widget.dropDownText == null
? EdgeInsets.symmetric(vertical: 0) ? EdgeInsets.symmetric(vertical: 0)
: EdgeInsets.symmetric(vertical: 8), : EdgeInsets.symmetric(vertical: 0), // 8.0
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -82,40 +86,45 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
widget.dropDownText != null) widget.dropDownText != null)
AppText( AppText(
widget.hintText, widget.hintText,
fontFamily: 'Poppins', color: Color(0xFF2E303A),
fontSize: SizeConfig.textMultiplier * 1.4, fontSize: SizeConfig.textMultiplier * 1.4,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
widget.dropDownText == null widget.dropDownText == null
? TextField( ? Container(
textAlign: TextAlign.left, height: widget.height != 0 && widget.maxLines == 1 ? widget.height - 22 : null,
decoration: child: TextField(
TextFieldsUtils.textFieldSelectorDecoration( textAlign: projectViewModel.isArabic
widget.hintText, null, true), ? TextAlign.right
style: TextStyle( : TextAlign.left,
fontSize: SizeConfig.textMultiplier * 1.7, decoration:
fontFamily: 'Poppins', TextFieldsUtils.textFieldSelectorDecoration(
color: Colors.grey.shade800, widget.hintText, null, true),
), style: TextStyle(
controller: widget.controller, fontSize: SizeConfig.textMultiplier * 1.7,
keyboardType: widget.inputType, fontFamily: 'Poppins',
enabled: widget.enabled, color: Color(0xFF575757),
minLines: widget.minLines, ),
maxLines: widget.maxLines, controller: widget.controller,
inputFormatters: widget.inputFormatters != null keyboardType: widget.inputType,
? widget.inputFormatters enabled: widget.enabled,
: [], minLines: widget.minLines,
onChanged: (value) { maxLines: widget.maxLines,
if (widget.onChanged != null) { inputFormatters: widget.inputFormatters != null
widget.onChanged(value); ? widget.inputFormatters
: [],
onChanged: (value) {
setState(() {}); setState(() {});
} if (widget.onChanged != null) {
}, widget.onChanged(value);
) }
},
),
)
: AppText( : AppText(
widget.dropDownText, widget.dropDownText,
fontFamily: 'Poppins', fontFamily: 'Poppins',
color: Colors.grey.shade800, color: Color(0xFF575757),
fontSize: SizeConfig.textMultiplier * 1.7, fontSize: SizeConfig.textMultiplier * 1.7,
), ),
], ],

@ -566,7 +566,7 @@ packages:
name: js name: js
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.3-nullsafety.1" version: "0.6.2"
json_annotation: json_annotation:
dependency: transitive dependency: transitive
description: description:

Loading…
Cancel
Save