From 4dc93f7c311cd8b6c590e9d25481cca773a31f77 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Wed, 29 Dec 2021 12:27:18 +0200 Subject: [PATCH 1/2] fix issues with text fields --- .../shared/text_fields/app-textfield-custom.dart | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/widgets/shared/text_fields/app-textfield-custom.dart b/lib/widgets/shared/text_fields/app-textfield-custom.dart index 769cd4f8..28331c6c 100644 --- a/lib/widgets/shared/text_fields/app-textfield-custom.dart +++ b/lib/widgets/shared/text_fields/app-textfield-custom.dart @@ -96,7 +96,7 @@ class _AppTextFieldCustomState extends State { Container( height: widget.height != 0 && widget.maxLines == 1 ? widget.height + 8 - : MediaQuery.of(context).size.height * 0.098, + : null,//MediaQuery.of(context).size.height * 0.098, decoration: widget.hasBorder ? TextFieldsUtils.containerBorderDecoration( Color(0Xffffffff), @@ -117,7 +117,7 @@ class _AppTextFieldCustomState extends State { padding: widget.dropDownText == null ? widget.isSearchTextField ? EdgeInsets.only(top: 10) - : EdgeInsets.only(top: 7.5) + : EdgeInsets.only(top: 0.5) : EdgeInsets.only(top: 0), // 8.0 child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -144,8 +144,7 @@ class _AppTextFieldCustomState extends State { height: widget.height != 0 && widget.maxLines == 1 ? widget.height - 22 - : MediaQuery.of(context).size.height * - 0.045, + : null, child: TextFormField( textAlign: projectViewModel.isArabic ? TextAlign.right @@ -156,8 +155,7 @@ class _AppTextFieldCustomState extends State { .textFieldSelectorDecoration( widget.hintText, null, true), style: TextStyle( - fontSize: - 14.0, //SizeConfig.textMultiplier * 1.7, + fontSize: SizeConfig.textMultiplier * 1.7, fontFamily: 'Poppins', color: Color(0xFF575757), fontWeight: FontWeight.w400, From 558de8ec757e922ce54f64b1aa17d0b59290f2d3 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Wed, 29 Dec 2021 12:28:58 +0200 Subject: [PATCH 2/2] fix issues with text fields --- .../referral/refer-patient-screen.dart | 21 ++++++++++--------- .../patient-referral-item-widget.dart | 6 +++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/screens/patients/profile/referral/refer-patient-screen.dart b/lib/screens/patients/profile/referral/refer-patient-screen.dart index f9371834..e9ba4770 100644 --- a/lib/screens/patients/profile/referral/refer-patient-screen.dart +++ b/lib/screens/patients/profile/referral/refer-patient-screen.dart @@ -123,16 +123,17 @@ class _PatientMakeReferralScreenState extends State { model.patientReferral.length - 1] .patientDetails .gender, - referredDate: model - .patientReferral[ - model.patientReferral.length - 1] - .referredOn - .split(" ")[0], - referredTime: model - .patientReferral[ - model.patientReferral.length - 1] - .referredOn - .split(" ")[1], + ///TODO Elham* check this + // referredDate: model + // .patientReferral[ + // model.patientReferral.length - 1] + // .referredOn + // .split(" ")[0], + // referredTime: model + // .patientReferral[ + // model.patientReferral.length - 1] + // .referredOn + // .split(" ")[1], patientID: "${model.patientReferral[model.patientReferral.length - 1].patientID}", isSameBranch: model diff --git a/lib/widgets/patients/patient-referral-item-widget.dart b/lib/widgets/patients/patient-referral-item-widget.dart index d4e18fc3..07f8352e 100644 --- a/lib/widgets/patients/patient-referral-item-widget.dart +++ b/lib/widgets/patients/patient-referral-item-widget.dart @@ -96,7 +96,7 @@ class PatientReferralItemWidget extends StatelessWidget { : Colors.red[900], ), AppText( - referredDate, + referredDate??"", fontFamily: 'Poppins', fontWeight: FontWeight.w600, letterSpacing: -0.48, @@ -109,7 +109,7 @@ class PatientReferralItemWidget extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ AppText( - patientName, + patientName??"", fontSize: 16.0, fontWeight: FontWeight.w600, color: Color(0xff2E303A), @@ -130,7 +130,7 @@ class PatientReferralItemWidget extends StatelessWidget { width: 4, ), AppText( - referredTime, + referredTime??"", fontFamily: 'Poppins', fontWeight: FontWeight.w600, fontSize: 12.0,