From d2049b726a2299f399bbda92e7e5f3ed03994a56 Mon Sep 17 00:00:00 2001
From: estevez-dev <vyalov.egor@gmail.com>
Date: Sat, 7 Sep 2019 17:27:23 +0300
Subject: [PATCH] Resolves #348 Button entity refactoring

---
 .../widgets/button_entity_container.dart      | 29 ++++++++++---------
 .../widgets}/card_header_widget.dart          |  2 +-
 lib/main.dart                                 |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)
 rename lib/{ui_widgets => cards/widgets}/card_header_widget.dart (96%)

diff --git a/lib/cards/widgets/button_entity_container.dart b/lib/cards/widgets/button_entity_container.dart
index f11e2e4..bd06b88 100644
--- a/lib/cards/widgets/button_entity_container.dart
+++ b/lib/cards/widgets/button_entity_container.dart
@@ -15,24 +15,25 @@ class ButtonEntityContainer extends StatelessWidget {
     if (entityWrapper.entity.statelessType > StatelessEntityType.MISSED) {
       return Container(width: 0.0, height: 0.0,);
     }
+
     return InkWell(
       onTap: () => entityWrapper.handleTap(),
       onLongPress: () => entityWrapper.handleHold(),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: <Widget>[
-          FractionallySizedBox(
-            widthFactor: 0.4,
-            child: FittedBox(
-                fit: BoxFit.fitHeight,
-                child: EntityIcon(
-                  padding: EdgeInsets.fromLTRB(2.0, 6.0, 2.0, 2.0),
-                  size: Sizes.iconSize,
-                )
+      child: FractionallySizedBox(
+        widthFactor: 1,
+        child: Column(
+          children: <Widget>[
+            LayoutBuilder(
+                builder: (BuildContext context, BoxConstraints constraints) {
+                  return EntityIcon(
+                    padding: EdgeInsets.fromLTRB(2.0, 6.0, 2.0, 2.0),
+                    size: constraints.maxWidth / 2.5,
+                  );
+                }
             ),
-          ),
-          _buildName()
-        ],
+            _buildName()
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/ui_widgets/card_header_widget.dart b/lib/cards/widgets/card_header_widget.dart
similarity index 96%
rename from lib/ui_widgets/card_header_widget.dart
rename to lib/cards/widgets/card_header_widget.dart
index 471bdcf..e4df778 100644
--- a/lib/ui_widgets/card_header_widget.dart
+++ b/lib/cards/widgets/card_header_widget.dart
@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class CardHeaderWidget extends StatelessWidget {
 
diff --git a/lib/main.dart b/lib/main.dart
index 5199e0f..e270723 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -113,7 +113,7 @@ part 'ui_class/sizes_class.dart';
 part 'ui_class/panel_class.dart';
 part 'ui_widgets/view.dart';
 part 'cards/widgets/card_widget.dart';
-part 'ui_widgets/card_header_widget.dart';
+part 'cards/widgets/card_header_widget.dart';
 part 'panels/config_panel_widget.dart';
 part 'panels/widgets/link_to_web_config.dart';
 part 'utils/logger.dart';