diff --git a/lib/screens/patients/profile/UCAF/UCAF-input-screen.dart b/lib/screens/patients/profile/UCAF/UCAF-input-screen.dart index 18939d54..c2d0d5f4 100644 --- a/lib/screens/patients/profile/UCAF/UCAF-input-screen.dart +++ b/lib/screens/patients/profile/UCAF/UCAF-input-screen.dart @@ -1,6 +1,7 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-ucaf-viewmodel.dart'; +import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/UCAF/page-stepper-widget.dart'; @@ -145,8 +146,8 @@ class _UCAFInputScreenState extends State { ), AppTextFieldCustom( height: screenSize.height * 0.075, - hintText: - TranslationBase.of(context).durationOfIllness, + hintText: TranslationBase.of(context) + .durationOfIllness, dropDownText: "3", inputType: TextInputType.number, inputFormatters: [ @@ -163,6 +164,14 @@ class _UCAFInputScreenState extends State { children: [ Row( children: [ + Icon( + DoctorApp.warning, + size: 20, + color: Color(0xFFCC9B14), + ), + SizedBox( + width: 4, + ), AppText( "BP (H/L)", fontSize: @@ -246,7 +255,8 @@ class _UCAFInputScreenState extends State { height: 16, ), AppText( - TranslationBase.of(context).chiefComplaintsAndSymptoms, + TranslationBase.of(context) + .chiefComplaintsAndSymptoms, fontFamily: 'Poppins', fontSize: SizeConfig.textMultiplier * 2.1, fontWeight: FontWeight.w700, @@ -265,7 +275,8 @@ class _UCAFInputScreenState extends State { height: 8, ), AppTextFieldCustom( - hintText: TranslationBase.of(context).instruction, + hintText: + TranslationBase.of(context).instruction, dropDownText: helpers.parseHtmlString(model .patientChiefComplaintList[0] .chiefComplaint), @@ -288,7 +299,7 @@ class _UCAFInputScreenState extends State { (index) => CheckboxListTile( title: AppText( conditionsData[index]['name'], - fontWeight: FontWeight.bold, + fontWeight: FontWeight.normal, fontSize: SizeConfig.textMultiplier * 2.1, ), @@ -307,115 +318,77 @@ class _UCAFInputScreenState extends State { SizedBox( height: 8, ), - Container( - height: screenSize.height * 0.070, - child: TextField( - decoration: - Helpers.textFieldSelectorDecoration( - TranslationBase.of(context).other, - null, - false), - enabled: true, - controller: _otherController, - keyboardType: TextInputType.text, - )), + AppTextFieldCustom( + height: screenSize.height * 0.075, + hintText: TranslationBase.of(context).other, + dropDownText: "None", + enabled: false, + ), SizedBox( height: 8, ), - Container( - height: screenSize.height * 0.070, - child: TextField( - decoration: - Helpers.textFieldSelectorDecoration( - TranslationBase.of(context).how, - null, - false), - enabled: true, - controller: _howController, - keyboardType: TextInputType.text, - )), + AppTextFieldCustom( + height: screenSize.height * 0.075, + hintText: TranslationBase.of(context).how, + dropDownText: "None", + enabled: false, + ), SizedBox( height: 8, ), Row( children: [ Expanded( - child: Container( - height: screenSize.height * 0.070, - child: TextField( - decoration: Helpers - .textFieldSelectorDecoration( - TranslationBase.of(context) - .when, - null, - false), - enabled: true, - controller: _whenController, - keyboardType: TextInputType.text, - )), + child: AppTextFieldCustom( + height: screenSize.height * 0.075, + hintText: + TranslationBase.of(context).when, + dropDownText: "None", + enabled: false, + ), ), SizedBox( width: 4, ), Expanded( - child: Container( - height: screenSize.height * 0.070, - child: TextField( - decoration: Helpers - .textFieldSelectorDecoration( - TranslationBase.of(context) - .where, - null, - false), - enabled: true, - controller: _whereController, - keyboardType: TextInputType.text, - )), + child: AppTextFieldCustom( + height: screenSize.height * 0.075, + hintText: + TranslationBase.of(context).where, + dropDownText: "None", + enabled: false, + ), ), ], ), SizedBox( height: 8, ), - Container( - child: TextField( - decoration: - Helpers.textFieldSelectorDecoration( - TranslationBase.of(context) - .specifyPossibleLineManagement, - null, - false), - enabled: true, - controller: _managementsLineController, - keyboardType: TextInputType.text, + AppTextFieldCustom( + height: screenSize.height * 0.1, + hintText: TranslationBase.of(context).specifyPossibleLineManagement, + dropDownText: "None", + enabled: false, minLines: 4, maxLines: 6, - )), + ), SizedBox( - height: 16, + height: 26, ), AppText( TranslationBase.of(context).significantSigns, fontWeight: FontWeight.bold, - fontSize: SizeConfig.textMultiplier * 2.0, + fontSize: SizeConfig.textMultiplier * 2.1, ), SizedBox( height: 8, ), - Container( - child: TextField( - decoration: - Helpers.textFieldSelectorDecoration( - TranslationBase.of(context) - .backAbdomen, - null, - false), - enabled: true, - controller: _signsController, - keyboardType: TextInputType.multiline, - minLines: null, - maxLines: null, - )), + AppTextFieldCustom( + height: screenSize.height * 0.1, + hintText: TranslationBase.of(context).backAbdomen, + dropDownText: "BackLNeck", + enabled: false, + ), ], ), ), diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_item.dart b/lib/screens/patients/profile/vital_sign/vital_sign_item.dart index e838affa..3431a011 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_item.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_item.dart @@ -51,7 +51,7 @@ class VitalSignItem extends StatelessWidget { "$lastVal", fontFamily: 'Poppins', fontSize: SizeConfig.textMultiplier * 1.4, - fontWeight: FontWeight.w800, + fontWeight: FontWeight.bold, margin: 0, ), Expanded( @@ -88,7 +88,7 @@ class VitalSignItem extends StatelessWidget { "$des", fontFamily: 'Poppins', fontSize: SizeConfig.textMultiplier * 1.3, - fontWeight: FontWeight.w600, + fontWeight: FontWeight.bold, ), ), ), diff --git a/lib/widgets/shared/app-textfield-custom.dart b/lib/widgets/shared/app-textfield-custom.dart index caeb7ea2..6c52001b 100644 --- a/lib/widgets/shared/app-textfield-custom.dart +++ b/lib/widgets/shared/app-textfield-custom.dart @@ -68,7 +68,7 @@ class _AppTextFieldCustomState extends State { widget.hintText, fontFamily: 'Poppins', fontSize: SizeConfig.textMultiplier * 1.4, - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w700, ), widget.dropDownText == null ? TextField(