From cabbf03eec33a9f1ffb59bda3b6c7742d1eef44c Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Thu, 7 May 2020 16:44:45 +0300 Subject: [PATCH] vital_sign_details --- .../vital_sign/vital_sign_details_screen.dart | 25 ++++++++++--------- .../profile/profile_medical_info_widget.dart | 6 ++++- lib/widgets/shared/app_texts_widget.dart | 22 ++++++++-------- 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart index cf2676d9..bf4aad6b 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart @@ -19,43 +19,44 @@ class VitalSignDetailsScreen extends StatelessWidget { return AppScaffold( appBarTitle: "vital Sing ", body: RoundedContainer( + height: SizeConfig.realScreenHeight *0.7, child: CustomScrollView( primary: false, slivers: [ SliverPadding( padding: const EdgeInsets.all(10), sliver: SliverGrid.count( - childAspectRatio: 0.6, + childAspectRatio: 0.7, crossAxisSpacing: 10, - mainAxisSpacing: 20, - crossAxisCount: 4, + mainAxisSpacing: 0, + crossAxisCount: 3, children: [ CircleAvatarWidget( - des: 'Vital Sign', + des: 'Body Measurements', url: url + 'heartbeat.png', + ), CircleAvatarWidget( + des: 'Temperature', + url: url + 'heartbeat.png', ), CircleAvatarWidget( - des: 'Vital Sign', + des: 'Pulse', url: url + 'heartbeat.png', ), CircleAvatarWidget( - des: 'Vital Sign', + des: 'Respiration', url: url + 'heartbeat.png', ), CircleAvatarWidget( - des: 'Vital Sign', + des: 'Blood Pressure', url: url + 'heartbeat.png', ), CircleAvatarWidget( - des: 'Vital Sign', - url: url + 'heartbeat.png', - ), CircleAvatarWidget( - des: 'Vital Sign', + des: 'Oxygenation', url: url + 'heartbeat.png', ), CircleAvatarWidget( - des: 'Vital Sign', + des: 'Pain Scale', url: url + 'heartbeat.png', ), ], diff --git a/lib/widgets/patients/profile/profile_medical_info_widget.dart b/lib/widgets/patients/profile/profile_medical_info_widget.dart index 2a4e001b..5bf83cf0 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget.dart @@ -144,7 +144,11 @@ class CircleAvatarWidget extends StatelessWidget { SizedBox( height: 10, ), - AppText(des) + AppText( + des, + fontSize: 2 * SizeConfig.textMultiplier, + textAlign: TextAlign.center, + ) ], ), ); diff --git a/lib/widgets/shared/app_texts_widget.dart b/lib/widgets/shared/app_texts_widget.dart index db4f1b2c..100f9bd9 100644 --- a/lib/widgets/shared/app_texts_widget.dart +++ b/lib/widgets/shared/app_texts_widget.dart @@ -2,7 +2,6 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; - // OWNER : Ibrahim albitar // DATE : 12-04-2020 // DESCRIPTION : Customization for Texts in app @@ -19,6 +18,7 @@ class AppText extends StatefulWidget { final double marginBottom; final double marginLeft; final bool visibility; + final TextAlign textAlign; AppText(this.data, {this.color = Colors.black, @@ -30,7 +30,8 @@ class AppText extends StatefulWidget { this.marginRight = 0, this.marginBottom = 0, this.marginLeft = 0, - this.visibility = true}); + this.visibility = true, + this.textAlign}); @override _AppTextState createState() => _AppTextState(); @@ -39,18 +40,19 @@ class AppText extends StatefulWidget { class _AppTextState extends State { @override Widget build(BuildContext context) { - return Visibility( visible: widget.visibility, - child: Container( - margin: widget.margin != null ? EdgeInsets.all(widget.margin) : EdgeInsets.only( - top: widget.marginTop, - right: widget.marginRight, - bottom: widget.marginBottom, - left: widget.marginLeft - ), + child: Container( + margin: widget.margin != null + ? EdgeInsets.all(widget.margin) + : EdgeInsets.only( + top: widget.marginTop, + right: widget.marginRight, + bottom: widget.marginBottom, + left: widget.marginLeft), child: Text( widget.data, + textAlign: widget.textAlign, style: TextStyle( color: widget.color, fontWeight: widget.fontWeight,