vital signs solve overflow of the width

merge-requests/232/head
mosazaid 5 years ago
parent a51239447b
commit c9aac6e2e9

@ -415,43 +415,57 @@ class _TemperatureWidgetState extends State<TemperatureWidget> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Row( Expanded(
children: [ child: Row(
AppText( crossAxisAlignment: CrossAxisAlignment.start,
"${TranslationBase.of(context).temperature} (C):", children: [
fontSize: SizeConfig.textMultiplier * 1.8, Expanded(
color: Colors.black, child: AppText(
fontWeight: FontWeight.w700, "${TranslationBase.of(context).temperature} (C):",
), fontSize: SizeConfig.textMultiplier * 1.8,
SizedBox( color: Colors.black,
width: 8, fontWeight: FontWeight.w700,
), ),
AppText( ),
"${widget.vitalSign.temperatureCelcius}", SizedBox(
fontSize: SizeConfig.textMultiplier * 2, width: 8,
color: Colors.grey.shade800, ),
fontWeight: FontWeight.normal, Expanded(
), child: AppText(
], "${widget.vitalSign.temperatureCelcius}",
fontSize: SizeConfig.textMultiplier * 2,
color: Colors.grey.shade800,
fontWeight: FontWeight.normal,
),
),
],
),
), ),
Row( Expanded(
children: [ child: Row(
AppText( crossAxisAlignment: CrossAxisAlignment.start,
"${TranslationBase.of(context).temperature} (F):", children: [
fontSize: SizeConfig.textMultiplier * 1.8, Expanded(
color: Colors.black, child: AppText(
fontWeight: FontWeight.w700, "${TranslationBase.of(context).temperature} (F):",
), fontSize: SizeConfig.textMultiplier * 1.8,
SizedBox( color: Colors.black,
width: 8, fontWeight: FontWeight.w700,
), ),
AppText( ),
"${widget.vitalSign.temperatureCelcius * (9 / 5) + 32}", SizedBox(
fontSize: SizeConfig.textMultiplier * 2, width: 8,
color: Colors.grey.shade800, ),
fontWeight: FontWeight.normal, Expanded(
), child: AppText(
], "${widget.vitalSign.temperatureCelcius * (9 / 5) + 32}",
fontSize: SizeConfig.textMultiplier * 2,
color: Colors.grey.shade800,
fontWeight: FontWeight.normal,
),
),
],
),
), ),
], ],
), ),
@ -534,44 +548,59 @@ class _PulseWidgetState extends State<PulseWidget> {
children: [ children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Expanded(
children: [ child: Row(
AppText( crossAxisAlignment: CrossAxisAlignment.start,
"${TranslationBase.of(context).pulseBeats}", children: [
fontSize: SizeConfig.textMultiplier * 1.8, Expanded(
color: Colors.black, child: AppText(
fontWeight: FontWeight.w700, "${TranslationBase.of(context).pulseBeats}",
), fontSize: SizeConfig.textMultiplier * 1.8,
SizedBox( color: Colors.black,
width: 8, fontWeight: FontWeight.w700,
), ),
AppText( ),
"${widget.vitalSign.pulseBeatPerMinute}", SizedBox(
fontSize: SizeConfig.textMultiplier * 2, width: 8,
color: Colors.grey.shade800, ),
fontWeight: FontWeight.normal, Expanded(
), child: AppText(
], "${widget.vitalSign.pulseBeatPerMinute}",
fontSize: SizeConfig.textMultiplier * 2,
color: Colors.grey.shade800,
fontWeight: FontWeight.normal,
),
),
],
),
), ),
Row( Expanded(
children: [ child: Row(
AppText( crossAxisAlignment: CrossAxisAlignment.start,
"${TranslationBase.of(context).rhythm}", children: [
fontSize: SizeConfig.textMultiplier * 1.8, Expanded(
color: Colors.black, child: AppText(
fontWeight: FontWeight.w700, "${TranslationBase.of(context).rhythm}",
), fontSize: SizeConfig.textMultiplier * 1.8,
SizedBox( color: Colors.black,
width: 8, fontWeight: FontWeight.w700,
), ),
AppText( ),
"${widget.vitalSign.pulseRhythm}", SizedBox(
fontSize: SizeConfig.textMultiplier * 2, width: 8,
color: Colors.grey.shade800, ),
fontWeight: FontWeight.normal, Expanded(
), child: AppText(
], "${widget.vitalSign.pulseRhythm}",
fontSize: SizeConfig.textMultiplier * 2,
color: Colors.grey.shade800,
fontWeight: FontWeight.normal,
),
),
],
),
), ),
], ],
), ),
@ -628,43 +657,57 @@ class _RespirationWidgetState extends State<RespirationWidget> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Row( Expanded(
children: [ child: Row(
AppText( crossAxisAlignment: CrossAxisAlignment.start,
"${TranslationBase.of(context).respBeats}", children: [
fontSize: SizeConfig.textMultiplier * 1.8, Expanded(
color: Colors.black, child: AppText(
fontWeight: FontWeight.w700, "${TranslationBase.of(context).respBeats}",
), fontSize: SizeConfig.textMultiplier * 1.8,
SizedBox( color: Colors.black,
width: 8, fontWeight: FontWeight.w700,
), ),
AppText( ),
"${widget.vitalSign.respirationBeatPerMinute}", SizedBox(
fontSize: SizeConfig.textMultiplier * 2, width: 8,
color: Colors.grey.shade800, ),
fontWeight: FontWeight.normal, Expanded(
), child: AppText(
], "${widget.vitalSign.respirationBeatPerMinute}",
fontSize: SizeConfig.textMultiplier * 2,
color: Colors.grey.shade800,
fontWeight: FontWeight.normal,
),
),
],
),
), ),
Row( Expanded(
children: [ child: Row(
AppText( crossAxisAlignment: CrossAxisAlignment.start,
"${TranslationBase.of(context).patternOfRespiration}", children: [
fontSize: SizeConfig.textMultiplier * 1.8, Expanded(
color: Colors.black, child: AppText(
fontWeight: FontWeight.w700, "${TranslationBase.of(context).patternOfRespiration}",
), fontSize: SizeConfig.textMultiplier * 1.8,
SizedBox( color: Colors.black,
width: 8, fontWeight: FontWeight.w700,
), ),
AppText( ),
"${widget.vitalSign.respirationPattern}", SizedBox(
fontSize: SizeConfig.textMultiplier * 2, width: 8,
color: Colors.grey.shade800, ),
fontWeight: FontWeight.normal, Expanded(
), child: AppText(
], "${widget.vitalSign.respirationPattern}",
fontSize: SizeConfig.textMultiplier * 2,
color: Colors.grey.shade800,
fontWeight: FontWeight.normal,
),
),
],
),
), ),
], ],
), ),
@ -721,43 +764,57 @@ class _BloodPressureWidgetState extends State<BloodPressureWidget> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Row( Expanded(
children: [ child: Row(
AppText( crossAxisAlignment: CrossAxisAlignment.start,
"${TranslationBase.of(context).bloodPressureDiastoleAndSystole}", children: [
fontSize: SizeConfig.textMultiplier * 1.8, Expanded(
color: Colors.black, child: AppText(
fontWeight: FontWeight.w700, "${TranslationBase.of(context).bloodPressureDiastoleAndSystole}",
), fontSize: SizeConfig.textMultiplier * 1.8,
SizedBox( color: Colors.black,
width: 8, fontWeight: FontWeight.w700,
), ),
AppText( ),
"${widget.vitalSign.bloodPressureHigher}, ${widget.vitalSign.bloodPressureLower}", SizedBox(
fontSize: SizeConfig.textMultiplier * 2, width: 8,
color: Colors.grey.shade800, ),
fontWeight: FontWeight.normal, Expanded(
), child: AppText(
], "${widget.vitalSign.bloodPressureHigher}, ${widget.vitalSign.bloodPressureLower}",
fontSize: SizeConfig.textMultiplier * 2,
color: Colors.grey.shade800,
fontWeight: FontWeight.normal,
),
),
],
),
), ),
Row( Expanded(
children: [ child: Row(
AppText( crossAxisAlignment: CrossAxisAlignment.start,
"${TranslationBase.of(context).cuffLocation}", children: [
fontSize: SizeConfig.textMultiplier * 1.8, Expanded(
color: Colors.black, child: AppText(
fontWeight: FontWeight.w700, "${TranslationBase.of(context).cuffLocation}",
), fontSize: SizeConfig.textMultiplier * 1.8,
SizedBox( color: Colors.black,
width: 8, fontWeight: FontWeight.w700,
), ),
AppText( ),
"${widget.vitalSign.bloodPressureCuffLocation}", SizedBox(
fontSize: SizeConfig.textMultiplier * 2, width: 8,
color: Colors.grey.shade800, ),
fontWeight: FontWeight.normal, Expanded(
), child: AppText(
], "${widget.vitalSign.bloodPressureCuffLocation}",
fontSize: SizeConfig.textMultiplier * 2,
color: Colors.grey.shade800,
fontWeight: FontWeight.normal,
),
),
],
),
), ),
], ],
), ),
@ -766,44 +823,54 @@ class _BloodPressureWidgetState extends State<BloodPressureWidget> {
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Expanded(
children: [ child: Row(
AppText( crossAxisAlignment: CrossAxisAlignment.start,
"${TranslationBase.of(context).patientPosition}", children: [
fontSize: SizeConfig.textMultiplier * 1.8, Expanded(
color: Colors.black, child: AppText(
fontWeight: FontWeight.w700, "${TranslationBase.of(context).patientPosition}",
), fontSize: SizeConfig.textMultiplier * 1.8,
SizedBox( color: Colors.black,
width: 8, fontWeight: FontWeight.w700,
), ),
AppText( ),
"${widget.vitalSign.bloodPressurePatientPosition}", SizedBox(
fontSize: SizeConfig.textMultiplier * 2, width: 8,
color: Colors.grey.shade800, ),
fontWeight: FontWeight.normal, Expanded(
), child: AppText(
], "${widget.vitalSign.bloodPressurePatientPosition}",
fontSize: SizeConfig.textMultiplier * 2,
color: Colors.grey.shade800,
fontWeight: FontWeight.normal,
),
),
],
),
), ),
Row( Expanded(
children: [ child: Row(
AppText( children: [
"${TranslationBase.of(context).cuffSize}", AppText(
fontSize: SizeConfig.textMultiplier * 1.8, "${TranslationBase.of(context).cuffSize}",
color: Colors.black, fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w700, color: Colors.black,
), fontWeight: FontWeight.w700,
SizedBox( ),
width: 8, SizedBox(
), width: 8,
AppText( ),
"${widget.vitalSign.bloodPressureCuffSize}", AppText(
fontSize: SizeConfig.textMultiplier * 2, "${widget.vitalSign.bloodPressureCuffSize}",
color: Colors.grey.shade800, fontSize: SizeConfig.textMultiplier * 2,
fontWeight: FontWeight.normal, color: Colors.grey.shade800,
), fontWeight: FontWeight.normal,
], ),
],
),
), ),
], ],
), ),
@ -953,43 +1020,47 @@ class _PainScaleWidgetState extends State<PainScaleWidget> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Row( Expanded(
children: [ child: Row(
AppText( children: [
"${TranslationBase.of(context).painScale}", AppText(
fontSize: SizeConfig.textMultiplier * 1.8, "${TranslationBase.of(context).painScale}",
color: Colors.black, fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w700, color: Colors.black,
), fontWeight: FontWeight.w700,
SizedBox( ),
width: 8, SizedBox(
), width: 8,
AppText( ),
"${widget.vitalSign.painScore}", AppText(
fontSize: SizeConfig.textMultiplier * 2, "${widget.vitalSign.painScore}",
color: Colors.grey.shade800, fontSize: SizeConfig.textMultiplier * 2,
fontWeight: FontWeight.normal, color: Colors.grey.shade800,
), fontWeight: FontWeight.normal,
], ),
],
),
), ),
Row( Expanded(
children: [ child: Row(
AppText( children: [
"${TranslationBase.of(context).painManagement}", AppText(
fontSize: SizeConfig.textMultiplier * 1.8, "${TranslationBase.of(context).painManagement}",
color: Colors.black, fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w700, color: Colors.black,
), fontWeight: FontWeight.w700,
SizedBox( ),
width: 8, SizedBox(
), width: 8,
AppText( ),
"${widget.vitalSign.isPainManagementDone}", AppText(
fontSize: SizeConfig.textMultiplier * 2, "${widget.vitalSign.isPainManagementDone}",
color: Colors.grey.shade800, fontSize: SizeConfig.textMultiplier * 2,
fontWeight: FontWeight.normal, color: Colors.grey.shade800,
), fontWeight: FontWeight.normal,
], ),
],
),
), ),
], ],
), ),

Loading…
Cancel
Save