From 6da7a5ab9058d471b96595148451ac9115253e8f Mon Sep 17 00:00:00 2001
From: estevez-dev <vyalov.egor@gmail.com>
Date: Sat, 14 Sep 2019 18:32:44 +0300
Subject: [PATCH] Resolves #224 Main UI tablet support

---
 android/app/src/main/AndroidManifest.xml      |   3 +
 lib/cards/card_widget.dart                    |   2 +-
 lib/const.dart                                |   3 +
 lib/entities/badge.widget.dart                |   2 +-
 lib/entities/entity.class.dart                |  61 ++++--
 lib/entities/entity_wrapper.class.dart        |   4 +-
 .../light/widgets/light_color_picker.dart     |   1 -
 .../widgets/media_player_widgets.dart         |   2 +-
 lib/main.dart                                 |   1 -
 lib/pages/entity.page.dart                    |  28 ++-
 lib/pages/main.page.dart                      | 186 +++++++++++-------
 lib/pages/play_media.page.dart                |   2 +-
 .../widgets/entity_page_container.widget.dart |  14 --
 lib/plugins/DynamicMultiColumnLayout.dart     |   5 +-
 lib/types/event_bus_events.dart               |   4 +-
 15 files changed, 194 insertions(+), 124 deletions(-)
 delete mode 100644 lib/pages/widgets/entity_page_container.widget.dart

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 43fa34a..6a160c4 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.keyboardcrumbs.hassclient">
 
+    <uses-feature android:name="android.hardware.touchscreen"
+        android:required="false" />
+
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/lib/cards/card_widget.dart b/lib/cards/card_widget.dart
index dcfe9a1..8911301 100644
--- a/lib/cards/card_widget.dart
+++ b/lib/cards/card_widget.dart
@@ -192,7 +192,7 @@ class CardWidget extends StatelessWidget {
                     alignment: Alignment.centerRight,
                     icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
                         "mdi:dots-vertical")),
-                    onPressed: () => eventBus.fire(new ShowEntityPageEvent(card.linkedEntityWrapper.entity))
+                    onPressed: () => eventBus.fire(new ShowEntityPageEvent(entity: card.linkedEntityWrapper.entity))
                 )
             )
           ]
diff --git a/lib/const.dart b/lib/const.dart
index 9da7af2..57012b9 100644
--- a/lib/const.dart
+++ b/lib/const.dart
@@ -114,4 +114,7 @@ class Sizes {
   static const rowPadding = 10.0;
   static const doubleRowPadding = rowPadding*2;
   static const minViewColumnWidth = 350;
+  static const entityPageMaxWidth = 400.0;
+  static const mainPageScreenSeparatorWidth = 5.0;
+  static const tabletMinWidth = minViewColumnWidth + entityPageMaxWidth + 5;
 }
\ No newline at end of file
diff --git a/lib/entities/badge.widget.dart b/lib/entities/badge.widget.dart
index 36c8984..0643f15 100644
--- a/lib/entities/badge.widget.dart
+++ b/lib/entities/badge.widget.dart
@@ -140,6 +140,6 @@ class BadgeWidget extends StatelessWidget {
           ],
         ),
         onTap: () =>
-            eventBus.fire(new ShowEntityPageEvent(entityModel.entityWrapper.entity)));
+            eventBus.fire(new ShowEntityPageEvent(entity: entityModel.entityWrapper.entity)));
   }
 }
\ No newline at end of file
diff --git a/lib/entities/entity.class.dart b/lib/entities/entity.class.dart
index c7e0576..e353c67 100644
--- a/lib/entities/entity.class.dart
+++ b/lib/entities/entity.class.dart
@@ -211,21 +211,56 @@ class Entity {
     );
   }
 
