diff --git a/assets/images/new/blood_pressure.svg b/assets/images/new/blood_pressure.svg
new file mode 100644
index 00000000..22cf1a2f
--- /dev/null
+++ b/assets/images/new/blood_pressure.svg
@@ -0,0 +1,7 @@
+
diff --git a/assets/images/new/heart_rate.svg b/assets/images/new/heart_rate.svg
new file mode 100644
index 00000000..fe476c3c
--- /dev/null
+++ b/assets/images/new/heart_rate.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/images/new/mass/Obese_BMI.svg b/assets/images/new/mass/Obese_BMI.svg
new file mode 100644
index 00000000..d638bb72
--- /dev/null
+++ b/assets/images/new/mass/Obese_BMI.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/new/mass/health_BMI.svg b/assets/images/new/mass/health_BMI.svg
new file mode 100644
index 00000000..081110d8
--- /dev/null
+++ b/assets/images/new/mass/health_BMI.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/new/mass/ovrweight_BMI.svg b/assets/images/new/mass/ovrweight_BMI.svg
new file mode 100644
index 00000000..d60d9e55
--- /dev/null
+++ b/assets/images/new/mass/ovrweight_BMI.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/new/mass/underweight_BMI.svg b/assets/images/new/mass/underweight_BMI.svg
new file mode 100644
index 00000000..fac1a9ed
--- /dev/null
+++ b/assets/images/new/mass/underweight_BMI.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/new/respiration_rate.svg b/assets/images/new/respiration_rate.svg
new file mode 100644
index 00000000..f544f547
--- /dev/null
+++ b/assets/images/new/respiration_rate.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/new/temperature.svg b/assets/images/new/temperature.svg
new file mode 100644
index 00000000..3330c310
--- /dev/null
+++ b/assets/images/new/temperature.svg
@@ -0,0 +1,5 @@
+
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 50ba6655..247267e7 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -773,7 +773,7 @@ const Map localizedValues = {
"bpm": {"en": "bpm", "ar": "نبضة"},
"respiration-signs": {"en": "Respiration", "ar": "تنفس"},
"sys-dias": {"en": "SBP/DBP", "ar": "إنقباض/إنبساط"},
- "body": {"en": "Body \n Mass", "ar": "كتلة\nالجسم"},
+ "body": {"en": "Body Mass", "ar": "كتلة\nالجسم"},
"feedback": {"en": "Feedback", "ar": "رأيك يهمنا"},
"send": {"en": "Send", "ar": "أرسل"},
"status": {"en": "Status", "ar": "الحالة"},
diff --git a/lib/models/vital_sign.dart b/lib/models/vital_sign.dart
new file mode 100644
index 00000000..f9587d31
--- /dev/null
+++ b/lib/models/vital_sign.dart
@@ -0,0 +1,8 @@
+class VitalSign {
+ final String des;
+ final String lastVal;
+ final String unit;
+ final String icon;
+
+ VitalSign(this.des, this.lastVal, this.unit, this.icon);
+}
diff --git a/lib/pages/landing/fragments/home_page_fragment2.dart b/lib/pages/landing/fragments/home_page_fragment2.dart
index e4b0db7b..dae43863 100644
--- a/lib/pages/landing/fragments/home_page_fragment2.dart
+++ b/lib/pages/landing/fragments/home_page_fragment2.dart
@@ -253,14 +253,15 @@ class _HomePageFragment2State extends State {
top: 0,
),
child: GridView.builder(
- gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 2 / 2, crossAxisSpacing: 12, mainAxisSpacing: 12),
- physics: NeverScrollableScrollPhysics(),
- shrinkWrap: true,
- itemCount: hmgServices.length,
- padding: EdgeInsets.zero,
- itemBuilder: (BuildContext context, int index) {
- return ServicesView(hmgServices[index], index);
- }),
+ gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 2 / 2, crossAxisSpacing: 12, mainAxisSpacing: 12),
+ physics: NeverScrollableScrollPhysics(),
+ shrinkWrap: true,
+ itemCount: hmgServices.length,
+ padding: EdgeInsets.zero,
+ itemBuilder: (BuildContext context, int index) {
+ return ServicesView(hmgServices[index], index);
+ },
+ ),
),
],
),
diff --git a/lib/pages/landing/widgets/logged_slider_view.dart b/lib/pages/landing/widgets/logged_slider_view.dart
index 161d58fb..6570bb18 100644
--- a/lib/pages/landing/widgets/logged_slider_view.dart
+++ b/lib/pages/landing/widgets/logged_slider_view.dart
@@ -128,7 +128,7 @@ class LoggedSliderView extends StatelessWidget {
style: TextStyle(
color: Colors.white,
fontSize: 12,
- letterSpacing: -0.36,
+ letterSpacing: -0.33,
height: 1,
),
),
@@ -148,9 +148,9 @@ class LoggedSliderView extends StatelessWidget {
),
mWidth(6),
Texts(
- "${model.heightCm} ${TranslationBase.of(context).cm}",
+ "Height: ${model.heightCm} ${TranslationBase.of(context).cm}",
color: Colors.white,
- fontSize: 9,
+ fontSize: 10,
)
],
),
@@ -167,7 +167,7 @@ class LoggedSliderView extends StatelessWidget {
height: 12,
),
mWidth(6),
- Texts('${model.weightKg} ${TranslationBase.of(context).kg}', color: Colors.white, fontSize: 9)
+ Texts('Weight: ${model.weightKg} ${TranslationBase.of(context).kg}', color: Colors.white, fontSize: 10)
],
),
),
@@ -183,7 +183,7 @@ class LoggedSliderView extends StatelessWidget {
height: 12,
),
mWidth(6),
- Texts('${model.booldType}', color: Colors.white, fontSize: 9)
+ Texts('Blood: ${model.booldType}', color: Colors.white, fontSize: 10)
],
),
),
diff --git a/lib/pages/medical/vital_sign/vital_sign_details_screen.dart b/lib/pages/medical/vital_sign/vital_sign_details_screen.dart
index 9f7b0f6d..a8636051 100644
--- a/lib/pages/medical/vital_sign/vital_sign_details_screen.dart
+++ b/lib/pages/medical/vital_sign/vital_sign_details_screen.dart
@@ -1,14 +1,20 @@
+import 'package:auto_size_text/auto_size_text.dart';
import 'package:diplomaticquarterapp/core/enum/patient_lookup.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/vital_sign_view_model.dart';
+import 'package:diplomaticquarterapp/models/vital_sign.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/medical/vital_sign/vital_sign_item.dart';
import 'package:diplomaticquarterapp/pages/medical/vital_sign/vital_sign_item_details_screen.dart';
+import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
+import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
+import 'package:flutter_svg/svg.dart';
import '../../../d_q_icons_icons.dart';
@@ -18,185 +24,178 @@ class VitalSignDetailsScreen extends StatelessWidget {
int appointmentNo;
int projectID;
bool isNotOneAppointment;
- VitalSignDetailsScreen({this.appointmentNo, this.projectID,this.isNotOneAppointment=true});
+
+ VitalSignDetailsScreen({this.appointmentNo, this.projectID, this.isNotOneAppointment = true});
+
List imagesInfo = List();
+ List vitalSigns = [];
+ initList(BuildContext context, VitalSignViewModel mode) {
+ vitalSigns.clear();
+ vitalSigns.add(new VitalSign(TranslationBase.of(context).height, mode.heightCm, TranslationBase.of(context).cm, "assets/images/new/height.svg"));
+ vitalSigns.add(new VitalSign(TranslationBase.of(context).weight, mode.weightKg, TranslationBase.of(context).kg, "assets/images/new/weight.svg"));
+ // vitalSigns.add(new VitalSign(TranslationBase.of(context).body, mode.bodyMax, TranslationBase.of(context).mass, "assets/images/new/"));
+ vitalSigns.add(new VitalSign(TranslationBase.of(context).temperature, mode.temperatureCelcius, TranslationBase.of(context).tempC, "assets/images/new/temperature.svg"));
+ vitalSigns.add(new VitalSign(TranslationBase.of(context).heart, mode.hartRat, TranslationBase.of(context).bpm, "assets/images/new/heart_rate.svg"));
+ vitalSigns.add(new VitalSign(TranslationBase.of(context).respirationRate, mode.respirationBeatPerMinute, TranslationBase.of(context).bpm, "assets/images/new/respiration_rate.svg"));
+ vitalSigns.add(new VitalSign(TranslationBase.of(context).bloodPressure, mode.bloodPressure, TranslationBase.of(context).sysDias, "assets/images/new/blood_pressure.svg"));
+ }
@override
Widget build(BuildContext context) {
- imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/ar/0.png'));
- imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/ar/1.png'));
+ imagesInfo.add(ImagesInfo(
+ imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/en/0.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/ar/0.png'));
+ imagesInfo.add(ImagesInfo(
+ imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/en/1.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/ar/1.png'));
return BaseView(
- onModelReady: appointmentNo != null && projectID != null
- ? (model) => model.getPatientVitalSign(
- appointmentNo: appointmentNo, projectID: projectID)
- : (model) => model.getPatientVitalSign(),
- builder: (_, mode, widget) => AppScaffold(
- isShowAppBar: true,
- appBarTitle: TranslationBase.of(context).vitalSigns,
- baseViewModel: mode,
- description: TranslationBase.of(context).infoSigns,
- imagesInfo: imagesInfo,
- body: mode.vitalSignResModelList.length > 0
- ? Container(
- child: ListView(
- children: [
- Row(
- children: [
- InkWell(
- onTap: () =>isNotOneAppointment? Navigator.push(
- context,
- FadePage(
- page: VitalSignItemDetailsScreen(
- pageKey: VitalSignDetails.Height,
- pageTitle: TranslationBase.of(context).height,
- vitalList: mode.vitalSignResModelList,
- ),
- ),
- ):null,
- child: Container(
- child: VitalSignItem(
- des: TranslationBase.of(context).height,
- icon: DQIcons.height,
- lastVal: mode.heightCm,
- unit: TranslationBase.of(context).cm,
- ),
- ),
- ),
- InkWell(
- onTap: () => isNotOneAppointment ? Navigator.push(
- context,
- FadePage(
- page: VitalSignItemDetailsScreen(
- pageKey: VitalSignDetails.Weight,
- pageTitle: TranslationBase.of(context).weight,
- vitalList: mode.vitalSignResModelList,
- ),
- ),
- ):null,
- child: VitalSignItem(
- des: TranslationBase.of(context).weight,
- icon: DQIcons.weight_scale,
- unit: TranslationBase.of(context).kg,
- lastVal: mode.weightKg,
- ),
- ),
- ],
- ),
- Row(
- children: [
- InkWell(
- onTap: () => isNotOneAppointment ? Navigator.push(
- context,
- FadePage(
- page: VitalSignItemDetailsScreen(
- pageKey: VitalSignDetails.BodyMeasurements,
- pageTitle: TranslationBase.of(context)
- .bodyMeasurements,
- vitalList: mode.vitalSignResModelList,
- ),
- ),
- ): null,
- child: VitalSignItem(
- des: TranslationBase.of(context).body,
- icon: DQIcons.bmi,
- lastVal: mode.bodyMax,
- unit: TranslationBase.of(context).mass,
- ),
- ),
- InkWell(
- onTap: () => isNotOneAppointment ? Navigator.push(
- context,
- FadePage(
- page: VitalSignItemDetailsScreen(
- pageKey: VitalSignDetails.Temperature,
- pageTitle:
- TranslationBase.of(context).temperature,
- vitalList: mode.vitalSignResModelList,
- ),
- ),
- ):null,
- child: Container(
- child: VitalSignItem(
- des: TranslationBase.of(context).temperature,
- icon: DQIcons.thermometer,
- lastVal: mode.temperatureCelcius,
- unit: TranslationBase.of(context).tempC,
+ onModelReady: appointmentNo != null && projectID != null ? (model) => model.getPatientVitalSign(appointmentNo: appointmentNo, projectID: projectID) : (model) => model.getPatientVitalSign(),
+ builder: (_, mode, widget) {
+ initList(context, mode);
+ return AppScaffold(
+ isShowAppBar: true,
+ appBarTitle: TranslationBase.of(context).vitalSigns,
+ baseViewModel: mode,
+ description: TranslationBase.of(context).infoSigns,
+ imagesInfo: imagesInfo,
+ showNewAppBar: true,
+ showNewAppBarTitle: true,
+ backgroundColor: Color(0xFFF7F7F7),
+ body: mode.vitalSignResModelList.length > 0
+ ? Container(
+ width: double.infinity,
+ child: ListView(
+ children: [
+ Container(
+ child: Card(
+ margin: EdgeInsets.only(left: 20, right: 20, top: 20, bottom: 6),
+ shape: cardRadius(12),
+ child: Padding(
+ padding: const EdgeInsets.all(12.0),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ "Body Mass Index is: " + mode.bodyMax,
+ style: TextStyle(
+ fontSize: 16,
+ letterSpacing: -0.64,
+ fontWeight: FontWeight.w600,
+ ),
+ ),
+ mHeight(20),
+ Container(
+ height: MediaQuery.of(context).size.width / 2.8,
+ child: Row(
+ children: [
+ showMass(context, "Underweight", "<18.5", double.parse(mode.bodyMax) <= 18.5 ? Colors.red : Colors.black, 8),
+ mWidth(12),
+ showMass(context, "Normal", "18.5-24.9", (double.parse(mode.bodyMax) >= 18.5 || double.parse(mode.bodyMax) >= 24.6) ? Colors.red : Colors.black, 6),
+ mWidth(12),
+ showMass(context, "Overweight", "25-29.9", (double.parse(mode.bodyMax) >= 25 || double.parse(mode.bodyMax) >= 29.9) ? Colors.red : Colors.black, 4),
+ mWidth(12),
+ showMass(context, "Obese", "30-34.9", (double.parse(mode.bodyMax) >= 30 || double.parse(mode.bodyMax) >= 34.9) ? Colors.red : Colors.black, 2),
+ mWidth(12),
+ showMass(context, "Extreme Obese", ">35", (double.parse(mode.bodyMax) >= 35) ? Colors.red : Colors.black, 0),
+ ],
+ ),
+ ),
+ ],
),
),
),
- ],
- ),
- Row(
- children: [
- InkWell(
- onTap: () => isNotOneAppointment ? Navigator.push(
- context,
- FadePage(
- page: VitalSignItemDetailsScreen(
- pageKey: VitalSignDetails.heart,
- pageTitle: TranslationBase.of(context).heart,
- vitalList: mode.vitalSignResModelList,
- ),
- ),
- ):null,
- child: VitalSignItem(
- des: TranslationBase.of(context).heart,
- icon: DQIcons.heart,
- lastVal: mode.hartRat,
- unit: TranslationBase.of(context).bpm,
- ),
- ),
- InkWell(
- onTap: () => isNotOneAppointment ? Navigator.push(
- context,
- FadePage(
- page: VitalSignItemDetailsScreen(
- pageKey: VitalSignDetails.Respiration,
- pageTitle:
- TranslationBase.of(context).respirationRate,
- vitalList: mode.vitalSignResModelList,
+ ),
+ mHeight(2),
+ Container(
+ padding: EdgeInsets.only(left: 16, right: 16, bottom: 16),
+ child: GridView.builder(
+ gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 2 / 2, crossAxisSpacing: 12, mainAxisSpacing: 12),
+ itemCount: vitalSigns.length,
+ padding: EdgeInsets.all(4),
+ physics: NeverScrollableScrollPhysics(),
+ shrinkWrap: true,
+ itemBuilder: (BuildContext context, int index) {
+ return InkWell(
+ onTap: () {
+ if (isNotOneAppointment) {
+ Navigator.push(
+ context,
+ FadePage(
+ page: VitalSignItemDetailsScreen(
+ pageKey: VitalSignDetails.Height,
+ pageTitle: TranslationBase.of(context).height,
+ vitalList: mode.vitalSignResModelList,
+ ),
+ ),
+ );
+ }
+ },
+ child: VitalSignItem(
+ vitalSign: vitalSigns[index],
),
- ),
- ):null,
- child: VitalSignItem(
- des: TranslationBase.of(context).respirationRate,
- icon: DQIcons.outline,
- lastVal: mode.respirationBeatPerMinute,
- unit: TranslationBase.of(context).bpm,
- ),
+ );
+ },
),
- ],
- ),
- Row(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- InkWell(
- onTap: () => isNotOneAppointment ? Navigator.push(
- context,
- FadePage(
- page: VitalSignItemDetailsScreen(
- pageKey: VitalSignDetails.BloodPressure,
- pageTitle: TranslationBase.of(context).bloodPressure,
- vitalList: mode.vitalSignResModelList,
- ),
- ),
- ):null,
- child: VitalSignItem(
- des: TranslationBase.of(context).bloodPressure,
- icon: DQIcons.blood_pressure,
- lastVal: mode.bloodPressure,
- unit: TranslationBase.of(context).sysDias,
- ),
- ),
- ],
- ),
- ],
+ ),
+ ],
+ ),
+ )
+ : Center(
+ child: Texts('No Data'),
),
- )
- : Center(
- child: Texts('No Data'),
+ );
+ },
+ );
+ }
+
+ Widget showMass(BuildContext context, String title, String weight, Color color, int f) {
+ return Expanded(
+ flex: 1,
+ child: Container(
+ height: double.infinity,
+ width: double.infinity,
+ child: Column(
+ children: [
+ Flexible(
+ child: Row(
+ children: [
+ mFlex(f),
+ Flexible(
+ flex: 10,
+ child: SvgPicture.asset(
+ "assets/images/new/mass/health_BMI.svg",
+ height: double.infinity,
+ width: double.infinity,
+ fit: BoxFit.fill,
+ color: color,
+ ),
+ ),
+ mFlex(f),
+ ],
+ ),
+ ),
+ mHeight(20),
+ AutoSizeText(
+ title,
+ maxLines: 1,
+ minFontSize: 6,
+ style: TextStyle(
+ color: color,
+ fontSize: 10,
+ letterSpacing: -0.6,
+ ),
+ ),
+ AutoSizeText(
+ weight,
+ maxLines: 1,
+ minFontSize: 6,
+ style: TextStyle(
+ color: color,
+ fontSize: 10,
+ letterSpacing: -0.6,
),
+ )
+ ],
+ ),
),
);
}
diff --git a/lib/pages/medical/vital_sign/vital_sign_item.dart b/lib/pages/medical/vital_sign/vital_sign_item.dart
index 1cad714e..44321942 100644
--- a/lib/pages/medical/vital_sign/vital_sign_item.dart
+++ b/lib/pages/medical/vital_sign/vital_sign_item.dart
@@ -1,94 +1,88 @@
+import 'package:auto_size_text/auto_size_text.dart';
import 'package:diplomaticquarterapp/config/size_config.dart';
+import 'package:diplomaticquarterapp/models/vital_sign.dart';
+import 'package:diplomaticquarterapp/theme/colors.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart';
import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
import 'package:hexcolor/hexcolor.dart';
class VitalSignItem extends StatelessWidget {
- const VitalSignItem(
- {Key key,
- @required this.des,
- this.lastVal = 'N/A',
- this.unit = '',
- this.height,
- this.width,
- @required this.icon})
- : super(key: key);
+ const VitalSignItem({
+ Key key,
+ @required this.vitalSign,
+ this.height,
+ this.width,
+ }) : super(key: key);
- final String des;
- final String lastVal;
- final String unit;
- final IconData icon;
final double height;
final double width;
+ final VitalSign vitalSign;
@override
Widget build(BuildContext context) {
return RoundedContainer(
- margin: 0.025 * SizeConfig.realScreenWidth,
- height: 0.15 * SizeConfig.realScreenHeight,
- width: 0.45 * SizeConfig.realScreenWidth,
+ margin: 0,
+ height: double.infinity,
+ width: double.infinity,
child: Container(
- padding: EdgeInsets.all(5),
+ padding: EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- Container(
- height: 0.10 * SizeConfig.realScreenHeight,
- child: Row(
- children: [
- Expanded(
- flex: 2,
- child: Align(
- alignment: Alignment.topLeft,
- child: Padding(
- padding: const EdgeInsets.all(8.0),
- child: Text(
- des,
- style: TextStyle(
- fontSize: 1.7 * SizeConfig.textMultiplier,
- color: HexColor('#B8382C'),
- fontWeight: FontWeight.bold,
- ),
+ Row(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Expanded(
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ AutoSizeText(
+ vitalSign.lastVal ?? 'N/A',
+ minFontSize: 10,
+ maxLines: 1,
+ style: TextStyle(
+ fontSize: 15,
+ letterSpacing: -0.45,
+ fontWeight: FontWeight.bold,
),
),
- ),
- ),
- Expanded(
- flex: 1,
- child: Container(
- child: Icon(
- icon,
- size: 40,
+ Text(
+ vitalSign.unit ?? "",
+ style: TextStyle(
+ fontSize: 9,
+ letterSpacing: -0.27,
+ color: CustomColors.accentColor,
+ fontWeight: FontWeight.w600,
+ ),
),
- ),
- )
- ],
- ),
- ),
- Expanded(
- child: Container(
- width: double.infinity,
- child: Align(
- alignment: Alignment.topRight,
- child: Container(
- margin: EdgeInsets.only(left: 5, right: 5),
- child: RichText(
- text: TextSpan(
- style: TextStyle(color: Colors.black),
- children: [
- TextSpan(text: lastVal),
- TextSpan(
- text: " " + unit,
- style: TextStyle(
- color: HexColor('#B8382C'),
- ),
- ),
- ]),
- ),
+ ],
),
),
- ),
+ mWidth(4),
+ Container(
+ width: MediaQuery.of(context).size.width / 16,
+ height: MediaQuery.of(context).size.width / 16,
+ child: SvgPicture.asset(
+ vitalSign.icon,
+ color: Colors.black,
+ ),
+ ),
+ ],
),
+ mFlex(1),
+ AutoSizeText(
+ vitalSign.des,
+ minFontSize: 8,
+ maxLines: 2,
+ style: TextStyle(
+ fontSize: 12,
+ letterSpacing: -0.33,
+ height: 1,
+ fontWeight: FontWeight.w600,
+ ),
+ )
],
),
),
diff --git a/lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart b/lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart
index 6db865b6..551392e0 100644
--- a/lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart
+++ b/lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart
@@ -30,7 +30,6 @@ class VitalSignItemDetailsScreen extends StatelessWidget {
'title2Ar': 'الكتلة',
'viewKey': 'BodyMassIndex',
},
-
];
break;
@@ -86,7 +85,6 @@ class VitalSignItemDetailsScreen extends StatelessWidget {
'title3Ar': 'الإنبساط',
'viewKey': 'BloodPressure',
},
-
];
break;
@@ -167,25 +165,24 @@ class VitalSignItemDetailsScreen extends StatelessWidget {
(element) => element.toJson()[chartInfo['viewKey']] != null,
);
- if(vitalListTemp.length != 0 && chartInfo['viewKey']=='BloodPressure'){
+ if (vitalListTemp.length != 0 && chartInfo['viewKey'] == 'BloodPressure') {
return VitalSingChartBloodPressure(
- vitalList: vitalList,
- name:projectViewModel.isArabic? chartInfo['nameAr']:chartInfo['name'],
- title1: chartInfo['title1'],
- title2:projectViewModel.isArabic?chartInfo['title2Ar']: chartInfo['title2'],
- title3:projectViewModel.isArabic?chartInfo['title3Ar']: chartInfo['title3'],
- viewKey1: 'BloodPressureHigher',
- viewKey2: 'BloodPressureLower',
-
+ vitalList: vitalList,
+ name: projectViewModel.isArabic ? chartInfo['nameAr'] : chartInfo['name'],
+ title1: chartInfo['title1'],
+ title2: projectViewModel.isArabic ? chartInfo['title2Ar'] : chartInfo['title2'],
+ title3: projectViewModel.isArabic ? chartInfo['title3Ar'] : chartInfo['title3'],
+ viewKey1: 'BloodPressureHigher',
+ viewKey2: 'BloodPressureLower',
);
}
return vitalListTemp.length != 0
? VitalSingChartAndDetials(
vitalList: vitalList,
- name:projectViewModel.isArabic? chartInfo['nameAr']:chartInfo['name'],
+ name: projectViewModel.isArabic ? chartInfo['nameAr'] : chartInfo['name'],
title1: chartInfo['title1'],
- title2:projectViewModel.isArabic?chartInfo['title2Ar']: chartInfo['title2'],
+ title2: projectViewModel.isArabic ? chartInfo['title2Ar'] : chartInfo['title2'],
viewKey: chartInfo['viewKey'])
: Container();
}).toList(),
diff --git a/lib/widgets/drawer/drawer_item_widget.dart b/lib/widgets/drawer/drawer_item_widget.dart
index 88e121d4..18c24ba6 100644
--- a/lib/widgets/drawer/drawer_item_widget.dart
+++ b/lib/widgets/drawer/drawer_item_widget.dart
@@ -61,7 +61,7 @@ class _DrawerItemState extends State {
children: [
AppText(
widget.title,
- fontWeight: FontWeight.bold,
+ fontWeight: FontWeight.w600,
fontSize: widget.fontSize,
height: widget.fontHeight,
letterSpacing: widget.letterSpacing,
diff --git a/pubspec.yaml b/pubspec.yaml
index 776e48c7..973a7f13 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -229,6 +229,7 @@ flutter:
- assets/payment_options/
- assets/images/new/
+ - assets/images/new/mass/
- assets/images/new/bottom_nav/
- assets/images/new/services/