From 8dbfb91234e287e4c148e8b59b2a6133718bbfdd Mon Sep 17 00:00:00 2001 From: Yegor Vialov Date: Sat, 25 Apr 2020 14:53:33 +0000 Subject: [PATCH] Add Lovelase card widget --- lib/cards/card_widget.dart | 18 +++++++++--------- lib/cards/widgets/lovelace_card.dart | 17 +++++++++++++++++ lib/main.dart | 1 + 3 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 lib/cards/widgets/lovelace_card.dart diff --git a/lib/cards/card_widget.dart b/lib/cards/card_widget.dart index 2655baf..c2b215c 100644 --- a/lib/cards/card_widget.dart +++ b/lib/cards/card_widget.dart @@ -167,7 +167,7 @@ class CardWidget extends StatelessWidget { ); }) ); - return Card( + return LovelaceCard( child: Padding( padding: EdgeInsets.only(right: Sizes.rightWidgetPadding, left: Sizes.leftWidgetPadding), child: Column( @@ -186,7 +186,7 @@ class CardWidget extends StatelessWidget { List body = []; body.add(CardHeader(name: card.name)); body.add(MarkdownBody(data: card.content)); - return Card( + return LovelaceCard( child: Padding( padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, Sizes.rowPadding, Sizes.rightWidgetPadding, Sizes.rowPadding), child: new Column(mainAxisSize: MainAxisSize.min, children: body), @@ -226,7 +226,7 @@ class CardWidget extends StatelessWidget { states: card.states, ) ); - return Card( + return LovelaceCard( child: EntityModel( entityWrapper: card.linkedEntityWrapper, handleTap: null, @@ -278,7 +278,7 @@ class CardWidget extends StatelessWidget { ) ); } - return Card( + return LovelaceCard( child: Column( mainAxisSize: MainAxisSize.min, children: [ @@ -295,7 +295,7 @@ class CardWidget extends StatelessWidget { } Widget _buildMediaControlsCard(BuildContext context) { - return Card( + return LovelaceCard( child: EntityModel( entityWrapper: card.linkedEntityWrapper, handleTap: null, @@ -307,7 +307,7 @@ class CardWidget extends StatelessWidget { Widget _buildEntityButtonCard(BuildContext context) { card.linkedEntityWrapper.overrideName = card.name?.toUpperCase() ?? card.linkedEntityWrapper.displayName.toUpperCase(); - return Card( + return LovelaceCard( child: EntityModel( entityWrapper: card.linkedEntityWrapper, child: EntityButtonCardBody( @@ -324,7 +324,7 @@ class CardWidget extends StatelessWidget { card.linkedEntityWrapper.displayName; card.linkedEntityWrapper.unitOfMeasurementOverride = card.unit ?? card.linkedEntityWrapper.unitOfMeasurement; - return Card( + return LovelaceCard( child: EntityModel( entityWrapper: card.linkedEntityWrapper, child: GaugeCardBody( @@ -341,7 +341,7 @@ class CardWidget extends StatelessWidget { Widget _buildLightCard(BuildContext context) { card.linkedEntityWrapper.overrideName = card.name ?? card.linkedEntityWrapper.displayName; - return Card( + return LovelaceCard( child: EntityModel( entityWrapper: card.linkedEntityWrapper, child: LightCardBody( @@ -382,7 +382,7 @@ class CardWidget extends StatelessWidget { ]); } body.addAll(result); - return Card( + return LovelaceCard( child: new Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, diff --git a/lib/cards/widgets/lovelace_card.dart b/lib/cards/widgets/lovelace_card.dart new file mode 100644 index 0000000..9836d97 --- /dev/null +++ b/lib/cards/widgets/lovelace_card.dart @@ -0,0 +1,17 @@ +part of '../../main.dart'; + +class LovelaceCard extends StatelessWidget { + + final Widget child; + + const LovelaceCard({Key key, this.child}) : super(key: key); + + @override + Widget build(BuildContext context) { + return Card( + child: child, + ); + } + + +} \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 300034d..bfe51d0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -138,6 +138,7 @@ part 'types/ha_error.dart'; part 'types/event_bus_events.dart'; part 'cards/widgets/gauge_card_body.dart'; part 'cards/widgets/light_card_body.dart'; +part 'cards/widgets/lovelace_card.dart'; part 'pages/play_media.page.dart'; part 'entities/entity_page_layout.widget.dart'; part 'entities/media_player/widgets/media_player_seek_bar.widget.dart';