fix design

episode_fixes
Elham Rababh 5 years ago
parent 14a0911aec
commit 7227679081

@ -1,5 +1,6 @@
import 'package:autocomplete_textfield/autocomplete_textfield.dart'; import 'package:autocomplete_textfield/autocomplete_textfield.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.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/master_lookup_key.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.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/core/viewModel/SOAP_view_model.dart';
@ -153,6 +154,8 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
margin: EdgeInsets.only(left: 0, right: 0, top: 15), margin: EdgeInsets.only(left: 0, right: 0, top: 15),
child: AppTextFieldCustom( child: AppTextFieldCustom(
// height: 55.0, // height: 55.0,
height: Helpers.getTextFieldHeight(),
hintText: hintText:
TranslationBase.of(context).appointmentNumber, TranslationBase.of(context).appointmentNumber,
isTextFieldHasSuffix: false, isTextFieldHasSuffix: false,
@ -224,7 +227,8 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
), ),
) )
: AppTextFieldCustom( : AppTextFieldCustom(
onClick: model.listOfICD10 != null height: Helpers.getTextFieldHeight(),
onClick: model.listOfICD10 != null
? () { ? () {
setState(() { setState(() {
widget.mySelectedAssessment widget.mySelectedAssessment
@ -235,7 +239,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
: null, : null,
hintText: TranslationBase.of(context) hintText: TranslationBase.of(context)
.nameOrICD, .nameOrICD,
maxLines: 2, maxLines: 1,
minLines: 1, minLines: 1,
controller: icdNameController, controller: icdNameController,
enabled: true, enabled: true,
@ -251,6 +255,8 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
height: 7, height: 7,
), ),
AppTextFieldCustom( AppTextFieldCustom(
height: Helpers.getTextFieldHeight(),
onClick: model.listOfDiagnosisCondition != null onClick: model.listOfDiagnosisCondition != null
? () { ? () {
MasterKeyDailog dialog = MasterKeyDailog( MasterKeyDailog dialog = MasterKeyDailog(
@ -288,7 +294,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
} }
: null, : null,
hintText: TranslationBase.of(context).condition, hintText: TranslationBase.of(context).condition,
maxLines: 2, maxLines: 1,
minLines: 1, minLines: 1,
controller: conditionController, controller: conditionController,
isTextFieldHasSuffix: true, isTextFieldHasSuffix: true,
@ -305,6 +311,8 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
height: 10, height: 10,
), ),
AppTextFieldCustom( AppTextFieldCustom(
height: Helpers.getTextFieldHeight(),
onClick: model.listOfDiagnosisType != null onClick: model.listOfDiagnosisType != null
? () { ? () {
MasterKeyDailog dialog = MasterKeyDailog( MasterKeyDailog dialog = MasterKeyDailog(
@ -334,7 +342,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
} }
: null, : null,
hintText: TranslationBase.of(context).dType, hintText: TranslationBase.of(context).dType,
maxLines: 2, maxLines: 1,
minLines: 1, minLines: 1,
enabled: false, enabled: false,
isTextFieldHasSuffix: true, isTextFieldHasSuffix: true,
@ -365,7 +373,8 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
), ),
), ),
SizedBox( SizedBox(
height: 10, height: SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort ?20:SizeConfig.isHeightShort?15:10),
), ),
])), ])),
), ),