-  Widget buildEntityPageWidget(BuildContext context) {
+  Widget buildEntityPageWidget(BuildContext context, {bool showClose: false}) {
     return EntityModel(
       entityWrapper: EntityWrapper(entity: this),
-      child: EntityPageContainer(children: <Widget>[
-        Padding(
-          padding: EdgeInsets.only(top: Sizes.rowPadding, left: Sizes.leftWidgetPadding),
-          child: DefaultEntityContainer(state: _buildStatePartForPage(context)),
-        ),
-        LastUpdatedWidget(),
-        Divider(),
-        _buildAdditionalControlsForPage(context),
-        Divider(),
-        buildHistoryWidget(),
-        EntityAttributesList()
-      ]),
+      child: ListView(
+        padding: EdgeInsets.all(0),
+          children: <Widget>[
+            showClose ?
+              Container(
+                color: Colors.blue[300],
+                height: 36,
+                child: Row(
+                  children: <Widget>[
+                    Expanded(
+                      child: Padding(
+                        padding: EdgeInsets.only(left: 8),
+                        child: Text(
+                          this.displayName,
+                          style: TextStyle(
+                              fontWeight: FontWeight.bold,
+                              color: Colors.white,
+                              fontSize: 22
+                          ),
+                        ),
+                      ),
+                    ),
+                    IconButton(
+                      padding: EdgeInsets.all(0),
+                      icon: Icon(Icons.close),
+                      color: Colors.white,
+                      iconSize: 30.0,
+                      onPressed: () {
+                        eventBus.fire(ShowEntityPageEvent());
+                      },
+                    )
+                  ],
+                ),
+              ) :
+              Container(height: 0, width: 0,),
+            Padding(
+              padding: EdgeInsets.only(top: Sizes.rowPadding, left: Sizes.leftWidgetPadding),
+              child: DefaultEntityContainer(state: _buildStatePartForPage(context)),
+            ),
+            LastUpdatedWidget(),
+            Divider(),
+            _buildAdditionalControlsForPage(context),
+            Divider(),
+            buildHistoryWidget(),
+            EntityAttributesList()
+        ]
+      ),
       handleTap: false,
     );
   }
diff --git a/lib/entities/entity_wrapper.class.dart b/lib/entities/entity_wrapper.class.dart
index ec9bc21..d1fe9bc 100644
--- a/lib/entities/entity_wrapper.class.dart
+++ b/lib/entities/entity_wrapper.class.dart
@@ -53,7 +53,7 @@ class EntityWrapper {
 
       case EntityUIAction.moreInfo: {
         eventBus.fire(
-            new ShowEntityPageEvent(entity));
+            new ShowEntityPageEvent(entity: entity));
         break;
       }
 
@@ -93,7 +93,7 @@ class EntityWrapper {
 
         case EntityUIAction.moreInfo: {
           eventBus.fire(
-              new ShowEntityPageEvent(entity));
+              new ShowEntityPageEvent(entity: entity));
           break;
         }
 
diff --git a/lib/entities/light/widgets/light_color_picker.dart b/lib/entities/light/widgets/light_color_picker.dart
index 0ca6a45..4d53aef 100644
--- a/lib/entities/light/widgets/light_color_picker.dart
+++ b/lib/entities/light/widgets/light_color_picker.dart
@@ -27,7 +27,6 @@ class LightColorPickerState extends State<LightColorPicker> {
     List<Widget> colorRows = [];
     Border border;
     bool isSomethingSelected = false;
-    Logger.d("Current colotfor picker: [${widget.color.hue}, ${widget.color.saturation}]");
     for (double saturation = 1.0; saturation >= (0.0 + widget.saturationStep); saturation = double.parse((saturation - widget.saturationStep).toStringAsFixed(2))) {
       List<Widget> rowChildren = [];
       //Logger.d("$saturation");
diff --git a/lib/entities/media_player/widgets/media_player_widgets.dart b/lib/entities/media_player/widgets/media_player_widgets.dart
index bd93b4e..308ed05 100644
--- a/lib/entities/media_player/widgets/media_player_widgets.dart
+++ b/lib/entities/media_player/widgets/media_player_widgets.dart
@@ -229,7 +229,7 @@ class MediaPlayerPlaybackControls extends StatelessWidget {
           IconButton(
               icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
                   "mdi:dots-vertical")),
-              onPressed: () => eventBus.fire(new ShowEntityPageEvent(entity))
+              onPressed: () => eventBus.fire(new ShowEntityPageEvent(entity: entity))
           )
       );
     } else if (entity.supportStop && entity.state != EntityState.off && entity.state != EntityState.unavailable) {
diff --git a/lib/main.dart b/lib/main.dart
index 03f4efd..614768f 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -69,7 +69,6 @@ part 'entities/flat_service_button.widget.dart';
 part 'entities/light/widgets/light_color_picker.dart';
 part 'entities/camera/widgets/camera_stream_view.dart';
 part 'entities/entity_colors.class.dart';
-part 'pages/widgets/entity_page_container.widget.dart';
 part 'plugins/history_chart/entity_history.dart';
 part 'plugins/history_chart/simple_state_history_chart.dart';
 part 'plugins/history_chart/numeric_state_history_chart.dart';
diff --git a/lib/pages/entity.page.dart b/lib/pages/entity.page.dart
index 6b49bdc..cd8acd9 100644
--- a/lib/pages/entity.page.dart
+++ b/lib/pages/entity.page.dart
@@ -10,9 +10,10 @@ class EntityViewPage extends StatefulWidget {
 }
 
 class _EntityViewPageState extends State<EntityViewPage> {
-  String _title;
   StreamSubscription _refreshDataSubscription;
   StreamSubscription _stateSubscription;
+  Entity entity;
+  Entity forwardToMainPage;
 
   @override
   void initState() {
@@ -26,16 +27,18 @@ class _EntityViewPageState extends State<EntityViewPage> {
     _refreshDataSubscription = eventBus.on<RefreshDataFinishedEvent>().listen((event) {
       setState(() {});
     });
-    _prepareData();
+    entity = HomeAssistant().entities.get(widget.entityId);
   }
 
-  void _prepareData() async {
-    _title = HomeAssistant().entities.get(widget.entityId).displayName;
-  }
-
-
   @override
   Widget build(BuildContext context) {
+    Widget body;
+    if (MediaQuery.of(context).size.width >= Sizes.tabletMinWidth) {
+      _popAfterBuild();
+      body = PageLoadingIndicator();
+    } else {
+      body = entity.buildEntityPageWidget(context);
+    }
     return new Scaffold(
       appBar: new AppBar(
         leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
@@ -43,16 +46,23 @@ class _EntityViewPageState extends State<EntityViewPage> {
         }),
         // Here we take the value from the MyHomePage object that was created by
         // the App.build method, and use it to set our appbar title.
-        title: new Text(_title),
+        title: new Text("${entity.displayName}"),
       ),
-      body: HomeAssistant().entities.get(widget.entityId).buildEntityPageWidget(context),
+      body: body,
     );
   }
 
+  _popAfterBuild() async {
+    forwardToMainPage = entity;
+    await Future.delayed(Duration(milliseconds: 300));
+    Navigator.of(context).pop();
+  }
+
   @override
   void dispose(){
     if (_stateSubscription != null) _stateSubscription.cancel();
     if (_refreshDataSubscription != null) _refreshDataSubscription.cancel();
+    eventBus.fire(ShowEntityPageEvent(entity: forwardToMainPage));
     super.dispose();
   }
 }
\ No newline at end of file
diff --git a/lib/pages/main.page.dart b/lib/pages/main.page.dart
index 197ad16..7b5137d 100644
--- a/lib/pages/main.page.dart
+++ b/lib/pages/main.page.dart
@@ -26,6 +26,7 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
   bool _showLoginButton = false;
   bool _preventAppRefresh = false;
   String _savedSharedText;
+  String _entityToShow;
 
   @override
   void initState() {
@@ -227,7 +228,7 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
     if (_showEntityPageSubscription == null) {
       _showEntityPageSubscription =
           eventBus.on<ShowEntityPageEvent>().listen((event) {
-            _showEntityPage(event.entity.entityId);
+            _showEntityPage(event.entity?.entityId);
           });
     }
 
@@ -327,12 +328,17 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
   }
 
   void _showEntityPage(String entityId) {
-    Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => EntityViewPage(entityId: entityId),
-        )
-    );
+    setState(() {
+      _entityToShow = entityId;
+    });
+    if (_entityToShow!= null && MediaQuery.of(context).size.width < Sizes.tabletMinWidth) {
+      Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (context) => EntityViewPage(entityId: entityId),
+          )
+      );
+    }
   }
 
   void _showPage(String path, bool goBackFirst) {
@@ -643,9 +649,6 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
       child: new Text("Reload"),
       value: "reload",
     ));
