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,5 +9,14 @@ build/
 .flutter-plugins
 
 .idea/
+.vscode/
+.theia/
+.project/
+.settings/
 
-key.properties
+flutter_export_environment.sh
+.flutter-plugins-dependencies
+
+key.properties
+.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,12 +1,16 @@
-[![flutter](https://somegeeky.website/assets/badges/flutter_badge_v3.svg)](https://somegeeky.website/badges/flutter) [![dart](https://somegeeky.website/assets/badges/dart_badge_v3.svg)](https://somegeeky.website/badges/dart)
 # 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.
 
-Join [Google Group](https://groups.google.com/d/forum/ha-client-alpha-testing) to become an alpha tester
+Download the app from [Google Play](https://play.google.com/apps/testing/com.keyboardcrumbs.haclient)
 
-Download the app from [Google Play](https://play.google.com/apps/testing/com.keyboardcrumbs.haclient) after joining the group
+Discuss it on [Discord](https://discord.gg/nd6FZQ) or at [Home Assistant community](https://community.home-assistant.io/c/mobile-apps/ha-client-android)
 
-Discuss it in [Home Assistant community](https://community.home-assistant.io/t/alpha-testing-ha-client-native-android-client-for-home-assistant/69912)
+[![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": []
-        },
-        "ads_service": {
-          "status": 2
+          "other_platform_oauth_client": [
+            {
+              "client_id": "441874387819-id0hqsfprj3b5kc312faqv3lmdfpm7l8.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
         }
       }
     }

android/app/src/main/AndroidManifest.xml

@@ -1,11 +1,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.keyboardcrumbs.hassclient">
 
-    <!-- The INTERNET permission is required for development. Specifically,
-         flutter needs it to communicate with the running application
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
+    <uses-feature android:name="android.hardware.touchscreen"
+        android:required="false" />
     <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.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.
@@ -13,10 +17,18 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
         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" />
+
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
@@ -24,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:value="true" />
+                android:name="io.flutter.embedding.android.SplashScreenDrawable"
+                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" />
@@ -40,5 +51,20 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
+        <service
+            android:name="io.flutter.plugins.androidalarmmanager.AlarmService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="false"/>
+        <receiver
+            android:name="io.flutter.plugins.androidalarmmanager.AlarmBroadcastReceiver"
+            android:exported="false"/>
+        <receiver
+            android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"></action>
+            </intent-filter>
+        </receiver>
     </application>
 </manifest>

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

@@ -1,13 +1,15 @@
 package com.keyboardcrumbs.hassclient;
 
-import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
+import androidx.annotation.NonNull;
+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) {
-    super.onCreate(savedInstanceState);
-    GeneratedPluginRegistrant.registerWith(this);
-  }
+  
+    @Override
+    public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
+        GeneratedPluginRegistrant.registerWith(flutterEngine);
+    }
+
 }

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

@@ -2,4 +2,5 @@ org.gradle.jvmargs=-Xmx2g
 org.gradle.daemon=true
 org.gradle.caching=true
 android.useAndroidX=true
-android.enableJetifier=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

@@ -0,0 +1,35 @@
+window.externalApp = {};
+window.externalApp.getExternalAuth = function(options) {
+    console.log("Starting external auth");
+    var options = JSON.parse(options);
+    if (options && options.callback) {
+        var responseData = {
+            access_token: "[token]",
+            expires_in: 1800
+        };
+        console.log("Waiting for callback to be added");
+        setTimeout(function(){
+            console.log("Calling a callback");
+            window[options.callback](true, responseData);
+        }, 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');
+    }
+};

flutter_01.log

@@ -0,0 +1,41 @@
+Flutter crash report; please file at https://github.com/flutter/flutter/issues.
+
+## command
+
+flutter --no-color run --machine --track-widget-creation --device-id=89AY052S4 lib/main.dart
+
+## exception
+
+_InternalLinkedHashMap<String, dynamic>: {code: 105, message: Isolate must be runnable, data: {request: {method: _reloadSources, params: {pause: true, rootLibUri: file:///data/user/0/com.keyboardcrumbs.haclient/code_cache/ha_clientSYJJZI/ha_client/lib/main.dart.incremental.dill, packagesUri: file:///data/user/0/com.keyboardcrumbs.haclient/code_cache/ha_clientSYJJZI/ha_client/.packages, isolateId: isolates/68989666}}, details: Isolate must be runnable before this request is made.}}
+
+```
+null```
+
+## flutter doctor
+
+```
+[✓] Flutter (Channel stable, v1.7.8+hotfix.4, on Linux, locale en_US.UTF-8)
+    • Flutter version 1.7.8+hotfix.4 at /home/estevez/sdk/flutter
+    • Framework revision 20e59316b8 (6 weeks ago), 2019-07-18 20:04:33 -0700
+    • Engine revision fee001c93f
+    • Dart version 2.4.0
+
+[✓] Android toolchain - develop for Android devices (Android SDK version 29.0.2)
+    • Android SDK at /home/estevez/Android/Sdk
+    • Android NDK location not configured (optional; useful for native profiling support)
+    • Platform android-29, build-tools 29.0.2
+    • Java binary at: /home/estevez/bin/android-studio/jre/bin/java
+    • Java version OpenJDK Runtime Environment (build 1.8.0_202-release-1483-b49-5587405)
+    • All Android licenses accepted.
+
+[✓] Android Studio (version 3.5)
+    • Android Studio at /home/estevez/bin/android-studio
+    • Flutter plugin version 38.2.3
+    • Dart plugin version 191.8423
+    • Java version OpenJDK Runtime Environment (build 1.8.0_202-release-1483-b49-5587405)
+
+[✓] Connected device (1 available)
+    • Pixel 3 XL • 89AY052S4 • android-arm64 • Android 9 (API 28)
+
+• No issues found!
+```

flutter_02.log

@@ -0,0 +1,41 @@
+Flutter crash report; please file at https://github.com/flutter/flutter/issues.
+
+## command
+
+flutter --no-color run --machine --track-widget-creation --device-id=89AY052S4 lib/main.dart
+
+## exception
+
+_InternalLinkedHashMap<String, dynamic>: {code: 105, message: Isolate must be runnable, data: {request: {method: _reloadSources, params: {pause: true, rootLibUri: file:///data/user/0/com.keyboardcrumbs.haclient/code_cache/ha_clientWYMXDL/ha_client/lib/main.dart.incremental.dill, packagesUri: file:///data/user/0/com.keyboardcrumbs.haclient/code_cache/ha_clientWYMXDL/ha_client/.packages, isolateId: isolates/289688365}}, details: Isolate must be runnable before this request is made.}}
+
+```
+null```
+
+## flutter doctor
+
+```
+[✓] Flutter (Channel stable, v1.7.8+hotfix.4, on Linux, locale en_US.UTF-8)
+    • Flutter version 1.7.8+hotfix.4 at /home/estevez/sdk/flutter
+    • Framework revision 20e59316b8 (6 weeks ago), 2019-07-18 20:04:33 -0700
+    • Engine revision fee001c93f
+    • Dart version 2.4.0
+
+[✓] Android toolchain - develop for Android devices (Android SDK version 29.0.2)
+    • Android SDK at /home/estevez/Android/Sdk
+    • Android NDK location not configured (optional; useful for native profiling support)
+    • Platform android-29, build-tools 29.0.2
+    • Java binary at: /home/estevez/bin/android-studio/jre/bin/java
+    • Java version OpenJDK Runtime Environment (build 1.8.0_202-release-1483-b49-5587405)
+    • All Android licenses accepted.
+
+[✓] Android Studio (version 3.5)
+    • Android Studio at /home/estevez/bin/android-studio
+    • Flutter plugin version 38.2.3
+    • Dart plugin version 191.8423
+    • Java version OpenJDK Runtime Environment (build 1.8.0_202-release-1483-b49-5587405)
+
+[✓] Connected device (1 available)
+    • Pixel 3 XL • 89AY052S4 • android-arm64 • Android 9 (API 28)
+
+• No issues found!
+```

flutter_03.log

@@ -0,0 +1,41 @@
+Flutter crash report; please file at https://github.com/flutter/flutter/issues.
+
+## command
+
+flutter --no-color run --machine --track-widget-creation --device-id=89AY052S4 lib/main.dart
+
+## exception
+
+_InternalLinkedHashMap<String, dynamic>: {code: 105, message: Isolate must be runnable, data: {request: {method: _reloadSources, params: {pause: true, rootLibUri: file:///data/user/0/com.keyboardcrumbs.haclient/code_cache/ha_clientLNSJAH/ha_client/lib/main.dart.incremental.dill, packagesUri: file:///data/user/0/com.keyboardcrumbs.haclient/code_cache/ha_clientLNSJAH/ha_client/.packages, isolateId: isolates/866521062}}, details: Isolate must be runnable before this request is made.}}
+
+```
+null```
+
+## flutter doctor
+
+```
+[✓] Flutter (Channel stable, v1.7.8+hotfix.4, on Linux, locale en_US.UTF-8)
+    • Flutter version 1.7.8+hotfix.4 at /home/estevez/sdk/flutter
+    • Framework revision 20e59316b8 (6 weeks ago), 2019-07-18 20:04:33 -0700
+    • Engine revision fee001c93f
+    • Dart version 2.4.0
+
+[✓] Android toolchain - develop for Android devices (Android SDK version 29.0.2)
+    • Android SDK at /home/estevez/Android/Sdk
+    • Android NDK location not configured (optional; useful for native profiling support)
+    • Platform android-29, build-tools 29.0.2
+    • Java binary at: /home/estevez/bin/android-studio/jre/bin/java
+    • Java version OpenJDK Runtime Environment (build 1.8.0_202-release-1483-b49-5587405)
+    • All Android licenses accepted.
+
+[✓] Android Studio (version 3.5)
+    • Android Studio at /home/estevez/bin/android-studio
+    • Flutter plugin version 38.2.3
+    • Dart plugin version 191.8423
+    • Java version OpenJDK Runtime Environment (build 1.8.0_202-release-1483-b49-5587405)
+
+[✓] Connected device (1 available)
+    • Pixel 3 XL • 89AY052S4 • android-arm64 • Android 9 (API 28)
+
+• No issues found!
+```

lib/auth_manager.class.dart

@@ -1,44 +0,0 @@
-part of 'main.dart';
-
-class AuthManager {
-
-  static final AuthManager _instance = AuthManager._internal();
-
-  factory AuthManager() {
-    return _instance;
-  }
-
-  AuthManager._internal();
-
-  Future getTempToken({String httpWebHost, String oauthUrl}) {
-    Completer completer = Completer();
-    final flutterWebviewPlugin = new FlutterWebviewPlugin();
-    flutterWebviewPlugin.onUrlChanged.listen((String url) {
-      if (url.startsWith("http://ha-client.homemade.systems/service/auth_callback.html")) {
-        String authCode = url.split("=")[1];
-        Logger.d("We have auth code. Getting temporary access token...");
-        Connection().sendHTTPPost(
-            host: httpWebHost,
-            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/')}"
-        ).then((response) {
-          Logger.d("Gottemp token");
-          String tempToken = json.decode(response)['access_token'];
-          Logger.d("Closing webview...");
-          flutterWebviewPlugin.close();
-          completer.complete(tempToken);
-        }).catchError((e) {
-          flutterWebviewPlugin.close();
-          completer.completeError({"errorCode": 61, "errorMessage": "Error getting temp token"});
-          Logger.e("Error getting temp token: ${e.toString()}");
-        });
-      }
-    });
-    Logger.d("Launching OAuth...");
-    eventBus.fire(StartAuthEvent(oauthUrl));
-    return completer.future;
-  }
-
-}

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

@@ -24,63 +24,82 @@ class CardWidget extends StatelessWidget {
       }
     }
 
+    if (card.conditions.isNotEmpty) {
+      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_not'] != null && conditionEntity.state == condition['state_not']))
+          ) {
+          showCardByConditions = false;
+          break;
+        }
+      }
+      if (!showCardByConditions) {
+        return Container(width: 0.0, height: 0.0,);
+      }
+    }
+
     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) {
-            if (card.getEntitiesToShow().isNotEmpty || card.showEmpty) {
-              children.add(
-                  Flexible(
-                    fit: FlexFit.tight,
-                    child: card.build(context),
-                  )
-              );
-            }
-          });
+          children = card.childCards.map((childCard) => Flexible(
+              fit: FlexFit.tight,
+              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 = [];
-          card.childCards.forEach((card) {
-            children.add(
-                card.build(context)
-            );
-          });
+          List<Widget> children = card.childCards.map((childCard) => childCard.build(context)).toList();
           return Column(
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.start,
@@ -107,22 +126,49 @@ 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(10.0, 4.0, 0.0, 4.0),
-              child: EntityModel(
-                  entityWrapper: entity,
-                  handleTap: true,
-                  child: entity.entity.buildDefaultWidget(context)
-              ),
-            ));
-      }
+      body.add(
+          Padding(
+            padding: EdgeInsets.fromLTRB(0.0, 4.0, 0.0, 4.0),
+            child: EntityModel(
+                entityWrapper: entity,
+                handleTap: true,
+                child: entity.entity.buildDefaultWidget(context)
+            ),
+          ));
     });
     return Card(
-        child: new Column(mainAxisSize: MainAxisSize.min, children: body)
+        child: Padding(
+          padding: EdgeInsets.only(right: Sizes.rightWidgetPadding, left: Sizes.leftWidgetPadding),
+          child: Column(mainAxisSize: MainAxisSize.min, children: body),
+        )
     );
   }
 
@@ -131,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(
@@ -143,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,
@@ -164,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))
                 )
             )
           ]
@@ -195,39 +238,51 @@ 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;
 
-    entitiesToShow.forEach((EntityWrapper entity) {
-      result.add(
-          FractionallySizedBox(
-            widthFactor: 1/columnsCount,
-            child: EntityModel(
-                entityWrapper: entity,
-                child: GlanceEntityContainer(
-                  showName: card.showName,
-                  showState: card.showState,
-                ),
-                handleTap: true
-            ),
-          )
-      );
-    });
     rows.add(
         Padding(
-          padding: EdgeInsets.fromLTRB(0.0, Sizes.rowPadding, 0.0, 2*Sizes.rowPadding),
-          child: Wrap(
-            //alignment: WrapAlignment.spaceAround,
-            runSpacing: Sizes.rowPadding*2,
-            children: result,
+          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) {
+                    buttons.add(
+                        SizedBox(
+                          width: buttonWidth,
+                          child: EntityModel(
+                              entityWrapper: entity,
+                              child: GlanceCardEntityContainer(
+                                showName: card.showName,
+                                showState: card.showState,
+                              ),
+                              handleTap: true
+                          ),
+                        )
+                    );
+                  });
+                  return Wrap(
+                    //spacing: 5.0,
+                    //alignment: WrapAlignment.spaceEvenly,
+                    runSpacing: Sizes.doubleRowPadding,
+                    children: buttons,
+                  );
+                }
+            ),
           ),
         )
     );
 
     return Card(
-        child: new Column(mainAxisSize: MainAxisSize.min, children: rows)
+        child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: rows
+        )
     );
   }
 
