892

lib/cards/card_widget.dart

@@ -59,6 +59,10 @@ class CardWidget extends StatelessWidget {
         return _buildEntityButtonCard(context);
       }
 
+      case CardType.BUTTON: {
+        return _buildEntityButtonCard(context);
+      }
+
       case CardType.GAUGE: {
         return _buildGaugeCard(context);
       }
@@ -78,20 +82,15 @@ class CardWidget extends StatelessWidget {
       case CardType.HORIZONTAL_STACK: {
         if (card.childCards.isNotEmpty) {
           List<Widget> children = [];
-          card.childCards.forEach((card) {
+          children = card.childCards.map((childCard) => Flexible(
-            if (card.getEntitiesToShow().isNotEmpty || card.showEmpty) {
+              fit: FlexFit.tight,
-              children.add(
+              child: childCard.build(context),
-                  Flexible(
+            )
-                    fit: FlexFit.tight,
+          ).toList();
-                    child: card.build(context),
-                  )
-              );
-            }
-          });
           return Row(
             mainAxisSize: MainAxisSize.max,
             mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.center,
             children: children,
           );
         }
@@ -100,12 +99,7 @@ class CardWidget extends StatelessWidget {
 
       case CardType.VERTICAL_STACK: {
         if (card.childCards.isNotEmpty) {
-          List<Widget> children = [];
+          List<Widget> children = card.childCards.map((childCard) => childCard.build(context)).toList();
-          card.childCards.forEach((card) {
-            children.add(
-                card.build(context)
-            );
-          });
           return Column(
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.start,

lib/cards/widgets/entity_button_card_body.widget.dart

@@ -25,6 +25,7 @@ class EntityButtonCardBody extends StatelessWidget {
       child: FractionallySizedBox(
         widthFactor: 1,
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: <Widget>[
             LayoutBuilder(
                 builder: (BuildContext context, BoxConstraints constraints) {

lib/cards/widgets/gauge_card_body.dart

@@ -1,6 +1,6 @@
 part of '../../main.dart';
 
-class GaugeCardBody extends StatefulWidget {
+class GaugeCardBody extends StatelessWidget {
 
   final int min;
   final int max;
@@ -8,31 +8,26 @@ class GaugeCardBody extends StatefulWidget {
 
   GaugeCardBody({Key key, this.min, this.max, this.severity}) : super(key: key);
 
-  @override
-  _GaugeCardBodyState createState() => _GaugeCardBodyState();
-}
-
-class _GaugeCardBodyState extends State<GaugeCardBody> {
-
   @override
   Widget build(BuildContext context) {
     EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
     double fixedValue;
     double value = entityWrapper.entity.doubleState;
-    if (value > widget.max) {
+    if (value > max) {
-      fixedValue = widget.max.toDouble();
+      fixedValue = max.toDouble();
-    } else if (value < widget.min) {
+    } else if (value < min) {
-      fixedValue = widget.min.toDouble();
+      fixedValue = min.toDouble();
     } else {
       fixedValue = value;
     }
     
     List<GaugeRange> ranges;
-    if (widget.severity != null && widget.severity["green"] is int && widget.severity["red"] is int && widget.severity["yellow"] is int) {
+    Color currentColor;
+    if (severity != null && severity["green"] is int && severity["red"] is int && severity["yellow"] is int) {
       List<RangeContainer> rangesList = <RangeContainer>[
-        RangeContainer(widget.severity["green"], HAClientTheme().getGreenGaugeColor()),
+        RangeContainer(severity["green"], HAClientTheme().getGreenGaugeColor()),
-        RangeContainer(widget.severity["red"], HAClientTheme().getRedGaugeColor()),
+        RangeContainer(severity["red"], HAClientTheme().getRedGaugeColor()),
-        RangeContainer(widget.severity["yellow"], HAClientTheme().getYellowGaugeColor())
+        RangeContainer(severity["yellow"], HAClientTheme().getYellowGaugeColor())
       ];
       rangesList.sort((current, next) {
         if (current.startFrom > next.startFrom) {
@@ -43,11 +38,20 @@ class _GaugeCardBodyState extends State<GaugeCardBody> {
         }
         return 0;
       });
+
+      if (fixedValue < rangesList[1].startFrom) {
+        currentColor = rangesList[0].color;
+      } else if (fixedValue < rangesList[2].startFrom && fixedValue >= rangesList[1].startFrom) {
+        currentColor = rangesList[1].color;
+      } else {
+        currentColor = rangesList[2].color;
+      }
+
       ranges = [
         GaugeRange(
           startValue: rangesList[0].startFrom.toDouble(),
           endValue: rangesList[1].startFrom.toDouble(),
-          color: fixedValue < rangesList[1].startFrom ? rangesList[0].color : rangesList[0].color.withOpacity(0.1),
+          color: rangesList[0].color.withOpacity(0.1),
           sizeUnit: GaugeSizeUnit.factor,
           endWidth: 0.3,
           startWidth: 0.3
@@ -55,15 +59,15 @@ class _GaugeCardBodyState extends State<GaugeCardBody> {
         GaugeRange(
           startValue: rangesList[1].startFrom.toDouble(),
           endValue: rangesList[2].startFrom.toDouble(),
-          color: (fixedValue < rangesList[2].startFrom && fixedValue >= rangesList[1].startFrom) ? rangesList[1].color : rangesList[1].color.withOpacity(0.1),
+          color: rangesList[1].color.withOpacity(0.1),
           sizeUnit: GaugeSizeUnit.factor,
           endWidth: 0.3,
           startWidth: 0.3
         ),
         GaugeRange(
           startValue: rangesList[2].startFrom.toDouble(),
-          endValue: widget.max.toDouble(),
+          endValue: max.toDouble(),
-          color: fixedValue >= rangesList[2].startFrom ? rangesList[2].color : rangesList[2].color.withOpacity(0.1),
+          color: rangesList[2].color.withOpacity(0.1),
           sizeUnit: GaugeSizeUnit.factor,
           endWidth: 0.3,
           startWidth: 0.3
@@ -71,14 +75,15 @@ class _GaugeCardBodyState extends State<GaugeCardBody> {
       ];
     }
     if (ranges == null) {
+      currentColor = Theme.of(context).primaryColorDark;
       ranges = <GaugeRange>[
         GaugeRange(
-          startValue: widget.min.toDouble(),
+          startValue: min.toDouble(),
-          endValue: widget.max.toDouble(),
+          endValue: max.toDouble(),
-          color: Theme.of(context).primaryColorDark,
+          color: Theme.of(context).primaryColorDark.withOpacity(0.1),
           sizeUnit: GaugeSizeUnit.factor,
           endWidth: 0.3,
-          startWidth: 0.3
+          startWidth: 0.3,
         )
       ];
     }
@@ -104,12 +109,18 @@ class _GaugeCardBodyState extends State<GaugeCardBody> {
             return SfRadialGauge(
               axes: <RadialAxis>[
                 RadialAxis(
-                  maximum: widget.max.toDouble(),
+                  maximum: max.toDouble(),
-                  minimum: widget.min.toDouble(),
+                  minimum: min.toDouble(),
                   showLabels: false,
+                  useRangeColorForAxis: true,
                   showTicks: false,
                   canScaleToFit: true,
                   ranges: ranges,
+                  axisLineStyle: AxisLineStyle(
+                    thickness: 0.3,
+                    thicknessUnit: GaugeSizeUnit.factor,
+                    color: Colors.transparent
+                  ),
                   annotations: <GaugeAnnotation>[
                     GaugeAnnotation(
                       angle: -90,
@@ -135,27 +146,16 @@ class _GaugeCardBodyState extends State<GaugeCardBody> {
                       ),
                     )
                   ],
-                  axisLineStyle: AxisLineStyle(
-                    thickness: 0.3,
-                    thicknessUnit: GaugeSizeUnit.factor
-                  ),
                   startAngle: 180,
                   endAngle: 0,
                   pointers: <GaugePointer>[
-                    NeedlePointer(
+                    RangePointer(
                       value: fixedValue,
-                      lengthUnit: GaugeSizeUnit.factor,
+                      sizeUnit: GaugeSizeUnit.factor,
-                      needleLength: 0.9,
+                      width: 0.3,
-                      needleColor: Theme.of(context).accentColor,
+                      color: currentColor,
                       enableAnimation: true,
-                      needleStartWidth: 1,
                       animationType: AnimationType.bounceOut,
-                      needleEndWidth: 3,
-                      knobStyle: KnobStyle(
-                        sizeUnit: GaugeSizeUnit.factor,
-                        color: Theme.of(context).buttonColor,
-                        knobRadius: 0.1
-                      )
                     )
                   ]
                 )
@@ -166,6 +166,7 @@ class _GaugeCardBodyState extends State<GaugeCardBody> {
       ),
     );
   }
+  
 }
 
 class RangeContainer {

lib/const.dart

@@ -113,6 +113,7 @@ class CardType {
   static const IFRAME = "iframe";
   static const GAUGE = "gauge";
   static const ENTITY_BUTTON = "entity-button";
+  static const BUTTON = "button";
   static const CONDITIONAL = "conditional";
   static const ALARM_PANEL = "alarm-panel";
   static const MARKDOWN = "markdown";

lib/main.dart

@@ -149,7 +149,7 @@ EventBus eventBus = new EventBus();
 final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
 FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = new FlutterLocalNotificationsPlugin();
 const String appName = "HA Client";
-const appVersionNumber = "0.8.3";
+const appVersionNumber = "0.8.4";
 const appVersionAdd = "";
 const appVersion = "$appVersionNumber$appVersionAdd";
 

lib/managers/connection_manager.class.dart

@@ -20,6 +20,7 @@ class ConnectionManager {
   String oauthUrl;
   String webhookId;
   bool settingsLoaded = false;
+  int appIntegrationVersion;
   bool get isAuthenticated => _token != null;
   StreamSubscription _socketSubscription;
   Duration connectTimeout = Duration(seconds: 15);
@@ -43,6 +44,7 @@ class ConnectionManager {
       _domain = prefs.getString('hassio-domain');
       _port = prefs.getString('hassio-port');
       webhookId = prefs.getString('app-webhook-id');
+      appIntegrationVersion = prefs.getInt('app-integration-version') ?? 0;
       displayHostname = "$_domain:$_port";
       _webSocketAPIEndpoint =
       "${prefs.getString('hassio-protocol')}://$_domain:$_port/api/websocket";

lib/managers/mobile_app_integration_manager.class.dart

@@ -2,9 +2,11 @@ part of '../main.dart';
 
 class MobileAppIntegrationManager {
 
+  static const INTEGRATION_VERSION = 3;
+
   static final _appRegistrationData = {
-    "app_version": "$appVersion",
     "device_name": "",
+    "app_version": "$appVersion",
     "manufacturer": DeviceInfoManager().manufacturer,
     "model": DeviceInfoManager().model,
     "os_version": DeviceInfoManager().osVersion,
@@ -22,6 +24,7 @@ class MobileAppIntegrationManager {
       Logger.d("Mobile app was not registered yet or need to be reseted. Registering...");
       var registrationData = Map.from(_appRegistrationData);
       registrationData.addAll({
+        "device_id": "${DeviceInfoManager().unicDeviceId}",
         "app_id": "ha_client",
         "app_name": "$appName",
         "os_name": DeviceInfoManager().osName,
@@ -34,9 +37,11 @@ class MobileAppIntegrationManager {
       ).then((response) {
         Logger.d("Processing registration responce...");
         var responseObject = json.decode(response);
+        ConnectionManager().webhookId = responseObject["webhook_id"];
+        ConnectionManager().appIntegrationVersion = INTEGRATION_VERSION;
         SharedPreferences.getInstance().then((prefs) {
           prefs.setString("app-webhook-id", responseObject["webhook_id"]);
-          ConnectionManager().webhookId = responseObject["webhook_id"];
+          prefs.setInt('app-integration-version', INTEGRATION_VERSION);
 
           completer.complete();
           eventBus.fire(ShowPopupDialogEvent(
@@ -65,18 +70,29 @@ class MobileAppIntegrationManager {
           includeAuthHeader: false,
           data: json.encode(updateData)
       ).then((response) {
-        if (response == null || response.isEmpty) {
+        var registrationData;
-          Logger.d("No registration data in response. MobileApp integration was removed");
+        try {
+          registrationData = json.decode(response);
+        } catch (e) {
+          registrationData = null;
+        }
+        if (registrationData == null || registrationData.isEmpty) {
+          Logger.d("No registration data in response. MobileApp integration was removed or broken");
           _askToRegisterApp();
         } else {
-          Logger.d("App registration works fine");
+          if (INTEGRATION_VERSION > ConnectionManager().appIntegrationVersion) {
-          if (showOkDialog) {
+            Logger.d('App registration needs to be updated');
-            eventBus.fire(ShowPopupDialogEvent(
+            _askToRemoveAndRegisterApp();
-                title: "All good",
+          } else {
-                body: "HA Client integration with your Home Assistant server works fine",
+            Logger.d('App registration works fine');
-                positiveText: "Nice!",
+            if (showOkDialog) {
-                negativeText: "Ok"
+              eventBus.fire(ShowPopupDialogEvent(
-            ));
+                  title: "All good",
+                  body: "HA Client integration with your Home Assistant server works fine",
+                  positiveText: "Nice!",
+                  negativeText: "Ok"
+              ));
+            }
           }
         }
         completer.complete();
@@ -105,10 +121,22 @@ class MobileAppIntegrationManager {
     }
   }
 
+  static void _askToRemoveAndRegisterApp() {
+    eventBus.fire(ShowPopupDialogEvent(
+      title: "Mobile app integration needs to be updated",
+      body: "You need to update HA Client integration to continue using notifications and location tracking. Please remove 'Mobile App' integration for this device from your Home Assistant and restart Home Assistant. Then go back to HA Client to create app integration again.",
+      positiveText: "Ok",
+      negativeText: "Report an issue",
+      onNegative: () {
+        Launcher.launchURL("https://github.com/estevez-dev/ha_client/issues/new");
+      },
+    ));
+  }
+
   static void _askToRegisterApp() {
     eventBus.fire(ShowPopupDialogEvent(
-      title: "App integration was removed",
+      title: "App integration is broken",
-      body: "Looks like app integration was removed from your Home Assistant. HA Client needs to be registered on your Home Assistant server to make it possible to use notifications and other useful stuff.",
+      body: "Looks like app integration was removed from your Home Assistant or it needs to be updated. HA Client needs to be registered on your Home Assistant server to make it possible to use notifications and location tracking. Please remove 'Mobile App' integration for this device from your Home Assistant before registering and restart Home Assistant. Then go back here.",
       positiveText: "Register now",
       negativeText: "Cancel",
       onPositive: () {

lib/pages/entity.page.dart

@@ -12,61 +12,52 @@ class EntityViewPage extends StatefulWidget {
 class _EntityViewPageState extends State<EntityViewPage> {
   StreamSubscription _refreshDataSubscription;
   StreamSubscription _stateSubscription;
-  Entity entity;
+  Entity _entity;
-  Entity forwardToMainPage;
-  bool _popScheduled = false;
 
   @override
   void initState() {
     super.initState();
     _stateSubscription = eventBus.on<StateChangedEvent>().listen((event) {
       if (event.entityId == widget.entityId) {
-        entity = HomeAssistant().entities.get(widget.entityId);
         Logger.d("[Entity page] State change event handled: ${event.entityId}");
-        setState(() {});
+        setState(() {
+          _getEntity();
+        });
       }
     });
     _refreshDataSubscription = eventBus.on<RefreshDataFinishedEvent>().listen((event) {
-      entity = HomeAssistant().entities.get(widget.entityId);
+      Logger.d("[Entity page] Refresh data event handled");
-      setState(() {});
+      setState(() {
+        _getEntity();
+      });
     });
-    entity = HomeAssistant().entities.get(widget.entityId);
+    _getEntity();
+  }
+
+  _getEntity() {
+    _entity = HomeAssistant().entities.get(widget.entityId);
   }
 
   @override
   Widget build(BuildContext context) {
-    Widget body;
+    String entityNameToDisplay = '${(_entity?.displayName ?? widget.entityId) ?? ''}';
-    if (MediaQuery.of(context).size.width >= Sizes.tabletMinWidth) {
-      if (!_popScheduled) {
-        _popScheduled = true;
-        _popAfterBuild();
-      }
-      body = PageLoadingIndicator();
-    } else {
-      body = EntityPageLayout(entity: entity);
-    }
     return new Scaffold(
       appBar: new AppBar(
         leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
           Navigator.pop(context);
         }),
-        title: new Text("${entity.displayName}"),
+        title: new Text(entityNameToDisplay),
       ),
-      body: body,
+      body: _entity == null ? PageLoadingError(
+        errorText: 'Entity is not available $entityNameToDisplay',
+      ) : EntityPageLayout(entity: _entity),
     );
   }
 
-  _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();
   }
 }

lib/pages/main/main.page.dart

@@ -25,7 +25,6 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
   int _previousViewCount;
   bool _showLoginButton = false;
   bool _preventAppRefresh = false;
-  Entity _entityToShow;
 
   @override
   void initState() {
@@ -125,9 +124,6 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
     }
     await HomeAssistant().fetchData(uiOnly).then((_) {
       _hideBottomBar();
-      if (_entityToShow != null) {
-        _entityToShow = HomeAssistant().entities.get(_entityToShow.entityId);
-      }
     }).catchError((e) {
       if (e is HAError) {
         _setErrorState(e);
@@ -302,12 +298,12 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
   }
 
   void _showEntityPage(String entityId) {
-    setState(() {
+    Navigator.push(
-      _entityToShow = HomeAssistant().entities?.get(entityId);
+      context,
-      if (_entityToShow != null) {
+      MaterialPageRoute(
-        _mainScrollController?.jumpTo(0);
+        builder: (context) => EntityViewPage(entityId: entityId),
-      }
+      )
-    });
+    );
     /*if (_entityToShow!= null && MediaQuery.of(context).size.width < Sizes.tabletMinWidth) {
       Navigator.push(
           context,
@@ -591,7 +587,6 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
   }
 
   final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
-  final ScrollController _mainScrollController = ScrollController();
 
   Widget _buildScaffoldBody(bool empty) {
     List<PopupMenuItem<String>> serviceMenuItems = [];
@@ -697,28 +692,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
         );
       }
     } else {
-      if (_entityToShow != null && MediaQuery.of(context).size.width >= Sizes.tabletMinWidth) {
+      mainScrollBody = HomeAssistant().ui.build(context, _viewsTabController);
-        mainScrollBody = Flex(
-          direction: Axis.horizontal,
-          children: <Widget>[
-            Expanded(
-              child: HomeAssistant().ui.build(context, _viewsTabController),
-            ),
-            Container(
-              width: Sizes.mainPageScreenSeparatorWidth,
-              color: Colors.blue,
-            ),
-            ConstrainedBox(
-              constraints: BoxConstraints.tightFor(width: Sizes.entityPageMaxWidth),
-              child: EntityPageLayout(entity: _entityToShow, showClose: true,),
-            )
-          ],
-        );
-      } else if (_entityToShow != null) {
-        mainScrollBody = EntityPageLayout(entity: _entityToShow, showClose: true,);
-      } else {
-        mainScrollBody = HomeAssistant().ui.build(context, _viewsTabController);
-      }
     }
 
     return NestedScrollView(
@@ -774,7 +748,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
                   _scaffoldKey.currentState.openDrawer();
                 },
               ),
-              bottom: (empty || _entityToShow != null) ? null : TabBar(
+              bottom: empty ? null : TabBar(
                 controller: _viewsTabController,
                 tabs: buildUIViewTabs(),
                 isScrollable: true,
@@ -784,7 +758,6 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
           ];
         },
         body: mainScrollBody,
-        controller: _mainScrollController,
     );
   }
 
@@ -849,22 +822,12 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
             body: _buildScaffoldBody(true)
         );
       } else {
-        return WillPopScope(
+        return Scaffold(
-          child: Scaffold(
+          key: _scaffoldKey,
-            key: _scaffoldKey,
+          drawer: _buildAppDrawer(),
-            drawer: _buildAppDrawer(),
+          primary: false,
-            primary: false,
+          bottomNavigationBar: bottomBar,
-            bottomNavigationBar: bottomBar,
+          body: _buildScaffoldBody(false)
-            body: _buildScaffoldBody(false)
-          ),
-          onWillPop: () {
-            if (_entityToShow != null) {
-              eventBus.fire(ShowEntityPageEvent());
-              return Future.value(false);
-            } else {
-              return Future.value(true);
-            }
-          },
         );
       }
   }

lib/pages/purchase.page.dart

@@ -62,7 +62,7 @@ class _PurchasePageState extends State<PurchasePage> {
     }
   }
 
-  Widget _buildProducts() {
+  List<Widget> _buildProducts() {
     List<Widget> productWidgets = [];
     for (ProductDetails product in _products) {
       productWidgets.add(
@@ -72,10 +72,7 @@ class _PurchasePageState extends State<PurchasePage> {
           purchased: _purchases.any((purchase) { return purchase.productID == product.id;}),)
       );
     }
-    return ListView(
+    return productWidgets;
-        scrollDirection: Axis.vertical,
-        children: productWidgets
-      );
   }
 
   void _buyProduct(ProductDetails product) {
@@ -87,12 +84,28 @@ class _PurchasePageState extends State<PurchasePage> {
 
   @override
   Widget build(BuildContext context) {
-    Widget body;
+    List<Widget> body;
     if (!_loaded) {
-      body = _error.isEmpty ? PageLoadingIndicator() : PageLoadingError(errorText: _error);
+      body = [_error.isEmpty ? PageLoadingIndicator() : PageLoadingError(errorText: _error)];
     } else {
       body = _buildProducts();
     }
+    body.add(
+      Card(
+        child: Container(
+          height: 80,
+          child: InkWell(
+            child: Image.network('https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif'),
+            onTap: () {
+              Launcher.launchURLInCustomTab(
+                context: context,
+                url: 'https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ARWGETZD2D83Q&source=url'
+              );
+            },
+          )
+        ),
+      )
+    );
     return new Scaffold(
       appBar: new AppBar(
         leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
@@ -100,7 +113,10 @@ class _PurchasePageState extends State<PurchasePage> {
         }),
         title: new Text(widget.title),
       ),
-      body: body,
+      body: ListView(
+        scrollDirection: Axis.vertical,
+        children: body
+      ),
     );
   }
   

lib/utils/mdi.class.dart

@@ -7,9 +7,9 @@ class MaterialDesignIcons {
     "binary_sensor": "mdi:checkbox-blank-circle-outline",
     "group": "mdi:google-circles-communities",
     "sensor": "mdi:eye",
-    "automation": "mdi:playlist-play",
+    "automation": "mdi:robot",
-    "script": "mdi:file-document",
+    "script": "mdi:script-text",
-    "input_boolean": "mdi:drawing",
+    "input_boolean": "mdi:toggle-switch-outline",
     "input_datetime": "mdi:clock",
     "input_number": "mdi:ray-vertex",
     "input_select": "mdi:format-list-bulleted",

lib/view.class.dart

@@ -48,7 +48,7 @@ class HAView {
             type: rawCardInfo['type'] ?? CardType.ENTITIES,
             columnsCount: rawCardInfo['columns'] ?? 4,
             showName: (rawCardInfo['show_name'] ?? rawCard['show_name']) ?? true,
-            showHeaderToggle: (rawCardInfo['show_header_toggle'] ?? rawCard['show_header_toggle']) ?? true, 
+            showHeaderToggle: (rawCardInfo['show_header_toggle'] ?? rawCard['show_header_toggle']) ?? false, 
             showState: (rawCardInfo['show_state'] ?? rawCard['show_state']) ?? true,
             showEmpty: (rawCardInfo['show_empty'] ?? rawCard['show_empty']) ?? true,
             stateFilter: (rawCard['state_filter'] ?? rawCardInfo['state_filter']) ?? [],

pubspec.yaml

@@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 0.8.3+890
+version: 0.8.4+892
 
 
 environment: