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

Resolves #314 card icon priority

Browse Source
This commit is contained in:
estevez-dev
2019-03-13 22:12:01 +02:00
parent fb456878bc
commit 8b28bb2e9e
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/entity_class/entity_wrapper.class.dart
View File

@ -4,6 +4,7 @@ class EntityWrapper {
String displayName; String displayName;
String icon; String icon;
String entityPicture;
EntityUIAction uiAction; EntityUIAction uiAction;
Entity entity; Entity entity;
@ -16,6 +17,9 @@ class EntityWrapper {
}) { }) {
if (entity.statelessType == StatelessEntityType.NONE || entity.statelessType == StatelessEntityType.CALL_SERVICE || entity.statelessType == StatelessEntityType.WEBLINK) { if (entity.statelessType == StatelessEntityType.NONE || entity.statelessType == StatelessEntityType.CALL_SERVICE || entity.statelessType == StatelessEntityType.WEBLINK) {
this.icon = icon ?? entity.icon; this.icon = icon ?? entity.icon;
if (icon == null) {
entityPicture = entity.entityPicture;
}
this.displayName = displayName ?? entity.displayName; this.displayName = displayName ?? entity.displayName;
if (uiAction == null) { if (uiAction == null) {
uiAction = EntityUIAction(); uiAction = EntityUIAction();

12
lib/entity_widgets/entity_colors.class.dart
View File

@ -2,6 +2,8 @@ part of '../main.dart';
class EntityColor { class EntityColor {
static const defaultStateColor = Color.fromRGBO(68, 115, 158, 1.0);
static const badgeColors = { static const badgeColors = {
"default": Color.fromRGBO(223, 76, 30, 1.0), "default": Color.fromRGBO(223, 76, 30, 1.0),
"binary_sensor": Color.fromRGBO(3, 155, 229, 1.0) "binary_sensor": Color.fromRGBO(3, 155, 229, 1.0)
@ -15,11 +17,11 @@ class EntityColor {
"above_horizon": Colors.amber, "above_horizon": Colors.amber,
EntityState.home: Colors.amber, EntityState.home: Colors.amber,
EntityState.open: Colors.amber, EntityState.open: Colors.amber,
EntityState.off: Color.fromRGBO(68, 115, 158, 1.0), EntityState.off: defaultStateColor,
EntityState.closed: Color.fromRGBO(68, 115, 158, 1.0), EntityState.closed: defaultStateColor,
"below_horizon": Color.fromRGBO(68, 115, 158, 1.0), "below_horizon": defaultStateColor,
"default": Color.fromRGBO(68, 115, 158, 1.0), "default": defaultStateColor,
EntityState.idle: Color.fromRGBO(68, 115, 158, 1.0), EntityState.idle: defaultStateColor,
"heat": Colors.redAccent, "heat": Colors.redAccent,
"cool": Colors.lightBlue, "cool": Colors.lightBlue,
EntityState.unavailable: Colors.black26, EntityState.unavailable: Colors.black26,

4
lib/entity_widgets/entity_icon.dart
View File

@ -27,7 +27,7 @@ class EntityIcon extends StatelessWidget {
if (data == null) { if (data == null) {
return null; return null;
} }
if (data.entity.entityPicture != null) { if (data.entityPicture != null) {
return Container( return Container(
height: size+12, height: size+12,
width: size+12, width: size+12,
@ -36,7 +36,7 @@ class EntityIcon extends StatelessWidget {
image: DecorationImage( image: DecorationImage(
fit:BoxFit.cover, fit:BoxFit.cover,
image: CachedNetworkImageProvider( image: CachedNetworkImageProvider(
"${data.entity.entityPicture}" "${data.entityPicture}"
), ),
) )
), ),