@@ -242,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
         )
     );
@@ -255,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>[
@@ -286,4 +381,4 @@ class CardWidget extends StatelessWidget {
     );
   }
 
-}
+}

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) {
@@ -39,43 +37,39 @@ class GlanceEntityContainer extends StatelessWidget {
       }
     }
     result.add(
-      EntityIcon(
-        padding: EdgeInsets.all(0.0),
-        size: iconSize,
-      )
+        EntityIcon(
+          padding: EdgeInsets.all(0.0),
+          size: iconSize,
+        )
     );
     if (!nameInTheBottom) {
       if (showState) {
         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,
-          ),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          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/connection.class.dart

@@ -1,343 +0,0 @@
-part of 'main.dart';
-
-class Connection {
-
-  static final Connection _instance = Connection._internal();
-
-  factory Connection() {
-    return _instance;
-  }
-
-  Connection._internal();
-
-  String displayHostname;
-  String _webSocketAPIEndpoint;
-  String httpWebHost;
-  String _token;
-  String _tempToken;
-  String oauthUrl;
-  bool get isAuthenticated => _token != null;
-  StreamSubscription _socketSubscription;
-  Duration connectTimeout = Duration(seconds: 15);
-
-  bool isConnected = false;
-
-  var onStateChangeCallback;
-
-  IOWebSocketChannel _socket;
-
-  int _currentMessageId = 0;
-  Map<String, Completer> _messageResolver = {};
-
-  Future init(onStateChange) async {
-    Completer completer = Completer();
-    onStateChangeCallback = onStateChange;
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    String domain = prefs.getString('hassio-domain');
-    String port = prefs.getString('hassio-port');
-    displayHostname = "$domain:$port";
-    _webSocketAPIEndpoint = "${prefs.getString('hassio-protocol')}://$domain:$port/api/websocket";
-    httpWebHost = "${prefs.getString('hassio-res-protocol')}://$domain:$port";
-    //_token = prefs.getString('hassio-token');
-    final storage = new FlutterSecureStorage();
-    try {
-      _token = await storage.read(key: "hacl_llt");
-    } catch (e) {
-      Logger.e("Cannt read secure storage. Need to relogin.");
-      _token = null;
-      await storage.delete(key: "hacl_llt");
-    }
-    if ((domain == null) || (port == null) ||
-        (domain.length == 0) || (port.length == 0)) {
-      completer.completeError({"errorCode": 5, "errorMessage": "Check connection settings"});
-    } else {
-      oauthUrl = "$httpWebHost/auth/authorize?client_id=${Uri.encodeComponent('http://ha-client.homemade.systems/')}&redirect_uri=${Uri.encodeComponent('http://ha-client.homemade.systems/service/auth_callback.html')}";
-      if (_token == null) {
-        await AuthManager().getTempToken(
-            httpWebHost: httpWebHost,
-            oauthUrl: oauthUrl
-        ).then((token) {
-          Logger.d("Token from AuthManager recived");
-          _tempToken = token;
-        });
-      }
-      _connect().timeout(connectTimeout, onTimeout: () {
-        _disconnect().then((_) {
-          completer.completeError(
-              {"errorCode": 1, "errorMessage": "Connection timeout"});
-        });
-      }).then((_) => completer.complete()).catchError((e) {
-        completer.completeError(e);
-      });
-    }
-    return completer.future;
-  }
-
-  Completer connecting;
-
-  Future _connect() async {
-    if (connecting != null && !connecting.isCompleted) {
-      Logger.w("");
-      return connecting.future;
-    }
-    connecting = Completer();
-    await _disconnect();
-    Logger.d( "Socket connecting...");
-    _socket = IOWebSocketChannel.connect(
-        _webSocketAPIEndpoint, pingInterval: Duration(seconds: 15));
-    _socketSubscription = _socket.stream.listen(
-            (message) {
-          isConnected = true;
-          var data = json.decode(message);
-          if (data["type"] == "auth_required") {
-            Logger.d("[Received] <== ${data.toString()}");
-            _authenticate().then((_) => connecting.complete()).catchError((e) {
-              if (!connecting.isCompleted) connecting.completeError(e);
-            });
-          } else if (data["type"] == "auth_ok") {
-            Logger.d("[Received] <== ${data.toString()}");
-            _messageResolver["auth"]?.complete();
-            _messageResolver.remove("auth");
-            if (!connecting.isCompleted) connecting.complete(sendSocketMessage(
-              type: "subscribe_events",
-              additionalData: {"event_type": "state_changed"},
-            ));
-          } else if (data["type"] == "auth_invalid") {
-            Logger.d("[Received] <== ${data.toString()}");
-            _messageResolver["auth"]?.completeError({"errorCode": 62, "errorMessage": "${data["message"]}"});
-            _messageResolver.remove("auth");
-            logout().then((_) {
-              if (!connecting.isCompleted) connecting.completeError({"errorCode": 62, "errorMessage": "${data["message"]}"});
-            });
-          } else {
-            _handleMessage(data);
-          }
-        },
-        cancelOnError: true,
-        onDone: () => _handleSocketClose(connecting),
-        onError: (e) => _handleSocketError(e, connecting)
-    );
-    return connecting.future;
-  }
-
-  Future _disconnect() async {
-    Logger.d( "Socket disconnecting...");
-    await _socketSubscription?.cancel();
-    await _socket?.sink?.close()?.timeout(Duration(seconds: 4),
-        onTimeout: () => Logger.d( "Socket sink close timeout")
-    );
-    Logger.d( "..Disconnected");
-  }
-
-  _handleMessage(data) {
-    if (data["type"] == "result") {
-      if (data["id"] != null && data["success"]) {
-        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({"errorMessage": "${data['error']["message"]}"});
-      }
-      _messageResolver.remove("${data["id"]}");
-    } else if (data["type"] == "event") {
-      if ((data["event"] != null) && (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) {
-        Logger.w("Unhandled event type: ${data["event"]["event_type"]}");
-      } else {
-        Logger.e("Event is null: $data");
-      }
-    } else {
-      Logger.d("[Received unhandled] <== ${data.toString()}");
-    }
-  }
-
-  void _handleSocketClose(Completer connectionCompleter) {
-    isConnected = false;
-    Logger.d("Socket disconnected.");
-    if (!connectionCompleter.isCompleted) {
-      connectionCompleter.completeError({"errorCode": 82, "errorMessage": "Disconnected"});
-    } else {
-      _disconnect().then((_) {
-        Timer(Duration(seconds: 5), () {
-          Logger.d("Trying to reconnect...");
-          _connect();
-        });
-      });
-    }
-  }
-
-  void _handleSocketError(e, Completer connectionCompleter) {
-    isConnected = false;
-    Logger.e("Socket stream Error: $e");
-    if (!connectionCompleter.isCompleted) {
-      connectionCompleter.completeError({"errorCode": 81, "errorMessage": "Unable to connect to Home Assistant"});
-    } else {
-      _disconnect().then((_) {
-        Timer(Duration(seconds: 5), () {
-          Logger.d("Trying to reconnect...");
-          _connect();
-        });
-      });
-    }
-  }
-
-  Future _authenticate() {
-    Completer completer = Completer();
-    if (_token != null) {
-      Logger.d( "Long-lived token exist");
-      Logger.d( "[Sending] ==> auth request");
-      sendSocketMessage(
-          type: "auth",
-          additionalData: {"access_token": "$_token"},
-          auth: true
-      ).then((_) {
-        completer.complete();
-      }).catchError((e) => completer.completeError(e));
-    } else if (_tempToken != null) {
-      Logger.d("We have temp token. Loging in...");
-      sendSocketMessage(
-          type: "auth",
-          additionalData: {"access_token": "$_tempToken"},
-          auth: true
-      ).then((_) {
-        Logger.d("Requesting long-lived token...");
-        _getLongLivedToken().then((_) {
-          completer.complete();
-        }).catchError((e) {
-          Logger.e("Can't get long-lived token: $e");
-          throw e;
-        });
-      }).catchError((e) => completer.completeError(e));
-    } else {
-      completer.completeError({"errorCode": 63, "errorMessage": "General login error"});
-    }
-    return completer.future;
-  }
-
-  Future logout() {
-    _token = null;
-    _tempToken = null;
-    final storage = new FlutterSecureStorage();
-    return storage.delete(key: "hacl_llt");
-  }
-
-  Future _getLongLivedToken() {
-    Completer completer = Completer();
-    sendSocketMessage(type: "auth/long_lived_access_token", additionalData: {"client_name": "HA Client app ${DateTime.now().millisecondsSinceEpoch}", "lifespan": 365}).then((data) {
-      Logger.d("Got long-lived token.");
-      _token = data;
-      _tempToken = null;
-      final storage = new FlutterSecureStorage();
-      storage.write(key: "hacl_llt", value: "$_token").then((_) {
-        completer.complete();
-      }).catchError((e) {
-        throw e;
-      });
-    }).catchError((e) {
-      logout();
-      completer.completeError({"errorCode": 63, "errorMessage": "Authentication error: $e"});
-    });
-    return completer.future;
-  }
-
-  Future sendSocketMessage({String type, Map additionalData, bool auth: false}) {
-    Completer _completer = Completer();
-    Map dataObject = {"type": "$type"};
-    String callbackName;
-    if (!auth) {
-      _incrementMessageId();
-      dataObject["id"] = _currentMessageId;
-      callbackName = "$_currentMessageId";
-    } else {
-      callbackName = "auth";
-    }
-    if (additionalData != null) {
-      dataObject.addAll(additionalData);
-    }
-    _messageResolver[callbackName] = _completer;
-    String rawMessage = json.encode(dataObject);
-    Logger.d("[Sending] ==> $rawMessage");
-    if (!isConnected) {
-      _connect().timeout(connectTimeout, onTimeout: (){
-        _completer.completeError({"errorCode": 8, "errorMessage": "No connection to Home Assistant"});
-      }).then((_) {
-        _socket.sink.add(rawMessage);
-      }).catchError((e) {
-        _completer.completeError(e);
-      });
-    } else {
-      _socket.sink.add(rawMessage);
-    }
-    return _completer.future;
-  }
-
-  void _incrementMessageId() {
-    _currentMessageId += 1;
-  }
-
-  Future callService({String domain, String service, String entityId, Map additionalServiceData}) {
-    Map serviceData = {};
-    if (entityId != null) {
-      serviceData["entity_id"] = entityId;
-    }
-    if (additionalServiceData != null && additionalServiceData.isNotEmpty) {
-      serviceData.addAll(additionalServiceData);
-    }
-    if (serviceData.isNotEmpty)
-      return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service, "service_data": serviceData});
-    else
-      return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service});
-  }
-
-  Future<List> getHistory(String entityId) async {
-    DateTime now = DateTime.now();
-    //String endTime = formatDate(now, [yyyy, '-', mm, '-', dd, 'T', HH, ':', nn, ':', ss, z]);
-    String startTime = formatDate(now.subtract(Duration(hours: 24)), [yyyy, '-', mm, '-', dd, 'T', HH, ':', nn, ':', ss, z]);
-    String url = "$httpWebHost/api/history/period/$startTime?&filter_entity_id=$entityId";
-    Logger.d("[Sending] ==> $url");
-    http.Response historyResponse;
-    historyResponse = await http.get(url, headers: {
-      "authorization": "Bearer $_token",
-      "Content-Type": "application/json"
-    });
-    var history = json.decode(historyResponse.body);
-    if (history is List) {
-      Logger.d( "[Received] <== ${history.first.length} history recors");
-      return history;
-    } else {
-      return [];
-    }
-  }
-
-  Future sendHTTPPost({String host, String endPoint, String data, String contentType: "application/json", bool includeAuthHeader: true, String authToken}) async {
-    Completer completer = Completer();
-    String url = "$host$endPoint";
-    Logger.d("[Sending] ==> $url");
-    Map<String, String> headers = {};
-    if (contentType != null) {
-      headers["Content-Type"] = contentType;
-    }
-    if (includeAuthHeader) {
-      headers["authorization"] = "Bearer $authToken";
-    }
-    http.post(
-        url,
-        headers: headers,
-        body: data
-    ).then((response) {
-      Logger.d("[Received] <== ${response.statusCode}, ${response.body}");
-      if (response.statusCode == 200) {
-        completer.complete(response.body);
-      } else {
-        completer.completeError({"code": response.statusCode, "message": "${response.body}"});
-      }
-    }).catchError((e) {
-      completer.completeError(e);
-    });
-
-    return completer.future;
-  }
-
-}

