From 7227679081b8ecc6cf8df87b02777a8ebb67781c Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Tue, 27 Jul 2021 15:08:58 +0300 Subject: [PATCH] fix design --- .../assessment/add_assessment_details.dart | 19 +++-- .../assessment/update_assessment_page.dart | 34 +++++---- .../objective/add_examination_widget.dart | 75 +++++++++++-------- .../examinations_list_search_widget.dart | 4 +- .../objective/update_objective_page.dart | 13 +++- .../soap_update/plan/update_plan_page.dart | 23 ++++-- .../expandable_SOAP_widget.dart | 2 +- .../shared_soap_widgets/remove_button.dart | 5 +- .../steper/steps_widget.dart | 2 - .../allergies/update_allergies_widget.dart | 5 +- .../history/update_history_widget.dart | 3 +- .../subjective/medication/add_medication.dart | 2 +- .../subjective/update_subjective_page.dart | 3 +- 13 files changed, 118 insertions(+), 72 deletions(-) diff --git a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart index 691cc5b6..2ac051b1 100644 --- a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart +++ b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart @@ -1,5 +1,6 @@ import 'package:autocomplete_textfield/autocomplete_textfield.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; +import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; @@ -153,6 +154,8 @@ class _AddAssessmentDetailsState extends State { margin: EdgeInsets.only(left: 0, right: 0, top: 15), child: AppTextFieldCustom( // height: 55.0, + height: Helpers.getTextFieldHeight(), + hintText: TranslationBase.of(context).appointmentNumber, isTextFieldHasSuffix: false, @@ -224,7 +227,8 @@ class _AddAssessmentDetailsState extends State { ), ) : AppTextFieldCustom( - onClick: model.listOfICD10 != null + height: Helpers.getTextFieldHeight(), + onClick: model.listOfICD10 != null ? () { setState(() { widget.mySelectedAssessment @@ -235,7 +239,7 @@ class _AddAssessmentDetailsState extends State { : null, hintText: TranslationBase.of(context) .nameOrICD, - maxLines: 2, + maxLines: 1, minLines: 1, controller: icdNameController, enabled: true, @@ -251,6 +255,8 @@ class _AddAssessmentDetailsState extends State { height: 7, ), AppTextFieldCustom( + height: Helpers.getTextFieldHeight(), + onClick: model.listOfDiagnosisCondition != null ? () { MasterKeyDailog dialog = MasterKeyDailog( @@ -288,7 +294,7 @@ class _AddAssessmentDetailsState extends State { } : null, hintText: TranslationBase.of(context).condition, - maxLines: 2, + maxLines: 1, minLines: 1, controller: conditionController, isTextFieldHasSuffix: true, @@ -305,6 +311,8 @@ class _AddAssessmentDetailsState extends State { height: 10, ), AppTextFieldCustom( + height: Helpers.getTextFieldHeight(), + onClick: model.listOfDiagnosisType != null ? () { MasterKeyDailog dialog = MasterKeyDailog( @@ -334,7 +342,7 @@ class _AddAssessmentDetailsState extends State { } : null, hintText: TranslationBase.of(context).dType, - maxLines: 2, + maxLines: 1, minLines: 1, enabled: false, isTextFieldHasSuffix: true, @@ -365,7 +373,8 @@ class _AddAssessmentDetailsState extends State { ), ), SizedBox( - height: 10, + height: SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort ?20:SizeConfig.isHeightShort?15:10), + ), ])), ), diff --git a/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart b/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart index 8caf61fe..99c27478 100644 --- a/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart +++ b/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; @@ -167,7 +168,7 @@ class _UpdateAssessmentPageState extends State { RichText( text: new TextSpan( style: new TextStyle( - fontSize: 10, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6, color: Color(0xFF2E303A), fontFamily: 'Poppins', fontWeight: FontWeight.w600, @@ -182,7 +183,8 @@ class _UpdateAssessmentPageState extends State { .selectedICD.code .trim() .toUpperCase() ?? - "", + "" + ), ], ), @@ -195,7 +197,7 @@ class _UpdateAssessmentPageState extends State { child: RichText( text: new TextSpan( style: new TextStyle( - fontSize: 16, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *5, color: Color(0xFF2E303A), fontFamily: 'Poppins', fontWeight: FontWeight.w600, @@ -215,7 +217,7 @@ class _UpdateAssessmentPageState extends State { RichText( text: new TextSpan( style: new TextStyle( - fontSize: 12, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.5, color: Color(0xFF2E303A), fontFamily: 'Poppins', fontWeight: FontWeight.w600, @@ -226,7 +228,7 @@ class _UpdateAssessmentPageState extends State { context) .appointmentNo, style: new TextStyle( - fontSize: 10, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3, letterSpacing: -0.4, color: Color(0xFF575757), ), @@ -237,7 +239,7 @@ class _UpdateAssessmentPageState extends State { .toString() ?? "", style: new TextStyle( - fontSize: 14, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6, letterSpacing: -0.48, color: Color(0xFF2B353E), ), @@ -248,7 +250,7 @@ class _UpdateAssessmentPageState extends State { RichText( text: new TextSpan( style: new TextStyle( - fontSize: 12, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3, color: Color(0xFF2E303A), fontFamily: 'Poppins', fontWeight: @@ -274,7 +276,7 @@ class _UpdateAssessmentPageState extends State { .selectedDiagnosisCondition .nameEn, style: new TextStyle( - fontSize: 12, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6, letterSpacing: -0.48, color: Color(0xFF2B353E), ), @@ -285,7 +287,7 @@ class _UpdateAssessmentPageState extends State { RichText( text: new TextSpan( style: new TextStyle( - fontSize: 10, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3, color: Color(0xFF2E303A), fontFamily: 'Poppins', fontWeight: @@ -311,7 +313,7 @@ class _UpdateAssessmentPageState extends State { .selectedDiagnosisType .nameEn, style: new TextStyle( - fontSize: 12, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6, letterSpacing: -0.48, color: Color(0xFF2B353E), ), @@ -323,7 +325,7 @@ class _UpdateAssessmentPageState extends State { RichText( text: new TextSpan( style: new TextStyle( - fontSize: 12, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6, color: Color(0xFF2E303A), fontFamily: 'Poppins', fontWeight: @@ -335,7 +337,7 @@ class _UpdateAssessmentPageState extends State { .doctor + ' : ', style: new TextStyle( - fontSize: 10,letterSpacing: -0.4, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,letterSpacing: -0.4, color: Color(0xFF575757), ), @@ -345,7 +347,7 @@ class _UpdateAssessmentPageState extends State { .doctorName ?? '', style: new TextStyle( - fontSize: 12,letterSpacing: -0.48, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,letterSpacing: -0.48, color: Color(0xFF2B353E), ), @@ -375,7 +377,7 @@ class _UpdateAssessmentPageState extends State { .remarks + " : " : '', - fontSize: 12, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3, color: Color(0xFF2E303A), fontFamily: 'Poppins', fontWeight: @@ -412,7 +414,7 @@ class _UpdateAssessmentPageState extends State { .now()), fontWeight: FontWeight.w600, - fontSize: 12, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6, ), AppText( assessment.createdOn != @@ -427,7 +429,7 @@ class _UpdateAssessmentPageState extends State { fontWeight: FontWeight.w600, color: Color(0xFF575757), - fontSize: 12, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6, ), ], ), diff --git a/lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart b/lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart index 82d26dc9..ae6342c4 100644 --- a/lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart +++ b/lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart @@ -65,38 +65,32 @@ class _AddExaminationWidgetState extends State { headerWidget: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Expanded( - child: CheckboxListTile( - title: AppText( - projectViewModel.isArabic - ? widget.item.nameAr != null && widget.item.nameAr != "" - ? widget.item.nameAr - : widget.item.nameEn - : widget.item.nameEn, - fontWeight: FontWeight.normal, - fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier * 2.0, - ), - value: widget.isServiceSelected(widget.item), - activeColor: HexColor("#D02127"), - onChanged: (newValue) { - setState(() { - if (widget.isServiceSelected(widget.item)) { - if (examination.isLocal) - widget.removeExamination(examination); - widget.expandClick(); - } else { - examination.isNormal = status == 1; - examination.isAbnormal = status == 2; - examination.notExamined = status == 3; - examination.remark = remarksController.text; - widget.addExamination(examination); - widget.expandClick(); - } - }); - }, - controlAffinity: ListTileControlAffinity.leading, - contentPadding: EdgeInsets.all(0), + InkWell( + onTap: (){ + onExamTap(); + }, + child: Row( + children: [ + Checkbox( + value:widget.isServiceSelected(widget.item), + activeColor: Colors.red[800], + onChanged: (bool newValue) { + onExamTap(); + }), + Container( + child: AppText( + projectViewModel.isArabic + ? widget.item.nameAr != null && widget.item.nameAr != "" + ? widget.item.nameAr + : widget.item.nameEn + : widget.item.nameEn, + + color: Color(0xFF575757), + fontSize: SizeConfig.getTextMultiplierBasedOnWidth()*3.8, + letterSpacing: -0.56, + ), + ), + ], ), ), Container( @@ -271,6 +265,23 @@ class _AddExaminationWidgetState extends State { ); } + onExamTap(){ + setState(() { + if (widget.isServiceSelected(widget.item)) { + if (examination.isLocal) + widget.removeExamination(examination); + widget.expandClick(); + } else { + examination.isNormal = status == 1; + examination.isAbnormal = status == 2; + examination.notExamined = status == 3; + examination.remark = remarksController.text; + widget.addExamination(examination); + widget.expandClick(); + } + }); + } + MySelectedExamination getSelectedExam(MasterKeyModel masterKey) { Iterable exam = widget.mySelectedExamination.where( (element) => diff --git a/lib/screens/patients/profile/soap_update/objective/examinations_list_search_widget.dart b/lib/screens/patients/profile/soap_update/objective/examinations_list_search_widget.dart index bab2d647..c041b545 100644 --- a/lib/screens/patients/profile/soap_update/objective/examinations_list_search_widget.dart +++ b/lib/screens/patients/profile/soap_update/objective/examinations_list_search_widget.dart @@ -1,5 +1,6 @@ import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/models/SOAP/selected_items/my_selected_examination.dart'; +import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; @@ -42,10 +43,11 @@ class _ExaminationsListSearchWidgetState return Column( children: [ AppTextFieldCustom( - height: MediaQuery.of(context).size.height * 0.080, + height: Helpers.getTextFieldHeight(), hintText: TranslationBase.of(context).searchExamination, isTextFieldHasSuffix: true, hasBorder: false, + controller: filteredSearchController, onChanged: (value) { filterSearchResults(value); diff --git a/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart b/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart index 317fa4af..0ecda333 100644 --- a/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart +++ b/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart @@ -1,4 +1,5 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; +import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; @@ -192,7 +193,8 @@ class _UpdateObjectivePageState extends State { isExpanded: isSysExaminationExpand, ), SizedBox( - height: MediaQuery.of(context).size.height * 0.12, + height: SizeConfig.heightMultiplier * + (SizeConfig.isHeightVeryShort ? 14 : 12), ) ], ), @@ -207,7 +209,8 @@ class _UpdateObjectivePageState extends State { ), border: Border.all(color: HexColor('#707070'), width: 0), ), - height: 80, + height: SizeConfig.heightMultiplier * + (SizeConfig.isHeightVeryShort ? 12 : 10), width: double.infinity, child: Column( children: [ @@ -224,6 +227,9 @@ class _UpdateObjectivePageState extends State { child: AppButton( title: TranslationBase.of(context).previous, color: Colors.grey[300], + height: SizeConfig.heightMultiplier * + (SizeConfig.isHeightVeryShort ? 8 : 6), + padding: 10, fontColor: Colors.black, fontWeight: FontWeight.w600, onPressed: () { @@ -239,6 +245,9 @@ class _UpdateObjectivePageState extends State { title: TranslationBase.of(context).next, fontWeight: FontWeight.w600, color: Colors.red[700], + height: SizeConfig.heightMultiplier * + (SizeConfig.isHeightVeryShort ? 8 : 6), + padding: 10, disabled: model.state == ViewState.BusyLocal, onPressed: () async { await submitUpdateObjectivePage(model); diff --git a/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart b/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart index 4622bc94..ce86f33d 100644 --- a/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart +++ b/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart @@ -1,4 +1,5 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; +import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; @@ -209,7 +210,9 @@ class _UpdatePlanPageState extends State { children: [ AppText( 'Appointment No: ', - fontSize: 12, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3, + letterSpacing: -0.4, + color: Color(0xFF575757), ), AppText( patientProgressNote @@ -220,7 +223,9 @@ class _UpdatePlanPageState extends State { .toString() : '', fontWeight: FontWeight.w600, - fontSize: 14, + letterSpacing: -0.48, + color: Color(0xFF2B353E), + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6, ), ], ), @@ -236,7 +241,7 @@ class _UpdatePlanPageState extends State { .getDayMonthYearDateFormatted( DateTime.now()), fontWeight: FontWeight.w600, - fontSize: 14, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6, ) ], ), @@ -268,7 +273,8 @@ class _UpdatePlanPageState extends State { : AppDateUtils.getHour( DateTime.now()), fontWeight: FontWeight.w600, - fontSize: 14, + color: Color(0xFF575757), + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6, ) ], ), @@ -319,7 +325,8 @@ class _UpdatePlanPageState extends State { ), border: Border.all(color: HexColor('#707070'), width: 0), ), - height: 80, + height: SizeConfig.heightMultiplier * + (SizeConfig.isHeightVeryShort ? 12 : 10), width: double.infinity, child: Column( children: [ @@ -334,6 +341,9 @@ class _UpdatePlanPageState extends State { children: [ Expanded( child: AppButton( + height: SizeConfig.heightMultiplier * + (SizeConfig.isHeightVeryShort ? 8 : 6), + padding: 10, title: TranslationBase.of(context).previous, color: Colors.grey[300], fontColor: Colors.black, @@ -349,6 +359,9 @@ class _UpdatePlanPageState extends State { ), Expanded( child: AppButton( + height: SizeConfig.heightMultiplier * + (SizeConfig.isHeightVeryShort ? 8 : 6), + padding: 10, title: isAddProgress ? TranslationBase.of(context).next : TranslationBase.of(context).finish, diff --git a/lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart b/lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart index 25518110..732df855 100644 --- a/lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart +++ b/lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart @@ -42,7 +42,7 @@ class ExpandableSOAPWidget extends StatelessWidget { children: [ AppText(headerTitle, variant: isExpanded ? "bodyText" : '', - fontSize: SizeConfig.getTextMultiplierBasedOnWidth()*5, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth()*(SizeConfig.isHeightVeryShort?4.8: 5), letterSpacing:-0.64, fontWeight: FontWeight.w700, color: Color(0xFF2E303A),), diff --git a/lib/screens/patients/profile/soap_update/shared_soap_widgets/remove_button.dart b/lib/screens/patients/profile/soap_update/shared_soap_widgets/remove_button.dart index bff3d4a8..1e5231c9 100644 --- a/lib/screens/patients/profile/soap_update/shared_soap_widgets/remove_button.dart +++ b/lib/screens/patients/profile/soap_update/shared_soap_widgets/remove_button.dart @@ -1,4 +1,5 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; @@ -19,7 +20,7 @@ class RemoveButton extends StatelessWidget { Container( child: AppText( label??TranslationBase.of(context).remove, - fontSize: 12, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.5, fontWeight: FontWeight.w700, color: HexColor("#D02127"), letterSpacing:-0.48, @@ -28,7 +29,7 @@ class RemoveButton extends StatelessWidget { Icon( FontAwesomeIcons.times, color: HexColor("#D02127"), - size: 16, + size: SizeConfig.getTextMultiplierBasedOnWidth() *4, ), ], ), diff --git a/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart b/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart index cba8daf2..e1f740bc 100644 --- a/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart +++ b/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart @@ -1,11 +1,9 @@ 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/screens/patients/profile/soap_update/shared_soap_widgets/steper/status_Label.dart'; -import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; import 'Step_details_widget.dart'; diff --git a/lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart index 48136cb4..c8a519c3 100644 --- a/lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart @@ -1,3 +1,4 @@ +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/models/SOAP/selected_items/my_selected_allergy.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/remark_text.dart'; @@ -70,7 +71,7 @@ class _UpdateAllergiesWidgetState extends State { : TextDecoration.lineThrough, bold: true, color: Color(0xFF2B353E), - fontSize: 12, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.5, fontWeight: FontWeight.w700, letterSpacing: -0.48, // fontHeight:0.18 , @@ -86,7 +87,7 @@ class _UpdateAllergiesWidgetState extends State { ? null : TextDecoration.lineThrough, color: Color(0xFFCC9B14), - fontSize: 10, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3, fontWeight: FontWeight.w700, letterSpacing: -0.48, ), diff --git a/lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart b/lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart index 2f17d332..33e7fcd1 100644 --- a/lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart +++ b/lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart @@ -1,3 +1,4 @@ +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/models/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/models/SOAP/selected_items/my_selected_history.dart'; @@ -68,7 +69,7 @@ class _UpdateHistoryWidgetState extends State ? null : TextDecoration.lineThrough, color: Color(0xFF2B353E), - fontSize: 12, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.5, fontWeight: FontWeight.w700, letterSpacing: -0.48, ), diff --git a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart index 8bc8e712..6b0a592d 100644 --- a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart +++ b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart @@ -351,7 +351,7 @@ class _AddMedicationState extends State { height: 5, ), AppTextFieldCustom( - height: Helpers.getTextFieldHeight(), + height: Helpers.getTextFieldHeight(), onClick: model.medicationFrequencyList != null ? () { diff --git a/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart index 3e8c2d44..b1441ce4 100644 --- a/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart +++ b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart @@ -345,9 +345,8 @@ class _UpdateSubjectivePageState extends State { fontWeight: FontWeight.w600, height: SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort ? 8 : 6), - color: Colors.red[700], padding: 10, - // loading: model.state == ViewState.BusyLocal, + color: Colors.red[700], onPressed: () async { addSubjectiveInfo( model: model,