design hot fixes

merge-requests/527/head
mosazaid 5 years ago
parent 51234b8059
commit dde8d9aa48

@ -44,406 +44,414 @@ class VitalSignDetailsScreen extends StatelessWidget {
appBarTitle: TranslationBase.of(context).vitalSign, appBarTitle: TranslationBase.of(context).vitalSign,
body: mode.patientVitalSignsHistory.length > 0 body: mode.patientVitalSignsHistory.length > 0
? Column( ? Column(
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ Expanded(
Container( child: Container(
margin: EdgeInsets.all(16.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( Container(
"${patient.firstName ?? patient.patientDetails.firstName}'s", margin: EdgeInsets.all(16.0),
fontFamily: 'Poppins', child: Column(
fontSize: SizeConfig.textMultiplier * 1.6, crossAxisAlignment: CrossAxisAlignment.start,
fontWeight: FontWeight.w600,
),
AppText(
TranslationBase.of(context).vitalSign,
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 3,
fontWeight: FontWeight.bold,
)
],
),
),
Container(
height: MediaQuery.of(context).size.height * 0.23,
width: double.infinity,
padding: EdgeInsets.all(12.0),
margin: EdgeInsets.symmetric(horizontal: 16.0),
decoration: BoxDecoration(
shape: BoxShape.rectangle,
color: Colors.white,
borderRadius: BorderRadius.circular(16),
border: Border.fromBorderSide(BorderSide(
color: Colors.grey.shade400,
width: 0.4,
)),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
"${TranslationBase.of(context).yourBodyMassIndex} ${mode.bodyMax}",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 2.0,
fontWeight: FontWeight.w700,
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
mode.getBMIStatus() != 1
? '${assetBasePath}underweight_BMI.png'
: '${assetBasePath}underweight_BMI-r.png',
height:
MediaQuery.of(context).size.height * 0.10,
),
const SizedBox(
height: 4,
),
AppText(
"${TranslationBase.of(context).bmiUnderWeight}",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15,
color: mode.getBMIStatus() == 1
? Color(0XFFD02127)
: null,
fontWeight: FontWeight.w700,
),
AppText(
"(<18.5)",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15,
color: mode.getBMIStatus() == 1
? Color(0XFFD02127)
: null,
fontWeight: FontWeight.w700,
),
],
)),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
mode.getBMIStatus() != 2
? '${assetBasePath}health_BMI.png'
: '${assetBasePath}health_BMI-r.png',
height:
MediaQuery.of(context).size.height * 0.10,
),
const SizedBox(
height: 4,
),
Container(
child: AppText(
"${TranslationBase.of(context).normal}",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15,
fontWeight: FontWeight.w700,
color: mode.getBMIStatus() == 2
? Color(0XFFD02127)
: null,
),
),
AppText(
"(18.5-24.9)",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15,
fontWeight: FontWeight.w700,
color: mode.getBMIStatus() == 2
? Color(0XFFD02127)
: null,
),
],
)),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Image.asset(
mode.getBMIStatus() != 3
? '${assetBasePath}ovrweight_BMI.png'
: '${assetBasePath}ovrweight_BMI-r.png',
height:
MediaQuery.of(context).size.height * 0.10,
),
const SizedBox(
height: 4,
),
AppText( AppText(
"${TranslationBase.of(context).bmiOverWeight}", "${patient.firstName ?? patient.patientDetails.firstName}'s",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.155, fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w600,
color: mode.getBMIStatus() == 3
? Color(0XFFD02127)
: null,
), ),
AppText( AppText(
"(25-29.9)", TranslationBase.of(context).vitalSign,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.155, fontSize: SizeConfig.textMultiplier * 3,
fontWeight: FontWeight.w700, fontWeight: FontWeight.bold,
color: mode.getBMIStatus() == 3 )
? Color(0XFFD02127)
: null,
),
], ],
)), ),
Expanded( ),
child: Column( Container(
crossAxisAlignment: CrossAxisAlignment.center, height: MediaQuery.of(context).size.height * 0.23,
width: double.infinity,
padding: EdgeInsets.all(12.0),
margin: EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
decoration: BoxDecoration(
shape: BoxShape.rectangle,
color: Colors.white,
borderRadius: BorderRadius.circular(16),
border: Border.fromBorderSide(BorderSide(
color: Colors.grey.shade400,
width: 0.4,
)),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Image.asset(
mode.getBMIStatus() != 4
? '${assetBasePath}Obese_BMI.png'
: '${assetBasePath}Obese_BMI-r.png',
height:
MediaQuery.of(context).size.height * 0.10,
),
const SizedBox(
height: 4,
),
AppText( AppText(
"${TranslationBase.of(context).bmiObese}", "${TranslationBase.of(context).yourBodyMassIndex} ${mode.bodyMax}",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15, fontSize: SizeConfig.textMultiplier * 2.0,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: mode.getBMIStatus() == 4
? Color(0XFFD02127)
: null,
),
AppText(
"(30-34.9)",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15,
fontWeight: FontWeight.w700,
color: mode.getBMIStatus() == 4
? Color(0XFFD02127)
: null,
), ),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
mode.getBMIStatus() != 1
? '${assetBasePath}underweight_BMI.png'
: '${assetBasePath}underweight_BMI-r.png',
height:
MediaQuery.of(context).size.height * 0.10,
),
const SizedBox(
height: 4,
),
AppText(
"${TranslationBase.of(context).bmiUnderWeight}",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15,
color: mode.getBMIStatus() == 1
? Color(0XFFD02127)
: null,
fontWeight: FontWeight.w700,
),
AppText(
"(<18.5)",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15,
color: mode.getBMIStatus() == 1
? Color(0XFFD02127)
: null,
fontWeight: FontWeight.w700,
),
],
)),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
mode.getBMIStatus() != 2
? '${assetBasePath}health_BMI.png'
: '${assetBasePath}health_BMI-r.png',
height:
MediaQuery.of(context).size.height * 0.10,
),
const SizedBox(
height: 4,
),
Container(
child: AppText(
"${TranslationBase.of(context).normal}",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15,
fontWeight: FontWeight.w700,
color: mode.getBMIStatus() == 2
? Color(0XFFD02127)
: null,
),
),
AppText(
"(18.5-24.9)",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15,
fontWeight: FontWeight.w700,
color: mode.getBMIStatus() == 2
? Color(0XFFD02127)
: null,
),
],
)),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
mode.getBMIStatus() != 3
? '${assetBasePath}ovrweight_BMI.png'
: '${assetBasePath}ovrweight_BMI-r.png',
height:
MediaQuery.of(context).size.height * 0.10,
),
const SizedBox(
height: 4,
),
AppText(
"${TranslationBase.of(context).bmiOverWeight}",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.155,
fontWeight: FontWeight.w700,
color: mode.getBMIStatus() == 3
? Color(0XFFD02127)
: null,
),
AppText(
"(25-29.9)",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.155,
fontWeight: FontWeight.w700,
color: mode.getBMIStatus() == 3
? Color(0XFFD02127)
: null,
),
],
)),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
mode.getBMIStatus() != 4
? '${assetBasePath}Obese_BMI.png'
: '${assetBasePath}Obese_BMI-r.png',
height:
MediaQuery.of(context).size.height * 0.10,
),
const SizedBox(
height: 4,
),
AppText(
"${TranslationBase.of(context).bmiObese}",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15,
fontWeight: FontWeight.w700,
color: mode.getBMIStatus() == 4
? Color(0XFFD02127)
: null,
),
AppText(
"(30-34.9)",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15,
fontWeight: FontWeight.w700,
color: mode.getBMIStatus() == 4
? Color(0XFFD02127)
: null,
),
],
)),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
mode.getBMIStatus() != 5
? '${assetBasePath}Obese_BMI.png'
: '${assetBasePath}Obese_BMI-r.png',
height:
MediaQuery.of(context).size.height * 0.10,
),
const SizedBox(
height: 4,
),
FittedBox(
fit: BoxFit.fitWidth,
child: AppText(
"${TranslationBase.of(context).bmiObeseExtreme}",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15,
fontWeight: FontWeight.w700,
color: mode.getBMIStatus() == 5
? Color(0XFFD02127)
: null,
),
),
AppText(
"(35<)",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.15,
fontWeight: FontWeight.w700,
color: mode.getBMIStatus() == 5
? Color(0XFFD02127)
: null,
),
],
)),
],
)
], ],
)), ),
Expanded( ),
child: Column( Expanded(
crossAxisAlignment: CrossAxisAlignment.center, child: Container(
children: [ margin: EdgeInsets.symmetric(horizontal: 16.0, vertical: 4),
Image.asset( child: GridView.count(
mode.getBMIStatus() != 5 shrinkWrap: true,
? '${assetBasePath}Obese_BMI.png' physics: NeverScrollableScrollPhysics(),
: '${assetBasePath}Obese_BMI-r.png', crossAxisSpacing: 6,
height: mainAxisSpacing: 6,
MediaQuery.of(context).size.height * 0.10, childAspectRatio: 1.0 / 1.0,
), crossAxisCount: 3,
const SizedBox( children: [
height: 4, InkWell(
), onTap: () => isNotOneAppointment
FittedBox( ? Navigator.push(
fit: BoxFit.fitWidth, context,
child: AppText( FadePage(
"${TranslationBase.of(context).bmiObeseExtreme}", page: VitalSignItemDetailsScreen(
fontFamily: 'Poppins', pageKey: vitalSignDetails.Height,
fontSize: SizeConfig.textMultiplier * 1.15, pageTitle:
fontWeight: FontWeight.w700, TranslationBase.of(context).height,
color: mode.getBMIStatus() == 5 vitalList:
? Color(0XFFD02127) mode.patientVitalSignsHistory,
patient: patient,
patientType: patientType,
arrivalType: arrivalType,
),
),
)
: null, : null,
), child: Container(
), child: VitalSignItem(
AppText( des: TranslationBase.of(context).height,
"(35<)", imagePath: "${assetBasePath}height.png",
fontFamily: 'Poppins', lastVal: mode.heightCm,
fontSize: SizeConfig.textMultiplier * 1.15, unit: TranslationBase.of(context).cm,
fontWeight: FontWeight.w700,
color: mode.getBMIStatus() == 5
? Color(0XFFD02127)
: null,
),
],
)),
],
)
],
),
),
Expanded(
child: Container(
margin: EdgeInsets.symmetric(horizontal: 8.0),
child: GridView.count(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
crossAxisSpacing: 4,
mainAxisSpacing: 4,
childAspectRatio: 1 / 1.0,
crossAxisCount: 3,
children: [
InkWell(
onTap: () => isNotOneAppointment
? Navigator.push(
context,
FadePage(
page: VitalSignItemDetailsScreen(
pageKey: vitalSignDetails.Height,
pageTitle:
TranslationBase.of(context).height,
vitalList:
mode.patientVitalSignsHistory,
patient: patient,
patientType: patientType,
arrivalType: arrivalType,
), ),
), ),
) ),
: null, InkWell(
child: Container( onTap: () => isNotOneAppointment
child: VitalSignItem( ? Navigator.push(
des: TranslationBase.of(context).height, context,
imagePath: "${assetBasePath}height.png", FadePage(
lastVal: mode.heightCm, page: VitalSignItemDetailsScreen(
unit: TranslationBase.of(context).cm, pageKey: vitalSignDetails.Weight,
), pageTitle:
), TranslationBase.of(context).weight,
), vitalList:
InkWell( mode.patientVitalSignsHistory,
onTap: () => isNotOneAppointment patient: patient,
? Navigator.push( patientType: patientType,
context, arrivalType: arrivalType,
FadePage( ),
page: VitalSignItemDetailsScreen(
pageKey: vitalSignDetails.Weight,
pageTitle:
TranslationBase.of(context).weight,
vitalList:
mode.patientVitalSignsHistory,
patient: patient,
patientType: patientType,
arrivalType: arrivalType,
), ),
)
: null,
child: VitalSignItem(
des: TranslationBase.of(context).weight,
imagePath: "${assetBasePath}weight.png",
unit: TranslationBase.of(context).kg,
lastVal: mode.weightKg,
), ),
) ),
: null, InkWell(
child: VitalSignItem( onTap: () => isNotOneAppointment
des: TranslationBase.of(context).weight, ? Navigator.push(
imagePath: "${assetBasePath}weight.png", context,
unit: TranslationBase.of(context).kg, FadePage(
lastVal: mode.weightKg, page: VitalSignItemDetailsScreen(
), pageKey: vitalSignDetails.Temperature,
), pageTitle: TranslationBase.of(context)
InkWell( .temperature,
onTap: () => isNotOneAppointment vitalList:
? Navigator.push( mode.patientVitalSignsHistory,
context, patient: patient,
FadePage( patientType: patientType,
page: VitalSignItemDetailsScreen( arrivalType: arrivalType,
pageKey: vitalSignDetails.Temperature, ),
pageTitle: TranslationBase.of(context) ),
.temperature, )
vitalList: : null,
mode.patientVitalSignsHistory, child: Container(
patient: patient, child: VitalSignItem(
patientType: patientType, des: TranslationBase.of(context).temperature,
arrivalType: arrivalType, imagePath: "${assetBasePath}temperature.png",
lastVal: mode.temperatureCelcius,
unit: TranslationBase.of(context).tempC,
), ),
), ),
) ),
: null, InkWell(
child: Container( onTap: () => isNotOneAppointment
child: VitalSignItem( ? Navigator.push(
des: TranslationBase.of(context).temperature, context,
imagePath: "${assetBasePath}temperature.png", FadePage(
lastVal: mode.temperatureCelcius, page: VitalSignItemDetailsScreen(
unit: TranslationBase.of(context).tempC, pageKey: vitalSignDetails.heart,
), pageTitle:
), TranslationBase.of(context).heart,
), vitalList:
InkWell( mode.patientVitalSignsHistory,
onTap: () => isNotOneAppointment patient: patient,
? Navigator.push( patientType: patientType,
context, arrivalType: arrivalType,
FadePage( ),
page: VitalSignItemDetailsScreen(
pageKey: vitalSignDetails.heart,
pageTitle:
TranslationBase.of(context).heart,
vitalList:
mode.patientVitalSignsHistory,
patient: patient,
patientType: patientType,
arrivalType: arrivalType,
), ),
)
: null,
child: VitalSignItem(
des: TranslationBase.of(context).heart,
imagePath: "${assetBasePath}heart_rate.png",
lastVal: mode.hartRat,
unit: TranslationBase.of(context).bpm,
), ),
) ),
: null, InkWell(
child: VitalSignItem( onTap: () => isNotOneAppointment
des: TranslationBase.of(context).heart, ? Navigator.push(
imagePath: "${assetBasePath}heart_rate.png", context,
lastVal: mode.hartRat, FadePage(
unit: TranslationBase.of(context).bpm, page: VitalSignItemDetailsScreen(
), pageKey: vitalSignDetails.Respiration,
), pageTitle: TranslationBase.of(context)
InkWell( .respirationRate,
onTap: () => isNotOneAppointment vitalList:
? Navigator.push( mode.patientVitalSignsHistory,
context, patient: patient,
FadePage( patientType: patientType,
page: VitalSignItemDetailsScreen( arrivalType: arrivalType,
pageKey: vitalSignDetails.Respiration, ),
pageTitle: TranslationBase.of(context)
.respirationRate,
vitalList:
mode.patientVitalSignsHistory,
patient: patient,
patientType: patientType,
arrivalType: arrivalType,
), ),
)
: null,
child: VitalSignItem(
des: TranslationBase.of(context).respirationRate,
imagePath: "${assetBasePath}respiration_rate.png",
lastVal: mode.respirationBeatPerMinute,
unit:
TranslationBase.of(context).respirationSigns,
), ),
) ),
: null, InkWell(
child: VitalSignItem( onTap: () => isNotOneAppointment
des: TranslationBase.of(context).respirationRate, ? Navigator.push(
imagePath: "${assetBasePath}respiration_rate.png", context,
lastVal: mode.respirationBeatPerMinute, FadePage(
unit: page: VitalSignItemDetailsScreen(
TranslationBase.of(context).respirationSigns, pageKey: vitalSignDetails.BloodPressure,
), pageTitle: TranslationBase.of(context)
), .bloodPressure,
InkWell( vitalList:
onTap: () => isNotOneAppointment mode.patientVitalSignsHistory,
? Navigator.push( patient: patient,
context, patientType: patientType,
FadePage( arrivalType: arrivalType,
page: VitalSignItemDetailsScreen( ),
pageKey: vitalSignDetails.BloodPressure,
pageTitle: TranslationBase.of(context)
.bloodPressure,
vitalList:
mode.patientVitalSignsHistory,
patient: patient,
patientType: patientType,
arrivalType: arrivalType,
), ),
)
: null,
child: VitalSignItem(
des: TranslationBase.of(context).bloodPressure,
imagePath: "${assetBasePath}blood_pressure.png",
lastVal: mode.bloodPressure,
unit: TranslationBase.of(context).sysDias,
), ),
) ),
: null, ],
child: VitalSignItem( ),
des: TranslationBase.of(context).bloodPressure,
imagePath: "${assetBasePath}blood_pressure.png",
lastVal: mode.bloodPressure,
unit: TranslationBase.of(context).sysDias,
), ),
), ),
], ],
), ),
),
), ),
], ),
) ],
)
: Center( : Center(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,

@ -55,13 +55,17 @@ class VitalSignItem extends StatelessWidget {
margin: 0, margin: 0,
), ),
Expanded( Expanded(
child: AppText( child: Column(
"$unit", children: [
fontFamily: 'Poppins', AppText(
fontSize: SizeConfig.textMultiplier * 1.2, "$unit",
fontWeight: FontWeight.w700, fontFamily: 'Poppins',
color: HexColor('#B8382C'), fontSize: SizeConfig.textMultiplier * 1.2,
margin: 0, fontWeight: FontWeight.w700,
color: Color(0xFFB8382C),
margin: 0,
),
],
), ),
), ),
], ],

Loading…
Cancel
Save