lib/const.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of 'main.dart';
 
 class EntityState {
   static const on = 'on';
@@ -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 verticalStack = "vertical-stack";
-  static const entities = "entities";
-  static const glance = "glance";
-  static const mediaControl = "media-control";
-  static const weatherForecast = "weather-forecast";
-  static const thermostat = "thermostat";
-  static const sensor = "sensor";
-  static const plantStatus = "plant-status";
-  static const pictureEntity = "picture-entity";
-  static const pictureElements = "picture-elements";
-  static const picture = "picture";
-  static const map = "map";
-  static const iframe = "iframe";
-  static const gauge = "gauge";
-  static const entityButton = "entity-button";
-  static const conditional = "conditional";
-  static const alarmPanel = "alarm-panel";
-  static const markdown = "markdown";
+  static const HORIZONTAL_STACK = "horizontal-stack";
+  static const VERTICAL_STACK = "vertical-stack";
+  static const ENTITIES = "entities";
+  static const GLANCE = "glance";
+  static const MEDIA_CONTROL = "media-control";
+  static const WEATHER_FORECAST = "weather-forecast";
+  static const THERMOSTAT = "thermostat";
+  static const SENSOR = "sensor";
+  static const PLANT_STATUS = "plant-status";
+  static const PICTURE_ENTITY = "picture-entity";
+  static const PICTURE_ELEMENTS = "picture-elements";
+  static const PICTURE = "picture";
+  static const MAP = "map";
+  static const IFRAME = "iframe";
+  static const GAUGE = "gauge";
+  static const ENTITY_BUTTON = "entity-button";
+  static const BUTTON = "button";
+  static const CONDITIONAL = "conditional";
+  static const ALARM_PANEL = "alarm-panel";
+  static const MARKDOWN = "markdown";
+  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/alarm_control_panel_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class AlarmControlPanelEntity extends Entity {
   AlarmControlPanelEntity(Map rawData, String webHost) : super(rawData, webHost);

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

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class AlarmControlPanelControlsWidget extends StatefulWidget {
 
@@ -25,9 +25,12 @@ class _AlarmControlPanelControlsWidgetWidgetState extends State<AlarmControlPane
 
 
   void _callService(AlarmControlPanelEntity entity, String service) {
-    eventBus.fire(new ServiceCallEvent(
-          entity.domain, service, entity.entityId,
-          {"code": "$code"}));
+    ConnectionManager().callService(
+      domain: entity.domain,
+      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/automation/automation_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class AutomationEntity extends Entity {
   AutomationEntity(Map rawData, String webHost) : super(rawData, webHost);

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] ??
-        EntityColor.badgeColors["default"];
+    Color iconColor = HAClientTheme().getBadgeColor(entityModel.entityWrapper.entity.domain);
     switch (entityModel.entityWrapper.entity.domain) {
       case "sun":
         {
@@ -30,30 +29,43 @@ class BadgeWidget extends StatelessWidget {
           badgeIcon = EntityIcon(
             padding: EdgeInsets.all(0.0),
             size: iconSize,
-            color: Colors.black
+            color: Theme.of(context).textTheme.body1.color
           );
           break;
         }
       case "device_tracker":
+      case "person":
         {
           badgeIcon = EntityIcon(
               padding: EdgeInsets.all(0.0),
               size: iconSize,
-              color: Colors.black
+              color: Theme.of(context).textTheme.body1.color
           );
-          onBadgeTextValue = entityModel.entityWrapper.entity.state;
+          onBadgeTextValue = entityModel.entityWrapper.entity.displayState;
           break;
         }
       default:
         {
-          onBadgeTextValue = entityModel.entityWrapper.entity.unitOfMeasurement;
+          double stateFontSize;
+          if (entityModel.entityWrapper.entity.displayState.length <= 3) {
+            stateFontSize = 18.0;
+          } else if (entityModel.entityWrapper.entity.displayState.length <= 4) {
+            stateFontSize = 15.0;
+          } else if (entityModel.entityWrapper.entity.displayState.length <= 6) {
+            stateFontSize = 10.0;
+          } else if (entityModel.entityWrapper.entity.displayState.length <= 10) {
+            stateFontSize = 8.0;
+          }
+          onBadgeTextValue = entityModel.entityWrapper.unitOfMeasurement;
           badgeIcon = Center(
             child: Text(
-              "${entityModel.entityWrapper.entity.state}",
+              "${entityModel.entityWrapper.entity.displayState}",
               overflow: TextOverflow.fade,
               softWrap: false,
               textAlign: TextAlign.center,
-              style: TextStyle(fontSize: 17.0),
+              style: Theme.of(context).textTheme.body1.copyWith(
+                fontSize: stateFontSize
+              )
             ),
           );
           break;
@@ -66,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),
@@ -87,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,
@@ -120,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,
@@ -129,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/button/button_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class ButtonEntity extends Entity {
   ButtonEntity(Map rawData, String webHost) : super(rawData, webHost);

lib/entities/camera/camera_entity.class.dart

@@ -1,14 +1,18 @@
-part of '../main.dart';
+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/climate_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class ClimateEntity extends Entity {
 
@@ -10,71 +10,57 @@ class ClimateEntity extends Entity {
   );
 
   static const SUPPORT_TARGET_TEMPERATURE = 1;
-  static const SUPPORT_TARGET_TEMPERATURE_HIGH = 2;
-  static const SUPPORT_TARGET_TEMPERATURE_LOW = 4;
-  static const SUPPORT_TARGET_HUMIDITY = 8;
-  static const SUPPORT_TARGET_HUMIDITY_HIGH = 16;
-  static const SUPPORT_TARGET_HUMIDITY_LOW = 32;
-  static const SUPPORT_FAN_MODE = 64;
-  static const SUPPORT_OPERATION_MODE = 128;
-  static const SUPPORT_HOLD_MODE = 256;
-  static const SUPPORT_SWING_MODE = 512;
-  static const SUPPORT_AWAY_MODE = 1024;
-  static const SUPPORT_AUX_HEAT = 2048;
-  static const SUPPORT_ON_OFF = 4096;
+  static const SUPPORT_TARGET_TEMPERATURE_RANGE = 2;
+  static const SUPPORT_TARGET_HUMIDITY = 4;
+  static const SUPPORT_FAN_MODE = 8;
+  static const SUPPORT_PRESET_MODE = 16;
+  static const SUPPORT_SWING_MODE = 32;
+  static const SUPPORT_AUX_HEAT = 64;
+
+
+  //static const SUPPORT_OPERATION_MODE = 16;
+  //static const SUPPORT_HOLD_MODE = 256;
+  //static const SUPPORT_AWAY_MODE = 1024;
+  //static const SUPPORT_ON_OFF = 4096;
 
   ClimateEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   bool get supportTargetTemperature => ((supportedFeatures &
   ClimateEntity.SUPPORT_TARGET_TEMPERATURE) ==
       ClimateEntity.SUPPORT_TARGET_TEMPERATURE);
-  bool get supportTargetTemperatureHigh => ((supportedFeatures &
-  ClimateEntity.SUPPORT_TARGET_TEMPERATURE_HIGH) ==
-      ClimateEntity.SUPPORT_TARGET_TEMPERATURE_HIGH);
-  bool get supportTargetTemperatureLow => ((supportedFeatures &
-  ClimateEntity.SUPPORT_TARGET_TEMPERATURE_LOW) ==
-      ClimateEntity.SUPPORT_TARGET_TEMPERATURE_LOW);
+  bool get supportTargetTemperatureRange => ((supportedFeatures &
+  ClimateEntity.SUPPORT_TARGET_TEMPERATURE_RANGE) ==
+      ClimateEntity.SUPPORT_TARGET_TEMPERATURE_RANGE);
   bool get supportTargetHumidity => ((supportedFeatures &
   ClimateEntity.SUPPORT_TARGET_HUMIDITY) ==
       ClimateEntity.SUPPORT_TARGET_HUMIDITY);
-  bool get supportTargetHumidityHigh => ((supportedFeatures &
-  ClimateEntity.SUPPORT_TARGET_HUMIDITY_HIGH) ==
-      ClimateEntity.SUPPORT_TARGET_HUMIDITY_HIGH);
-  bool get supportTargetHumidityLow => ((supportedFeatures &
-  ClimateEntity.SUPPORT_TARGET_HUMIDITY_LOW) ==
-      ClimateEntity.SUPPORT_TARGET_HUMIDITY_LOW);
   bool get supportFanMode =>
       ((supportedFeatures & ClimateEntity.SUPPORT_FAN_MODE) ==
           ClimateEntity.SUPPORT_FAN_MODE);
-  bool get supportOperationMode => ((supportedFeatures &
-  ClimateEntity.SUPPORT_OPERATION_MODE) ==
-      ClimateEntity.SUPPORT_OPERATION_MODE);
-  bool get supportHoldMode =>
-      ((supportedFeatures & ClimateEntity.SUPPORT_HOLD_MODE) ==
-          ClimateEntity.SUPPORT_HOLD_MODE);
   bool get supportSwingMode =>
       ((supportedFeatures & ClimateEntity.SUPPORT_SWING_MODE) ==
           ClimateEntity.SUPPORT_SWING_MODE);
-  bool get supportAwayMode =>
-      ((supportedFeatures & ClimateEntity.SUPPORT_AWAY_MODE) ==
-          ClimateEntity.SUPPORT_AWAY_MODE);
+  bool get supportPresetMode =>
+      ((supportedFeatures & ClimateEntity.SUPPORT_PRESET_MODE) ==
+          ClimateEntity.SUPPORT_PRESET_MODE);
   bool get supportAuxHeat =>
       ((supportedFeatures & ClimateEntity.SUPPORT_AUX_HEAT) ==
           ClimateEntity.SUPPORT_AUX_HEAT);
-  bool get supportOnOff =>
-      ((supportedFeatures & ClimateEntity.SUPPORT_ON_OFF) ==
-          ClimateEntity.SUPPORT_ON_OFF);
 
-  List<String> get operationList => attributes["operation_list"] != null
-      ? (attributes["operation_list"] as List).cast<String>()
+  List<String> get hvacModes => attributes["hvac_modes"] != null
+      ? (attributes["hvac_modes"] as List).cast<String>()
       : null;
-  List<String> get fanList => attributes["fan_list"] != null
-      ? (attributes["fan_list"] as List).cast<String>()
+  List<String> get fanModes => attributes["fan_modes"] != null
+      ? (attributes["fan_modes"] as List).cast<String>()
       : null;
-  List<String> get swingList => attributes["swing_list"] != null
-      ? (attributes["swing_list"] as List).cast<String>()
+  List<String> get presetModes => attributes["preset_modes"] != null
+      ? (attributes["preset_modes"] as List).cast<String>()
+      : null;
+  List<String> get swingModes => attributes["swing_modes"] != null
+      ? (attributes["swing_modes"] as List).cast<String>()
       : null;
   double get temperature => _getDoubleAttributeValue('temperature');
+  double get currentTemperature => _getDoubleAttributeValue('current_temperature');
   double get targetHigh => _getDoubleAttributeValue('target_temp_high');
   double get targetLow => _getDoubleAttributeValue('target_temp_low');
   double get maxTemp => _getDoubleAttributeValue('max_temp') ?? 100.0;
@@ -83,11 +69,12 @@ class ClimateEntity extends Entity {
   double get maxHumidity => _getDoubleAttributeValue('max_humidity');
   double get minHumidity => _getDoubleAttributeValue('min_humidity');
   double get temperatureStep => _getDoubleAttributeValue('target_temp_step') ?? 0.5;
-  String get operationMode => attributes['operation_mode'];
+  String get hvacAction => attributes['hvac_action'];
   String get fanMode => attributes['fan_mode'];
+  String get presetMode => attributes['preset_mode'];
   String get swingMode => attributes['swing_mode'];
   bool get awayMode => attributes['away_mode'] == "on";
-  bool get isOff => state == EntityState.off;
+  //bool get isOff => state == EntityState.off;
   bool get auxHeat => attributes['aux_heat'] == "on";
 
   @override
@@ -96,10 +83,8 @@ class ClimateEntity extends Entity {
     if (supportTargetTemperature) {
       historyConfig.numericAttributesToShow.add("temperature");
     }
-    if (supportTargetTemperatureHigh) {
+    if (supportTargetTemperatureRange) {
       historyConfig.numericAttributesToShow.add("target_temp_high");
-    }
-    if (supportTargetTemperatureLow) {
       historyConfig.numericAttributesToShow.add("target_temp_low");
     }
   }

lib/entities/climate/widgets/climate_controls.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class ClimateControlWidget extends StatefulWidget {
 
@@ -10,35 +10,35 @@ 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;
   double _tmpTargetLow = 0.0;
   double _tmpTargetHigh = 0.0;
   double _tmpTargetHumidity = 0.0;
-  String _tmpOperationMode;
+  String _tmpHVACMode;
   String _tmpFanMode;
   String _tmpSwingMode;
-  bool _tmpAwayMode = false;
-  bool _tmpIsOff = false;
+  String _tmpPresetMode;
+  //bool _tmpIsOff = false;
   bool _tmpAuxHeat = false;
 
   void _resetVars(ClimateEntity entity) {
-    _tmpTemperature = entity.temperature;
-    _tmpTargetHigh = entity.targetHigh;
-    _tmpTargetLow = entity.targetLow;
-    _tmpOperationMode = entity.operationMode;
+    if (!_temperaturePending) {
+      _tmpTemperature = entity.temperature;
+      _tmpTargetHigh = entity.targetHigh;
+      _tmpTargetLow = entity.targetLow;
+    }
+    _tmpHVACMode = entity.state;
     _tmpFanMode = entity.fanMode;
     _tmpSwingMode = entity.swingMode;
-    _tmpAwayMode = entity.awayMode;
-    _tmpIsOff = entity.isOff;
+    _tmpPresetMode = entity.presetMode;
+    //_tmpIsOff = entity.isOff;
     _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)}"}));
-        _resetStateTimer(entity);
+        _temperaturePending = false;
+        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)}"}));
-        _resetStateTimer(entity);
+        _temperaturePending = false;
+        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,17 +119,25 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpTargetHumidity = value.roundToDouble();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_humidity", entity.entityId,{"humidity": "$_tmpTargetHumidity"}));
-      _resetStateTimer(entity);
+      ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_humidity",
+          entityId: entity.entityId,
+          data: {"humidity": "$_tmpTargetHumidity"}
+        );
     });
   }
 
-  void _setOperationMode(ClimateEntity entity, value) {
+  void _setHVACMode(ClimateEntity entity, value) {
     setState(() {
-      _tmpOperationMode = value;
+      _tmpHVACMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_operation_mode", entity.entityId,{"operation_mode": "$_tmpOperationMode"}));
-      _resetStateTimer(entity);
+      ConnectionManager().callService(
+          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"}));
-      _resetStateTimer(entity);
+      ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_swing_mode",
+          entityId: entity.entityId,
+          data: {"swing_mode": "$_tmpSwingMode"}
+        );
     });
   }
 
@@ -138,45 +158,32 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpFanMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_fan_mode", entity.entityId,{"fan_mode": "$_tmpFanMode"}));
-      _resetStateTimer(entity);
+      ConnectionManager().callService(domain: entity.domain, service: "set_fan_mode", entityId: entity.entityId, data: {"fan_mode": "$_tmpFanMode"});
     });
   }
 
-  void _setAwayMode(ClimateEntity entity, value) {
+  void _setPresetMode(ClimateEntity entity, value) {
     setState(() {
-      _tmpAwayMode = value;
+      _tmpPresetMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_away_mode", entity.entityId,{"away_mode": "${_tmpAwayMode ? 'on' : 'off'}"}));
-      _resetStateTimer(entity);
+      ConnectionManager().callService(domain: entity.domain, service: "set_preset_mode", entityId: entity.entityId, data: {"preset_mode": "$_tmpPresetMode"});
     });
   }
 
-  void _setOnOf(ClimateEntity entity, value) {
+  /*void _setOnOf(ClimateEntity entity, value) {
     setState(() {
       _tmpIsOff = !value;
       _changedHere = true;
       eventBus.fire(new ServiceCallEvent(entity.domain, "${_tmpIsOff ? 'turn_off' : 'turn_on'}", entity.entityId, null));
       _resetStateTimer(entity);
     });
-  }
+  }*/
 
   void _setAuxHeat(ClimateEntity entity, value) {
     setState(() {
       _tmpAuxHeat = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_aux_heat", entity.entityId, {"aux_heat": "$_tmpAuxHeat"}));
-      _resetStateTimer(entity);
-    });
-  }
-
-  void _resetStateTimer(ClimateEntity entity) {
-    if (_resetTimer!=null) {
-      _resetTimer.cancel();
-    }
-    _resetTimer = Timer(Duration(seconds: 3), () {
-      setState(() {});
-      _resetVars(entity);
+      ConnectionManager().callService(domain: entity.domain, service: "set_aux_heat", entityId: entity.entityId, data: {"aux_heat": "$_tmpAuxHeat"});
     });
   }
 
@@ -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(
@@ -196,33 +203,34 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
-          _buildOnOffControl(entity),
-          _buildTemperatureControls(entity),
-          _buildTargetTemperatureControls(entity),
-          _buildHumidityControls(entity),
-          _buildOperationControl(entity),
-          _buildFanControl(entity),
-          _buildSwingControl(entity),
-          _buildAwayModeControl(entity),
-          _buildAuxHeatControl(entity)
+          //_buildOnOffControl(entity),
+          _buildTemperatureControls(entity, context),
+          _buildTargetTemperatureControls(entity, context),
+          _buildHumidityControls(entity, context),
+          _buildOperationControl(entity, context),
+          _buildFanControl(entity, context),
+          _buildSwingControl(entity, context),
+          _buildPresetModeControl(entity, context),
+          _buildAuxHeatControl(entity, context)
         ],
       ),
     );
   }
 
-  Widget _buildAwayModeControl(ClimateEntity entity) {
-    if (entity.supportAwayMode) {
-      return ModeSwitchWidget(
-        caption: "Away mode",
-        onChange: (value) => _setAwayMode(entity, value),
-        value: _tmpAwayMode,
+  Widget _buildPresetModeControl(ClimateEntity entity, BuildContext context) {
+    if (entity.supportPresetMode) {
+      return ModeSelectorWidget(
+        options: entity.presetModes,
+        onChange: (mode) => _setPresetMode(entity, mode),
+        caption: "Preset",
+        value: _tmpPresetMode,
       );
     } else {
       return Container(height: 0.0, width: 0.0,);
     }
   }
 
-  Widget _buildOnOffControl(ClimateEntity entity) {
+  /*Widget _buildOnOffControl(ClimateEntity entity) {
     if (entity.supportOnOff) {
       return ModeSwitchWidget(
           onChange: (value) => _setOnOf(entity, value),
@@ -232,9 +240,9 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     } else {
       return Container(height: 0.0, width: 0.0,);
     }
-  }
+  }*/
 
-  Widget _buildAuxHeatControl(ClimateEntity entity) {
+  Widget _buildAuxHeatControl(ClimateEntity entity, BuildContext context) {
     if (entity.supportAuxHeat ) {
       return ModeSwitchWidget(
           caption: "Aux heat",
@@ -246,23 +254,23 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildOperationControl(ClimateEntity entity) {
-    if (entity.supportOperationMode) {
+  Widget _buildOperationControl(ClimateEntity entity, BuildContext context) {
+    if (entity.hvacModes != null) {
       return ModeSelectorWidget(
-        onChange: (mode) => _setOperationMode(entity, mode),
-        options: entity.operationList,
+        onChange: (mode) => _setHVACMode(entity, mode),
+        options: entity.hvacModes,
         caption: "Operation",
-        value: _tmpOperationMode,
+        value: _tmpHVACMode,
       );
     } else {
       return Container(height: 0.0, width: 0.0);
     }
   }
 
-  Widget _buildFanControl(ClimateEntity entity) {
+  Widget _buildFanControl(ClimateEntity entity, BuildContext context) {
     if (entity.supportFanMode) {
       return ModeSelectorWidget(
-        options: entity.fanList,
+        options: entity.fanModes,
         onChange: (mode) => _setFanMode(entity, mode),
         caption: "Fan mode",
         value: _tmpFanMode,
@@ -272,11 +280,11 @@ 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),
-          options: entity.swingList,
+          options: entity.swingModes,
           value: _tmpSwingMode,
           caption: "Swing mode"
       );
@@ -285,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(
-              fontSize: Sizes.stateFontSize
-          )),
+          Text("Target temperature", style: Theme.of(context).textTheme.body1),
           TemperatureControlWidget(
             value: _tmpTemperature,
-            fontColor: _showPending ? Colors.red : Colors.black,
+            active: _temperaturePending,
             onDec: () => _temperatureDown(entity),
             onInc: () => _temperatureUp(entity),
           )
@@ -306,13 +312,13 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildTargetTemperatureControls(ClimateEntity entity) {
+  Widget _buildTargetTemperatureControls(ClimateEntity entity, BuildContext context) {
     List<Widget> controls = [];
-    if ((entity.supportTargetTemperatureLow) && (entity.targetLow != null)) {
+    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),
         ),
@@ -321,11 +327,11 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
         )
       ]);
     }
-    if ((entity.supportTargetTemperatureHigh) && (entity.targetHigh != null)) {
+    if ((entity.supportTargetTemperatureRange) && (entity.targetHigh != null)) {
       controls.add(
           TemperatureControlWidget(
             value: _tmpTargetHigh,
-            fontColor: _showPending ? Colors.red : Colors.black,
+            active: _temperaturePending,
             onDec: () => _targetHighDown(entity),
             onInc: () => _targetHighUp(entity),
           )
@@ -335,9 +341,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
-          Text("Target temperature range", style: TextStyle(
-              fontSize: Sizes.stateFontSize
-          )),
+          Text("Target temperature range", style: Theme.of(context).textTheme.body1),
           Row(
             children: controls,
           )
@@ -348,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(
@@ -379,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(
-                fontSize: Sizes.stateFontSize
-            )),
+            child: Text("Target humidity", style: Theme.of(context).textTheme.body1),
           ),
           Row(
             crossAxisAlignment: CrossAxisAlignment.center,
@@ -403,57 +405,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
 
   @override
   void dispose() {
-    _resetTimer?.cancel();
     super.dispose();
   }
 
-}
-
-class TemperatureControlWidget extends StatelessWidget {
-  final double value;
-  final double fontSize;
-  final Color fontColor;
-  final onInc;
-  final onDec;
-
-  TemperatureControlWidget(
-      {Key key,
-        @required this.value,
-        @required this.onInc,
-        @required this.onDec,
-        this.fontSize,
-        this.fontColor})
-      : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.center,
-      children: <Widget>[
-        Text(
-          "$value",
-          style: TextStyle(
-              fontSize: fontSize ?? 24.0,
-              color: fontColor ?? Colors.black
-          ),
-        ),
-        Column(
-          children: <Widget>[
-            IconButton(
-              icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
-                  'mdi:chevron-up')),
-              iconSize: 30.0,
-              onPressed: () => onInc(),
-            ),
-            IconButton(
-              icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
-                  'mdi:chevron-down')),
-              iconSize: 30.0,
-              onPressed: () => onDec(),
-            )
-          ],
-        )
-      ],
-    );
-  }
 }

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

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class ClimateStateWidget extends StatelessWidget {
   @override
@@ -8,13 +8,19 @@ class ClimateStateWidget extends StatelessWidget {
     String targetTemp = "-";
     if ((entity.supportTargetTemperature) && (entity.temperature != null)) {
       targetTemp = "${entity.temperature}";
-    } else if ((entity.supportTargetTemperatureLow) &&
-        (entity.targetLow != null)) {
-      targetTemp = "${entity.targetLow}";
-      if ((entity.supportTargetTemperatureHigh) &&
-          (entity.targetHigh != null)) {
-        targetTemp += " - ${entity.targetHigh}";
-      }
+    } else if ((entity.supportTargetTemperatureRange) &&
+        (entity.targetLow != null) &&
+        (entity.targetHigh != null)) {
+      targetTemp = "${entity.targetLow} - ${entity.targetHigh}";
+    }
+    String displayState = '';
+    if (entity.hvacAction != null) {
+      displayState = "${entity.hvacAction} (${entity.displayState})";
+    } else {
+      displayState = "${entity.displayState}";
+    }
+    if (entity.presetMode != null) {
+      displayState += " - ${entity.presetMode}";
     }
     return Padding(
         padding: EdgeInsets.fromLTRB(
@@ -25,25 +31,18 @@ class ClimateStateWidget extends StatelessWidget {
           children: <Widget>[
             Row(
               children: <Widget>[
-                Text("${entity.state}",
+                Text("$displayState",
                     textAlign: TextAlign.right,
-                    style: new TextStyle(
-                      fontWeight: FontWeight.bold,
-                      fontSize: Sizes.stateFontSize,
-                    )),
+                    style: Theme.of(context).textTheme.body2),
                 Text(" $targetTemp",
                     textAlign: TextAlign.right,
-                    style: new TextStyle(
-                      fontSize: Sizes.stateFontSize,
-                    ))
+                    style: Theme.of(context).textTheme.body1)
               ],
             ),
-            entity.attributes["current_temperature"] != null ?
-            Text("Currently: ${entity.attributes["current_temperature"]}",
+            entity.currentTemperature != null ?
+            Text("Currently: ${entity.currentTemperature}",
                 textAlign: TextAlign.right,
-                style: new TextStyle(
-                    fontSize: Sizes.stateFontSize,
-                    color: Colors.black45)
+                style: Theme.of(context).textTheme.subtitle
             ) :
             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(
-              fontSize: captionFontSize ?? Sizes.stateFontSize
-          )),
+          Text("$caption", style: Theme.of(context).textTheme.body1),
           Row(
             children: <Widget>[
               Expanded(
@@ -40,15 +34,12 @@ class ModeSelectorWidget extends StatelessWidget {
                     value: value,
                     iconSize: 30.0,
                     isExpanded: true,
-                    style: TextStyle(
-                      fontSize: valueFontSize ?? Sizes.largeFontSize,
-                      color: Colors.black,
-                    ),
+                    style: Theme.of(context).textTheme.title,
                     hint: Text("Select ${caption.toLowerCase()}"),
-                    items: options.map((String value) {
+                    items: options.map((value) {
                       return new DropdownMenuItem<String>(
-                        value: value,
-                        child: Text(value),
+                        value: '$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(
-          fontSize: captionFontSize ?? Sizes.stateFontSize
-      ),
+      style: Theme.of(context).textTheme.body1,
     );
     if (expanded) {
       return Expanded(

lib/entities/climate/widgets/temperature_control_widget.dart

@@ -0,0 +1,47 @@
+part of '../../../main.dart';
+
+class TemperatureControlWidget extends StatelessWidget {
+  final double value;
+  final bool active;
+  final onInc;
+  final onDec;
+
+  TemperatureControlWidget(
+      {Key key,
+        @required this.value,
+        @required this.onInc,
+        @required this.onDec,
+        //this.fontSize,
+        this.active: false
+      })
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: <Widget>[
+        Text(
+          "$value",
+          style: active ? Theme.of(context).textTheme.display2 : Theme.of(context).textTheme.display1,
+        ),
+        Column(
+          children: <Widget>[
+            IconButton(
+              icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
+                  'mdi:chevron-up')),
+              iconSize: 30.0,
+              onPressed: () => onInc(),
+            ),
+            IconButton(
+              icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
+                  'mdi:chevron-down')),
+              iconSize: 30.0,
+              onPressed: () => onDec(),
+            )
+          ],
+        )
+      ],
+    );
+  }
+}

lib/entities/cover/cover_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class CoverEntity extends Entity {
 

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

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class CoverControlWidget extends StatefulWidget {
 
@@ -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(
-                fontSize: Sizes.stateFontSize
-            )),
+            child: Text("Position"),
           ),
           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(
-            fontSize: Sizes.stateFontSize
-        )),
+        child: Text("Tilt position"),
       ));
       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(
-        entity.domain, "open_cover_tilt", entity.entityId, null));
+    ConnectionManager().callService(
+        domain: entity.domain, service: "open_cover_tilt", entityId: entity.entityId);
   }
 
   void _close(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "close_cover_tilt", entity.entityId, null));
+    ConnectionManager().callService(
+        domain: entity.domain, service: "close_cover_tilt", entityId: entity.entityId);
   }
 
   void _stop(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "stop_cover_tilt", entity.entityId, null));
+    ConnectionManager().callService(
+        domain: entity.domain, service: "stop_cover_tilt", entityId: entity.entityId);
   }
 
   @override

lib/entities/cover/widgets/cover_state.dart

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

lib/entities/date_time/date_time_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class DateTimeEntity extends Entity {
   DateTimeEntity(Map rawData, String webHost) : super(rawData, webHost);
@@ -35,8 +35,7 @@ class DateTimeEntity extends Entity {
     return formattedState;
   }
 
-  void setNewState(newValue) {
-    eventBus
-        .fire(new ServiceCallEvent(domain, "set_datetime", entityId, newValue));
+  void setNewState(Map newValue) {
+    ConnectionManager().callService(domain: domain, service: "set_datetime", entityId: entityId, data: newValue);
   }
 }

lib/entities/date_time/widgets/date_time_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class DateTimeStateWidget extends StatelessWidget {
   @override
@@ -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,
-              style: new TextStyle(
-                fontSize: Sizes.stateFontSize,
-              )),
+              textAlign: TextAlign.right
+            ),
           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

@@ -27,7 +27,7 @@ class Entity {
     "cold.on": "Cold",
     "cold.off": "Normal",
     "connectivity.on": "Connected",
-    "connectivity.off": "Diconnected",
+    "connectivity.off": "Disconnected",
     "door.on": "Open",
     "door.off": "Closed",
     "garage_door.on": "Open",
@@ -153,8 +153,8 @@ class Entity {
     domain = rawData["entity_id"].split(".")[0];
     entityId = rawData["entity_id"];
     deviceClass = attributes["device_class"];
-    state = rawData["state"];
-    displayState = Entity.StateByDeviceClass["$deviceClass.$state"] ?? 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),
-          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_model.widget.dart

@@ -15,26 +15,6 @@ class EntityModel extends InheritedWidget {
     return context.inheritFromWidgetOfExactType(EntityModel);
   }
 
-  @override
-  bool updateShouldNotify(InheritedWidget oldWidget) {
-    return true;
-  }
-}
-
-class HomeAssistantModel extends InheritedWidget {
-
-  const HomeAssistantModel({
-    Key key,
-    @required this.homeAssistant,
-    @required Widget child,
-  }) : super(key: key, child: child);
-
-  final HomeAssistant homeAssistant;
-
-  static HomeAssistantModel of(BuildContext context) {
-    return context.inheritFromWidgetOfExactType(HomeAssistantModel);
-  }
-
   @override
   bool updateShouldNotify(InheritedWidget oldWidget) {
     return true;

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);
-    if (entityWrapper.entity.statelessType == StatelessEntityType.WEBLINK) {
-      textStyle = textStyle.apply(color: Colors.blue, decoration: TextDecoration.underline);
+    TextStyle tStyle;
+    if (textStyle == null) {
+      if (entityWrapper.entity.statelessType == StatelessEntityType.WEBLINK) {
+        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

@@ -0,0 +1,155 @@
+part of '../main.dart';
+
+class EntityWrapper {
+
+  String overrideName;
+  final String overrideIcon;
+  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,
+    this.overrideIcon,
+    this.overrideName,
+    this.uiAction,
+    this.stateFilter
+  }) {
+    if (entity.statelessType == StatelessEntityType.NONE || entity.statelessType == StatelessEntityType.CALL_SERVICE || entity.statelessType == StatelessEntityType.WEBLINK) {
+      if (uiAction == null) {
+        uiAction = EntityUIAction();
+      }
+    }
+  }
+
+  void handleTap() {
+    switch (uiAction.tapAction) {
+      case EntityUIAction.toggle: {
+        ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
+        break;
+      }
+
+      case EntityUIAction.callService: {
+        if (uiAction.tapService != null) {
+          ConnectionManager().callService(
+            domain: uiAction.tapService.split(".")[0],
+            service: uiAction.tapService.split(".")[1],
+            data: uiAction.tapServiceData
+          );
+        }
+        break;
+      }
+
+      case EntityUIAction.none: {
+        break;
+      }
+
+      case EntityUIAction.moreInfo: {
+        eventBus.fire(
+            new ShowEntityPageEvent(entity: entity));
+        break;
+      }
+
+      case EntityUIAction.navigate: {
+        if (uiAction.tapService != null && uiAction.tapService.startsWith("/")) {
+          //TODO handle local urls
+          Logger.w("Local urls is not supported yet");
+        } else {
+          Launcher.launchURL(uiAction.tapService);
+        }
+        break;
+      }
+
+      default: {
+        break;
+      }
+    }
+  }
+
+  void handleHold() {
+      switch (uiAction.holdAction) {
+        case EntityUIAction.toggle: {
+          ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
+          break;
+        }
+
+        case EntityUIAction.callService: {
+          if (uiAction.holdService != null) {
+            ConnectionManager().callService(
+              domain: uiAction.holdService.split(".")[0],
+              service: uiAction.holdService.split(".")[1],
+              data: uiAction.holdServiceData
+            );
+          }
+          break;
+        }
+
+        case EntityUIAction.moreInfo: {
+          eventBus.fire(
+              new ShowEntityPageEvent(entity: entity));
+          break;
+        }
+
+        case EntityUIAction.navigate: {
+          if (uiAction.holdService != null && uiAction.holdService.startsWith("/")) {
+            //TODO handle local urls
+            Logger.w("Local urls is not supported yet");
+          } else {
+            Launcher.launchURL(uiAction.holdService);
+          }
+          break;
+        }
+
+        default: {
+          break;
+        }
+      }
+  }
+
+  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/fan_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class FanEntity extends Entity {
 

lib/entities/fan/widgets/fan_controls.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class FanControlsWidget extends StatefulWidget {
 
@@ -24,9 +24,12 @@ class _FanControlsWidgetState extends State<FanControlsWidget> {
     setState(() {
       _tmpOscillate = oscillate;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
-          "fan", "oscillate", entity.entityId,
-          {"oscillating": oscillate}));
+      ConnectionManager().callService(
+          domain: "fan",
+          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(
-          "fan", "set_direction", entity.entityId,
-          {"direction": forward ? "forward" : "reverse"}));
+      ConnectionManager().callService(
+          domain: "fan",
+          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(
-            "fan", "set_speed", entity.entityId,
-            {"speed": value}));
+      ConnectionManager().callService(
+            domain: "fan",
+            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:
-            new TextStyle(fontSize: fontSize, color: Colors.blue),
+            style: HAClientTheme().getActionTextStyle(context),
           ),
         )
     );

lib/entities/group/group_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class GroupEntity extends Entity {
 

lib/entities/light/light_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class LightEntity extends Entity {
 

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

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class LightControlsWidget extends StatefulWidget {
 
@@ -17,7 +17,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
   String _tmpEffect;
 
   void _resetState(LightEntity entity) {
-    _tmpBrightness = entity.brightness ?? 0;
+    _tmpBrightness = entity.brightness ?? 1;
     _tmpWhiteValue = entity.whiteValue ?? 0;
     _tmpColorTemp = entity.colorTemp ?? entity.minMireds?.toInt();
     _tmpColor = entity.color ?? _tmpColor;
@@ -28,15 +28,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     setState(() {
       _tmpBrightness = value.round();
       _changedHere = true;
-      if (_tmpBrightness > 0) {
-        eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_on", entity.entityId,
-            {"brightness": _tmpBrightness}));
-      } else {
-        eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_off", entity.entityId,
-            null));
-      }
+      ConnectionManager().callService(
+          domain: entity.domain,
+          service: "turn_on",
+          entityId: entity.entityId,
+          data: {"brightness": _tmpBrightness}
+        );
     });
   }
 
@@ -44,9 +41,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     setState(() {
       _tmpWhiteValue = value.round();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_on", entity.entityId,
-            {"white_value": _tmpWhiteValue}));
+      ConnectionManager().callService(
+            domain: entity.domain,
+            service: "turn_on",
+            entityId: entity.entityId,
+            data: {"white_value": _tmpWhiteValue}
+          );
 
     });
   }
@@ -55,9 +55,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     setState(() {
       _tmpColorTemp = value.round();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
-          entity.domain, "turn_on", entity.entityId,
-          {"color_temp": _tmpColorTemp}));
+      ConnectionManager().callService(
+          domain: entity.domain,
+          service: "turn_on",
+          entityId: entity.entityId,
+          data: {"color_temp": _tmpColorTemp}
+        );
     });
   }
 
@@ -65,10 +68,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     setState(() {
       _tmpColor = color;
       _changedHere = true;
-      Logger.d( "HS Color: [${color.hue}, ${color.saturation}]");
-      eventBus.fire(new ServiceCallEvent(
-        entity.domain, "turn_on", entity.entityId,
-          {"hs_color": [color.hue, color.saturation*100]}));
+      ConnectionManager().callService(
+        domain: entity.domain,
+        service: "turn_on",
+        entityId: entity.entityId,
+        data: {"hs_color": [color.hue, color.saturation*100]}
+      );
     });
   }
 
@@ -77,9 +82,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
       _tmpEffect = value;
       _changedHere = true;
       if (_tmpEffect != null) {
-        eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_on", entity.entityId,
-            {"effect": "$value"}));
+        ConnectionManager().callService(
+            domain: entity.domain,
+            service: "turn_on",
+            entityId: entity.entityId,
+            data: {"effect": "$value"}
+          );
       }
     });
   }