-    List<Widget> emptyBody = [
-      Text("."),
-    ];
     if (ConnectionManager().isAuthenticated) {
       _showLoginButton = false;
       popupMenuItems.add(
@@ -654,73 +657,106 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
             value: "logout",
           ));
     }
-    if (_showLoginButton) {
-      emptyBody = [
-        FlatButton(
-          child: Text("Login with Home Assistant", style: TextStyle(fontSize: 16.0, color: Colors.white)),
-          color: Colors.blue,
-          onPressed: () => _fullLoad(),
-        )
-      ];
-    }
-    return NestedScrollView(
-      headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
-        return <Widget>[
-          SliverAppBar(
-            floating: true,
-            pinned: true,
-            primary: true,
-            title: Text(HomeAssistant().locationName ?? ""),
-            actions: <Widget>[
-              IconButton(
-                  icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
-                      "mdi:television"), color: Colors.white,),
-                  onPressed: () => Navigator.pushNamed(context, "/play-media", arguments: {"url": ""})
-              ),
-              IconButton(
-                  icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
-                      "mdi:dots-vertical"), color: Colors.white,),
-                  onPressed: () {
-                    showMenu(
-                        position: RelativeRect.fromLTRB(MediaQuery.of(context).size.width, 70.0, 0.0, 0.0),
-                        context: context,
-                        items: popupMenuItems
-                    ).then((String val) {
-                      if (val == "reload") {
-                        _quickLoad();
-                      } else if (val == "logout") {
-                        HomeAssistant().logout().then((_) {
-                          _quickLoad();
-                        });
-                      }
-                    });
-                  }
-              )
-            ],
-            leading: IconButton(
-              icon: Icon(Icons.menu),
-              onPressed: () {
-                _scaffoldKey.currentState.openDrawer();
-              },
-            ),
-            bottom: empty ? null : TabBar(
-              controller: _viewsTabController,
-              tabs: buildUIViewTabs(),
-              isScrollable: true,
-            ),
+    Widget mainScrollBody;
+    if (empty) {
+      if (_showLoginButton) {
+        mainScrollBody = Center(
+            child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: <Widget>[
+                  FlatButton(
+                    child: Text("Login with Home Assistant", style: TextStyle(fontSize: 16.0, color: Colors.white)),
+                    color: Colors.blue,
+                    onPressed: () => _fullLoad(),
+                  )
+                ]
+            )
+        );
+      } else {
+        mainScrollBody = Center(
+          child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: <Widget>[
+                Text("...")
+              ]
           ),
+        );
+      }
+    } else {
+      if (_entityToShow != null && MediaQuery.of(context).size.width >= Sizes.tabletMinWidth) {
+        Entity entity = HomeAssistant().entities.get(_entityToShow);
+        mainScrollBody = Flex(
+          direction: Axis.horizontal,
+          children: <Widget>[
+            Expanded(
+              child: HomeAssistant().buildViews(context, _viewsTabController),
+            ),
+            Container(
+              width: Sizes.mainPageScreenSeparatorWidth,
+              color: Colors.blue,
+            ),
+            ConstrainedBox(
+              constraints: BoxConstraints.tightFor(width: Sizes.entityPageMaxWidth),
+              child: entity.buildEntityPageWidget(context, showClose: true),
+            )
+          ],
+        );
+      } else {
+        _entityToShow = null;
+        mainScrollBody = HomeAssistant().buildViews(context, _viewsTabController);
+      }
+    }
 
