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

Resolves #320 Fix eEntity_picture size

Browse Source
This commit is contained in:
estevez-dev 2019-03-10 22:50:39 +02:00
parent 2e9b7d20b9
commit 91a99e17e0
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/entity_widgets/default_entity_container.dart
View File

@ -30,7 +30,9 @@ class DefaultEntityContainer extends StatelessWidget {
Flexible(
fit: FlexFit.tight,
flex: 3,
child: EntityName(),
child: EntityName(
padding: EdgeInsets.fromLTRB(10.0, 2.0, 10.0, 2.0),
),
),
state
],

30
lib/entity_widgets/entity_icon.dart
View File

@ -6,8 +6,7 @@ class EntityIcon extends StatelessWidget {
final double size;
final Color color;
const EntityIcon({Key key, this.color, this.size: Sizes.iconSize, this.padding: const EdgeInsets.fromLTRB(
Sizes.leftWidgetPadding, 0.0, 12.0, 0.0)}) : super(key: key);
const EntityIcon({Key key, this.color, this.size: Sizes.iconSize, this.padding: const EdgeInsets.all(0.0)}) : super(key: key);
int getDefaultIconByEntityId(String entityId, String deviceClass, String state) {
String domain = entityId.split(".")[0];
@ -29,8 +28,22 @@ class EntityIcon extends StatelessWidget {
return null;
}
if (data.entity.entityPicture != null) {
return Container(
height: size+12,
width: size+12,
decoration: BoxDecoration(
shape: BoxShape.circle,
image: DecorationImage(
fit:BoxFit.cover,
image: CachedNetworkImageProvider(
"$homeAssistantWebHost${data.entity.entityPicture}",
),
)
),
);
return CircleAvatar(
radius: size/2,
radius: size/2+0,
backgroundColor: Colors.white,
backgroundImage: CachedNetworkImageProvider(
"$homeAssistantWebHost${data.entity.entityPicture}",
@ -45,10 +58,13 @@ class EntityIcon extends StatelessWidget {
iconCode = getDefaultIconByEntityId(data.entity.entityId,
data.entity.deviceClass, data.entity.state); //
}
return Icon(
IconData(iconCode, fontFamily: 'Material Design Icons'),
size: size,
color: color,
return Padding(
padding: EdgeInsets.fromLTRB(6.0, 6.0, 6.0, 6.0),
child: Icon(
IconData(iconCode, fontFamily: 'Material Design Icons'),
size: size,
color: color,
)
);
}
}

2
lib/ui_widgets/card_widget.dart
View File

@ -103,7 +103,7 @@ class CardWidget extends StatelessWidget {
if (!entity.entity.isHidden) {
body.add(
Padding(
padding: EdgeInsets.fromLTRB(0.0, Sizes.rowPadding, 0.0, Sizes.rowPadding),
padding: EdgeInsets.fromLTRB(10.0, 4.0, 0.0, 4.0),
child: EntityModel(
entityWrapper: entity,
handleTap: true,