minor background reporting fix

Hotfix/0.7.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help improve HA Client
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- 
+Please provide as much information as possible.
+ -->
+**HA Client version:** <!-- Main app menu => About HA Client -->
+
+**Home Assistant version:** <!-- 0.94.1 for example -->
+
+**Device name:** <!-- Pixel 2 for example -->
+
+**Android version:** <!-- 8.1 for example -->
+
+**Connection type:** <!-- For example "Local IP" or "Remote UI" or "Own domain"-->
+
+**Login type:** <!-- For example "HA Login" or "Manual token"-->
+
+**Description**
+<!-- 
+Describe your issue here
+-->
+
+**Screenshots**
+<!-- 
+Please provide screenshots if it is a UI issue. Also you can attach screenshot from Home Assistant web UI as an expected result
+-->
+
+**Logs**
+<!-- 
+Right after issue reproduced go to app menu and tap "Log". Copy log with a "Copy" button in the upper-right corner and post it below
+-->
+```
+[Replace this text with your logs] 
+```

.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,13 @@ build/
 .flutter-plugins
 
 .idea/
+.vscode/
+.theia/
+.project/
+.settings/
+
+flutter_export_environment.sh
 
 key.properties
+premium_features_manager.class.dart
+pubspec.lock

.gitpod.dockerfile

@@ -0,0 +1,12 @@
+FROM gitpod/workspace-full:latest
+
+ENV ANDROID_HOME=/workspace/android-sdk \
+    FLUTTER_ROOT=/workspace/flutter \
+    FLUTTER_HOME=/workspace/flutter
+
+USER root
+
+RUN apt-get update && \
+    apt-get -y install build-essential libkrb5-dev gcc make gradle openjdk-8-jdk && \
+    apt-get clean && \
+    apt-get -y autoremove

.gitpod.yml

@@ -0,0 +1,27 @@
+image:
+  file: .gitpod.dockerfile
+
+tasks:
+- before: |
+    export PATH=$FLUTTER_HOME/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.9.1+hotfix.4-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: |
+    flutter pub upgrade
+    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,15 @@
-[![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)
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/estevez-dev/ha_client)
 # 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.
 
-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 in [Home Assistant community](https://community.home-assistant.io/t/alpha-testing-ha-client-native-android-client-for-home-assistant/69912) or on [Discord server](https://discord.gg/AUzEvwn)
 
-Discuss it in [Home Assistant community](https://community.home-assistant.io/t/alpha-testing-ha-client-native-android-client-for-home-assistant/69912)
+#### 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,7 +78,10 @@ flutter {
 }
 
 dependencies {
+    implementation 'com.google.firebase:firebase-core:16.0.8'
     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: 'com.google.gms.google-services'

android/app/google-services.json

@@ -0,0 +1,64 @@
+{
+  "project_info": {
+    "project_number": "441874387819",
+    "firebase_url": "https://ha-client-c73c4.firebaseio.com",
+    "project_id": "ha-client-c73c4",
+    "storage_bucket": "ha-client-c73c4.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:441874387819:android:92c7efc892dc3d45",
+        "android_client_info": {
+          "package_name": "com.keyboardcrumbs.haclient"
+        }
+      },
+      "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
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBsl9cjBY633IrdrTyCsLFlO9lfsYJ0OJU"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "441874387819-id0hqsfprj3b5kc312faqv3lmdfpm7l8.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

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,
+    <uses-feature android:name="android.hardware.touchscreen"
-         flutter needs it to communicate with the running application
+        android:required="false" />
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -13,9 +17,15 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name=".Application"
         android:label="HA Client"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:usesCleartextTraffic="true">
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="ha_notify" />
+
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
@@ -26,14 +36,41 @@
             <!-- 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). -->
+                 defined in @style/LaunchTheme).
             <meta-data
                 android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
+                android:value="true" />-->
+            <intent-filter>
+                <action android:name="FLUTTER_NOTIFICATION_CLICK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data
+                android:scheme="haclient"
+                android:host="auth" />
+            </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/Application.java

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

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

@@ -3,8 +3,10 @@ package com.keyboardcrumbs.hassclient;
 import android.os.Bundle;
 import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.plugins.share.FlutterShareReceiverActivity;
+
+public class MainActivity extends FlutterShareReceiverActivity {
   
-public class MainActivity extends FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);

android/build.gradle

@@ -5,7 +5,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 

android/gradle.properties

@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx2g
 org.gradle.daemon=true
 org.gradle.caching=true
 android.useAndroidX=true
-android.enableJetifier=false
+android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

assets/js/externalAuth.js

@@ -0,0 +1,16 @@
+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);
+    }
+};

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/cards/card.class.dart

