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

Fix integer entity names handling in cards

Browse Source
This commit is contained in:
Yegor Vialov
2020-05-25 08:39:30 +00:00
parent aa26212ddd
commit 9b5a0068fd
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/cards/card.class.dart
View File

@ -197,7 +197,7 @@ class BadgesData extends CardData {
entities.add( entities.add(
EntityWrapper( EntityWrapper(
entity: HomeAssistant().entities.get(rawBadge['entity']), entity: HomeAssistant().entities.get(rawBadge['entity']),
overrideName: rawBadge["name"], overrideName: rawBadge["name"]?.toString(),
overrideIcon: rawBadge["icon"], overrideIcon: rawBadge["icon"],
) )
); );
@ -223,7 +223,7 @@ class BadgesData extends CardData {
entities.add( entities.add(
EntityWrapper( EntityWrapper(
entity: e, entity: e,
overrideName: rawEntity["name"], overrideName: rawEntity["name"]?.toString(),
overrideIcon: rawEntity["icon"], overrideIcon: rawEntity["icon"],
stateFilter: rawEntity['state_filter'] ?? (rawData['state_filter'] ?? []), stateFilter: rawEntity['state_filter'] ?? (rawData['state_filter'] ?? []),
uiAction: EntityUIAction(rawEntityData: rawEntity) uiAction: EntityUIAction(rawEntityData: rawEntity)
@ -248,7 +248,7 @@ class EntitiesCardData extends CardData {
EntitiesCardData(rawData) : super(rawData) { EntitiesCardData(rawData) : super(rawData) {
//Parsing card data //Parsing card data
title = rawData['title']; title = rawData['title']?.toString();
icon = rawData['icon'] is String ? rawData['icon'] : null; icon = rawData['icon'] is String ? rawData['icon'] : null;
stateColor = rawData['state_color'] ?? false; stateColor = rawData['state_color'] ?? false;
showHeaderToggle = rawData['show_header_toggle'] ?? false; showHeaderToggle = rawData['show_header_toggle'] ?? false;
@ -279,7 +279,7 @@ class EntitiesCardData extends CardData {
EntityWrapper( EntityWrapper(
entity: Entity.callService( entity: Entity.callService(
icon: rawEntity["icon"], icon: rawEntity["icon"],
name: rawEntity["name"], name: rawEntity["name"]?.toString(),
service: rawEntity["service"], service: rawEntity["service"],
actionName: rawEntity["action_name"] actionName: rawEntity["action_name"]
), ),
@ -298,7 +298,7 @@ class EntitiesCardData extends CardData {
entities.add(EntityWrapper( entities.add(EntityWrapper(
entity: Entity.weblink( entity: Entity.weblink(
icon: rawEntity["icon"], icon: rawEntity["icon"],
name: rawEntity["name"], name: rawEntity["name"]?.toString(),
url: rawEntity["url"] url: rawEntity["url"]
), ),
stateColor: rawEntity["state_color"] ?? stateColor, stateColor: rawEntity["state_color"] ?? stateColor,
@ -311,7 +311,7 @@ class EntitiesCardData extends CardData {
EntityWrapper( EntityWrapper(
entity: e, entity: e,
stateColor: rawEntity["state_color"] ?? stateColor, stateColor: rawEntity["state_color"] ?? stateColor,
overrideName: rawEntity["name"], overrideName: rawEntity["name"]?.toString(),
overrideIcon: rawEntity["icon"], overrideIcon: rawEntity["icon"],
stateFilter: rawEntity['state_filter'] ?? [], stateFilter: rawEntity['state_filter'] ?? [],
uiAction: EntityUIAction(rawEntityData: rawEntity) uiAction: EntityUIAction(rawEntityData: rawEntity)
@ -338,7 +338,7 @@ class AlarmPanelCardData extends CardData {
AlarmPanelCardData(rawData) : super(rawData) { AlarmPanelCardData(rawData) : super(rawData) {
//Parsing card data //Parsing card data
name = rawData['name']; name = rawData['name']?.toString();
states = rawData['states']; states = rawData['states'];
//Parsing entity //Parsing entity
var entitiId = rawData["entity"]; var entitiId = rawData["entity"];
@ -370,7 +370,7 @@ class LightCardData extends CardData {
LightCardData(rawData) : super(rawData) { LightCardData(rawData) : super(rawData) {
//Parsing card data //Parsing card data
name = rawData['name']; name = rawData['name']?.toString();
icon = rawData['icon'] is String ? rawData['icon'] : null; icon = rawData['icon'] is String ? rawData['icon'] : null;
//Parsing entity //Parsing entity
var entitiId = rawData["entity"]; var entitiId = rawData["entity"];
@ -407,7 +407,7 @@ class ButtonCardData extends CardData {
ButtonCardData(rawData) : super(rawData) { ButtonCardData(rawData) : super(rawData) {
//Parsing card data //Parsing card data
name = rawData['name']; name = rawData['name']?.toString();
icon = rawData['icon'] is String ? rawData['icon'] : null; icon = rawData['icon'] is String ? rawData['icon'] : null;
showName = rawData['show_name'] ?? true; showName = rawData['show_name'] ?? true;
showIcon = rawData['show_icon'] ?? true; showIcon = rawData['show_icon'] ?? true;
@ -470,7 +470,7 @@ class GaugeCardData extends CardData {
GaugeCardData(rawData) : super(rawData) { GaugeCardData(rawData) : super(rawData) {
//Parsing card data //Parsing card data
name = rawData['name']; name = rawData['name']?.toString();
unit = rawData['unit']; unit = rawData['unit'];
if (rawData['min'] is int) { if (rawData['min'] is int) {
min = rawData['min'].toDouble(); min = rawData['min'].toDouble();
@ -522,7 +522,7 @@ class GlanceCardData extends CardData {
GlanceCardData(rawData) : super(rawData) { GlanceCardData(rawData) : super(rawData) {
//Parsing card data //Parsing card data
title = rawData["title"]; title = rawData["title"]?.toString();
showName = rawData['show_name'] ?? true; showName = rawData['show_name'] ?? true;
showIcon = rawData['show_icon'] ?? true; showIcon = rawData['show_icon'] ?? true;
showState = rawData['show_state'] ?? true; showState = rawData['show_state'] ?? true;
@ -544,7 +544,7 @@ class GlanceCardData extends CardData {
EntityWrapper( EntityWrapper(
entity: e, entity: e,
stateColor: stateColor, stateColor: stateColor,
overrideName: rawEntity["name"], overrideName: rawEntity["name"]?.toString(),
overrideIcon: rawEntity["icon"], overrideIcon: rawEntity["icon"],
stateFilter: rawEntity['state_filter'] ?? [], stateFilter: rawEntity['state_filter'] ?? [],
uiAction: EntityUIAction(rawEntityData: rawEntity) uiAction: EntityUIAction(rawEntityData: rawEntity)