@ -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/master_lookup_key.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.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/core/viewModel/SOAP_view_model.dart';
@ -167,7 +168,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
RichText( RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: 10, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -182,7 +183,8 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
.selectedICD.code .selectedICD.code
.trim() .trim()
.toUpperCase() ?? .toUpperCase() ??
"", ""
), ),
], ],
), ),
@ -195,7 +197,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
child: RichText( child: RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: 16, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *5,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -215,7 +217,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
RichText( RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.5,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -226,7 +228,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
context) context)
.appointmentNo, .appointmentNo,
style: new TextStyle( style: new TextStyle(
fontSize: 10, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,
letterSpacing: -0.4, letterSpacing: -0.4,
color: Color(0xFF575757), color: Color(0xFF575757),
), ),
@ -237,7 +239,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
.toString() ?? .toString() ??
"", "",
style: new TextStyle( style: new TextStyle(
fontSize: 14, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
letterSpacing: -0.48, letterSpacing: -0.48,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
), ),
@ -248,7 +250,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
RichText( RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: fontWeight:
@ -274,7 +276,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
.selectedDiagnosisCondition .selectedDiagnosisCondition
.nameEn, .nameEn,
style: new TextStyle( style: new TextStyle(
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
letterSpacing: -0.48, letterSpacing: -0.48,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
), ),
@ -285,7 +287,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
RichText( RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: 10, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: fontWeight:
@ -311,7 +313,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
.selectedDiagnosisType .selectedDiagnosisType
.nameEn, .nameEn,
style: new TextStyle( style: new TextStyle(
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
letterSpacing: -0.48, letterSpacing: -0.48,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
), ),
@ -323,7 +325,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
RichText( RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: fontWeight:
@ -335,7 +337,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
.doctor + .doctor +
' : ', ' : ',
style: new TextStyle( style: new TextStyle(
fontSize: 10,letterSpacing: -0.4, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,letterSpacing: -0.4,
color: color:
Color(0xFF575757), Color(0xFF575757),
), ),
@ -345,7 +347,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
.doctorName ?? .doctorName ??
'', '',
style: new TextStyle( style: new TextStyle(
fontSize: 12,letterSpacing: -0.48, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,letterSpacing: -0.48,
color: color:
Color(0xFF2B353E), Color(0xFF2B353E),
), ),
@ -375,7 +377,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
.remarks + .remarks +
" : " " : "
: '', : '',
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: fontWeight:
@ -412,7 +414,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
.now()), .now()),
fontWeight: fontWeight:
FontWeight.w600, FontWeight.w600,
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
), ),
AppText( AppText(
assessment.createdOn != assessment.createdOn !=
@ -427,7 +429,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
fontWeight: fontWeight:
FontWeight.w600, FontWeight.w600,
color: Color(0xFF575757), color: Color(0xFF575757),
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
), ),
], ],
), ),