@@ -13,7 +13,12 @@ class HACard {
   int columnsCount;
   List stateFilter;
   List states;
+  List conditions;
   String content;
+  String unit;
+  int min;
+  int max;
+  Map severity;
 
   HACard({
     this.name,
@@ -26,12 +31,21 @@ class HACard {
     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 (entityWrapper.entity.isHidden) {
+      if (!ConnectionManager().useLovelace && entityWrapper.entity.isHidden) {
         return false;
       }
       if (stateFilter.isNotEmpty) {

lib/cards/card_widget.dart

@@ -24,33 +24,58 @@ 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.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) {
@@ -73,7 +98,7 @@ class CardWidget extends StatelessWidget {
         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) {
@@ -107,22 +132,23 @@ 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));
     entitiesToShow.forEach((EntityWrapper entity) {
-      if (!entity.entity.isHidden) {
       body.add(
           Padding(
-              padding: EdgeInsets.fromLTRB(10.0, 4.0, 0.0, 4.0),
+            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 +157,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,7 +169,7 @@ 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(
@@ -164,7 +190,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,18 +221,26 @@ class CardWidget extends StatelessWidget {
       return Container(height: 0.0, width: 0.0,);
     }
     List<Widget> rows = [];
-    rows.add(CardHeaderWidget(name: card.name));
+    rows.add(CardHeader(name: card.name));
 
-    List<Widget> result = [];
     int columnsCount = entitiesToShow.length >= card.columnsCount ? card.columnsCount : entitiesToShow.length;
 
+    rows.add(
+        Padding(
+          padding: EdgeInsets.only(bottom: Sizes.rowPadding, top: Sizes.rowPadding),
+          child: FractionallySizedBox(
+            widthFactor: 1,
+            child: LayoutBuilder(
+                builder: (BuildContext context, BoxConstraints constraints) {
+                  List<Widget> buttons = [];
+                  double buttonWidth = constraints.maxWidth / columnsCount;
                   entitiesToShow.forEach((EntityWrapper entity) {
-      result.add(
+                    buttons.add(
-          FractionallySizedBox(
+                        SizedBox(
-            widthFactor: 1/columnsCount,
+                          width: buttonWidth,
                           child: EntityModel(
                               entityWrapper: entity,
-                child: GlanceEntityContainer(
+                              child: GlanceCardEntityContainer(
                                 showName: card.showName,
                                 showState: card.showState,
                               ),
@@ -215,19 +249,23 @@ class CardWidget extends StatelessWidget {
                         )
                     );
                   });
-    rows.add(
+                  return Wrap(
-        Padding(
+                    //spacing: 5.0,
-          padding: EdgeInsets.fromLTRB(0.0, Sizes.rowPadding, 0.0, 2*Sizes.rowPadding),
+                    //alignment: WrapAlignment.spaceEvenly,
-          child: Wrap(
+                    runSpacing: Sizes.doubleRowPadding,
-            //alignment: WrapAlignment.spaceAround,
+                    children: buttons,
-            runSpacing: Sizes.rowPadding*2,
+                  );
-            children: result,
+                }
+            ),
           ),
         )
     );
 
     return Card(
-        child: new Column(mainAxisSize: MainAxisSize.min, children: rows)
+        child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: rows
+        )
     );
   }
 
@@ -247,7 +285,41 @@ class CardWidget extends StatelessWidget {
     return Card(
         child: EntityModel(
             entityWrapper: card.linkedEntityWrapper,
-            child: ButtonEntityContainer(),
+            child: EntityButtonCardBody(),
+            handleTap: true
+        )
+    );
+  }
+
+  Widget _buildGaugeCard(BuildContext context) {
+    card.linkedEntityWrapper.displayName = card.name ??
+        card.linkedEntityWrapper.displayName;
+    card.linkedEntityWrapper.unitOfMeasurement = 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.displayName = 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 +327,7 @@ class CardWidget extends StatelessWidget {
 
   Widget _buildUnsupportedCard(BuildContext context) {
     List<Widget> body = [];
-    body.add(CardHeaderWidget(name: card.name ?? ""));
+    body.add(CardHeader(name: card.name ?? ""));
     List<Widget> result = [];
     if (card.linkedEntityWrapper != null) {
       result.addAll(<Widget>[

lib/cards/widgets/card_header.widget.dart

@@ -1,12 +1,12 @@
-part of '../main.dart';
+part of '../../main.dart';
 
-class CardHeaderWidget extends StatelessWidget {
+class CardHeader extends StatelessWidget {
 
   final String name;
   final Widget trailing;
   final Widget subtitle;
 
-  const CardHeaderWidget({Key key, this.name, this.trailing, this.subtitle}) : super(key: key);
+  const CardHeader({Key key, this.name, this.trailing, this.subtitle}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

lib/cards/widgets/entity_button_card_body.widget.dart

@@ -1,8 +1,8 @@
-part of '../main.dart';
+part of '../../main.dart';
 
-class ButtonEntityContainer extends StatelessWidget {
+class EntityButtonCardBody extends StatelessWidget {
 
-  ButtonEntityContainer({
+  EntityButtonCardBody({
     Key key,
   }) : super(key: key);
 
@@ -15,25 +15,26 @@ class ButtonEntityContainer extends StatelessWidget {
     if (entityWrapper.entity.statelessType > StatelessEntityType.MISSED) {
       return Container(width: 0.0, height: 0.0,);
     }
+
     return InkWell(
       onTap: () => entityWrapper.handleTap(),
       onLongPress: () => entityWrapper.handleHold(),
+      child: FractionallySizedBox(
+        widthFactor: 1,
         child: Column(
-        mainAxisSize: MainAxisSize.min,
           children: <Widget>[
-          FractionallySizedBox(
+            LayoutBuilder(
-            widthFactor: 0.4,
+                builder: (BuildContext context, BoxConstraints constraints) {
-            child: FittedBox(
+                  return EntityIcon(
-                fit: BoxFit.fitHeight,
-                child: EntityIcon(
                     padding: EdgeInsets.fromLTRB(2.0, 6.0, 2.0, 2.0),
-                  size: Sizes.iconSize,
+                    size: constraints.maxWidth / 2.5,
-                )
+                  );
-            ),
+                }
             ),
             _buildName()
           ],
         ),
+      ),
     );
   }
 

lib/cards/widgets/gauge_card_body.dart

@@ -0,0 +1,153 @@
+part of '../../main.dart';
+
+class GaugeCardBody extends StatefulWidget {
+
+  final int min;
+  final int max;
+  final Map severity;
+
+  GaugeCardBody({Key key, this.min, this.max, this.severity}) : super(key: key);
+
+  @override
+  _GaugeCardBodyState createState() => _GaugeCardBodyState();
+}
+
+class _GaugeCardBodyState extends State<GaugeCardBody> {
+
+  List<charts.Series> seriesList;
+
+  List<charts.Series<GaugeSegment, String>> _createData(double value) {
+    double fixedValue;
+    if (value > widget.max) {
+      fixedValue = widget.max.toDouble();
+    } else if (value < widget.min) {
+      fixedValue = widget.min.toDouble();
+    } else {
+      fixedValue = value;
+    }
+    double toShow = ((fixedValue - widget.min) / (widget.max - widget.min)) * 100;
+    Color mainColor;
+    if (widget.severity != null) {
+      if (widget.severity["red"] is int && fixedValue >= widget.severity["red"]) {
+        mainColor = Colors.red;
+      } else if (widget.severity["yellow"] is int && fixedValue >= widget.severity["yellow"]) {
+        mainColor = Colors.amber;
+      } else {
+        mainColor = Colors.green;
+      }
+    } else {
+      mainColor = Colors.green;
+    }
+    final data = [
+      GaugeSegment('Main', toShow, mainColor),
+      GaugeSegment('Rest', 100 - toShow, Colors.black45),
+    ];
+
+    return [
+      charts.Series<GaugeSegment, String>(
+        id: 'Segments',
+        domainFn: (GaugeSegment segment, _) => segment.segment,
+        measureFn: (GaugeSegment segment, _) => segment.value,
+        colorFn: (GaugeSegment segment, _) => segment.color,
+        // Set a label accessor to control the text of the arc label.
+        labelAccessorFn: (GaugeSegment segment, _) =>
+        segment.segment == 'Main' ? '${segment.value}' : null,
+        data: data,
+      )
+    ];
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
+
+    return InkWell(
+      onTap: () => entityWrapper.handleTap(),
+      onLongPress: () => entityWrapper.handleHold(),
+      child: AspectRatio(
+          aspectRatio: 1.5,
+          child: Stack(
+              fit: StackFit.expand,
+              overflow: Overflow.clip,
+              children: [
+                LayoutBuilder(
+                    builder: (BuildContext context, BoxConstraints constraints) {
+                      double verticalOffset;
+                      if(constraints.maxWidth > 150.0) {
+                        verticalOffset = 0.2;
+                      } else if (constraints.maxWidth > 100.0)  {
+                        verticalOffset = 0.3;
+                      } else {
+                        verticalOffset = 0.3;
+                      }
+                      return FractionallySizedBox(
+                        heightFactor: 2,
+                        widthFactor: 1,
+                        alignment: FractionalOffset(0,verticalOffset),
+                        child: charts.PieChart(
+                          _createData(entityWrapper.entity.doubleState),
+                          animate: false,
+                          defaultRenderer: charts.ArcRendererConfig(
+                            arcRatio: 0.4,
+                            startAngle: pi,
+                            arcLength: pi,
+                          ),
+                        ),
+                      );
+                    }
+                ),
+                Align(
+                  alignment: Alignment.bottomCenter,
+                  child: LayoutBuilder(
+                      builder: (BuildContext context, BoxConstraints constraints) {
+                        double fontSize = constraints.maxHeight / 7;
+                        return Padding(
+                          padding: EdgeInsets.only(bottom: 2*fontSize),
+                          child: SimpleEntityState(
+                            //textAlign: TextAlign.center,
+                            expanded: false,
+                            maxLines: 1,
+                            bold: true,
+                            textAlign: TextAlign.center,
+                            padding: EdgeInsets.all(0.0),
+                            fontSize: fontSize,
+                            //padding: EdgeInsets.only(top: Sizes.rowPadding),
+                          ),
+                        );
+                      }
+                  ),
+                ),
+                Align(
+                  alignment: Alignment.bottomCenter,
+                  child: LayoutBuilder(
+                      builder: (BuildContext context, BoxConstraints constraints) {
+                        double fontSize = constraints.maxHeight / 7;
+                        return Padding(
+                          padding: EdgeInsets.only(bottom: fontSize),
+                          child: EntityName(
+                            fontSize: fontSize,
+                            maxLines: 1,
+                            padding: EdgeInsets.all(0.0),
+                            textAlign: TextAlign.center,
+                            textOverflow: TextOverflow.ellipsis,
+                          ),
+                        );
+                      }
+                  ),
+                )
+              ]
+          )
+      ),
+    );
+  }
+}
+
+class GaugeSegment {
+  final String segment;
+  final double value;
+  final charts.Color color;
+
+  GaugeSegment(this.segment, this.value, Color color)
+      : this.color = charts.Color(
+      r: color.red, g: color.green, b: color.blue, a: color.alpha);
+}

lib/cards/widgets/glance_card_entity_container.dart

@@ -1,6 +1,6 @@
-part of '../main.dart';
+part of '../../main.dart';
 
-class GlanceEntityContainer extends StatelessWidget {
+class GlanceCardEntityContainer extends StatelessWidget {
 
   final bool showName;
   final bool showState;
@@ -9,7 +9,7 @@ class GlanceEntityContainer extends StatelessWidget {
   final double nameFontSize;
   final bool wordsWrapInName;
 
-  GlanceEntityContainer({
+  GlanceCardEntityContainer({
     Key key,
     @required this.showName,
     @required this.showState,
@@ -54,15 +54,10 @@ class GlanceEntityContainer extends StatelessWidget {
 
     return Center(
       child: InkResponse(
-        child: ConstrainedBox(
-          constraints: BoxConstraints(minWidth: Sizes.iconSize * 2),
         child: Column(
           mainAxisSize: MainAxisSize.min,
-            //mainAxisAlignment: MainAxisAlignment.start,
-            //crossAxisAlignment: CrossAxisAlignment.center,
           children: result,
         ),
-        ),
         onTap: () => entityWrapper.handleTap(),
         onLongPress: () => entityWrapper.handleHold(),
       ),

lib/cards/widgets/light_card_body.dart

@@ -0,0 +1,90 @@
+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],
+        ),
+      ),
+    );
+
+    return InkWell(
+      onTap: () => entityWrapper.handleTap(),
+      onLongPress: () => entityWrapper.handleHold(),
+      child: AspectRatio(
+          aspectRatio: 1.5,
+          child: Stack(
+              fit: StackFit.expand,
+              overflow: Overflow.clip,
+              children: [
+                Align(
+                  alignment: Alignment.bottomCenter,
+                  child: LayoutBuilder(
+                      builder: (BuildContext context, BoxConstraints constraints) {
+                        double fontSize = constraints.maxHeight / 7;
+                        return Padding(
+                          padding: EdgeInsets.only(bottom: 2*fontSize),
+                          child: SimpleEntityState(
+                            //textAlign: TextAlign.center,
+                            expanded: false,
+                            maxLines: 1,
+                            bold: true,
+                            textAlign: TextAlign.center,
+                            padding: EdgeInsets.all(0.0),
+                            fontSize: fontSize,
+                            //padding: EdgeInsets.only(top: Sizes.rowPadding),
+                          ),
+                        );
+                      }
+                  ),
+                ),
+                Align(
+                  alignment: Alignment.bottomCenter,
+                  child: LayoutBuilder(
+                      builder: (BuildContext context, BoxConstraints constraints) {
+                        double fontSize = constraints.maxHeight / 7;
+                        return Padding(
+                          padding: EdgeInsets.only(bottom: fontSize),
+                          child: EntityName(
+                            fontSize: fontSize,
+                            maxLines: 1,
+                            padding: EdgeInsets.all(0.0),
+                            textAlign: TextAlign.center,
+                            textOverflow: TextOverflow.ellipsis,
+                          ),
+                        );
+                      }
+                  ),
+                )
+              ]
+          )
+      ),
+    );
+  }
+}

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 {
@@ -77,23 +82,44 @@ class EntityUIAction {
 }
 
 class CardType {
-  static const horizontalStack = "horizontal-stack";
+  static const HORIZONTAL_STACK = "horizontal-stack";
-  static const verticalStack = "vertical-stack";
+  static const VERTICAL_STACK = "vertical-stack";
-  static const entities = "entities";
+  static const ENTITIES = "entities";
-  static const glance = "glance";
+  static const GLANCE = "glance";
-  static const mediaControl = "media-control";
+  static const MEDIA_CONTROL = "media-control";
-  static const weatherForecast = "weather-forecast";
+  static const WEATHER_FORECAST = "weather-forecast";
-  static const thermostat = "thermostat";
+  static const THERMOSTAT = "thermostat";
-  static const sensor = "sensor";
+  static const SENSOR = "sensor";
-  static const plantStatus = "plant-status";
+  static const PLANT_STATUS = "plant-status";
-  static const pictureEntity = "picture-entity";
+  static const PICTURE_ENTITY = "picture-entity";
-  static const pictureElements = "picture-elements";
+  static const PICTURE_ELEMENTS = "picture-elements";
-  static const picture = "picture";
+  static const PICTURE = "picture";
-  static const map = "map";
+  static const MAP = "map";
-  static const iframe = "iframe";
+  static const IFRAME = "iframe";
-  static const gauge = "gauge";
+  static const GAUGE = "gauge";
-  static const entityButton = "entity-button";
+  static const ENTITY_BUTTON = "entity-button";
-  static const conditional = "conditional";
+  static const CONDITIONAL = "conditional";
-  static const alarmPanel = "alarm-panel";
+  static const ALARM_PANEL = "alarm-panel";
-  static const markdown = "markdown";
+  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,7 +1,8 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class AlarmControlPanelEntity extends Entity {
-  AlarmControlPanelEntity(Map rawData) : super(rawData);
+  AlarmControlPanelEntity(Map rawData, String webHost) : super(rawData, webHost);
+
 
   @override
   Widget _buildAdditionalControlsForPage(BuildContext context) {

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(
+    ConnectionManager().callService(
-          entity.domain, service, entity.entityId,
+      domain: entity.domain,
-          {"code": "$code"}));
+      service: service,
+      entityId: entity.entityId,
+      data: {"code": "$code"}
+    );
     setState(() {
       code = "";
     });
@@ -58,7 +61,11 @@ class _AlarmControlPanelControlsWidgetWidgetState extends State<AlarmControlPane
             FlatButton(
               child: new Text("Yes"),
               onPressed: () {
-                eventBus.fire(new ServiceCallEvent(entity.domain, "alarm_trigger", entity.entityId, null));
+                ConnectionManager().callService(
+                  domain: entity.domain,
+                  service: "alarm_trigger",
+                  entityId: entity.entityId
+                );
                 Navigator.of(context).pop();
               },
             ),

lib/entities/automation/automation_entity.class.dart

@@ -1,7 +1,8 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class AutomationEntity extends Entity {
-  AutomationEntity(Map rawData) : super(rawData);
+  AutomationEntity(Map rawData, String webHost) : super(rawData, webHost);
+
 
   @override
   Widget _buildStatePart(BuildContext context) {

lib/entities/badge.widget.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../main.dart';
 
 class BadgeWidget extends StatelessWidget {
   @override
@@ -35,25 +35,36 @@ class BadgeWidget extends StatelessWidget {
           break;
         }
       case "device_tracker":
+      case "person":
         {
           badgeIcon = EntityIcon(
               padding: EdgeInsets.all(0.0),
               size: iconSize,
               color: Colors.black
           );
-          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: TextStyle(fontSize: stateFontSize),
             ),
           );
           break;
@@ -129,6 +140,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,7 +1,8 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class ButtonEntity extends Entity {
-  ButtonEntity(Map rawData) : super(rawData);
+  ButtonEntity(Map rawData, String webHost) : super(rawData, webHost);
+
 
   @override
   Widget _buildStatePart(BuildContext context) {

lib/entities/camera/camera_entity.class.dart

@@ -1,10 +1,10 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class CameraEntity extends Entity {
 
   static const SUPPORT_ON_OFF = 1;
 
-  CameraEntity(Map rawData) : super(rawData);
+  CameraEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   bool get supportOnOff => ((supportedFeatures &
   CameraEntity.SUPPORT_ON_OFF) ==

lib/entities/camera/widgets/camera_stream_view.dart

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

lib/entities/climate/climate_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class ClimateEntity extends Entity {
 
@@ -10,69 +10,57 @@ class ClimateEntity extends Entity {
   );
 
   static const SUPPORT_TARGET_TEMPERATURE = 1;
-  static const SUPPORT_TARGET_TEMPERATURE_HIGH = 2;
+  static const SUPPORT_TARGET_TEMPERATURE_RANGE = 2;
-  static const SUPPORT_TARGET_TEMPERATURE_LOW = 4;
+  static const SUPPORT_TARGET_HUMIDITY = 4;
-  static const SUPPORT_TARGET_HUMIDITY = 8;
+  static const SUPPORT_FAN_MODE = 8;
-  static const SUPPORT_TARGET_HUMIDITY_HIGH = 16;
+  static const SUPPORT_PRESET_MODE = 16;
-  static const SUPPORT_TARGET_HUMIDITY_LOW = 32;
+  static const SUPPORT_SWING_MODE = 32;
-  static const SUPPORT_FAN_MODE = 64;
+  static const SUPPORT_AUX_HEAT = 64;
-  static const SUPPORT_OPERATION_MODE = 128;
+
-  static const SUPPORT_HOLD_MODE = 256;
+
-  static const SUPPORT_SWING_MODE = 512;
+  //static const SUPPORT_OPERATION_MODE = 16;
-  static const SUPPORT_AWAY_MODE = 1024;
+  //static const SUPPORT_HOLD_MODE = 256;
-  static const SUPPORT_AUX_HEAT = 2048;
+  //static const SUPPORT_AWAY_MODE = 1024;
-  static const SUPPORT_ON_OFF = 4096;
+  //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 &
+  bool get supportTargetTemperatureRange => ((supportedFeatures &
-  ClimateEntity.SUPPORT_TARGET_TEMPERATURE_HIGH) ==
+  ClimateEntity.SUPPORT_TARGET_TEMPERATURE_RANGE) ==
-      ClimateEntity.SUPPORT_TARGET_TEMPERATURE_HIGH);
+      ClimateEntity.SUPPORT_TARGET_TEMPERATURE_RANGE);
-  bool get supportTargetTemperatureLow => ((supportedFeatures &
-  ClimateEntity.SUPPORT_TARGET_TEMPERATURE_LOW) ==
-      ClimateEntity.SUPPORT_TARGET_TEMPERATURE_LOW);
   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 =>
+  bool get supportPresetMode =>
-      ((supportedFeatures & ClimateEntity.SUPPORT_AWAY_MODE) ==
+      ((supportedFeatures & ClimateEntity.SUPPORT_PRESET_MODE) ==
-          ClimateEntity.SUPPORT_AWAY_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
+  List<String> get hvacModes => attributes["hvac_modes"] != null
-      ? (attributes["operation_list"] as List).cast<String>()
+      ? (attributes["hvac_modes"] as List).cast<String>()
       : null;
-  List<String> get fanList => attributes["fan_list"] != null
+  List<String> get fanModes => attributes["fan_modes"] != null
-      ? (attributes["fan_list"] as List).cast<String>()
+      ? (attributes["fan_modes"] as List).cast<String>()
       : null;
-  List<String> get swingList => attributes["swing_list"] != null
+  List<String> get presetModes => attributes["preset_modes"] != null
-      ? (attributes["swing_list"] as List).cast<String>()
+      ? (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;
@@ -81,25 +69,22 @@ 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";
 
-  ClimateEntity(Map rawData) : super(rawData);
-
   @override
-  void update(Map rawData) {
+  void update(Map rawData, String webHost) {
-    super.update(rawData);
+    super.update(rawData, webHost);
     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 {
 
@@ -19,22 +19,22 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   double _tmpTargetLow = 0.0;
   double _tmpTargetHigh = 0.0;
   double _tmpTargetHumidity = 0.0;
-  String _tmpOperationMode;
+  String _tmpHVACMode;
   String _tmpFanMode;
   String _tmpSwingMode;
-  bool _tmpAwayMode = false;
+  String _tmpPresetMode;
-  bool _tmpIsOff = false;
+  //bool _tmpIsOff = false;
   bool _tmpAuxHeat = false;
 
   void _resetVars(ClimateEntity entity) {
     _tmpTemperature = entity.temperature;
     _tmpTargetHigh = entity.targetHigh;
     _tmpTargetLow = entity.targetLow;
-    _tmpOperationMode = entity.operationMode;
+    _tmpHVACMode = entity.state;
     _tmpFanMode = entity.fanMode;
     _tmpSwingMode = entity.swingMode;
-    _tmpAwayMode = entity.awayMode;
+    _tmpPresetMode = entity.presetMode;
-    _tmpIsOff = entity.isOff;
+    //_tmpIsOff = entity.isOff;
     _tmpAuxHeat = entity.auxHeat;
     _tmpTargetHumidity = entity.targetHumidity;
 
@@ -83,7 +83,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     _tempThrottleTimer = Timer(Duration(seconds: 2), () {
       setState(() {
         _changedHere = true;
-        eventBus.fire(new ServiceCallEvent(entity.domain, "set_temperature", entity.entityId,{"temperature": "${_tmpTemperature.toStringAsFixed(1)}"}));
+        ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_temperature",
+          entityId: entity.entityId,
+          data: {"temperature": "${_tmpTemperature.toStringAsFixed(1)}"}
+        );
         _resetStateTimer(entity);
       });
     });
@@ -101,7 +106,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     _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)}"}));
+        ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_temperature",
+          entityId: entity.entityId,
+          data: {"target_temp_high": "${_tmpTargetHigh.toStringAsFixed(1)}", "target_temp_low": "${_tmpTargetLow.toStringAsFixed(1)}"}
+        );
         _resetStateTimer(entity);
       });
     });
@@ -111,16 +121,26 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpTargetHumidity = value.roundToDouble();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_humidity", entity.entityId,{"humidity": "$_tmpTargetHumidity"}));
+      ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_humidity",
+          entityId: entity.entityId,
+          data: {"humidity": "$_tmpTargetHumidity"}
+        );
       _resetStateTimer(entity);
     });
   }
 
-  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"}));
+      ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_hvac_mode",
+          entityId: entity.entityId,
+          data: {"hvac_mode": "$_tmpHVACMode"}
+        );
       _resetStateTimer(entity);
     });
   }
@@ -129,7 +149,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpSwingMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_swing_mode", entity.entityId,{"swing_mode": "$_tmpSwingMode"}));
+      ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_swing_mode",
+          entityId: entity.entityId,
+          data: {"swing_mode": "$_tmpSwingMode"}
+        );
       _resetStateTimer(entity);
     });
   }
@@ -138,34 +163,34 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpFanMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_fan_mode", entity.entityId,{"fan_mode": "$_tmpFanMode"}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_fan_mode", entityId: entity.entityId, data: {"fan_mode": "$_tmpFanMode"});
       _resetStateTimer(entity);
     });
   }
 
-  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'}"}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_preset_mode", entityId: entity.entityId, data: {"preset_mode": "$_tmpPresetMode"});
       _resetStateTimer(entity);
     });
   }
 
-  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"}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_aux_heat", entityId: entity.entityId, data: {"aux_heat": "$_tmpAuxHeat"});
       _resetStateTimer(entity);
     });
   }
@@ -196,33 +221,34 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
-          _buildOnOffControl(entity),
+          //_buildOnOffControl(entity),
           _buildTemperatureControls(entity),
           _buildTargetTemperatureControls(entity),
           _buildHumidityControls(entity),
           _buildOperationControl(entity),
           _buildFanControl(entity),
           _buildSwingControl(entity),
-          _buildAwayModeControl(entity),
+          _buildPresetModeControl(entity),
           _buildAuxHeatControl(entity)
         ],
       ),
     );
   }
 
-  Widget _buildAwayModeControl(ClimateEntity entity) {
+  Widget _buildPresetModeControl(ClimateEntity entity) {
-    if (entity.supportAwayMode) {
+    if (entity.supportPresetMode) {
-      return ModeSwitchWidget(
+      return ModeSelectorWidget(
-        caption: "Away mode",
+        options: entity.presetModes,
-        onChange: (value) => _setAwayMode(entity, value),
+        onChange: (mode) => _setPresetMode(entity, mode),
-        value: _tmpAwayMode,
+        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,7 +258,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     } else {
       return Container(height: 0.0, width: 0.0,);
     }
-  }
+  }*/
 
   Widget _buildAuxHeatControl(ClimateEntity entity) {
     if (entity.supportAuxHeat ) {
@@ -247,12 +273,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   }
 
   Widget _buildOperationControl(ClimateEntity entity) {
-    if (entity.supportOperationMode) {
+    if (entity.hvacModes != null) {
       return ModeSelectorWidget(
-        onChange: (mode) => _setOperationMode(entity, mode),
+        onChange: (mode) => _setHVACMode(entity, mode),
-        options: entity.operationList,
+        options: entity.hvacModes,
         caption: "Operation",
-        value: _tmpOperationMode,
+        value: _tmpHVACMode,
       );
     } else {
       return Container(height: 0.0, width: 0.0);
@@ -262,7 +288,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   Widget _buildFanControl(ClimateEntity entity) {
     if (entity.supportFanMode) {
       return ModeSelectorWidget(
-        options: entity.fanList,
+        options: entity.fanModes,
         onChange: (mode) => _setFanMode(entity, mode),
         caption: "Fan mode",
         value: _tmpFanMode,
@@ -276,7 +302,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     if (entity.supportSwingMode) {
       return ModeSelectorWidget(
           onChange: (mode) => _setSwingMode(entity, mode),
-          options: entity.swingList,
+          options: entity.swingModes,
           value: _tmpSwingMode,
           caption: "Swing mode"
       );
@@ -308,7 +334,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
 
   Widget _buildTargetTemperatureControls(ClimateEntity entity) {
     List<Widget> controls = [];
-    if ((entity.supportTargetTemperatureLow) && (entity.targetLow != null)) {
+    if ((entity.supportTargetTemperatureRange) && (entity.targetLow != null)) {
       controls.addAll(<Widget>[
         TemperatureControlWidget(
           value: _tmpTargetLow,
@@ -321,7 +347,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
         )
       ]);
     }
-    if ((entity.supportTargetTemperatureHigh) && (entity.targetHigh != null)) {
+    if ((entity.supportTargetTemperatureRange) && (entity.targetHigh != null)) {
       controls.add(
           TemperatureControlWidget(
             value: _tmpTargetHigh,
@@ -408,52 +434,3 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   }
 
 }
-
-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) &&
+    } else if ((entity.supportTargetTemperatureRange) &&
-        (entity.targetLow != null)) {
+        (entity.targetLow != null) &&
-      targetTemp = "${entity.targetLow}";
-      if ((entity.supportTargetTemperatureHigh) &&
         (entity.targetHigh != null)) {
-        targetTemp += " - ${entity.targetHigh}";
+      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,7 +31,7 @@ class ClimateStateWidget extends StatelessWidget {
           children: <Widget>[
             Row(
               children: <Widget>[
-                Text("${entity.state}",
+                Text("$displayState",
                     textAlign: TextAlign.right,
                     style: new TextStyle(
                       fontWeight: FontWeight.bold,
@@ -38,8 +44,8 @@ class ClimateStateWidget extends StatelessWidget {
                     ))
               ],
             ),
-            entity.attributes["current_temperature"] != null ?
+            entity.currentTemperature != null ?
-            Text("Currently: ${entity.attributes["current_temperature"]}",
+            Text("Currently: ${entity.currentTemperature}",
                 textAlign: TextAlign.right,
                 style: new TextStyle(
                     fontSize: Sizes.stateFontSize,

lib/entities/climate/widgets/mode_selector.dart

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

lib/entities/climate/widgets/mode_swicth.dart

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

lib/entities/climate/widgets/temperature_control_widget.dart

@@ -0,0 +1,50 @@
+part of '../../../main.dart';
+
+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/cover/cover_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class CoverEntity extends Entity {
 
@@ -11,6 +11,8 @@ class CoverEntity extends Entity {
   static const SUPPORT_STOP_TILT = 64;
   static const SUPPORT_SET_TILT_POSITION = 128;
 
+  CoverEntity(Map rawData, String webHost) : super(rawData, webHost);
+
   bool get supportOpen => ((supportedFeatures &
   CoverEntity.SUPPORT_OPEN) ==
       CoverEntity.SUPPORT_OPEN);
@@ -45,8 +47,6 @@ class CoverEntity extends Entity {
   bool get canTiltBeOpened => currentTiltPosition < 100;
   bool get canTiltBeClosed => currentTiltPosition > 0;
 
-  CoverEntity(Map rawData) : super(rawData);
-
   @override
   Widget _buildStatePart(BuildContext context) {
     return CoverStateWidget();

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()});
     });
   }
 
@@ -135,18 +135,18 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
 
 class CoverTiltControlsWidget extends StatelessWidget {
   void _open(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
+    ConnectionManager().callService(
-        entity.domain, "open_cover_tilt", entity.entityId, null));
+        domain: entity.domain, service: "open_cover_tilt", entityId: entity.entityId);
   }
 
   void _close(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
+    ConnectionManager().callService(
-        entity.domain, "close_cover_tilt", entity.entityId, null));
+        domain: entity.domain, service: "close_cover_tilt", entityId: entity.entityId);
   }
 
   void _stop(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
+    ConnectionManager().callService(
-        entity.domain, "stop_cover_tilt", entity.entityId, null));
+        domain: entity.domain, service: "stop_cover_tilt", entityId: entity.entityId);
   }
 
   @override

lib/entities/cover/widgets/cover_state.dart

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

lib/entities/date_time/date_time_entity.class.dart

@@ -1,6 +1,8 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class DateTimeEntity extends Entity {
+  DateTimeEntity(Map rawData, String webHost) : super(rawData, webHost);
+
   bool get hasDate => attributes["has_date"] ?? false;
   bool get hasTime => attributes["has_time"] ?? false;
   int get year => attributes["year"] ?? 1970;
@@ -12,8 +14,6 @@ class DateTimeEntity extends Entity {
   String get formattedState => _getFormattedState();
   DateTime get dateTimeState => _getDateTimeState();
 
-  DateTimeEntity(Map rawData) : super(rawData);
-
   @override
   Widget _buildStatePart(BuildContext context) {
     return DateTimeStateWidget();
@@ -35,8 +35,7 @@ class DateTimeEntity extends Entity {
     return formattedState;
   }
 
-  void setNewState(newValue) {
+  void setNewState(Map newValue) {
-    eventBus
+    ConnectionManager().callService(domain: domain, service: "set_datetime", entityId: entityId, data: newValue);
-        .fire(new ServiceCallEvent(domain, "set_datetime", entityId, newValue));
   }
 }

lib/entities/date_time/widgets/date_time_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class DateTimeStateWidget extends StatelessWidget {
   @override

lib/entities/default_entity_container.widget.dart

@@ -15,14 +15,18 @@ class DefaultEntityContainer extends StatelessWidget {
       return MissedEntityWidget();
     }
     if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.DIVIDER) {
-      return Divider();
+      return Divider(
+        color: Colors.black45,
+      );
     }
     if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.SECTION) {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
-          Divider(),
+          Divider(
+            color: Colors.black45,
+          ),
           Text(
               "${entityModel.entityWrapper.entity.displayName}",
             style: TextStyle(color: Colors.blue),
@@ -30,18 +34,7 @@ class DefaultEntityContainer extends StatelessWidget {
         ],
       );
     }
-    return InkWell(
+    Widget result = Row(
-      onLongPress: () {
-        if (entityModel.handleTap) {
-          entityModel.entityWrapper.handleHold();
-        }
-      },
-      onTap: () {
-        if (entityModel.handleTap) {
-          entityModel.entityWrapper.handleTap();
-        }
-      },
-      child: Row(
       mainAxisSize: MainAxisSize.max,
       children: <Widget>[
         EntityIcon(),
@@ -55,7 +48,23 @@ class DefaultEntityContainer extends StatelessWidget {
         ),
         state
       ],
-      ),
     );
+    if (entityModel.handleTap) {
+      return InkWell(
+        onLongPress: () {
+          if (entityModel.handleTap) {
+            entityModel.entityWrapper.handleHold();
+          }
+        },
+        onTap: () {
+          if (entityModel.handleTap) {
+            entityModel.entityWrapper.handleTap();
+          }
+        },
+        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",
@@ -73,6 +73,7 @@ class Entity {
   Map attributes;
   String domain;
   String entityId;
+  String entityPicture;
   String state;
   String displayState;
   DateTime _lastUpdated;
@@ -94,7 +95,6 @@ class Entity {
   bool get isBadge => Entity.badgeDomains.contains(domain);
   String get icon => attributes["icon"] ?? "";
   bool get isOn => state == EntityState.on;
-  String get entityPicture => _getEntityPictureUrl();
   String get unitOfMeasurement => attributes["unit_of_measurement"] ?? "";
   List get childEntityIds => attributes["entity_id"] ?? [];
   String get lastUpdated => _getLastUpdatedFormatted();
@@ -102,21 +102,21 @@ class Entity {
   double get doubleState => double.tryParse(state) ?? 0.0;
   int get supportedFeatures => attributes["supported_features"] ?? 0;
 
-  String _getEntityPictureUrl() {
+  String _getEntityPictureUrl(String webHost) {
     String result = attributes["entity_picture"];
     if (result == null) return result;
     if (!result.startsWith("http")) {
       if (result.startsWith("/")) {
-        result = "$homeAssistantWebHost$result";
+        result = "$webHost$result";
       } else {
-        result = "$homeAssistantWebHost/$result";
+        result = "$webHost/$result";
       }
     }
     return result;
   }
 
-  Entity(Map rawData) {
+  Entity(Map rawData, String webHost) {
-    update(rawData);
+    update(rawData, webHost);
   }
 
   Entity.missed(String entityId) {
@@ -148,14 +148,15 @@ class Entity {
     attributes = {"hidden": false, "friendly_name": "${name ?? url}", "icon": "${icon ?? 'mdi:link'}"};
   }
 
-  void update(Map rawData) {
+  void update(Map rawData, String webHost) {
     attributes = rawData["attributes"] ?? {};
     domain = rawData["entity_id"].split(".")[0];
     entityId = rawData["entity_id"];
     deviceClass = attributes["device_class"];
-    state = rawData["state"];
+    state = rawData["state"] is bool ? (rawData["state"] ? EntityState.on : EntityState.off) : rawData["state"];
-    displayState = Entity.StateByDeviceClass["$deviceClass.$state"] ?? state;
+    displayState = Entity.StateByDeviceClass["$deviceClass.$state"] ?? (state.toLowerCase() == 'unknown' ? '-' : state);
     _lastUpdated = DateTime.tryParse(rawData["last_updated"]);
+    entityPicture = _getEntityPictureUrl(webHost);
   }
 
   double _getDoubleAttributeValue(String attributeName) {
@@ -210,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),

lib/entities/entity_colors.class.dart

@@ -14,9 +14,12 @@ class EntityColor {
     "auto": Colors.amber,
     EntityState.active: Colors.amber,
     EntityState.playing: Colors.amber,
+    EntityState.paused: Colors.amber,
     "above_horizon": Colors.amber,
     EntityState.home:  Colors.amber,
     EntityState.open:  Colors.amber,
+    EntityState.cleaning:  Colors.amber,
+    EntityState.returning:  Colors.amber,
     EntityState.off: defaultStateColor,
     EntityState.closed: defaultStateColor,
     "below_horizon": defaultStateColor,

lib/entities/entity_model.widget.dart

@@ -20,23 +20,3 @@ class EntityModel extends InheritedWidget {
     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_page_layout.widget.dart

@@ -0,0 +1,70 @@
+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: Colors.blue[300],
+              height: 40,
+              child: Row(
+                children: <Widget>[
+                  Expanded(
+                    child: Padding(
+                      padding: EdgeInsets.only(left: 8),
+                      child: Text(
+                        entity.displayName,
+                        style: TextStyle(
+                            fontWeight: FontWeight.bold,
+                            color: Colors.white,
+                            fontSize: 22
+                        ),
+                      ),
+                    ),
+                  ),
+                  IconButton(
+                    padding: EdgeInsets.all(0),
+                    icon: Icon(Icons.close),
+                    color: Colors.white,
+                    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_wrapper.class.dart

@@ -4,6 +4,7 @@ class EntityWrapper {
 
   String displayName;
   String icon;
+  String unitOfMeasurement;
   String entityPicture;
   EntityUIAction uiAction;
   Entity entity;
@@ -24,23 +25,24 @@ class EntityWrapper {
       if (uiAction == null) {
         uiAction = EntityUIAction();
       }
+      unitOfMeasurement = entity.unitOfMeasurement;
     }
   }
 
   void handleTap() {
     switch (uiAction.tapAction) {
       case EntityUIAction.toggle: {
-        eventBus.fire(
+        ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
-            ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
         break;
       }
 
       case EntityUIAction.callService: {
         if (uiAction.tapService != null) {
-          eventBus.fire(
+          ConnectionManager().callService(
-              ServiceCallEvent(uiAction.tapService.split(".")[0],
+            domain: uiAction.tapService.split(".")[0],
-                  uiAction.tapService.split(".")[1], null,
+            service: uiAction.tapService.split(".")[1],
-                  uiAction.tapServiceData));
+            data: uiAction.tapServiceData
+          );
         }
         break;
       }
@@ -51,7 +53,7 @@ class EntityWrapper {
 
       case EntityUIAction.moreInfo: {
         eventBus.fire(
-            new ShowEntityPageEvent(entity));
+            new ShowEntityPageEvent(entity: entity));
         break;
       }
 
@@ -60,7 +62,7 @@ class EntityWrapper {
           //TODO handle local urls
           Logger.w("Local urls is not supported yet");
         } else {
-          HAUtils.launchURL(uiAction.tapService);
+          Launcher.launchURL(uiAction.tapService);
         }
         break;
       }
@@ -74,24 +76,24 @@ class EntityWrapper {
   void handleHold() {
       switch (uiAction.holdAction) {
         case EntityUIAction.toggle: {
-          eventBus.fire(
+          ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
-              ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
           break;
         }
 
         case EntityUIAction.callService: {
           if (uiAction.holdService != null) {
-            eventBus.fire(
+            ConnectionManager().callService(
-                ServiceCallEvent(uiAction.holdService.split(".")[0],
+              domain: uiAction.holdService.split(".")[0],
-                    uiAction.holdService.split(".")[1], null,
+              service: uiAction.holdService.split(".")[1],
-                    uiAction.holdServiceData));
+              data: uiAction.holdServiceData
+            );
           }
           break;
         }
 
         case EntityUIAction.moreInfo: {
           eventBus.fire(
-              new ShowEntityPageEvent(entity));
+              new ShowEntityPageEvent(entity: entity));
           break;
         }
 
@@ -100,7 +102,7 @@ class EntityWrapper {
             //TODO handle local urls
             Logger.w("Local urls is not supported yet");
           } else {
-            HAUtils.launchURL(uiAction.holdService);
+            Launcher.launchURL(uiAction.holdService);
           }
           break;
         }

lib/entities/fan/fan_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class FanEntity extends Entity {
 
@@ -6,7 +6,7 @@ class FanEntity extends Entity {
   static const SUPPORT_OSCILLATE = 2;
   static const SUPPORT_DIRECTION = 4;
 
-  FanEntity(Map rawData) : super(rawData);
+  FanEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   bool get supportSetSpeed => ((supportedFeatures &
   FanEntity.SUPPORT_SET_SPEED) ==

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

lib/entities/flat_service_button.widget.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../main.dart';
 
 class FlatServiceButton extends StatelessWidget {
 
@@ -18,7 +18,7 @@ class FlatServiceButton extends StatelessWidget {
   }) : super(key: key);
 
   void _setNewState() {
-    eventBus.fire(new ServiceCallEvent(serviceDomain, serviceName, entityId, null));
+    ConnectionManager().callService(domain: serviceDomain, service: serviceName, entityId: entityId);
   }
 
   @override

lib/entities/group/group_entity.class.dart

@@ -1,12 +1,13 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class GroupEntity extends Entity {
-  GroupEntity(Map rawData) : super(rawData);
 
   final List<String> _domainsForSwitchableGroup = ["switch", "light", "automation", "input_boolean"];
   String mutualDomain;
   bool switchable = false;
 
+  GroupEntity(Map rawData, String webHost) : super(rawData, webHost);
+
   @override
   Widget _buildStatePart(BuildContext context) {
     if (switchable) {
@@ -19,8 +20,8 @@ class GroupEntity extends Entity {
   }
 
   @override
-  void update(Map rawData) {
+  void update(Map rawData, String webHost) {
-    super.update(rawData);
+    super.update(rawData, webHost);
     if (_isOneDomain()) {
       mutualDomain = attributes['entity_id'][0].split(".")[0];
       switchable = _domainsForSwitchableGroup.contains(mutualDomain);

lib/entities/light/light_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class LightEntity extends Entity {
 
@@ -42,7 +42,7 @@ class LightEntity extends Entity {
   bool get isAdditionalControls => ((supportedFeatures != null) && (supportedFeatures != 0));
   List<String> get effectList => getStringListAttributeValue("effect_list");
 
-  LightEntity(Map rawData) : super(rawData);
+  LightEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   HSVColor _getColor() {
     List hs = attributes["hs_color"];

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) {
+      ConnectionManager().callService(
-        eventBus.fire(new ServiceCallEvent(
+          domain: entity.domain,
-            entity.domain, "turn_on", entity.entityId,
+          service: "turn_on",
-            {"brightness": _tmpBrightness}));
+          entityId: entity.entityId,
-      } else {
+          data: {"brightness": _tmpBrightness}
-        eventBus.fire(new ServiceCallEvent(
+        );
-            entity.domain, "turn_off", entity.entityId,
-            null));
-      }
     });
   }
 
@@ -44,9 +41,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     setState(() {
       _tmpWhiteValue = value.round();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
+      ConnectionManager().callService(
-            entity.domain, "turn_on", entity.entityId,
+            domain: entity.domain,
-            {"white_value": _tmpWhiteValue}));
+            service: "turn_on",
+            entityId: entity.entityId,
+            data: {"white_value": _tmpWhiteValue}
+          );
 
     });
   }
@@ -55,9 +55,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     setState(() {
       _tmpColorTemp = value.round();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
+      ConnectionManager().callService(
-          entity.domain, "turn_on", entity.entityId,
+          domain: entity.domain,
-          {"color_temp": _tmpColorTemp}));
+          service: "turn_on",
+          entityId: entity.entityId,
+          data: {"color_temp": _tmpColorTemp}
+        );
     });
   }
 
@@ -65,10 +68,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     setState(() {
       _tmpColor = color;
       _changedHere = true;
-      Logger.d( "HS Color: [${color.hue}, ${color.saturation}]");
+      ConnectionManager().callService(
-      eventBus.fire(new ServiceCallEvent(
+        domain: entity.domain,
-        entity.domain, "turn_on", entity.entityId,
+        service: "turn_on",
-          {"hs_color": [color.hue, color.saturation*100]}));
+        entityId: entity.entityId,
+        data: {"hs_color": [color.hue, color.saturation*100]}
+      );
     });
   }
 
@@ -77,9 +82,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
       _tmpEffect = value;
       _changedHere = true;
       if (_tmpEffect != null) {
-        eventBus.fire(new ServiceCallEvent(
+        ConnectionManager().callService(
-            entity.domain, "turn_on", entity.entityId,
+            domain: entity.domain,
-            {"effect": "$value"}));
+            service: "turn_on",
+            entityId: entity.entityId,
+            data: {"effect": "$value"}
+          );
       }
     });
   }
@@ -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(),
+        value:  val,
         onChangeEnd: (value) => _setColorTemp(entity, value),
         max: entity.maxMireds,
         min: entity.minMireds,
@@ -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,10 +219,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
                 child: Text('Copy color'),
                 onPressed: _tmpColor == null ? null : () {
                   setState(() {
-                    HomeAssistantModel
+                    HomeAssistant().savedColor = _tmpColor;
-                        .of(context)
-                        .homeAssistant
-                        .savedColor = _tmpColor;
                   });
                 },
               ),
@@ -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,7 +1,7 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class LockEntity extends Entity {
-  LockEntity(Map rawData) : super(rawData);
+  LockEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   bool get isLocked => state == "locked";
 

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

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 {
 
@@ -20,7 +20,7 @@ class MediaPlayerEntity extends Entity {
   static const SUPPORT_SHUFFLE_SET = 32768;
   static const SUPPORT_SELECT_SOUND_MODE = 65536;
 
-  MediaPlayerEntity(Map rawData) : super(rawData);
+  MediaPlayerEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   bool get supportPause => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_PAUSE) ==
@@ -74,10 +74,37 @@ 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;
+    if (canCalculateActualPosition()) {
+      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;
+    int currentPosition;
+    if (entity.canCalculateActualPosition()) {
+      currentPosition = entity.getActualPosition().toInt();
+      progress = (currentPosition <= entity.durationSeconds) ? currentPosition / entity.durationSeconds : 100;
+    } else {
+      progress = 0;
+    }
+    return LinearProgressIndicator(
+      value: progress,
+      backgroundColor: Colors.black45,
+      valueColor: AlwaysStoppedAnimation<Color>(EntityColor.stateColor(EntityState.on)),
+    );
+  }
+
+  @override
+  void dispose() {
+    _timer?.cancel();
+    super.dispose();
+  }
+
+}

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

@@ -0,0 +1,137 @@
+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;
+
+  final TextStyle _seekTextStyle = TextStyle(
+      fontSize: 20,
+      color: Colors.blue,
+      fontWeight: FontWeight.bold
+  );
+
+  @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: Colors.orange,
+              focusColor: Colors.white,
+              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: _seekTextStyle),
+                ),
+                Text("${Duration(seconds: entity.durationSeconds).toString().split(".")[0]}")
+              ],
+            ),
+            Container(height: 10,),
+            Slider(
+              min: 0,
+              activeColor: Colors.amber,
+              inactiveColor: Colors.black26,
+              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,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class MediaPlayerWidget extends StatelessWidget {
 
@@ -26,7 +26,7 @@ class MediaPlayerWidget extends StatelessWidget {
                 bottom: 0.0,
                 left: 0.0,
                 right: 0.0,
-                child: MediaPlayerProgressWidget()
+                child: MediaPlayerProgressBar()
             )
           ],
         ),
@@ -73,7 +73,7 @@ class MediaPlayerWidget extends StatelessWidget {
 
   Widget _buildImage(MediaPlayerEntity entity) {
     String state = entity.state;
-    if (homeAssistantWebHost != null && entity.entityPicture != null && state != EntityState.off && state != EntityState.unavailable && state != EntityState.idle) {
+    if (entity.entityPicture != null && state != EntityState.off && state != EntityState.unavailable && state != EntityState.idle) {
       return Container(
         color: Colors.black,
         child: Row(
@@ -118,26 +118,28 @@ class MediaPlayerPlaybackControls extends StatelessWidget {
 
 
   void _setPower(MediaPlayerEntity entity) {
-    if (entity.state != EntityState.unavailable && entity.state != EntityState.unknown) {
       if (entity.state == EntityState.off) {
-        Logger.d("${entity.entityId} turn_on");
+        ConnectionManager().callService(
-        eventBus.fire(new ServiceCallEvent(
+            domain: entity.domain,
-            entity.domain, "turn_on", entity.entityId,
+            service: "turn_on",
-            null));
+            entityId: entity.entityId
+          );
       } else {
-        Logger.d("${entity.entityId} turn_off");
+        ConnectionManager().callService(
-        eventBus.fire(new ServiceCallEvent(
+            domain: entity.domain,
-            entity.domain, "turn_off", entity.entityId,
+            service: "turn_off",
-            null));
+            entityId: entity.entityId
-      }
+          );
       }
   }
 
   void _callAction(MediaPlayerEntity entity, String action) {
     Logger.d("${entity.entityId} $action");
-    eventBus.fire(new ServiceCallEvent(
+    ConnectionManager().callService(
-        entity.domain, "$action", entity.entityId,
+        domain: entity.domain,
-        null));
+        service: "$action",
+        entityId: entity.entityId
+      );
   }
 
   @override
@@ -229,7 +231,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 +266,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 +317,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 +335,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) {
@@ -398,69 +433,43 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
             )
         );
       }
-
+      if (entity.state == EntityState.playing || entity.state == EntityState.paused) {
+        children.add(
+            ButtonBar(
+              children: <Widget>[
+                RaisedButton(
+                  child: Text("Duplicate to"),
+                  color: Colors.blue,
+                  textColor: Colors.white,
+                  onPressed: () => _duplicateTo(entity),
+                ),
+                RaisedButton(
+                  child: Text("Switch to"),
+                  color: Colors.blue,
+                  textColor: Colors.white,
+                  onPressed: () => _switchTo(entity),
+                )
+              ],
+            )
+        );
+      }
     }
     return Column(
       children: children,
     );
   }
 
-}
+  void _duplicateTo(entity) {
-
+    HomeAssistant().savedPlayerPosition = entity.getActualPosition().toInt();
-class MediaPlayerProgressWidget extends StatefulWidget {
+    Navigator.of(context).pushNamed("/play-media", arguments: {
-  @override
+        "url": entity.attributes["media_content_id"],
-  _MediaPlayerProgressWidgetState createState() => _MediaPlayerProgressWidgetState();
+        "type": entity.attributes["media_content_type"]
-}
-
-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;
-    }
-    return LinearProgressIndicator(
-      value: progress,
-      backgroundColor: Colors.black45,
-    );
   }
 
-  @override
+  void _switchTo(entity) {
-  void dispose() {
+    HomeAssistant().sendFromPlayerId = entity.entityId;
-    _timer?.cancel();
+    _duplicateTo(entity);
-    super.dispose();
   }
 
 }

lib/entities/select/select_entity.class.dart

@@ -1,11 +1,11 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class SelectEntity extends Entity {
   List<String> get listOptions => attributes["options"] != null
       ? (attributes["options"] as List).cast<String>()
       : [];
 
-  SelectEntity(Map rawData) : super(rawData);
+  SelectEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   @override
   Widget _buildStatePart(BuildContext context) {

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,
+    ConnectionManager().callService(
-        {"option": "$newValue"}));
+      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';
+part of '../../main.dart';
-
-class SunEntity extends Entity {
-  SunEntity(Map rawData) : super(rawData);
-}
 
 class SensorEntity extends Entity {
 
@@ -12,6 +8,6 @@ class SensorEntity extends Entity {
       numericState: true
   );
 
-  SensorEntity(Map rawData) : super(rawData);
+  SensorEntity(Map rawData, String webHost) : super(rawData, webHost);
 
 }

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 double fontSize;
+  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.fontSize: Sizes.stateFontSize, 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);
 
   @override
   Widget build(BuildContext context) {
@@ -21,18 +23,22 @@ class SimpleEntityState extends StatelessWidget {
       state = customValue;
     }
     TextStyle textStyle =  TextStyle(
-      fontSize: Sizes.stateFontSize,
+      fontSize: this.fontSize,
+      fontWeight: FontWeight.normal
     );
     if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.CALL_SERVICE) {
       textStyle = textStyle.apply(color: Colors.blue);
     }
+    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,

lib/entities/slider/slider_entity.dart

@@ -1,7 +1,7 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class SliderEntity extends Entity {
-  SliderEntity(Map rawData) : super(rawData);
+  SliderEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   double get minValue => _getDoubleAttributeValue("min") ?? 0.0;
   double get maxValue =>_getDoubleAttributeValue("max") ?? 100.0;

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,
+    ConnectionManager().callService(
-        {"value": "${newValue.toString()}"}));
+      domain: domain,
+      service: "set_value",
+      entityId: entityId,
+      data: {"value": "${newValue.toString()}"}
+    );
   }
 
   @override

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,7 +1,7 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class SwitchEntity extends Entity {
-  SwitchEntity(Map rawData) : super(rawData);
+  SwitchEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   @override
   Widget _buildStatePart(BuildContext context) {

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(
+    ConnectionManager().callService(
-        domain, (newValue as bool) ? "turn_on" : "turn_off", entity.entityId, null));
+        domain: domain,
+        service: (newValue as bool) ? "turn_on" : "turn_off",
+        entityId: entity.entityId
+      );
   }
 
   @override

lib/entities/text/text_entity.class.dart

@@ -1,7 +1,7 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class TextEntity extends Entity {
-  TextEntity(Map rawData) : super(rawData);
+  TextEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   int get valueMinLength => attributes["min"] ?? -1;
   int get valueMaxLength => attributes["max"] ?? -1;

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,
+      ConnectionManager().callService(
-          {"value": "$newValue"}));
+        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(
+            controller: TextEditingController.fromValue(TextEditingValue(text: _tmpValue)),
-                new TextEditingValue(
-                    text: _tmpValue,
-                    selection:
-                    new TextSelection.collapsed(offset: _tmpValue.length)
-                )
-            ),
             onChanged: (value) {
               _tmpValue = value;
             }),

lib/entities/timer/timer_entity.class.dart

@@ -0,0 +1,45 @@
+part of '../../main.dart';
+
+class TimerEntity extends Entity {
+  TimerEntity(Map rawData, String webHost) : super(rawData, webHost);
+
+  Duration duration;
+
+  @override
+  void update(Map rawData, String webHost) {
+    super.update(rawData, webHost);
+    String durationSource = "${attributes["duration"]}";
+    if (durationSource != null && durationSource.isNotEmpty) {
+      try {
+        List<String> durationList = durationSource.split(":");
+        if (durationList.length == 1) {
+          duration = Duration(seconds: int.tryParse(durationList[0] ?? 0));
+        } else if (durationList.length == 2) {
+          duration = Duration(
+              hours: int.tryParse(durationList[0]) ?? 0,
+              minutes: int.tryParse(durationList[1]) ?? 0
+          );
+        } else if (durationList.length == 3) {
+          duration = Duration(
+              hours: int.tryParse(durationList[0]) ?? 0,
+              minutes: int.tryParse(durationList[1]) ?? 0,
+              seconds: int.tryParse(durationList[2]) ?? 0
+          );
+        } else {
+          Logger.e("Strange $entityId duration format: $durationSource");
+          duration = Duration(seconds: 0);
+        }
+      } catch (e) {
+        Logger.e("Error parsing duration for $entityId: ${e.toString()}");
+        duration = Duration(seconds: 0);
+      }
+    } else {
+      duration = Duration(seconds: 0);
+    }
+  }
+
+  @override
+  Widget _buildStatePart(BuildContext context) {
+    return TimerState();
+  }
+}

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 {
 

lib/entities/vacuum/vacuum_entity.class.dart

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

lib/entities/vacuum/widgets/vacuum_controls.dart

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