vital signs solve overflow of the width

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

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

Loading…
Cancel
Save