@@ -106,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(() {
@@ -114,10 +134,10 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
             _tmpBrightness = value.round();
           });
         },
-        min: 0.0,
+        min: 1.0,
         max: 255.0,
         onChangeEnd: (value) => _setBrightness(entity, value),
-        value: _tmpBrightness == null ? 0.0 : _tmpBrightness.toDouble(),
+        value: val,
         leading: Icon(Icons.brightness_5),
         title: "Brightness",
       );
@@ -149,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),),
-        value:  _tmpColorTemp == null ? entity.maxMireds : _tmpColorTemp.toDouble(),
+        leading: Text("Cold", style: Theme.of(context).textTheme.body1.copyWith(color: Colors.lightBlue)),
+        value:  val,
         onChangeEnd: (value) => _setColorTemp(entity, value),
         max: entity.maxMireds,
         min: entity.minMireds,
@@ -162,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);
@@ -171,7 +203,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
 
   Widget _buildColorControl(LightEntity entity) {
     if (entity.supportColor) {
-      HSVColor savedColor = HomeAssistantModel.of(context)?.homeAssistant?.savedColor;
+      HSVColor savedColor = HomeAssistant().savedColor;
       return Column(
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
@@ -187,15 +219,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
                 child: Text('Copy color'),
                 onPressed: _tmpColor == null ? null : () {
                   setState(() {
-                    HomeAssistantModel
-                        .of(context)
-                        .homeAssistant
-                        .savedColor = _tmpColor;
+                    HomeAssistant().savedColor = _tmpColor;
                   });
                 },
               ),
               FlatButton(
-                color: savedColor?.toColor() ?? Colors.transparent,
+                color: savedColor?.toColor() ?? Theme.of(context).backgroundColor,
                 child: Text('Paste color'),
                 onPressed: savedColor == null ? null : () {
                   _setColor(entity, savedColor);
@@ -212,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/lock_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class LockEntity extends Entity {
   LockEntity(Map rawData, String webHost) : super(rawData, webHost);

lib/entities/lock/widgets/lock_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class LockStateWidget extends StatelessWidget {
 
@@ -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:
-              new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
+              style: HAClientTheme().getActionTextStyle(context)
             ),
           )
         ),
@@ -39,8 +38,7 @@ class LockStateWidget extends StatelessWidget {
               onPressed: () => _lock(entity),
               child: Text("LOCK",
                 textAlign: TextAlign.right,
-                style:
-                new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
+                style: HAClientTheme().getActionTextStyle(context),
               ),
             )
         )
@@ -56,8 +54,7 @@ class LockStateWidget extends StatelessWidget {
             child: Text(
               entity.isLocked ? "UNLOCK" : "LOCK",
               textAlign: TextAlign.right,
-              style:
-              new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
+              style: HAClientTheme().getActionTextStyle(context),
             ),
           )
       );

lib/entities/media_player/media_player_entity.class.dart

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

@@ -1,7 +1,7 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class MediaPlayerWidget extends StatelessWidget {
-  
+
   @override
   Widget build(BuildContext context) {
     final EntityModel entityModel = EntityModel.of(context);
@@ -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) {
-    TextStyle style = TextStyle(
-        fontSize: 14.0,
-        color: Colors.white,
-        fontWeight: FontWeight.normal,
-        height: 1.2
+  Widget _buildState(MediaPlayerEntity entity, BuildContext context) {
+    TextStyle style = Theme.of(context).textTheme.body1.copyWith(
+      color: Colors.white
     );
     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");
-        eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_on", entity.entityId,
-            null));
+        ConnectionManager().callService(
+            domain: entity.domain,
+            service: "turn_on",
+            entityId: entity.entityId
+          );
       } else {
-        Logger.d("${entity.entityId} turn_off");
-        eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_off", entity.entityId,
-            null));
+        ConnectionManager().callService(
+            domain: entity.domain,
+            service: "turn_off",
+            entityId: entity.entityId
+          );
       }
