yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP #183 tap_action support. State change event fix

Browse Source
This commit is contained in:
Yegor Vialov
2018-11-16 22:32:43 +02:00
parent 1bd04abd37
commit 82c9bd26d1
29 changed files with 89 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/entity_widgets/badge.dart
View File

@ -7,12 +7,12 @@ class BadgeWidget extends StatelessWidget {
double iconSize = 26.0;
Widget badgeIcon;
String onBadgeTextValue;
Color iconColor = EntityColor.badgeColors[entityModel.entity.entity.domain] ??
Color iconColor = EntityColor.badgeColors[entityModel.entityWrapper.entity.domain] ??
EntityColor.badgeColors["default"];
switch (entityModel.entity.entity.domain) {
switch (entityModel.entityWrapper.entity.domain) {
case "sun":
{
badgeIcon = entityModel.entity.entity.state == "below_horizon"
badgeIcon = entityModel.entityWrapper.entity.state == "below_horizon"
? Icon(
MaterialDesignIcons.createIconDataFromIconCode(0xf0dc),
size: iconSize,
@ -25,10 +25,10 @@ class BadgeWidget extends StatelessWidget {
}
case "sensor":
{
onBadgeTextValue = entityModel.entity.entity.unitOfMeasurement;
onBadgeTextValue = entityModel.entityWrapper.entity.unitOfMeasurement;
badgeIcon = Center(
child: Text(
"${entityModel.entity.entity.state}",
"${entityModel.entityWrapper.entity.state}",
overflow: TextOverflow.fade,
softWrap: false,
textAlign: TextAlign.center,
@ -40,14 +40,14 @@ class BadgeWidget extends StatelessWidget {
case "device_tracker":
{
badgeIcon = MaterialDesignIcons.createIconWidgetFromEntityData(
entityModel.entity, iconSize, Colors.black);
onBadgeTextValue = entityModel.entity.entity.state;
entityModel.entityWrapper, iconSize, Colors.black);
onBadgeTextValue = entityModel.entityWrapper.entity.state;
break;
}
default:
{
badgeIcon = MaterialDesignIcons.createIconWidgetFromEntityData(
entityModel.entity, iconSize, Colors.black);
entityModel.entityWrapper, iconSize, Colors.black);
}
}
Widget onBadgeText;
@ -109,7 +109,7 @@ class BadgeWidget extends StatelessWidget {
Container(
width: 60.0,
child: Text(
"${entityModel.entity.displayName}",
"${entityModel.entityWrapper.displayName}",
textAlign: TextAlign.center,
style: TextStyle(fontSize: 12.0),
softWrap: true,
@ -120,6 +120,6 @@ class BadgeWidget extends StatelessWidget {
],
),
onTap: () =>
eventBus.fire(new ShowEntityPageEvent(entityModel.entity.entity)));
eventBus.fire(new ShowEntityPageEvent(entityModel.entityWrapper.entity)));
}
}