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: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<AddAssessmentDetails> {
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<AddAssessmentDetails> {
),
)
: AppTextFieldCustom(
onClick: model.listOfICD10 != null
height: Helpers.getTextFieldHeight(),
onClick: model.listOfICD10 != null
? () {
setState(() {
widget.mySelectedAssessment
@ -235,7 +239,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
: null,
hintText: TranslationBase.of(context)
.nameOrICD,
maxLines: 2,
maxLines: 1,
minLines: 1,
controller: icdNameController,
enabled: true,
@ -251,6 +255,8 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
height: 7,
),
AppTextFieldCustom(
height: Helpers.getTextFieldHeight(),
onClick: model.listOfDiagnosisCondition != null
? () {
MasterKeyDailog dialog = MasterKeyDailog(
@ -288,7 +294,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
}
: null,
hintText: TranslationBase.of(context).condition,
maxLines: 2,
maxLines: 1,
minLines: 1,
controller: conditionController,
isTextFieldHasSuffix: true,
@ -305,6 +311,8 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
height: 10,
),
AppTextFieldCustom(
height: Helpers.getTextFieldHeight(),
onClick: model.listOfDiagnosisType != null
? () {
MasterKeyDailog dialog = MasterKeyDailog(
@ -334,7 +342,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
}
: null,
hintText: TranslationBase.of(context).dType,
maxLines: 2,
maxLines: 1,
minLines: 1,
enabled: false,
isTextFieldHasSuffix: true,
@ -365,7 +373,8 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
),
),
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/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
@ -167,7 +168,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
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<UpdateAssessmentPage> {
.selectedICD.code
.trim()
.toUpperCase() ??
"",
""
),
],
),
@ -195,7 +197,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
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<UpdateAssessmentPage> {
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<UpdateAssessmentPage> {
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<UpdateAssessmentPage> {
.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<UpdateAssessmentPage> {
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<UpdateAssessmentPage> {
.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<UpdateAssessmentPage> {
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<UpdateAssessmentPage> {
.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<UpdateAssessmentPage> {
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<UpdateAssessmentPage> {
.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<UpdateAssessmentPage> {
.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<UpdateAssessmentPage> {
.remarks +
" : "
: '',
fontSize: 12,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,
color: Color(0xFF2E303A),
fontFamily: 'Poppins',
fontWeight:
@ -412,7 +414,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
.now()),
fontWeight:
FontWeight.w600,
fontSize: 12,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
),
AppText(
assessment.createdOn !=
@ -427,7 +429,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
fontWeight:
FontWeight.w600,
color: Color(0xFF575757),
fontSize: 12,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
),
],
),

@ -65,38 +65,32 @@ class _AddExaminationWidgetState extends State<AddExaminationWidget> {
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<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) {
Iterable<MySelectedExamination> exam = widget.mySelectedExamination.where(
(element) =>

@ -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);

@ -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<UpdateObjectivePage> {
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<UpdateObjectivePage> {
),
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<UpdateObjectivePage> {
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<UpdateObjectivePage> {
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);

@ -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<UpdatePlanPage> {
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<UpdatePlanPage> {
.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<UpdatePlanPage> {
.getDayMonthYearDateFormatted(
DateTime.now()),
fontWeight: FontWeight.w600,
fontSize: 14,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.6,
)
],
),
@ -268,7 +273,8 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
: 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<UpdatePlanPage> {
),
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<UpdatePlanPage> {
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<UpdatePlanPage> {
),
Expanded(
child: AppButton(
height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 8 : 6),
padding: 10,
title: isAddProgress
? TranslationBase.of(context).next
: TranslationBase.of(context).finish,

@ -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),),

@ -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,
),
],
),

@ -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';

@ -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<UpdateAllergiesWidget> {
: 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<UpdateAllergiesWidget> {
? null
: TextDecoration.lineThrough,
color: Color(0xFFCC9B14),
fontSize: 10,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3,
fontWeight: FontWeight.w700,
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/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<UpdateHistoryWidget>
? null
: TextDecoration.lineThrough,
color: Color(0xFF2B353E),
fontSize: 12,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() *3.5,
fontWeight: FontWeight.w700,
letterSpacing: -0.48,
),

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

@ -345,9 +345,8 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
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,

Loading…
Cancel
Save