-    }
   }
 
   void _callAction(MediaPlayerEntity entity, String action) {
     Logger.d("${entity.entityId} $action");
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "$action", entity.entityId,
-        null));
+    ConnectionManager().callService(
+        domain: entity.domain,
+        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,
     );
   }
 
-}
-
-class MediaPlayerProgressWidget extends StatefulWidget {
-  @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();
-      }
-      progress = currentPosition / duration.inSeconds;
-      return LinearProgressIndicator(
-        value: progress,
-        backgroundColor: Colors.black45,
-        valueColor: AlwaysStoppedAnimation<Color>(EntityColor.stateColor(EntityState.on)),
-      );
-    } catch (e) {
-      _timer?.cancel();
-      progress = 0.0;
+  void _duplicateTo(entity) {
+    if (entity.canCalculateActualPosition()) {
+        HomeAssistant().savedPlayerPosition = entity.getActualPosition().toInt();
+    } else {
+        HomeAssistant().savedPlayerPosition = 0;
     }
-    return LinearProgressIndicator(
-      value: progress,
-      backgroundColor: Colors.black45,
-    );
+    Navigator.of(context).pushNamed("/play-media", arguments: {
+        "url": entity.attributes["media_content_id"],
+        "type": entity.attributes["media_content_type"]
+      });
   }
 
-  @override
-  void dispose() {
-    _timer?.cancel();
-    super.dispose();
+  void _switchTo(entity) {
+    HomeAssistant().sendFromPlayerId = entity.entityId;
+    _duplicateTo(entity);
   }
 
 }

lib/entities/select/select_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class SelectEntity extends Entity {
   List<String> get listOptions => attributes["options"] != null

lib/entities/select/widgets/select_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class SelectStateWidget extends StatefulWidget {
 
@@ -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,
-        {"option": "$newValue"}));
+    ConnectionManager().callService(
+      domain: domain,
+      service: "select_option",
+      entityId: entityId,
+      data: {"option": "$newValue"}
+    );
   }
 
   @override

