From 62b1af30e0b71a52f0594a4e91a88fdae28f9881 Mon Sep 17 00:00:00 2001 From: Yegor Vialov Date: Sat, 16 Feb 2019 19:59:39 +0200 Subject: [PATCH] Resolves #291 some padding issues --- .../common/entity_attributes_list.dart | 11 +++++---- lib/entity_widgets/common/last_updated.dart | 2 +- lib/entity_widgets/common/mode_swicth.dart | 23 +++++++++++-------- lib/main.dart | 4 ++-- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/lib/entity_widgets/common/entity_attributes_list.dart b/lib/entity_widgets/common/entity_attributes_list.dart index 41b0831..48eca6b 100644 --- a/lib/entity_widgets/common/entity_attributes_list.dart +++ b/lib/entity_widgets/common/entity_attributes_list.dart @@ -21,10 +21,13 @@ class EntityAttributesList extends StatelessWidget { } }); } - return Column( - children: attrs, - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, + return Padding( + padding: EdgeInsets.only(bottom: Sizes.rowPadding), + child: Column( + children: attrs, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + ) ); } diff --git a/lib/entity_widgets/common/last_updated.dart b/lib/entity_widgets/common/last_updated.dart index f4957f7..def81fe 100644 --- a/lib/entity_widgets/common/last_updated.dart +++ b/lib/entity_widgets/common/last_updated.dart @@ -6,7 +6,7 @@ class LastUpdatedWidget extends StatelessWidget { final entityModel = EntityModel.of(context); return Padding( padding: EdgeInsets.fromLTRB( - Sizes.leftWidgetPadding, 0.0, 0.0, 0.0), + Sizes.leftWidgetPadding, Sizes.rowPadding, 0.0, 0.0), child: Text( '${entityModel.entityWrapper.entity.lastUpdated}', textAlign: TextAlign.left, diff --git a/lib/entity_widgets/common/mode_swicth.dart b/lib/entity_widgets/common/mode_swicth.dart index c842df1..d34ca3e 100644 --- a/lib/entity_widgets/common/mode_swicth.dart +++ b/lib/entity_widgets/common/mode_swicth.dart @@ -7,6 +7,7 @@ class ModeSwitchWidget extends StatelessWidget { final double captionFontSize; final bool value; final bool expanded; + final EdgeInsets padding; ModeSwitchWidget({ Key key, @@ -14,19 +15,23 @@ class ModeSwitchWidget extends StatelessWidget { @required this.onChange, this.captionFontSize, this.value, - this.expanded: true + this.expanded: true, + this.padding: const EdgeInsets.only(left: Sizes.leftWidgetPadding, right: Sizes.rightWidgetPadding) }) : super(key: key); @override Widget build(BuildContext context) { - return Row( - children: [ - _buildCaption(), - Switch( - onChanged: (value) => onChange(value), - value: value ?? false, - ) - ], + return Padding( + padding: this.padding, + child: Row( + children: [ + _buildCaption(), + Switch( + onChanged: (value) => onChange(value), + value: value ?? false, + ) + ], + ) ); } diff --git a/lib/main.dart b/lib/main.dart index e2620b1..e9a228f 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -361,10 +361,10 @@ class _MainPageState extends State with WidgetsBindingObserver { GestureDetector( onTap: () { Navigator.of(context).pop(); - HAUtils.launchURL("http://ha-client.vynn.co/"); + HAUtils.launchURL("http://ha-client.homemade.systems/"); }, child: Text( - "ha-client.vynn.co", + "ha-client.homemade.systems", style: TextStyle( color: Colors.blue, decoration: TextDecoration.underline