892

890

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Create a report to help improve HA Client
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**HA Client version:** [Main menu -> About HA Client]
+
+**Home Assistant version:**
+
+**Device name:**
+
+**Android version:**
+
+**Description**
+[Replace with description]
+
+**Screenshots**
+[Replace with screenshots]

.github/ISSUE_TEMPLATE/entity-support-request.md

@@ -0,0 +1,12 @@
+---
+name: Entity support request
+about: Suggest to add support of any entity type
+title: ''
+labels: ENTITY, feature/improvement
+assignees: ''
+
+---
+
+**Entity type:**
+
+**Link to documentation:**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for HA Client if it is not a card or entity support
+title: ''
+labels: feature/improvement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/lovelace-card-support-request.md

@@ -0,0 +1,12 @@
+---
+name: Lovelace Card support request
+about: Suggest to add any Lovelace card support
+title: ''
+labels: CARD, feature/improvement
+assignees: ''
+
+---
+
+**Card name:**
+
+**Link to card repository or web page:**

.github/no-response.yml

@@ -0,0 +1,11 @@
+# Configuration for probot-no-response - https://github.com/probot/no-response
+
+# Number of days of inactivity before an Issue is closed for lack of response
+daysUntilClose: 14
+# Label requiring a response
+responseRequiredLabel: more info needed
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  to our request for more information from the original author. If the issue still relevant
+  feel free to reopen this issue and add more information, or report a new one. 

.gitignore

@@ -9,7 +9,14 @@ build/
 .flutter-plugins
 
 .idea/
+.vscode/
+.theia/
+.project/
+.settings/
+
+flutter_export_environment.sh
+.flutter-plugins-dependencies
 
 key.properties
-premium_features_manager.class.dart
+.secrets.dart
 pubspec.lock

.gitpod.dockerfile

@@ -0,0 +1,8 @@
+FROM gitpod/workspace-full:latest
+
+ENV ANDROID_HOME=/workspace/android-sdk \
+    FLUTTER_ROOT=/workspace/flutter \
+    FLUTTER_HOME=/workspace/flutter
+
+RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh \
+             && sdk install java 8.0.242.j9-adpt"

.gitpod.yml

@@ -0,0 +1,26 @@
+image:
+  file: .gitpod.dockerfile
+
+tasks:
+- before: |
+    export PATH=$FLUTTER_HOME/bin:$FLUTTER_HOME/bin/cache/dart-sdk/bin:$ANDROID_HOME/bin:$ANDROID_HOME/platform-tools:$PATH
+    mkdir -p /home/gitpod/.android
+    touch /home/gitpod/.android/repositories.cfg
+  init: |
+    echo "Installing Flutter SDK..."
+    cd /workspace && wget -qO flutter_sdk.tar.xz https://storage.googleapis.com/flutter_infra/releases/stable/linux/flutter_linux_v1.12.13+hotfix.7-stable.tar.xz && tar -xf flutter_sdk.tar.xz && rm -f flutter_sdk.tar.xz
+    echo "Installing Android SDK..."
+    mkdir -p /workspace/android-sdk && cd /workspace/android-sdk && wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && unzip sdk-tools-linux-4333796.zip && rm -f sdk-tools-linux-4333796.zip
+    /workspace/android-sdk/tools/bin/sdkmanager "platform-tools" "platforms;android-28" "build-tools;28.0.3"
+    echo "Init Flutter..."
+    cd /workspace/ha_client
+    flutter upgrade
+    flutter doctor --android-licenses
+    flutter pub get
+  command: |
+    echo "Ready to go!"
+    flutter doctor
+vscode:
+  extensions:
+    - Dart-Code.dart-code@3.5.0-beta.1:Wg2nTABftVR/Dry4tqeY1w==
+    - Dart-Code.flutter@3.5.0:/kOacEWdiDRLyN/idUiM4A==

README.md

@@ -1,9 +1,16 @@
 # HA Client
 ## Native Android client for Home Assistant
-### With Lovelace UI support
+### With notifications and Lovelace UI support
 
-Visit [homemade.systems](http://ha-client.homemade.systems/) for more info.
+Visit [ha-client.app](http://ha-client.app/) for more info.
 
 Download the app from [Google Play](https://play.google.com/apps/testing/com.keyboardcrumbs.haclient)
 
-Discuss it in [Home Assistant community](https://community.home-assistant.io/t/alpha-testing-ha-client-native-android-client-for-home-assistant/69912) or on [Discord server](https://discord.gg/AUzEvwn)
+Discuss it on [Discord](https://discord.gg/nd6FZQ) or at [Home Assistant community](https://community.home-assistant.io/c/mobile-apps/ha-client-android)
+
+[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/estevez-dev/ha_client) 
+
+#### Pre-release CI build
+[![Codemagic build status](https://api.codemagic.io/apps/5da8bdab9f20ef798f7c2c65/5da8bdab9f20ef798f7c2c64/status_badge.svg)](https://codemagic.io/apps/5da8bdab9f20ef798f7c2c65/5da8bdab9f20ef798f7c2c64/latest_build)
+#### Beta CI build
+[![Codemagic build status](https://api.codemagic.io/apps/5da8bdab9f20ef798f7c2c65/5db1862025dc3f0b0288a57a/status_badge.svg)](https://codemagic.io/apps/5da8bdab9f20ef798f7c2c65/5db1862025dc3f0b0288a57a/latest_build)

android/.gitignore

@@ -8,3 +8,4 @@
 /build
 /captures
 GeneratedPluginRegistrant.java
+.project/

android/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

android/app/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

android/app/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

android/app/build.gradle

@@ -50,6 +50,14 @@ android {
     }
 
     signingConfigs {
+        if (!System.getenv()["CI"]) {
+            debug {
+                keyAlias keystoreProperties['debugKeyAlias']
+                keyPassword keystoreProperties['debugKeyPassword']
+                storeFile file(keystoreProperties['debugStoreFile'])
+                storePassword keystoreProperties['debugStorePassword']
+            }
+        }
         release {
             keyAlias keystoreProperties['keyAlias']
             keyPassword keystoreProperties['keyPassword']
@@ -70,10 +78,11 @@ flutter {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-core:16.0.8'
+    implementation 'com.google.firebase:firebase-analytics:17.2.2'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
 
+apply plugin: 'io.fabric'
 apply plugin: 'com.google.gms.google-services'

android/app/google-services.json

@@ -14,6 +14,30 @@
         }
       },
       "oauth_client": [
+        {
+          "client_id": "441874387819-uqmkibhf361828od1982o2jhl0n3m0ov.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.keyboardcrumbs.haclient",
+            "certificate_hash": "bebe4d970fbebf0bff2c93244fdc7fcbcefb3470"
+          }
+        },
+        {
+          "client_id": "441874387819-5q7vmimci4s2jl3v0ncugv1ocp4m48nb.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.keyboardcrumbs.haclient",
+            "certificate_hash": "0ea12348468be44bc2aa5792ee7e8924c633da81"
+          }
+        },
+        {
+          "client_id": "441874387819-joi8plo5345ebt8i1dug27u2aenv5tg7.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.keyboardcrumbs.haclient",
+            "certificate_hash": "fcbc805d965ccf6a4d5417398d191edc9c9890b0"
+          }
+        },
         {
           "client_id": "441874387819-id0hqsfprj3b5kc312faqv3lmdfpm7l8.apps.googleusercontent.com",
           "client_type": 3
@@ -25,15 +49,13 @@
         }
       ],
       "services": {
-        "analytics_service": {
-          "status": 1
-        },
         "appinvite_service": {
-          "status": 1,
+          "other_platform_oauth_client": [
-          "other_platform_oauth_client": []
+            {
-        },
+              "client_id": "441874387819-id0hqsfprj3b5kc312faqv3lmdfpm7l8.apps.googleusercontent.com",
-        "ads_service": {
+              "client_type": 3
-          "status": 2
+            }
+          ]
         }
       }
     }

android/app/src/main/AndroidManifest.xml

@@ -1,16 +1,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.keyboardcrumbs.hassclient">
 
-    <!-- The INTERNET permission is required for development. Specifically,
+    <uses-feature android:name="android.hardware.touchscreen"
-         flutter needs it to communicate with the running application
+        android:required="false" />
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -18,11 +17,14 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name=".Application"
         android:label="HA Client"
         android:icon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true">
 
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="ha_notify" />
@@ -34,13 +36,12 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
-            <!-- This keeps the window background of the activity showing
-                 until Flutter renders its first frame. It can be removed if
-                 there is no splash screen (such as the default splash screen
-                 defined in @style/LaunchTheme).
             <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
+                android:name="io.flutter.embedding.android.SplashScreenDrawable"
-                android:value="true" />-->
+                android:resource="@drawable/launch_background" />
+            <meta-data
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
             <intent-filter>
                 <action android:name="FLUTTER_NOTIFICATION_CLICK" />
                 <category android:name="android.intent.category.DEFAULT" />

android/app/src/main/java/com/keyboardcrumbs/hassclient/Application.java

@@ -1,18 +0,0 @@
-package com.keyboardcrumbs.hassclient;
-
-import io.flutter.app.FlutterApplication;
-import io.flutter.plugin.common.PluginRegistry;
-import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback;
-import io.flutter.plugins.GeneratedPluginRegistrant;
-
-public class Application extends FlutterApplication implements PluginRegistrantCallback {
-    @Override
-    public void onCreate() {
-        super.onCreate();
-    }
-
-    @Override
-    public void registerWith(PluginRegistry registry) {
-        GeneratedPluginRegistrant.registerWith(registry);
-    }
-}

android/app/src/main/java/com/keyboardcrumbs/hassclient/MainActivity.java

@@ -1,13 +1,15 @@
 package com.keyboardcrumbs.hassclient;
 
-import android.os.Bundle;
+import androidx.annotation.NonNull;
-import io.flutter.app.FlutterActivity;
+import io.flutter.embedding.android.FlutterActivity;
+import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.plugins.GeneratedPluginRegistrant;
 
 public class MainActivity extends FlutterActivity {
+  
     @Override
-  protected void onCreate(Bundle savedInstanceState) {
+    public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
-    super.onCreate(savedInstanceState);
+        GeneratedPluginRegistrant.registerWith(flutterEngine);
-    GeneratedPluginRegistrant.registerWith(this);
     }
+
 }

android/app/src/main/res/values/styles.xml

@@ -5,4 +5,7 @@
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
 </resources>

android/build.gradle

@@ -2,11 +2,15 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven {
+            url 'https://maven.fabric.io/public'
+        }
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.2'
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'io.fabric.tools:gradle:1.26.1'
     }
 }
 
@@ -14,6 +18,9 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven {
+            url 'https://maven.fabric.io/public'
+        }
     }
 }
 

android/gradle.properties

@@ -3,3 +3,4 @@ org.gradle.daemon=true
 org.gradle.caching=true
 android.useAndroidX=true
 android.enableJetifier=true
+android.enableR8=true

android/settings_aar.gradle

@@ -0,0 +1 @@
+include ':app'

assets/html/cameraLiveView.html

@@ -0,0 +1,61 @@
+<html>
+<head>
+<script src="https://cdn.jsdelivr.net/npm/hls.js@latest"></script>
+<style>
+    body {
+        padding: 0;
+        margin: 0;
+        widows: 100%;
+        height: 100%;
+    }
+
+    video {
+        width: 100%;
+    }
+</style>
+<script>
+    var messageChannel = '{{message_channel}}';
+</script>
+</head>
+<body>
+<video id="screen" width="100%" controls></video>
+<script>
+if (Hls.isSupported()) {
+    var video = document.getElementById('screen');
+    var hls = new Hls();
+    hls.on(Hls.Events.ERROR, function (event, data) {
+            if (data.fatal) {
+            switch(data.type) {
+            case Hls.ErrorTypes.NETWORK_ERROR:
+            // try to recover network error
+                console.log("fatal network error encountered, try to recover");
+                hls.startLoad();
+                break;
+            case Hls.ErrorTypes.MEDIA_ERROR:
+                console.log("fatal media error encountered, try to recover");
+                hls.recoverMediaError();
+                break;
+            default:
+            // cannot recover
+                hls.destroy();
+                break;
+            }
+            }
+        });
+    // bind them together
+    hls.attachMedia(video);
+    hls.on(Hls.Events.MEDIA_ATTACHED, function () {
+        console.log("video and hls.js are now bound together !");
+        hls.loadSource("{{stream_url}}");
+        hls.on(Hls.Events.MANIFEST_PARSED, function (event, data) {
+            console.log("manifest loaded, found " + data.levels.length + " quality level");
+            video.play();
+            video.onloadedmetadata = function() {
+                window[messageChannel].postMessage(document.body.clientWidth / video.offsetHeight);
+            };
+        });
+    });
+}
+</script>
+</body>
+</html>

assets/html/cameraView.html

@@ -0,0 +1,28 @@
+<html>
+<head>
+<style>
+    body {
+        padding: 0;
+        margin: 0;
+        widows: 100%;
+        height: 100%;
+    }
+
+    img {
+        width: 100%;
+    }
+</style>
+<script>
+    var messageChannel = '{{message_channel}}';
+    window.onload = function() {
+        var img = document.getElementById('screen');
+        if (img) {
+            window[messageChannel].postMessage(document.body.clientWidth / img.offsetHeight);
+        }
+    };
+</script>
+</head>
+<body>
+<img id="screen" src="{{stream_url}}">
+</body>
+</html>

assets/js/externalAuth.js

@@ -14,3 +14,22 @@ window.externalApp.getExternalAuth = function(options) {
         }, 500);
     }
 };
+window.externalApp.externalBus = function(message) {
+    console.log("External bus message: " + message);
+    var messageObj = JSON.parse(message);
+    if (messageObj.type == "config/get") {
+        var responseData = {
+            id: messageObj.id,
+            type: "result",
+            success: true,
+            result: {
+                hasSettingsScreen: true
+            }
+        };
+        setTimeout(function(){
+            window.externalBus(responseData);
+        }, 500);
+    } else if (messageObj.type == "config_screen/show") {
+        HAClient.postMessage('show-settings');
+    }
+};

lib/cards/card.class.dart

@@ -0,0 +1,123 @@
+part of '../main.dart';
+
+class HACard {
+  List<EntityWrapper> entities = [];
+  List<HACard> childCards = [];
+  EntityWrapper linkedEntityWrapper;
+  String name;
+  String id;
+  String type;
+  bool showName;
+  bool showState;
+  bool showEmpty;
+  bool showHeaderToggle;
+  int columnsCount;
+  List stateFilter;
+  List states;
+  List conditions;
+  String content;
+  String unit;
+  int min;
+  int max;
+  Map severity;
+
+  HACard({
+    this.name,
+    this.id,
+    this.linkedEntityWrapper,
+    this.columnsCount: 4,
+    this.showName: true,
+    this.showHeaderToggle: true,
+    this.showState: true,
+    this.stateFilter: const [],
+    this.showEmpty: true,
+    this.content,
+    this.states,
+    this.conditions: const [],
+    this.unit,
+    this.min,
+    this.max,
+    this.severity,
+    @required this.type
+  }) {
+    if (this.columnsCount <= 0) {
+      this.columnsCount = 4;
+    }
+  }
+
+  List<EntityWrapper> getEntitiesToShow() {
+    return entities.where((entityWrapper) {
+      if (HomeAssistant().autoUi && entityWrapper.entity.isHidden) {
+        return false;
+      }
+      List currentStateFilter;
+      if (entityWrapper.stateFilter != null && entityWrapper.stateFilter.isNotEmpty) {
+        currentStateFilter = entityWrapper.stateFilter;
+      } else {
+        currentStateFilter = stateFilter;
+      }
+      bool showByFilter = currentStateFilter.isEmpty;
+      for (var allowedState in currentStateFilter) {
+        if (allowedState is String && allowedState == entityWrapper.entity.state) {
+          showByFilter = true;
+          break;
+        } else if (allowedState is Map) {
+          try {
+            var tmpVal = allowedState['attribute'] != null ? entityWrapper.entity.getAttribute(allowedState['attribute']) : entityWrapper.entity.state;
+            var valToCompareWith = allowedState['value'];
+            var valToCompare;
+            if (valToCompareWith is! String && tmpVal is String) {
+              valToCompare = double.tryParse(tmpVal);
+            } else {
+              valToCompare = tmpVal;
+            }
+            if (valToCompare != null) {
+              bool result;
+              switch (allowedState['operator']) {
+                case '<=': { result = valToCompare <= valToCompareWith;}
+                break;
+                
+                case '<': { result = valToCompare < valToCompareWith;}
+                break;
+
+                case '>=': { result = valToCompare >= valToCompareWith;}
+                break;
+
+                case '>': { result = valToCompare > valToCompareWith;}
+                break;
+
+                case '!=': { result = valToCompare != valToCompareWith;}
+                break;
+
+                case 'regex': {
+                  RegExp regExp = RegExp(valToCompareWith.toString());
+                  result = regExp.hasMatch(valToCompare.toString());
+                }
+                break;
+
+                default: {
+                    result = valToCompare == valToCompareWith;
+                  }
+              }
+              if (result) {
+                showByFilter = true;
+                break;
+              }  
+            }
+          } catch (e) {
+            Logger.e('Error filtering ${entityWrapper.entity.entityId} by $allowedState');
+            Logger.e('$e');
+          }
+        }
+      }
+      return showByFilter;
+    }).toList();
+  }
+
+  Widget build(BuildContext context) {
+    return CardWidget(
+      card: this,
+    );
+  }
+
+}

lib/cards/card_widget.dart

