View widget improvements

lib/main.dart

@@ -115,7 +115,7 @@ part 'ui.dart';
 part 'view.class.dart';
 part 'cards/card.class.dart';
 part 'panels/panel_class.dart';
-part 'view.dart';
+part 'viewWidget.widget.dart';
 part 'cards/card_widget.dart';
 part 'cards/widgets/card_header.widget.dart';
 part 'panels/config_panel_widget.dart';

lib/view.dart

@@ -1,159 +0,0 @@
-part of 'main.dart';
-
-class ViewWidget extends StatefulWidget {
-  final HAView view;
-
-  const ViewWidget({
-    Key key,
-    this.view
-  }) : super(key: key);
-
-  @override
-  State<StatefulWidget> createState() {
-    return ViewWidgetState();
-  }
-
-}
-
-class ViewWidgetState extends State<ViewWidget> {
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (widget.view.panel) {
-      return FractionallySizedBox(
-        widthFactor: 1,
-        heightFactor: 1,
-        child: _buildPanelChild(context),
-      );
-    } else {
-      return ListView(
-          shrinkWrap: true,
-          padding: EdgeInsets.all(0),
-          children: <Widget>[
-            DynamicMultiColumnLayout(
-              minColumnWidth: Sizes.minViewColumnWidth,
-              children: _buildChildren(context),
-            )
-          ]
-      );
-      return ListView(
-        shrinkWrap: true,
-        padding: EdgeInsets.all(0),
-        children: <Widget>[
-          ConstrainedBox(
-            constraints: BoxConstraints(maxHeight: 3000),
-            child: CustomMultiChildLayout(
-              delegate: ViewLayoutBuilder(
-                  cardsCount: widget.view.cards.length
-              ),
-              children: _buildChildren(context),
-            ),
-          )
-        ],
-      );
-    }
-  }
-
-  Widget _buildPanelChild(BuildContext context) {
-    if (widget.view.cards != null && widget.view.cards.isNotEmpty) {
-      return widget.view.cards[0].build(context);
-    } else {
-      return Container(width: 0, height: 0);
-    }
-  }
-
-  List<Widget> _buildChildren(BuildContext context) {
-    List<Widget> result = [];
-    int layoutChildId = 0;
-
-    /*if (widget.view.badges.isNotEmpty) {
-      result.add(
-          LayoutId(
-            id: "badges",
-            child: Wrap(
-              alignment: WrapAlignment.center,
-              spacing: 10.0,
-              runSpacing: 1.0,
-              children: _buildBadges(context),
-            ),
-          )
-      );
-    }*/
-    widget.view.cards.forEach((HACard card){
-      result.add(
-          card.build(context)
-      );
-    });
-
-    return result;
-  }
-
-  List<Widget> _buildBadges(BuildContext context) {
-    List<Widget> result = [];
-    widget.view.badges.forEach((Entity entity) {
-      if (!entity.isHidden) {
-        result.add(
-            entity.buildBadgeWidget(context)
-        );
-      }
-    });
-    return result;
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-}
-
-class ViewLayoutBuilder extends MultiChildLayoutDelegate {
-  final int cardsCount;
-
-  ViewLayoutBuilder({@required this.cardsCount});
-
-  @override
-  void performLayout(Size size) {
-    int columnsCount = (size.width ~/ Sizes.minViewColumnWidth);
-    double columnWidth = size.width / columnsCount;
-    List<double> columnXPositions = [];
-    List<double> columnYPositions = [];
-    double startY = 0;
-    if (hasChild("badges")) {
-      Size badgesSizes = layoutChild(
-          'badges', BoxConstraints.tightFor(width: size.width));
-      startY += badgesSizes.height;
-      positionChild('badges', Offset(0, 0));
-    }
-    for (int i =0; i < columnsCount; i++) {
-      columnXPositions.add(i*columnWidth);
-      columnYPositions.add(startY);
-    }
-    for (int i = 0; i < cardsCount; i++) {
-      final String cardId = 'card_$i';
-
-      if (hasChild(cardId)) {
-        int columnToAdd = 0;
-        double minYPosition = columnYPositions[0];
-        for (int i=1; i<columnsCount; i++) {
-          if (columnYPositions[i] < minYPosition) {
-            minYPosition = columnYPositions[i];
-            columnToAdd = i;
-          }
-        }
-        Size newSize = layoutChild(
-            '$cardId', BoxConstraints.tightFor(width: columnWidth));
-        positionChild('$cardId', Offset(columnXPositions[columnToAdd], columnYPositions[columnToAdd]));
-        columnYPositions[columnToAdd] = minYPosition + newSize.height;
-      }
-    }
-  }
-
-  @override
-  bool shouldRelayout(MultiChildLayoutDelegate oldDelegate) => false;
-}

lib/viewWidget.widget.dart

@@ -0,0 +1,56 @@
+part of 'main.dart';
+
+class ViewWidget extends StatelessWidget {
+  final HAView view;
+
+  const ViewWidget({
+    Key key,
+    this.view
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    if (this.view.panel) {
+      return FractionallySizedBox(
+        widthFactor: 1,
+        heightFactor: 1,
+        child: _buildPanelChild(context),
+      );
+    } else {
+      return ListView(
+          shrinkWrap: true,
+          padding: EdgeInsets.all(0),
+          children: <Widget>[
+            _buildBadges(context),
+            DynamicMultiColumnLayout(
+              minColumnWidth: Sizes.minViewColumnWidth,
+              children: this.view.cards.map((card) => card.build(context)).toList(),
+            )
+          ]
+      );
+    }
+  }
+
+  Widget _buildPanelChild(BuildContext context) {
+    if (this.view.cards != null && this.view.cards.isNotEmpty) {
+      return this.view.cards[0].build(context);
+    } else {
+      return Container(width: 0, height: 0);
+    }
+  }
+
+  Widget _buildBadges(BuildContext context) {
+    if (this.view.badges.isNotEmpty) {
+      return Wrap(
+        alignment: WrapAlignment.center,
+        spacing: 10.0,
+        runSpacing: 1.0,
+        children: this.view.badges.map((badge) =>
+            badge.buildBadgeWidget(context)).toList(),
+      );
+    } else {
+      return Container(width: 0, height: 0,);
+    }
+  }
+
+}

pubspec.yaml

@@ -22,7 +22,7 @@ dependencies:
 #  flutter_svg: ^0.10.3
   flutter_custom_tabs: ^0.6.0
   firebase_messaging: ^5.1.5
-  flutter_webview_plugin: ^0.3.7
+  flutter_webview_plugin: ^0.3.8
   flutter_secure_storage: ^3.3.1
   device_info: ^0.4.0+2
   flutter_local_notifications: ^0.8.2+1