-        ];
-      },
-      body: empty ?
-      Center(
-        child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: emptyBody
-        ),
-      )
-          :
-      HomeAssistant().buildViews(context, _viewsTabController),
+    return NestedScrollView(
+        headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
+          return <Widget>[
+            SliverAppBar(
+              floating: true,
+              pinned: true,
+              primary: true,
+              title: Text(HomeAssistant().locationName ?? ""),
+              actions: <Widget>[
+                IconButton(
+                    icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
+                        "mdi:television"), color: Colors.white,),
+                    onPressed: () => Navigator.pushNamed(context, "/play-media", arguments: {"url": ""})
+                ),
+                IconButton(
+                    icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
+                        "mdi:dots-vertical"), color: Colors.white,),
+                    onPressed: () {
+                      showMenu(
+                          position: RelativeRect.fromLTRB(MediaQuery.of(context).size.width, 70.0, 0.0, 0.0),
+                          context: context,
+                          items: popupMenuItems
+                      ).then((String val) {
+                        if (val == "reload") {
+                          _quickLoad();
+                        } else if (val == "logout") {
+                          HomeAssistant().logout().then((_) {
+                            _quickLoad();
+                          });
+                        }
+                      });
+                    }
+                )
+              ],
+              leading: IconButton(
+                icon: Icon(Icons.menu),
+                onPressed: () {
+                  _scaffoldKey.currentState.openDrawer();
+                },
+              ),
+              bottom: empty ? null : TabBar(
+                controller: _viewsTabController,
+                tabs: buildUIViewTabs(),
+                isScrollable: true,
+              ),
+            ),
+
+          ];
+        },
+        body: mainScrollBody
     );
   }
 
