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

Resolves #160 Flexible entity heigth

Browse Source
This commit is contained in:
Yegor Vialov
2018-11-04 22:55:09 +02:00
parent 66f84952f0
commit 788d682f2f
4 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/entity_widgets/default_entity_container.dart
View File

@ -13,7 +13,7 @@ class DefaultEntityContainer extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SizedBox( return SizedBox(
height: height, //height: height,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
EntityIcon(), EntityIcon(),

23
lib/entity_widgets/state/button_state.dart
View File

@ -9,16 +9,19 @@ class ButtonStateWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final entityModel = EntityModel.of(context); final entityModel = EntityModel.of(context);
return FlatButton( return SizedBox(
onPressed: (() { height: 34.0,
_setNewState(entityModel.entity); child: FlatButton(
}), onPressed: (() {
child: Text( _setNewState(entityModel.entity);
"EXECUTE", }),
textAlign: TextAlign.right, child: Text(
style: "EXECUTE",
new TextStyle(fontSize: Entity.stateFontSize, color: Colors.blue), textAlign: TextAlign.right,
), style:
new TextStyle(fontSize: Entity.stateFontSize, color: Colors.blue),
),
)
); );
} }
} }

32
lib/entity_widgets/state/simple_state.dart
View File

@ -4,19 +4,21 @@ class SimpleEntityState extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final entityModel = EntityModel.of(context); final entityModel = EntityModel.of(context);
return Padding( return Expanded(
padding: EdgeInsets.fromLTRB( child: Padding(
0.0, 0.0, Entity.rightWidgetPadding, 0.0), padding: EdgeInsets.fromLTRB(0.0, 0.0, Entity.rightWidgetPadding, 0.0),
child: GestureDetector( child: GestureDetector(
child: Text( child: Text(
"${entityModel.entity.state}${entityModel.entity.unitOfMeasurement}", "${entityModel.entity.state}${entityModel.entity.unitOfMeasurement}",
textAlign: TextAlign.right, textAlign: TextAlign.right,
style: new TextStyle( style: new TextStyle(
fontSize: Entity.stateFontSize, fontSize: Entity.stateFontSize,
)), )),
onTap: () => entityModel.handleTap onTap: () => entityModel.handleTap
? eventBus.fire(new ShowEntityPageEvent(entityModel.entity)) ? eventBus.fire(new ShowEntityPageEvent(entityModel.entity))
: null, : null,
)); )
),
);
} }
} }

10
lib/entity_widgets/state/switch_state.dart
View File

@ -29,15 +29,16 @@ class _SwitchStateWidgetState extends State<SwitchStateWidget> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final entityModel = EntityModel.of(context); final entityModel = EntityModel.of(context);
final entity = entityModel.entity; final entity = entityModel.entity;
Widget result;
if ((entity.attributes["assumed_state"] == null) || (entity.attributes["assumed_state"] == false)) { if ((entity.attributes["assumed_state"] == null) || (entity.attributes["assumed_state"] == false)) {
return Switch( result = Switch(
value: entity.assumedState == 'on', value: entity.assumedState == 'on',
onChanged: ((switchState) { onChanged: ((switchState) {
_setNewState(switchState, entity); _setNewState(switchState, entity);
}), }),
); );
} else { } else {
return Row( result = Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
IconButton( IconButton(
@ -55,6 +56,9 @@ class _SwitchStateWidgetState extends State<SwitchStateWidget> {
], ],
); );
} }
return SizedBox(
height: 32.0,
child: result,
);
} }
} }