From 6508f109f7059adaf5a58fb640db4272a517ed67 Mon Sep 17 00:00:00 2001 From: estevez-dev Date: Sat, 7 Sep 2019 17:04:40 +0300 Subject: [PATCH] Minor gauge fixes --- lib/cards/widgets/card_widget.dart | 3 ++- lib/cards/widgets/gauge_card_body.dart | 24 ++++++++++++--------- lib/entities/entity_wrapper.class.dart | 2 ++ lib/entity_widgets/common/badge.dart | 2 +- lib/entity_widgets/common/simple_state.dart | 12 ++++++++--- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/lib/cards/widgets/card_widget.dart b/lib/cards/widgets/card_widget.dart index 44d6172..d83a493 100644 --- a/lib/cards/widgets/card_widget.dart +++ b/lib/cards/widgets/card_widget.dart @@ -291,13 +291,14 @@ class CardWidget extends StatelessWidget { Widget _buildGaugeCard(BuildContext context) { card.linkedEntityWrapper.displayName = card.name ?? card.linkedEntityWrapper.displayName; + card.linkedEntityWrapper.unitOfMeasurement = card.unit ?? + card.linkedEntityWrapper.unitOfMeasurement; return Card( child: EntityModel( entityWrapper: card.linkedEntityWrapper, child: GaugeCardBody( min: card.min, max: card.max, - unit: card.unit ?? card.linkedEntityWrapper.entity.unitOfMeasurement, severity: card.severity, ), handleTap: true diff --git a/lib/cards/widgets/gauge_card_body.dart b/lib/cards/widgets/gauge_card_body.dart index a437198..568a80e 100644 --- a/lib/cards/widgets/gauge_card_body.dart +++ b/lib/cards/widgets/gauge_card_body.dart @@ -4,10 +4,9 @@ class GaugeCardBody extends StatefulWidget { final int min; final int max; - final String unit; final Map severity; - GaugeCardBody({Key key, this.min, this.max, this.unit, this.severity}) : super(key: key); + GaugeCardBody({Key key, this.min, this.max, this.severity}) : super(key: key); @override _GaugeCardBodyState createState() => _GaugeCardBodyState(); @@ -104,11 +103,15 @@ class _GaugeCardBodyState extends State { double fontSize = constraints.maxHeight / 7; return Padding( padding: EdgeInsets.only(bottom: 2*fontSize), - child: Text( - '${entityWrapper.entity.doubleState}${widget.unit}', + child: SimpleEntityState( + //textAlign: TextAlign.center, + expanded: false, maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle(fontWeight: FontWeight.bold, fontSize: fontSize), + bold: true, + textAlign: TextAlign.center, + padding: EdgeInsets.all(0.0), + fontSize: fontSize, + //padding: EdgeInsets.only(top: Sizes.rowPadding), ), ); } @@ -121,11 +124,12 @@ class _GaugeCardBodyState extends State { double fontSize = constraints.maxHeight / 7; return Padding( padding: EdgeInsets.only(bottom: fontSize), - child: Text( - '${entityWrapper.displayName}', + child: EntityName( + fontSize: fontSize, maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle(fontSize: fontSize), + padding: EdgeInsets.all(0.0), + textAlign: TextAlign.center, + textOverflow: TextOverflow.ellipsis, ), ); } diff --git a/lib/entities/entity_wrapper.class.dart b/lib/entities/entity_wrapper.class.dart index 46a379b..ec9bc21 100644 --- a/lib/entities/entity_wrapper.class.dart +++ b/lib/entities/entity_wrapper.class.dart @@ -4,6 +4,7 @@ class EntityWrapper { String displayName; String icon; + String unitOfMeasurement; String entityPicture; EntityUIAction uiAction; Entity entity; @@ -24,6 +25,7 @@ class EntityWrapper { if (uiAction == null) { uiAction = EntityUIAction(); } + unitOfMeasurement = entity.unitOfMeasurement; } } diff --git a/lib/entity_widgets/common/badge.dart b/lib/entity_widgets/common/badge.dart index 4f4d06e..32080cf 100644 --- a/lib/entity_widgets/common/badge.dart +++ b/lib/entity_widgets/common/badge.dart @@ -57,7 +57,7 @@ class BadgeWidget extends StatelessWidget { } else if (entityModel.entityWrapper.entity.displayState.length <= 10) { stateFontSize = 8.0; } - onBadgeTextValue = entityModel.entityWrapper.entity.unitOfMeasurement; + onBadgeTextValue = entityModel.entityWrapper.unitOfMeasurement; badgeIcon = Center( child: Text( "${entityModel.entityWrapper.entity.displayState}", diff --git a/lib/entity_widgets/common/simple_state.dart b/lib/entity_widgets/common/simple_state.dart index 8f8ab9f..eb68ec4 100644 --- a/lib/entity_widgets/common/simple_state.dart +++ b/lib/entity_widgets/common/simple_state.dart @@ -7,8 +7,10 @@ class SimpleEntityState extends StatelessWidget { final EdgeInsetsGeometry padding; final int maxLines; final String customValue; + final double fontSize; + final bool bold; - const SimpleEntityState({Key key, this.maxLines: 10, this.expanded: true, this.textAlign: TextAlign.right, this.padding: const EdgeInsets.fromLTRB(0.0, 0.0, Sizes.rightWidgetPadding, 0.0), this.customValue}) : super(key: key); + const SimpleEntityState({Key key,this.bold: false, this.maxLines: 10, this.fontSize: Sizes.stateFontSize, this.expanded: true, this.textAlign: TextAlign.right, this.padding: const EdgeInsets.fromLTRB(0.0, 0.0, Sizes.rightWidgetPadding, 0.0), this.customValue}) : super(key: key); @override Widget build(BuildContext context) { @@ -21,18 +23,22 @@ class SimpleEntityState extends StatelessWidget { state = customValue; } TextStyle textStyle = TextStyle( - fontSize: Sizes.stateFontSize, + fontSize: this.fontSize, + fontWeight: FontWeight.normal ); if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.CALL_SERVICE) { textStyle = textStyle.apply(color: Colors.blue); } + if (this.bold) { + textStyle = textStyle.apply(fontWeightDelta: 100); + } while (state.contains(" ")){ state = state.replaceAll(" ", " "); } Widget result = Padding( padding: padding, child: Text( - "$state ${entityModel.entityWrapper.entity.unitOfMeasurement}", + "$state ${entityModel.entityWrapper.unitOfMeasurement}", textAlign: textAlign, maxLines: maxLines, overflow: TextOverflow.ellipsis,