@@ -25,14 +25,15 @@ class CardWidget extends StatelessWidget {
     }
 
     if (card.conditions.isNotEmpty) {
-      bool showCardByConditions = false;
+      bool showCardByConditions = true;
       for (var condition in card.conditions) {
         Entity conditionEntity = HomeAssistant().entities.get(condition['entity']);
         if (conditionEntity != null &&
-            (condition['state'] != null && conditionEntity.state == condition['state']) ||
+            ((condition['state'] != null && conditionEntity.state != condition['state']) ||
-            (condition['state_not'] != null && conditionEntity.state != condition['state_not'])
+            (condition['state_not'] != null && conditionEntity.state == condition['state_not']))
           ) {
-          showCardByConditions = true;
+          showCardByConditions = false;
+          break;
         }
       }
       if (!showCardByConditions) {
@@ -42,61 +43,63 @@ class CardWidget extends StatelessWidget {
 
     switch (card.type) {
 
-      case CardType.entities: {
+      case CardType.ENTITIES: {
         return _buildEntitiesCard(context);
       }
 
-      case CardType.glance: {
+      case CardType.GLANCE: {
         return _buildGlanceCard(context);
       }
 
-      case CardType.mediaControl: {
+      case CardType.MEDIA_CONTROL: {
         return _buildMediaControlsCard(context);
       }
 
-      case CardType.entityButton: {
+      case CardType.ENTITY_BUTTON: {
         return _buildEntityButtonCard(context);
       }
 
-      case CardType.markdown: {
+      case CardType.BUTTON: {
+        return _buildEntityButtonCard(context);
+      }
+
+      case CardType.GAUGE: {
+        return _buildGaugeCard(context);
+      }
+
+/*      case CardType.LIGHT: {
+        return _buildLightCard(context);
+      }*/
+
+      case CardType.MARKDOWN: {
         return _buildMarkdownCard(context);
       }
 
-      case CardType.alarmPanel: {
+      case CardType.ALARM_PANEL: {
         return _buildAlarmPanelCard(context);
       }
 
-      case CardType.horizontalStack: {
+      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) {
-              children.add(
-                  Flexible(
               fit: FlexFit.tight,
-                    child: card.build(context),
+              child: childCard.build(context),
             )
-              );
+          ).toList();
-            }
-          });
           return Row(
             mainAxisSize: MainAxisSize.max,
             mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.center,
             children: children,
           );
         }
         return Container(height: 0.0, width: 0.0,);
       }
 
-      case CardType.verticalStack: {
+      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,
@@ -123,9 +126,34 @@ class CardWidget extends StatelessWidget {
       return Container(height: 0.0, width: 0.0,);
     }
     List<Widget> body = [];
-    body.add(CardHeaderWidget(name: card.name));
+    Widget headerSwitch;
+    if (card.showHeaderToggle) {
+      bool headerToggleVal = entitiesToShow.any((EntityWrapper en){ return en.entity.state == EntityState.on; });
+      List<String> entitiesToToggle = entitiesToShow.where((EntityWrapper enw) {
+        return <String>["switch", "light", "automation", "input_boolean"].contains(enw.entity.domain);
+      }).map((EntityWrapper en) {
+          return en.entity.entityId;
+      }).toList();
+      headerSwitch = Switch(
+            value: headerToggleVal,
+            onChanged: (val) {
+              if (entitiesToToggle.isNotEmpty) {
+                ConnectionManager().callService(
+                  domain: "homeassistant",
+                  service: val ? "turn_on" : "turn_off",
+                  entityId: entitiesToToggle
+                );
+              }
+            },
+          );
+    }
+    body.add(
+      CardHeader(
+        name: card.name,
+        trailing: headerSwitch 
+      )
+    );
     entitiesToShow.forEach((EntityWrapper entity) {
-      if (!entity.entity.isHidden) {
       body.add(
           Padding(
             padding: EdgeInsets.fromLTRB(0.0, 4.0, 0.0, 4.0),
@@ -135,7 +163,6 @@ class CardWidget extends StatelessWidget {
                 child: entity.entity.buildDefaultWidget(context)
             ),
           ));
-      }
     });
     return Card(
         child: Padding(
@@ -150,7 +177,7 @@ class CardWidget extends StatelessWidget {
       return Container(height: 0.0, width: 0.0,);
     }
     List<Widget> body = [];
-    body.add(CardHeaderWidget(name: card.name));
+    body.add(CardHeader(name: card.name));
     body.add(MarkdownBody(data: card.content));
     return Card(
         child: Padding(
@@ -162,12 +189,9 @@ class CardWidget extends StatelessWidget {
 
   Widget _buildAlarmPanelCard(BuildContext context) {
     List<Widget> body = [];
-    body.add(CardHeaderWidget(
+    body.add(CardHeader(
       name: card.name ?? "",
       subtitle: Text("${card.linkedEntityWrapper.entity.displayState}",
-        style: TextStyle(
-            color: Colors.grey
-        ),
       ),
       trailing: Row(
           mainAxisSize: MainAxisSize.min,
@@ -183,7 +207,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))
                 )
             )
           ]
@@ -214,18 +238,26 @@ class CardWidget extends StatelessWidget {
       return Container(height: 0.0, width: 0.0,);
     }
     List<Widget> rows = [];
-    rows.add(CardHeaderWidget(name: card.name));
+    rows.add(CardHeader(name: card.name));
 
-    List<Widget> result = [];
     int columnsCount = entitiesToShow.length >= card.columnsCount ? card.columnsCount : entitiesToShow.length;
 
+    rows.add(
+        Padding(
+          padding: EdgeInsets.only(bottom: Sizes.rowPadding, top: Sizes.rowPadding),
+          child: FractionallySizedBox(
+            widthFactor: 1,
+            child: LayoutBuilder(
+                builder: (BuildContext context, BoxConstraints constraints) {
+                  List<Widget> buttons = [];
+                  double buttonWidth = constraints.maxWidth / columnsCount;
                   entitiesToShow.forEach((EntityWrapper entity) {
-      result.add(
+                    buttons.add(
-          FractionallySizedBox(
+                        SizedBox(
-            widthFactor: 1/columnsCount,
+                          width: buttonWidth,
                           child: EntityModel(
                               entityWrapper: entity,
-                child: GlanceEntityContainer(
+                              child: GlanceCardEntityContainer(
                                 showName: card.showName,
                                 showState: card.showState,
                               ),
@@ -234,19 +266,23 @@ class CardWidget extends StatelessWidget {
                         )
                     );
                   });
-    rows.add(
+                  return Wrap(
-        Padding(
+                    //spacing: 5.0,
-          padding: EdgeInsets.fromLTRB(0.0, Sizes.rowPadding, 0.0, 2*Sizes.rowPadding),
+                    //alignment: WrapAlignment.spaceEvenly,
-          child: Wrap(
+                    runSpacing: Sizes.doubleRowPadding,
-            //alignment: WrapAlignment.spaceAround,
+                    children: buttons,
-            runSpacing: Sizes.rowPadding*2,
+                  );
-            children: result,
+                }
+            ),
           ),
         )
     );
 
     return Card(
-        child: new Column(mainAxisSize: MainAxisSize.min, children: rows)
+        child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: rows
+        )
     );
   }
 
@@ -261,12 +297,48 @@ class CardWidget extends StatelessWidget {
   }
 
   Widget _buildEntityButtonCard(BuildContext context) {
-    card.linkedEntityWrapper.displayName = card.name?.toUpperCase() ??
+    card.linkedEntityWrapper.overrideName = card.name?.toUpperCase() ??
         card.linkedEntityWrapper.displayName.toUpperCase();
     return Card(
         child: EntityModel(
             entityWrapper: card.linkedEntityWrapper,
-            child: ButtonEntityContainer(),
+            child: EntityButtonCardBody(
+              showName: card.showName,
+            ),
+            handleTap: true
+        )
+    );
+  }
+
+  Widget _buildGaugeCard(BuildContext context) {
+    card.linkedEntityWrapper.overrideName = card.name ??
+        card.linkedEntityWrapper.displayName;
+    card.linkedEntityWrapper.unitOfMeasurementOverride = card.unit ??
+        card.linkedEntityWrapper.unitOfMeasurement;
+    return Card(
+        child: EntityModel(
+            entityWrapper: card.linkedEntityWrapper,
+            child: GaugeCardBody(
+              min: card.min,
+              max: card.max,
+              severity: card.severity,
+            ),
+            handleTap: true
+        )
+    );
+  }
+
+  Widget _buildLightCard(BuildContext context) {
+    card.linkedEntityWrapper.overrideName = card.name ??
+        card.linkedEntityWrapper.displayName;
+    return Card(
+        child: EntityModel(
+            entityWrapper: card.linkedEntityWrapper,
+            child: LightCardBody(
+              min: card.min,
+              max: card.max,
+              severity: card.severity,
+            ),
             handleTap: true
         )
     );
@@ -274,7 +346,11 @@ class CardWidget extends StatelessWidget {
 
   Widget _buildUnsupportedCard(BuildContext context) {
     List<Widget> body = [];
-    body.add(CardHeaderWidget(name: card.name ?? ""));
+    body.add(
+      CardHeader(
+        name: card.name ?? ""
+      )
+    );
     List<Widget> result = [];
     if (card.linkedEntityWrapper != null) {
       result.addAll(<Widget>[

lib/cards/widgets/card_header.widget.dart

@@ -1,12 +1,12 @@
-part of '../main.dart';
+part of '../../main.dart';
 
-class CardHeaderWidget extends StatelessWidget {
+class CardHeader extends StatelessWidget {
 
   final String name;
   final Widget trailing;
   final Widget subtitle;
 
-  const CardHeaderWidget({Key key, this.name, this.trailing, this.subtitle}) : super(key: key);
+  const CardHeader({Key key, this.name, this.trailing, this.subtitle}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -18,7 +18,7 @@ class CardHeaderWidget extends StatelessWidget {
         title: Text("$name",
             textAlign: TextAlign.left,
             overflow: TextOverflow.ellipsis,
-            style: new TextStyle(fontWeight: FontWeight.bold, fontSize: Sizes.largeFontSize)),
+            style: Theme.of(context).textTheme.headline),
       );
     } else {
       result = new Container(width: 0.0, height: 0.0);

lib/cards/widgets/entity_button_card_body.widget.dart

@@ -0,0 +1,57 @@
+part of '../../main.dart';
+
+class EntityButtonCardBody extends StatelessWidget {
+
+  final bool showName;
+
+  EntityButtonCardBody({
+    Key key, this.showName: true,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
+    if (entityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
+      return MissedEntityWidget();
+    }
+    if (entityWrapper.entity.statelessType > StatelessEntityType.MISSED) {
+      return Container(width: 0.0, height: 0.0,);
+    }
+
+    return InkWell(
+      onTap: () => entityWrapper.handleTap(),
+      onLongPress: () => entityWrapper.handleHold(),
+      onDoubleTap: () => entityWrapper.handleDoubleTap(),
+      child: FractionallySizedBox(
+        widthFactor: 1,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          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()
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildName() {
+    if (showName) {
+      return EntityName(
+        padding: EdgeInsets.fromLTRB(Sizes.buttonPadding, 0.0, Sizes.buttonPadding, Sizes.rowPadding),
+        textOverflow: TextOverflow.ellipsis,
+        maxLines: 3,
+        wordsWrap: true,
+        textAlign: TextAlign.center
+      );
+    }
+    return Container(width: 0, height: 0);
+  }
+}

lib/cards/widgets/gauge_card_body.dart

@@ -0,0 +1,177 @@
+part of '../../main.dart';
+
+class GaugeCardBody extends StatelessWidget {
+
+  final int min;
+  final int max;
+  final Map severity;
+
+  GaugeCardBody({Key key, this.min, this.max, this.severity}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
+    double fixedValue;
+    double value = entityWrapper.entity.doubleState;
+    if (value > max) {
+      fixedValue = max.toDouble();
+    } else if (value < min) {
+      fixedValue = min.toDouble();
+    } else {
+      fixedValue = value;
+    }
+    
+    List<GaugeRange> ranges;
+    Color currentColor;
+    if (severity != null && severity["green"] is int && severity["red"] is int && severity["yellow"] is int) {
+      List<RangeContainer> rangesList = <RangeContainer>[
+        RangeContainer(severity["green"], HAClientTheme().getGreenGaugeColor()),
+        RangeContainer(severity["red"], HAClientTheme().getRedGaugeColor()),
+        RangeContainer(severity["yellow"], HAClientTheme().getYellowGaugeColor())
+      ];
+      rangesList.sort((current, next) {
+        if (current.startFrom > next.startFrom) {
+          return 1;
+        }
+        if (current.startFrom < next.startFrom) {
+          return -1;
+        }
+        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: rangesList[0].color.withOpacity(0.1),
+          sizeUnit: GaugeSizeUnit.factor,
+          endWidth: 0.3,
+          startWidth: 0.3
+        ),
+        GaugeRange(
+          startValue: rangesList[1].startFrom.toDouble(),
+          endValue: rangesList[2].startFrom.toDouble(),
+          color: rangesList[1].color.withOpacity(0.1),
+          sizeUnit: GaugeSizeUnit.factor,
+          endWidth: 0.3,
+          startWidth: 0.3
+        ),
+        GaugeRange(
+          startValue: rangesList[2].startFrom.toDouble(),
+          endValue: max.toDouble(),
+          color: rangesList[2].color.withOpacity(0.1),
+          sizeUnit: GaugeSizeUnit.factor,
+          endWidth: 0.3,
+          startWidth: 0.3
+        )
+      ];
+    }
+    if (ranges == null) {
+      currentColor = Theme.of(context).primaryColorDark;
+      ranges = <GaugeRange>[
+        GaugeRange(
+          startValue: min.toDouble(),
+          endValue: max.toDouble(),
+          color: Theme.of(context).primaryColorDark.withOpacity(0.1),
+          sizeUnit: GaugeSizeUnit.factor,
+          endWidth: 0.3,
+          startWidth: 0.3,
+        )
+      ];
+    }
+
+    return InkWell(
+      onTap: () => entityWrapper.handleTap(),
+      onLongPress: () => entityWrapper.handleHold(),
+      onDoubleTap: () => entityWrapper.handleDoubleTap(),
+      child: AspectRatio(
+        aspectRatio: 2,
+        child: LayoutBuilder(
+          builder: (BuildContext context, BoxConstraints constraints) {
+            double fontSizeFactor;
+            if (constraints.maxWidth > 300.0) {
+              fontSizeFactor = 1.6;
+            } else if (constraints.maxWidth > 150.0) {
+              fontSizeFactor = 1;
+            } else if (constraints.maxWidth > 100.0)  {
+              fontSizeFactor = 0.6;
+            } else {
+              fontSizeFactor = 0.4;
+            }
+            return SfRadialGauge(
+              axes: <RadialAxis>[
+                RadialAxis(
+                  maximum: max.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,
+                      positionFactor: 1.3,
+                      //verticalAlignment: GaugeAlignment.far,
+                      widget: EntityName(
+                        textStyle: Theme.of(context).textTheme.body1.copyWith(
+                          fontSize: Theme.of(context).textTheme.body1.fontSize * fontSizeFactor
+                        ),
+                      ),
+                    ),
+                    GaugeAnnotation(
+                      angle: 180,
+                      positionFactor: 0,
+                      verticalAlignment: GaugeAlignment.center,
+                      widget: SimpleEntityState(
+                        expanded: false,
+                        maxLines: 1,
+                        textAlign: TextAlign.center,
+                        textStyle: Theme.of(context).textTheme.title.copyWith(
+                          fontSize: Theme.of(context).textTheme.title.fontSize * fontSizeFactor,
+                        ),
+                      ),
+                    )
+                  ],
+                  startAngle: 180,
+                  endAngle: 0,
+                  pointers: <GaugePointer>[
+                    RangePointer(
+                      value: fixedValue,
+                      sizeUnit: GaugeSizeUnit.factor,
+                      width: 0.3,
+                      color: currentColor,
+                      enableAnimation: true,
+                      animationType: AnimationType.bounceOut,
+                    )
+                  ]
+                )
+              ],
+            );
+          },
+        ),
+      ),
+    );
+  }
+  
+}
+
+class RangeContainer {
+  final int startFrom;
+  Color color;
+
+  RangeContainer(this.startFrom, this.color);
+}

lib/cards/widgets/glance_card_entity_container.dart

@@ -1,21 +1,19 @@
-part of '../main.dart';
+part of '../../main.dart';
 
-class GlanceEntityContainer extends StatelessWidget {
+class GlanceCardEntityContainer extends StatelessWidget {
 
   final bool showName;
   final bool showState;
   final bool nameInTheBottom;
   final double iconSize;
-  final double nameFontSize;
   final bool wordsWrapInName;
 
-  GlanceEntityContainer({
+  GlanceCardEntityContainer({
     Key key,
     @required this.showName,
     @required this.showState,
     this.nameInTheBottom: false,
     this.iconSize: Sizes.iconSize,
-    this.nameFontSize: Sizes.smallFontSize,
     this.wordsWrapInName: false
   }) : super(key: key);
 
@@ -31,7 +29,7 @@ class GlanceEntityContainer extends StatelessWidget {
     List<Widget> result = [];
     if (!nameInTheBottom) {
       if (showName) {
-        result.add(_buildName());
+        result.add(_buildName(context));
       }
     } else {
       if (showState) {
@@ -49,33 +47,29 @@ class GlanceEntityContainer extends StatelessWidget {
         result.add(_buildState());
       }
     } else {
-      result.add(_buildName());
+      result.add(_buildName(context));
     }
 
     return Center(
       child: InkResponse(
-        child: ConstrainedBox(
-          constraints: BoxConstraints(minWidth: Sizes.iconSize * 2),
         child: Column(
           mainAxisSize: MainAxisSize.min,
-            //mainAxisAlignment: MainAxisAlignment.start,
-            //crossAxisAlignment: CrossAxisAlignment.center,
           children: result,
         ),
-        ),
         onTap: () => entityWrapper.handleTap(),
         onLongPress: () => entityWrapper.handleHold(),
+        onDoubleTap: () => entityWrapper.handleDoubleTap(),
       ),
     );
   }
 
-  Widget _buildName() {
+  Widget _buildName(BuildContext context) {
     return EntityName(
       padding: EdgeInsets.only(bottom: Sizes.rowPadding),
       textOverflow: TextOverflow.ellipsis,
       wordsWrap: wordsWrapInName,
       textAlign: TextAlign.center,
-      fontSize: nameFontSize,
+      textStyle: Theme.of(context).textTheme.body1,
     );
   }
 

lib/cards/widgets/light_card_body.dart

@@ -0,0 +1,38 @@
+part of '../../main.dart';
+
+class LightCardBody extends StatefulWidget {
+
+  final int min;
+  final int max;
+  final Map severity;
+
+  LightCardBody({Key key, this.min, this.max, this.severity}) : super(key: key);
+
+  @override
+  _LightCardBodyState createState() => _LightCardBodyState();
+}
+
+class _LightCardBodyState extends State<LightCardBody> {
+
+  @override
+  Widget build(BuildContext context) {
+    EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
+    LightEntity entity = entityWrapper.entity;
+    Logger.d("Light brightness: ${entity.brightness}");
+
+    return FractionallySizedBox(
+      widthFactor: 0.5,
+      child: Container(
+        //color: Colors.redAccent,
+        child: SingleCircularSlider(
+            255,
+            entity.brightness ?? 0,
+          baseColor: Colors.white,
+          handlerColor: Colors.blue[200],
+          selectionColor: Colors.blue[100],
+        ),
+      ),
+    );
+
+  }
+}

lib/const.dart

@@ -29,6 +29,11 @@ class EntityState {
   static const ok = 'ok';
   static const problem = 'problem';
   static const active = 'active';
+  static const cleaning = 'cleaning';
+  static const docked = 'docked';
+  static const returning = 'returning';
+  static const error = 'error';
+
 }
 
 class EntityUIAction {
@@ -46,6 +51,10 @@ class EntityUIAction {
   String holdNavigationPath;
   String holdService;
   Map<String, dynamic> holdServiceData;
+  String doubleTapAction = EntityUIAction.none;
+  String doubleTapNavigationPath;
+  String doubleTapService;
+  Map<String, dynamic> doubleTapServiceData;
 
   EntityUIAction({rawEntityData}) {
     if (rawEntityData != null) {
@@ -71,29 +80,62 @@ class EntityUIAction {
           holdServiceData = rawEntityData["hold_action"]["service_data"];
         }
       }
+      if (rawEntityData["double_tap_action"] != null) {
+        if (rawEntityData["double_tap_action"] is String) {
+          doubleTapAction = rawEntityData["double_tap_action"];
+        } else {
+          doubleTapAction =
+              rawEntityData["double_tap_action"]["action"] ?? EntityUIAction.none;
+          doubleTapNavigationPath = rawEntityData["double_tap_action"]["navigation_path"];
+          doubleTapService = rawEntityData["double_tap_action"]["service"];
+          doubleTapServiceData = rawEntityData["double_tap_action"]["service_data"];
+        }
+      }
     }
   }
 
 }
 
 class CardType {
-  static const horizontalStack = "horizontal-stack";
+  static const HORIZONTAL_STACK = "horizontal-stack";
-  static const verticalStack = "vertical-stack";
+  static const VERTICAL_STACK = "vertical-stack";
-  static const entities = "entities";
+  static const ENTITIES = "entities";
-  static const glance = "glance";
+  static const GLANCE = "glance";
-  static const mediaControl = "media-control";
+  static const MEDIA_CONTROL = "media-control";
-  static const weatherForecast = "weather-forecast";
+  static const WEATHER_FORECAST = "weather-forecast";
-  static const thermostat = "thermostat";
+  static const THERMOSTAT = "thermostat";
-  static const sensor = "sensor";
+  static const SENSOR = "sensor";
-  static const plantStatus = "plant-status";
+  static const PLANT_STATUS = "plant-status";
-  static const pictureEntity = "picture-entity";
+  static const PICTURE_ENTITY = "picture-entity";
-  static const pictureElements = "picture-elements";
+  static const PICTURE_ELEMENTS = "picture-elements";
-  static const picture = "picture";
+  static const PICTURE = "picture";
-  static const map = "map";
+  static const MAP = "map";
-  static const iframe = "iframe";
+  static const IFRAME = "iframe";
-  static const gauge = "gauge";
+  static const GAUGE = "gauge";
-  static const entityButton = "entity-button";
+  static const ENTITY_BUTTON = "entity-button";
-  static const conditional = "conditional";
+  static const BUTTON = "button";
-  static const alarmPanel = "alarm-panel";
+  static const CONDITIONAL = "conditional";
-  static const markdown = "markdown";
+  static const ALARM_PANEL = "alarm-panel";
+  static const MARKDOWN = "markdown";
+  static const LIGHT = "light";
+}
+
+class Sizes {
+  static const rightWidgetPadding = 10.0;
+  static const leftWidgetPadding = 10.0;
+  static const buttonPadding = 4.0;
+  static const extendedWidgetHeight = 50.0;
+  static const iconSize = 28.0;
+  static const largeIconSize = 46.0;
+  //static const stateFontSize = 15.0;
+  //static const nameFontSize = 15.0;
+  //static const smallFontSize = 14.0;
+  //static const largeFontSize = 24.0;
+  static const inputWidth = 160.0;
+  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;
 }

lib/entities/alarm_control_panel/widgets/alarm_control_panel_controls.widget.dart

@@ -25,9 +25,12 @@ class _AlarmControlPanelControlsWidgetWidgetState extends State<AlarmControlPane
 
 
   void _callService(AlarmControlPanelEntity entity, String service) {
-    eventBus.fire(new ServiceCallEvent(
+    ConnectionManager().callService(
-          entity.domain, service, entity.entityId,
+      domain: entity.domain,
-          {"code": "$code"}));
+      service: service,
+      entityId: entity.entityId,
+      data: {"code": "$code"}
+    );
     setState(() {
       code = "";
     });
@@ -58,7 +61,11 @@ class _AlarmControlPanelControlsWidgetWidgetState extends State<AlarmControlPane
             FlatButton(
               child: new Text("Yes"),
               onPressed: () {
-                eventBus.fire(new ServiceCallEvent(entity.domain, "alarm_trigger", entity.entityId, null));
+                ConnectionManager().callService(
+                  domain: entity.domain,
+                  service: "alarm_trigger",
+                  entityId: entity.entityId
+                );
                 Navigator.of(context).pop();
               },
             ),
@@ -241,7 +248,9 @@ class _AlarmControlPanelControlsWidgetWidgetState extends State<AlarmControlPane
         FlatButton(
           child: Text(
             "TRIGGER",
-            style: TextStyle(color: Colors.redAccent)
+            style: Theme.of(context).textTheme.subhead.copyWith(
+              color: Theme.of(context).errorColor
+            )
           ),
           onPressed: () => _askToTrigger(entity),
         )

lib/entities/badge.widget.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../main.dart';
 
 class BadgeWidget extends StatelessWidget {
   @override
@@ -7,8 +7,7 @@ class BadgeWidget extends StatelessWidget {
     double iconSize = 26.0;
     Widget badgeIcon;
     String onBadgeTextValue;
-    Color iconColor = EntityColor.badgeColors[entityModel.entityWrapper.entity.domain] ??
+    Color iconColor = HAClientTheme().getBadgeColor(entityModel.entityWrapper.entity.domain);
-        EntityColor.badgeColors["default"];
     switch (entityModel.entityWrapper.entity.domain) {
       case "sun":
         {
@@ -30,7 +29,7 @@ class BadgeWidget extends StatelessWidget {
           badgeIcon = EntityIcon(
             padding: EdgeInsets.all(0.0),
             size: iconSize,
-            color: Colors.black
+            color: Theme.of(context).textTheme.body1.color
           );
           break;
         }
@@ -40,7 +39,7 @@ class BadgeWidget extends StatelessWidget {
           badgeIcon = EntityIcon(
               padding: EdgeInsets.all(0.0),
               size: iconSize,
-              color: Colors.black
+              color: Theme.of(context).textTheme.body1.color
           );
           onBadgeTextValue = entityModel.entityWrapper.entity.displayState;
           break;
@@ -57,14 +56,16 @@ class BadgeWidget extends StatelessWidget {
           } else if (entityModel.entityWrapper.entity.displayState.length <= 10) {
             stateFontSize = 8.0;
           }
-          onBadgeTextValue = entityModel.entityWrapper.entity.unitOfMeasurement;
+          onBadgeTextValue = entityModel.entityWrapper.unitOfMeasurement;
           badgeIcon = Center(
             child: Text(
               "${entityModel.entityWrapper.entity.displayState}",
               overflow: TextOverflow.fade,
               softWrap: false,
               textAlign: TextAlign.center,
-              style: TextStyle(fontSize: stateFontSize),
+              style: Theme.of(context).textTheme.body1.copyWith(
+                fontSize: stateFontSize
+              )
             ),
           );
           break;
@@ -77,7 +78,9 @@ class BadgeWidget extends StatelessWidget {
       onBadgeText = Container(
           padding: EdgeInsets.fromLTRB(6.0, 2.0, 6.0, 2.0),
           child: Text("$onBadgeTextValue",
-              style: TextStyle(fontSize: 12.0, color: Colors.white),
+              style: Theme.of(context).textTheme.overline.copyWith(
+                color: HAClientTheme().getOnBadgeTextColor()
+              ),
               textAlign: TextAlign.center,
               softWrap: false,
               overflow: TextOverflow.fade),
@@ -98,7 +101,7 @@ class BadgeWidget extends StatelessWidget {
               decoration: new BoxDecoration(
                 // Circle shape
                 shape: BoxShape.circle,
-                color: Colors.white,
+                color: Theme.of(context).cardColor,
                 // The border you want
                 border: new Border.all(
                   width: 2.0,
@@ -131,7 +134,7 @@ class BadgeWidget extends StatelessWidget {
               child: Text(
                 "${entityModel.entityWrapper.displayName}",
                 textAlign: TextAlign.center,
-                style: TextStyle(fontSize: 12.0),
+                style: Theme.of(context).textTheme.caption,
                 softWrap: true,
                 maxLines: 3,
                 overflow: TextOverflow.ellipsis,
@@ -140,6 +143,6 @@ class BadgeWidget extends StatelessWidget {
           ],
         ),
         onTap: () =>
-            eventBus.fire(new ShowEntityPageEvent(entityModel.entityWrapper.entity)));
+            eventBus.fire(new ShowEntityPageEvent(entity: entityModel.entityWrapper.entity)));
   }
 }

lib/entities/camera/camera_entity.class.dart

@@ -3,12 +3,16 @@ part of '../../main.dart';
 class CameraEntity extends Entity {
 
   static const SUPPORT_ON_OFF = 1;
+  static const SUPPORT_STREAM = 2;
 
   CameraEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   bool get supportOnOff => ((supportedFeatures &
   CameraEntity.SUPPORT_ON_OFF) ==
       CameraEntity.SUPPORT_ON_OFF);
+  bool get supportStream => ((supportedFeatures &
+  CameraEntity.SUPPORT_STREAM) ==
+      CameraEntity.SUPPORT_STREAM);
 
   @override
   Widget _buildAdditionalControlsForPage(BuildContext context) {

lib/entities/camera/widgets/camera_stream_view.dart

@@ -0,0 +1,191 @@
+part of '../../../main.dart';
+
+class CameraStreamView extends StatefulWidget {
+
+  final bool withControls;
+
+  CameraStreamView({Key key, this.withControls: true}) : super(key: key);
+
+  @override
+  _CameraStreamViewState createState() => _CameraStreamViewState();
+}
+
+class _CameraStreamViewState extends State<CameraStreamView> {
+
+  CameraEntity _entity;
+  String _streamUrl = "";
+  bool _isLoaded = false;
+  double _aspectRatio = 1.33;
+  String _webViewHtml;
+  String _jsMessageChannelName = 'unknown';
+  Completer _loading;
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  Future _loadResources() {
+    if (_loading != null && !_loading.isCompleted) {
+      Logger.d("[Camera Player] Resources loading is not finished yet");
+      return _loading.future;  
+    }
+    Logger.d("[Camera Player] Loading resources");
+    _loading = Completer();
+    _entity = EntityModel
+          .of(context)
+          .entityWrapper
+          .entity;
+    if (_entity.supportStream) {
+      HomeAssistant().getCameraStream(_entity.entityId)
+        .then((data) {
+          _jsMessageChannelName = 'HA_${_entity.entityId.replaceAll('.', '_')}';
+            rootBundle.loadString('assets/html/cameraLiveView.html').then((file) {
+              _webViewHtml = Uri.dataFromString(
+                  file.replaceFirst('{{stream_url}}', '${ConnectionManager().httpWebHost}${data["url"]}').replaceFirst('{{message_channel}}', _jsMessageChannelName),
+                  mimeType: 'text/html',
+                  encoding: Encoding.getByName('utf-8')
+              ).toString();
+              _loading.complete();
+            });
+        })
+        .catchError((e) {
+          if (e == 'start_stream_failed') {
+            Logger.e("[Camera Player] Home Assistant failed starting stream. Forcing MJPEG: $e");
+            _loadMJPEG().then((_) {
+              _loading.complete();
+            });
+          } else {
+            _loading.completeError(e);
+            Logger.e("[Camera Player] Error loading stream: $e");
+          }
+        });
+    } else {
+      _loadMJPEG().then((_) {
+        _loading.complete();
+      });
+    }
+    return _loading.future;
+  }
+
+  Future _loadMJPEG() async {
+    _streamUrl = '${ConnectionManager().httpWebHost}/api/camera_proxy_stream/${_entity
+        .entityId}?token=${_entity.attributes['access_token']}';
+    _jsMessageChannelName = 'HA_${_entity.entityId.replaceAll('.', '_')}';
+    var file = await rootBundle.loadString('assets/html/cameraView.html');
+    _webViewHtml = Uri.dataFromString(
+        file.replaceFirst('{{stream_url}}', _streamUrl).replaceFirst('{{message_channel}}', _jsMessageChannelName),
+        mimeType: 'text/html',
+        encoding: Encoding.getByName('utf-8')
+    ).toString();
+  }
+
+  Widget _buildScreen() {
+    Widget screenWidget;
+    if (!_isLoaded) {
+      screenWidget = Center(
+        child: EntityPicture(
+          fit: BoxFit.contain,
+        )
+      );
+    } else {
+      screenWidget = WebView(
+        initialUrl: _webViewHtml,
+        initialMediaPlaybackPolicy: AutoMediaPlaybackPolicy.always_allow,
+        debuggingEnabled: Logger.isInDebugMode,
+        gestureNavigationEnabled: false,
+        javascriptMode: JavascriptMode.unrestricted,
+        javascriptChannels: {
+          JavascriptChannel(
+            name: _jsMessageChannelName,
+            onMessageReceived: ((message) {
+              Logger.d('[Camera Player] Message from page: $message');
+              setState((){
+                _aspectRatio = double.tryParse(message.message) ?? 1.33;
+              });
+            })
+          )
+        }
+      );
+    }
+    return AspectRatio(
+      aspectRatio: _aspectRatio,
+      child: screenWidget
+    );
+  }
+
+  Widget _buildControls() {
+      return Row(
+        mainAxisSize: MainAxisSize.max,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: <Widget>[
+          IconButton(
+            icon: Icon(Icons.refresh),
+            iconSize: 40,
+            color: Theme.of(context).accentColor,
+            onPressed: _isLoaded ? () {
+              setState(() {
+                _isLoaded = false;  
+              });
+            } : null,
+          ),
+          Expanded(
+            child: Container(),
+          ),
+          IconButton(
+            icon: Icon(Icons.fullscreen),
+            iconSize: 40,
+            color: Theme.of(context).accentColor,
+            onPressed: _isLoaded ? () {
+              eventBus.fire(ShowEntityPageEvent());
+              Navigator.of(context).push(
+                MaterialPageRoute(
+                  builder: (conext) => FullScreenPage(
+                    child: EntityModel(
+                      child: CameraStreamView(
+                        withControls: false
+                      ),
+                      handleTap: false,
+                      entityWrapper: EntityWrapper(
+                        entity: _entity
+                      ),
+                    ),
+                  ),
+                  fullscreenDialog: true
+                )
+              ).then((_) {
+                eventBus.fire(ShowEntityPageEvent(entity: _entity));
+              });
+            } : null,
+          )
+        ],
+      );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (!_isLoaded && (_loading == null || _loading.isCompleted)) {
+      _loadResources().then((_) => setState((){ _isLoaded = true; }));
+    }
+    if (widget.withControls) {
+      return Card(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: <Widget>[
+            _buildScreen(),
+            _buildControls()
+          ],
+        ),
+      );
+    } else {
+      return _buildScreen();
+    }
+    
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+}

lib/entities/climate/widgets/climate_controls.dart

@@ -10,9 +10,8 @@ class ClimateControlWidget extends StatefulWidget {
 
 class _ClimateControlWidgetState extends State<ClimateControlWidget> {
 
-  bool _showPending = false;
+  bool _temperaturePending = false;
   bool _changedHere = false;
-  Timer _resetTimer;
   Timer _tempThrottleTimer;
   Timer _targetTempThrottleTimer;
   double _tmpTemperature = 0.0;
@@ -27,9 +26,11 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   bool _tmpAuxHeat = false;
 
   void _resetVars(ClimateEntity entity) {
+    if (!_temperaturePending) {
       _tmpTemperature = entity.temperature;
       _tmpTargetHigh = entity.targetHigh;
       _tmpTargetLow = entity.targetLow;
+    }
     _tmpHVACMode = entity.state;
     _tmpFanMode = entity.fanMode;
     _tmpSwingMode = entity.swingMode;
@@ -38,7 +39,6 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     _tmpAuxHeat = entity.auxHeat;
     _tmpTargetHumidity = entity.targetHumidity;
 
-    _showPending = false;
     _changedHere = false;
   }
 
@@ -73,36 +73,44 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   }
 
   void _setTemperature(ClimateEntity entity) {
-    if (_tempThrottleTimer!=null) {
+    _tempThrottleTimer?.cancel();
-      _tempThrottleTimer.cancel();
-    }
     setState(() {
       _changedHere = true;
+      _temperaturePending = true;
       _tmpTemperature = double.parse(_tmpTemperature.toStringAsFixed(1));
     });
     _tempThrottleTimer = Timer(Duration(seconds: 2), () {
       setState(() {
         _changedHere = true;
-        eventBus.fire(new ServiceCallEvent(entity.domain, "set_temperature", entity.entityId,{"temperature": "${_tmpTemperature.toStringAsFixed(1)}"}));
+        _temperaturePending = false;
-        _resetStateTimer(entity);
+        ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_temperature",
+          entityId: entity.entityId,
+          data: {"temperature": "${_tmpTemperature.toStringAsFixed(1)}"}
+        );
       });
     });
   }
 
   void _setTargetTemp(ClimateEntity entity) {
-    if (_targetTempThrottleTimer!=null) {
+    _targetTempThrottleTimer?.cancel();
-      _targetTempThrottleTimer.cancel();
-    }
     setState(() {
       _changedHere = true;
+      _temperaturePending = true;
       _tmpTargetLow = double.parse(_tmpTargetLow.toStringAsFixed(1));
       _tmpTargetHigh = double.parse(_tmpTargetHigh.toStringAsFixed(1));
     });
     _targetTempThrottleTimer = Timer(Duration(seconds: 2), () {
       setState(() {
         _changedHere = true;
-        eventBus.fire(new ServiceCallEvent(entity.domain, "set_temperature", entity.entityId,{"target_temp_high": "${_tmpTargetHigh.toStringAsFixed(1)}", "target_temp_low": "${_tmpTargetLow.toStringAsFixed(1)}"}));
+        _temperaturePending = false;
-        _resetStateTimer(entity);
+        ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_temperature",
+          entityId: entity.entityId,
+          data: {"target_temp_high": "${_tmpTargetHigh.toStringAsFixed(1)}", "target_temp_low": "${_tmpTargetLow.toStringAsFixed(1)}"}
+        );
       });
     });
   }
@@ -111,8 +119,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpTargetHumidity = value.roundToDouble();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_humidity", entity.entityId,{"humidity": "$_tmpTargetHumidity"}));
+      ConnectionManager().callService(
-      _resetStateTimer(entity);
+          domain: entity.domain,
+          service: "set_humidity",
+          entityId: entity.entityId,
+          data: {"humidity": "$_tmpTargetHumidity"}
+        );
     });
   }
 
@@ -120,8 +132,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpHVACMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_hvac_mode", entity.entityId,{"hvac_mode": "$_tmpHVACMode"}));
+      ConnectionManager().callService(
-      _resetStateTimer(entity);
+          domain: entity.domain,
+          service: "set_hvac_mode",
+          entityId: entity.entityId,
+          data: {"hvac_mode": "$_tmpHVACMode"}
+        );
     });
   }
 
@@ -129,8 +145,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpSwingMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_swing_mode", entity.entityId,{"swing_mode": "$_tmpSwingMode"}));
+      ConnectionManager().callService(
-      _resetStateTimer(entity);
+          domain: entity.domain,
+          service: "set_swing_mode",
+          entityId: entity.entityId,
+          data: {"swing_mode": "$_tmpSwingMode"}
+        );
     });
   }
 
@@ -138,8 +158,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpFanMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_fan_mode", entity.entityId,{"fan_mode": "$_tmpFanMode"}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_fan_mode", entityId: entity.entityId, data: {"fan_mode": "$_tmpFanMode"});
-      _resetStateTimer(entity);
     });
   }
 
@@ -147,8 +166,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpPresetMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_preset_mode", entity.entityId,{"preset_mode": "$_tmpPresetMode"}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_preset_mode", entityId: entity.entityId, data: {"preset_mode": "$_tmpPresetMode"});
-      _resetStateTimer(entity);
     });
   }
 
@@ -165,18 +183,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpAuxHeat = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_aux_heat", entity.entityId, {"aux_heat": "$_tmpAuxHeat"}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_aux_heat", entityId: entity.entityId, data: {"aux_heat": "$_tmpAuxHeat"});
-      _resetStateTimer(entity);
-    });
-  }
-
-  void _resetStateTimer(ClimateEntity entity) {
-    if (_resetTimer!=null) {
-      _resetTimer.cancel();
-    }
-    _resetTimer = Timer(Duration(seconds: 3), () {
-      setState(() {});
-      _resetVars(entity);
     });
   }
 
@@ -184,11 +191,11 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   Widget build(BuildContext context) {
     final entityModel = EntityModel.of(context);
     final ClimateEntity entity = entityModel.entityWrapper.entity;
+    Logger.d("[Climate widget build] changed here = $_changedHere");
     if (_changedHere) {
-      _showPending = (_tmpTemperature != entity.temperature || _tmpTargetHigh != entity.targetHigh || _tmpTargetLow != entity.targetLow);
+      //_showPending = (_tmpTemperature != entity.temperature || _tmpTargetHigh != entity.targetHigh || _tmpTargetLow != entity.targetLow);
       _changedHere = false;
     } else {
-      _resetTimer?.cancel();
       _resetVars(entity);
     }
     return Padding(
@@ -197,20 +204,20 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           //_buildOnOffControl(entity),
-          _buildTemperatureControls(entity),
+          _buildTemperatureControls(entity, context),
-          _buildTargetTemperatureControls(entity),
+          _buildTargetTemperatureControls(entity, context),
-          _buildHumidityControls(entity),
+          _buildHumidityControls(entity, context),
-          _buildOperationControl(entity),
+          _buildOperationControl(entity, context),
-          _buildFanControl(entity),
+          _buildFanControl(entity, context),
-          _buildSwingControl(entity),
+          _buildSwingControl(entity, context),
-          _buildPresetModeControl(entity),
+          _buildPresetModeControl(entity, context),
-          _buildAuxHeatControl(entity)
+          _buildAuxHeatControl(entity, context)
         ],
       ),
     );
   }
 
-  Widget _buildPresetModeControl(ClimateEntity entity) {
+  Widget _buildPresetModeControl(ClimateEntity entity, BuildContext context) {
     if (entity.supportPresetMode) {
       return ModeSelectorWidget(
         options: entity.presetModes,
@@ -235,7 +242,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }*/
 
-  Widget _buildAuxHeatControl(ClimateEntity entity) {
+  Widget _buildAuxHeatControl(ClimateEntity entity, BuildContext context) {
     if (entity.supportAuxHeat ) {
       return ModeSwitchWidget(
           caption: "Aux heat",
@@ -247,7 +254,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildOperationControl(ClimateEntity entity) {
+  Widget _buildOperationControl(ClimateEntity entity, BuildContext context) {
     if (entity.hvacModes != null) {
       return ModeSelectorWidget(
         onChange: (mode) => _setHVACMode(entity, mode),
@@ -260,7 +267,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildFanControl(ClimateEntity entity) {
+  Widget _buildFanControl(ClimateEntity entity, BuildContext context) {
     if (entity.supportFanMode) {
       return ModeSelectorWidget(
         options: entity.fanModes,
@@ -273,7 +280,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildSwingControl(ClimateEntity entity) {
+  Widget _buildSwingControl(ClimateEntity entity, BuildContext context) {
     if (entity.supportSwingMode) {
       return ModeSelectorWidget(
           onChange: (mode) => _setSwingMode(entity, mode),
@@ -286,17 +293,15 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildTemperatureControls(ClimateEntity entity) {
+  Widget _buildTemperatureControls(ClimateEntity entity, BuildContext context) {
     if ((entity.supportTargetTemperature) && (entity.temperature != null)) {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
-          Text("Target temperature", style: TextStyle(
+          Text("Target temperature", style: Theme.of(context).textTheme.body1),
-              fontSize: Sizes.stateFontSize
-          )),
           TemperatureControlWidget(
             value: _tmpTemperature,
-            fontColor: _showPending ? Colors.red : Colors.black,
+            active: _temperaturePending,
             onDec: () => _temperatureDown(entity),
             onInc: () => _temperatureUp(entity),
           )
@@ -307,13 +312,13 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildTargetTemperatureControls(ClimateEntity entity) {
+  Widget _buildTargetTemperatureControls(ClimateEntity entity, BuildContext context) {
     List<Widget> controls = [];
     if ((entity.supportTargetTemperatureRange) && (entity.targetLow != null)) {
       controls.addAll(<Widget>[
         TemperatureControlWidget(
           value: _tmpTargetLow,
-          fontColor: _showPending ? Colors.red : Colors.black,
+          active: _temperaturePending,
           onDec: () => _targetLowDown(entity),
           onInc: () => _targetLowUp(entity),
         ),
@@ -326,7 +331,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
       controls.add(
           TemperatureControlWidget(
             value: _tmpTargetHigh,
-            fontColor: _showPending ? Colors.red : Colors.black,
+            active: _temperaturePending,
             onDec: () => _targetHighDown(entity),
             onInc: () => _targetHighUp(entity),
           )
@@ -336,9 +341,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
-          Text("Target temperature range", style: TextStyle(
+          Text("Target temperature range", style: Theme.of(context).textTheme.body1),
-              fontSize: Sizes.stateFontSize
-          )),
           Row(
             children: controls,
           )
@@ -349,13 +352,13 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildHumidityControls(ClimateEntity entity) {
+  Widget _buildHumidityControls(ClimateEntity entity, BuildContext context) {
     List<Widget> result = [];
     if (entity.supportTargetHumidity) {
       result.addAll(<Widget>[
         Text(
           "$_tmpTargetHumidity%",
-          style: TextStyle(fontSize: Sizes.largeFontSize),
+          style: Theme.of(context).textTheme.display1,
         ),
         Expanded(
           child: Slider(
@@ -380,9 +383,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
           Padding(
             padding: EdgeInsets.fromLTRB(
                 0.0, Sizes.rowPadding, 0.0, Sizes.rowPadding),
-            child: Text("Target humidity", style: TextStyle(
+            child: Text("Target humidity", style: Theme.of(context).textTheme.body1),
-                fontSize: Sizes.stateFontSize
-            )),
           ),
           Row(
             crossAxisAlignment: CrossAxisAlignment.center,
@@ -404,7 +405,6 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
 
   @override
   void dispose() {
-    _resetTimer?.cancel();
     super.dispose();
   }
 

lib/entities/climate/widgets/climate_state.widget.dart

@@ -33,23 +33,16 @@ class ClimateStateWidget extends StatelessWidget {
               children: <Widget>[
                 Text("$displayState",
                     textAlign: TextAlign.right,
-                    style: new TextStyle(
+                    style: Theme.of(context).textTheme.body2),
-                      fontWeight: FontWeight.bold,
-                      fontSize: Sizes.stateFontSize,
-                    )),
                 Text(" $targetTemp",
                     textAlign: TextAlign.right,
-                    style: new TextStyle(
+                    style: Theme.of(context).textTheme.body1)
-                      fontSize: Sizes.stateFontSize,
-                    ))
               ],
             ),
             entity.currentTemperature != null ?
             Text("Currently: ${entity.currentTemperature}",
                 textAlign: TextAlign.right,
-                style: new TextStyle(
+                style: Theme.of(context).textTheme.subtitle
-                    fontSize: Sizes.stateFontSize,
-                    color: Colors.black45)
             ) :
             Container(height: 0.0,)
           ],

lib/entities/climate/widgets/mode_selector.dart

@@ -1,12 +1,10 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class ModeSelectorWidget extends StatelessWidget {
 
   final String caption;
-  final List<String> options;
+  final List options;
   final String value;
-  final double captionFontSize;
-  final double valueFontSize;
   final onChange;
   final EdgeInsets padding;
 
@@ -16,8 +14,6 @@ class ModeSelectorWidget extends StatelessWidget {
     @required this.options,
     this.value,
     @required this.onChange,
-    this.captionFontSize,
-    this.valueFontSize,
     this.padding: const EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, Sizes.rowPadding, Sizes.rightWidgetPadding, 0.0),
   }) : super(key: key);
 
@@ -28,9 +24,7 @@ class ModeSelectorWidget extends StatelessWidget {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
-          Text("$caption", style: TextStyle(
+          Text("$caption", style: Theme.of(context).textTheme.body1),
-              fontSize: captionFontSize ?? Sizes.stateFontSize
-          )),
           Row(
             children: <Widget>[
               Expanded(
@@ -40,15 +34,12 @@ class ModeSelectorWidget extends StatelessWidget {
                     value: value,
                     iconSize: 30.0,
                     isExpanded: true,
-                    style: TextStyle(
+                    style: Theme.of(context).textTheme.title,
-                      fontSize: valueFontSize ?? Sizes.largeFontSize,
-                      color: Colors.black,
-                    ),
                     hint: Text("Select ${caption.toLowerCase()}"),
-                    items: options.map((String value) {
+                    items: options.map((value) {
                       return new DropdownMenuItem<String>(
-                        value: value,
+                        value: '$value',
-                        child: Text(value),
+                        child: Text('$value'),
                       );
                     }).toList(),
                     onChanged: (mode) => onChange(mode),

lib/entities/climate/widgets/mode_swicth.dart

@@ -1,10 +1,9 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class ModeSwitchWidget extends StatelessWidget {
 
   final String caption;
   final onChange;
-  final double captionFontSize;
   final bool value;
   final bool expanded;
   final EdgeInsets padding;
@@ -13,7 +12,6 @@ class ModeSwitchWidget extends StatelessWidget {
     Key key,
     @required this.caption,
     @required this.onChange,
-    this.captionFontSize,
     this.value,
     this.expanded: true,
     this.padding: const EdgeInsets.only(left: Sizes.leftWidgetPadding, right: Sizes.rightWidgetPadding)
@@ -25,7 +23,7 @@ class ModeSwitchWidget extends StatelessWidget {
       padding: this.padding,
       child: Row(
         children: <Widget>[
-          _buildCaption(),
+          _buildCaption(context),
           Switch(
             onChanged: (value) => onChange(value),
             value: value ?? false,
@@ -35,12 +33,10 @@ class ModeSwitchWidget extends StatelessWidget {
     );
   }
 
-  Widget _buildCaption() {
+  Widget _buildCaption(BuildContext context) {
     Widget captionWidget = Text(
       "$caption",
-      style: TextStyle(
+      style: Theme.of(context).textTheme.body1,
-          fontSize: captionFontSize ?? Sizes.stateFontSize
-      ),
     );
     if (expanded) {
       return Expanded(

lib/entities/climate/widgets/temperature_control_widget.dart

@@ -2,8 +2,7 @@ part of '../../../main.dart';
 
 class TemperatureControlWidget extends StatelessWidget {
   final double value;
-  final double fontSize;
+  final bool active;
-  final Color fontColor;
   final onInc;
   final onDec;
 
@@ -12,8 +11,9 @@ class TemperatureControlWidget extends StatelessWidget {
         @required this.value,
         @required this.onInc,
         @required this.onDec,
-        this.fontSize,
+        //this.fontSize,
-        this.fontColor})
+        this.active: false
+      })
       : super(key: key);
 
   @override
@@ -23,10 +23,7 @@ class TemperatureControlWidget extends StatelessWidget {
       children: <Widget>[
         Text(
           "$value",
-          style: TextStyle(
+          style: active ? Theme.of(context).textTheme.display2 : Theme.of(context).textTheme.display1,
-              fontSize: fontSize ?? 24.0,
-              color: fontColor ?? Colors.black
-          ),
         ),
         Column(
           children: <Widget>[

lib/entities/cover/widgets/cover_controls.widget.dart

@@ -18,7 +18,7 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
     setState(() {
       _tmpPosition = position.roundToDouble();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_cover_position", entity.entityId,{"position": _tmpPosition.round()}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_cover_position", entityId: entity.entityId, data: {"position": _tmpPosition.round()});
     });
   }
 
@@ -26,7 +26,7 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
     setState(() {
       _tmpTiltPosition = position.roundToDouble();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_cover_tilt_position", entity.entityId,{"tilt_position": _tmpTiltPosition.round()}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_cover_tilt_position", entityId: entity.entityId, data: {"tilt_position": _tmpTiltPosition.round()});
     });
   }
 
@@ -64,9 +64,7 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
           Padding(
             padding: EdgeInsets.fromLTRB(
                 0.0, Sizes.rowPadding, 0.0, Sizes.rowPadding),
-            child: Text("Position", style: TextStyle(
+            child: Text("Position"),
-                fontSize: Sizes.stateFontSize
-            )),
           ),
           Slider(
             value: _tmpPosition,
@@ -118,9 +116,7 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
       controls.insert(0, Padding(
         padding: EdgeInsets.fromLTRB(
             0.0, Sizes.rowPadding, 0.0, Sizes.rowPadding),
-        child: Text("Tilt position", style: TextStyle(
+        child: Text("Tilt position"),
-            fontSize: Sizes.stateFontSize
-        )),
       ));
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -135,18 +131,18 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
 
 class CoverTiltControlsWidget extends StatelessWidget {
   void _open(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
+    ConnectionManager().callService(
-        entity.domain, "open_cover_tilt", entity.entityId, null));
+        domain: entity.domain, service: "open_cover_tilt", entityId: entity.entityId);
   }
 
   void _close(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
+    ConnectionManager().callService(
-        entity.domain, "close_cover_tilt", entity.entityId, null));
+        domain: entity.domain, service: "close_cover_tilt", entityId: entity.entityId);
   }
 
   void _stop(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
+    ConnectionManager().callService(
-        entity.domain, "stop_cover_tilt", entity.entityId, null));
+        domain: entity.domain, service: "stop_cover_tilt", entityId: entity.entityId);
   }
 
   @override

lib/entities/cover/widgets/cover_state.dart

@@ -2,18 +2,27 @@ part of '../../../main.dart';
 
 class CoverStateWidget extends StatelessWidget {
   void _open(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
+    ConnectionManager().callService(
-        entity.domain, "open_cover", entity.entityId, null));
+        domain: entity.domain,
+        service: "open_cover",
+        entityId: entity.entityId
+      );
   }
 
   void _close(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
+    ConnectionManager().callService(
-        entity.domain, "close_cover", entity.entityId, null));
+        domain: entity.domain,
+        service: "close_cover",
+        entityId: entity.entityId
+      );
   }
 
   void _stop(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
+    ConnectionManager().callService(
-        entity.domain, "stop_cover", entity.entityId, null));
+        domain: entity.domain,
+        service: "stop_cover",
+        entityId: entity.entityId
+      );
   }
 
   @override

lib/entities/date_time/date_time_entity.class.dart

@@ -35,8 +35,7 @@ class DateTimeEntity extends Entity {
     return formattedState;
   }
 
-  void setNewState(newValue) {
+  void setNewState(Map newValue) {
-    eventBus
+    ConnectionManager().callService(domain: domain, service: "set_datetime", entityId: entityId, data: newValue);
-        .fire(new ServiceCallEvent(domain, "set_datetime", entityId, newValue));
   }
 }

lib/entities/date_time/widgets/date_time_state.dart

@@ -9,10 +9,8 @@ class DateTimeStateWidget extends StatelessWidget {
         padding: EdgeInsets.fromLTRB(0.0, 0.0, Sizes.rightWidgetPadding, 0.0),
         child: GestureDetector(
           child: Text("${entity.formattedState}",
-              textAlign: TextAlign.right,
+              textAlign: TextAlign.right
-              style: new TextStyle(
+            ),
-                fontSize: Sizes.stateFontSize,
-              )),
           onTap: () => _handleStateTap(context, entity),
         ));
   }

lib/entities/default_entity_container.widget.dart

@@ -0,0 +1,73 @@
+part of '../main.dart';
+
+class DefaultEntityContainer extends StatelessWidget {
+  DefaultEntityContainer({
+    Key key,
+    @required this.state
+  }) : super(key: key);
+
+  final Widget state;
+
+  @override
+  Widget build(BuildContext context) {
+    final EntityModel entityModel = EntityModel.of(context);
+    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
+      return MissedEntityWidget();
+    }
+    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.DIVIDER) {
+      return Divider();
+    }
+    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.SECTION) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          Divider(),
+          Text(
+              "${entityModel.entityWrapper.entity.displayName}",
+            style: HAClientTheme().getLinkTextStyle(context).copyWith(
+              decoration: TextDecoration.none
+            )
+          )
+        ],
+      );
+    }
+    Widget result = Row(
+      mainAxisSize: MainAxisSize.max,
+      children: <Widget>[
+        EntityIcon(),
+
+        Flexible(
+          fit: FlexFit.tight,
+          flex: 3,
+          child: EntityName(
+            padding: EdgeInsets.fromLTRB(10.0, 2.0, 10.0, 2.0),
+          ),
+        ),
+        state
+      ],
+    );
+    if (entityModel.handleTap) {
+      return InkWell(
+        onLongPress: () {
+          if (entityModel.handleTap) {
+            entityModel.entityWrapper.handleHold();
+          }
+        },
+        onTap: () {
+          if (entityModel.handleTap) {
+            entityModel.entityWrapper.handleTap();
+          }
+        },
+        onDoubleTap: () {
+          if (entityModel.handleTap) {
+            entityModel.entityWrapper.handleDoubleTap();
+          }
+        },
+        child: result,
+      );
+    } else {
+      return result;
+    }
+  }
+}

lib/entities/entity.class.dart

@@ -153,7 +153,7 @@ class Entity {
     domain = rawData["entity_id"].split(".")[0];
     entityId = rawData["entity_id"];
     deviceClass = attributes["device_class"];
-    state = rawData["state"];
+    state = rawData["state"] is bool ? (rawData["state"] ? EntityState.on : EntityState.off) : rawData["state"];
     displayState = Entity.StateByDeviceClass["$deviceClass.$state"] ?? (state.toLowerCase() == 'unknown' ? '-' : state);
     _lastUpdated = DateTime.tryParse(rawData["last_updated"]);
     entityPicture = _getEntityPictureUrl(webHost);
@@ -211,31 +211,6 @@ class Entity {
     );
   }
 
-  Widget buildEntityPageWidget(BuildContext context) {
-    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()
-      ]),
-      handleTap: false,
-    );
-  }
-
-  Widget buildHistoryWidget() {
-    return EntityHistoryWidget(
-      config: historyConfig,
-    );
-  }
-
   Widget buildBadgeWidget(BuildContext context) {
     return EntityModel(
       entityWrapper: EntityWrapper(entity: this),
@@ -246,7 +221,7 @@ class Entity {
 
   String getAttribute(String attributeName) {
     if (attributes != null) {
-      return attributes["$attributeName"];
+      return attributes["$attributeName"].toString();
     }
     return null;
   }

lib/entities/entity_icon.widget.dart

@@ -67,7 +67,7 @@ class EntityIcon extends StatelessWidget {
       padding: padding,
       child: buildIcon(
           entityWrapper,
-          color ?? EntityColor.stateColor(entityWrapper.entity.state)
+          color ?? HAClientTheme().getColorByEntityState(entityWrapper.entity.state, context)
       ),
     );
   }

lib/entities/entity_name.widget.dart

@@ -5,18 +5,24 @@ class EntityName extends StatelessWidget {
   final EdgeInsetsGeometry padding;
   final TextOverflow textOverflow;
   final bool wordsWrap;
-  final double fontSize;
   final TextAlign textAlign;
   final int maxLines;
+  final TextStyle textStyle;
 
-  const EntityName({Key key, this.maxLines, this.padding: const EdgeInsets.only(right: 10.0), this.textOverflow: TextOverflow.ellipsis, this.wordsWrap: true, this.fontSize: Sizes.nameFontSize, this.textAlign: TextAlign.left}) : super(key: key);
+  const EntityName({Key key, this.maxLines, this.padding: const EdgeInsets.only(right: 10.0), this.textOverflow: TextOverflow.ellipsis, this.textStyle, this.wordsWrap: true, this.textAlign: TextAlign.left}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
-    TextStyle textStyle = TextStyle(fontSize: fontSize);
+    TextStyle tStyle;
+    if (textStyle == null) {
       if (entityWrapper.entity.statelessType == StatelessEntityType.WEBLINK) {
-      textStyle = textStyle.apply(color: Colors.blue, decoration: TextDecoration.underline);
+        tStyle = HAClientTheme().getLinkTextStyle(context);
+      } else {
+        tStyle = Theme.of(context).textTheme.body1;
+      }
+    } else {
+      tStyle = textStyle;
     }
     return Padding(
       padding: padding,
@@ -25,7 +31,7 @@ class EntityName extends StatelessWidget {
         overflow: textOverflow,
         softWrap: wordsWrap,
         maxLines: maxLines,
-        style: textStyle,
+        style: tStyle,
         textAlign: textAlign,
       ),
     );

lib/entities/entity_page_layout.widget.dart

@@ -0,0 +1,66 @@
+part of '../main.dart';
+
+class EntityPageLayout extends StatelessWidget {
+
+  final bool showClose;
+  final Entity entity;
+
+  EntityPageLayout({Key key, this.showClose: false, this.entity}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return EntityModel(
+      entityWrapper: EntityWrapper(entity: entity),
+      child: ListView(
+          padding: EdgeInsets.all(0),
+          children: <Widget>[
+            showClose ?
+            Container(
+              color: Theme.of(context).primaryColor,
+              height: 40,
+              child: Row(
+                children: <Widget>[
+                  Expanded(
+                    child: Padding(
+                      padding: EdgeInsets.only(left: 8),
+                      child: Text(
+                        entity.displayName,
+                        style: Theme.of(context).primaryTextTheme.headline
+                      ),
+                    ),
+                  ),
+                  IconButton(
+                    padding: EdgeInsets.all(0),
+                    icon: Icon(Icons.close),
+                    color: Theme.of(context).primaryTextTheme.headline.color,
+                    iconSize: 36.0,
+                    onPressed: () {
+                      eventBus.fire(ShowEntityPageEvent());
+                    },
+                  )
+                ],
+              ),
+            ) :
+            Container(height: 0, width: 0,),
+            Padding(
+              padding: EdgeInsets.only(top: Sizes.rowPadding, left: Sizes.leftWidgetPadding),
+              child: DefaultEntityContainer(state: entity._buildStatePartForPage(context)),
+            ),
+            LastUpdatedWidget(),
+            Divider(),
+            entity._buildAdditionalControlsForPage(context),
+            Divider(),
+            SpoilerCard(
+              title: "State history",
+              body: EntityHistoryWidget(),
+            ),
+            SpoilerCard(
+              title: "Attributes",
+              body: EntityAttributesList(),
+            ),
+          ]
+      ),
+      handleTap: false,
+    );
+  }
+}

lib/entities/entity_picture.widget.dart

@@ -0,0 +1,71 @@
+part of '../main.dart';
+
+class EntityPicture extends StatelessWidget {
+
+  final EdgeInsetsGeometry padding;
+  final BoxFit fit;
+  
+  const EntityPicture({Key key, this.padding: const EdgeInsets.all(0.0), this.fit: BoxFit.cover}) : super(key: key);
+
+  int getDefaultIconByEntityId(String entityId, String deviceClass, String state) {
+    String domain = entityId.split(".")[0];
+    String iconNameByDomain = MaterialDesignIcons.defaultIconsByDomains["$domain.$state"] ?? MaterialDesignIcons.defaultIconsByDomains["$domain"];
+    String iconNameByDeviceClass;
+    if (deviceClass != null) {
+      iconNameByDeviceClass = MaterialDesignIcons.defaultIconsByDeviceClass["$domain.$deviceClass.$state"] ?? MaterialDesignIcons.defaultIconsByDeviceClass["$domain.$deviceClass"];
+    }
+    String iconName = iconNameByDeviceClass ?? iconNameByDomain;
+    if (iconName != null) {
+      return MaterialDesignIcons.iconsDataMap[iconName] ?? 0;
+    } else {
+      return 0;
+    }
+  }
+
+  Widget buildIcon(EntityWrapper data, BuildContext context) {
+    if (data == null) {
+      return null;
+    }
+    String iconName = data.icon;
+    int iconCode = 0;
+    if (iconName.length > 0) {
+      iconCode = MaterialDesignIcons.getIconCodeByIconName(iconName);
+    } else {
+      iconCode = getDefaultIconByEntityId(data.entity.entityId,
+          data.entity.deviceClass, data.entity.state); //
+    }
+    Widget iconPicture = Container(
+      child: Center(
+        child: Icon(
+          IconData(iconCode, fontFamily: 'Material Design Icons'),
+          size: Sizes.largeIconSize,
+          color: HAClientTheme().getOffStateColor(context),
+        )
+      )
+    );
+    
+    
+    if (data.entityPicture != null) {
+      return CachedNetworkImage(
+        imageUrl: data.entityPicture,
+        fit: this.fit,
+        errorWidget: (context, _, __) => iconPicture,
+        placeholder: (context, _) => iconPicture,
+      );
+    }
+    
+    return iconPicture;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
+    return Padding(
+      padding: padding,
+      child: buildIcon(
+          entityWrapper,
+          context
+      ),
+    );
+  }
+}

lib/entities/entity_wrapper.class.dart

@@ -2,25 +2,26 @@ part of '../main.dart';
 
 class EntityWrapper {
 
-  String displayName;
+  String overrideName;
-  String icon;
+  final String overrideIcon;
-  String entityPicture;
   EntityUIAction uiAction;
   Entity entity;
+  String unitOfMeasurementOverride;
+  final List stateFilter;
 
+  String get icon => overrideIcon ?? entity.icon;
+  String get entityPicture => entity.entityPicture;
+  String get displayName => overrideName ?? entity.displayName;
+  String get unitOfMeasurement => unitOfMeasurementOverride ?? entity.unitOfMeasurement;
 
   EntityWrapper({
     this.entity,
-    String icon,
+    this.overrideIcon,
-    String displayName,
+    this.overrideName,
-    this.uiAction
+    this.uiAction,
+    this.stateFilter
   }) {
     if (entity.statelessType == StatelessEntityType.NONE || entity.statelessType == StatelessEntityType.CALL_SERVICE || entity.statelessType == StatelessEntityType.WEBLINK) {
-      this.icon = icon ?? entity.icon;
-      if (icon == null) {
-        entityPicture = entity.entityPicture;
-      }
-      this.displayName = displayName ?? entity.displayName;
       if (uiAction == null) {
         uiAction = EntityUIAction();
       }
@@ -30,17 +31,17 @@ class EntityWrapper {
   void handleTap() {
     switch (uiAction.tapAction) {
       case EntityUIAction.toggle: {
-        eventBus.fire(
+        ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
-            ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
         break;
       }
 
       case EntityUIAction.callService: {
         if (uiAction.tapService != null) {
-          eventBus.fire(
+          ConnectionManager().callService(
-              ServiceCallEvent(uiAction.tapService.split(".")[0],
+            domain: uiAction.tapService.split(".")[0],
-                  uiAction.tapService.split(".")[1], null,
+            service: uiAction.tapService.split(".")[1],
-                  uiAction.tapServiceData));
+            data: uiAction.tapServiceData
+          );
         }
         break;
       }
@@ -51,12 +52,12 @@ class EntityWrapper {
 
       case EntityUIAction.moreInfo: {
         eventBus.fire(
-            new ShowEntityPageEvent(entity));
+            new ShowEntityPageEvent(entity: entity));
         break;
       }
 
       case EntityUIAction.navigate: {
-        if (uiAction.tapService.startsWith("/")) {
+        if (uiAction.tapService != null && uiAction.tapService.startsWith("/")) {
           //TODO handle local urls
           Logger.w("Local urls is not supported yet");
         } else {
@@ -74,29 +75,29 @@ class EntityWrapper {
   void handleHold() {
       switch (uiAction.holdAction) {
         case EntityUIAction.toggle: {
-          eventBus.fire(
+          ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
-              ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
           break;
         }
 
         case EntityUIAction.callService: {
           if (uiAction.holdService != null) {
-            eventBus.fire(
+            ConnectionManager().callService(
-                ServiceCallEvent(uiAction.holdService.split(".")[0],
+              domain: uiAction.holdService.split(".")[0],
-                    uiAction.holdService.split(".")[1], null,
+              service: uiAction.holdService.split(".")[1],
-                    uiAction.holdServiceData));
+              data: uiAction.holdServiceData
+            );
           }
           break;
         }
 
         case EntityUIAction.moreInfo: {
           eventBus.fire(
-              new ShowEntityPageEvent(entity));
+              new ShowEntityPageEvent(entity: entity));
           break;
         }
 
         case EntityUIAction.navigate: {
-          if (uiAction.holdService.startsWith("/")) {
+          if (uiAction.holdService != null && uiAction.holdService.startsWith("/")) {
             //TODO handle local urls
             Logger.w("Local urls is not supported yet");
           } else {
@@ -111,4 +112,44 @@ class EntityWrapper {
       }
   }
 
+  void handleDoubleTap() {
+      switch (uiAction.doubleTapAction) {
+        case EntityUIAction.toggle: {
+          ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
+          break;
+        }
+
+        case EntityUIAction.callService: {
+          if (uiAction.doubleTapService != null) {
+            ConnectionManager().callService(
+              domain: uiAction.doubleTapService.split(".")[0],
+              service: uiAction.doubleTapService.split(".")[1],
+              data: uiAction.doubleTapServiceData
+            );
+          }
+          break;
+        }
+
+        case EntityUIAction.moreInfo: {
+          eventBus.fire(
+              new ShowEntityPageEvent(entity: entity));
+          break;
+        }
+
+        case EntityUIAction.navigate: {
+          if (uiAction.doubleTapService != null && uiAction.doubleTapService.startsWith("/")) {
+            //TODO handle local urls
+            Logger.w("Local urls is not supported yet");
+          } else {
+            Launcher.launchURL(uiAction.doubleTapService);
+          }
+          break;
+        }
+
+        default: {
+          break;
+        }
+      }
+  }
+
 }

lib/entities/fan/widgets/fan_controls.dart

@@ -24,9 +24,12 @@ class _FanControlsWidgetState extends State<FanControlsWidget> {
     setState(() {
       _tmpOscillate = oscillate;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
+      ConnectionManager().callService(
-          "fan", "oscillate", entity.entityId,
+          domain: "fan",
-          {"oscillating": oscillate}));
+          service: "oscillate",
+          entityId: entity.entityId,
+          data: {"oscillating": oscillate}
+        );
     });
   }
 
@@ -34,9 +37,12 @@ class _FanControlsWidgetState extends State<FanControlsWidget> {
     setState(() {
       _tmpDirectionForward = forward;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
+      ConnectionManager().callService(
-          "fan", "set_direction", entity.entityId,
+          domain: "fan",
-          {"direction": forward ? "forward" : "reverse"}));
+          service: "set_direction",
+          entityId: entity.entityId,
+          data: {"direction": forward ? "forward" : "reverse"}
+        );
     });
   }
 
@@ -44,9 +50,12 @@ class _FanControlsWidgetState extends State<FanControlsWidget> {
     setState(() {
       _tmpSpeed = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
+      ConnectionManager().callService(
-            "fan", "set_speed", entity.entityId,
+            domain: "fan",
-            {"speed": value}));
+            service: "set_speed",
+            entityId: entity.entityId,
+            data: {"speed": value}
+          );
     });
   }
 

lib/entities/flat_service_button.widget.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../main.dart';
 
 class FlatServiceButton extends StatelessWidget {
 
@@ -6,7 +6,6 @@ class FlatServiceButton extends StatelessWidget {
   final String serviceName;
   final String entityId;
   final String text;
-  final double fontSize;
 
   FlatServiceButton({
     Key key,
@@ -14,17 +13,16 @@ class FlatServiceButton extends StatelessWidget {
     @required this.serviceName,
     @required this.entityId,
     @required this.text,
-    this.fontSize: Sizes.stateFontSize
   }) : super(key: key);
 
   void _setNewState() {
-    eventBus.fire(new ServiceCallEvent(serviceDomain, serviceName, entityId, null));
+    ConnectionManager().callService(domain: serviceDomain, service: serviceName, entityId: entityId);
   }
 
   @override
   Widget build(BuildContext context) {
     return SizedBox(
-        height: fontSize*2.5,
+        height: Theme.of(context).textTheme.subhead.fontSize*2.5,
         child: FlatButton(
           onPressed: (() {
             _setNewState();
@@ -32,8 +30,7 @@ class FlatServiceButton extends StatelessWidget {
           child: Text(
             text,
             textAlign: TextAlign.right,
-            style:
+            style: HAClientTheme().getActionTextStyle(context),
-            new TextStyle(fontSize: fontSize, color: Colors.blue),
           ),
         )
     );

lib/entities/light/widgets/light_color_picker.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class LightColorPicker extends StatefulWidget {
 
@@ -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");

lib/entities/light/widgets/light_controls.dart

@@ -28,9 +28,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     setState(() {
       _tmpBrightness = value.round();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
+      ConnectionManager().callService(
-          entity.domain, "turn_on", entity.entityId,
+          domain: entity.domain,
-          {"brightness": _tmpBrightness}));
+          service: "turn_on",
+          entityId: entity.entityId,
+          data: {"brightness": _tmpBrightness}
+        );
     });
   }
 
@@ -38,9 +41,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     setState(() {
       _tmpWhiteValue = value.round();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
+      ConnectionManager().callService(
-            entity.domain, "turn_on", entity.entityId,
+            domain: entity.domain,
-            {"white_value": _tmpWhiteValue}));
+            service: "turn_on",
+            entityId: entity.entityId,
+            data: {"white_value": _tmpWhiteValue}
+          );
 
     });
   }
@@ -49,9 +55,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     setState(() {
       _tmpColorTemp = value.round();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
+      ConnectionManager().callService(
-          entity.domain, "turn_on", entity.entityId,
+          domain: entity.domain,
-          {"color_temp": _tmpColorTemp}));
+          service: "turn_on",
+          entityId: entity.entityId,
+          data: {"color_temp": _tmpColorTemp}
+        );
     });
   }
 
@@ -59,10 +68,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     setState(() {
       _tmpColor = color;
       _changedHere = true;
-      Logger.d( "HS Color: [${color.hue}, ${color.saturation}]");
+      ConnectionManager().callService(
-      eventBus.fire(new ServiceCallEvent(
+        domain: entity.domain,
-        entity.domain, "turn_on", entity.entityId,
+        service: "turn_on",
-          {"hs_color": [color.hue, color.saturation*100]}));
+        entityId: entity.entityId,
+        data: {"hs_color": [color.hue, color.saturation*100]}
+      );
     });
   }
 
@@ -71,9 +82,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
       _tmpEffect = value;
       _changedHere = true;
       if (_tmpEffect != null) {
-        eventBus.fire(new ServiceCallEvent(
+        ConnectionManager().callService(
-            entity.domain, "turn_on", entity.entityId,
+            domain: entity.domain,
-            {"effect": "$value"}));
+            service: "turn_on",
+            entityId: entity.entityId,
+            data: {"effect": "$value"}
+          );
       }
     });
   }
@@ -100,7 +114,19 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
   }
 
   Widget _buildBrightnessControl(LightEntity entity) {
-    if ((entity.supportBrightness) && (_tmpBrightness != null)) {
+    if (entity.supportBrightness) {
+      double val;
+      if (_tmpBrightness != null) {
+        if (_tmpBrightness > 255) {
+          val = 255;
+        } else if (_tmpBrightness < 1) {
+          val = 1;
+        } else {
+          val = _tmpBrightness.toDouble();
+        }
+      } else {
+        val = 1;
+      }
       return UniversalSlider(
         onChanged: (value) {
           setState(() {
@@ -111,7 +137,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
         min: 1.0,
         max: 255.0,
         onChangeEnd: (value) => _setBrightness(entity, value),
-        value: _tmpBrightness == null ? 1.0 : _tmpBrightness.toDouble(),
+        value: val,
         leading: Icon(Icons.brightness_5),
         title: "Brightness",
       );
@@ -143,10 +169,22 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
 
   Widget _buildColorTempControl(LightEntity entity) {
     if (entity.supportColorTemp) {
+      double val;
+      if (_tmpColorTemp != null) {
+        if (_tmpColorTemp > entity.maxMireds) {
+          val = entity.maxMireds;
+        } else if (_tmpColorTemp < entity.minMireds) {
+          val = entity.minMireds;
+        } else {
+          val = _tmpColorTemp.toDouble();
+        }
+      } else {
+        val = entity.minMireds;
+      }
       return UniversalSlider(
         title: "Color temperature",
-        leading: Text("Cold", style: TextStyle(color: Colors.lightBlue),),
+        leading: Text("Cold", style: Theme.of(context).textTheme.body1.copyWith(color: Colors.lightBlue)),
-        value:  _tmpColorTemp == null ? entity.maxMireds : _tmpColorTemp.toDouble(),
+        value:  val,
         onChangeEnd: (value) => _setColorTemp(entity, value),
         max: entity.maxMireds,
         min: entity.minMireds,
@@ -156,7 +194,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
             _tmpColorTemp = value.round();
           });
         },
-        closing: Text("Warm", style: TextStyle(color: Colors.amberAccent),),
+        closing: Text("Warm", style: Theme.of(context).textTheme.body1.copyWith(color: Colors.amberAccent),),
       );
     } else {
       return Container(width: 0.0, height: 0.0);
@@ -186,7 +224,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
                 },
               ),
               FlatButton(
-                color: savedColor?.toColor() ?? Colors.transparent,
+                color: savedColor?.toColor() ?? Theme.of(context).backgroundColor,
                 child: Text('Paste color'),
                 onPressed: savedColor == null ? null : () {
                   _setColor(entity, savedColor);
@@ -203,10 +241,14 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
 
   Widget _buildEffectControl(LightEntity entity) {
     if ((entity.supportEffect) && (entity.effectList != null)) {
+      List<String> list = List.from(entity.effectList);
+      if (_tmpEffect!= null && !list.contains(_tmpEffect)) {
+        list.insert(0, _tmpEffect);
+      }
       return ModeSelectorWidget(
           onChange: (effect) => _setEffect(entity, effect),
           caption: "Effect",
-          options: entity.effectList,
+          options: list,
           value: _tmpEffect
       );
     } else {

lib/entities/lock/widgets/lock_state.dart

@@ -7,11 +7,11 @@ class LockStateWidget extends StatelessWidget {
   const LockStateWidget({Key key, this.assumedState: false}) : super(key: key);
 
   void _lock(Entity entity) {
-    eventBus.fire(new ServiceCallEvent("lock", "lock", entity.entityId, null));
+    ConnectionManager().callService(domain: "lock", service: "lock", entityId: entity.entityId);
   }
 
   void _unlock(Entity entity) {
-    eventBus.fire(new ServiceCallEvent("lock", "unlock", entity.entityId, null));
+    ConnectionManager().callService(domain: "lock", service: "unlock", entityId: entity.entityId);
   }
 
   @override
@@ -28,8 +28,7 @@ class LockStateWidget extends StatelessWidget {
           onPressed: () => _unlock(entity),
           child: Text("UNLOCK",
               textAlign: TextAlign.right,
-              style:
+              style: HAClientTheme().getActionTextStyle(context)
-              new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
             ),
           )
         ),
@@ -39,8 +38,7 @@ class LockStateWidget extends StatelessWidget {
               onPressed: () => _lock(entity),
               child: Text("LOCK",
                 textAlign: TextAlign.right,
-                style:
+                style: HAClientTheme().getActionTextStyle(context),
-                new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
               ),
             )
         )
@@ -56,8 +54,7 @@ class LockStateWidget extends StatelessWidget {
             child: Text(
               entity.isLocked ? "UNLOCK" : "LOCK",
               textAlign: TextAlign.right,
-              style:
+              style: HAClientTheme().getActionTextStyle(context),
-              new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
             ),
           )
       );

lib/entities/media_player/media_player_entity.class.dart

@@ -74,10 +74,34 @@ class MediaPlayerEntity extends Entity {
 
   List<String> get soundModeList => getStringListAttributeValue("sound_mode_list");
   List<String> get sourceList => getStringListAttributeValue("source_list");
+  DateTime get positionLastUpdated => DateTime.tryParse("${attributes["media_position_updated_at"]}")?.toLocal();
+  int get durationSeconds => _getIntAttributeValue("media_duration");
+  int get positionSeconds => _getIntAttributeValue("media_position");
 
   @override
   Widget _buildAdditionalControlsForPage(BuildContext context) {
     return MediaPlayerControls();
   }
 
+  bool canCalculateActualPosition() {
+    return positionLastUpdated != null && durationSeconds != null && positionSeconds != null && durationSeconds > 0;
+  }
+
+  double getActualPosition() {
+    double result = 0;
+    Duration durationD;
+    Duration positionD;
+    durationD = Duration(seconds: durationSeconds);
+    positionD = Duration(
+          seconds: positionSeconds);
+    result = positionD.inSeconds.toDouble();
+    int differenceInSeconds = DateTime
+          .now()
+          .difference(positionLastUpdated)
+          .inSeconds;
+    result = ((result + differenceInSeconds) <= durationD.inSeconds) ? (result + differenceInSeconds) : durationD.inSeconds.toDouble();
+    return result;
+
+  }
+
 }

lib/entities/media_player/widgets/media_player_progress_bar.widget.dart

@@ -0,0 +1,46 @@
+part of '../../../main.dart';
+
+class MediaPlayerProgressBar extends StatefulWidget {
+  @override
+  _MediaPlayerProgressBarState createState() => _MediaPlayerProgressBarState();
+}
+
+class _MediaPlayerProgressBarState extends State<MediaPlayerProgressBar> {
+
+  Timer _timer;
+
+  @override
+  initState() {
+    super.initState();
+    _timer = Timer.periodic(Duration(seconds: 1), (_) {
+      setState(() {
+      });
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final EntityModel entityModel = EntityModel.of(context);
+    final MediaPlayerEntity entity = entityModel.entityWrapper.entity;
+    double progress = 0;
+    int currentPosition;
+    if (entity.canCalculateActualPosition()) {
+      currentPosition = entity.getActualPosition().toInt();
+      if (currentPosition > 0) {
+          progress = (currentPosition <= entity.durationSeconds) ? currentPosition / entity.durationSeconds : 100;
+      }
+    }
+    return LinearProgressIndicator(
+      value: progress,
+      backgroundColor: Colors.black45,
+      valueColor: AlwaysStoppedAnimation<Color>(HAClientTheme().getOnStateColor(context)),
+    );
+  }
+
+  @override
+  void dispose() {
+    _timer?.cancel();
+    super.dispose();
+  }
+
+}

lib/entities/media_player/widgets/media_player_seek_bar.widget.dart

@@ -0,0 +1,135 @@
+part of '../../../main.dart';
+
+class MediaPlayerSeekBar extends StatefulWidget {
+  @override
+  _MediaPlayerSeekBarState createState() => _MediaPlayerSeekBarState();
+}
+
+class _MediaPlayerSeekBarState extends State<MediaPlayerSeekBar> {
+
+  Timer _timer;
+  bool _seekStarted = false;
+  bool _changedHere = false;
+  double _currentPosition = 0;
+  int _savedPosition = 0;
+
+  @override
+  initState() {
+    super.initState();
+    _timer = Timer.periodic(Duration(seconds: 1), (_) {
+      if (!_seekStarted && !_changedHere) {
+        setState(() {});
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final EntityModel entityModel = EntityModel.of(context);
+    final MediaPlayerEntity entity = entityModel.entityWrapper.entity;
+
+    if (entity.canCalculateActualPosition() && entity.state != EntityState.idle) {
+      if (HomeAssistant().sendToPlayerId == entity.entityId  && HomeAssistant().savedPlayerPosition != null) {
+        _savedPosition = HomeAssistant().savedPlayerPosition;
+        HomeAssistant().savedPlayerPosition = null;
+        HomeAssistant().sendToPlayerId = null;
+      }
+      if (entity.state == EntityState.playing && !_seekStarted &&
+          !_changedHere) {
+        _currentPosition = entity.getActualPosition();
+      } else if (entity.state == EntityState.paused) {
+        _currentPosition = entity.positionSeconds.toDouble();
+      } else if (_changedHere) {
+        _changedHere = false;
+      }
+      List<Widget> buttons = [];
+      if (_savedPosition > 0) {
+        buttons.add(
+            RaisedButton(
+              child: Text("Jump to ${Duration(seconds: _savedPosition).toString().split('.')[0]}"),
+              color: Theme.of(context).accentColor,
+              onPressed: () {
+                ConnectionManager().callService(
+                    domain: "media_player",
+                    service: "media_seek",
+                    entityId: entity.entityId,
+                    data: {"seek_position": _savedPosition}
+                );
+                setState(() {
+                  _savedPosition = 0;
+                });
+              },
+            )
+        );
+      }
+      return Padding(
+        padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 20, Sizes.rightWidgetPadding, 0),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: <Widget>[
+            Row(
+              mainAxisSize: MainAxisSize.max,
+              children: <Widget>[
+                Text("00:00"),
+                Expanded(
+                  child: Text(
+                    "${Duration(seconds: _currentPosition.toInt()).toString().split(".")[0]}",
+                    textAlign: TextAlign.center,
+                    style: Theme.of(context).textTheme.title.copyWith(
+                      color: Colors.blue
+                    )
+                  ),
+                ),
+                Text("${Duration(seconds: entity.durationSeconds).toString().split(".")[0]}")
+              ],
+            ),
+            Container(height: 10,),
+            Slider(
+              min: 0,
+              activeColor: Theme.of(context).accentColor,
+              max: entity.durationSeconds.toDouble(),
+              value: _currentPosition,
+              onChangeStart: (val) {
+                _seekStarted = true;
+              },
+              onChanged: (val) {
+                setState(() {
+                  _currentPosition = val;
+                });
+              },
+              onChangeEnd: (val) {
+                _seekStarted = false;
+                Timer(Duration(milliseconds: 500), () {
+                  if (!_seekStarted) {
+                    ConnectionManager().callService(
+                        domain: "media_player",
+                        service: "media_seek",
+                        entityId: entity.entityId,
+                        data: {"seek_position": val}
+                    );
+                    setState(() {
+                      _changedHere = true;
+                      _currentPosition = val;
+                    });
+                  }
+                });
+              },
+            ),
+            ButtonBar(
+              children: buttons,
+            )
+          ],
+        ),
+      );
+    } else {
+      return Container(width: 0, height: 0,);
+    }
+  }
+
+  @override
+  void dispose() {
+    _timer?.cancel();
+    super.dispose();
+  }
+
+}

lib/entities/media_player/widgets/media_player_widgets.dart

@@ -12,21 +12,21 @@ class MediaPlayerWidget extends StatelessWidget {
         Stack(
           alignment: AlignmentDirectional.topEnd,
           children: <Widget>[
-            _buildImage(entity),
+            _buildImage(entity, context),
             Positioned(
               bottom: 0.0,
               left: 0.0,
               right: 0.0,
               child: Container(
                 color: Colors.black45,
-                child: _buildState(entity),
+                child: _buildState(entity, context),
               ),
             ),
             Positioned(
                 bottom: 0.0,
                 left: 0.0,
                 right: 0.0,
-                child: MediaPlayerProgressWidget()
+                child: MediaPlayerProgressBar()
             )
           ],
         ),
@@ -35,12 +35,9 @@ class MediaPlayerWidget extends StatelessWidget {
     );
   }
 
-  Widget _buildState(MediaPlayerEntity entity) {
+  Widget _buildState(MediaPlayerEntity entity, BuildContext context) {
-    TextStyle style = TextStyle(
+    TextStyle style = Theme.of(context).textTheme.body1.copyWith(
-        fontSize: 14.0,
+      color: Colors.white
-        color: Colors.white,
-        fontWeight: FontWeight.normal,
-        height: 1.2
     );
     List<Widget> states = [];
     states.add(Text("${entity.displayName}", style: style));
@@ -71,7 +68,7 @@ class MediaPlayerWidget extends StatelessWidget {
     );
   }
 
-  Widget _buildImage(MediaPlayerEntity entity) {
+  Widget _buildImage(MediaPlayerEntity entity, BuildContext context) {
     String state = entity.state;
     if (entity.entityPicture != null && state != EntityState.off && state != EntityState.unavailable && state != EntityState.idle) {
       return Container(
@@ -97,7 +94,7 @@ class MediaPlayerWidget extends StatelessWidget {
           Icon(
             MaterialDesignIcons.getIconDataFromIconName("mdi:movie"),
             size: 150.0,
-            color: EntityColor.stateColor("$state"),
+            color: HAClientTheme().getColorByEntityState("$state", context),
           )
         ],
       );
@@ -118,26 +115,28 @@ class MediaPlayerPlaybackControls extends StatelessWidget {
 
 
   void _setPower(MediaPlayerEntity entity) {
-    if (entity.state != EntityState.unavailable && entity.state != EntityState.unknown) {
       if (entity.state == EntityState.off) {
-        Logger.d("${entity.entityId} turn_on");
+        ConnectionManager().callService(
-        eventBus.fire(new ServiceCallEvent(
+            domain: entity.domain,
-            entity.domain, "turn_on", entity.entityId,
+            service: "turn_on",
-            null));
+            entityId: entity.entityId
+          );
       } else {
-        Logger.d("${entity.entityId} turn_off");
+        ConnectionManager().callService(
-        eventBus.fire(new ServiceCallEvent(
+            domain: entity.domain,
-            entity.domain, "turn_off", entity.entityId,
+            service: "turn_off",
-            null));
+            entityId: entity.entityId
-      }
+          );
       }
   }
 
   void _callAction(MediaPlayerEntity entity, String action) {
     Logger.d("${entity.entityId} $action");
-    eventBus.fire(new ServiceCallEvent(
+    ConnectionManager().callService(
-        entity.domain, "$action", entity.entityId,
+        domain: entity.domain,
-        null));
+        service: "$action",
+        entityId: entity.entityId
+      );
   }
 
   @override
@@ -229,7 +228,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) {
@@ -264,27 +263,50 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
     setState(() {
       _changedHere = true;
       _newVolumeLevel = value;
-      eventBus.fire(ServiceCallEvent("media_player", "volume_set", entityId, {"volume_level": value}));
+      ConnectionManager().callService(
+        domain: "media_player",
+        service: "volume_set",
+        entityId: entityId,
+        data: {"volume_level": value}
+      );
     });
   }
 
   void _setVolumeMute(bool isMuted, String entityId) {
-    eventBus.fire(ServiceCallEvent("media_player", "volume_mute", entityId, {"is_volume_muted": isMuted}));
+    ConnectionManager().callService(
+      domain: "media_player",
+      service: "volume_mute",
+      entityId: entityId,
+      data: {"is_volume_muted": isMuted}
+    );
   }
 
   void _setVolumeUp(String entityId) {
-    eventBus.fire(ServiceCallEvent("media_player", "volume_up", entityId, null));
+    ConnectionManager().callService(
+      domain: "media_player",
+      service: "volume_up",
+      entityId: entityId
+    );
   }
 
   void _setVolumeDown(String entityId) {
-    eventBus.fire(ServiceCallEvent("media_player", "volume_down", entityId, null));
+    ConnectionManager().callService(
+      domain: "media_player",
+      service: "volume_down",
+      entityId: entityId
+    );
   }
 
   void _setSoundMode(String value, String entityId) {
     setState(() {
       _newSoundMode = value;
       _changedHere = true;
-      eventBus.fire(ServiceCallEvent("media_player", "select_sound_mode", entityId, {"sound_mode": "$value"}));
+      ConnectionManager().callService(
+        domain: "media_player",
+        service: "select_sound_mode",
+        entityId: entityId,
+        data: {"sound_mode": "$value"}
+      );
     });
   }
 
@@ -292,7 +314,12 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
     setState(() {
       _newSource = source;
       _changedHere = true;
-      eventBus.fire(ServiceCallEvent("media_player", "select_source", entityId, {"source": "$source"}));
+      ConnectionManager().callService(
+        domain: "media_player",
+        service: "select_source",
+        entityId: entityId,
+        data: {"source": "$source"}
+      );
     });
   }
 
@@ -305,6 +332,11 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
       )
     ];
     if (entity.state != EntityState.off && entity.state != EntityState.unknown && entity.state != EntityState.unavailable) {
+      if (entity.supportSeek) {
+        children.add(MediaPlayerSeekBar());
+      } else {
+        children.add(MediaPlayerProgressBar());
+      }
       Widget muteWidget;
       Widget volumeStepWidget;
       if (entity.supportVolumeMute  || entity.attributes["is_volume_muted"] != null) {
@@ -321,13 +353,13 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
         volumeStepWidget = Row(
           mainAxisSize: MainAxisSize.min,
           children: <Widget>[
-            IconButton(
-                icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:plus")),
-                onPressed: () => _setVolumeUp(entity.entityId)
-            ),
             IconButton(
                 icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:minus")),
                 onPressed: () => _setVolumeDown(entity.entityId)
+            ),
+            IconButton(
+                icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:plus")),
+                onPressed: () => _setVolumeUp(entity.entityId)
             )
           ],
         );
@@ -398,69 +430,47 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
             )
         );
       }
-
+      if (entity.state == EntityState.playing || entity.state == EntityState.paused) {
+        children.add(
+            ButtonBar(
+              children: <Widget>[
+                RaisedButton(
+                  child: Text("Duplicate to"),
+                  color: Colors.blue,
+                  textColor: Colors.white,
+                  onPressed: () => _duplicateTo(entity),
+                ),
+                RaisedButton(
+                  child: Text("Switch to"),
+                  color: Colors.blue,
+                  textColor: Colors.white,
+                  onPressed: () => _switchTo(entity),
+                )
+              ],
+            )
+        );
+      }
     }
     return Column(
       children: children,
     );
   }
 
-}
+  void _duplicateTo(entity) {
-
+    if (entity.canCalculateActualPosition()) {
-class MediaPlayerProgressWidget extends StatefulWidget {
+        HomeAssistant().savedPlayerPosition = entity.getActualPosition().toInt();
-  @override
-  _MediaPlayerProgressWidgetState createState() => _MediaPlayerProgressWidgetState();
-}
-
-class _MediaPlayerProgressWidgetState extends State<MediaPlayerProgressWidget> {
-
-  Timer _timer;
-
-  @override
-  Widget build(BuildContext context) {
-    final EntityModel entityModel = EntityModel.of(context);
-    final MediaPlayerEntity entity = entityModel.entityWrapper.entity;
-    double progress;
-    try {
-      DateTime lastUpdated = DateTime.parse(
-          entity.attributes["media_position_updated_at"]).toLocal();
-      Duration duration = Duration(seconds: entity._getIntAttributeValue("media_duration") ?? 1);
-      Duration position = Duration(seconds: entity._getIntAttributeValue("media_position") ?? 0);
-      int currentPosition = position.inSeconds;
-      if (entity.state == EntityState.playing) {
-        _timer?.cancel();
-        _timer = Timer(Duration(seconds: 1), () {
-          setState(() {
-          });
-        });
-        int differenceInSeconds = DateTime
-            .now()
-            .difference(lastUpdated)
-            .inSeconds;
-        currentPosition = currentPosition + differenceInSeconds;
     } else {
-        _timer?.cancel();
+        HomeAssistant().savedPlayerPosition = 0;
     }
-      progress = currentPosition / duration.inSeconds;
+    Navigator.of(context).pushNamed("/play-media", arguments: {
-      return LinearProgressIndicator(
+        "url": entity.attributes["media_content_id"],
-        value: progress,
+        "type": entity.attributes["media_content_type"]
-        backgroundColor: Colors.black45,
+      });
-        valueColor: AlwaysStoppedAnimation<Color>(EntityColor.stateColor(EntityState.on)),
-      );
-    } catch (e) {
-      _timer?.cancel();
-      progress = 0.0;
-    }
-    return LinearProgressIndicator(
-      value: progress,
-      backgroundColor: Colors.black45,
-    );
   }
 
-  @override
+  void _switchTo(entity) {
-  void dispose() {
+    HomeAssistant().sendFromPlayerId = entity.entityId;
-    _timer?.cancel();
+    _duplicateTo(entity);
-    super.dispose();
   }
 
 }

lib/entities/select/widgets/select_state.dart

@@ -11,8 +11,12 @@ class SelectStateWidget extends StatefulWidget {
 class _SelectStateWidgetState extends State<SelectStateWidget> {
 
   void setNewState(domain, entityId, newValue) {
-    eventBus.fire(new ServiceCallEvent(domain, "select_option", entityId,
+    ConnectionManager().callService(
-        {"option": "$newValue"}));
+      domain: domain,
+      service: "select_option",
+      entityId: entityId,
+      data: {"option": "$newValue"}
+    );
   }
 
   @override

lib/entities/simple_state.widget.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../main.dart';
 
 class SimpleEntityState extends StatelessWidget {
 
@@ -7,8 +7,10 @@ class SimpleEntityState extends StatelessWidget {
   final EdgeInsetsGeometry padding;
   final int maxLines;
   final String customValue;
+  final TextStyle textStyle;
+  //final bool bold;
 
-  const SimpleEntityState({Key key, this.maxLines: 10, this.expanded: true, this.textAlign: TextAlign.right, this.padding: const EdgeInsets.fromLTRB(0.0, 0.0, Sizes.rightWidgetPadding, 0.0), this.customValue}) : super(key: key);
+  const SimpleEntityState({Key key,/*this.bold: false,*/ this.maxLines: 10, this.expanded: true, this.textAlign: TextAlign.right, this.textStyle, this.padding: const EdgeInsets.fromLTRB(0.0, 0.0, Sizes.rightWidgetPadding, 0.0), this.customValue}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -20,24 +22,31 @@ class SimpleEntityState extends StatelessWidget {
     } else {
       state = customValue;
     }
-    TextStyle textStyle =  TextStyle(
+    TextStyle tStyle;
-      fontSize: Sizes.stateFontSize,
+    if (textStyle != null) {
+      tStyle = textStyle;
+    } else if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.CALL_SERVICE) {
+      tStyle = Theme.of(context).textTheme.subhead.copyWith(
+        color: Colors.blue
       );
-    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.CALL_SERVICE) {
+    } else {
-      textStyle = textStyle.apply(color: Colors.blue);
+      tStyle = Theme.of(context).textTheme.body1;
     }
+    /*if (this.bold) {
+      textStyle = textStyle.apply(fontWeightDelta: 100);
+    }*/
     while (state.contains("  ")){
       state = state.replaceAll("  ", " ");
     }
     Widget result = Padding(
       padding: padding,
       child: Text(
-        "$state ${entityModel.entityWrapper.entity.unitOfMeasurement}",
+        "$state ${entityModel.entityWrapper.unitOfMeasurement}",
         textAlign: textAlign,
         maxLines: maxLines,
         overflow: TextOverflow.ellipsis,
         softWrap: true,
-        style: textStyle
+        style: tStyle
       )
     );
     if (expanded) {

lib/entities/slider/widgets/slider_controls.dart

@@ -18,8 +18,12 @@ class _SliderControlsWidgetState extends State<SliderControlsWidget> {
       _newValue = newValue;
       _changedHere = true;
     });
-    eventBus.fire(new ServiceCallEvent(domain, "set_value", entityId,
+    ConnectionManager().callService(
-        {"value": "${newValue.toString()}"}));
+      domain: domain,
+      service: "set_value",
+      entityId: entityId,
+      data: {"value": "${newValue.toString()}"}
+    );
   }
 
   @override
@@ -58,8 +62,7 @@ class _SliderControlsWidgetState extends State<SliderControlsWidget> {
       children: <Widget>[
         Text(
           "$_newValue",
-          style: TextStyle(
+          style: Theme.of(context).textTheme.display1.copyWith(
-            fontSize: Sizes.largeFontSize,
             color: Colors.blue
           ),
         ),

lib/entities/switch/widget/switch_state.dart

@@ -38,8 +38,11 @@ class _SwitchStateWidgetState extends State<SwitchStateWidget> {
     } else {
       domain = entity.domain;
     }
-    eventBus.fire(new ServiceCallEvent(
+    ConnectionManager().callService(
-        domain, (newValue as bool) ? "turn_on" : "turn_off", entity.entityId, null));
+        domain: domain,
+        service: (newValue as bool) ? "turn_on" : "turn_off",
+        entityId: entity.entityId
+      );
   }
 
   @override

lib/entities/text/widgets/text_input_state.dart

@@ -26,8 +26,12 @@ class _TextInputStateWidgetState extends State<TextInputStateWidget> {
 
   void setNewState(newValue, domain, entityId) {
     if (validate(newValue, _minLength, _maxLength)) {
-      eventBus.fire(new ServiceCallEvent(domain, "set_value", entityId,
+      ConnectionManager().callService(
-          {"value": "$newValue"}));
+        domain: domain,
+        service: "set_value",
+        entityId: entityId,
+        data: {"value": "$newValue"}
+      );
     } else {
       setState(() {
         _tmpValue = _entityState;

lib/entities/universal_slider.widget.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../main.dart';
 
 class UniversalSlider extends StatelessWidget {
 
@@ -40,10 +40,7 @@ class UniversalSlider extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           Container(height: Sizes.rowPadding,),
-          Text(
+          Text("$title"),
-            "$title",
-            style: TextStyle(fontSize: Sizes.stateFontSize),
-          ),
           Container(height: Sizes.rowPadding,),
           Row(
             mainAxisSize: MainAxisSize.min,

lib/entities/vacuum/vacuum_entity.class.dart

@@ -0,0 +1,98 @@
+part of '../../main.dart';
+
+class VacuumEntity extends Entity {
+
+  static const SUPPORT_TURN_ON = 1;
+  static const SUPPORT_TURN_OFF = 2;
+  static const SUPPORT_PAUSE = 4;
+  static const SUPPORT_STOP = 8;
+  static const SUPPORT_RETURN_HOME = 16;
+  static const SUPPORT_FAN_SPEED = 32;
+  static const SUPPORT_BATTERY = 64;
+  static const SUPPORT_STATUS = 128;
+  static const SUPPORT_SEND_COMMAND = 256;
+  static const SUPPORT_LOCATE = 512;
+  static const SUPPORT_CLEAN_SPOT = 1024;
+  static const SUPPORT_MAP = 2048;
+  static const SUPPORT_STATE = 4096;
+  static const SUPPORT_START = 8192;
+
+  VacuumEntity(Map rawData, String webHost) : super(rawData, webHost);
+
+  bool get supportTurnOn => ((supportedFeatures &
+  VacuumEntity.SUPPORT_TURN_ON) ==
+      VacuumEntity.SUPPORT_TURN_ON);
+  bool get supportTurnOff => ((supportedFeatures &
+  VacuumEntity.SUPPORT_TURN_OFF) ==
+      VacuumEntity.SUPPORT_TURN_OFF);
+  bool get supportPause => ((supportedFeatures &
+  VacuumEntity.SUPPORT_PAUSE) ==
+      VacuumEntity.SUPPORT_PAUSE);
+  bool get supportStop => ((supportedFeatures &
+  VacuumEntity.SUPPORT_STOP) ==
+      VacuumEntity.SUPPORT_STOP);
+  bool get supportReturnHome => ((supportedFeatures &
+  VacuumEntity.SUPPORT_RETURN_HOME) ==
+      VacuumEntity.SUPPORT_RETURN_HOME);
+  bool get supportFanSpeed => ((supportedFeatures &
+  VacuumEntity.SUPPORT_FAN_SPEED) ==
+      VacuumEntity.SUPPORT_FAN_SPEED);
+  bool get supportBattery => ((supportedFeatures &
+  VacuumEntity.SUPPORT_BATTERY) ==
+      VacuumEntity.SUPPORT_BATTERY);
+  bool get supportStatus => ((supportedFeatures &
+  VacuumEntity.SUPPORT_STATUS) ==
+      VacuumEntity.SUPPORT_STATUS);
+  bool get supportSendCommand => ((supportedFeatures &
+  VacuumEntity.SUPPORT_SEND_COMMAND) ==
+      VacuumEntity.SUPPORT_SEND_COMMAND);
+  bool get supportLocate => ((supportedFeatures &
+  VacuumEntity.SUPPORT_LOCATE) ==
+      VacuumEntity.SUPPORT_LOCATE);
+  bool get supportCleanSpot => ((supportedFeatures &
+  VacuumEntity.SUPPORT_CLEAN_SPOT) ==
+      VacuumEntity.SUPPORT_CLEAN_SPOT);
+  bool get supportMap => ((supportedFeatures &
+  VacuumEntity.SUPPORT_MAP) ==
+      VacuumEntity.SUPPORT_MAP);
+  bool get supportState => ((supportedFeatures &
+  VacuumEntity.SUPPORT_STATE) ==
+      VacuumEntity.SUPPORT_STATE);
+  bool get supportStart => ((supportedFeatures &
+  VacuumEntity.SUPPORT_START) ==
+      VacuumEntity.SUPPORT_START);
+
+  List<String> get fanSpeedList => getStringListAttributeValue("fan_speed_list");
+  String get fanSpeed => getAttribute("fan_speed");
+  String get status => getAttribute("status");
+  int get batteryLevel => _getIntAttributeValue("battery_level");
+  String get batteryIcon => getAttribute("battery_icon");
+  double get cleanedArea => _getDoubleAttributeValue("cleaned_area");
+
+  @override
+  Widget _buildStatePart(BuildContext context) {
+    if (supportTurnOn || supportTurnOff) {
+      return SwitchStateWidget(
+        domainForService: "vacuum",
+      );
+    } else {
+      return SimpleEntityState();
+    }
+  }
+
+  @override
+  Widget _buildStatePartForPage(BuildContext context) {
+    return EntityModel(
+      entityWrapper: EntityWrapper(
+        entity: this
+      ),
+      child: VacuumStateButton(),
+      handleTap: false,
+    );
+  }
+
+  @override
+  Widget _buildAdditionalControlsForPage(BuildContext context) {
+    return VacuumControls();
+  }
+}

lib/entities/vacuum/widgets/vacuum_controls.dart

@@ -0,0 +1,229 @@
+part of '../../../main.dart';
+
+class VacuumControls extends StatelessWidget {
+
+  @override
+  Widget build(BuildContext context) {
+    VacuumEntity entity = EntityModel.of(context).entityWrapper.entity;
+    return Padding(
+      padding: EdgeInsets.only(left: Sizes.leftWidgetPadding, right: Sizes.rightWidgetPadding),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          _buildStatusAndBattery(entity, context),
+          _buildCommands(entity),
+          _buildFanSpeed(entity),
+          _buildAdditionalInfo(entity)
+        ],
+      ),
+    );
+  }
+
+  Widget _buildStatusAndBattery(VacuumEntity entity, BuildContext context) {
+    List<Widget> result = [];
+    if (entity.supportStatus) {
+      result.addAll(
+          <Widget>[
+            Text("Status:"),
+            Container(width: 6,),
+            Expanded(
+              //flex: 1,
+              child: Text(
+                "${entity.status}",
+                maxLines: 1,
+                softWrap: true,
+                overflow: TextOverflow.ellipsis,
+                style: Theme.of(context).textTheme.body2,
+              ),
+            ),
+          ]
+      );
+    }
+    if (entity.supportBattery && entity.batteryLevel != null) {
+      String iconName = entity.batteryIcon ?? "mdi:battery";
+      int batteryLevel = entity.batteryLevel ?? 100;
+      result.addAll(<Widget>[
+        Icon(MaterialDesignIcons.getIconDataFromIconName(iconName)),
+        Container(width: 6,),
+        Text("$batteryLevel %")
+      ]
+      );
+    }
+
+    if (result.isEmpty) {
+      return Container(width: 0, height: 0);
+    }
+
+    return Padding(
+      padding: EdgeInsets.only(bottom: Sizes.doubleRowPadding),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.start,
+        mainAxisSize: MainAxisSize.max,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: result,
+      ),
+    );
+  }
+
+  Widget _buildCommands(VacuumEntity entity) {
+    List<Widget> commandButtons = [];
+    double iconSize = 32;
+    if (entity.supportStart) {
+      commandButtons.add(
+          IconButton(
+            icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:play")),
+            iconSize: iconSize,
+            onPressed: () => ConnectionManager().callService(
+                domain: "vacuum",
+                entityId: entity.entityId,
+                service: "start"
+            ),
+          )
+      );
+    }
+    if (entity.supportPause && !entity.supportStart) {
+      commandButtons.add(
+        IconButton(
+          icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:play-pause")),
+          iconSize: iconSize,
+          onPressed: () => ConnectionManager().callService(
+              domain: "vacuum",
+              entityId: entity.entityId,
+              service: "start_pause"
+          ),
+        )
+      );
+    } else if (entity.supportPause) {
+      commandButtons.add(
+          IconButton(
+            icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:pause")),
+            iconSize: iconSize,
+            onPressed: () => ConnectionManager().callService(
+                domain: "vacuum",
+                entityId: entity.entityId,
+                service: "pause"
+            ),
+          )
+      );
+    }
+    if (entity.supportStop) {
+      commandButtons.add(
+          IconButton(
+            icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:stop")),
+            iconSize: iconSize,
+            onPressed: () => ConnectionManager().callService(
+                domain: "vacuum",
+                entityId: entity.entityId,
+                service: "stop"
+            ),
+          )
+      );
+    }
+    if (entity.supportCleanSpot) {
+      commandButtons.add(
+          IconButton(
+            icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:broom")),
+            iconSize: iconSize,
+            onPressed: () => ConnectionManager().callService(
+                domain: "vacuum",
+                entityId: entity.entityId,
+                service: "clean_spot"
+            ),
+          )
+      );
+    }
+    if (entity.supportLocate) {
+      commandButtons.add(
+          IconButton(
+            icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:map-marker")),
+            iconSize: iconSize,
+            onPressed: () => ConnectionManager().callService(
+                domain: "vacuum",
+                entityId: entity.entityId,
+                service: "locate"
+            ),
+          )
+      );
+    }
+    if (entity.supportReturnHome) {
+      commandButtons.add(
+          IconButton(
+            icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:home-map-marker")),
+            iconSize: iconSize,
+            onPressed: () => ConnectionManager().callService(
+                domain: "vacuum",
+                entityId: entity.entityId,
+                service: "return_to_base"
+            ),
+          )
+      );
+    }
+
+    if (commandButtons.isEmpty) {
+      return Container(width: 0, height: 0,);
+    }
+
+    return Padding(
+      padding: EdgeInsets.only(bottom: Sizes.doubleRowPadding),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
+          Text("Vacuum cleaner commands:"),
+          Container(height: Sizes.rowPadding,),
+          Row(
+            mainAxisSize: MainAxisSize.max,
+            children: commandButtons.map((button) => Expanded(
+              child: button,
+            )).toList(),
+          )
+        ],
+      ),
+    );
+  }
+
+  Widget _buildFanSpeed(VacuumEntity entity) {
+    if (entity.supportFanSpeed) {
+      return Padding(
+        padding: EdgeInsets.only(bottom: Sizes.doubleRowPadding),
+        child: ModeSelectorWidget(
+            caption: "Fan speed",
+            options: entity.fanSpeedList,
+            value: entity.fanSpeed,
+            onChange: (val) => ConnectionManager().callService(
+                domain: "vacuum",
+                entityId: entity.entityId,
+                service: "set_fan_speed",
+                data: {"fan_speed": val}
+            )
+        ),
+      );
+    } else {
+      return Container(width: 0, height: 0,);
+    }
+
+  }
+
+  Widget _buildAdditionalInfo(VacuumEntity entity) {
+    List<Widget> rows = [];
+    if (entity.cleanedArea != null) {
+      rows.add(
+        Text("Cleaned area: ${entity.cleanedArea}")
+      );
+    }
+
+    if (rows.isEmpty) {
+      return Container(width: 0, height: 0,);
+    }
+
+    return Padding(
+      padding: EdgeInsets.only(bottom: Sizes.doubleRowPadding),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: rows,
+      ),
+    );
+
+  }
+}

lib/entities/vacuum/widgets/vacuum_state_button.dart

@@ -0,0 +1,37 @@
+part of '../../../main.dart';
+
+class VacuumStateButton extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    Widget result;
+    VacuumEntity entity = EntityModel.of(context).entityWrapper.entity;
+    if (entity.supportTurnOn && entity.supportTurnOff) {
+      result = FlatServiceButton(
+          serviceDomain: "vacuum",
+          serviceName: entity.state == EntityState.on ? "turn_off" : "turn_on",
+          entityId: entity.entityId,
+          text: entity.state == EntityState.on ? "TURN OFF" : "TURN ON"
+      );
+    } else if (entity.supportStart && (entity.state == EntityState.docked || entity.state == EntityState.idle)) {
+      result = FlatServiceButton(
+          serviceDomain: "vacuum",
+          serviceName: "start",
+          entityId: entity.entityId,
+          text: "START CLEANING"
+      );
+    } else if (entity.supportReturnHome && entity.state == EntityState.cleaning) {
+      result = FlatServiceButton(
+          serviceDomain: "vacuum",
+          serviceName: "return_to_base",
+          entityId: entity.entityId,
+          text: "RETURN TO DOCK"
+      );
+    } else {
+      result = Text(entity.state.toUpperCase(), style: Theme.of(context).textTheme.subhead);
+    }
+    return Padding(
+      padding: EdgeInsets.only(right: 15),
+      child: result,
+    );
+  }
+}

lib/entity_collection.class.dart

@@ -101,6 +101,9 @@ class EntityCollection {
       case "timer": {
         return TimerEntity(rawEntityData, homeAssistantWebHost);
       }
+      case "vacuum": {
+        return VacuumEntity(rawEntityData, homeAssistantWebHost);
+      }
       default: {
         return Entity(rawEntityData, homeAssistantWebHost);
       }
@@ -149,32 +152,12 @@ class EntityCollection {
     return _allEntities[entityId] != null;
   }
 
-  List<Entity> filterEntitiesForDefaultView() {
+  List<Entity> getByDomains({List<String> includeDomains: const [], List<String> excludeDomains: const [], List<String> stateFiler}) {
-    List<Entity> result = [];
+    return _allEntities.values.where((entity) {
-    List<Entity> groups = [];
+      return
-    List<Entity> nonGroupEntities = [];
+        (excludeDomains.isEmpty || !excludeDomains.contains(entity.domain)) && 
-    _allEntities.forEach((id, entity){
+        (includeDomains.isEmpty || includeDomains.contains(entity.domain)) &&
-      if (entity.isGroup && (entity.attributes['auto'] == null || (entity.attributes['auto'] && !entity.isHidden)) && (!entity.isView)) {
+        ((stateFiler != null && stateFiler.contains(entity.state)) || stateFiler == null);
-        groups.add(entity);
+    }).toList();
-      }
-      if (!entity.isGroup) {
-        nonGroupEntities.add(entity);
-      }
-    });
-
-    nonGroupEntities.forEach((entity) {
-      bool foundInGroup = false;
-      groups.forEach((groupEntity) {
-        if (groupEntity.childEntityIds.contains(entity.entityId)) {
-          foundInGroup = true;
-        }
-      });
-      if (!foundInGroup) {
-        result.add(entity);
-      }
-    });
-    result.insertAll(0, groups);
-
-    return result;
   }
 }

lib/entity_widgets/button_entity_container.dart

@@ -1,50 +0,0 @@
-part of '../main.dart';
-
-class ButtonEntityContainer extends StatelessWidget {
-
-  ButtonEntityContainer({
-    Key key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
-    if (entityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
-      return MissedEntityWidget();
-    }
-    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,
-                )
-            ),
-          ),
-          _buildName()
-        ],
-      ),
-    );
-  }
-
-  Widget _buildName() {
-    return EntityName(
-      padding: EdgeInsets.fromLTRB(Sizes.buttonPadding, 0.0, Sizes.buttonPadding, Sizes.rowPadding),
-      textOverflow: TextOverflow.ellipsis,
-      maxLines: 3,
-      wordsWrap: true,
-      textAlign: TextAlign.center,
-      fontSize: Sizes.nameFontSize,
-    );
-  }
-}

lib/entity_widgets/common/camera_stream_view.dart

@@ -1,70 +0,0 @@
-part of '../../main.dart';
-
-class CameraStreamView extends StatefulWidget {
-
-  CameraStreamView({Key key}) : super(key: key);
-
-  @override
-  _CameraStreamViewState createState() => _CameraStreamViewState();
-}
-
-class _CameraStreamViewState extends State<CameraStreamView> {
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  CameraEntity _entity;
-  bool started = false;
-  String streamUrl = "";
-
-  launchStream() {
-    Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => WebviewScaffold(
-            url: "$streamUrl",
-            withZoom: true,
-            appBar: new AppBar(
-              leading: IconButton(
-                  icon: Icon(Icons.close),
-                  onPressed: () => Navigator.pop(context)
-              ),
-              title: new Text("${_entity.displayName}"),
-            ),
-          ),
-        )
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (!started) {
-      _entity = EntityModel
-          .of(context)
-          .entityWrapper
-          .entity;
-      started = true;
-    }
-    streamUrl = '${ConnectionManager().httpWebHost}/api/camera_proxy_stream/${_entity
-        .entityId}?token=${_entity.attributes['access_token']}';
-    return Column(
-      children: <Widget>[
-        Container(
-            padding: const EdgeInsets.all(20.0),
-            child: IconButton(
-              icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:monitor-screenshot"), color: Colors.amber),
-              iconSize: 50.0,
-              onPressed: () => launchStream(),
-            )
-        )
-      ],
-    );
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-}

lib/entity_widgets/default_entity_container.dart

@@ -1,65 +0,0 @@
-part of '../main.dart';
-
-class DefaultEntityContainer extends StatelessWidget {
-  DefaultEntityContainer({
-    Key key,
-    @required this.state
-  }) : super(key: key);
-
-  final Widget state;
-
-  @override
-  Widget build(BuildContext context) {
-    final EntityModel entityModel = EntityModel.of(context);
-    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
-      return MissedEntityWidget();
-    }
-    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.DIVIDER) {
-      return Divider(
-        color: Colors.black45,
-      );
-    }
-    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.SECTION) {
-      return Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisSize: MainAxisSize.min,
-        children: <Widget>[
-          Divider(
-            color: Colors.black45,
-          ),
-          Text(
-              "${entityModel.entityWrapper.entity.displayName}",
-            style: TextStyle(color: Colors.blue),
-          )
-        ],
-      );
-    }
-    return InkWell(
-      onLongPress: () {
-        if (entityModel.handleTap) {
-          entityModel.entityWrapper.handleHold();
-        }
-      },
-      onTap: () {
-        if (entityModel.handleTap) {
-          entityModel.entityWrapper.handleTap();
-        }
-      },
-      child: Row(
-        mainAxisSize: MainAxisSize.max,
-        children: <Widget>[
-          EntityIcon(),
-
-          Flexible(
-            fit: FlexFit.tight,
-            flex: 3,
-            child: EntityName(
-              padding: EdgeInsets.fromLTRB(10.0, 2.0, 10.0, 2.0),
-            ),
-          ),
-          state
-        ],
-      ),
-    );
-  }
-}

lib/entity_widgets/entity_colors.class.dart

@@ -1,74 +0,0 @@
-part of '../main.dart';
-
-class EntityColor {
-
-  static const defaultStateColor = Color.fromRGBO(68, 115, 158, 1.0);
-
-  static const badgeColors = {
-    "default": Color.fromRGBO(223, 76, 30, 1.0),
-    "binary_sensor": Color.fromRGBO(3, 155, 229, 1.0)
-  };
-
-  static const _stateColors = {
-    EntityState.on: Colors.amber,
-    "auto": Colors.amber,
-    EntityState.active: Colors.amber,
-    EntityState.playing: Colors.amber,
-    "above_horizon": Colors.amber,
-    EntityState.home:  Colors.amber,
-    EntityState.open:  Colors.amber,
-    EntityState.off: defaultStateColor,
-    EntityState.closed: defaultStateColor,
-    "below_horizon": defaultStateColor,
-    "default": defaultStateColor,
-    EntityState.idle: defaultStateColor,
-    "heat": Colors.redAccent,
-    "cool": Colors.lightBlue,
-    EntityState.unavailable: Colors.black26,
-    EntityState.unknown: Colors.black26,
-    EntityState.alarm_disarmed: Colors.green,
-    EntityState.alarm_armed_away: Colors.redAccent,
-    EntityState.alarm_armed_custom_bypass: Colors.redAccent,
-    EntityState.alarm_armed_home: Colors.redAccent,
-    EntityState.alarm_armed_night: Colors.redAccent,
-    EntityState.alarm_triggered: Colors.redAccent,
-    EntityState.alarm_arming: Colors.amber,
-    EntityState.alarm_disarming: Colors.amber,
-    EntityState.alarm_pending: Colors.amber,
-  };
-
-  static Color stateColor(String state) {
-    return _stateColors[state] ?? _stateColors["default"];
-  }
-
-  static charts.Color chartHistoryStateColor(String state, int id) {
-    Color c = _stateColors[state];
-    if (c != null) {
-      return charts.Color(
-          r: c.red,
-          g: c.green,
-          b: c.blue,
-          a: c.alpha
-      );
-    } else {
-      double r = id.toDouble() % 10;
-      return charts.MaterialPalette.getOrderedPalettes(10)[r.round()].shadeDefault;
-    }
-  }
-
-  static Color historyStateColor(String state, int id) {
-    Color c = _stateColors[state];
-    if (c != null) {
-      return c;
-    } else {
-      if (id > -1) {
-        double r = id.toDouble() % 10;
-        charts.Color c1 = charts.MaterialPalette.getOrderedPalettes(10)[r.round()].shadeDefault;
-        return Color.fromARGB(c1.a, c1.r, c1.g, c1.b);
-      } else {
-        return _stateColors[EntityState.on];
-      }
-    }
-  }
-
-}

lib/entity_widgets/entity_page_container.dart

@@ -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,
-    );
-  }
-}

lib/home_assistant.class.dart

@@ -2,6 +2,8 @@ part of 'main.dart';
 
 class HomeAssistant {
 
+  static const DEFAULT_DASHBOARD = 'lovelace';
+
   static final HomeAssistant _instance = HomeAssistant._internal();
 
   factory HomeAssistant() {
@@ -12,21 +14,32 @@ class HomeAssistant {
   HomeAssistantUI ui;
   Map _instanceConfig = {};
   String _userName;
+  String _lovelaceDashbordUrl;
   HSVColor savedColor;
+  int savedPlayerPosition;
+  String sendToPlayerId;
+  String sendFromPlayerId;
+  Map services;
+  bool autoUi = false;
 
   String fcmToken;
 
   Map _rawLovelaceData;
+  var _rawStates;
+  var _rawUserInfo;
+  var _rawPanels;
+
+  set lovelaceDashboardUrl(String val) => _lovelaceDashbordUrl = val;
 
   List<Panel> panels = [];
 
   Duration fetchTimeout = Duration(seconds: 30);
 
   String get locationName {
-    if (ConnectionManager().useLovelace) {
+    if (!autoUi) {
-      return ui?.title ?? "";
+      return ui?.title ?? "Home";
     } else {
-      return _instanceConfig["location_name"] ?? "";
+      return _instanceConfig["location_name"] ?? "Home";
     }
   }
   String get userName => _userName ?? locationName;
@@ -37,38 +50,37 @@ class HomeAssistant {
 
   HomeAssistant._internal() {
     ConnectionManager().onStateChangeCallback = _handleEntityStateChange;
+    ConnectionManager().onLovelaceUpdatedCallback = _handleLovelaceUpdate;
     DeviceInfoManager().loadDeviceInfo();
   }
 
   Completer _fetchCompleter;
 
-  Future fetchData() {
+  Future fetchData(bool uiOnly) {
     if (_fetchCompleter != null && !_fetchCompleter.isCompleted) {
       Logger.w("Previous data fetch is not completed yet");
       return _fetchCompleter.future;
     }
-    if (entities == null) entities = EntityCollection(ConnectionManager().httpWebHost);
     _fetchCompleter = Completer();
     List<Future> futures = [];
-    futures.add(_getStates());
+    if (!uiOnly) {
-    if (ConnectionManager().useLovelace) {
+      if (entities == null) entities = EntityCollection(ConnectionManager().httpWebHost);
-      futures.add(_getLovelace());
+      futures.add(_getStates(null));
+      futures.add(_getConfig(null));
+      futures.add(_getUserInfo(null));
+      futures.add(_getPanels(null));
+      futures.add(_getServices(null));
+    }
+    if (!autoUi) {
+      futures.add(_getLovelace(null));
     }
-    futures.add(_getConfig());
-    futures.add(_getServices());
-    futures.add(_getUserInfo());
-    futures.add(_getPanels());
-    futures.add(ConnectionManager().sendSocketMessage(
-      type: "subscribe_events",
-      additionalData: {"event_type": "state_changed"},
-    ));
     Future.wait(futures).then((_) {
       if (isMobileAppEnabled) {
         _createUI();
         _fetchCompleter.complete();
-        MobileAppIntegrationManager.checkAppRegistration();
+        if (!uiOnly) MobileAppIntegrationManager.checkAppRegistration();
       } else {
-        _fetchCompleter.completeError(HAError("Mobile app component not found", actions: [HAErrorAction.tryAgain(), HAErrorAction(type: HAErrorActionType.URL ,title: "Help",url: "http://ha-client.homemade.systems/docs#mobile-app-integration")]));
+        _fetchCompleter.completeError(HAError("Mobile app component not found", actions: [HAErrorAction.tryAgain(), HAErrorAction(type: HAErrorActionType.URL ,title: "Help",url: "http://ha-client.app/docs#mobile-app-integration")]));
       }
     }).catchError((e) {
       _fetchCompleter.completeError(e);
@@ -76,6 +88,48 @@ class HomeAssistant {
     return _fetchCompleter.future;
   }
 
+  Future<void> fetchDataFromCache() async {
+    Logger.d('Loading cached data');
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    bool cached = prefs.getBool('cached');
+    if (cached != null && cached) {
+      if (entities == null) entities = EntityCollection(ConnectionManager().httpWebHost);
+      try {
+        _getStates(prefs);
+        if (!autoUi) {
+          _getLovelace(prefs);
+        }
+        _getConfig(prefs);
+        _getUserInfo(prefs);
+        _getPanels(prefs);
+        _getServices(prefs);
+        if (isMobileAppEnabled) {
+          _createUI();
+        }  
+      } catch (e) {
+        Logger.d('Didnt get cached data: $e');  
+      }
+    }
+  }
+
+  void saveCache() async {
+    Logger.d('Saving data to cache...');
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    try {
+      await prefs.setString('cached_states', json.encode(_rawStates));
+      await prefs.setString('cached_lovelace', json.encode(_rawLovelaceData));
+      await prefs.setString('cached_user', json.encode(_rawUserInfo));
+      await prefs.setString('cached_config', json.encode(_instanceConfig));
+      await prefs.setString('cached_panels', json.encode(_rawPanels));
+      await prefs.setString('cached_services', json.encode(services));
+      await prefs.setBool('cached', true);
+    } catch (e) {
+      await prefs.setBool('cached', false);
+      Logger.e('Error saving cache: $e');
+    }
+    Logger.d('Done saving cache');
+  }
+
   Future logout() async {
     Logger.d("Logging out...");
     await ConnectionManager().logout().then((_) {
@@ -85,64 +139,181 @@ class HomeAssistant {
     });
   }
 
-  Future _getConfig() async {
+  Future _getConfig(SharedPreferences sharedPrefs) async {
-    await ConnectionManager().sendSocketMessage(type: "get_config").then((data) {
+    if (sharedPrefs != null) {
-      _instanceConfig = Map.from(data);
+      try {
-    }).catchError((e) {
+        var data = json.decode(sharedPrefs.getString('cached_config'));
-      throw HAError("Error getting config: ${e}");
+        _parseConfig(data);
+      } catch (e) {
+        throw HAError("Error getting config: $e");
+      }
+    } else {
+      await ConnectionManager().sendSocketMessage(type: "get_config").then((data) => _parseConfig(data)).catchError((e) {
+        throw HAError("Error getting config: $e");
       });
     }
+  }
 
-  Future _getStates() async {
+  void _parseConfig(data) {
+    _instanceConfig = Map.from(data);
+  }
+
+  Future _getStates(SharedPreferences sharedPrefs) async {
+    if (sharedPrefs != null) {
+      try {
+        var data = json.decode(sharedPrefs.getString('cached_states'));
+        _parseStates(data);
+      } catch (e) {
+        throw HAError("Error getting states: $e");
+      }
+    } else {
       await ConnectionManager().sendSocketMessage(type: "get_states").then(
-            (data) => entities.parse(data)
+              (data) => _parseStates(data)
       ).catchError((e) {
         throw HAError("Error getting states: $e");
       });
     }
-
-  Future _getLovelace() async {
-    await ConnectionManager().sendSocketMessage(type: "lovelace/config").then((data) => _rawLovelaceData = data).catchError((e) {
-      throw HAError("Error getting lovelace config: $e");
-    });
   }
 
-  Future _getUserInfo() async {
+  void _parseStates(data) {
-    _userName = null;
+    _rawStates = data;
-    await ConnectionManager().sendSocketMessage(type: "auth/current_user").then((data) => _userName = data["name"]).catchError((e) {
+    entities.parse(data);
-      Logger.w("Can't get user info: ${e}");
-    });
   }
 
-  Future _getServices() async {
+  Future _getLovelace(SharedPreferences sharedPrefs) {
-    await ConnectionManager().sendSocketMessage(type: "get_services").then((data) => Logger.d("Services received")).catchError((e) {
+    if (sharedPrefs != null) {
-      Logger.w("Can't get services: ${e}");
+      try {
-    });
+        var data = json.decode(sharedPrefs.getString('cached_lovelace'));
+        _rawLovelaceData = data;
+      } catch (e) {
+        autoUi = true;
       }
-
+      return Future.value();
-  Future _getPanels() async {
+    } else {
-    panels.clear();
+      Completer completer = Completer();
-    await ConnectionManager().sendSocketMessage(type: "get_panels").then((data) {
+      var additionalData;
-      data.forEach((k,v) {
+      if (_lovelaceDashbordUrl != HomeAssistant.DEFAULT_DASHBOARD) {
-        String title = v['title'] == null ? "${k[0].toUpperCase()}${k.substring(1)}" : "${v['title'][0].toUpperCase()}${v['title'].substring(1)}";
+        additionalData = {
-        panels.add(Panel(
+          'url_path': _lovelaceDashbordUrl
-            id: k,
+        };
-            type: v["component_name"],
+      }
-            title: title,
+      ConnectionManager().sendSocketMessage(
-            urlPath: v["url_path"],
+        type: 'lovelace/config',
-            config: v["config"],
+        additionalData: additionalData
-            icon: v["icon"]
+      ).then((data) {
-        )
+        _rawLovelaceData = data;
-        );
+        completer.complete();
-      });
       }).catchError((e) {
+        if ("$e" == "config_not_found") {
+          autoUi = true;
+          _rawLovelaceData = null;
+          completer.complete();
+        } else {
+          completer.completeError(HAError("Error getting lovelace config: $e"));
+        }
+      });
+      return completer.future;
+    }
+  }
+
+  Future _getServices(SharedPreferences prefs) async {	
+    if (prefs != null) {
+      try {
+        var data = json.decode(prefs.getString('cached_services'));
+        _parseServices(data);
+      } catch (e) {
+        Logger.w("Can't get services: $e");  
+      }
+    }
+    await ConnectionManager().sendSocketMessage(type: "get_services").then((data) => _parseServices(data)).catchError((e) {	
+      Logger.w("Can't get services: $e");	
+    });	
+  }
+
+  void _parseServices(data) {
+    services = data;
+  }
+
+  Future _getUserInfo(SharedPreferences sharedPrefs) async {
+    _userName = null;
+    await ConnectionManager().sendSocketMessage(type: "auth/current_user").then((data) => _parseUserInfo(data)).catchError((e) {
+      Logger.w("Can't get user info: $e");
+    });
+  }
+
+  void _parseUserInfo(data) {
+    _rawUserInfo = data;
+    _userName = data["name"];
+  }
+
+  Future _getPanels(SharedPreferences sharedPrefs) async {
+    if (sharedPrefs != null) {
+      try {
+        var data = json.decode(sharedPrefs.getString('cached_panels'));
+        _parsePanels(data);
+      } catch (e) {
+        throw HAError("Error getting panels list: $e");
+      }
+    } else {
+      await ConnectionManager().sendSocketMessage(type: "get_panels").then((data) => _parsePanels(data)).catchError((e) {
         throw HAError("Error getting panels list: $e");
       });
     }
+  }
+
+  void _parsePanels(data) {
+    _rawPanels = data;
+    panels.clear();
+    List<Panel> dashboards = [];
+    data.forEach((k,v) {
+        String title = v['title'] == null ? "${k[0].toUpperCase()}${k.substring(1)}" : "${v['title'][0].toUpperCase()}${v['title'].substring(1)}";
+        if (v['component_name'] != null && v['component_name'] == 'lovelace') {
+          dashboards.add(
+            Panel(
+              id: k,
+              componentName: v['component_name'],
+              title: title,
+              urlPath: v['url_path'],
+              config: v['config'],
+              icon: (v['icon'] == null || v['icon'] == 'hass:view-dashboard') ? 'mdi:view-dashboard' : v['icon']
+            )  
+          );
+        } else {
+          panels.add(
+            Panel(
+              id: k,
+              componentName: v['component_name'],
+              title: title,
+              urlPath: v['url_path'],
+              config: v['config'],
+              icon: v['icon']
+            )
+          );
+        }
+    });
+    panels.insertAll(0, dashboards);
+  }
+
+  Future getCameraStream(String entityId) {
+    Completer completer = Completer();
+
+    ConnectionManager().sendSocketMessage(type: "camera/stream", additionalData: {"entity_id": entityId}).then((data) {
+      completer.complete(data);
+    }).catchError((e) {
+      completer.completeError(e);
+    });
+    return completer.future;
+  }
+
+  void _handleLovelaceUpdate() {
+    if (_fetchCompleter != null && _fetchCompleter.isCompleted) {
+      eventBus.fire(new LovelaceChangedEvent());
+    }
+  }
 
   void _handleEntityStateChange(Map eventData) {
     //TheLogger.debug( "New state for ${eventData['entity_id']}");
-    if (_fetchCompleter.isCompleted) {
+    if (_fetchCompleter != null && _fetchCompleter.isCompleted) {
       Map data = Map.from(eventData);
       eventBus.fire(new StateChangedEvent(
           entityId: data["entity_id"],
@@ -151,196 +322,26 @@ class HomeAssistant {
     }
   }
 
-  void _parseLovelace() {
+  bool isServiceExist(String service) {
-      Logger.d("--Title: ${_rawLovelaceData["title"]}");
+    return services != null &&
-      ui.title = _rawLovelaceData["title"];
+      services.isNotEmpty &&
-      int viewCounter = 0;
+      services.containsKey(service);
-      Logger.d("--Views count: ${_rawLovelaceData['views'].length}");
-      _rawLovelaceData["views"].forEach((rawView){
-        Logger.d("----view id: ${rawView['id']}");
-        HAView view = HAView(
-            count: viewCounter,
-            id: "${rawView['id']}",
-            name: rawView['title'],
-            iconName: rawView['icon']
-        );
-
-        if (rawView['badges'] != null && rawView['badges'] is List) {
-          rawView['badges'].forEach((entity) {
-            if (entities.isExist(entity)) {
-              Entity e = entities.get(entity);
-              view.badges.add(e);
-            }
-          });
-        }
-
-        view.cards.addAll(_createLovelaceCards(rawView["cards"] ?? []));
-        ui.views.add(
-            view
-        );
-        viewCounter += 1;
-      });
-  }
-
-  List<HACard> _createLovelaceCards(List rawCards) {
-    List<HACard> result = [];
-    rawCards.forEach((rawCard){
-      try {
-        //bool isThereCardOptionsInside = rawCard["card"] != null;
-        var rawCardInfo =  rawCard["card"] ?? rawCard;
-        HACard card = HACard(
-            id: "card",
-            name: rawCardInfo["title"] ?? rawCardInfo["name"],
-            type: rawCardInfo['type'] ?? CardType.entities,
-            columnsCount: rawCardInfo['columns'] ?? 4,
-            showName: rawCardInfo['show_name'] ?? true,
-            showState: rawCardInfo['show_state'] ?? true,
-            showEmpty: rawCardInfo['show_empty'] ?? true,
-            stateFilter: rawCardInfo['state_filter'] ?? [],
-            states: rawCardInfo['states'],
-            conditions: rawCard['conditions'] ?? [],
-            content: rawCardInfo['content']
-        );
-        if (rawCardInfo["cards"] != null) {
-          card.childCards = _createLovelaceCards(rawCardInfo["cards"]);
-        }
-        rawCardInfo["entities"]?.forEach((rawEntity) {
-          if (rawEntity is String) {
-            if (entities.isExist(rawEntity)) {
-              card.entities.add(EntityWrapper(entity: entities.get(rawEntity)));
-            } else {
-              card.entities.add(EntityWrapper(entity: Entity.missed(rawEntity)));
-            }
-          } else {
-            if (rawEntity["type"] == "divider") {
-              card.entities.add(EntityWrapper(entity: Entity.divider()));
-            } else if (rawEntity["type"] == "section") {
-              card.entities.add(EntityWrapper(entity: Entity.section(rawEntity["label"] ?? "")));
-            } else if (rawEntity["type"] == "call-service") {
-              Map uiActionData = {
-                "tap_action": {
-                  "action": EntityUIAction.callService,
-                  "service": rawEntity["service"],
-                  "service_data": rawEntity["service_data"]
-                },
-                "hold_action": EntityUIAction.none
-              };
-              card.entities.add(EntityWrapper(
-                  entity: Entity.callService(
-                    icon: rawEntity["icon"],
-                    name: rawEntity["name"],
-                    service: rawEntity["service"],
-                    actionName: rawEntity["action_name"]
-                  ),
-                uiAction: EntityUIAction(rawEntityData: uiActionData)
-              )
-              );
-            } else if (rawEntity["type"] == "weblink") {
-              Map uiActionData = {
-                "tap_action": {
-                  "action": EntityUIAction.navigate,
-                  "service": rawEntity["url"]
-                },
-                "hold_action": EntityUIAction.none
-              };
-              card.entities.add(EntityWrapper(
-                  entity: Entity.weblink(
-                      icon: rawEntity["icon"],
-                      name: rawEntity["name"],
-                      url: rawEntity["url"]
-                  ),
-                  uiAction: EntityUIAction(rawEntityData: uiActionData)
-              )
-              );
-            } else if (entities.isExist(rawEntity["entity"])) {
-              Entity e = entities.get(rawEntity["entity"]);
-              card.entities.add(
-                  EntityWrapper(
-                      entity: e,
-                      displayName: rawEntity["name"],
-                      icon: rawEntity["icon"],
-                      uiAction: EntityUIAction(rawEntityData: rawEntity)
-                  )
-              );
-            } else {
-              card.entities.add(EntityWrapper(entity: Entity.missed(rawEntity["entity"])));
-            }
-          }
-        });
-        if (rawCardInfo["entity"] != null) {
-          var en = rawCardInfo["entity"];
-          if (en is String) {
-            if (entities.isExist(en)) {
-              Entity e = entities.get(en);
-              card.linkedEntityWrapper = EntityWrapper(
-                  entity: e,
-                  icon: rawCardInfo["icon"],
-                  displayName: rawCardInfo["name"],
-                  uiAction: EntityUIAction(rawEntityData: rawCard)
-              );
-            } else {
-              card.linkedEntityWrapper = EntityWrapper(entity: Entity.missed(en));
-            }
-          } else {
-            if (entities.isExist(en["entity"])) {
-              Entity e = entities.get(en["entity"]);
-              card.linkedEntityWrapper = EntityWrapper(
-                  entity: e,
-                  icon: en["icon"],
-                  displayName: en["name"],
-                  uiAction: EntityUIAction(rawEntityData: rawCard)
-              );
-            } else {
-              card.linkedEntityWrapper = EntityWrapper(entity: Entity.missed(en["entity"]));
-            }
-          }
-        }
-        result.add(card);
-      } catch (e) {
-          Logger.e("There was an error parsing card: ${e.toString()}");
-      }
-    });
-    return result;
   }
 
   void _createUI() {
-    ui = HomeAssistantUI();
-    if ((ConnectionManager().useLovelace) && (_rawLovelaceData != null)) {
     Logger.d("Creating Lovelace UI");
-      _parseLovelace();
+    ui = HomeAssistantUI(rawLovelaceConfig: _rawLovelaceData);
-    } else {
+    /*if (isServiceExist('zha_map')) {
-      Logger.d("Creating group-based UI");
+      panels.add(
-      int viewCounter = 0;
+          Panel(
-      if (!entities.hasDefaultView) {
+            id: 'haclient_zha',
-        HAView view = HAView(
+            componentName: 'haclient_zha',
-            count: viewCounter,
+            title: 'ZHA',
-            id: "group.default_view",
+            urlPath: '/haclient_zha',
-            name: "Home",
+            icon: 'mdi:zigbee'
-            childEntities: entities.filterEntitiesForDefaultView()
+          )
         );
-        ui.views.add(
+    }*/
-            view
-        );
-        viewCounter += 1;
-      }
-      entities.viewEntities.forEach((viewEntity) {
-        HAView view = HAView(
-            count: viewCounter,
-            id: viewEntity.entityId,
-            name: viewEntity.displayName,
-            childEntities: viewEntity.childEntities
-        );
-        view.linkedEntity = viewEntity;
-        ui.views.add(
-            view
-        );
-        viewCounter += 1;
-      });
-    }
-  }
-
-  Widget buildViews(BuildContext context, TabController tabController) {
-    return ui.build(context, tabController);
   }
 }
 

lib/main.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'dart:async';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -16,11 +17,24 @@ import 'package:progress_indicators/progress_indicators.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:flutter_custom_tabs/flutter_custom_tabs.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:device_info/device_info.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:in_app_purchase/in_app_purchase.dart';
+import 'plugins/circular_slider/single_circular_slider.dart';
+import 'plugins/dynamic_multi_column_layout.dart';
+import 'plugins/spoiler_card.dart';
+import 'package:workmanager/workmanager.dart' as workManager;
+import 'package:geolocator/geolocator.dart';
+import 'package:battery/battery.dart';
+import 'package:firebase_crashlytics/firebase_crashlytics.dart';
+import 'package:flutter_webview_plugin/flutter_webview_plugin.dart' as standaloneWebview;
+import 'package:webview_flutter/webview_flutter.dart';
+import 'package:syncfusion_flutter_core/core.dart';
+import 'package:syncfusion_flutter_gauges/gauges.dart';
+
+import 'utils/logger.dart';
+import '.secrets.dart';
 
 part 'const.dart';
 part 'utils/launcher.dart';
@@ -45,35 +59,34 @@ part 'entities/fan/fan_entity.class.dart';
 part 'entities/automation/automation_entity.class.dart';
 part 'entities/camera/camera_entity.class.dart';
 part 'entities/alarm_control_panel/alarm_control_panel_entity.class.dart';
-part 'entity_widgets/common/badge.dart';
+part 'entities/badge.widget.dart';
-part 'entity_widgets/model_widgets.dart';
+part 'entities/entity_model.widget.dart';
-part 'entity_widgets/default_entity_container.dart';
+part 'entities/default_entity_container.widget.dart';
-part 'entity_widgets/missed_entity.dart';
+part 'entities/missed_entity.widget.dart';
-part 'entity_widgets/glance_entity_container.dart';
+part 'cards/widgets/glance_card_entity_container.dart';
-part 'entity_widgets/button_entity_container.dart';
+part 'cards/widgets/entity_button_card_body.widget.dart';
-part 'entity_widgets/common/entity_attributes_list.dart';
+part 'pages/widgets/entity_attributes_list.dart';
-part 'entity_widgets/entity_icon.dart';
+part 'entities/entity_icon.widget.dart';
-part 'entity_widgets/entity_name.dart';
+part 'entities/entity_name.widget.dart';
-part 'entity_widgets/common/last_updated.dart';
+part 'pages/widgets/last_updated.dart';
-part 'entity_widgets/common/mode_swicth.dart';
+part 'entities/climate/widgets/mode_swicth.dart';
-part 'entity_widgets/common/mode_selector.dart';
+part 'entities/climate/widgets/mode_selector.dart';
-part 'entity_widgets/common/universal_slider.dart';
+part 'entities/universal_slider.widget.dart';
-part 'entity_widgets/common/flat_service_button.dart';
+part 'entities/flat_service_button.widget.dart';
-part 'entity_widgets/common/light_color_picker.dart';
+part 'entities/light/widgets/light_color_picker.dart';
-part 'entity_widgets/common/camera_stream_view.dart';
+part 'entities/camera/widgets/camera_stream_view.dart';
-part 'entity_widgets/entity_colors.class.dart';
+part 'plugins/history_chart/entity_history.dart';
-part 'entity_widgets/entity_page_container.dart';
+part 'plugins/history_chart/simple_state_history_chart.dart';
-part 'entity_widgets/history_chart/entity_history.dart';
+part 'plugins/history_chart/numeric_state_history_chart.dart';
-part 'entity_widgets/history_chart/simple_state_history_chart.dart';
+part 'plugins/history_chart/combined_history_chart.dart';
-part 'entity_widgets/history_chart/numeric_state_history_chart.dart';
+part 'plugins/history_chart/history_control_widget.dart';
-part 'entity_widgets/history_chart/combined_history_chart.dart';
+part 'plugins/history_chart/entity_history_moment.dart';
-part 'entity_widgets/history_chart/history_control_widget.dart';
-part 'entity_widgets/history_chart/entity_history_moment.dart';
 part 'entities/switch/widget/switch_state.dart';
 part 'entities/slider/widgets/slider_controls.dart';
 part 'entities/text/widgets/text_input_state.dart';
 part 'entities/select/widgets/select_state.dart';
-part 'entity_widgets/common/simple_state.dart';
+part 'entities/simple_state.widget.dart';
+part 'entities/entity_picture.widget.dart';
 part 'entities/timer/widgets/timer_state.dart';
 part 'entities/climate/widgets/climate_state.widget.dart';
 part 'entities/cover/widgets/cover_state.dart';
@@ -86,17 +99,24 @@ part 'entities/light/widgets/light_controls.dart';
 part 'entities/media_player/widgets/media_player_widgets.dart';
 part 'entities/fan/widgets/fan_controls.dart';
 part 'entities/alarm_control_panel/widgets/alarm_control_panel_controls.widget.dart';
-part 'pages/settings.page.dart';
+part 'entities/vacuum/vacuum_entity.class.dart';
+part 'entities/vacuum/widgets/vacuum_controls.dart';
+part 'entities/vacuum/widgets/vacuum_state_button.dart';
+part 'pages/settings/connection_settings.part.dart';
 part 'pages/purchase.page.dart';
 part 'pages/widgets/product_purchase.widget.dart';
 part 'pages/widgets/page_loading_indicator.dart';
 part 'pages/widgets/page_loading_error.dart';
 part 'pages/panel.page.dart';
-part 'pages/main.page.dart';
+part 'pages/main/main.page.dart';
+part 'pages/settings/integration_settings.part.dart';
+part 'pages/settings/app_settings.page.dart';
+part 'pages/settings/lookandfeel_settings.part.dart';
+part 'pages/zha_page.dart';
 part 'home_assistant.class.dart';
 part 'pages/log.page.dart';
 part 'pages/entity.page.dart';
-part 'mdi.class.dart';
+part 'utils/mdi.class.dart';
 part 'entity_collection.class.dart';
 part 'managers/auth_manager.class.dart';
 part 'managers/location_manager.class.dart';
@@ -104,85 +124,144 @@ part 'managers/mobile_app_integration_manager.class.dart';
 part 'managers/connection_manager.class.dart';
 part 'managers/device_info_manager.class.dart';
 part 'managers/startup_user_messages_manager.class.dart';
-part 'ui_class/ui.dart';
+part 'managers/theme_manager.dart';
-part 'ui_class/view.class.dart';
+part 'ui.dart';
-part 'ui_class/card.class.dart';
+part 'view.class.dart';
-part 'ui_class/sizes_class.dart';
+part 'cards/card.class.dart';
-part 'ui_class/panel_class.dart';
+part 'panels/panel_class.dart';
-part 'ui_widgets/view.dart';
+part 'viewWidget.widget.dart';
-part 'ui_widgets/card_widget.dart';
+part 'cards/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';
 part 'types/ha_error.dart';
 part 'types/event_bus_events.dart';
-
+part 'cards/widgets/gauge_card_body.dart';
+part 'cards/widgets/light_card_body.dart';
+part 'pages/play_media.page.dart';
+part 'entities/entity_page_layout.widget.dart';
+part 'entities/media_player/widgets/media_player_seek_bar.widget.dart';
+part 'entities/media_player/widgets/media_player_progress_bar.widget.dart';
+part 'pages/whats_new.page.dart';
+part 'pages/fullscreen.page.dart';
 
 EventBus eventBus = new EventBus();
 final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
 FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = new FlutterLocalNotificationsPlugin();
 const String appName = "HA Client";
-const appVersion = "0.6.5";
+const appVersionNumber = "0.8.4";
+const appVersionAdd = "";
+const appVersion = "$appVersionNumber$appVersionAdd";
+
+Future<void> _reportError(dynamic error, dynamic stackTrace) async {
+    // Print the exception to the console.
+    if (Logger.isInDebugMode) {
+      Logger.e('Caught error: $error');
+      Logger.p(stackTrace);
+    }
+    Crashlytics.instance.recordError(error, stackTrace);
+
+}
 
 void main() async {
-  FlutterError.onError = (errorDetails) {
+  Crashlytics.instance.enableInDevMode = false;
-    Logger.e( "${errorDetails.exception}");
+  SyncfusionLicense.registerLicense(secrets['syncfusion_license_key']); 
+
+  FlutterError.onError = (FlutterErrorDetails details) {
+    Logger.e("Caut Flutter runtime error: ${details.exception}");
     if (Logger.isInDebugMode) {
-      FlutterError.dumpErrorToConsole(errorDetails);
+      FlutterError.dumpErrorToConsole(details);
     }
+    Crashlytics.instance.recordFlutterError(details);
   };
 
-  runZoned(() {
+  WidgetsFlutterBinding.ensureInitialized();
-    //AndroidAlarmManager.initialize().then((_) {
+  SharedPreferences prefs = await SharedPreferences.getInstance();
-      runApp(new HAClientApp());
+  AppTheme theme = AppTheme.values[prefs.getInt('app-theme') ?? AppTheme.defaultTheme.index];
-    //  print("Running MAIN isolate ${Isolate.current.hashCode}");
-    //});
 
+  runZoned(() {
+      runApp(new HAClientApp(
+        theme: theme,
+      ));
   }, onError: (error, stack) {
-    Logger.e("$error");
+    _reportError(error, stack);
-    Logger.e("$stack");
-    if (Logger.isInDebugMode) {
-      debugPrint("$stack");
-    }
   });
 }
 
-class HAClientApp extends StatelessWidget {
+class HAClientApp extends StatefulWidget {
+
+  final AppTheme theme;
+
+  const HAClientApp({Key key, this.theme: AppTheme.defaultTheme}) : super(key: key);
+
+  @override
+  _HAClientAppState createState() => new _HAClientAppState();
+
+}
+
+class _HAClientAppState extends State<HAClientApp> {
+  StreamSubscription<List<PurchaseDetails>> _purchaseUpdateSubscription;
+  StreamSubscription _themeChangeSubscription;
+  AppTheme _currentTheme = AppTheme.defaultTheme;
+  
+  @override
+  void initState() {
+    InAppPurchaseConnection.enablePendingPurchases();
+    final Stream purchaseUpdates =
+        InAppPurchaseConnection.instance.purchaseUpdatedStream;
+    _purchaseUpdateSubscription = purchaseUpdates.listen((purchases) {
+      _handlePurchaseUpdates(purchases);
+    });
+    _currentTheme = widget.theme;
+    _themeChangeSubscription = eventBus.on<ChangeThemeEvent>().listen((event){
+      setState(() {
+        _currentTheme = event.theme;
+      });
+    });
+    workManager.Workmanager.initialize(
+      updateDeviceLocationIsolate,
+      isInDebugMode: false
+    );
+    super.initState();
+  }
+
+  void _handlePurchaseUpdates(purchase) {
+    if (purchase is List<PurchaseDetails>) {
+      if (purchase[0].status == PurchaseStatus.purchased) {
+        eventBus.fire(ShowPopupMessageEvent(
+            title: "Thanks a lot!",
+            body: "Thank you for supporting HA Client development!",
+            buttonText: "Ok"
+        ));
+      } else {
+        Logger.d("Purchase change handler: ${purchase[0].status}");
+      }
+    } else {
+      Logger.e("Something wrong with purchase handling. Got: $purchase");
+    }
+  }
 
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
     return new MaterialApp(
       title: appName,
-      theme: new ThemeData(
+      theme: HAClientTheme().getThemeData(_currentTheme),
-        primarySwatch: Colors.blue,
+      darkTheme: HAClientTheme().darkTheme,
-      ),
+      debugShowCheckedModeBanner: false,
       initialRoute: "/",
       routes: {
         "/": (context) => MainPage(title: 'HA Client'),
-        "/connection-settings": (context) => ConnectionSettingsPage(title: "Settings"),
+        "/app-settings": (context) => AppSettingsPage(),
+        "/connection-settings": (context) => AppSettingsPage(showSection: AppSettingsSection.connectionSettings),
+        "/integration-settings": (context) => AppSettingsPage(showSection: AppSettingsSection.integrationSettings),
         "/putchase": (context) => PurchasePage(title: "Support app development"),
+        "/play-media": (context) => PlayMediaPage(
+          mediaUrl: "${ModalRoute.of(context).settings.arguments != null ? (ModalRoute.of(context).settings.arguments as Map)['url'] : ''}",
+          mediaType: "${ModalRoute.of(context).settings.arguments != null ? (ModalRoute.of(context).settings.arguments as Map)['type'] ?? '' : ''}",
+        ),
         "/log-view": (context) => LogViewPage(title: "Log"),
-        "/login": (context) => WebviewScaffold(
+        "/webview": (context) => standaloneWebview.WebviewScaffold(
-          url: "${ConnectionManager().oauthUrl}",
-          appBar: new AppBar(
-            leading: IconButton(
-                icon: Icon(Icons.help),
-                onPressed: () => Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.homemade.systems/docs#authentication")
-            ),
-            title: new Text("Login with HA"),
-            actions: <Widget>[
-              FlatButton(
-                child: Text("Manual", style: TextStyle(color: Colors.white)),
-                onPressed: () {
-                  eventBus.fire(ShowPageEvent(path: "/connection-settings", goBackFirst: true));
-                },
-              )
-            ],
-          ),
-        ),
-        "/webview": (context) => WebviewScaffold(
           url: "${(ModalRoute.of(context).settings.arguments as Map)['url']}",
           appBar: new AppBar(
             leading: IconButton(
@@ -191,8 +270,37 @@ class HAClientApp extends StatelessWidget {
             ),
             title: new Text("${(ModalRoute.of(context).settings.arguments as Map)['title']}"),
           ),
+        ),
+        "/whats-new": (context) => WhatsNewPage(),
+        "/haclient_zha": (context) => ZhaPage(),
+        "/auth": (context) => new standaloneWebview.WebviewScaffold(
+          url: "${ConnectionManager().oauthUrl}",
+          appBar: new AppBar(
+            leading: IconButton(
+                icon: Icon(Icons.help),
+                onPressed: () => Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.app/docs#authentication")
+            ),
+            title: new Text("Login with HA"),
+            actions: <Widget>[
+              FlatButton(
+                child: Text("Manual", style: Theme.of(context).textTheme.button.copyWith(
+                  decoration: TextDecoration.underline
+                )),
+                onPressed: () {
+                  eventBus.fire(ShowPageEvent(path: "/connection-settings", goBackFirst: true));
+                },
+              )
+            ],
+          ),
         )
       },
     );
   }
+
+  @override
+  void dispose() {
+    _purchaseUpdateSubscription.cancel();
+    _themeChangeSubscription.cancel();
+    super.dispose();
+  }
 }

lib/managers/auth_manager.class.dart

@@ -10,31 +10,31 @@ class AuthManager {
 
   AuthManager._internal();
 
-  Future getTempToken({String oauthUrl}) {
+  Future start({String oauthUrl}) {
     Completer completer = Completer();
-    final flutterWebviewPlugin = new FlutterWebviewPlugin();
+    final flutterWebviewPlugin = new standaloneWebview.FlutterWebviewPlugin();
     flutterWebviewPlugin.onUrlChanged.listen((String url) {
-      if (url.startsWith("http://ha-client.homemade.systems/service/auth_callback.html")) {
+      if (url.startsWith("https://ha-client.app/service/auth_callback.html")) {
+        Logger.d("url=$url");
         String authCode = url.split("=")[1];
+        Logger.d("authCode=$authCode");
         Logger.d("We have auth code. Getting temporary access token...");
         ConnectionManager().sendHTTPPost(
           endPoint: "/auth/token",
           contentType: "application/x-www-form-urlencoded",
           includeAuthHeader: false,
-            data: "grant_type=authorization_code&code=$authCode&client_id=${Uri.encodeComponent('http://ha-client.homemade.systems/')}"
+          data: "grant_type=authorization_code&code=$authCode&client_id=${Uri.encodeComponent('https://ha-client.app')}"
         ).then((response) {
           Logger.d("Got temp token");
           String tempToken = json.decode(response)['access_token'];
           Logger.d("Closing webview...");
-          //flutterWebviewPlugin.close();
           eventBus.fire(StartAuthEvent(oauthUrl, false));
           completer.complete(tempToken);
         }).catchError((e) {
-          //flutterWebviewPlugin.close();
           Logger.e("Error getting temp token: ${e.toString()}");
           eventBus.fire(StartAuthEvent(oauthUrl, false));
           completer.completeError(HAError("Error getting temp token"));
-        });
+        }).whenComplete(() => flutterWebviewPlugin.close());
       }
     });
     Logger.d("Launching OAuth");

lib/managers/connection_manager.class.dart

@@ -19,8 +19,8 @@ class ConnectionManager {
   String _tempToken;
   String oauthUrl;
   String webhookId;
-  bool useLovelace = true;
   bool settingsLoaded = false;
+  int appIntegrationVersion;
   bool get isAuthenticated => _token != null;
   StreamSubscription _socketSubscription;
   Duration connectTimeout = Duration(seconds: 15);
@@ -28,6 +28,7 @@ class ConnectionManager {
   bool isConnected = false;
 
   var onStateChangeCallback;
+  var onLovelaceUpdatedCallback;
 
   IOWebSocketChannel _socket;
 
@@ -38,12 +39,12 @@ class ConnectionManager {
     Completer completer = Completer();
     bool stopInit = false;
     if (loadSettings) {
-      Logger.e("Loading settings...");
+      Logger.d("Loading settings...");
       SharedPreferences prefs = await SharedPreferences.getInstance();
-      useLovelace = prefs.getBool('use-lovelace') ?? true;
       _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";
@@ -59,9 +60,9 @@ class ConnectionManager {
           _token = await storage.read(key: "hacl_llt");
           Logger.e("Long-lived token read successful");
           oauthUrl = "$httpWebHost/auth/authorize?client_id=${Uri.encodeComponent(
-              'http://ha-client.homemade.systems/')}&redirect_uri=${Uri
+              'https://ha-client.app')}&redirect_uri=${Uri
               .encodeComponent(
-              'http://ha-client.homemade.systems/service/auth_callback.html')}";
+              'https://ha-client.app/service/auth_callback.html')}";
           settingsLoaded = true;
         } catch (e) {
           completer.completeError(HAError("Error reading login details", actions: [HAErrorAction.tryAgain(type: HAErrorActionType.FULL_RELOAD), HAErrorAction.loginAgain()]));
@@ -79,7 +80,7 @@ class ConnectionManager {
 
     if (!stopInit) {
       if (_token == null) {
-        AuthManager().getTempToken(
+        AuthManager().start(
             oauthUrl: oauthUrl
         ).then((token) {
           Logger.d("Token from AuthManager recived");
@@ -98,14 +99,23 @@ class ConnectionManager {
 
   void _doConnect({Completer completer, bool forceReconnect}) {
     if (forceReconnect || !isConnected) {
-      _connect().timeout(connectTimeout, onTimeout: () {
+      _disconnect().then((_){
-        _disconnect().then((_) {
+        _connect().timeout(connectTimeout).then((_) {
-          completer?.completeError(HAError("Connection timeout"));
-        });
-      }).then((_) {
           completer?.complete();
         }).catchError((e) {
+          _disconnect().then((_) {
+            if (e is TimeoutException) {
+              if (connecting != null && !connecting.isCompleted) {
+                connecting.completeError(HAError("Connection timeout"));
+              }
+              completer?.completeError(HAError("Connection timeout"));
+            } else if (e is HAError) {
               completer?.completeError(e);
+            } else {
+              completer?.completeError(HAError("${e.toString()}"));
+            }
+          });
+        });
       });
     } else {
       completer?.complete();
@@ -122,6 +132,7 @@ class ConnectionManager {
       connecting = Completer();
       _disconnect().then((_) {
         Logger.d("Socket connecting...");
+        try {
           _socket = IOWebSocketChannel.connect(
             _webSocketAPIEndpoint, pingInterval: Duration(seconds: 15));
           _socketSubscription = _socket.stream.listen(
@@ -138,11 +149,21 @@ class ConnectionManager {
                   });
                 } else if (data["type"] == "auth_ok") {
                   Logger.d("[Received] <== ${data.toString()}");
+                  Logger.d("[Connection] Subscribing to events");
+                  sendSocketMessage(
+                    type: "subscribe_events",
+                    additionalData: {"event_type": "lovelace_updated"},
+                  );
+                  sendSocketMessage(
+                    type: "subscribe_events",
+                    additionalData: {"event_type": "state_changed"},
+                  ).whenComplete((){
                     _messageResolver["auth"]?.complete();
                     _messageResolver.remove("auth");
                     if (_token != null) {
                       if (!connecting.isCompleted) connecting.complete();
                     }
+                  });
                 } else if (data["type"] == "auth_invalid") {
                   Logger.d("[Received] <== ${data.toString()}");
                   _messageResolver["auth"]?.completeError(HAError("${data["message"]}", actions: [HAErrorAction.loginAgain()]));
@@ -156,13 +177,14 @@ class ConnectionManager {
               onDone: () => _handleSocketClose(connecting),
               onError: (e) => _handleSocketError(e, connecting)
           );
+        } catch(exeption) {
+          connecting.completeError(HAError("${exeption.toString()}"));
+        }
       });
       return connecting.future;
     }
   }
 
-
-
   Future _disconnect() {
     Completer completer = Completer();
     if (!isConnected) {
@@ -186,21 +208,22 @@ class ConnectionManager {
   _handleMessage(data) {
     if (data["type"] == "result") {
       if (data["id"] != null && data["success"]) {
-        Logger.d("[Received] <== Request id ${data['id']} was successful");
+        //Logger.d("[Received] <== Request id ${data['id']} was successful");
         _messageResolver["${data["id"]}"]?.complete(data["result"]);
       } else if (data["id"] != null) {
         Logger.e("[Received] <== Error received on request id ${data['id']}: ${data['error']}");
-        _messageResolver["${data["id"]}"]?.completeError("${data['error']["message"]}");
+        _messageResolver["${data["id"]}"]?.completeError("${data["error"]["code"]}");
       }
       _messageResolver.remove("${data["id"]}");
     } else if (data["type"] == "event") {
-      if ((data["event"] != null) && (data["event"]["event_type"] == "state_changed")) {
+      if (data["event"] != null) {
+        if (data["event"]["event_type"] == "state_changed") {
           Logger.d("[Received] <== ${data['type']}.${data["event"]["event_type"]}: ${data["event"]["data"]["entity_id"]}");
           onStateChangeCallback(data["event"]["data"]);
-      } else if (data["event"] != null) {
+        } else if (data["event"]["event_type"] == "lovelace_updated") {
-        Logger.w("Unhandled event type: ${data["event"]["event_type"]}");
+          Logger.d("[Received] <== ${data['type']}.${data["event"]["event_type"]}: $data");
-      } else {
+          onLovelaceUpdatedCallback();
-        Logger.e("Event is null: $data");
+        }  
       }
     } else {
       Logger.d("[Received unhandled] <== ${data.toString()}");
@@ -209,38 +232,24 @@ class ConnectionManager {
 
   void _handleSocketClose(Completer connectionCompleter) {
     Logger.d("Socket disconnected.");
+    _disconnect().then((_) {
       if (!connectionCompleter.isCompleted) {
         isConnected = false;
         connectionCompleter.completeError(HAError("Disconnected", actions: [HAErrorAction.reconnect()]));
-    } else {
+      }
-      _disconnect().then((_) {
-        Timer(Duration(seconds: 5), () {
-          Logger.d("Trying to reconnect...");
-          _connect().catchError((e) {
-            isConnected = false;
       eventBus.fire(ShowErrorEvent(HAError("Unable to connect to Home Assistant")));  
     });
-        });
-      });
-    }
   }
 
   void _handleSocketError(e, Completer connectionCompleter) {
     Logger.e("Socket stream Error: $e");
+    _disconnect().then((_) {
       if (!connectionCompleter.isCompleted) {
         isConnected = false;
-      connectionCompleter.completeError(HAError("Unable to connect to Home Assistant"));
+        connectionCompleter.completeError(HAError("Disconnected", actions: [HAErrorAction.reconnect()]));
-    } else {
+      }
-      _disconnect().then((_) {
-        Timer(Duration(seconds: 5), () {
-          Logger.d("Trying to reconnect...");
-          _connect().catchError((e) {
-            isConnected = false;
       eventBus.fire(ShowErrorEvent(HAError("Unable to connect to Home Assistant")));  
     });
-        });
-      });
-    }
   }
 
   Future _authenticate() {
@@ -329,13 +338,13 @@ class ConnectionManager {
     _messageResolver[callbackName] = _completer;
     String rawMessage = json.encode(dataObject);
     if (!isConnected) {
-      _connect().timeout(connectTimeout, onTimeout: (){
+      _connect().timeout(connectTimeout).then((_) {
-        _completer.completeError(HAError("No connection to Home Assistant", actions: [HAErrorAction.reconnect()]));
-      }).then((_) {
         Logger.d("[Sending] ==> ${auth ? "type="+dataObject['type'] : rawMessage}");
         _socket.sink.add(rawMessage);
       }).catchError((e) {
-        _completer.completeError(e);
+        if (!_completer.isCompleted) {
+          _completer.completeError(HAError("No connection to Home Assistant", actions: [HAErrorAction.reconnect()]));
+        }
       });
     } else {
       Logger.d("[Sending] ==> ${auth ? "type="+dataObject['type'] : rawMessage}");
@@ -348,18 +357,29 @@ class ConnectionManager {
     _currentMessageId += 1;
   }
 
-  Future callService({String domain, String service, String entityId, Map additionalServiceData}) {
+  Future callService({@required String domain, @required String service, entityId, Map data}) {
+    eventBus.fire(NotifyServiceCallEvent(domain, service, entityId));
+    Logger.d("Service call: $domain.$service, $entityId, $data");
+    Completer completer = Completer();
     Map serviceData = {};
     if (entityId != null) {
       serviceData["entity_id"] = entityId;
     }
-    if (additionalServiceData != null && additionalServiceData.isNotEmpty) {
+    if (data != null && data.isNotEmpty) {
-      serviceData.addAll(additionalServiceData);
+      serviceData.addAll(data);
     }
     if (serviceData.isNotEmpty)
-      return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service, "service_data": serviceData});
+      sendHTTPPost(
+        endPoint: "/api/services/$domain/$service",
+        data: json.encode(serviceData)
+      ).then((data) => completer.complete(data)).catchError((e) => completer.completeError(HAError(e.toString())));
+      //return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service, "service_data": serviceData});
     else
-      return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service});
+      sendHTTPPost(
+          endPoint: "/api/services/$domain/$service"
+      ).then((data) => completer.complete(data)).catchError((e) => completer.completeError(HAError(e.toString())));
+      //return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service});
+    return completer.future;
   }
 
   Future<List> getHistory(String entityId) async {
@@ -398,11 +418,12 @@ class ConnectionManager {
         headers: headers,
         body: data
     ).then((response) {
-      Logger.d("[Received] <== HTTP ${response.statusCode}");
       if (response.statusCode >= 200 && response.statusCode < 300 ) {
+        Logger.d("[Received] <== HTTP ${response.statusCode}");
         completer.complete(response.body);
       } else {
-        completer.completeError({"code": response.statusCode, "message": "${response.body}"});
+        Logger.d("[Received] <== HTTP ${response.statusCode}: ${response.body}");
+        completer.completeError(response);
       }
     }).catchError((e) {
       completer.completeError(e);

lib/managers/location_manager.class.dart

@@ -2,4 +2,236 @@ part of '../main.dart';
 
 class LocationManager {
 
+  static final LocationManager _instance = LocationManager
+      ._internal();
+
+  factory LocationManager() {
+    return _instance;
+  }
+
+  LocationManager._internal() {
+    init();
+  }
+
+  final int defaultUpdateIntervalMinutes = 20;
+  final String backgroundTaskId = "haclocationtask0";
+  final String backgroundTaskTag = "haclocation";
+  Duration _updateInterval;
+  bool _isRunning;
+
+  void init() async {
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    await prefs.reload();
+    _updateInterval = Duration(minutes: prefs.getInt("location-interval") ??
+        defaultUpdateIntervalMinutes);
+    _isRunning = prefs.getBool("location-enabled") ?? false;
+    if (_isRunning) {
+      await _startLocationService();
+    }
+  }
+
+  setSettings(bool enabled, int interval) async {
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    if (interval != _updateInterval.inMinutes) {
+      prefs.setInt("location-interval", interval);
+      _updateInterval = Duration(minutes: interval);
+      if (_isRunning) {
+        Logger.d("Stopping location tracking...");
+        _isRunning = false;
+        await _stopLocationService();
+      }
+    }
+    if (enabled && !_isRunning) {
+      Logger.d("Starting location tracking");
+      SharedPreferences prefs = await SharedPreferences.getInstance();
+      prefs.setBool("location-enabled", enabled);
+      _isRunning = true;
+      await _startLocationService();
+    } else if (!enabled && _isRunning) {
+      Logger.d("Stopping location tracking...");
+      SharedPreferences prefs = await SharedPreferences.getInstance();
+      prefs.setBool("location-enabled", enabled);
+      _isRunning = false;
+      await _stopLocationService();
+    }
+  }
+
+  _startLocationService() async {
+    String webhookId = ConnectionManager().webhookId;
+    String httpWebHost = ConnectionManager().httpWebHost;
+    if (webhookId != null && webhookId.isNotEmpty) {
+      Duration interval;
+      int delayFactor;
+      int taskCount;
+      Logger.d("Starting location update for every ${_updateInterval
+        .inMinutes} minutes...");
+      if (_updateInterval.inMinutes == 10) {
+        interval = Duration(minutes: 20);
+        taskCount = 2;
+        delayFactor = 10;
+      } else if (_updateInterval.inMinutes == 5) {
+        interval = Duration(minutes: 15);
+        taskCount = 3;
+        delayFactor = 5;
+      } else {
+        interval = _updateInterval;
+        taskCount = 1;
+        delayFactor = 0;
+      }
+      for (int i = 1; i <= taskCount; i++) {
+        int delay = i*delayFactor;
+        Logger.d("Scheduling location update task #$i for every ${interval.inMinutes} minutes in $delay minutes...");
+        await workManager.Workmanager.registerPeriodicTask(
+          "$backgroundTaskId$i",
+          "haClientLocationTracking-0$i",
+          tag: backgroundTaskTag,
+          inputData: {
+            "webhookId": webhookId,
+            "httpWebHost": httpWebHost
+          },
+          frequency: interval,
+          initialDelay: Duration(minutes: delay),
+          existingWorkPolicy: workManager.ExistingWorkPolicy.keep,
+          backoffPolicy: workManager.BackoffPolicy.linear,
+          backoffPolicyDelay: interval,
+          constraints: workManager.Constraints(
+            networkType: workManager.NetworkType.connected,
+          ),
+        );
+      }
+    }
+  }
+
+  _stopLocationService() async {
+    Logger.d("Canceling previous schedule if any...");
+    await workManager.Workmanager.cancelAll();
+  }
+
+  updateDeviceLocation() async {
+    Logger.d("[Foreground location] Started");
+    Geolocator geolocator = Geolocator();
+    var battery = Battery();
+    String webhookId = ConnectionManager().webhookId;
+    String httpWebHost = ConnectionManager().httpWebHost;
+    if (webhookId != null && webhookId.isNotEmpty) {
+        Logger.d("[Foreground location] Getting battery level...");
+        int batteryLevel = await battery.batteryLevel;
+        Logger.d("[Foreground location] Getting device location...");
+        Position position = await geolocator.getCurrentPosition(
+            desiredAccuracy: LocationAccuracy.high,
+            locationPermissionLevel: GeolocationPermission.locationAlways
+          );
+        if (position != null) {
+          Logger.d("[Foreground location] Location: ${position.latitude} ${position.longitude}. Accuracy: ${position.accuracy}. (${position.timestamp})");
+          String url = "$httpWebHost/api/webhook/$webhookId";
+          Map data = {
+            "type": "update_location",
+            "data": {
+              "gps": [position.latitude, position.longitude],
+              "gps_accuracy": position.accuracy,
+              "battery": batteryLevel ?? 100
+            }
+          };
+          Logger.d("[Foreground location] Sending data home...");
+          var response = await http.post(
+            url,
+            headers: {"Content-Type": "application/json"},
+            body: json.encode(data)
+          );
+          Logger.d("[Foreground location] Got HTTP ${response.statusCode}");
+        } else {
+          Logger.d("[Foreground location] No location. Aborting.");
+        }
+    }
+  }
+
+}
+
+void updateDeviceLocationIsolate() {
+  workManager.Workmanager.executeTask((backgroundTask, data) async {
+    //print("[Background $backgroundTask] Started");
+    Geolocator geolocator = Geolocator();
+    var battery = Battery();
+    String webhookId = data["webhookId"];
+    String httpWebHost = data["httpWebHost"];
+    //String logData = '==> ${DateTime.now()} [Background $backgroundTask]:';
+    //print("[Background $backgroundTask] Getting path for log file...");
+    //final logFileDirectory = await getExternalStorageDirectory();
+    //print("[Background $backgroundTask] Opening log file...");
+    //File logFile = File('${logFileDirectory.path}/ha-client-background-log.txt');
+    //print("[Background $backgroundTask] Log file path: ${logFile.path}");
+    if (webhookId != null && webhookId.isNotEmpty) {
+      String url = "$httpWebHost/api/webhook/$webhookId";
+      Map<String, String> headers = {};
+      headers["Content-Type"] = "application/json";
+      Map data = {
+        "type": "update_location",
+        "data": {
+          "gps": [],
+          "gps_accuracy": 0,
+          "battery": 100
+        }
+      };
+      //print("[Background $backgroundTask] Getting battery level...");
+      int batteryLevel;
+      try {
+        batteryLevel = await battery.batteryLevel;
+        //print("[Background $backgroundTask] Got battery level: $batteryLevel");
+      } catch(e) {
+        //print("[Background $backgroundTask] Error getting battery level: $e. Setting zero");
+        batteryLevel = 0;
+        //logData += 'Battery: error, $e';
+      }
+      if (batteryLevel != null) {
+        data["data"]["battery"] = batteryLevel;
+        //logData += 'Battery: success, $batteryLevel';
+      }/* else {
+        logData += 'Battery: error, level is null';
+      }*/
+      Position location;
+      try {
+        location = await geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.high, locationPermissionLevel: GeolocationPermission.locationAlways);
+        if (location != null && location.latitude != null) {
+          //logData += ' || Location: success, ${location.latitude} ${location.longitude} (${location.timestamp})';
+          data["data"]["gps"] = [location.latitude, location.longitude];
+          data["data"]["gps_accuracy"] = location.accuracy;
+          try {
+            http.Response response = await http.post(
+                url,
+                headers: headers,
+                body: json.encode(data)
+            );
+            /*if (response.statusCode >= 200 && response.statusCode < 300) {
+              logData += ' || Post: success, ${response.statusCode}';
+            } else {
+              logData += ' || Post: error, ${response.statusCode}';
+            }*/
+          } catch(e) {
+            //logData += ' || Post: error, $e';
+          }
+        }/* else {
+          logData += ' || Location: error, location is null';
+        }*/
+      } catch (e) {
+        //print("[Background $backgroundTask] Location error: $e");
+        //logData += ' || Location: error, $e';
+      }
+    }/* else {
+      logData += 'Not configured';
+    }*/
+    //print("[Background $backgroundTask] Writing log data...");
+    /*try {
+      var fileMode;
+      if (logFile.existsSync() && logFile.lengthSync() < 5000000) {
+        fileMode = FileMode.append;
+      } else {
+        fileMode = FileMode.write;
+      }
+      await logFile.writeAsString('$logData\n', mode: fileMode);
+    } catch (e) {
+      print("[Background $backgroundTask] Error writing log: $e");
+    }
+    print("[Background $backgroundTask] Finished.");*/
+    return true;
+  });
 }

lib/managers/mobile_app_integration_manager.class.dart

@@ -2,24 +2,29 @@ part of '../main.dart';
 
 class MobileAppIntegrationManager {
 
+  static const INTEGRATION_VERSION = 3;
+
   static final _appRegistrationData = {
+    "device_name": "",
     "app_version": "$appVersion",
-    "device_name": "${HomeAssistant().userName}'s ${DeviceInfoManager().model}",
     "manufacturer": DeviceInfoManager().manufacturer,
     "model": DeviceInfoManager().model,
     "os_version": DeviceInfoManager().osVersion,
     "app_data": {
-      "push_token": "${HomeAssistant().fcmToken}",
+      "push_token": "",
       "push_url": "https://us-central1-ha-client-c73c4.cloudfunctions.net/sendPushNotification"
     }
   };
 
   static Future checkAppRegistration({bool forceRegister: false, bool showOkDialog: false}) {
     Completer completer = Completer();
+    _appRegistrationData["device_name"] = "${HomeAssistant().userName}'s ${DeviceInfoManager().model}";
+    (_appRegistrationData["app_data"] as Map)["push_token"] = "${HomeAssistant().fcmToken}";
     if (ConnectionManager().webhookId == null || forceRegister) {
       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,
@@ -32,9 +37,12 @@ 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(
             title: "Mobile app Integration was created",
@@ -42,7 +50,7 @@ class MobileAppIntegrationManager {
             positiveText: "Restart now",
             negativeText: "Later",
             onPositive: () {
-              ConnectionManager().callService(domain: "homeassistant", service: "restart", entityId: null);
+              ConnectionManager().callService(domain: "homeassistant", service: "restart");
             },
           ));
         });
@@ -62,11 +70,21 @@ 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) {
+            Logger.d('App registration needs to be updated');
+            _askToRemoveAndRegisterApp();
+          } else {
+            Logger.d('App registration works fine');
             if (showOkDialog) {
               eventBus.fire(ShowPopupDialogEvent(
                   title: "All good",
@@ -76,9 +94,10 @@ class MobileAppIntegrationManager {
               ));
             }
           }
+        }
         completer.complete();
       }).catchError((e) {
-        if (e['code'] != null && e['code'] == 410) {
+        if (e is http.Response && e.statusCode == 410) {
           Logger.e("MobileApp integration was removed");
           _askToRegisterApp();
         } else {
@@ -102,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/managers/startup_user_messages_manager.class.dart

@@ -9,16 +9,21 @@ class StartupUserMessagesManager {
     return _instance;
   }
 
-  StartupUserMessagesManager._internal() {}
+  StartupUserMessagesManager._internal();
 
   bool _supportAppDevelopmentMessageShown;
+  bool _whatsNewMessageShown;
   static final _supportAppDevelopmentMessageKey = "user-message-shown-support-development_3";
+  static final _whatsNewMessageKey = "user-message-shown-whats-new-888";
 
   void checkMessagesToShow() async {
     SharedPreferences prefs = await SharedPreferences.getInstance();
     await prefs.reload();
     _supportAppDevelopmentMessageShown = prefs.getBool(_supportAppDevelopmentMessageKey) ?? false;
-    if (!_supportAppDevelopmentMessageShown) {
+    _whatsNewMessageShown = prefs.getBool(_whatsNewMessageKey) ?? false;
+    if (!_whatsNewMessageShown) {
+      _showWhatsNewMessage();
+    } else if (!_supportAppDevelopmentMessageShown) {
       _showSupportAppDevelopmentMessage();
     }
   }
@@ -43,4 +48,11 @@ class StartupUserMessagesManager {
     ));
   }
 
+  void _showWhatsNewMessage() {
+    SharedPreferences.getInstance().then((prefs) {
+      prefs.setBool(_whatsNewMessageKey, true);
+      eventBus.fire(ShowPageEvent(path: "/whats-new"));
+    });
+  }
+
 }

lib/managers/theme_manager.dart

@@ -0,0 +1,272 @@
+part of '../main.dart';
+
+enum AppTheme {darkTheme, defaultTheme, haTheme}
+
+class HAClientTheme {
+
+  static const TextTheme textTheme = TextTheme(
+    display1: TextStyle(fontSize: 34, fontWeight: FontWeight.normal),
+    display2: TextStyle(fontSize: 34, fontWeight: FontWeight.normal),
+    headline: TextStyle(fontSize: 24, fontWeight: FontWeight.normal),
+    title: TextStyle(fontSize: 20, fontWeight: FontWeight.w700),
+    subhead: TextStyle(fontSize: 16, fontWeight: FontWeight.normal),
+    body1: TextStyle(fontSize: 15, fontWeight: FontWeight.normal),
+    body2: TextStyle(fontSize: 15, fontWeight: FontWeight.w500),
+    subtitle: TextStyle(fontSize: 15, fontWeight: FontWeight.w500),
+    caption: TextStyle(fontSize: 12, fontWeight: FontWeight.normal),
+    overline: TextStyle(
+      fontSize: 10,
+      fontWeight: FontWeight.normal,
+      letterSpacing: 1,
+    ),
+    button: TextStyle(fontSize: 14, fontWeight: FontWeight.w500),
+  );
+
+  static const offEntityStates = [
+    EntityState.off,
+    EntityState.closed,
+    "below_horizon",
+    "default",
+    EntityState.idle,
+    EntityState.alarm_disarmed,
+  ];
+
+  static const onEntityStates = [
+    EntityState.on,
+    "auto",
+    EntityState.active,
+    EntityState.playing,
+    EntityState.paused,
+    "above_horizon",
+    EntityState.home,
+    EntityState.open,
+    EntityState.cleaning,
+    EntityState.returning,
+    "cool",
+    EntityState.alarm_arming,
+    EntityState.alarm_disarming,
+    EntityState.alarm_pending,
+  ];
+
+  static const disabledEntityStates = [
+    EntityState.unavailable,
+    EntityState.unknown,
+  ];
+
+  static const alarmEntityStates = [
+    EntityState.alarm_armed_away,
+    EntityState.alarm_armed_custom_bypass,
+    EntityState.alarm_armed_home,
+    EntityState.alarm_armed_night,
+    EntityState.alarm_triggered,
+    "heat",
+  ];
+
+  static const defaultStateColor = Color.fromRGBO(68, 115, 158, 1.0);
+
+  static const badgeColors = {
+    "default": Color.fromRGBO(223, 76, 30, 1.0),
+    "binary_sensor": Color.fromRGBO(3, 155, 229, 1.0)
+  };
+
+  static final HAClientTheme _instance = HAClientTheme
+      ._internal();
+
+  factory HAClientTheme() {
+    return _instance;
+  }
+
+  HAClientTheme._internal();
+
+  ThemeData getThemeData(AppTheme theme) {
+    switch (theme) {
+      case AppTheme.darkTheme:
+        return darkTheme;
+        break;
+      case AppTheme.defaultTheme:
+        return defaultTheme;
+        break;
+      case AppTheme.haTheme:
+        return homeAssistantTheme;
+        break;
+      default:
+        return defaultTheme;
+    }
+  }
+
+  final ThemeData defaultTheme = ThemeData.from(
+    colorScheme: ColorScheme(
+      primary: Color.fromRGBO(112, 154, 193, 1),
+      primaryVariant: Color.fromRGBO(68, 115, 158, 1),
+      secondary: Color.fromRGBO(253, 216, 53, 1),
+      secondaryVariant: Color.fromRGBO(222, 181, 2, 1),
+      background: Color.fromRGBO(250, 250, 250, 1),
+      surface: Colors.white,
+      error: Colors.red,
+      onPrimary: Colors.white,
+      onSecondary: Colors.black87,
+      onBackground: Colors.black87,
+      onSurface: Colors.black87,
+      onError: Colors.white,
+      brightness: Brightness.light
+    ),
+    textTheme: ThemeData.light().textTheme.copyWith(
+      display1: textTheme.display1.copyWith(color: Colors.black54),
+      display2: textTheme.display2.copyWith(color: Colors.redAccent),
+      headline: textTheme.headline.copyWith(color: Colors.black87),
+      title: textTheme.title.copyWith(color: Colors.black87),
+      subhead: textTheme.subhead.copyWith(color: Colors.black54),
+      body1: textTheme.body1.copyWith(color: Colors.black87),
+      body2: textTheme.body2.copyWith(color: Colors.black87),
+      subtitle: textTheme.subtitle.copyWith(color: Colors.black45),
+      caption: textTheme.caption.copyWith(color: Colors.black45),
+      overline: textTheme.overline.copyWith(color: Colors.black26),
+      button: textTheme.button.copyWith(color: Colors.white),
+    )
+  );
+
+  final ThemeData homeAssistantTheme = ThemeData.from(
+    colorScheme: ColorScheme(
+      primary: Color.fromRGBO(2, 165, 238, 1),
+      primaryVariant: Color.fromRGBO(68, 115, 158, 1),
+      secondary: Color.fromRGBO(253, 216, 53, 1),
+      secondaryVariant: Color.fromRGBO(222, 181, 2, 1),
+      background: Color.fromRGBO(250, 250, 250, 1),
+      surface: Colors.white,
+      error: Colors.red,
+      onPrimary: Colors.white,
+      onSecondary: Colors.black87,
+      onBackground: Colors.black87,
+      onSurface: Colors.black87,
+      onError: Colors.white,
+      brightness: Brightness.light
+    ),
+    textTheme: ThemeData.light().textTheme.copyWith(
+      display1: textTheme.display1.copyWith(color: Colors.black54),
+      display2: textTheme.display2.copyWith(color: Colors.redAccent),
+      headline: textTheme.headline.copyWith(color: Colors.black87),
+      title: textTheme.title.copyWith(color: Colors.black87),
+      subhead: textTheme.subhead.copyWith(color: Colors.black54),
+      body1: textTheme.body1.copyWith(color: Colors.black87),
+      body2: textTheme.body2.copyWith(color: Colors.black87),
+      subtitle: textTheme.subtitle.copyWith(color: Colors.black45),
+      caption: textTheme.caption.copyWith(color: Colors.black45),
+      overline: textTheme.overline.copyWith(color: Colors.black26),
+      button: textTheme.button.copyWith(color: Colors.white),
+    )
+  );
+
+  final ThemeData darkTheme = ThemeData.from(
+    colorScheme: ColorScheme(
+      primary: Color.fromRGBO(112, 154, 193, 1),
+      primaryVariant: Color.fromRGBO(68, 115, 158, 1),
+      secondary: Color.fromRGBO(253, 216, 53, 1),
+      secondaryVariant: Color.fromRGBO(222, 181, 2, 1),
+      background: Color.fromRGBO(47, 49, 54, 1),
+      surface: Color.fromRGBO(54, 57, 63, 1),
+      error: Color.fromRGBO(183, 109, 109, 1),
+      onPrimary: Colors.white,
+      onSecondary: Colors.black87,
+      onBackground: Color.fromRGBO(220, 221, 222, 1),
+      onSurface: Colors.white,
+      onError: Colors.white,
+      brightness: Brightness.dark
+    ),
+    textTheme: textTheme
+  );
+
+  Color getOnStateColor(BuildContext context) {
+    return Theme.of(context).colorScheme.secondary;
+  }
+
+  Color getOffStateColor(BuildContext context) {
+    return Theme.of(context).colorScheme.primaryVariant;
+  }
+
+  Color getDisabledStateColor(BuildContext context) {
+    return Theme.of(context).disabledColor;
+  }
+
+  Color getAlertStateColor(BuildContext context) {
+    return Theme.of(context).colorScheme.error;
+  }
+
+  Color getColorByEntityState(String state, BuildContext context) {
+    if (onEntityStates.contains(state)) {
+      return getOnStateColor(context);
+    } else if (disabledEntityStates.contains(state)) {
+      return getDisabledStateColor(context);
+    } else if (alarmEntityStates.contains(state)) {
+      return getAlertStateColor(context);
+    } else {
+      return getOffStateColor(context);
+    }
+  }
+
+  Color getGreenGaugeColor() {
+    return Colors.green;
+  }
+
+  Color getYellowGaugeColor() {
+    return Colors.yellow;
+  }
+
+  Color getRedGaugeColor() {
+    return Colors.red;
+  }
+
+  TextStyle getLinkTextStyle(BuildContext context) {
+    ThemeData theme = Theme.of(context);
+    return theme.textTheme.body1.copyWith(
+      color: Colors.blue,
+      decoration: TextDecoration.underline
+    );
+  }
+
+  TextStyle getActionTextStyle(BuildContext context) {
+    ThemeData theme = Theme.of(context);
+    return theme.textTheme.subhead.copyWith(
+      color: Colors.blue
+    );
+  }
+
+  Color getBadgeColor(String entityDomain) {
+    return badgeColors[entityDomain] ??
+        badgeColors["default"];
+  }
+
+  Color getOnBadgeTextColor() {
+    return Colors.white;
+  }
+
+  charts.Color chartHistoryStateColor(String state, int id, BuildContext context) {
+    Color c = getColorByEntityState(state, context);
+    if (c != null) {
+      return charts.Color(
+          r: c.red,
+          g: c.green,
+          b: c.blue,
+          a: c.alpha
+      );
+    } else {
+      double r = id.toDouble() % 10;
+      return charts.MaterialPalette.getOrderedPalettes(10)[r.round()].shadeDefault;
+    }
+  }
+
+  Color historyStateColor(String state, int id, BuildContext context) {
+    Color c = getColorByEntityState(state, context);
+    if (c != null) {
+      return c;
+    } else {
+      if (id > -1) {
+        double r = id.toDouble() % 10;
+        charts.Color c1 = charts.MaterialPalette.getOrderedPalettes(10)[r.round()].shadeDefault;
+        return Color.fromARGB(c1.a, c1.r, c1.g, c1.b);
+      } else {
+        return getOnStateColor(context);
+      }
+    }
+  }
+
+}

lib/pages/entity.page.dart

@@ -10,42 +10,47 @@ class EntityViewPage extends StatefulWidget {
 }
 
 class _EntityViewPageState extends State<EntityViewPage> {
-  String _title;
   StreamSubscription _refreshDataSubscription;
   StreamSubscription _stateSubscription;
+  Entity _entity;
 
   @override
   void initState() {
     super.initState();
     _stateSubscription = eventBus.on<StateChangedEvent>().listen((event) {
       if (event.entityId == widget.entityId) {
-        Logger.d("State change event handled by entity page: ${event.entityId}");
+        Logger.d("[Entity page] State change event handled: ${event.entityId}");
-        setState(() {});
+        setState(() {
+          _getEntity();
+        });
       }
     });
     _refreshDataSubscription = eventBus.on<RefreshDataFinishedEvent>().listen((event) {
-      setState(() {});
+      Logger.d("[Entity page] Refresh data event handled");
+      setState(() {
+        _getEntity();
       });
-    _prepareData();
+    });
+    _getEntity();
   }
 
-  void _prepareData() async {
+  _getEntity() {
-    _title = HomeAssistant().entities.get(widget.entityId).displayName;
+    _entity = HomeAssistant().entities.get(widget.entityId);
   }
 
-
   @override
   Widget build(BuildContext context) {
+    String entityNameToDisplay = '${(_entity?.displayName ?? widget.entityId) ?? ''}';
     return new Scaffold(
       appBar: new AppBar(
         leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
           Navigator.pop(context);
         }),
-        // Here we take the value from the MyHomePage object that was created by
+        title: new Text(entityNameToDisplay),
-        // the App.build method, and use it to set our appbar title.
-        title: new Text(_title),
       ),
-      body: HomeAssistant().entities.get(widget.entityId).buildEntityPageWidget(context),
+      body: _entity == null ? PageLoadingError(
+        errorText: 'Entity is not available $entityNameToDisplay',
+      ) : EntityPageLayout(entity: _entity),
     );
   }
 

lib/pages/fullscreen.page.dart

@@ -0,0 +1,18 @@
+part of '../main.dart';
+
+class FullScreenPage extends StatelessWidget {
+
+  final Widget child;
+
+  const FullScreenPage({Key key, this.child}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      color: Colors.black,
+      child: Center(
+        child: this.child,
+      ),
+    );
+  }
+}

lib/pages/main/main.page.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class MainPage extends StatefulWidget {
   MainPage({Key key, this.title}) : super(key: key);
@@ -11,8 +11,8 @@ class MainPage extends StatefulWidget {
 
 class _MainPageState extends State<MainPage> with WidgetsBindingObserver, TickerProviderStateMixin {
 
-  StreamSubscription<List<PurchaseDetails>> _subscription;
   StreamSubscription _stateSubscription;
+  StreamSubscription _lovelaceSubscription;
   StreamSubscription _settingsSubscription;
   StreamSubscription _serviceCallSubscription;
   StreamSubscription _showEntityPageSubscription;
@@ -28,11 +28,6 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
 
   @override
   void initState() {
-    final Stream purchaseUpdates =
-        InAppPurchaseConnection.instance.purchaseUpdatedStream;
-    _subscription = purchaseUpdates.listen((purchases) {
-      _handlePurchaseUpdates(purchases);
-    });
     super.initState();
     WidgetsBinding.instance.addObserver(this);
 
@@ -72,8 +67,6 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
     });
 
     _fullLoad();
-
-
   }
 
   Future onSelectNotification(String payload) async {
@@ -97,38 +90,40 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
     );
   }
 
-  void _fullLoad() async {
+  void _fullLoad() {
     _showInfoBottomBar(progress: true,);
     _subscribe().then((_) {
       ConnectionManager().init(loadSettings: true, forceReconnect: true).then((__){
-        _fetchData();
+        SharedPreferences.getInstance().then((prefs) {
+          HomeAssistant().lovelaceDashboardUrl = prefs.getString('lovelace_dashboard_url') ?? HomeAssistant.DEFAULT_DASHBOARD;
+          _fetchData(useCache: true);
+          LocationManager();
           StartupUserMessagesManager().checkMessagesToShow();
+        });
       }, onError: (e) {
         _setErrorState(e);
       });
     });
   }
 
-  void _quickLoad() {
+  void _quickLoad({bool uiOnly: false}) {
     _hideBottomBar();
     _showInfoBottomBar(progress: true,);
     ConnectionManager().init(loadSettings: false, forceReconnect: false).then((_){
-      _fetchData();
+      _fetchData(useCache: false, uiOnly: uiOnly);
-      //StartupUserMessagesManager().checkMessagesToShow();
     }, onError: (e) {
       _setErrorState(e);
     });
   }
 
-  _fetchData() async {
+  _fetchData({useCache: false, uiOnly: false}) async {
-    await HomeAssistant().fetchData().then((_) {
+    if (useCache && !uiOnly) {
-      _hideBottomBar();
+      HomeAssistant().fetchDataFromCache().then((_) {
-      int currentViewCount = HomeAssistant().ui?.views?.length ?? 0;
+        setState((){});  
-      if (_previousViewCount != currentViewCount) {
+      });
-        Logger.d("Views count changed ($_previousViewCount->$currentViewCount). Creating new tabs controller.");
-        _viewsTabController = TabController(vsync: this, length: currentViewCount);
-        _previousViewCount = currentViewCount;
     }
+    await HomeAssistant().fetchData(uiOnly).then((_) {
+      _hideBottomBar();
     }).catchError((e) {
       if (e is HAError) {
         _setErrorState(e);
@@ -144,40 +139,32 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
     Logger.d("$state");
     if (state == AppLifecycleState.resumed && ConnectionManager().settingsLoaded && !_preventAppRefresh) {
       _quickLoad();
-    }
+    } else if (state == AppLifecycleState.paused && ConnectionManager().settingsLoaded && !_preventAppRefresh) {
-  }
+      HomeAssistant().saveCache();
-
-  void _handlePurchaseUpdates(purchase) {
-    if (purchase is List<PurchaseDetails>) {
-      if (purchase[0].status == PurchaseStatus.purchased) {
-        eventBus.fire(ShowPopupMessageEvent(
-            title: "Thanks a lot!",
-            body: "Thank you for supporting HA Client development!",
-            buttonText: "Ok"
-        ));
-      } else {
-        Logger.d("Purchase change handler: ${purchase[0].status}");
-      }
-    } else {
-      Logger.e("Something wrong with purchase handling. Got: $purchase");
     }
   }
 
   Future _subscribe() {
     Completer completer = Completer();
+
     if (_stateSubscription == null) {
       _stateSubscription = eventBus.on<StateChangedEvent>().listen((event) {
         if (event.needToRebuildUI) {
-          Logger.d("New entity. Need to rebuild UI");
+          Logger.d("Need to rebuild UI");
           _quickLoad();
         } else {
           setState(() {});
         }
       });
     }
+    if (_lovelaceSubscription == null) {
+      _lovelaceSubscription = eventBus.on<LovelaceChangedEvent>().listen((event) {
+        _quickLoad();
+      });
+    }
     if (_reloadUISubscription == null) {
       _reloadUISubscription = eventBus.on<ReloadUIEvent>().listen((event){
-        _quickLoad();
+        _quickLoad(uiOnly: true);
       });
     }
     if (_showPopupDialogSubscription == null) {
@@ -205,16 +192,15 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
     }
     if (_serviceCallSubscription == null) {
       _serviceCallSubscription =
-          eventBus.on<ServiceCallEvent>().listen((event) {
+          eventBus.on<NotifyServiceCallEvent>().listen((event) {
-            _callService(event.domain, event.service, event.entityId,
+            _notifyServiceCalled(event.domain, event.service, event.entityId);
-                event.additionalParams);
           });
     }
 
     if (_showEntityPageSubscription == null) {
       _showEntityPageSubscription =
           eventBus.on<ShowEntityPageEvent>().listen((event) {
-            _showEntityPage(event.entity.entityId);
+            _showEntityPage(event.entity?.entityId);
           });
     }
 
@@ -254,7 +240,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
 
   void _showOAuth() {
     _preventAppRefresh = true;
-    Navigator.of(context).pushNamed('/login');
+    Navigator.of(context).pushNamed("/auth", arguments: {"url": ConnectionManager().oauthUrl});
   }
 
   _setErrorState(HAError e) {
@@ -304,13 +290,11 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
     );
   }
 
-  //TODO remove this shit
+  void _notifyServiceCalled(String domain, String service, entityId) {
-  void _callService(String domain, String service, String entityId, Map additionalParams) {
     _showInfoBottomBar(
         message: "Calling $domain.$service",
-        duration: Duration(seconds: 3)
+        duration: Duration(seconds: 4)
     );
-    ConnectionManager().callService(domain: domain, service: service, entityId: entityId, additionalServiceData: additionalParams).catchError((e) => _setErrorState(e));
   }
 
   void _showEntityPage(String entityId) {
@@ -320,6 +304,14 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
         builder: (context) => EntityViewPage(entityId: 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) {
@@ -349,31 +341,12 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
     menuItems.add(
         UserAccountsDrawerHeader(
           accountName: Text(HomeAssistant().userName),
-          accountEmail: Text(ConnectionManager().displayHostname ?? "Not configured"),
+          accountEmail: Text(HomeAssistant().locationName ?? ""),
-          onDetailsPressed: () {
-            final flutterWebViewPlugin = new FlutterWebviewPlugin();
-            flutterWebViewPlugin.onStateChanged.listen((viewState) async {
-              if (viewState.type == WebViewState.startLoad) {
-                Logger.d("[WebView] Injecting external auth JS");
-                rootBundle.loadString('assets/js/externalAuth.js').then((js){
-                  flutterWebViewPlugin.evalJavascript(js.replaceFirst("[token]", ConnectionManager()._token));
-                });
-              }
-            });
-            Navigator.of(context).pushNamed(
-                "/webview",
-                arguments: {
-                  "url": "${ConnectionManager().httpWebHost}/profile?external_auth=1",
-                  "title": "Profile"
-                }
-            );
-          },
           currentAccountPicture: CircleAvatar(
+            backgroundColor: Theme.of(context).backgroundColor,
             child: Text(
               HomeAssistant().userAvatarText,
-              style: TextStyle(
+              style: Theme.of(context).textTheme.display1
-                  fontSize: 32.0
-              ),
             ),
           ),
         )
@@ -382,21 +355,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
       HomeAssistant().panels.forEach((Panel panel) {
         if (!panel.isHidden) {
           menuItems.add(
-              new ListTile(
+              panel.getMenuItemWidget(context)
-                  leading: Icon(MaterialDesignIcons.getIconDataFromIconName(panel.icon)),
-                  title: Row(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: <Widget>[
-                      Text("${panel.title}"),
-                      Container(width: 4.0,),
-                      panel.isWebView ? Text("webview", style: TextStyle(fontSize: 8.0, color: Colors.black45),) : Container(width: 1.0,)
-                    ],
-                  ),
-                  onTap: () {
-                    Navigator.of(context).pop();
-                    panel.handleOpen(context);
-                  }
-              )
           );
         }
       });
@@ -404,11 +363,11 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
     menuItems.addAll([
       Divider(),
       ListTile(
-        leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:login-variant")),
+        leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:cellphone-settings-variant")),
-        title: Text("Connection settings"),
+        title: Text("App settings"),
         onTap: () {
           Navigator.of(context).pop();
-          Navigator.of(context).pushNamed('/connection-settings');
+          Navigator.of(context).pushNamed('/app-settings');
         },
       )
     ]);
@@ -445,29 +404,36 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
         title: Text("Help"),
         onTap: () {
           Navigator.of(context).pop();
-          Launcher.launchURL("http://ha-client.homemade.systems/docs");
+          Launcher.launchURL("http://ha-client.app/docs");
         },
       ),
       new ListTile(
         leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:discord")),
-        title: Text("Join Discord channel"),
+        title: Text("Contacts/Discussion"),
         onTap: () {
           Navigator.of(context).pop();
-          Launcher.launchURL("https://discord.gg/AUzEvwn");
+          Launcher.launchURL("https://discord.gg/nd6FZQ");
         },
       ),
+      new ListTile(
+        title: Text("What's new?"),
+        onTap: () {
+          Navigator.of(context).pop();
+          Navigator.of(context).pushNamed('/whats-new');
+        }
+      ),
       new AboutListTile(
           aboutBoxChildren: <Widget>[
             GestureDetector(
               onTap: () {
                 Navigator.of(context).pop();
-                Launcher.launchURL("http://ha-client.homemade.systems/");
+                Launcher.launchURL("http://ha-client.app/");
               },
               child: Text(
-                "ha-client.homemade.systems",
+                "ha-client.app",
-                style: TextStyle(
+                style: Theme.of(context).textTheme.body1.copyWith(
                   color: Colors.blue,
-                    decoration: TextDecoration.underline
+                  decoration: TextDecoration.underline,
                 ),
               ),
             ),
@@ -477,13 +443,13 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
             GestureDetector(
               onTap: () {
                 Navigator.of(context).pop();
-                Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.homemade.systems/terms_and_conditions");
+                Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.app/terms_and_conditions");
               },
               child: Text(
                 "Terms and Conditions",
-                style: TextStyle(
+                style: Theme.of(context).textTheme.body1.copyWith(
                   color: Colors.blue,
-                    decoration: TextDecoration.underline
+                  decoration: TextDecoration.underline,
                 ),
               ),
             ),
@@ -493,13 +459,13 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
             GestureDetector(
               onTap: () {
                 Navigator.of(context).pop();
-                Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.homemade.systems/privacy_policy");
+                Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.app/privacy_policy");
               },
               child: Text(
                 "Privacy Policy",
-                style: TextStyle(
+                style: Theme.of(context).textTheme.body1.copyWith(
                   color: Colors.blue,
-                    decoration: TextDecoration.underline
+                  decoration: TextDecoration.underline,
                 ),
               ),
             )
@@ -526,13 +492,13 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
   bool _showBottomBar = false;
   String _bottomBarText;
   bool _bottomBarProgress;
-  Color _bottomBarColor;
+  bool _bottomBarErrorColor;
   Timer _bottomBarTimer;
 
   void _showInfoBottomBar({String message, bool progress: false, Duration duration}) {
     _bottomBarTimer?.cancel();
     _bottomBarAction = Container(height: 0.0, width: 0.0,);
-    _bottomBarColor = Colors.grey.shade50;
+    _bottomBarErrorColor = false;
     setState(() {
       _bottomBarText = message;
       _bottomBarProgress = progress;
@@ -546,11 +512,10 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
   }
 
   void _showErrorBottomBar(HAError error) {
-    TextStyle textStyle = TextStyle(
+    TextStyle textStyle = Theme.of(context).textTheme.button.copyWith(
-        color: Colors.blue,
+      decoration: TextDecoration.underline
-        fontSize: Sizes.nameFontSize
     );
-    _bottomBarColor = Colors.red.shade100;
+    _bottomBarErrorColor = true;
     List<Widget> actions = [];
     error.actions.forEach((HAErrorAction action) {
       switch (action.type) {
@@ -624,32 +589,112 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
   final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
 
   Widget _buildScaffoldBody(bool empty) {
-    List<PopupMenuItem<String>> popupMenuItems = [];
+    List<PopupMenuItem<String>> serviceMenuItems = [];
+    List<PopupMenuItem<String>> mediaMenuItems = [];
 
-    popupMenuItems.add(PopupMenuItem<String>(
+    int currentViewCount = HomeAssistant().ui?.views?.length ?? 0;
+    if (_previousViewCount != currentViewCount) {
+      Logger.d("Views count changed ($_previousViewCount->$currentViewCount). Creating new tabs controller.");
+      _viewsTabController = TabController(vsync: this, length: currentViewCount);
+      _previousViewCount = currentViewCount;
+    }
+
+    serviceMenuItems.add(PopupMenuItem<String>(
       child: new Text("Reload"),
       value: "reload",
     ));
-    List<Widget> emptyBody = [
-      Text("."),
-    ];
     if (ConnectionManager().isAuthenticated) {
       _showLoginButton = false;
-      popupMenuItems.add(
+      serviceMenuItems.add(
           PopupMenuItem<String>(
             child: new Text("Logout"),
             value: "logout",
           ));
     }
+    Widget mediaMenuIcon;
+    int playersCount = 0;
+    if (!empty && !HomeAssistant().entities.isEmpty) {
+      List<Entity> activePlayers = HomeAssistant().entities.getByDomains(includeDomains: ["media_player"], stateFiler: [EntityState.paused, EntityState.playing, EntityState.idle]);
+      playersCount = activePlayers.length;
+      mediaMenuItems.addAll(
+          activePlayers.map((entity) => PopupMenuItem<String>(
+            child: Text(
+                "${entity.displayName}",
+              style: Theme.of(context).textTheme.body1.copyWith(
+                color: HAClientTheme().getColorByEntityState(entity.state, context)
+              )
+            ),
+            value: "${entity.entityId}",
+          )).toList()
+      );
+    }
+    mediaMenuItems.addAll([
+      PopupMenuItem<String>(
+        child: new Text("Play media..."),
+        value: "play_media",
+      )
+    ]);
+    if (playersCount > 0) {
+      mediaMenuIcon = Stack(
+        overflow: Overflow.visible,
+        children: <Widget>[
+          Icon(MaterialDesignIcons.getIconDataFromIconName(
+              "mdi:television"), color: Colors.white,),
+          Positioned(
+            bottom: -4,
+            right: -4,
+            child: Container(
+              height: 16,
+              width: 16,
+              decoration: new BoxDecoration(
+                color: Colors.orange,
+                shape: BoxShape.circle,
+              ),
+              child: Center(
+                child: Text(
+                  "$playersCount",
+                  style: Theme.of(context).textTheme.caption.copyWith(
+                    color: Colors.white
+                  )
+                ),
+              ),
+            ),
+          )
+        ],
+      );
+    } else {
+      mediaMenuIcon = Icon(MaterialDesignIcons.getIconDataFromIconName(
+          "mdi:television"), color: Colors.white,);
+    }
+    Widget mainScrollBody;
+    if (empty) {
       if (_showLoginButton) {
-      emptyBody = [
+        mainScrollBody = Center(
+            child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: <Widget>[
                   FlatButton(
-          child: Text("Login with Home Assistant", style: TextStyle(fontSize: 16.0, color: Colors.white)),
+                    child: Text("Login with Home Assistant", style: Theme.of(context).textTheme.button),
                     color: Colors.blue,
                     onPressed: () => _fullLoad(),
                   )
-      ];
+                ]
+            )
+        );
+      } else {
+        mainScrollBody = Center(
+          child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: <Widget>[
+                Text("...")
+              ]
+          ),
+        );
       }
+    } else {
+      mainScrollBody = HomeAssistant().ui.build(context, _viewsTabController);
+    }
+
     return NestedScrollView(
         headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
           return <Widget>[
@@ -659,16 +704,34 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
               primary: true,
               title: Text(HomeAssistant().locationName ?? ""),
               actions: <Widget>[
+                IconButton(
+                    icon: mediaMenuIcon,
+                    onPressed: () {
+                      showMenu(
+                          position: RelativeRect.fromLTRB(MediaQuery.of(context).size.width, 100.0, 50, 0.0),
+                          context: context,
+                          items: mediaMenuItems
+                      ).then((String val) {
+                        if (val == "play_media") {
+                          Navigator.pushNamed(context, "/play-media", arguments: {"url": ""});
+                        } else  {
+                          _showEntityPage(val);
+                        }
+                      });
+                    }
+                ),
                 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),
+                          position: RelativeRect.fromLTRB(MediaQuery.of(context).size.width, 100, 0.0, 0.0),
                           context: context,
-                        items: popupMenuItems
+                          items: serviceMenuItems
                       ).then((String val) {
+                        HomeAssistant().lovelaceDashboardUrl = HomeAssistant.DEFAULT_DASHBOARD;
                         if (val == "reload") {
+                          
                           _quickLoad();
                         } else if (val == "logout") {
                           HomeAssistant().logout().then((_) {
@@ -694,15 +757,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
 
           ];
         },
-      body: empty ?
+        body: mainScrollBody,
-      Center(
-        child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: emptyBody
-        ),
-      )
-          :
-      HomeAssistant().buildViews(context, _viewsTabController),
     );
   }
 
@@ -732,16 +787,16 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
         bottomBarChildren.add(
           CollectionScaleTransition(
             children: <Widget>[
-              Icon(Icons.stop, size: 10.0, color: EntityColor.stateColor(EntityState.on),),
+              Icon(Icons.stop, size: 10.0, color: HAClientTheme().getOnStateColor(context),),
-              Icon(Icons.stop, size: 10.0, color: EntityColor.stateColor(EntityState.unavailable),),
+              Icon(Icons.stop, size: 10.0, color: HAClientTheme().getDisabledStateColor(context),),
-              Icon(Icons.stop, size: 10.0, color: EntityColor.stateColor(EntityState.off),),
+              Icon(Icons.stop, size: 10.0, color: HAClientTheme().getOffStateColor(context),),
             ],
           ),
         );
       }
       if (bottomBarChildren.isNotEmpty) {
         bottomBar = Container(
-          color: _bottomBarColor,
+          color: _bottomBarErrorColor ? Theme.of(context).errorColor : Theme.of(context).primaryColorLight,
           child: Row(
             mainAxisSize: MainAxisSize.max,
             children: <Widget>[
@@ -758,7 +813,6 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
         );
       }
     }
-    // This method is rerun every time setState is called.
     if (HomeAssistant().isNoViews) {
         return Scaffold(
             key: _scaffoldKey,
@@ -773,18 +827,19 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
           drawer: _buildAppDrawer(),
           primary: false,
           bottomNavigationBar: bottomBar,
-        body: _buildScaffoldBody(false),
+          body: _buildScaffoldBody(false)
         );
       }
   }
 
   @override
   void dispose() {
-    final flutterWebviewPlugin = new FlutterWebviewPlugin();
-    flutterWebviewPlugin.dispose();
     WidgetsBinding.instance.removeObserver(this);
+    //final flutterWebviewPlugin = new FlutterWebviewPlugin();
+    //flutterWebviewPlugin.dispose();
     _viewsTabController?.dispose();
     _stateSubscription?.cancel();
+    _lovelaceSubscription?.cancel();
     _settingsSubscription?.cancel();
     _serviceCallSubscription?.cancel();
     _showPopupDialogSubscription?.cancel();
@@ -792,7 +847,6 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
     _showEntityPageSubscription?.cancel();
     _showErrorSubscription?.cancel();
     _startAuthSubscription?.cancel();
-    _subscription?.cancel();
     _showPageSubscription?.cancel();
     _reloadUISubscription?.cancel();
     //TODO disconnect

lib/pages/play_media.page.dart

@@ -0,0 +1,251 @@
+part of '../main.dart';
+
+class PlayMediaPage extends StatefulWidget {
+
+  final String mediaUrl;
+  final String mediaType;
+
+  PlayMediaPage({Key key, this.mediaUrl, this.mediaType}) : super(key: key);
+
+  @override
+  _PlayMediaPageState createState() => new _PlayMediaPageState();
+}
+
+class _PlayMediaPageState extends State<PlayMediaPage> {
+
+  bool _loaded = false;
+  String _error = "";
+  String _validationMessage = "";
+  List<Entity> _players;
+  String _mediaUrl;
+  String _contentType;
+  bool _useMediaExtractor = false;
+  bool _isMediaExtractorExist = false;
+  StreamSubscription _stateSubscription;
+  StreamSubscription _refreshDataSubscription;
+  List<String> _contentTypes = ["movie", "video", "music", "image", "image/jpg", "playlist"];
+
+  @override
+  void initState() {
+    super.initState();
+    _mediaUrl = widget.mediaUrl;
+    if (widget.mediaType.isNotEmpty) {
+      if (!_contentTypes.contains(widget.mediaType)) {
+        _contentTypes.insert(0, widget.mediaType);
+        _contentType = _contentTypes[0];
+      } else {
+        _contentType = widget.mediaType;
+      }
+    } else {
+      _contentType = _contentTypes[0];
+    }
+    _stateSubscription = eventBus.on<StateChangedEvent>().listen((event) {
+      if (event.entityId.contains("media_player")) {
+        Logger.d("State change event handled by play media page: ${event.entityId}");
+        setState(() {});
+      }
+    });
+    _refreshDataSubscription = eventBus.on<RefreshDataFinishedEvent>().listen((event) {
+      _loadMediaEntities();
+    });
+    _loadMediaEntities();
+  }
+
+  _loadMediaEntities() async {
+    if (HomeAssistant().isNoEntities) {
+      setState(() {
+        _loaded = false;
+      });
+    } else {
+      _isMediaExtractorExist = HomeAssistant().isServiceExist("media_extractor");
+      //_useMediaExtractor = _isMediaExtractorExist;
+      _players = HomeAssistant().entities.getByDomains(includeDomains: ["media_player"]);
+      setState(() {
+        if (_players.isNotEmpty) {
+          _loaded = true;
+        } else {
+          _loaded = false;
+          _error = "Looks like you don't have any media player";
+        }
+      });
+    }
+  }
+
+  void _playMedia(Entity entity) {
+    if (_mediaUrl == null || _mediaUrl.isEmpty) {
+      setState(() {
+        _validationMessage = "Media url must be specified";
+      });
+    } else if (entity.state == EntityState.unavailable || entity.state == EntityState.unknown) {
+      setState(() {
+        _validationMessage = "${entity.displayName} is not available";
+      });
+    } else {
+      String serviceDomain;
+      if (_useMediaExtractor) {
+        serviceDomain = "media_extractor";
+      } else {
+        serviceDomain = "media_player";
+      }
+      Navigator.pop(context);
+      ConnectionManager().callService(
+          domain: serviceDomain,
+          service: "play_media",
+          entityId: entity.entityId,
+          data: {
+              "media_content_id": _mediaUrl,
+              "media_content_type": _contentType
+            }
+      );
+      HomeAssistant().sendToPlayerId = entity.entityId;
+      if (HomeAssistant().sendFromPlayerId != null && HomeAssistant().sendFromPlayerId != HomeAssistant().sendToPlayerId) {
+        ConnectionManager().callService(
+          domain: HomeAssistant().sendFromPlayerId.split(".")[0],
+          service: "turn_off",
+          entityId: HomeAssistant().sendFromPlayerId
+        );
+        HomeAssistant().sendFromPlayerId = null;
+      }
+      eventBus.fire(ShowEntityPageEvent(entity: entity));
+    }
+  }
+
+
+  @override
+  Widget build(BuildContext context) {
+    Widget body;
+    if (!_loaded) {
+      body = _error.isEmpty ? PageLoadingIndicator() : PageLoadingError(errorText: _error);
+    } else {
+      List<Widget> children = [];
+      children.add(CardHeader(name: "Media:"));
+      children.add(
+        TextField(
+          maxLines: 5,
+          minLines: 1,
+          decoration: InputDecoration(
+              labelText: "Media url"
+          ),
+          controller: TextEditingController.fromValue(TextEditingValue(text: _mediaUrl)),
+          onChanged: (value) {
+            _mediaUrl = value;
+          }
+        ),
+      );
+      if (_validationMessage.isNotEmpty) {
+        children.add(Text(
+          "$_validationMessage",
+          style: Theme.of(context).textTheme.body1.copyWith(
+            color: Theme.of(context).errorColor
+          )
+        ));
+      }
+      children.addAll(<Widget>[
+        Container(height: Sizes.rowPadding,),
+        DropdownButton<String>(
+          value: _contentType,
+          isExpanded: true,
+          items: _contentTypes.map((String value) {
+            return new DropdownMenuItem<String>(
+              value: value,
+              child: new Text(value),
+            );
+          }).toList(),
+          onChanged: (value) {
+            setState(() {
+              _contentType = value;
+            });
+          },
+        )
+      ]
+      );
+      if (_isMediaExtractorExist) {
+        children.addAll(<Widget>[
+            Row(
+              mainAxisSize: MainAxisSize.max,
+              children: <Widget>[
+                Expanded(
+                  child: Text("Use media extractor"),
+                ),
+                Switch(
+                  value: _useMediaExtractor,
+                  onChanged: (value) => setState((){_useMediaExtractor = value;}),
+                ),
+              ],
+            ),
+            Container(
+              height: Sizes.rowPadding,
+            )
+          ]
+        );
+      } else {
+        children.addAll(<Widget>[
+          Row(
+            mainAxisSize: MainAxisSize.max,
+            children: <Widget>[
+              Expanded(
+                child: Text("You can use media extractor here"),
+              ),
+              GestureDetector(
+                onTap: () {
+                  Launcher.launchURLInCustomTab(
+                    context: context,
+                    url: "https://www.home-assistant.io/components/media_extractor/"
+                  );
+                },
+                child: Text(
+                  "How?",
+                  style: Theme.of(context).textTheme.body1.copyWith(
+                    color: Colors.blue,
+                    decoration: TextDecoration.underline
+                  ),
+                ),
+              ),
+            ],
+          ),
+          Container(
+            height: Sizes.doubleRowPadding,
+          )
+        ]
+        );
+      }
+      children.add(CardHeader(name: "Play on:"));
+      children.addAll(
+          _players.map((player) => InkWell(
+            child: EntityModel(
+                entityWrapper: EntityWrapper(entity: player),
+                handleTap: false,
+                child: Padding(
+                  padding: EdgeInsets.only(bottom: Sizes.doubleRowPadding),
+                  child: DefaultEntityContainer(state: player._buildStatePart(context)),
+                )
+            ),
+            onTap: () => _playMedia(player),
+          ))
+      );
+      body = ListView(
+        padding: EdgeInsets.all(Sizes.leftWidgetPadding),
+          scrollDirection: Axis.vertical,
+          children: children
+      );
+    }
+    return new Scaffold(
+      appBar: new AppBar(
+        leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
+          Navigator.pop(context);
+        }),
+        title: new Text("Play media"),
+      ),
+      body: body,
+    );
+  }
+
+  @override
+  void dispose(){
+    HomeAssistant().sendFromPlayerId = null;
+    _stateSubscription?.cancel();
+    _refreshDataSubscription?.cancel();
+    super.dispose();
+  }
+
+}

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/pages/settings.page.dart

@@ -1,228 +0,0 @@
-part of '../main.dart';
-
-class ConnectionSettingsPage extends StatefulWidget {
-  ConnectionSettingsPage({Key key, this.title}) : super(key: key);
-
-  final String title;
-
-  @override
-  _ConnectionSettingsPageState createState() => new _ConnectionSettingsPageState();
-}
-
-class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
-  String _hassioDomain = "";
-  String _newHassioDomain = "";
-  String _hassioPort = "";
-  String _newHassioPort = "";
-  String _socketProtocol = "wss";
-  String _newSocketProtocol = "wss";
-  String _longLivedToken = "";
-  String _newLongLivedToken = "";
-  bool _useLovelace = true;
-  bool _newUseLovelace = true;
-
-  String oauthUrl;
-  bool useOAuth = false;
-
-  @override
-  void initState() {
-    super.initState();
-    _loadSettings();
-
-  }
-
-  _loadSettings() async {
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    final storage = new FlutterSecureStorage();
-
-    try {
-      useOAuth = prefs.getBool("oauth-used") ?? true;
-    } catch (e) {
-      useOAuth = true;
-    }
-
-    if (!useOAuth) {
-      try {
-        _longLivedToken = _newLongLivedToken =
-        await storage.read(key: "hacl_llt");
-      } catch (e) {
-        _longLivedToken = _newLongLivedToken = "";
-        await storage.delete(key: "hacl_llt");
-      }
-    }
-
-    setState(() {
-      _hassioDomain = _newHassioDomain = prefs.getString("hassio-domain")?? "";
-      _hassioPort = _newHassioPort = prefs.getString("hassio-port") ?? "";
-      _socketProtocol = _newSocketProtocol = prefs.getString("hassio-protocol") ?? 'wss';
-      try {
-        _useLovelace = _newUseLovelace = prefs.getBool("use-lovelace") ?? true;
-      } catch (e) {
-        _useLovelace = _newUseLovelace = true;
-      }
-    });
-  }
-
-  bool _checkConfigChanged() {
-    return (
-      (_newHassioPort != _hassioPort) ||
-      (_newHassioDomain != _hassioDomain) ||
-      (_newSocketProtocol != _socketProtocol) ||
-      (_newUseLovelace != _useLovelace) ||
-      (_newLongLivedToken != _longLivedToken));
-
-  }
-
-  _saveSettings() async {
-    _newHassioDomain = _newHassioDomain.trim();
-    if (_newHassioDomain.indexOf("http") == 0 && _newHassioDomain.indexOf("//") > 0) {
-      _newHassioDomain = _newHassioDomain.split("//")[1];
-    }
-    _newHassioDomain = _newHassioDomain.split("/")[0];
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    final storage = new FlutterSecureStorage();
-    if (_newLongLivedToken.isNotEmpty) {
-      _newLongLivedToken = _newLongLivedToken.trim();
-      prefs.setBool("oauth-used", false);
-      await storage.write(key: "hacl_llt", value: _newLongLivedToken);
-    } else if (!useOAuth) {
-      await storage.delete(key: "hacl_llt");
-    }
-    prefs.setString("hassio-domain", _newHassioDomain);
-    if (_newHassioPort == null || _newHassioPort.isEmpty) {
-      _newHassioPort = _newSocketProtocol == "wss" ? "443" : "80";
-    } else {
-      _newHassioPort = _newHassioPort.trim();
-    }
-    prefs.setString("hassio-port", _newHassioPort);
-    prefs.setString("hassio-protocol", _newSocketProtocol);
-    prefs.setString("hassio-res-protocol", _newSocketProtocol == "wss" ? "https" : "http");
-    prefs.setBool("use-lovelace", _newUseLovelace);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return new Scaffold(
-      appBar: new AppBar(
-        leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
-          Navigator.pop(context);
-        }),
-        title: new Text(widget.title),
-        actions: <Widget>[
-          IconButton(
-            icon: Icon(Icons.check),
-            onPressed: (){
-              if (_checkConfigChanged()) {
-                Logger.d("Settings changed. Saving...");
-                _saveSettings().then((r) {
-                  Navigator.pop(context);
-                  eventBus.fire(SettingsChangedEvent(true));
-                });
-              } else {
-                Logger.d("Settings was not changed");
-                Navigator.pop(context);
-              }
-            }
-          )
-        ],
-      ),
-      body: ListView(
-        scrollDirection: Axis.vertical,
-        padding: const EdgeInsets.all(20.0),
-        children: <Widget>[
-          Text(
-              "Connection settings",
-              style: TextStyle(
-                color: Colors.black45,
-                fontSize: 20.0
-              ),
-          ),
-          new Row(
-            children: [
-              Text("Use ssl (HTTPS)"),
-              Switch(
-                value: (_newSocketProtocol == "wss"),
-                onChanged: (value) {
-                  setState(() {
-                    _newSocketProtocol = value ? "wss" : "ws";
-                  });
-                },
-              )
-            ],
-          ),
-          new TextField(
-            decoration: InputDecoration(
-              labelText: "Home Assistant domain or ip address"
-            ),
-            controller: TextEditingController.fromValue(TextEditingValue(text: _newHassioDomain)),
-            onChanged: (value) {
-              _newHassioDomain = value;
-            }
-          ),
-          new TextField(
-            decoration: InputDecoration(
-              labelText: "Home Assistant port (default is 8123)"
-            ),
-            controller: TextEditingController.fromValue(TextEditingValue(text: _newHassioPort)),
-            onChanged: (value) {
-              _newHassioPort = value;
-            }
-          ),
-          new Text(
-            "Try ports 80 and 443 if default is not working and you don't know why.",
-            style: TextStyle(color: Colors.grey),
-          ),
-          Padding(
-            padding: EdgeInsets.only(top: 20.0),
-            child: Text(
-              "UI",
-              style: TextStyle(
-                  color: Colors.black45,
-                  fontSize: 20.0
-              ),
-            ),
-          ),
-          new Row(
-            children: [
-              Text("Use Lovelace UI"),
-              Switch(
-                value: _newUseLovelace,
-                onChanged: (value) {
-                  setState(() {
-                    _newUseLovelace = value;
-                  });
-                },
-              )
-            ],
-          ),
-          Text(
-            "Authentication settings",
-            style: TextStyle(
-                color: Colors.black45,
-                fontSize: 20.0
-            ),
-          ),
-          Container(height: 10.0,),
-          Text(
-            "You can leave this field blank to make app generate new long-lived token automatically by asking you to login to your Home Assistant. Use this field only if you still want to use manually generated long-lived token. Leave it blank if you don't understand what we are talking about.",
-            style: TextStyle(color: Colors.redAccent),
-          ),
-          new TextField(
-              decoration: InputDecoration(
-                  labelText: "Long-lived token"
-              ),
-              controller: TextEditingController.fromValue(TextEditingValue(text: _newLongLivedToken)),
-              onChanged: (value) {
-                _newLongLivedToken = value;
-              }
-          ),
-        ],
-      ),
-    );
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-}

lib/pages/settings/app_settings.page.dart

@@ -0,0 +1,104 @@
+part of '../../main.dart';
+
+enum AppSettingsSection {menu, connectionSettings, integrationSettings, lookAndFeel}
+
+class AppSettingsPage extends StatefulWidget {
+  final AppSettingsSection showSection;
+
+  AppSettingsPage({Key key, this.showSection: AppSettingsSection.menu}) : super(key: key);
+
+  @override
+  _AppSettingsPageState createState() => new _AppSettingsPageState();
+}
+
+class _AppSettingsPageState extends State<AppSettingsPage> {
+
+  var _currentSection;
+
+  @override
+  void initState() {
+    super.initState();
+    _currentSection = widget.showSection;
+  }
+
+  Widget _buildMenuItem(BuildContext context, IconData icon,String title, AppSettingsSection section) {
+    return ListTile(
+      title: Text(title, style: Theme.of(context).textTheme.subhead),
+      leading: Icon(icon),
+      trailing: Icon(Icons.keyboard_arrow_right),
+      onTap: () {
+        setState(() {
+          _currentSection = section;
+        });
+      },
+    );
+  }
+
+  Widget _buildMenu(BuildContext context) {
+    return ListView(
+      children: <Widget>[
+        _buildMenuItem(context, MaterialDesignIcons.getIconDataFromIconName('mdi:network'), 'Connection settings', AppSettingsSection.connectionSettings),
+        _buildMenuItem(context, MaterialDesignIcons.getIconDataFromIconName('mdi:cellphone-android'), 'Integration settings', AppSettingsSection.integrationSettings),
+        _buildMenuItem(context, MaterialDesignIcons.getIconDataFromIconName('mdi:brush'), 'Look and feel', AppSettingsSection.lookAndFeel),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Widget section;
+    String title;
+    switch (_currentSection) {
+      case AppSettingsSection.menu: {
+        section = _buildMenu(context);
+        title = 'App settings';
+        break;
+      }
+      case AppSettingsSection.connectionSettings: {
+        section = ConnectionSettingsPage();
+        title = 'App settings - Connection';
+        break;
+      }
+      case AppSettingsSection.integrationSettings: {
+        section = IntegrationSettingsPage();
+        title = 'App settings - Integration';
+        break;
+      }
+      case AppSettingsSection.lookAndFeel: {
+        section = LookAndFeelSettingsPage();
+        title = 'App settings - Look&Feel';
+        break;
+      }
+      default:
+        title = ':(';
+        section = PageLoadingIndicator();
+    }
+    return WillPopScope(
+      child: Scaffold(
+        appBar: new AppBar(
+          leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
+            if (_currentSection == AppSettingsSection.menu) {
+              Navigator.pop(context);
+            } else {
+              setState(() {
+                _currentSection = AppSettingsSection.menu;
+              });
+            }
+          }),
+          title: Text(title),
+        ),
+        body: section
+      ),
+      onWillPop: () {
+        if (_currentSection == AppSettingsSection.menu) {
+          return Future.value(true);
+        } else {
+          setState(() {
+            _currentSection = AppSettingsSection.menu;
+          });
+          return Future.value(false);
+        }
+      },
+    );
+  }
+}