@ -65,38 +65,32 @@ class _AddExaminationWidgetState extends State<AddExaminationWidget> {
headerWidget: Row( headerWidget: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Expanded( InkWell(
child: CheckboxListTile( onTap: (){
title: AppText( onExamTap();
projectViewModel.isArabic },
? widget.item.nameAr != null && widget.item.nameAr != "" child: Row(
? widget.item.nameAr children: [
: widget.item.nameEn Checkbox(
: widget.item.nameEn, value:widget.isServiceSelected(widget.item),
fontWeight: FontWeight.normal, activeColor: Colors.red[800],
fontFamily: 'Poppins', onChanged: (bool newValue) {
fontSize: SizeConfig.textMultiplier * 2.0, onExamTap();
), }),
value: widget.isServiceSelected(widget.item), Container(
activeColor: HexColor("#D02127"), child: AppText(
onChanged: (newValue) { projectViewModel.isArabic
setState(() { ? widget.item.nameAr != null && widget.item.nameAr != ""
if (widget.isServiceSelected(widget.item)) { ? widget.item.nameAr
if (examination.isLocal) : widget.item.nameEn
widget.removeExamination(examination); : widget.item.nameEn,
widget.expandClick();
} else { color: Color(0xFF575757),
examination.isNormal = status == 1; fontSize: SizeConfig.getTextMultiplierBasedOnWidth()*3.8,
examination.isAbnormal = status == 2; letterSpacing: -0.56,
examination.notExamined = status == 3; ),
examination.remark = remarksController.text; ),
widget.addExamination(examination); ],
widget.expandClick();
}
});
},
controlAffinity: ListTileControlAffinity.leading,
contentPadding: EdgeInsets.all(0),
), ),
), ),
Container( Container(
@ -271,6 +265,23 @@ class _AddExaminationWidgetState extends State<AddExaminationWidget> {
); );
} }
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) { MySelectedExamination getSelectedExam(MasterKeyModel masterKey) {
Iterable<MySelectedExamination> exam = widget.mySelectedExamination.where( Iterable<MySelectedExamination> exam = widget.mySelectedExamination.where(
(element) => (element) =>

@ -1,5 +1,6 @@
import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart'; 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/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/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.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'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
@ -42,10 +43,11 @@ class _ExaminationsListSearchWidgetState
return Column( return Column(
children: [ children: [
AppTextFieldCustom( AppTextFieldCustom(
height: MediaQuery.of(context).size.height * 0.080, height: Helpers.getTextFieldHeight(),
hintText: TranslationBase.of(context).searchExamination, hintText: TranslationBase.of(context).searchExamination,
isTextFieldHasSuffix: true, isTextFieldHasSuffix: true,
hasBorder: false, hasBorder: false,
controller: filteredSearchController, controller: filteredSearchController,
onChanged: (value) { onChanged: (value) {
filterSearchResults(value); filterSearchResults(value);

@ -1,4 +1,5 @@
import 'package:doctor_app_flutter/config/shared_pref_kay.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/master_lookup_key.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.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/core/viewModel/SOAP_view_model.dart';
@ -192,7 +193,8 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
isExpanded: isSysExaminationExpand, isExpanded: isSysExaminationExpand,
), ),
SizedBox( SizedBox(
height: MediaQuery.of(context).size.height * 0.12, height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 14 : 12),
) )
], ],
), ),
@ -207,7 +209,8 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
), ),
border: Border.all(color: HexColor('#707070'), width: 0), border: Border.all(color: HexColor('#707070'), width: 0),
), ),
height: 80, height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 12 : 10),
width: double.infinity, width: double.infinity,
child: Column( child: Column(
children: [ children: [
@ -224,6 +227,9 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
child: AppButton( child: AppButton(
title: TranslationBase.of(context).previous, title: TranslationBase.of(context).previous,
color: Colors.grey[300], color: Colors.grey[300],
height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 8 : 6),
padding: 10,
fontColor: Colors.black, fontColor: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
onPressed: () { onPressed: () {
@ -239,6 +245,9 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
title: TranslationBase.of(context).next, title: TranslationBase.of(context).next,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.red[700], color: Colors.red[700],
height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 8 : 6),
padding: 10,
disabled: model.state == ViewState.BusyLocal, disabled: model.state == ViewState.BusyLocal,
onPressed: () async { onPressed: () async {
await submitUpdateObjectivePage(model); await submitUpdateObjectivePage(model);

@ -1,4 +1,5 @@
import 'package:doctor_app_flutter/config/shared_pref_kay.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/viewstate.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/core/viewModel/SOAP_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
@ -209,7 +210,9 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
children: [ children: [
AppText( AppText(
'Appointment No: ', 'Appointment No: ',
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,
letterSpacing: -0.4,
color: Color(0xFF575757),
), ),
AppText( AppText(
patientProgressNote patientProgressNote
@ -220,7 +223,9 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
.toString() .toString()
: '', : '',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14, letterSpacing: -0.48,
color: Color(0xFF2B353E),
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
), ),
], ],
), ),
@ -236,7 +241,7 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
.getDayMonthYearDateFormatted( .getDayMonthYearDateFormatted(
DateTime.now()), DateTime.now()),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
) )
], ],
), ),
@ -268,7 +273,8 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
: AppDateUtils.getHour( : AppDateUtils.getHour(
DateTime.now()), DateTime.now()),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14, color: Color(0xFF575757),
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
) )
], ],
), ),
@ -319,7 +325,8 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
), ),
border: Border.all(color: HexColor('#707070'), width: 0), border: Border.all(color: HexColor('#707070'), width: 0),
), ),
height: 80, height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 12 : 10),
width: double.infinity, width: double.infinity,
child: Column( child: Column(
children: [ children: [
@ -334,6 +341,9 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
children: [ children: [
Expanded( Expanded(
child: AppButton( child: AppButton(
height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 8 : 6),
padding: 10,
title: TranslationBase.of(context).previous, title: TranslationBase.of(context).previous,
color: Colors.grey[300], color: Colors.grey[300],
fontColor: Colors.black, fontColor: Colors.black,
@ -349,6 +359,9 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
), ),
Expanded( Expanded(
child: AppButton( child: AppButton(
height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 8 : 6),
padding: 10,
title: isAddProgress title: isAddProgress
? TranslationBase.of(context).next ? TranslationBase.of(context).next
: TranslationBase.of(context).finish, : TranslationBase.of(context).finish,

@ -42,7 +42,7 @@ class ExpandableSOAPWidget extends StatelessWidget {
children: [ children: [
AppText(headerTitle, AppText(headerTitle,
variant: isExpanded ? "bodyText" : '', variant: isExpanded ? "bodyText" : '',
fontSize: SizeConfig.getTextMultiplierBasedOnWidth()*5, fontSize: SizeConfig.getTextMultiplierBasedOnWidth()*(SizeConfig.isHeightVeryShort?4.8: 5),
letterSpacing:-0.64, letterSpacing:-0.64,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: Color(0xFF2E303A),), color: Color(0xFF2E303A),),

@ -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/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -19,7 +20,7 @@ class RemoveButton extends StatelessWidget {
Container( Container(
child: AppText( child: AppText(
label??TranslationBase.of(context).remove, label??TranslationBase.of(context).remove,
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.5,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: HexColor("#D02127"), color: HexColor("#D02127"),
letterSpacing:-0.48, letterSpacing:-0.48,
@ -28,7 +29,7 @@ class RemoveButton extends StatelessWidget {
Icon( Icon(
FontAwesomeIcons.times, FontAwesomeIcons.times,
color: HexColor("#D02127"), color: HexColor("#D02127"),
size: 16, size: SizeConfig.getTextMultiplierBasedOnWidth() *4,
), ),
], ],
), ),

@ -1,11 +1,9 @@
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/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/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/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'Step_details_widget.dart'; import 'Step_details_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/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/SOAP/selected_items/my_selected_allergy.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'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/remark_text.dart';
@ -70,7 +71,7 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
: TextDecoration.lineThrough, : TextDecoration.lineThrough,
bold: true, bold: true,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.5,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
letterSpacing: -0.48, letterSpacing: -0.48,
// fontHeight:0.18 , // fontHeight:0.18 ,
@ -86,7 +87,7 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
? null ? null
: TextDecoration.lineThrough, : TextDecoration.lineThrough,
color: Color(0xFFCC9B14), color: Color(0xFFCC9B14),
fontSize: 10, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
letterSpacing: -0.48, letterSpacing: -0.48,
), ),

@ -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/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/SOAP/master_key_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'; import 'package:doctor_app_flutter/models/SOAP/selected_items/my_selected_history.dart';
@ -68,7 +69,7 @@ class _UpdateHistoryWidgetState extends State<UpdateHistoryWidget>
? null ? null
: TextDecoration.lineThrough, : TextDecoration.lineThrough,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
fontSize: 12, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.5,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
letterSpacing: -0.48, letterSpacing: -0.48,
), ),

@ -351,7 +351,7 @@ class _AddMedicationState extends State<AddMedication> {
height: 5, height: 5,
), ),
AppTextFieldCustom( AppTextFieldCustom(
height: Helpers.getTextFieldHeight(), height: Helpers.getTextFieldHeight(),
onClick: model.medicationFrequencyList != onClick: model.medicationFrequencyList !=
null null
? () { ? () {

@ -345,9 +345,8 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
height: SizeConfig.heightMultiplier * height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 8 : 6), (SizeConfig.isHeightVeryShort ? 8 : 6),
color: Colors.red[700],
padding: 10, padding: 10,
// loading: model.state == ViewState.BusyLocal, color: Colors.red[700],
onPressed: () async { onPressed: () async {
addSubjectiveInfo( addSubjectiveInfo(
model: model, model: model,

Loading…
Cancel
Save