From 86b6ad6bba5491fb096c8647005781c6d9f99bc2 Mon Sep 17 00:00:00 2001 From: Yegor Vialov Date: Wed, 14 Nov 2018 12:35:08 +0200 Subject: [PATCH] Resolves #171 --- lib/entity_class/entity.class.dart | 4 ++++ .../default_entity_container.dart | 19 +++++++++---------- lib/entity_widgets/state/simple_state.dart | 8 ++++++-- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/lib/entity_class/entity.class.dart b/lib/entity_class/entity.class.dart index 845c71e..79b4680 100644 --- a/lib/entity_class/entity.class.dart +++ b/lib/entity_class/entity.class.dart @@ -56,6 +56,10 @@ class Entity { domain = rawData["entity_id"].split(".")[0]; entityId = rawData["entity_id"]; state = rawData["state"]; + if (domain == "sun") { + state = "iuwfhiwushf iwuwfhiuwefh dsjhfkjsdfnksdj nfksdjfn ksdjfn kdsjfndskj sdk fhksbsk jvfk jvsfkj sfkjvsfkvdsjk bvsfk svfjk"; + attributes["friendly_name"] = "Black hole sun, wan't you come, wan't you come"; + } assumedState = state; _lastUpdated = DateTime.tryParse(rawData["last_updated"]); } diff --git a/lib/entity_widgets/default_entity_container.dart b/lib/entity_widgets/default_entity_container.dart index b928688..11f441f 100644 --- a/lib/entity_widgets/default_entity_container.dart +++ b/lib/entity_widgets/default_entity_container.dart @@ -10,16 +10,15 @@ class DefaultEntityContainer extends StatelessWidget { @override Widget build(BuildContext context) { - return SizedBox( - child: Row( - children: [ - EntityIcon(), - Expanded( - child: EntityName(), - ), - state - ], - ), + return Row( + mainAxisSize: MainAxisSize.max, + children: [ + EntityIcon(), + Expanded( + child: EntityName(), + ), + state + ], ); } } \ No newline at end of file diff --git a/lib/entity_widgets/state/simple_state.dart b/lib/entity_widgets/state/simple_state.dart index 4a815c6..2e17a59 100644 --- a/lib/entity_widgets/state/simple_state.dart +++ b/lib/entity_widgets/state/simple_state.dart @@ -15,6 +15,9 @@ class SimpleEntityState extends StatelessWidget { child: Text( "${entityModel.entity.state}${entityModel.entity.unitOfMeasurement}", textAlign: TextAlign.right, + maxLines: 4, + overflow: TextOverflow.ellipsis, + softWrap: true, style: new TextStyle( fontSize: Sizes.stateFontSize, )), @@ -24,8 +27,9 @@ class SimpleEntityState extends StatelessWidget { ) ); if (expanded) { - return Expanded( - child: result + return SizedBox( + width: MediaQuery.of(context).size.width * 0.3, + child: result, ); } else { return result;