lib/entities/sensor/sensor_entity.class.dart

@@ -1,8 +1,4 @@
-part of '../main.dart';
-
-class SunEntity extends Entity {
-  SunEntity(Map rawData, String webHost) : super(rawData, webHost);
-}
+part of '../../main.dart';
 
 class SensorEntity extends Entity {
 

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(
-      fontSize: Sizes.stateFontSize,
-    );
-    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.CALL_SERVICE) {
-      textStyle = textStyle.apply(color: Colors.blue);
+    TextStyle tStyle;
+    if (textStyle != null) {
+      tStyle = textStyle;
+    } else if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.CALL_SERVICE) {
+      tStyle = Theme.of(context).textTheme.subhead.copyWith(
+        color: Colors.blue
+      );
+    } else {
+      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/slider_entity.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class SliderEntity extends Entity {
   SliderEntity(Map rawData, String webHost) : super(rawData, webHost);

lib/entities/slider/widgets/slider_controls.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class SliderControlsWidget extends StatefulWidget {
 
@@ -18,8 +18,12 @@ class _SliderControlsWidgetState extends State<SliderControlsWidget> {
       _newValue = newValue;
       _changedHere = true;
     });
-    eventBus.fire(new ServiceCallEvent(domain, "set_value", entityId,
-        {"value": "${newValue.toString()}"}));
+    ConnectionManager().callService(
+      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(
-            fontSize: Sizes.largeFontSize,
+          style: Theme.of(context).textTheme.display1.copyWith(
             color: Colors.blue
           ),
         ),

lib/entities/sun/sun_entity.class.dart

@@ -0,0 +1,5 @@
+part of '../../main.dart';
+
+class SunEntity extends Entity {
+  SunEntity(Map rawData, String webHost) : super(rawData, webHost);
+}

lib/entities/switch/switch_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class SwitchEntity extends Entity {
   SwitchEntity(Map rawData, String webHost) : super(rawData, webHost);

lib/entities/switch/widget/switch_state.dart

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

lib/entities/text/text_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class TextEntity extends Entity {
   TextEntity(Map rawData, String webHost) : super(rawData, webHost);

lib/entities/text/widgets/text_input_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class TextInputStateWidget extends StatefulWidget {
 
@@ -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,
-          {"value": "$newValue"}));
+      ConnectionManager().callService(
+        domain: domain,
+        service: "set_value",
+        entityId: entityId,
+        data: {"value": "$newValue"}
+      );
     } else {
       setState(() {
         _tmpValue = _entityState;
@@ -73,13 +77,7 @@ class _TextInputStateWidgetState extends State<TextInputStateWidget> {
         child: TextField(
             focusNode: _focusNode,
             obscureText: entity.isPasswordField,
-            controller: new TextEditingController.fromValue(
-                new TextEditingValue(
-                    text: _tmpValue,
-                    selection:
-                    new TextSelection.collapsed(offset: _tmpValue.length)
-                )
-            ),
+            controller: TextEditingController.fromValue(TextEditingValue(text: _tmpValue)),
             onChanged: (value) {
               _tmpValue = value;
             }),

lib/entities/timer/timer_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class TimerEntity extends Entity {
   TimerEntity(Map rawData, String webHost) : super(rawData, webHost);

lib/entities/timer/widgets/timer_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class TimerState extends StatefulWidget  {
   //final bool expanded;

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(
-            "$title",
-            style: TextStyle(fontSize: Sizes.stateFontSize),
-          ),
+          Text("$title"),
           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();
+  }
+}