diff --git a/lib/pages/play_media.page.dart b/lib/pages/play_media.page.dart
index d3b1543..16104ca 100644
--- a/lib/pages/play_media.page.dart
+++ b/lib/pages/play_media.page.dart
@@ -83,7 +83,7 @@ class _PlayMediaPageState extends State<PlayMediaPage> {
             "media_content_type": _contentType
           }
       );
-      eventBus.fire(ShowEntityPageEvent(entity));
+      eventBus.fire(ShowEntityPageEvent(entity: entity));
     }
   }
 
diff --git a/lib/pages/widgets/entity_page_container.widget.dart b/lib/pages/widgets/entity_page_container.widget.dart
deleted file mode 100644
index 5573e12..0000000
--- a/lib/pages/widgets/entity_page_container.widget.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-part of '../../main.dart';
-
-class EntityPageContainer extends StatelessWidget {
-  EntityPageContainer({Key key, @required this.children}) : super(key: key);
-
-  final List<Widget> children;
-
-  @override
-  Widget build(BuildContext context) {
-    return ListView(
-      children: children,
-    );
-  }
-}
\ No newline at end of file
diff --git a/lib/plugins/DynamicMultiColumnLayout.dart b/lib/plugins/DynamicMultiColumnLayout.dart
index 116462f..8c00003 100644
--- a/lib/plugins/DynamicMultiColumnLayout.dart
+++ b/lib/plugins/DynamicMultiColumnLayout.dart
@@ -86,13 +86,12 @@ class RenderCustomLayoutBox extends RenderBox
     int columnsCount;
     List<double> columnXPositions = [];
     List<double> columnYPositions = [];
-    if (childCount == 0) {
+    columnsCount = (constraints.maxWidth ~/ this.minColumnWidth);
+    if (childCount == 0 || columnsCount == 0) {
       size = constraints.biggest;
       assert(size.isFinite);
       return;
     }
-
-    columnsCount = (constraints.maxWidth ~/ this.minColumnWidth);
     double columnWidth = constraints.maxWidth / columnsCount;
     double startY = 0;
     for (int i =0; i < columnsCount; i++) {
diff --git a/lib/types/event_bus_events.dart b/lib/types/event_bus_events.dart
index 50068fb..85f3044 100644
--- a/lib/types/event_bus_events.dart
+++ b/lib/types/event_bus_events.dart
@@ -63,9 +63,9 @@ class ShowPopupMessageEvent {
 }
 
 class ShowEntityPageEvent {
-  Entity entity;
+  final Entity entity;
 
-  ShowEntityPageEvent(this.entity);
+  ShowEntityPageEvent({this.entity});
 }
 
 class ShowPageEvent {