Resolves #494

Hotfix/0.7.1

.github/ISSUE_TEMPLATE/bug_report.md

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

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

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

.github/ISSUE_TEMPLATE/feature_request.md

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

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

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

.github/no-response.yml

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

.gitignore

@@ -9,6 +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']

android/app/google-services.json

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

android/app/src/main/AndroidManifest.xml

@@ -1,12 +1,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.keyboardcrumbs.hassclient">
 
-    <!-- The INTERNET permission is required for development. Specifically,
-         flutter needs it to communicate with the running application
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
+    <uses-feature android:name="android.hardware.touchscreen"
+        android:required="false" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.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.
@@ -14,7 +17,7 @@
          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:usesCleartextTraffic="true">
@@ -45,6 +48,29 @@
                 <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 FlutterActivity {
+public class MainActivity extends FlutterShareReceiverActivity {
+  
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);

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

@@ -15,6 +15,10 @@ class HACard {
   List states;
   List conditions;
   String content;
+  String unit;
+  int min;
+  int max;
+  Map severity;
 
   HACard({
     this.name,
@@ -27,13 +31,21 @@ class HACard {
     this.showEmpty: true,
     this.content,
     this.states,
-    this.conditions,
+    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

@@ -25,14 +25,15 @@ class CardWidget extends StatelessWidget {
     }
 
     if (card.conditions.isNotEmpty) {
-      bool showCardByConditions = false;
+      bool showCardByConditions = true;
       for (var condition in card.conditions) {
         Entity conditionEntity = HomeAssistant().entities.get(condition['entity']);
         if (conditionEntity != null &&
-            (condition['state'] != null && conditionEntity.state == condition['state']) ||
-            (condition['state_not'] != null && conditionEntity.state != condition['state_not'])
+            ((condition['state'] != null && conditionEntity.state != condition['state']) ||
+            (condition['state_not'] != null && conditionEntity.state == condition['state_not']))
           ) {
-          showCardByConditions = true;
+          showCardByConditions = false;
+          break;
         }
       }
       if (!showCardByConditions) {
@@ -42,31 +43,39 @@ class CardWidget extends StatelessWidget {
 
     switch (card.type) {
 
-      case CardType.entities: {
+      case CardType.ENTITIES: {
         return _buildEntitiesCard(context);
       }
 
-      case CardType.glance: {
+      case CardType.GLANCE: {
         return _buildGlanceCard(context);
       }
 
-      case CardType.mediaControl: {
+      case CardType.MEDIA_CONTROL: {
         return _buildMediaControlsCard(context);
       }
 
-      case CardType.entityButton: {
+      case CardType.ENTITY_BUTTON: {
         return _buildEntityButtonCard(context);
       }
 
-      case CardType.markdown: {
+      case CardType.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) {
@@ -89,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) {
@@ -123,19 +132,17 @@ 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(0.0, 4.0, 0.0, 4.0),
-              child: EntityModel(
-                  entityWrapper: entity,
-                  handleTap: true,
-                  child: entity.entity.buildDefaultWidget(context)
-              ),
-            ));
-      }
+      body.add(
+          Padding(
+            padding: EdgeInsets.fromLTRB(0.0, 4.0, 0.0, 4.0),
+            child: EntityModel(
+                entityWrapper: entity,
+                handleTap: true,
+                child: entity.entity.buildDefaultWidget(context)
+            ),
+          ));
     });
     return Card(
         child: Padding(
@@ -150,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(
@@ -162,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(
@@ -183,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))
                 )
             )
           ]
@@ -214,39 +221,51 @@ class CardWidget extends StatelessWidget {
       return Container(height: 0.0, width: 0.0,);
     }
     List<Widget> rows = [];
-    rows.add(CardHeaderWidget(name: card.name));
+    rows.add(CardHeader(name: card.name));
 
-    List<Widget> result = [];
     int columnsCount = entitiesToShow.length >= card.columnsCount ? card.columnsCount : entitiesToShow.length;
 
-    entitiesToShow.forEach((EntityWrapper entity) {
-      result.add(
-          FractionallySizedBox(
-            widthFactor: 1/columnsCount,
-            child: EntityModel(
-                entityWrapper: entity,
-                child: GlanceEntityContainer(
-                  showName: card.showName,
-                  showState: card.showState,
-                ),
-                handleTap: true
-            ),
-          )
-      );
-    });
     rows.add(
         Padding(
-          padding: EdgeInsets.fromLTRB(0.0, Sizes.rowPadding, 0.0, 2*Sizes.rowPadding),
-          child: Wrap(
-            //alignment: WrapAlignment.spaceAround,
-            runSpacing: Sizes.rowPadding*2,
-            children: result,
+          padding: EdgeInsets.only(bottom: Sizes.rowPadding, top: Sizes.rowPadding),
+          child: FractionallySizedBox(
+            widthFactor: 1,
+            child: LayoutBuilder(
+                builder: (BuildContext context, BoxConstraints constraints) {
+                  List<Widget> buttons = [];
+                  double buttonWidth = constraints.maxWidth / columnsCount;
+                  entitiesToShow.forEach((EntityWrapper entity) {
+                    buttons.add(
+                        SizedBox(
+                          width: buttonWidth,
+                          child: EntityModel(
+                              entityWrapper: entity,
+                              child: GlanceCardEntityContainer(
+                                showName: card.showName,
+                                showState: card.showState,
+                              ),
+                              handleTap: true
+                          ),
+                        )
+                    );
+                  });
+                  return Wrap(
+                    //spacing: 5.0,
+                    //alignment: WrapAlignment.spaceEvenly,
+                    runSpacing: Sizes.doubleRowPadding,
+                    children: buttons,
+                  );
+                }
+            ),
           ),
         )
     );
 
     return Card(
-        child: new Column(mainAxisSize: MainAxisSize.min, children: rows)
+        child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: rows
+        )
     );
   }
 
@@ -266,7 +285,43 @@ class CardWidget extends StatelessWidget {
     return Card(
         child: EntityModel(
             entityWrapper: card.linkedEntityWrapper,
-            child: ButtonEntityContainer(),
+            child: EntityButtonCardBody(
+              showName: card.showName,
+            ),
+            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
         )
     );
@@ -274,7 +329,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>[
@@ -305,4 +360,4 @@ class CardWidget extends StatelessWidget {
     );
   }
 
-}
+}

lib/cards/widgets/card_header.widget.dart

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

lib/cards/widgets/entity_button_card_body.widget.dart

@@ -0,0 +1,56 @@
+part of '../../main.dart';
+
+class EntityButtonCardBody extends StatelessWidget {
+
+  final bool showName;
+
+  EntityButtonCardBody({
+    Key key, this.showName: true,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
+    if (entityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
+      return MissedEntityWidget();
+    }
+    if (entityWrapper.entity.statelessType > StatelessEntityType.MISSED) {
+      return Container(width: 0.0, height: 0.0,);
+    }
+
+    return InkWell(
+      onTap: () => entityWrapper.handleTap(),
+      onLongPress: () => entityWrapper.handleHold(),
+      child: FractionallySizedBox(
+        widthFactor: 1,
+        child: Column(
+          children: <Widget>[
+            LayoutBuilder(
+                builder: (BuildContext context, BoxConstraints constraints) {
+                  return EntityIcon(
+                    padding: EdgeInsets.fromLTRB(2.0, 6.0, 2.0, 2.0),
+                    size: constraints.maxWidth / 2.5,
+                  );
+                }
+            ),
+            _buildName()
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildName() {
+    if (showName) {
+      return EntityName(
+        padding: EdgeInsets.fromLTRB(Sizes.buttonPadding, 0.0, Sizes.buttonPadding, Sizes.rowPadding),
+        textOverflow: TextOverflow.ellipsis,
+        maxLines: 3,
+        wordsWrap: true,
+        textAlign: TextAlign.center,
+        fontSize: Sizes.nameFontSize,
+      );
+    }
+    return Container(width: 0, height: 0);
+  }
+}

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

@@ -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 verticalStack = "vertical-stack";
-  static const entities = "entities";
-  static const glance = "glance";
-  static const mediaControl = "media-control";
-  static const weatherForecast = "weather-forecast";
-  static const thermostat = "thermostat";
-  static const sensor = "sensor";
-  static const plantStatus = "plant-status";
-  static const pictureEntity = "picture-entity";
-  static const pictureElements = "picture-elements";
-  static const picture = "picture";
-  static const map = "map";
-  static const iframe = "iframe";
-  static const gauge = "gauge";
-  static const entityButton = "entity-button";
-  static const conditional = "conditional";
-  static const alarmPanel = "alarm-panel";
-  static const markdown = "markdown";
+  static const HORIZONTAL_STACK = "horizontal-stack";
+  static const VERTICAL_STACK = "vertical-stack";
+  static const ENTITIES = "entities";
+  static const GLANCE = "glance";
+  static const MEDIA_CONTROL = "media-control";
+  static const WEATHER_FORECAST = "weather-forecast";
+  static const THERMOSTAT = "thermostat";
+  static const SENSOR = "sensor";
+  static const PLANT_STATUS = "plant-status";
+  static const PICTURE_ENTITY = "picture-entity";
+  static const PICTURE_ELEMENTS = "picture-elements";
+  static const PICTURE = "picture";
+  static const MAP = "map";
+  static const IFRAME = "iframe";
+  static const GAUGE = "gauge";
+  static const ENTITY_BUTTON = "entity-button";
+  static const CONDITIONAL = "conditional";
+  static const ALARM_PANEL = "alarm-panel";
+  static const MARKDOWN = "markdown";
+  static const LIGHT = "light";
+}
+
+class Sizes {
+  static const rightWidgetPadding = 10.0;
+  static const leftWidgetPadding = 10.0;
+  static const buttonPadding = 4.0;
+  static const extendedWidgetHeight = 50.0;
+  static const iconSize = 28.0;
+  static const largeIconSize = 46.0;
+  static const stateFontSize = 15.0;
+  static const nameFontSize = 15.0;
+  static const smallFontSize = 14.0;
+  static const largeFontSize = 24.0;
+  static const inputWidth = 160.0;
+  static const rowPadding = 10.0;
+  static const doubleRowPadding = rowPadding*2;
+  static const minViewColumnWidth = 350;
+  static const entityPageMaxWidth = 400.0;
+  static const mainPageScreenSeparatorWidth = 5.0;
+  static const tabletMinWidth = minViewColumnWidth + entityPageMaxWidth + 5;
 }

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

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

lib/entities/badge.widget.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../main.dart';
 
 class BadgeWidget extends StatelessWidget {
   @override
@@ -57,7 +57,7 @@ class BadgeWidget extends StatelessWidget {
           } else if (entityModel.entityWrapper.entity.displayState.length <= 10) {
             stateFontSize = 8.0;
           }
-          onBadgeTextValue = entityModel.entityWrapper.entity.unitOfMeasurement;
+          onBadgeTextValue = entityModel.entityWrapper.unitOfMeasurement;
           badgeIcon = Center(
             child: Text(
               "${entityModel.entityWrapper.entity.displayState}",
@@ -140,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/camera/widgets/camera_stream_view.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class CameraStreamView extends StatefulWidget {
 
@@ -20,21 +20,9 @@ class _CameraStreamViewState extends State<CameraStreamView> {
   String streamUrl = "";
 
   launchStream() {
-    Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => WebviewScaffold(
-            url: "$streamUrl",
-            withZoom: true,
-            appBar: new AppBar(
-              leading: IconButton(
-                  icon: Icon(Icons.close),
-                  onPressed: () => Navigator.pop(context)
-              ),
-              title: new Text("${_entity.displayName}"),
-            ),
-          ),
-        )
+    Launcher.launchURLInCustomTab(
+      context: context,
+      url: streamUrl
     );
   }
 
@@ -47,7 +35,7 @@ class _CameraStreamViewState extends State<CameraStreamView> {
           .entity;
       started = true;
     }
-    streamUrl = '${Connection().httpWebHost}/api/camera_proxy_stream/${_entity
+    streamUrl = '${ConnectionManager().httpWebHost}/api/camera_proxy_stream/${_entity
         .entityId}?token=${_entity.attributes['access_token']}';
     return Column(
       children: <Widget>[

lib/entities/climate/widgets/climate_controls.dart

@@ -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,7 +121,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpTargetHumidity = value.roundToDouble();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_humidity", entity.entityId,{"humidity": "$_tmpTargetHumidity"}));
+      ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_humidity",
+          entityId: entity.entityId,
+          data: {"humidity": "$_tmpTargetHumidity"}
+        );
       _resetStateTimer(entity);
     });
   }
@@ -120,7 +135,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpHVACMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_hvac_mode", entity.entityId,{"hvac_mode": "$_tmpHVACMode"}));
+      ConnectionManager().callService(
+          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,7 +163,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpFanMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_fan_mode", entity.entityId,{"fan_mode": "$_tmpFanMode"}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_fan_mode", entityId: entity.entityId, data: {"fan_mode": "$_tmpFanMode"});
       _resetStateTimer(entity);
     });
   }
@@ -147,7 +172,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpPresetMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_preset_mode", entity.entityId,{"preset_mode": "$_tmpPresetMode"}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_preset_mode", entityId: entity.entityId, data: {"preset_mode": "$_tmpPresetMode"});
       _resetStateTimer(entity);
     });
   }
@@ -165,7 +190,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpAuxHeat = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_aux_heat", entity.entityId, {"aux_heat": "$_tmpAuxHeat"}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_aux_heat", entityId: entity.entityId, data: {"aux_heat": "$_tmpAuxHeat"});
       _resetStateTimer(entity);
     });
   }
@@ -408,53 +433,4 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     super.dispose();
   }
 
-}
-
-class TemperatureControlWidget extends StatelessWidget {
-  final double value;
-  final double fontSize;
-  final Color fontColor;
-  final onInc;
-  final onDec;
-
-  TemperatureControlWidget(
-      {Key key,
-        @required this.value,
-        @required this.onInc,
-        @required this.onDec,
-        this.fontSize,
-        this.fontColor})
-      : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.center,
-      children: <Widget>[
-        Text(
-          "$value",
-          style: TextStyle(
-              fontSize: fontSize ?? 24.0,
-              color: fontColor ?? Colors.black
-          ),
-        ),
-        Column(
-          children: <Widget>[
-            IconButton(
-              icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
-                  'mdi:chevron-up')),
-              iconSize: 30.0,
-              onPressed: () => onInc(),
-            ),
-            IconButton(
-              icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
-                  'mdi:chevron-down')),
-              iconSize: 30.0,
-              onPressed: () => onDec(),
-            )
-          ],
-        )
-      ],
-    );
-  }
 }

lib/entities/climate/widgets/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/widgets/cover_controls.widget.dart

@@ -18,7 +18,7 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
     setState(() {
       _tmpPosition = position.roundToDouble();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_cover_position", entity.entityId,{"position": _tmpPosition.round()}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_cover_position", entityId: entity.entityId, data: {"position": _tmpPosition.round()});
     });
   }
 
@@ -26,7 +26,7 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
     setState(() {
       _tmpTiltPosition = position.roundToDouble();
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_cover_tilt_position", entity.entityId,{"tilt_position": _tmpTiltPosition.round()}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_cover_tilt_position", entityId: entity.entityId, data: {"tilt_position": _tmpTiltPosition.round()});
     });
   }
 
@@ -135,18 +135,18 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
 
 class CoverTiltControlsWidget extends StatelessWidget {
   void _open(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "open_cover_tilt", entity.entityId, null));
+    ConnectionManager().callService(
+        domain: entity.domain, service: "open_cover_tilt", entityId: entity.entityId);
   }
 
   void _close(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "close_cover_tilt", entity.entityId, null));
+    ConnectionManager().callService(
+        domain: entity.domain, service: "close_cover_tilt", entityId: entity.entityId);
   }
 
   void _stop(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "stop_cover_tilt", entity.entityId, null));
+    ConnectionManager().callService(
+        domain: entity.domain, service: "stop_cover_tilt", entityId: entity.entityId);
   }
 
   @override

lib/entities/cover/widgets/cover_state.dart

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

lib/entities/date_time/date_time_entity.class.dart

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

lib/entities/default_entity_container.widget.dart

@@ -34,32 +34,37 @@ class DefaultEntityContainer extends StatelessWidget {
         ],
       );
     }
-    return InkWell(
-      onLongPress: () {
-        if (entityModel.handleTap) {
-          entityModel.entityWrapper.handleHold();
-        }
-      },
-      onTap: () {
-        if (entityModel.handleTap) {
-          entityModel.entityWrapper.handleTap();
-        }
-      },
-      child: Row(
-        mainAxisSize: MainAxisSize.max,
-        children: <Widget>[
-          EntityIcon(),
+    Widget result = Row(
+      mainAxisSize: MainAxisSize.max,
+      children: <Widget>[
+        EntityIcon(),
 
-          Flexible(
-            fit: FlexFit.tight,
-            flex: 3,
-            child: EntityName(
-              padding: EdgeInsets.fromLTRB(10.0, 2.0, 10.0, 2.0),
-            ),
+        Flexible(
+          fit: FlexFit.tight,
+          flex: 3,
+          child: EntityName(
+            padding: EdgeInsets.fromLTRB(10.0, 2.0, 10.0, 2.0),
           ),
-          state
-        ],
-      ),
+        ),
+        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

@@ -153,7 +153,7 @@ class Entity {
     domain = rawData["entity_id"].split(".")[0];
     entityId = rawData["entity_id"];
     deviceClass = attributes["device_class"];
-    state = rawData["state"];
+    state = rawData["state"] is bool ? (rawData["state"] ? EntityState.on : EntityState.off) : rawData["state"];
     displayState = Entity.StateByDeviceClass["$deviceClass.$state"] ?? (state.toLowerCase() == 'unknown' ? '-' : state);
     _lastUpdated = DateTime.tryParse(rawData["last_updated"]);
     entityPicture = _getEntityPictureUrl(webHost);
@@ -211,31 +211,6 @@ class Entity {
     );
   }
 
-  Widget buildEntityPageWidget(BuildContext context) {
-    return EntityModel(
-      entityWrapper: EntityWrapper(entity: this),
-      child: EntityPageContainer(children: <Widget>[
-        Padding(
-          padding: EdgeInsets.only(top: Sizes.rowPadding, left: Sizes.leftWidgetPadding),
-          child: DefaultEntityContainer(state: _buildStatePartForPage(context)),
-        ),
-        LastUpdatedWidget(),
-        Divider(),
-        _buildAdditionalControlsForPage(context),
-        Divider(),
-        buildHistoryWidget(),
-        EntityAttributesList()
-      ]),
-      handleTap: false,
-    );
-  }
-
-  Widget buildHistoryWidget() {
-    return EntityHistoryWidget(
-      config: historyConfig,
-    );
-  }
-
   Widget buildBadgeWidget(BuildContext context) {
     return EntityModel(
       entityWrapper: EntityWrapper(entity: this),

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_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(
-            ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
+        ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
         break;
       }
 
       case EntityUIAction.callService: {
         if (uiAction.tapService != null) {
-          eventBus.fire(
-              ServiceCallEvent(uiAction.tapService.split(".")[0],
-                  uiAction.tapService.split(".")[1], null,
-                  uiAction.tapServiceData));
+          ConnectionManager().callService(
+            domain: uiAction.tapService.split(".")[0],
+            service: uiAction.tapService.split(".")[1],
+            data: uiAction.tapServiceData
+          );
         }
         break;
       }
@@ -51,16 +53,16 @@ class EntityWrapper {
 
       case EntityUIAction.moreInfo: {
         eventBus.fire(
-            new ShowEntityPageEvent(entity));
+            new ShowEntityPageEvent(entity: entity));
         break;
       }
 
       case EntityUIAction.navigate: {
-        if (uiAction.tapService.startsWith("/")) {
+        if (uiAction.tapService != null && uiAction.tapService.startsWith("/")) {
           //TODO handle local urls
           Logger.w("Local urls is not supported yet");
         } else {
-          HAUtils.launchURL(uiAction.tapService);
+          Launcher.launchURL(uiAction.tapService);
         }
         break;
       }
@@ -74,33 +76,33 @@ class EntityWrapper {
   void handleHold() {
       switch (uiAction.holdAction) {
         case EntityUIAction.toggle: {
-          eventBus.fire(
-              ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
+          ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
           break;
         }
 
         case EntityUIAction.callService: {
           if (uiAction.holdService != null) {
-            eventBus.fire(
-                ServiceCallEvent(uiAction.holdService.split(".")[0],
-                    uiAction.holdService.split(".")[1], null,
-                    uiAction.holdServiceData));
+            ConnectionManager().callService(
+              domain: uiAction.holdService.split(".")[0],
+              service: uiAction.holdService.split(".")[1],
+              data: uiAction.holdServiceData
+            );
           }
           break;
         }
 
         case EntityUIAction.moreInfo: {
           eventBus.fire(
-              new ShowEntityPageEvent(entity));
+              new ShowEntityPageEvent(entity: entity));
           break;
         }
 
         case EntityUIAction.navigate: {
-          if (uiAction.holdService.startsWith("/")) {
+          if (uiAction.holdService != null && uiAction.holdService.startsWith("/")) {
             //TODO handle local urls
             Logger.w("Local urls is not supported yet");
           } else {
-            HAUtils.launchURL(uiAction.holdService);
+            Launcher.launchURL(uiAction.holdService);
           }
           break;
         }

lib/entities/fan/widgets/fan_controls.dart

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

lib/entities/flat_service_button.widget.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../main.dart';
 
 class FlatServiceButton extends StatelessWidget {
 
@@ -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/light/widgets/light_color_picker.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class LightColorPicker extends StatefulWidget {
 
@@ -27,7 +27,6 @@ class LightColorPickerState extends State<LightColorPicker> {
     List<Widget> colorRows = [];
     Border border;
     bool isSomethingSelected = false;
-    Logger.d("Current colotfor picker: [${widget.color.hue}, ${widget.color.saturation}]");
     for (double saturation = 1.0; saturation >= (0.0 + widget.saturationStep); saturation = double.parse((saturation - widget.saturationStep).toStringAsFixed(2))) {
       List<Widget> rowChildren = [];
       //Logger.d("$saturation");

lib/entities/light/widgets/light_controls.dart

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

lib/entities/lock/widgets/lock_state.dart

@@ -7,11 +7,11 @@ class LockStateWidget extends StatelessWidget {
   const LockStateWidget({Key key, this.assumedState: false}) : super(key: key);
 
   void _lock(Entity entity) {
-    eventBus.fire(new ServiceCallEvent("lock", "lock", entity.entityId, null));
+    ConnectionManager().callService(domain: "lock", service: "lock", entityId: entity.entityId);
   }
 
   void _unlock(Entity entity) {
-    eventBus.fire(new ServiceCallEvent("lock", "unlock", entity.entityId, null));
+    ConnectionManager().callService(domain: "lock", service: "unlock", entityId: entity.entityId);
   }
 
   @override

lib/entities/media_player/media_player_entity.class.dart

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

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

@@ -0,0 +1,46 @@
+part of '../../../main.dart';
+
+class MediaPlayerProgressBar extends StatefulWidget {
+  @override
+  _MediaPlayerProgressBarState createState() => _MediaPlayerProgressBarState();
+}
+
+class _MediaPlayerProgressBarState extends State<MediaPlayerProgressBar> {
+
+  Timer _timer;
+
+  @override
+  initState() {
+    super.initState();
+    _timer = Timer.periodic(Duration(seconds: 1), (_) {
+      setState(() {
+      });
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final EntityModel entityModel = EntityModel.of(context);
+    final MediaPlayerEntity entity = entityModel.entityWrapper.entity;
+    double progress = 0;
+    int currentPosition;
+    if (entity.canCalculateActualPosition()) {
+      currentPosition = entity.getActualPosition().toInt();
+      if (currentPosition > 0) {
+          progress = (currentPosition <= entity.durationSeconds) ? currentPosition / entity.durationSeconds : 100;
+      }
+    }
+    return LinearProgressIndicator(
+      value: progress,
+      backgroundColor: Colors.black45,
+      valueColor: AlwaysStoppedAnimation<Color>(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,7 +1,7 @@
 part of '../../../main.dart';
 
 class MediaPlayerWidget extends StatelessWidget {
-  
+
   @override
   Widget build(BuildContext context) {
     final EntityModel entityModel = EntityModel.of(context);
@@ -26,7 +26,7 @@ class MediaPlayerWidget extends StatelessWidget {
                 bottom: 0.0,
                 left: 0.0,
                 right: 0.0,
-                child: MediaPlayerProgressWidget()
+                child: MediaPlayerProgressBar()
             )
           ],
         ),
@@ -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");
-        eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_on", entity.entityId,
-            null));
+        ConnectionManager().callService(
+            domain: entity.domain,
+            service: "turn_on",
+            entityId: entity.entityId
+          );
       } else {
-        Logger.d("${entity.entityId} turn_off");
-        eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_off", entity.entityId,
-            null));
+        ConnectionManager().callService(
+            domain: entity.domain,
+            service: "turn_off",
+            entityId: entity.entityId
+          );
       }
-    }
   }
 
   void _callAction(MediaPlayerEntity entity, String action) {
     Logger.d("${entity.entityId} $action");
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "$action", entity.entityId,
-        null));
+    ConnectionManager().callService(
+        domain: entity.domain,
+        service: "$action",
+        entityId: entity.entityId
+      );
   }
 
   @override
@@ -229,7 +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,47 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
             )
         );
       }
-
+      if (entity.state == EntityState.playing || entity.state == EntityState.paused) {
+        children.add(
+            ButtonBar(
+              children: <Widget>[
+                RaisedButton(
+                  child: Text("Duplicate to"),
+                  color: Colors.blue,
+                  textColor: Colors.white,
+                  onPressed: () => _duplicateTo(entity),
+                ),
+                RaisedButton(
+                  child: Text("Switch to"),
+                  color: Colors.blue,
+                  textColor: Colors.white,
+                  onPressed: () => _switchTo(entity),
+                )
+              ],
+            )
+        );
+      }
     }
     return Column(
       children: children,
     );
   }
 
-}
-
-class MediaPlayerProgressWidget extends StatefulWidget {
-  @override
-  _MediaPlayerProgressWidgetState createState() => _MediaPlayerProgressWidgetState();
-}
-
-class _MediaPlayerProgressWidgetState extends State<MediaPlayerProgressWidget> {
-
-  Timer _timer;
-
-  @override
-  Widget build(BuildContext context) {
-    final EntityModel entityModel = EntityModel.of(context);
-    final MediaPlayerEntity entity = entityModel.entityWrapper.entity;
-    double progress;
-    try {
-      DateTime lastUpdated = DateTime.parse(
-          entity.attributes["media_position_updated_at"]).toLocal();
-      Duration duration = Duration(seconds: entity._getIntAttributeValue("media_duration") ?? 1);
-      Duration position = Duration(seconds: entity._getIntAttributeValue("media_position") ?? 0);
-      int currentPosition = position.inSeconds;
-      if (entity.state == EntityState.playing) {
-        _timer?.cancel();
-        _timer = Timer(Duration(seconds: 1), () {
-          setState(() {
-          });
-        });
-        int differenceInSeconds = DateTime
-            .now()
-            .difference(lastUpdated)
-            .inSeconds;
-        currentPosition = currentPosition + differenceInSeconds;
-      } else {
-        _timer?.cancel();
-      }
-      progress = currentPosition / duration.inSeconds;
-      return LinearProgressIndicator(
-        value: progress,
-        backgroundColor: Colors.black45,
-        valueColor: AlwaysStoppedAnimation<Color>(EntityColor.stateColor(EntityState.on)),
-      );
-    } catch (e) {
-      _timer?.cancel();
-      progress = 0.0;
+  void _duplicateTo(entity) {
+    if (entity.canCalculateActualPosition()) {
+        HomeAssistant().savedPlayerPosition = entity.getActualPosition().toInt();
+    } else {
+        HomeAssistant().savedPlayerPosition = 0;
     }
-    return LinearProgressIndicator(
-      value: progress,
-      backgroundColor: Colors.black45,
-    );
+    Navigator.of(context).pushNamed("/play-media", arguments: {
+        "url": entity.attributes["media_content_id"],
+        "type": entity.attributes["media_content_type"]
+      });
   }
 
-  @override
-  void dispose() {
-    _timer?.cancel();
-    super.dispose();
+  void _switchTo(entity) {
+    HomeAssistant().sendFromPlayerId = entity.entityId;
+    _duplicateTo(entity);
   }
 
 }

lib/entities/select/widgets/select_state.dart

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

lib/entities/simple_state.widget.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../main.dart';
 
 class SimpleEntityState extends StatelessWidget {
 
@@ -7,8 +7,10 @@ class SimpleEntityState extends StatelessWidget {
   final EdgeInsetsGeometry padding;
   final int maxLines;
   final String customValue;
+  final 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/widgets/slider_controls.dart

@@ -18,8 +18,12 @@ class _SliderControlsWidgetState extends State<SliderControlsWidget> {
       _newValue = newValue;
       _changedHere = true;
     });
-    eventBus.fire(new ServiceCallEvent(domain, "set_value", entityId,
-        {"value": "${newValue.toString()}"}));
+    ConnectionManager().callService(
+      domain: domain,
+      service: "set_value",
+      entityId: entityId,
+      data: {"value": "${newValue.toString()}"}
+    );
   }
 
   @override

lib/entities/switch/widget/switch_state.dart

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

lib/entities/text/widgets/text_input_state.dart

@@ -26,8 +26,12 @@ class _TextInputStateWidgetState extends State<TextInputStateWidget> {
 
   void setNewState(newValue, domain, entityId) {
     if (validate(newValue, _minLength, _maxLength)) {
-      eventBus.fire(new ServiceCallEvent(domain, "set_value", entityId,
-          {"value": "$newValue"}));
+      ConnectionManager().callService(
+        domain: domain,
+        service: "set_value",
+        entityId: entityId,
+        data: {"value": "$newValue"}
+      );
     } else {
       setState(() {
         _tmpValue = _entityState;
@@ -73,13 +77,7 @@ class _TextInputStateWidgetState extends State<TextInputStateWidget> {
         child: TextField(
             focusNode: _focusNode,
             obscureText: entity.isPasswordField,
-            controller: new TextEditingController.fromValue(
-                new TextEditingValue(
-                    text: _tmpValue,
-                    selection:
-                    new TextSelection.collapsed(offset: _tmpValue.length)
-                )
-            ),
+            controller: TextEditingController.fromValue(TextEditingValue(text: _tmpValue)),
             onChanged: (value) {
               _tmpValue = value;
             }),

lib/entities/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,
+      ),
+    );
+
+  }
+}

lib/entities/vacuum/widgets/vacuum_state_button.dart

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

lib/entity_collection.class.dart

@@ -101,6 +101,9 @@ class EntityCollection {
       case "timer": {
         return TimerEntity(rawEntityData, homeAssistantWebHost);
       }
+      case "vacuum": {
+        return VacuumEntity(rawEntityData, homeAssistantWebHost);
+      }
       default: {
         return Entity(rawEntityData, homeAssistantWebHost);
       }
@@ -149,6 +152,13 @@ class EntityCollection {
     return _allEntities[entityId] != null;
   }
 
+  List<Entity> getByDomains({List<String> domains, List<String> stateFiler}) {
+    return _allEntities.values.where((entity) {
+      return domains.contains(entity.domain) &&
+          ((stateFiler != null && stateFiler.contains(entity.state)) || stateFiler == null);
+    }).toList();
+  }
+
   List<Entity> filterEntitiesForDefaultView() {
     List<Entity> result = [];
     List<Entity> groups = [];

lib/entity_widgets/button_entity_container.dart

@@ -1,50 +0,0 @@
-part of '../main.dart';
-
-class ButtonEntityContainer extends StatelessWidget {
-
-  ButtonEntityContainer({
-    Key key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
-    if (entityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
-      return MissedEntityWidget();
-    }
-    if (entityWrapper.entity.statelessType > StatelessEntityType.MISSED) {
-      return Container(width: 0.0, height: 0.0,);
-    }
-    return InkWell(
-      onTap: () => entityWrapper.handleTap(),
-      onLongPress: () => entityWrapper.handleHold(),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: <Widget>[
-          FractionallySizedBox(
-            widthFactor: 0.4,
-            child: FittedBox(
-                fit: BoxFit.fitHeight,
-                child: EntityIcon(
-                  padding: EdgeInsets.fromLTRB(2.0, 6.0, 2.0, 2.0),
-                  size: Sizes.iconSize,
-                )
-            ),
-          ),
-          _buildName()
-        ],
-      ),
-    );
-  }
-
-  Widget _buildName() {
-    return EntityName(
-      padding: EdgeInsets.fromLTRB(Sizes.buttonPadding, 0.0, Sizes.buttonPadding, Sizes.rowPadding),
-      textOverflow: TextOverflow.ellipsis,
-      maxLines: 3,
-      wordsWrap: true,
-      textAlign: TextAlign.center,
-      fontSize: Sizes.nameFontSize,
-    );
-  }
-}

lib/entity_widgets/entity_page_container.dart

@@ -1,14 +0,0 @@
-part of '../main.dart';
-
-class EntityPageContainer extends StatelessWidget {
-  EntityPageContainer({Key key, @required this.children}) : super(key: key);
-
-  final List<Widget> children;
-
-  @override
-  Widget build(BuildContext context) {
-    return ListView(
-      children: children,
-    );
-  }
-}

lib/home_assistant.class.dart

@@ -11,8 +11,13 @@ class HomeAssistant {
   EntityCollection entities;
   HomeAssistantUI ui;
   Map _instanceConfig = {};
+  Map services;
   String _userName;
+  bool childMode;
   HSVColor savedColor;
+  int savedPlayerPosition;
+  String sendToPlayerId;
+  String sendFromPlayerId;
 
   String fcmToken;
 
@@ -23,7 +28,7 @@ class HomeAssistant {
   Duration fetchTimeout = Duration(seconds: 30);
 
   String get locationName {
-    if (Connection().useLovelace) {
+    if (ConnectionManager().useLovelace) {
       return ui?.title ?? "";
     } else {
       return _instanceConfig["location_name"] ?? "";
@@ -36,8 +41,8 @@ class HomeAssistant {
   bool get isMobileAppEnabled => _instanceConfig["components"] != null && (_instanceConfig["components"] as List).contains("mobile_app");
 
   HomeAssistant._internal() {
-    Connection().onStateChangeCallback = _handleEntityStateChange;
-    Device().loadDeviceInfo();
+    ConnectionManager().onStateChangeCallback = _handleEntityStateChange;
+    DeviceInfoManager().loadDeviceInfo();
   }
 
   Completer _fetchCompleter;
@@ -47,28 +52,24 @@ class HomeAssistant {
       Logger.w("Previous data fetch is not completed yet");
       return _fetchCompleter.future;
     }
-    if (entities == null) entities = EntityCollection(Connection().httpWebHost);
+    if (entities == null) entities = EntityCollection(ConnectionManager().httpWebHost);
     _fetchCompleter = Completer();
     List<Future> futures = [];
     futures.add(_getStates());
-    if (Connection().useLovelace) {
+    if (ConnectionManager().useLovelace) {
       futures.add(_getLovelace());
     }
     futures.add(_getConfig());
     futures.add(_getServices());
     futures.add(_getUserInfo());
     futures.add(_getPanels());
-    futures.add(Connection().sendSocketMessage(
-      type: "subscribe_events",
-      additionalData: {"event_type": "state_changed"},
-    ));
     Future.wait(futures).then((_) {
       if (isMobileAppEnabled) {
-        _createUI();
+        if (!childMode) _createUI();
         _fetchCompleter.complete();
-        checkAppRegistration();
+        MobileAppIntegrationManager.checkAppRegistration();
       } else {
-        _fetchCompleter.completeError(HAError("Mobile app component not found", actions: [HAErrorAction.tryAgain(), HAErrorAction(type: HAErrorActionType.URL ,title: "Help",url: "http://ha-client.homemade.systems/docs#mobile-app")]));
+        _fetchCompleter.completeError(HAError("Mobile app component not found", actions: [HAErrorAction.tryAgain(), HAErrorAction(type: HAErrorActionType.URL ,title: "Help",url: "http://ha-client.homemade.systems/docs#mobile-app-integration")]));
       }
     }).catchError((e) {
       _fetchCompleter.completeError(e);
@@ -78,133 +79,15 @@ class HomeAssistant {
 
   Future logout() async {
     Logger.d("Logging out...");
-    await Connection().logout().then((_) {
+    await ConnectionManager().logout().then((_) {
       ui?.clear();
       entities?.clear();
       panels?.clear();
     });
   }
 
-  Map _getAppRegistrationData() {
-    return {
-      "app_version": "$appVersion",
-      "device_name": "$userName's ${Device().model}",
-      "manufacturer": Device().manufacturer,
-      "model": Device().model,
-      "os_version": Device().osVersion,
-      "app_data": {
-        "push_token": "$fcmToken",
-        "push_url": "https://us-central1-ha-client-c73c4.cloudfunctions.net/sendPushNotification"
-      }
-    };
-  }
-
-  Future checkAppRegistration({bool forceRegister: false, bool showOkDialog: false}) {
-    Completer completer = Completer();
-    if (Connection().webhookId == null || forceRegister) {
-      Logger.d("Mobile app was not registered yet or need to be reseted. Registering...");
-      var registrationData = _getAppRegistrationData();
-      registrationData.addAll({
-        "app_id": "ha_client",
-        "app_name": "$appName",
-        "os_name": Device().osName,
-        "supports_encryption": false,
-      });
-      Connection().sendHTTPPost(
-              endPoint: "/api/mobile_app/registrations",
-              includeAuthHeader: true,
-              data: json.encode(registrationData)
-          ).then((response) {
-            Logger.d("Processing registration responce...");
-            var responseObject = json.decode(response);
-            SharedPreferences.getInstance().then((prefs) {
-              prefs.setString("app-webhook-id", responseObject["webhook_id"]);
-              Connection().webhookId = responseObject["webhook_id"];
-              completer.complete();
-              eventBus.fire(ShowPopupDialogEvent(
-                title: "Mobile app Integration was created",
-                body: "HA Client was registered as MobileApp in your Home Assistant. To start using notifications you need to restart your Home Assistant",
-                positiveText: "Restart now",
-                negativeText: "Later",
-                onPositive: () {
-                  Connection().callService(domain: "homeassistant", service: "restart", entityId: null);
-                },
-              ));
-            });
-          }).catchError((e) {
-            completer.complete();
-            Logger.e("Error registering the app: ${e.toString()}");
-          });
-      return completer.future;
-    } else {
-      Logger.d("App was previously registered. Checking...");
-      var updateData = {
-        "type": "update_registration",
-        "data": _getAppRegistrationData()
-      };
-      Connection().sendHTTPPost(
-          endPoint: "/api/webhook/${Connection().webhookId}",
-          includeAuthHeader: false,
-          data: json.encode(updateData)
-      ).then((response) {
-        if (response == null || response.isEmpty) {
-          Logger.d("No registration data in response. MobileApp integration was removed");
-          _askToRegisterApp();
-        } else {
-          Logger.d("App registration works fine");
-          if (showOkDialog) {
-            eventBus.fire(ShowPopupDialogEvent(
-                title: "All good",
-                body: "HA Client integration with your Home Assistant server works fine",
-                positiveText: "Nice!",
-                negativeText: "Ok"
-            ));
-          }
-        }
-        completer.complete();
-      }).catchError((e) {
-        if (e['code'] != null && e['code'] == 410) {
-          Logger.e("MobileApp integration was removed");
-          _askToRegisterApp();
-        } else {
-          Logger.e("Error updating app registration: ${e.toString()}");
-          eventBus.fire(ShowPopupDialogEvent(
-            title: "App integration is not working properly",
-            body: "Something wrong with HA Client integration on your Home Assistant server. Please report this issue.",
-            positiveText: "Report to GitHub",
-            negativeText: "Report to Discord",
-            onPositive: () {
-              HAUtils.launchURL("https://github.com/estevez-dev/ha_client/issues/new");
-            },
-            onNegative: () {
-              HAUtils.launchURL("https://discord.gg/AUzEvwn");
-            },
-          ));
-        }
-        completer.complete();
-      });
-      return completer.future;
-    }
-  }
-
-  void _askToRegisterApp() {
-    eventBus.fire(ShowPopupDialogEvent(
-      title: "App integration was removed",
-      body: "Looks like app integration was removed from your Home Assistant. HA Client needs to be registered on your Home Assistant server to make it possible to use notifications and other useful stuff.",
-      positiveText: "Register now",
-      negativeText: "Cancel",
-      onPositive: () {
-        SharedPreferences.getInstance().then((prefs) {
-          prefs.remove("app-webhook-id");
-          Connection().webhookId = null;
-          HomeAssistant().checkAppRegistration();
-        });
-      },
-    ));
-  }
-
   Future _getConfig() async {
-    await Connection().sendSocketMessage(type: "get_config").then((data) {
+    await ConnectionManager().sendSocketMessage(type: "get_config").then((data) {
       _instanceConfig = Map.from(data);
     }).catchError((e) {
       throw HAError("Error getting config: ${e}");
@@ -212,35 +95,51 @@ class HomeAssistant {
   }
 
   Future _getStates() async {
-    await Connection().sendSocketMessage(type: "get_states").then(
+    await ConnectionManager().sendSocketMessage(type: "get_states").then(
             (data) => entities.parse(data)
     ).catchError((e) {
       throw HAError("Error getting states: $e");
     });
   }
 
-  Future _getLovelace() async {
-    await Connection().sendSocketMessage(type: "lovelace/config").then((data) => _rawLovelaceData = data).catchError((e) {
-      throw HAError("Error getting lovelace config: $e");
+  Future _getLovelace() {
+    Completer completer = Completer();
+    ConnectionManager().sendSocketMessage(type: "lovelace/config").then((data) {
+      _rawLovelaceData = data;
+      completer.complete();
+    }).catchError((e) {
+      if ("$e" == "config_not_found") {
+        ConnectionManager().useLovelace = false;
+        completer.complete();
+      } else {
+        completer.completeError(HAError("Error getting lovelace config: $e"));
+      }
     });
+    return completer.future;
   }
 
   Future _getUserInfo() async {
     _userName = null;
-    await Connection().sendSocketMessage(type: "auth/current_user").then((data) => _userName = data["name"]).catchError((e) {
-      Logger.w("Can't get user info: ${e}");
+    await ConnectionManager().sendSocketMessage(type: "auth/current_user").then((data) {
+        _userName = data["name"];
+        childMode = _userName.startsWith("[child]");
+    }).catchError((e) {
+      Logger.w("Can't get user info: $e");
     });
   }
 
   Future _getServices() async {
-    await Connection().sendSocketMessage(type: "get_services").then((data) => Logger.d("Services received")).catchError((e) {
-      Logger.w("Can't get services: ${e}");
+    await ConnectionManager().sendSocketMessage(type: "get_services").then((data) {
+      Logger.d("Got ${data.length} services");
+      services = data;
+    }).catchError((e) {
+      Logger.w("Can't get services: $e");
     });
   }
 
   Future _getPanels() async {
     panels.clear();
-    await Connection().sendSocketMessage(type: "get_panels").then((data) {
+    await ConnectionManager().sendSocketMessage(type: "get_panels").then((data) {
       data.forEach((k,v) {
         String title = v['title'] == null ? "${k[0].toUpperCase()}${k.substring(1)}" : "${v['title'][0].toUpperCase()}${v['title'].substring(1)}";
         panels.add(Panel(
@@ -280,14 +179,23 @@ class HomeAssistant {
             count: viewCounter,
             id: "${rawView['id']}",
             name: rawView['title'],
-            iconName: rawView['icon']
+            iconName: rawView['icon'],
+            panel: rawView['panel'] ?? false,
         );
 
         if (rawView['badges'] != null && rawView['badges'] is List) {
           rawView['badges'].forEach((entity) {
-            if (entities.isExist(entity)) {
-              Entity e = entities.get(entity);
-              view.badges.add(e);
+            if (entity is String) {
+              if (entities.isExist(entity)) {
+                Entity e = entities.get(entity);
+                view.badges.add(e);
+              }
+            } else {
+              String eId = '${entity['entity']}';
+              if (entities.isExist(eId)) {
+                Entity e = entities.get(eId);
+                view.badges.add(e);
+              }
             }
           });
         }
@@ -309,20 +217,25 @@ class HomeAssistant {
         HACard card = HACard(
             id: "card",
             name: rawCardInfo["title"] ?? rawCardInfo["name"],
-            type: rawCardInfo['type'],
+            type: rawCardInfo['type'] ?? CardType.ENTITIES,
             columnsCount: rawCardInfo['columns'] ?? 4,
-            showName: rawCardInfo['show_name'] ?? true,
-            showState: rawCardInfo['show_state'] ?? true,
-            showEmpty: rawCardInfo['show_empty'] ?? true,
-            stateFilter: rawCardInfo['state_filter'] ?? [],
+            showName: (rawCardInfo['show_name'] ?? rawCard['show_name']) ?? true,
+            showState: (rawCardInfo['show_state'] ?? rawCard['show_state']) ?? true,
+            showEmpty: (rawCardInfo['show_empty'] ?? rawCard['show_empty']) ?? true,
+            stateFilter: (rawCard['state_filter'] ?? rawCardInfo['state_filter']) ?? [],
             states: rawCardInfo['states'],
             conditions: rawCard['conditions'] ?? [],
-            content: rawCardInfo['content']
+            content: rawCardInfo['content'],
+            min: rawCardInfo['min'] ?? 0,
+            max: rawCardInfo['max'] ?? 100,
+            unit: rawCardInfo['unit'],
+            severity: rawCardInfo['severity']
         );
         if (rawCardInfo["cards"] != null) {
           card.childCards = _createLovelaceCards(rawCardInfo["cards"]);
         }
-        rawCardInfo["entities"]?.forEach((rawEntity) {
+        var rawEntities = rawCard["entities"] ?? rawCardInfo["entities"];
+        rawEntities?.forEach((rawEntity) {
           if (rawEntity is String) {
             if (entities.isExist(rawEntity)) {
               card.entities.add(EntityWrapper(entity: entities.get(rawEntity)));
@@ -385,8 +298,9 @@ class HomeAssistant {
             }
           }
         });
-        if (rawCardInfo["entity"] != null) {
-          var en = rawCardInfo["entity"];
+        var rawSingleEntity = rawCard["entity"] ?? rawCardInfo["entity"];
+        if (rawSingleEntity != null) {
+          var en = rawSingleEntity;
           if (en is String) {
             if (entities.isExist(en)) {
               Entity e = entities.get(en);
@@ -423,7 +337,7 @@ class HomeAssistant {
 
   void _createUI() {
     ui = HomeAssistantUI();
-    if ((Connection().useLovelace) && (_rawLovelaceData != null)) {
+    if ((ConnectionManager().useLovelace) && (_rawLovelaceData != null)) {
       Logger.d("Creating Lovelace UI");
       _parseLovelace();
     } else {
@@ -472,7 +386,7 @@ class SendMessageQueue {
   void add(String message) {
     _queue.add(HAMessage(_messageTimeout, message));
   }
-  
+
   List<String> getActualMessages() {
     _queue.removeWhere((item) => item.isExpired());
     List<String> result = [];
@@ -482,22 +396,22 @@ class SendMessageQueue {
     this.clear();
     return result;
   }
-  
+
   void clear() {
     _queue.clear();
   }
-  
+
 }
 
 class HAMessage {
   DateTime _timeStamp;
   int _messageTimeout;
   String message;
-  
+
   HAMessage(this._messageTimeout, this.message) {
     _timeStamp = DateTime.now();
   }
-  
+
   bool isExpired() {
     return DateTime.now().difference(_timeStamp).inSeconds > _messageTimeout;
   }

lib/managers/auth_manager.class.dart

@@ -1,4 +1,4 @@
-part of 'main.dart';
+part of '../main.dart';
 
 class AuthManager {
 
@@ -9,24 +9,37 @@ class AuthManager {
   }
 
   AuthManager._internal();
+  StreamSubscription deepLinksSubscription;
 
-  Future getTempToken({String oauthUrl}) {
+  Future start({String oauthUrl}) {
     Completer completer = Completer();
-    final flutterWebviewPlugin = new FlutterWebviewPlugin();
-    flutterWebviewPlugin.onUrlChanged.listen((String url) {
-      if (url.startsWith("http://ha-client.homemade.systems/service/auth_callback.html")) {
-        String authCode = url.split("=")[1];
-        Logger.d("We have auth code. Getting temporary access token...");
-        Connection().sendHTTPPost(
+    deepLinksSubscription?.cancel();
+    deepLinksSubscription = getUriLinksStream().listen((Uri uri) {
+            Logger.d("[LINKED AUTH] We got something private");
+            _getTempToken(oauthUrl, uri.queryParameters["code"])
+              .then((tempToken) => completer.complete(tempToken))
+              .catchError((_){
+                completer.completeError(HAError("Auth error"));
+              });
+          }, onError: (err) {
+            Logger.e("[LINKED AUTH] Error handling linked auth: $e");
+            completer.completeError(HAError("Auth error"));
+          });
+    Logger.d("Launching OAuth");
+    eventBus.fire(StartAuthEvent(oauthUrl, true));
+    return completer.future;
+  }
+
+  Future _getTempToken(String oauthUrl,String authCode) {
+    Completer completer = Completer();
+    ConnectionManager().sendHTTPPost(
             endPoint: "/auth/token",
             contentType: "application/x-www-form-urlencoded",
             includeAuthHeader: false,
-            data: "grant_type=authorization_code&code=$authCode&client_id=${Uri.encodeComponent('http://ha-client.homemade.systems/')}"
+            data: "grant_type=authorization_code&code=$authCode&client_id=${Uri.encodeComponent('http://ha-client.homemade.systems')}"
         ).then((response) {
           Logger.d("Got temp token");
           String tempToken = json.decode(response)['access_token'];
-          Logger.d("Closing webview...");
-          //flutterWebviewPlugin.close();
           eventBus.fire(StartAuthEvent(oauthUrl, false));
           completer.complete(tempToken);
         }).catchError((e) {
@@ -35,10 +48,6 @@ class AuthManager {
           eventBus.fire(StartAuthEvent(oauthUrl, false));
           completer.completeError(HAError("Error getting temp token"));
         });
-      }
-    });
-    Logger.d("Launching OAuth");
-    eventBus.fire(StartAuthEvent(oauthUrl, true));
     return completer.future;
   }
 

lib/managers/connection_manager.class.dart

@@ -1,14 +1,14 @@
-part of 'main.dart';
+part of '../main.dart';
 
-class Connection {
+class ConnectionManager {
 
-  static final Connection _instance = Connection._internal();
+  static final ConnectionManager _instance = ConnectionManager._internal();
 
-  factory Connection() {
+  factory ConnectionManager() {
     return _instance;
   }
 
-  Connection._internal();
+  ConnectionManager._internal();
 
   String _domain;
   String _port;
@@ -54,21 +54,20 @@ class Connection {
         completer.completeError(HAError.checkConnectionSettings());
         stopInit = true;
       } else {
-        //_token = prefs.getString('hassio-token');
         final storage = new FlutterSecureStorage();
         try {
           _token = await storage.read(key: "hacl_llt");
           Logger.e("Long-lived token read successful");
+          oauthUrl = "$httpWebHost/auth/authorize?client_id=${Uri.encodeComponent(
+              'http://ha-client.homemade.systems')}&redirect_uri=${Uri
+              .encodeComponent(
+              'haclient://auth')}";
+          settingsLoaded = true;
         } catch (e) {
+          completer.completeError(HAError("Error reading login details", actions: [HAErrorAction.tryAgain(type: HAErrorActionType.FULL_RELOAD), HAErrorAction.loginAgain()]));
           Logger.e("Cannt read secure storage. Need to relogin.");
-          _token = null;
-          await storage.delete(key: "hacl_llt");
+          stopInit = true;
         }
-        oauthUrl = "$httpWebHost/auth/authorize?client_id=${Uri.encodeComponent(
-            'http://ha-client.homemade.systems/')}&redirect_uri=${Uri
-            .encodeComponent(
-            'http://ha-client.homemade.systems/service/auth_callback.html')}";
-        settingsLoaded = true;
       }
     } else {
       if ((_domain == null) || (_port == null) ||
@@ -80,7 +79,7 @@ class Connection {
 
     if (!stopInit) {
       if (_token == null) {
-        AuthManager().getTempToken(
+        AuthManager().start(
             oauthUrl: oauthUrl
         ).then((token) {
           Logger.d("Token from AuthManager recived");
@@ -99,14 +98,23 @@ class Connection {
 
   void _doConnect({Completer completer, bool forceReconnect}) {
     if (forceReconnect || !isConnected) {
-      _connect().timeout(connectTimeout, onTimeout: () {
-        _disconnect().then((_) {
-          completer?.completeError(HAError("Connection timeout"));
+      _disconnect().then((_){
+        _connect().timeout(connectTimeout).then((_) {
+          completer?.complete();
+        }).catchError((e) {
+          _disconnect().then((_) {
+            if (e is TimeoutException) {
+              if (connecting != null && !connecting.isCompleted) {
+                connecting.completeError(HAError("Connection timeout"));
+              }
+              completer?.completeError(HAError("Connection timeout"));
+            } else if (e is HAError) {
+              completer?.completeError(e);
+            } else {
+              completer?.completeError(HAError("${e.toString()}"));
+            }
+          });
         });
-      }).then((_) {
-        completer?.complete();
-      }).catchError((e) {
-        completer?.completeError(e);
       });
     } else {
       completer?.complete();
@@ -123,49 +131,55 @@ class Connection {
       connecting = Completer();
       _disconnect().then((_) {
         Logger.d("Socket connecting...");
-        _socket = IOWebSocketChannel.connect(
+        try {
+          _socket = IOWebSocketChannel.connect(
             _webSocketAPIEndpoint, pingInterval: Duration(seconds: 15));
-        _socketSubscription = _socket.stream.listen(
-                (message) {
-              isConnected = true;
-              var data = json.decode(message);
-              if (data["type"] == "auth_required") {
-                Logger.d("[Received] <== ${data.toString()}");
-                _authenticate().then((_) {
-                  Logger.d('Authentication complete');
-                  connecting.complete();
-                }).catchError((e) {
-                  if (!connecting.isCompleted) connecting.completeError(e);
-                });
-              } else if (data["type"] == "auth_ok") {
-                Logger.d("[Received] <== ${data.toString()}");
-                _messageResolver["auth"]?.complete();
-                _messageResolver.remove("auth");
-                if (_token != null) {
-                  if (!connecting.isCompleted) connecting.complete();
+          _socketSubscription = _socket.stream.listen(
+                  (message) {
+                isConnected = true;
+                var data = json.decode(message);
+                if (data["type"] == "auth_required") {
+                  Logger.d("[Received] <== ${data.toString()}");
+                  _authenticate().then((_) {
+                    Logger.d('Authentication complete');
+                    connecting.complete();
+                  }).catchError((e) {
+                    if (!connecting.isCompleted) connecting.completeError(e);
+                  });
+                } else if (data["type"] == "auth_ok") {
+                  Logger.d("[Received] <== ${data.toString()}");
+                  Logger.d("[Connection] Subscribing to events");
+                  sendSocketMessage(
+                    type: "subscribe_events",
+                    additionalData: {"event_type": "state_changed"},
+                  ).whenComplete((){
+                    _messageResolver["auth"]?.complete();
+                    _messageResolver.remove("auth");
+                    if (_token != null) {
+                      if (!connecting.isCompleted) connecting.complete();
+                    }
+                  });
+                } else if (data["type"] == "auth_invalid") {
+                  Logger.d("[Received] <== ${data.toString()}");
+                  _messageResolver["auth"]?.completeError(HAError("${data["message"]}", actions: [HAErrorAction.loginAgain()]));
+                  _messageResolver.remove("auth");
+                  if (!connecting.isCompleted) connecting.completeError(HAError("${data["message"]}", actions: [HAErrorAction.tryAgain(title: "Retry"), HAErrorAction.loginAgain(title: "Relogin")]));
+                } else {
+                  _handleMessage(data);
                 }
-              } else if (data["type"] == "auth_invalid") {
-                Logger.d("[Received] <== ${data.toString()}");
-                _messageResolver["auth"]?.completeError(HAError("${data["message"]}", actions: [HAErrorAction.loginAgain()]));
-                _messageResolver.remove("auth");
-                logout().then((_) {
-                  if (!connecting.isCompleted) connecting.completeError(HAError("${data["message"]}", actions: [HAErrorAction.loginAgain()]));
-                });
-              } else {
-                _handleMessage(data);
-              }
-            },
-            cancelOnError: true,
-            onDone: () => _handleSocketClose(connecting),
-            onError: (e) => _handleSocketError(e, connecting)
-        );
+              },
+              cancelOnError: true,
+              onDone: () => _handleSocketClose(connecting),
+              onError: (e) => _handleSocketError(e, connecting)
+          );
+        } catch(exeption) {
+          connecting.completeError(HAError("${exeption.toString()}"));
+        }
       });
       return connecting.future;
     }
   }
 
-
-
   Future _disconnect() {
     Completer completer = Completer();
     if (!isConnected) {
@@ -189,11 +203,11 @@ class Connection {
   _handleMessage(data) {
     if (data["type"] == "result") {
       if (data["id"] != null && data["success"]) {
-        Logger.d("[Received] <== Request id ${data['id']} was successful");
+        //Logger.d("[Received] <== Request id ${data['id']} was successful");
         _messageResolver["${data["id"]}"]?.complete(data["result"]);
       } else if (data["id"] != null) {
         Logger.e("[Received] <== Error received on request id ${data['id']}: ${data['error']}");
-        _messageResolver["${data["id"]}"]?.completeError("${data['error']["message"]}");
+        _messageResolver["${data["id"]}"]?.completeError("${data["error"]["code"]}");
       }
       _messageResolver.remove("${data["id"]}");
     } else if (data["type"] == "event") {
@@ -212,38 +226,24 @@ class Connection {
 
   void _handleSocketClose(Completer connectionCompleter) {
     Logger.d("Socket disconnected.");
-    if (!connectionCompleter.isCompleted) {
-      isConnected = false;
-      connectionCompleter.completeError(HAError("Disconnected", actions: [HAErrorAction.reconnect()]));
-    } else {
-      _disconnect().then((_) {
-        Timer(Duration(seconds: 5), () {
-          Logger.d("Trying to reconnect...");
-          _connect().catchError((e) {
-            isConnected = false;
-            eventBus.fire(ShowErrorEvent(HAError("Unable to connect to Home Assistant")));
-          });
-        });
-      });
-    }
+    _disconnect().then((_) {
+      if (!connectionCompleter.isCompleted) {
+        isConnected = false;
+        connectionCompleter.completeError(HAError("Disconnected", actions: [HAErrorAction.reconnect()]));
+      }
+      eventBus.fire(ShowErrorEvent(HAError("Unable to connect to Home Assistant")));  
+    });
   }
 
   void _handleSocketError(e, Completer connectionCompleter) {
     Logger.e("Socket stream Error: $e");
-    if (!connectionCompleter.isCompleted) {
-      isConnected = false;
-      connectionCompleter.completeError(HAError("Unable to connect to Home Assistant"));
-    } else {
-      _disconnect().then((_) {
-        Timer(Duration(seconds: 5), () {
-          Logger.d("Trying to reconnect...");
-          _connect().catchError((e) {
-            isConnected = false;
-            eventBus.fire(ShowErrorEvent(HAError("Unable to connect to Home Assistant")));
-          });
-        });
-      });
-    }
+    _disconnect().then((_) {
+      if (!connectionCompleter.isCompleted) {
+        isConnected = false;
+        connectionCompleter.completeError(HAError("Disconnected", actions: [HAErrorAction.reconnect()]));
+      }
+      eventBus.fire(ShowErrorEvent(HAError("Unable to connect to Home Assistant")));  
+    });
   }
 
   Future _authenticate() {
@@ -281,6 +281,7 @@ class Connection {
   }
 
   Future logout() {
+    Logger.d("Logging out");
     Completer completer = Completer();
     _disconnect().whenComplete(() {
       _token = null;
@@ -309,8 +310,7 @@ class Connection {
         throw e;
       });
     }).catchError((e) {
-      logout();
-      completer.completeError(HAError("Authentication error: $e", actions: [HAErrorAction.loginAgain()]));
+      completer.completeError(HAError("Authentication error: $e", actions: [HAErrorAction.reload(title: "Retry"), HAErrorAction.loginAgain(title: "Relogin")]));
     });
     return completer.future;
   }
@@ -332,13 +332,13 @@ class Connection {
     _messageResolver[callbackName] = _completer;
     String rawMessage = json.encode(dataObject);
     if (!isConnected) {
-      _connect().timeout(connectTimeout, onTimeout: (){
-        _completer.completeError(HAError("No connection to Home Assistant", actions: [HAErrorAction.reconnect()]));
-      }).then((_) {
+      _connect().timeout(connectTimeout).then((_) {
         Logger.d("[Sending] ==> ${auth ? "type="+dataObject['type'] : rawMessage}");
         _socket.sink.add(rawMessage);
       }).catchError((e) {
-        _completer.completeError(e);
+        if (!_completer.isCompleted) {
+          _completer.completeError(HAError("No connection to Home Assistant", actions: [HAErrorAction.reconnect()]));
+        }
       });
     } else {
       Logger.d("[Sending] ==> ${auth ? "type="+dataObject['type'] : rawMessage}");
@@ -351,18 +351,29 @@ class Connection {
     _currentMessageId += 1;
   }
 
-  Future callService({String domain, String service, String entityId, Map additionalServiceData}) {
+  Future callService({@required String domain, @required String service, String entityId, Map data}) {
+    eventBus.fire(NotifyServiceCallEvent(domain, service, entityId));
+    Logger.d("Service call: $domain.$service, $entityId, $data");
+    Completer completer = Completer();
     Map serviceData = {};
     if (entityId != null) {
       serviceData["entity_id"] = entityId;
     }
-    if (additionalServiceData != null && additionalServiceData.isNotEmpty) {
-      serviceData.addAll(additionalServiceData);
+    if (data != null && data.isNotEmpty) {
+      serviceData.addAll(data);
     }
     if (serviceData.isNotEmpty)
-      return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service, "service_data": serviceData});
+      sendHTTPPost(
+        endPoint: "/api/services/$domain/$service",
+        data: json.encode(serviceData)
+      ).then((data) => completer.complete(data)).catchError((e) => completer.completeError(HAError(e.toString())));
+      //return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service, "service_data": serviceData});
     else
-      return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service});
+      sendHTTPPost(
+          endPoint: "/api/services/$domain/$service"
+      ).then((data) => completer.complete(data)).catchError((e) => completer.completeError(HAError(e.toString())));
+      //return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service});
+    return completer.future;
   }
 
   Future<List> getHistory(String entityId) async {
@@ -401,11 +412,12 @@ class Connection {
         headers: headers,
         body: data
     ).then((response) {
-      Logger.d("[Received] <== HTTP ${response.statusCode}");
       if (response.statusCode >= 200 && response.statusCode < 300 ) {
+        Logger.d("[Received] <== HTTP ${response.statusCode}");
         completer.complete(response.body);
       } else {
-        completer.completeError({"code": response.statusCode, "message": "${response.body}"});
+        Logger.d("[Received] <== HTTP ${response.statusCode}: ${response.body}");
+        completer.completeError(response);
       }
     }).catchError((e) {
       completer.completeError(e);

lib/managers/device_info_manager.class.dart

@@ -1,10 +1,10 @@
-part of 'main.dart';
+part of '../main.dart';
 
-class Device {
+class DeviceInfoManager {
 
-  static final Device _instance = Device._internal();
+  static final DeviceInfoManager _instance = DeviceInfoManager._internal();
 
-  factory Device() {
+  factory DeviceInfoManager() {
     return _instance;
   }
 
@@ -14,7 +14,7 @@ class Device {
   String osName;
   String osVersion;
 
-  Device._internal();
+  DeviceInfoManager._internal();
 
   loadDeviceInfo() {
     DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();

lib/managers/location_manager.class.dart

@@ -0,0 +1,199 @@
+part of '../main.dart';
+
+class LocationManager {
+
+  static final LocationManager _instance = LocationManager
+      ._internal();
+
+  factory LocationManager() {
+    return _instance;
+  }
+
+  LocationManager._internal() {
+    init();
+  }
+
+  final int defaultUpdateIntervalMinutes = 20;
+  final String backgroundTaskId = "haclocationtask0";
+  final String backgroundTaskTag = "haclocation";
+  Duration _updateInterval;
+  bool _isRunning;
+
+  void init() async {
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    await prefs.reload();
+    _updateInterval = Duration(minutes: prefs.getInt("location-interval") ??
+        defaultUpdateIntervalMinutes);
+    _isRunning = prefs.getBool("location-enabled") ?? false;
+    if (_isRunning) {
+      await _startLocationService();
+    }
+  }
+
+  setSettings(bool enabled, int interval) async {
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    if (interval != _updateInterval.inMinutes) {
+      prefs.setInt("location-interval", interval);
+      _updateInterval = Duration(minutes: interval);
+      if (_isRunning) {
+        Logger.d("Stopping location tracking...");
+        _isRunning = false;
+        await _stopLocationService();
+      }
+    }
+    if (enabled && !_isRunning) {
+      Logger.d("Starting location tracking");
+      SharedPreferences prefs = await SharedPreferences.getInstance();
+      prefs.setBool("location-enabled", enabled);
+      _isRunning = true;
+      await _startLocationService();
+    } else if (!enabled && _isRunning) {
+      Logger.d("Stopping location tracking...");
+      SharedPreferences prefs = await SharedPreferences.getInstance();
+      prefs.setBool("location-enabled", enabled);
+      _isRunning = false;
+      await _stopLocationService();
+    }
+  }
+
+  _startLocationService() async {
+    String webhookId = ConnectionManager().webhookId;
+    String httpWebHost = ConnectionManager().httpWebHost;
+    if (webhookId != null && webhookId.isNotEmpty) {
+      Duration interval;
+      int delayFactor;
+      int taskCount;
+      Logger.d("Starting location update for every ${_updateInterval
+        .inMinutes} minutes...");
+      if (_updateInterval.inMinutes == 10) {
+        interval = Duration(minutes: 20);
+        taskCount = 2;
+        delayFactor = 10;
+      } else if (_updateInterval.inMinutes == 5) {
+        interval = Duration(minutes: 15);
+        taskCount = 3;
+        delayFactor = 5;
+      } else {
+        interval = _updateInterval;
+        taskCount = 1;
+        delayFactor = 0;
+      }
+      for (int i = 1; i <= taskCount; i++) {
+        int delay = i*delayFactor;
+        Logger.d("Scheduling location update task #$i for every ${interval.inMinutes} minutes in $delay minutes...");
+        await workManager.Workmanager.registerPeriodicTask(
+          "$backgroundTaskId$i",
+          "haClientLocationTracking-0$i",
+          tag: backgroundTaskTag,
+          inputData: {
+            "webhookId": webhookId,
+            "httpWebHost": httpWebHost
+          },
+          frequency: interval,
+          initialDelay: Duration(minutes: delay),
+          existingWorkPolicy: workManager.ExistingWorkPolicy.keep,
+          backoffPolicy: workManager.BackoffPolicy.linear,
+          backoffPolicyDelay: interval,
+          constraints: workManager.Constraints(
+            networkType: workManager.NetworkType.connected
+          )
+        );
+      }
+    }
+  }
+
+  _stopLocationService() async {
+    Logger.d("Canceling previous schedule if any...");
+    await workManager.Workmanager.cancelByTag(backgroundTaskTag);
+  }
+
+  updateDeviceLocation() async {
+    Logger.d("[Foreground location] Started");
+    Geolocator geolocator = Geolocator();
+    var battery = Battery();
+    String webhookId = ConnectionManager().webhookId;
+    String httpWebHost = ConnectionManager().httpWebHost;
+    if (webhookId != null && webhookId.isNotEmpty) {
+        Logger.d("[Foreground location] Getting battery level...");
+        int batteryLevel = await battery.batteryLevel;
+        Logger.d("[Foreground location] Getting device location...");
+        Position position = await geolocator.getCurrentPosition(
+            desiredAccuracy: LocationAccuracy.high,
+            locationPermissionLevel: GeolocationPermission.locationAlways
+          );
+        if (position != null) {
+          Logger.d("[Foreground location] Location: ${position.latitude} ${position.longitude}. Accuracy: ${position.accuracy}. (${position.timestamp})");
+          String url = "$httpWebHost/api/webhook/$webhookId";
+          Map data = {
+            "type": "update_location",
+            "data": {
+              "gps": [position.latitude, position.longitude],
+              "gps_accuracy": position.accuracy,
+              "battery": batteryLevel ?? 100
+            }
+          };
+          Logger.d("[Foreground location] Sending data home...");
+          var response = await http.post(
+            url,
+            headers: {"Content-Type": "application/json"},
+            body: json.encode(data)
+          );
+          Logger.d("[Foreground location] Got HTTP ${response.statusCode}");
+        } else {
+          Logger.d("[Foreground location] No location. Aborting.");
+        }
+    }
+  }
+
+}
+
+void updateDeviceLocationIsolate() {
+  workManager.Workmanager.executeTask((backgroundTask, data) {
+    print("[Background $backgroundTask] Started");
+    final SentryClient sentryBackgroundClient = SentryClient(dsn: "https://5c868e5ef26947e2b61b189e391ec31b@sentry.io/1836366");
+    Geolocator geolocator = Geolocator();
+    var battery = Battery();
+    int batteryLevel = 100;
+    String webhookId = data["webhookId"];
+    String httpWebHost = data["httpWebHost"];
+    if (webhookId != null && webhookId.isNotEmpty) {
+        print("[Background $backgroundTask] hour=$battery");
+        String url = "$httpWebHost/api/webhook/$webhookId";
+        Map<String, String> headers = {};
+        headers["Content-Type"] = "application/json";
+        Map data = {
+          "type": "update_location",
+          "data": {
+            "gps": [],
+            "gps_accuracy": 0,
+            "battery": batteryLevel
+          }
+        };
+        print("[Background $backgroundTask] Getting battery level...");
+        battery.batteryLevel.then((val) => data["data"]["battery"] = val).whenComplete((){
+          print("[Background $backgroundTask] Getting device location...");
+          geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.high, locationPermissionLevel: GeolocationPermission.locationAlways).then((location) {
+            if (location != null) {
+              print("[Background $backgroundTask] Got location: ${location.latitude} ${location.longitude}");
+              data["data"]["gps"] = [location.latitude, location.longitude];
+              data["data"]["gps_accuracy"] = location.accuracy;
+              print("[Background $backgroundTask] Sending data home.");
+              http.post(
+                  url,
+                  headers: headers,
+                  body: json.encode(data)
+              );
+            } else {
+              throw "Can't get device location. Location is null";
+            }
+          }).catchError((e) {
+            sentryBackgroundClient.captureException(
+              exception: "${e.toString()}"
+            );
+            print("[Background $backgroundTask] Error getting current location: ${e.toString()}");
+          });
+        });
+    }
+    return Future.value(true);
+  });
+}

lib/managers/mobile_app_integration_manager.class.dart

@@ -0,0 +1,124 @@
+part of '../main.dart';
+
+class MobileAppIntegrationManager {
+
+  static final _appRegistrationData = {
+    "app_version": "$appVersion",
+    "device_name": "",
+    "manufacturer": DeviceInfoManager().manufacturer,
+    "model": DeviceInfoManager().model,
+    "os_version": DeviceInfoManager().osVersion,
+    "app_data": {
+      "push_token": "",
+      "push_url": "https://us-central1-ha-client-c73c4.cloudfunctions.net/sendPushNotification"
+    }
+  };
+
+  static Future checkAppRegistration({bool forceRegister: false, bool showOkDialog: false}) {
+    Completer completer = Completer();
+    _appRegistrationData["device_name"] = "${HomeAssistant().userName}'s ${DeviceInfoManager().model}";
+    (_appRegistrationData["app_data"] as Map)["push_token"] = "${HomeAssistant().fcmToken}";
+    if (ConnectionManager().webhookId == null || forceRegister) {
+      Logger.d("Mobile app was not registered yet or need to be reseted. Registering...");
+      var registrationData = Map.from(_appRegistrationData);
+      registrationData.addAll({
+        "app_id": "ha_client",
+        "app_name": "$appName",
+        "os_name": DeviceInfoManager().osName,
+        "supports_encryption": false,
+      });
+      ConnectionManager().sendHTTPPost(
+          endPoint: "/api/mobile_app/registrations",
+          includeAuthHeader: true,
+          data: json.encode(registrationData)
+      ).then((response) {
+        Logger.d("Processing registration responce...");
+        var responseObject = json.decode(response);
+        SharedPreferences.getInstance().then((prefs) {
+          prefs.setString("app-webhook-id", responseObject["webhook_id"]);
+          ConnectionManager().webhookId = responseObject["webhook_id"];
+
+          completer.complete();
+          eventBus.fire(ShowPopupDialogEvent(
+            title: "Mobile app Integration was created",
+            body: "HA Client was registered as MobileApp in your Home Assistant. To start using notifications you need to restart your Home Assistant",
+            positiveText: "Restart now",
+            negativeText: "Later",
+            onPositive: () {
+              ConnectionManager().callService(domain: "homeassistant", service: "restart");
+            },
+          ));
+        });
+      }).catchError((e) {
+        completer.complete();
+        Logger.e("Error registering the app: ${e.toString()}");
+      });
+      return completer.future;
+    } else {
+      Logger.d("App was previously registered. Checking...");
+      var updateData = {
+        "type": "update_registration",
+        "data": _appRegistrationData
+      };
+      ConnectionManager().sendHTTPPost(
+          endPoint: "/api/webhook/${ConnectionManager().webhookId}",
+          includeAuthHeader: false,
+          data: json.encode(updateData)
+      ).then((response) {
+        if (response == null || response.isEmpty) {
+          Logger.d("No registration data in response. MobileApp integration was removed");
+          _askToRegisterApp();
+        } else {
+          Logger.d("App registration works fine");
+          if (showOkDialog) {
+            eventBus.fire(ShowPopupDialogEvent(
+                title: "All good",
+                body: "HA Client integration with your Home Assistant server works fine",
+                positiveText: "Nice!",
+                negativeText: "Ok"
+            ));
+          }
+        }
+        completer.complete();
+      }).catchError((e) {
+        if (e is http.Response && e.statusCode == 410) {
+          Logger.e("MobileApp integration was removed");
+          _askToRegisterApp();
+        } else {
+          Logger.e("Error updating app registration: ${e.toString()}");
+          eventBus.fire(ShowPopupDialogEvent(
+            title: "App integration is not working properly",
+            body: "Something wrong with HA Client integration on your Home Assistant server. Please report this issue.",
+            positiveText: "Report to GitHub",
+            negativeText: "Report to Discord",
+            onPositive: () {
+              Launcher.launchURL("https://github.com/estevez-dev/ha_client/issues/new");
+            },
+            onNegative: () {
+              Launcher.launchURL("https://discord.gg/AUzEvwn");
+            },
+          ));
+        }
+        completer.complete();
+      });
+      return completer.future;
+    }
+  }
+
+  static void _askToRegisterApp() {
+    eventBus.fire(ShowPopupDialogEvent(
+      title: "App integration was removed",
+      body: "Looks like app integration was removed from your Home Assistant. HA Client needs to be registered on your Home Assistant server to make it possible to use notifications and other useful stuff.",
+      positiveText: "Register now",
+      negativeText: "Cancel",
+      onPositive: () {
+        SharedPreferences.getInstance().then((prefs) {
+          prefs.remove("app-webhook-id");
+          ConnectionManager().webhookId = null;
+          checkAppRegistration();
+        });
+      },
+    ));
+  }
+
+}

lib/managers/startup_user_messages_manager.class.dart

@@ -0,0 +1,58 @@
+part of '../main.dart';
+
+class StartupUserMessagesManager {
+
+  static final StartupUserMessagesManager _instance = StartupUserMessagesManager
+      ._internal();
+
+  factory StartupUserMessagesManager() {
+    return _instance;
+  }
+
+  StartupUserMessagesManager._internal() {}
+
+  bool _supportAppDevelopmentMessageShown;
+  bool _whatsNewMessageShown;
+  static final _supportAppDevelopmentMessageKey = "user-message-shown-support-development_3";
+  static final _whatsNewMessageKey = "user-message-shown-whats-new-706";
+
+  void checkMessagesToShow() async {
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    await prefs.reload();
+    _supportAppDevelopmentMessageShown = prefs.getBool(_supportAppDevelopmentMessageKey) ?? false;
+    _whatsNewMessageShown = prefs.getBool(_whatsNewMessageKey) ?? false;
+    if (!_whatsNewMessageShown) {
+      _showWhatsNewMessage();
+    } else if (!_supportAppDevelopmentMessageShown) {
+      _showSupportAppDevelopmentMessage();
+    }
+  }
+
+  void _showSupportAppDevelopmentMessage() {
+    eventBus.fire(ShowPopupDialogEvent(
+        title: "Hi!",
+        body: "As you may have noticed this app contains no ads. Also all app features are available for you for free. I'm not planning to change this in nearest future, but still you can support this application development materially. There is one-time payment available as well as several subscription options. Thanks.",
+        positiveText: "Show options",
+        negativeText: "Cancel",
+        onPositive: () {
+          SharedPreferences.getInstance().then((prefs) {
+            prefs.setBool(_supportAppDevelopmentMessageKey, true);
+            eventBus.fire(ShowPageEvent(path: "/putchase"));
+          });
+        },
+        onNegative: () {
+          SharedPreferences.getInstance().then((prefs) {
+            prefs.setBool(_supportAppDevelopmentMessageKey, true);
+          });
+        }
+    ));
+  }
+
+  void _showWhatsNewMessage() {
+    SharedPreferences.getInstance().then((prefs) {
+      prefs.setBool(_whatsNewMessageKey, true);
+      eventBus.fire(ShowPageEvent(path: "/whats-new"));
+    });
+  }
+
+}

lib/pages/entity.page.dart

@@ -1,59 +1,72 @@
 part of '../main.dart';
 
 class EntityViewPage extends StatefulWidget {
-  EntityViewPage({Key key, @required this.entityId, @required this.homeAssistant }) : super(key: key);
+  EntityViewPage({Key key, @required this.entityId}) : super(key: key);
 
   final String entityId;
-  final HomeAssistant homeAssistant;
 
   @override
   _EntityViewPageState createState() => new _EntityViewPageState();
 }
 
 class _EntityViewPageState extends State<EntityViewPage> {
-  String _title;
   StreamSubscription _refreshDataSubscription;
   StreamSubscription _stateSubscription;
+  Entity entity;
+  Entity forwardToMainPage;
+  bool _popScheduled = false;
 
   @override
   void initState() {
     super.initState();
     _stateSubscription = eventBus.on<StateChangedEvent>().listen((event) {
       if (event.entityId == widget.entityId) {
-        Logger.d("State change event handled by entity page: ${event.entityId}");
+        entity = HomeAssistant().entities.get(widget.entityId);
+        Logger.d("[Entity page] State change event handled: ${event.entityId}");
         setState(() {});
       }
     });
     _refreshDataSubscription = eventBus.on<RefreshDataFinishedEvent>().listen((event) {
+      entity = HomeAssistant().entities.get(widget.entityId);
       setState(() {});
     });
-    _prepareData();
+    entity = HomeAssistant().entities.get(widget.entityId);
   }
 
-  void _prepareData() async {
-    _title = widget.homeAssistant.entities.get(widget.entityId).displayName;
-  }
-
-
   @override
   Widget build(BuildContext context) {
+    Widget body;
+    if (MediaQuery.of(context).size.width >= Sizes.tabletMinWidth) {
+      if (!_popScheduled) {
+        _popScheduled = true;
+        _popAfterBuild();
+      }
+      body = PageLoadingIndicator();
+    } else {
+      body = EntityPageLayout(entity: entity);
+    }
     return new Scaffold(
       appBar: new AppBar(
         leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
           Navigator.pop(context);
         }),
-        // Here we take the value from the MyHomePage object that was created by
-        // the App.build method, and use it to set our appbar title.
-        title: new Text(_title),
+        title: new Text("${entity.displayName}"),
       ),
-      body: widget.homeAssistant.entities.get(widget.entityId).buildEntityPageWidget(context),
+      body: body,
     );
   }
 
+  _popAfterBuild() async {
+    forwardToMainPage = entity;
+    await Future.delayed(Duration(milliseconds: 300));
+    Navigator.of(context).pop();
+  }
+
   @override
   void dispose(){
     if (_stateSubscription != null) _stateSubscription.cancel();
     if (_refreshDataSubscription != null) _refreshDataSubscription.cancel();
+    eventBus.fire(ShowEntityPageEvent(entity: forwardToMainPage));
     super.dispose();
   }
 }

lib/pages/integration_settings.page.dart

@@ -0,0 +1,200 @@
+part of '../main.dart';
+
+class IntegrationSettingsPage extends StatefulWidget {
+  IntegrationSettingsPage({Key key, this.title}) : super(key: key);
+
+  final String title;
+
+  @override
+  _IntegrationSettingsPageState createState() => new _IntegrationSettingsPageState();
+}
+
+class _IntegrationSettingsPageState extends State<IntegrationSettingsPage> {
+
+  int _locationInterval = LocationManager().defaultUpdateIntervalMinutes;
+  bool _locationTrackingEnabled = false;
+  bool _wait = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadSettings();
+
+  }
+
+  _loadSettings() async {
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    await prefs.reload();
+    SharedPreferences.getInstance().then((prefs) {
+      setState(() {
+        _locationTrackingEnabled = prefs.getBool("location-enabled") ?? false;
+        _locationInterval = prefs.getInt("location-interval") ?? LocationManager().defaultUpdateIntervalMinutes;
+        if (_locationInterval % 5 != 0) {
+          _locationInterval = 5 * (_locationInterval ~/ 5);
+        }
+      });
+    });
+  }
+
+  void incLocationInterval() {
+    if (_locationInterval < 720) {
+      setState(() {
+        _locationInterval = _locationInterval + 5;
+      });
+    }
+  }
+
+  void decLocationInterval() {
+    if (_locationInterval > 5) {
+      setState(() {
+        _locationInterval = _locationInterval - 5;
+      });
+    }
+  }
+
+  restart() {
+    eventBus.fire(ShowPopupDialogEvent(
+      title: "Are you sure you want to restart Home Assistant?",
+      body: "This will restart your Home Assistant server.",
+      positiveText: "Sure. Make it so",
+      negativeText: "What?? No!",
+      onPositive: () {
+        ConnectionManager().callService(domain: "homeassistant", service: "restart");
+      },
+    ));
+  }
+
+  stop() {
+    eventBus.fire(ShowPopupDialogEvent(
+      title: "Are you sure you want to STOP Home Assistant?",
+      body: "This will STOP your Home Assistant server. It means that your web interface as well as HA Client will not work untill you'll find a way to start your server using ssh or something.",
+      positiveText: "Sure. Make it so",
+      negativeText: "What?? No!",
+      onPositive: () {
+        ConnectionManager().callService(domain: "homeassistant", service: "stop");
+      },
+    ));
+  }
+
+  updateRegistration() {
+    MobileAppIntegrationManager.checkAppRegistration(showOkDialog: true);
+  }
+
+  resetRegistration() {
+    eventBus.fire(ShowPopupDialogEvent(
+      title: "Waaaait",
+      body: "If you don't whant to have duplicate integrations and entities in your HA for your current device, first you need to remove MobileApp integration from Integration settings in HA and restart server.",
+      positiveText: "Done it already",
+      negativeText: "Ok, I will",
+      onPositive: () {
+        MobileAppIntegrationManager.checkAppRegistration(showOkDialog: true, forceRegister: true);
+      },
+    ));
+  }
+
+  _switchLocationTrackingState(bool state) async {
+    if (state) {
+      await LocationManager().updateDeviceLocation();
+    }
+    await LocationManager().setSettings(_locationTrackingEnabled, _locationInterval);
+    setState(() {
+      _wait = false;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return new Scaffold(
+      appBar: new AppBar(
+        leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
+          Navigator.pop(context);
+        }),
+        title: new Text(widget.title),
+      ),
+      body: ListView(
+        scrollDirection: Axis.vertical,
+        padding: const EdgeInsets.all(20.0),
+        children: <Widget>[
+                Text("Location tracking", style: TextStyle(fontSize: Sizes.largeFontSize-2)),
+                Container(height: Sizes.rowPadding,),
+                InkWell(
+                  onTap: () => Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.homemade.systems/docs#location-tracking"),
+                  child: Text(
+                    "Please read documentation!",
+                    style: TextStyle(
+                      color: Colors.blue,
+                      fontSize: 16,
+                      decoration: TextDecoration.underline
+                    )
+                  ),
+                ),
+                Container(height: Sizes.rowPadding,),
+                Row(
+                  children: <Widget>[
+                    Text("Enable device location tracking"),
+                    Switch(
+                      value: _locationTrackingEnabled,
+                      onChanged: _wait ? null : (value) {
+                        setState(() {
+                          _locationTrackingEnabled = value;
+                          _wait = true;
+                        });
+                        _switchLocationTrackingState(value);
+                      },
+                    ),
+                  ],
+                ),
+                Container(height: Sizes.rowPadding,),
+                Text("Location update interval in minutes:"),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  mainAxisSize: MainAxisSize.max,
+                  children: <Widget>[
+                    //Expanded(child: Container(),),
+                    FlatButton(
+                      padding: EdgeInsets.all(0.0),
+                      child: Text("-", style: TextStyle(fontSize: Sizes.largeFontSize)),
+                      onPressed: () => decLocationInterval(),
+                    ),
+                    Text("$_locationInterval", style: TextStyle(fontSize: Sizes.largeFontSize)),
+                    FlatButton(
+                      padding: EdgeInsets.all(0.0),
+                      child: Text("+", style: TextStyle(fontSize: Sizes.largeFontSize)),
+                      onPressed: () => incLocationInterval(),
+                    ),
+                  ],
+                ),
+                Divider(),
+                Text("Integration status", style: TextStyle(fontSize: Sizes.largeFontSize-2)),
+                Container(height: Sizes.rowPadding,),
+                Text("${HomeAssistant().userName}'s ${DeviceInfoManager().model}, ${DeviceInfoManager().osName} ${DeviceInfoManager().osVersion}"),
+                Container(height: 6.0,),
+                Text("Here you can manually check if HA Client integration with your Home Assistant works fine. As mobileApp integration in Home Assistant is still in development, this is not 100% correct check."),
+                //Divider(),
+                Row(
+                  mainAxisSize: MainAxisSize.max,
+                  children: <Widget>[
+                    RaisedButton(
+                        color: Colors.blue,
+                        onPressed: () => updateRegistration(),
+                        child: Text("Check integration", style: TextStyle(color: Colors.white))
+                    ),
+                    Container(width: 10.0,),
+                    RaisedButton(
+                        color: Colors.redAccent,
+                        onPressed: () => resetRegistration(),
+                        child: Text("Reset integration", style: TextStyle(color: Colors.white))
+                    )
+                  ],
+                ),
+              ]
+      ),
+    );
+  }
+
+  @override
+  void dispose() {
+    LocationManager().setSettings(_locationTrackingEnabled, _locationInterval);
+    super.dispose();
+  }
+}

lib/pages/main.page.dart

@@ -0,0 +1,924 @@
+part of '../main.dart';
+
+class MainPage extends StatefulWidget {
+  MainPage({Key key, this.title}) : super(key: key);
+
+  final String title;
+
+  @override
+  _MainPageState createState() => new _MainPageState();
+}
+
+class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObserver, TickerProviderStateMixin {
+
+  StreamSubscription<List<PurchaseDetails>> _subscription;
+  StreamSubscription _stateSubscription;
+  StreamSubscription _settingsSubscription;
+  StreamSubscription _serviceCallSubscription;
+  StreamSubscription _showEntityPageSubscription;
+  StreamSubscription _showErrorSubscription;
+  StreamSubscription _startAuthSubscription;
+  StreamSubscription _showPopupDialogSubscription;
+  StreamSubscription _showPopupMessageSubscription;
+  StreamSubscription _reloadUISubscription;
+  StreamSubscription _showPageSubscription;
+  int _previousViewCount;
+  bool _showLoginButton = false;
+  bool _preventAppRefresh = false;
+  String _savedSharedText;
+  Entity _entityToShow;
+
+  @override
+  void initState() {
+    super.initState();
+    final Stream purchaseUpdates =
+        InAppPurchaseConnection.instance.purchaseUpdatedStream;
+    _subscription = purchaseUpdates.listen((purchases) {
+      _handlePurchaseUpdates(purchases);
+    });
+    workManager.Workmanager.initialize(
+      updateDeviceLocationIsolate,
+      isInDebugMode: false
+    );
+    enableShareReceiving();
+    WidgetsBinding.instance.addObserver(this);
+
+    _firebaseMessaging.configure(
+        onLaunch: (data) {
+          Logger.d("Notification [onLaunch]: $data");
+          return Future.value();
+        },
+        onMessage: (data) {
+          Logger.d("Notification [onMessage]: $data");
+          return _showNotification(title: data["notification"]["title"], text: data["notification"]["body"]);
+        },
+        onResume: (data) {
+          Logger.d("Notification [onResume]: $data");
+          return Future.value();
+        }
+    );
+
+    _firebaseMessaging.requestNotificationPermissions(const IosNotificationSettings(sound: true, badge: true, alert: true));
+
+    // initialise the plugin. app_icon needs to be a added as a drawable resource to the Android head project
+    var initializationSettingsAndroid =
+    new AndroidInitializationSettings('mini_icon');
+    var initializationSettingsIOS = new IOSInitializationSettings(
+        onDidReceiveLocalNotification: null);
+    var initializationSettings = new InitializationSettings(
+        initializationSettingsAndroid, initializationSettingsIOS);
+    flutterLocalNotificationsPlugin.initialize(initializationSettings,
+        onSelectNotification: onSelectNotification);
+
+    _settingsSubscription = eventBus.on<SettingsChangedEvent>().listen((event) {
+      Logger.d("Settings change event: reconnect=${event.reconnect}");
+      if (event.reconnect) {
+        _preventAppRefresh = false;
+        _fullLoad();
+      }
+    });
+
+    _fullLoad();
+  }
+
+  @override void receiveShare(Share shared) {
+    if (shared.mimeType == ShareType.TYPE_PLAIN_TEXT) {
+      _savedSharedText = shared.text;
+    }
+  }
+
+  Future onSelectNotification(String payload) async {
+    if (payload != null) {
+      Logger.d('Notification clicked: ' + payload);
+    }
+  }
+
+  Future _showNotification({String title, String text}) async {
+    var androidPlatformChannelSpecifics = new AndroidNotificationDetails(
+        'ha_notify', 'Home Assistant notifications', 'Notifications from Home Assistant notify service',
+        importance: Importance.Max, priority: Priority.High);
+    var iOSPlatformChannelSpecifics = new IOSNotificationDetails();
+    var platformChannelSpecifics = new NotificationDetails(
+        androidPlatformChannelSpecifics, iOSPlatformChannelSpecifics);
+    await flutterLocalNotificationsPlugin.show(
+        0,
+        title ?? appName,
+        text,
+        platformChannelSpecifics
+    );
+  }
+
+  void _fullLoad() async {
+    _showInfoBottomBar(progress: true,);
+    _subscribe().then((_) {
+      ConnectionManager().init(loadSettings: true, forceReconnect: true).then((__){
+        _fetchData();
+        LocationManager();
+        StartupUserMessagesManager().checkMessagesToShow();
+      }, onError: (e) {
+        _setErrorState(e);
+      });
+    });
+  }
+
+  void _quickLoad() {
+    _hideBottomBar();
+    _showInfoBottomBar(progress: true,);
+    ConnectionManager().init(loadSettings: false, forceReconnect: false).then((_){
+      _fetchData();
+    }, onError: (e) {
+      _setErrorState(e);
+    });
+  }
+
+  _fetchData() async {
+    if (_savedSharedText != null && !HomeAssistant().isNoEntities) {
+      Logger.d("Got shared text: $_savedSharedText");
+      Navigator.pushNamed(context, "/play-media", arguments: {"url": _savedSharedText});
+      _savedSharedText = null;
+    }
+    await HomeAssistant().fetchData().then((_) {
+      _hideBottomBar();
+      int currentViewCount = HomeAssistant().ui?.views?.length ?? 0;
+      if (_previousViewCount != currentViewCount) {
+        Logger.d("Views count changed ($_previousViewCount->$currentViewCount). Creating new tabs controller.");
+        _viewsTabController = TabController(vsync: this, length: currentViewCount);
+        _previousViewCount = currentViewCount;
+      }
+      if (_entityToShow != null) {
+        _entityToShow = HomeAssistant().entities.get(_entityToShow.entityId);
+      }
+    }).catchError((e) {
+      if (e is HAError) {
+        _setErrorState(e);
+      } else {
+        _setErrorState(HAError(e.toString()));
+      }
+    });
+    eventBus.fire(RefreshDataFinishedEvent());
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    Logger.d("$state");
+    if (state == AppLifecycleState.resumed && ConnectionManager().settingsLoaded && !_preventAppRefresh) {
+      _quickLoad();
+    }
+  }
+
+  void _handlePurchaseUpdates(purchase) {
+    if (purchase is List<PurchaseDetails>) {
+      if (purchase[0].status == PurchaseStatus.purchased) {
+        eventBus.fire(ShowPopupMessageEvent(
+            title: "Thanks a lot!",
+            body: "Thank you for supporting HA Client development!",
+            buttonText: "Ok"
+        ));
+      } else {
+        Logger.d("Purchase change handler: ${purchase[0].status}");
+      }
+    } else {
+      Logger.e("Something wrong with purchase handling. Got: $purchase");
+    }
+  }
+
+  Future _subscribe() {
+    Completer completer = Completer();
+    if (_stateSubscription == null) {
+      _stateSubscription = eventBus.on<StateChangedEvent>().listen((event) {
+        if (event.needToRebuildUI) {
+          Logger.d("New entity. Need to rebuild UI");
+          _quickLoad();
+        } else {
+          setState(() {});
+        }
+      });
+    }
+    if (_reloadUISubscription == null) {
+      _reloadUISubscription = eventBus.on<ReloadUIEvent>().listen((event){
+        _quickLoad();
+      });
+    }
+    if (_showPopupDialogSubscription == null) {
+      _showPopupDialogSubscription = eventBus.on<ShowPopupDialogEvent>().listen((event){
+        _showPopupDialog(
+            title: event.title,
+            body: event.body,
+            onPositive: event.onPositive,
+            onNegative: event.onNegative,
+            positiveText: event.positiveText,
+            negativeText: event.negativeText
+        );
+      });
+    }
+    if (_showPopupMessageSubscription == null) {
+      _showPopupMessageSubscription = eventBus.on<ShowPopupMessageEvent>().listen((event){
+        _showPopupDialog(
+            title: event.title,
+            body: event.body,
+            onPositive: event.onButtonClick,
+            positiveText: event.buttonText,
+            negativeText: null
+        );
+      });
+    }
+    if (_serviceCallSubscription == null) {
+      _serviceCallSubscription =
+          eventBus.on<NotifyServiceCallEvent>().listen((event) {
+            _notifyServiceCalled(event.domain, event.service, event.entityId);
+          });
+    }
+
+    if (_showEntityPageSubscription == null) {
+      _showEntityPageSubscription =
+          eventBus.on<ShowEntityPageEvent>().listen((event) {
+            _showEntityPage(event.entity?.entityId);
+          });
+    }
+
+    if (_showPageSubscription == null) {
+      _showPageSubscription =
+          eventBus.on<ShowPageEvent>().listen((event) {
+            _showPage(event.path, event.goBackFirst);
+          });
+    }
+
+    if (_showErrorSubscription == null) {
+      _showErrorSubscription = eventBus.on<ShowErrorEvent>().listen((event){
+        _showErrorBottomBar(event.error);
+      });
+    }
+
+    if (_startAuthSubscription == null) {
+      _startAuthSubscription = eventBus.on<StartAuthEvent>().listen((event){
+        setState(() {
+          _showLoginButton = event.showButton;
+        });
+        if (event.showButton) {
+          _showOAuth();
+        } else {
+          _preventAppRefresh = false;
+        }
+      });
+    }
+
+    _firebaseMessaging.getToken().then((String token) {
+      HomeAssistant().fcmToken = token;
+      completer.complete();
+    });
+    return completer.future;
+  }
+
+  void _showOAuth() {
+    _preventAppRefresh = true;
+    Launcher.launchURLInCustomTab(
+      url: ConnectionManager().oauthUrl
+    );
+  }
+
+  _setErrorState(HAError e) {
+    if (e == null) {
+      _showErrorBottomBar(
+          HAError("Unknown error")
+      );
+    } else {
+      _showErrorBottomBar(e);
+    }
+  }
+
+  void _showPopupDialog({String title, String body, var onPositive, var onNegative, String positiveText, String negativeText}) {
+    List<Widget> buttons = [];
+    buttons.add(FlatButton(
+      child: new Text("$positiveText"),
+      onPressed: () {
+        Navigator.of(context).pop();
+        if (onPositive != null) {
+          onPositive();
+        }
+      },
+    ));
+    if (negativeText != null) {
+      buttons.add(FlatButton(
+        child: new Text("$negativeText"),
+        onPressed: () {
+          Navigator.of(context).pop();
+          if (onNegative != null) {
+            onNegative();
+          }
+        },
+      ));
+    }
+    // flutter defined function
+    showDialog(
+      barrierDismissible: false,
+      context: context,
+      builder: (BuildContext context) {
+        // return object of type Dialog
+        return AlertDialog(
+          title: new Text("$title"),
+          content: new Text("$body"),
+          actions: buttons,
+        );
+      },
+    );
+  }
+
+  void _notifyServiceCalled(String domain, String service, String entityId) {
+    _showInfoBottomBar(
+        message: "Calling $domain.$service",
+        duration: Duration(seconds: 4)
+    );
+  }
+
+  void _showEntityPage(String entityId) {
+    setState(() {
+      _entityToShow = HomeAssistant().entities?.get(entityId);
+      if (_entityToShow != null) {
+        _mainScrollController?.jumpTo(0);
+      }
+    });
+    /*if (_entityToShow!= null && MediaQuery.of(context).size.width < Sizes.tabletMinWidth) {
+      Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (context) => EntityViewPage(entityId: entityId),
+          )
+      );
+    }*/
+  }
+
+  void _showPage(String path, bool goBackFirst) {
+    if (goBackFirst) {
+      Navigator.pop(context);
+    }
+    Navigator.pushNamed(
+        context,
+        path
+    );
+  }
+
+  List<Tab> buildUIViewTabs() {
+    List<Tab> result = [];
+
+    if (HomeAssistant().ui.views.isNotEmpty) {
+      HomeAssistant().ui.views.forEach((HAView view) {
+        result.add(view.buildTab());
+      });
+    }
+
+    return result;
+  }
+
+  Drawer _buildAppDrawer() {
+    List<Widget> menuItems = [];
+    menuItems.add(
+        UserAccountsDrawerHeader(
+          accountName: Text(HomeAssistant().userName),
+          accountEmail: Text(HomeAssistant().locationName ?? ""),
+          currentAccountPicture: CircleAvatar(
+            child: Text(
+              HomeAssistant().userAvatarText,
+              style: TextStyle(
+                  fontSize: 32.0
+              ),
+            ),
+          ),
+        )
+    );
+    if (HomeAssistant().panels.isNotEmpty) {
+      HomeAssistant().panels.forEach((Panel panel) {
+        if (!panel.isHidden) {
+          menuItems.add(
+              new ListTile(
+                  leading: Icon(MaterialDesignIcons.getIconDataFromIconName(panel.icon)),
+                  title: Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: <Widget>[
+                      Text("${panel.title}"),
+                      Container(width: 4.0,),
+                      panel.isWebView ? Text("WEB", style: TextStyle(fontSize: 8.0, color: Colors.black45),) : Container(width: 1.0,)
+                    ],
+                  ),
+                  onTap: () {
+                    Navigator.of(context).pop();
+                    panel.handleOpen(context);
+                  }
+              )
+          );
+        }
+      });
+    }
+    menuItems.addAll([
+      Divider(),
+      ListTile(
+        leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:server-network")),
+        title: Text("Connection settings"),
+        onTap: () {
+          Navigator.of(context).pop();
+          Navigator.of(context).pushNamed('/connection-settings');
+        },
+      ),
+      ListTile(
+        leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:cellphone-settings-variant")),
+        title: Text("Integration settings"),
+        onTap: () {
+          Navigator.of(context).pop();
+          Navigator.of(context).pushNamed('/integration-settings');
+        },
+      )
+    ]);
+    menuItems.addAll([
+      Divider(),
+      new ListTile(
+        leading: Icon(Icons.insert_drive_file),
+        title: Text("Log"),
+        onTap: () {
+          Navigator.of(context).pop();
+          Navigator.of(context).pushNamed('/log-view');
+        },
+      ),
+      new ListTile(
+        leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:github-circle")),
+        title: Text("Report an issue"),
+        onTap: () {
+          Navigator.of(context).pop();
+          Launcher.launchURL("https://github.com/estevez-dev/ha_client/issues/new");
+        },
+      ),
+      Divider(),
+      new ListTile(
+        leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:food")),
+        title: Text("Support app development"),
+        onTap: () {
+          Navigator.of(context).pop();
+          Navigator.of(context).pushNamed('/putchase');
+        },
+      ),
+      Divider(),
+      new ListTile(
+        leading: Icon(Icons.help),
+        title: Text("Help"),
+        onTap: () {
+          Navigator.of(context).pop();
+          Launcher.launchURL("http://ha-client.homemade.systems/docs");
+        },
+      ),
+      new ListTile(
+        leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:discord")),
+        title: Text("Join Discord channel"),
+        onTap: () {
+          Navigator.of(context).pop();
+          Launcher.launchURL("https://discord.gg/AUzEvwn");
+        },
+      ),
+      new AboutListTile(
+          aboutBoxChildren: <Widget>[
+            GestureDetector(
+              onTap: () {
+                Navigator.of(context).pop();
+                Launcher.launchURL("http://ha-client.homemade.systems/");
+              },
+              child: Text(
+                "ha-client.homemade.systems",
+                style: TextStyle(
+                    color: Colors.blue,
+                    decoration: TextDecoration.underline
+                ),
+              ),
+            ),
+            Container(
+              height: 10.0,
+            ),
+            GestureDetector(
+              onTap: () {
+                Navigator.of(context).pop();
+                Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.homemade.systems/terms_and_conditions");
+              },
+              child: Text(
+                "Terms and Conditions",
+                style: TextStyle(
+                    color: Colors.blue,
+                    decoration: TextDecoration.underline
+                ),
+              ),
+            ),
+            Container(
+              height: 10.0,
+            ),
+            GestureDetector(
+              onTap: () {
+                Navigator.of(context).pop();
+                Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.homemade.systems/privacy_policy");
+              },
+              child: Text(
+                "Privacy Policy",
+                style: TextStyle(
+                    color: Colors.blue,
+                    decoration: TextDecoration.underline
+                ),
+              ),
+            )
+          ],
+          applicationName: appName,
+          applicationVersion: appVersion
+      )
+    ]);
+    return new Drawer(
+      child: ListView(
+        children: menuItems,
+      ),
+    );
+  }
+
+  void _hideBottomBar() {
+    //_scaffoldKey?.currentState?.hideCurrentSnackBar();
+    setState(() {
+      _showBottomBar = false;
+    });
+  }
+
+  Widget _bottomBarAction;
+  bool _showBottomBar = false;
+  String _bottomBarText;
+  bool _bottomBarProgress;
+  Color _bottomBarColor;
+  Timer _bottomBarTimer;
+
+  void _showInfoBottomBar({String message, bool progress: false, Duration duration}) {
+    _bottomBarTimer?.cancel();
+    _bottomBarAction = Container(height: 0.0, width: 0.0,);
+    _bottomBarColor = Colors.grey.shade50;
+    setState(() {
+      _bottomBarText = message;
+      _bottomBarProgress = progress;
+      _showBottomBar = true;
+    });
+    if (duration != null) {
+      _bottomBarTimer = Timer(duration, () {
+        _hideBottomBar();
+      });
+    }
+  }
+
+  void _showErrorBottomBar(HAError error) {
+    TextStyle textStyle = TextStyle(
+        color: Colors.blue,
+        fontSize: Sizes.nameFontSize
+    );
+    _bottomBarColor = Colors.red.shade100;
+    List<Widget> actions = [];
+    error.actions.forEach((HAErrorAction action) {
+      switch (action.type) {
+        case HAErrorActionType.FULL_RELOAD: {
+          actions.add(FlatButton(
+            child: Text("${action.title}", style: textStyle),
+            onPressed: () {
+              _fullLoad();
+            },
+          ));
+          break;
+        }
+
+        case HAErrorActionType.QUICK_RELOAD: {
+          actions.add(FlatButton(
+            child: Text("${action.title}", style: textStyle),
+            onPressed: () {
+              _quickLoad();
+            },
+          ));
+          break;
+        }
+
+        case HAErrorActionType.RELOGIN: {
+          actions.add(FlatButton(
+            child: Text("${action.title}", style: textStyle),
+            onPressed: () {
+              ConnectionManager().logout().then((_) => _fullLoad());
+            },
+          ));
+          break;
+        }
+
+        case HAErrorActionType.URL: {
+          actions.add(FlatButton(
+            child: Text("${action.title}", style: textStyle),
+            onPressed: () {
+              Launcher.launchURLInCustomTab(context: context, url: "${action.url}");
+            },
+          ));
+          break;
+        }
+
+        case HAErrorActionType.OPEN_CONNECTION_SETTINGS: {
+          actions.add(FlatButton(
+            child: Text("${action.title}", style: textStyle),
+            onPressed: () {
+              Navigator.pushNamed(context, '/connection-settings');
+            },
+          ));
+          break;
+        }
+      }
+    });
+    if (actions.isNotEmpty) {
+      _bottomBarAction = Row(
+        mainAxisSize: MainAxisSize.min,
+        children: actions,
+        mainAxisAlignment: MainAxisAlignment.end,
+      );
+    } else {
+      _bottomBarAction = Container(height: 0.0, width: 0.0,);
+    }
+    setState(() {
+      _bottomBarProgress = false;
+      _bottomBarText = "${error.message}";
+      _showBottomBar = true;
+    });
+  }
+
+  final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
+  final ScrollController _mainScrollController = ScrollController();
+
+  Widget _buildScaffoldBody(bool empty) {
+    List<PopupMenuItem<String>> serviceMenuItems = [];
+    List<PopupMenuItem<String>> mediaMenuItems = [];
+
+    serviceMenuItems.add(PopupMenuItem<String>(
+      child: new Text("Reload"),
+      value: "reload",
+    ));
+    if (ConnectionManager().isAuthenticated) {
+      _showLoginButton = false;
+      serviceMenuItems.add(
+          PopupMenuItem<String>(
+            child: new Text("Logout"),
+            value: "logout",
+          ));
+    }
+    Widget mediaMenuIcon;
+    int playersCount = 0;
+    if (!empty && !HomeAssistant().entities.isEmpty) {
+      List<Entity> activePlayers = HomeAssistant().entities.getByDomains(domains: ["media_player"], stateFiler: [EntityState.paused, EntityState.playing, EntityState.idle]);
+      playersCount = activePlayers.length;
+      mediaMenuItems.addAll(
+          activePlayers.map((entity) => PopupMenuItem<String>(
+            child: Text(
+                "${entity.displayName}",
+              style: TextStyle(
+                color: EntityColor.stateColor(entity.state)
+              ),
+            ),
+            value: "${entity.entityId}",
+          )).toList()
+      );
+    }
+    mediaMenuItems.addAll([
+      PopupMenuItem<String>(
+        child: new Text("Play media..."),
+        value: "play_media",
+      )
+    ]);
+    if (playersCount > 0) {
+      mediaMenuIcon = Stack(
+        overflow: Overflow.visible,
+        children: <Widget>[
+          Icon(MaterialDesignIcons.getIconDataFromIconName(
+              "mdi:television"), color: Colors.white,),
+          Positioned(
+            bottom: -4,
+            right: -4,
+            child: Container(
+              height: 16,
+              width: 16,
+              decoration: new BoxDecoration(
+                color: Colors.orange,
+                shape: BoxShape.circle,
+              ),
+              child: Center(
+                child: Text("$playersCount", style: TextStyle(fontSize: 12)),
+              ),
+            ),
+          )
+        ],
+      );
+    } else {
+      mediaMenuIcon = Icon(MaterialDesignIcons.getIconDataFromIconName(
+          "mdi:television"), color: Colors.white,);
+    }
+    Widget mainScrollBody;
+    if (empty) {
+      if (_showLoginButton) {
+        mainScrollBody = Center(
+            child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: <Widget>[
+                  FlatButton(
+                    child: Text("Login with Home Assistant", style: TextStyle(fontSize: 16.0, color: Colors.white)),
+                    color: Colors.blue,
+                    onPressed: () => _fullLoad(),
+                  )
+                ]
+            )
+        );
+      } else {
+        mainScrollBody = Center(
+          child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: <Widget>[
+                Text("...")
+              ]
+          ),
+        );
+      }
+    } else {
+      if (_entityToShow != null && MediaQuery.of(context).size.width >= Sizes.tabletMinWidth) {
+        mainScrollBody = Flex(
+          direction: Axis.horizontal,
+          children: <Widget>[
+            Expanded(
+              child: HomeAssistant().buildViews(context, _viewsTabController),
+            ),
+            Container(
+              width: Sizes.mainPageScreenSeparatorWidth,
+              color: Colors.blue,
+            ),
+            ConstrainedBox(
+              constraints: BoxConstraints.tightFor(width: Sizes.entityPageMaxWidth),
+              child: EntityPageLayout(entity: _entityToShow, showClose: true,),
+            )
+          ],
+        );
+      } else if (_entityToShow != null) {
+        mainScrollBody = EntityPageLayout(entity: _entityToShow, showClose: true,);
+      } else {
+        mainScrollBody = HomeAssistant().buildViews(context, _viewsTabController);
+      }
+    }
+
+    return NestedScrollView(
+        headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
+          return <Widget>[
+            SliverAppBar(
+              floating: true,
+              pinned: true,
+              primary: true,
+              title: Text(HomeAssistant().locationName ?? ""),
+              actions: <Widget>[
+                IconButton(
+                    icon: mediaMenuIcon,
+                    onPressed: () {
+                      showMenu(
+                          position: RelativeRect.fromLTRB(MediaQuery.of(context).size.width, 100.0, 50, 0.0),
+                          context: context,
+                          items: mediaMenuItems
+                      ).then((String val) {
+                        if (val == "play_media") {
+                          Navigator.pushNamed(context, "/play-media", arguments: {"url": ""});
+                        } else  {
+                          _showEntityPage(val);
+                        }
+                      });
+                    }
+                ),
+                IconButton(
+                    icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
+                        "mdi:dots-vertical"), color: Colors.white,),
+                    onPressed: () {
+                      showMenu(
+                          position: RelativeRect.fromLTRB(MediaQuery.of(context).size.width, 100, 0.0, 0.0),
+                          context: context,
+                          items: serviceMenuItems
+                      ).then((String val) {
+                        if (val == "reload") {
+                          _quickLoad();
+                        } else if (val == "logout") {
+                          HomeAssistant().logout().then((_) {
+                            _quickLoad();
+                          });
+                        }
+                      });
+                    }
+                )
+              ],
+              leading: IconButton(
+                icon: Icon(Icons.menu),
+                onPressed: () {
+                  _scaffoldKey.currentState.openDrawer();
+                },
+              ),
+              bottom: (empty || _entityToShow != null) ? null : TabBar(
+                controller: _viewsTabController,
+                tabs: buildUIViewTabs(),
+                isScrollable: true,
+              ),
+            ),
+
+          ];
+        },
+        body: mainScrollBody,
+        controller: _mainScrollController,
+    );
+  }
+
+  TabController _viewsTabController;
+
+  @override
+  Widget build(BuildContext context) {
+    Widget bottomBar;
+    if (_showBottomBar) {
+      List<Widget> bottomBarChildren = [];
+      if (_bottomBarText != null) {
+        bottomBarChildren.add(
+            Padding(
+              padding: EdgeInsets.fromLTRB(
+                  Sizes.leftWidgetPadding, Sizes.rowPadding, 0.0,
+                  Sizes.rowPadding),
+              child: Text(
+                "$_bottomBarText",
+                textAlign: TextAlign.left,
+                softWrap: true,
+              ),
+            )
+
+        );
+      }
+      if (_bottomBarProgress) {
+        bottomBarChildren.add(
+          CollectionScaleTransition(
+            children: <Widget>[
+              Icon(Icons.stop, size: 10.0, color: EntityColor.stateColor(EntityState.on),),
+              Icon(Icons.stop, size: 10.0, color: EntityColor.stateColor(EntityState.unavailable),),
+              Icon(Icons.stop, size: 10.0, color: EntityColor.stateColor(EntityState.off),),
+            ],
+          ),
+        );
+      }
+      if (bottomBarChildren.isNotEmpty) {
+        bottomBar = Container(
+          color: _bottomBarColor,
+          child: Row(
+            mainAxisSize: MainAxisSize.max,
+            children: <Widget>[
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: _bottomBarProgress ? CrossAxisAlignment.center : CrossAxisAlignment.start,
+                  mainAxisSize: MainAxisSize.min,
+                  children: bottomBarChildren,
+                ),
+              ),
+              _bottomBarAction
+            ],
+          ),
+        );
+      }
+    }
+    // This method is rerun every time setState is called.
+    if (HomeAssistant().isNoViews) {
+      return Scaffold(
+          key: _scaffoldKey,
+          primary: false,
+          drawer: _buildAppDrawer(),
+          bottomNavigationBar: bottomBar,
+          body: _buildScaffoldBody(true)
+      );
+    } else {
+      return WillPopScope(
+        child: Scaffold(
+          key: _scaffoldKey,
+          drawer: _buildAppDrawer(),
+          primary: false,
+          bottomNavigationBar: bottomBar,
+          body: _buildScaffoldBody(false)
+        ),
+        onWillPop: () {
+          if (_entityToShow != null) {
+            eventBus.fire(ShowEntityPageEvent());
+            return Future.value(false);
+          } else {
+            return Future.value(true);
+          }
+        },
+      );
+    }
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    _viewsTabController?.dispose();
+    _stateSubscription?.cancel();
+    _settingsSubscription?.cancel();
+    _serviceCallSubscription?.cancel();
+    _showPopupDialogSubscription?.cancel();
+    _showPopupMessageSubscription?.cancel();
+    _showEntityPageSubscription?.cancel();
+    _showErrorSubscription?.cancel();
+    _startAuthSubscription?.cancel();
+    _subscription?.cancel();
+    _showPageSubscription?.cancel();
+    _reloadUISubscription?.cancel();
+    //TODO disconnect
+    //widget.homeAssistant?.disconnect();
+    super.dispose();
+  }
+}

lib/pages/panel.page.dart

@@ -12,8 +12,6 @@ class PanelPage extends StatefulWidget {
 
 class _PanelPageState extends State<PanelPage> {
 
-  List<ConfigurationItem> _items;
-
   @override
   void initState() {
     super.initState();

lib/pages/play_media.page.dart

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

lib/pages/purchase.page.dart

@@ -10,7 +10,7 @@ class PurchasePage extends StatefulWidget {
 }
 
 class _PurchasePageState extends State<PurchasePage> {
-  
+
   bool _loaded = false;
   String _error = "";
   List<ProductDetails> _products;
@@ -29,7 +29,7 @@ class _PurchasePageState extends State<PurchasePage> {
         _error = "Error connecting to store";
       });
     } else {
-      const Set<String> _kIds = {'just_few_bucks_per_year', 'app_fan_support_per_year', 'grateful_user_support_per_year'};
+      const Set<String> _kIds = {'one_time_support','just_few_bucks_per_year', 'app_fan_support_per_year', 'grateful_user_support_per_year'};
       final ProductDetailsResponse response = await InAppPurchaseConnection.instance.queryProductDetails(_kIds);
       if (!response.notFoundIDs.isEmpty) {
         Logger.d("Products not found: ${response.notFoundIDs}");
@@ -61,7 +61,7 @@ class _PurchasePageState extends State<PurchasePage> {
       }
     }
   }
-  
+
   Widget _buildProducts() {
     List<Widget> productWidgets = [];
     for (ProductDetails product in _products) {

lib/pages/settings.page.dart

@@ -74,19 +74,32 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
   }
 
   _saveSettings() async {
-    if (_newHassioDomain.indexOf("http") == 0 && _newHassioDomain.indexOf("//") > 0) {
+    _newHassioDomain = _newHassioDomain.trim();
+    if (_newHassioDomain.startsWith("http") && _newHassioDomain.indexOf("//") > 0) {
+      _newHassioDomain.startsWith("https") ? _newSocketProtocol = "wss" : _newSocketProtocol = "ws";
       _newHassioDomain = _newHassioDomain.split("//")[1];
     }
     _newHassioDomain = _newHassioDomain.split("/")[0];
+    if (_newHassioDomain.contains(":")) {
+      List<String> domainAndPort = _newHassioDomain.split(":");
+      _newHassioDomain = domainAndPort[0];
+      _newHassioPort = domainAndPort[1];
+    }
     SharedPreferences prefs = await SharedPreferences.getInstance();
     final storage = new FlutterSecureStorage();
     if (_newLongLivedToken.isNotEmpty) {
+      _newLongLivedToken = _newLongLivedToken.trim();
       prefs.setBool("oauth-used", false);
       await storage.write(key: "hacl_llt", value: _newLongLivedToken);
     } else if (!useOAuth) {
       await storage.delete(key: "hacl_llt");
     }
     prefs.setString("hassio-domain", _newHassioDomain);
+    if (_newHassioPort == null || _newHassioPort.isEmpty) {
+      _newHassioPort = _newSocketProtocol == "wss" ? "443" : "80";
+    } else {
+      _newHassioPort = _newHassioPort.trim();
+    }
     prefs.setString("hassio-port", _newHassioPort);
     prefs.setString("hassio-protocol", _newSocketProtocol);
     prefs.setString("hassio-res-protocol", _newSocketProtocol == "wss" ? "https" : "http");
@@ -147,13 +160,7 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
             decoration: InputDecoration(
               labelText: "Home Assistant domain or ip address"
             ),
-            controller: new TextEditingController.fromValue(
-                new TextEditingValue(
-                    text: _newHassioDomain,
-                    selection:
-                    new TextSelection.collapsed(offset: _newHassioDomain.length)
-                )
-            ),
+            controller: TextEditingController.fromValue(TextEditingValue(text: _newHassioDomain)),
             onChanged: (value) {
               _newHassioDomain = value;
             }
@@ -162,13 +169,7 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
             decoration: InputDecoration(
               labelText: "Home Assistant port (default is 8123)"
             ),
-            controller: new TextEditingController.fromValue(
-                new TextEditingValue(
-                    text: _newHassioPort,
-                    selection:
-                    new TextSelection.collapsed(offset: _newHassioPort.length)
-                )
-            ),
+            controller: TextEditingController.fromValue(TextEditingValue(text: _newHassioPort)),
             onChanged: (value) {
               _newHassioPort = value;
             }
@@ -216,13 +217,7 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
               decoration: InputDecoration(
                   labelText: "Long-lived token"
               ),
-              controller: new TextEditingController.fromValue(
-                  new TextEditingValue(
-                      text: _newLongLivedToken ?? '',
-                      selection:
-                      new TextSelection.collapsed(offset: _newLongLivedToken != null ? _newLongLivedToken.length : 0)
-                  )
-              ),
+              controller: TextEditingController.fromValue(TextEditingValue(text: _newLongLivedToken)),
               onChanged: (value) {
                 _newLongLivedToken = value;
               }

lib/pages/whats_new.page.dart

@@ -0,0 +1,69 @@
+part of '../main.dart';
+
+class WhatsNewPage extends StatefulWidget {
+  WhatsNewPage({Key key}) : super(key: key);
+
+  @override
+  _WhatsNewPageState createState() => new _WhatsNewPageState();
+}
+
+class _WhatsNewPageState extends State<WhatsNewPage> {
+
+  String data = "";
+  String error = "";
+
+  @override
+  void initState() {
+    super.initState();
+    _loadData();
+  }
+
+  _loadData() async {
+    setState(() {
+      data = "";
+      error = "";
+    });
+    http.Response response;
+    response = await http.get("http://ha-client.homemade.systems/service/whats_new_0.7.0.md");
+    if (response.statusCode == 200) {
+      setState(() {
+        data = response.body;
+      });
+    } else {
+      setState(() {
+        error = "Can't load changelog";
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Widget body;
+    if (error.isNotEmpty) {
+      body = PageLoadingError(errorText: error,);
+    } else if (data.isEmpty) {
+      body = PageLoadingIndicator();
+    } else {
+      body = Markdown(
+        data: data,
+      );
+    }
+    return new Scaffold(
+      appBar: new AppBar(
+        leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
+          Navigator.pop(context);
+        }),
+        actions: <Widget>[
+          IconButton(
+            icon: Icon(Icons.refresh),
+            onPressed: () => _loadData(),
+          )
+        ],
+        // Here we take the value from the MyHomePage object that was created by
+        // the App.build method, and use it to set our appbar title.
+        title: new Text("What's new"),
+      ),
+      body: body
+    );
+  }
+}

lib/pages/widgets/product_purchase.widget.dart

@@ -10,13 +10,19 @@ class ProductPurchase extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    String period = "/ ";
+    String period = "";
     Color priceColor;
+    String buttonText = '';
+    String buttonTextInactive = '';
     if (product.id.contains("year")) {
-      period += "year";
+      period += "/ year";
+      buttonText = "Subscribe";
+      buttonTextInactive = "Already";
       priceColor = Colors.amber;
     } else {
-      period += "month";
+      period += "";
+      buttonText = "Pay";
+      buttonTextInactive = "Paid";
       priceColor = Colors.deepOrangeAccent;
     }
     return Card(
@@ -55,7 +61,7 @@ class ProductPurchase extends StatelessWidget {
               Expanded(
                 flex: 2,
                 child: RaisedButton(
-                  child: Text(this.purchased ? "Bought" : "Buy", style: TextStyle(color: Colors.white)),
+                  child: Text(this.purchased ? buttonTextInactive : buttonText, style: TextStyle(color: Colors.white)),
                   color: Colors.blue,
                   onPressed: this.purchased ? null : () => this.onBuy(this.product),
                 ),

lib/panels/config_panel_widget.dart

@@ -0,0 +1,32 @@
+part of '../main.dart';
+
+class ConfigPanelWidget extends StatefulWidget {
+  ConfigPanelWidget({Key key}) : super(key: key);
+
+  @override
+  _ConfigPanelWidgetState createState() => new _ConfigPanelWidgetState();
+}
+
+class _ConfigPanelWidgetState extends State<ConfigPanelWidget> {
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView(
+      children: [
+        LinkToWebConfig(name: "Home Assistant configuration", url: ConnectionManager().httpWebHost+"/config"),
+      ],
+    );
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+}

lib/panels/panel_class.dart

@@ -17,28 +17,25 @@ class Panel {
   final Map config;
   String icon;
   bool isHidden = true;
+  bool isWebView = false;
 
   Panel({this.id, this.type, this.title, this.urlPath, this.icon, this.config}) {
     if (icon == null || !icon.startsWith("mdi:")) {
       icon = Panel.iconsByComponent[type];
     }
-    isHidden = (type != "iframe" && type != "config");
+    isHidden = (type == 'lovelace' || type == 'kiosk' || type == 'states' || type == 'profile' || type == 'developer-tools');
+    isWebView = (type != 'config');
   }
 
   void handleOpen(BuildContext context) {
-    if (type == "iframe") {
-      Logger.d("Launching custom tab with ${config["url"]}");
-      HAUtils.launchURLInCustomTab(context: context, url: config["url"]);
-    } else if (type == "config") {
+    if (type == "config") {
       Navigator.of(context).push(
           MaterialPageRoute(
             builder: (context) => PanelPage(title: "$title", panel: this),
           )
       );
     } else {
-      String url = "${Connection().httpWebHost}/$urlPath";
-      Logger.d("Launching custom tab with $url");
-      HAUtils.launchURLInCustomTab(context: context, url: url);
+      Launcher.launchURLInCustomTab(url: "${ConnectionManager().httpWebHost}/$urlPath");
     }
   }
 

lib/panels/widgets/link_to_web_config.dart

@@ -0,0 +1,29 @@
+part of '../../main.dart';
+
+class LinkToWebConfig extends StatelessWidget {
+
+  final String name;
+  final String url;
+
+  const LinkToWebConfig({Key key, @required this.name, @required this.url}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      child: Column(
+        children: <Widget>[
+          ListTile(
+            title: Text("${this.name}",
+                textAlign: TextAlign.left,
+                overflow: TextOverflow.ellipsis,
+                style: new TextStyle(fontWeight: FontWeight.bold, fontSize: Sizes.largeFontSize)),
+            subtitle: Text("Tap to open web version"),
+            onTap: () {
+              Launcher.launchURLInCustomTab(url: this.url);
+            },
+          )
+        ],
+      ),
+    );
+  }
+}

lib/plugins/circular_slider/base_painter.dart

@@ -0,0 +1,77 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+
+import 'utils.dart';
+
+class BasePainter extends CustomPainter {
+  Color baseColor;
+  Color selectionColor;
+  int primarySectors;
+  int secondarySectors;
+  double sliderStrokeWidth;
+
+  Offset center;
+  double radius;
+
+  BasePainter({
+    @required this.baseColor,
+    @required this.selectionColor,
+    @required this.primarySectors,
+    @required this.secondarySectors,
+    @required this.sliderStrokeWidth,
+  });
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    Paint base = _getPaint(color: baseColor);
+
+    center = Offset(size.width / 2, size.height / 2);
+    radius = min(size.width / 2, size.height / 2) - sliderStrokeWidth;
+    // we need this in the parent to calculate if the user clicks on the circumference
+
+    assert(radius > 0);
+
+    canvas.drawCircle(center, radius, base);
+
+    if (primarySectors > 0) {
+      _paintSectors(primarySectors, 8.0, selectionColor, canvas);
+    }
+
+    if (secondarySectors > 0) {
+      _paintSectors(secondarySectors, 6.0, baseColor, canvas);
+    }
+  }
+
+  void _paintSectors(
+      int sectors, double radiusPadding, Color color, Canvas canvas) {
+    Paint section = _getPaint(color: color, width: 2.0);
+
+    var endSectors =
+    getSectionsCoordinatesInCircle(center, radius + radiusPadding, sectors);
+    var initSectors =
+    getSectionsCoordinatesInCircle(center, radius - radiusPadding, sectors);
+    _paintLines(canvas, initSectors, endSectors, section);
+  }
+
+  void _paintLines(
+      Canvas canvas, List<Offset> inits, List<Offset> ends, Paint section) {
+    assert(inits.length == ends.length && inits.length > 0);
+
+    for (var i = 0; i < inits.length; i++) {
+      canvas.drawLine(inits[i], ends[i], section);
+    }
+  }
+
+  Paint _getPaint({@required Color color, double width, PaintingStyle style}) =>
+      Paint()
+        ..color = color
+        ..strokeCap = StrokeCap.round
+        ..style = style ?? PaintingStyle.stroke
+        ..strokeWidth = width ?? sliderStrokeWidth;
+
+  @override
+  bool shouldRepaint(CustomPainter oldDelegate) {
+    return false;
+  }
+}

lib/plugins/circular_slider/circular_slider_paint.dart

@@ -0,0 +1,366 @@
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+
+import 'base_painter.dart';
+import 'slider_painter.dart';
+import 'utils.dart';
+
+enum CircularSliderMode { singleHandler, doubleHandler }
+
+enum SlidingState { none, endIsBiggerThanStart, endIsSmallerThanStart }
+
+typedef SelectionChanged<T> = void Function(T a, T b, T c);
+
+class CircularSliderPaint extends StatefulWidget {
+  final CircularSliderMode mode;
+  final int init;
+  final int end;
+  final int divisions;
+  final int primarySectors;
+  final int secondarySectors;
+  final SelectionChanged<int> onSelectionChange;
+  final SelectionChanged<int> onSelectionEnd;
+  final Color baseColor;
+  final Color selectionColor;
+  final Color handlerColor;
+  final double handlerOutterRadius;
+  final Widget child;
+  final bool showRoundedCapInSelection;
+  final bool showHandlerOutter;
+  final double sliderStrokeWidth;
+  final bool shouldCountLaps;
+
+  CircularSliderPaint({
+    @required this.mode,
+    @required this.divisions,
+    @required this.init,
+    @required this.end,
+    this.child,
+    @required this.primarySectors,
+    @required this.secondarySectors,
+    @required this.onSelectionChange,
+    @required this.onSelectionEnd,
+    @required this.baseColor,
+    @required this.selectionColor,
+    @required this.handlerColor,
+    @required this.handlerOutterRadius,
+    @required this.showRoundedCapInSelection,
+    @required this.showHandlerOutter,
+    @required this.sliderStrokeWidth,
+    @required this.shouldCountLaps,
+  });
+
+  @override
+  _CircularSliderState createState() => _CircularSliderState();
+}
+
+class _CircularSliderState extends State<CircularSliderPaint> {
+  bool _isInitHandlerSelected = false;
+  bool _isEndHandlerSelected = false;
+
+  SliderPainter _painter;
+
+  /// start angle in radians where we need to locate the init handler
+  double _startAngle;
+
+  /// end angle in radians where we need to locate the end handler
+  double _endAngle;
+
+  /// the absolute angle in radians representing the selection
+  double _sweepAngle;
+
+  /// in case we have a double slider and we want to move the whole selection by clicking in the slider
+  /// this will capture the position in the selection relative to the initial handler
+  /// that way we will be able to keep the selection constant when moving
+  int _differenceFromInitPoint;
+
+  /// will store the number of full laps (2pi radians) as part of the selection
+  int _laps = 0;
+
+  /// will be used to calculate in the next movement if we need to increase or decrease _laps
+  SlidingState _slidingState = SlidingState.none;
+
+  bool get isDoubleHandler => widget.mode == CircularSliderMode.doubleHandler;
+
+  bool get isSingleHandler => widget.mode == CircularSliderMode.singleHandler;
+
+  bool get isBothHandlersSelected =>
+      _isEndHandlerSelected && _isInitHandlerSelected;
+
+  bool get isNoHandlersSelected =>
+      !_isEndHandlerSelected && !_isInitHandlerSelected;
+
+  @override
+  void initState() {
+    super.initState();
+    _calculatePaintData();
+  }
+
+  // we need to update this widget both with gesture detector but
+  // also when the parent widget rebuilds itself
+  @override
+  void didUpdateWidget(CircularSliderPaint oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.init != widget.init || oldWidget.end != widget.end) {
+      _calculatePaintData();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return RawGestureDetector(
+      gestures: <Type, GestureRecognizerFactory>{
+        CustomPanGestureRecognizer:
+        GestureRecognizerFactoryWithHandlers<CustomPanGestureRecognizer>(
+              () => CustomPanGestureRecognizer(
+            onPanDown: _onPanDown,
+            onPanUpdate: _onPanUpdate,
+            onPanEnd: _onPanEnd,
+          ),
+              (CustomPanGestureRecognizer instance) {},
+        ),
+      },
+      child: CustomPaint(
+        painter: BasePainter(
+          baseColor: widget.baseColor,
+          selectionColor: widget.selectionColor,
+          primarySectors: widget.primarySectors,
+          secondarySectors: widget.secondarySectors,
+          sliderStrokeWidth: widget.sliderStrokeWidth,
+        ),
+        foregroundPainter: _painter,
+        child: Padding(
+          padding: const EdgeInsets.all(12.0),
+          child: widget.child,
+        ),
+      ),
+    );
+  }
+
+  void _calculatePaintData() {
+    var initPercent = isDoubleHandler
+        ? valueToPercentage(widget.init, widget.divisions)
+        : 0.0;
+    var endPercent = valueToPercentage(widget.end, widget.divisions);
+    var sweep = getSweepAngle(initPercent, endPercent);
+
+    var previousStartAngle = _startAngle;
+    var previousEndAngle = _endAngle;
+
+    _startAngle = isDoubleHandler ? percentageToRadians(initPercent) : 0.0;
+    _endAngle = percentageToRadians(endPercent);
+    _sweepAngle = percentageToRadians(sweep.abs());
+
+    // update full laps if need be
+    if (widget.shouldCountLaps) {
+      var newSlidingState = _calculateSlidingState(_startAngle, _endAngle);
+      if (isSingleHandler) {
+        _laps = _calculateLapsForsSingleHandler(
+            _endAngle, previousEndAngle, _slidingState, _laps);
+        _slidingState = newSlidingState;
+      } else {
+        // is double handler
+        if (newSlidingState != _slidingState) {
+          _laps = _calculateLapsForDoubleHandler(
+              _startAngle,
+              _endAngle,
+              previousStartAngle,
+              previousEndAngle,
+              _slidingState,
+              newSlidingState,
+              _laps);
+          _slidingState = newSlidingState;
+        }
+      }
+    }
+
+    _painter = SliderPainter(
+      mode: widget.mode,
+      startAngle: _startAngle,
+      endAngle: _endAngle,
+      sweepAngle: _sweepAngle,
+      selectionColor: widget.selectionColor,
+      handlerColor: widget.handlerColor,
+      handlerOutterRadius: widget.handlerOutterRadius,
+      showRoundedCapInSelection: widget.showRoundedCapInSelection,
+      showHandlerOutter: widget.showHandlerOutter,
+      sliderStrokeWidth: widget.sliderStrokeWidth,
+    );
+  }
+
+  int _calculateLapsForsSingleHandler(
+      double end, double prevEnd, SlidingState slidingState, int laps) {
+    if (slidingState != SlidingState.none) {
+      if (radiansWasModuloed(end, prevEnd)) {
+        var lapIncrement = end < prevEnd ? 1 : -1;
+        var newLaps = laps + lapIncrement;
+        return newLaps < 0 ? 0 : newLaps;
+      }
+    }
+    return laps;
+  }
+
+  int _calculateLapsForDoubleHandler(
+      double start,
+      double end,
+      double prevStart,
+      double prevEnd,
+      SlidingState slidingState,
+      SlidingState newSlidingState,
+      int laps) {
+    if (slidingState != SlidingState.none) {
+      if (!radiansWasModuloed(start, prevStart) &&
+          !radiansWasModuloed(end, prevEnd)) {
+        var lapIncrement =
+        newSlidingState == SlidingState.endIsBiggerThanStart ? 1 : -1;
+        var newLaps = laps + lapIncrement;
+        return newLaps < 0 ? 0 : newLaps;
+      }
+    }
+    return laps;
+  }
+
+  SlidingState _calculateSlidingState(double start, double end) {
+    return end > start
+        ? SlidingState.endIsBiggerThanStart
+        : SlidingState.endIsSmallerThanStart;
+  }
+
+  void _onPanUpdate(Offset details) {
+    if (!_isInitHandlerSelected && !_isEndHandlerSelected) {
+      return;
+    }
+    if (_painter.center == null) {
+      return;
+    }
+    _handlePan(details, false);
+  }
+
+  void _onPanEnd(Offset details) {
+    _handlePan(details, true);
+
+    _isInitHandlerSelected = false;
+    _isEndHandlerSelected = false;
+  }
+
+  void _handlePan(Offset details, bool isPanEnd) {
+    RenderBox renderBox = context.findRenderObject();
+    var position = renderBox.globalToLocal(details);
+
+    var angle = coordinatesToRadians(_painter.center, position);
+    var percentage = radiansToPercentage(angle);
+    var newValue = percentageToValue(percentage, widget.divisions);
+
+    if (isBothHandlersSelected) {
+      var newValueInit =
+          (newValue - _differenceFromInitPoint) % widget.divisions;
+      if (newValueInit != widget.init) {
+        var newValueEnd =
+            (widget.end + (newValueInit - widget.init)) % widget.divisions;
+        widget.onSelectionChange(newValueInit, newValueEnd, _laps);
+        if (isPanEnd) {
+          widget.onSelectionEnd(newValueInit, newValueEnd, _laps);
+        }
+      }
+      return;
+    }
+
+    // isDoubleHandler but one handler was selected
+    if (_isInitHandlerSelected) {
+      widget.onSelectionChange(newValue, widget.end, _laps);
+      if (isPanEnd) {
+        widget.onSelectionEnd(newValue, widget.end, _laps);
+      }
+    } else {
+      widget.onSelectionChange(widget.init, newValue, _laps);
+      if (isPanEnd) {
+        widget.onSelectionEnd(widget.init, newValue, _laps);
+      }
+    }
+  }
+
+  bool _onPanDown(Offset details) {
+    if (_painter == null) {
+      return false;
+    }
+    RenderBox renderBox = context.findRenderObject();
+    var position = renderBox.globalToLocal(details);
+
+    if (position == null) {
+      return false;
+    }
+
+    if (isSingleHandler) {
+      if (isPointAlongCircle(position, _painter.center, _painter.radius)) {
+        _isEndHandlerSelected = true;
+        _onPanUpdate(details);
+      }
+    } else {
+      _isInitHandlerSelected = isPointInsideCircle(
+          position, _painter.initHandler, widget.handlerOutterRadius);
+
+      if (!_isInitHandlerSelected) {
+        _isEndHandlerSelected = isPointInsideCircle(
+            position, _painter.endHandler, widget.handlerOutterRadius);
+      }
+
+      if (isNoHandlersSelected) {
+        // we check if the user pressed in the selection in a double handler slider
+        // that means the user wants to move the selection as a whole
+        if (isPointAlongCircle(position, _painter.center, _painter.radius)) {
+          var angle = coordinatesToRadians(_painter.center, position);
+          if (isAngleInsideRadiansSelection(angle, _startAngle, _sweepAngle)) {
+            _isEndHandlerSelected = true;
+            _isInitHandlerSelected = true;
+            var positionPercentage = radiansToPercentage(angle);
+
+            // no need to account for negative values, that will be sorted out in the onPanUpdate
+            _differenceFromInitPoint =
+                percentageToValue(positionPercentage, widget.divisions) -
+                    widget.init;
+          }
+        }
+      }
+    }
+    return _isInitHandlerSelected || _isEndHandlerSelected;
+  }
+}
+
+class CustomPanGestureRecognizer extends OneSequenceGestureRecognizer {
+  final Function onPanDown;
+  final Function onPanUpdate;
+  final Function onPanEnd;
+
+  CustomPanGestureRecognizer({
+    @required this.onPanDown,
+    @required this.onPanUpdate,
+    @required this.onPanEnd,
+  });
+
+  @override
+  void addPointer(PointerEvent event) {
+    if (onPanDown(event.position)) {
+      startTrackingPointer(event.pointer);
+      resolve(GestureDisposition.accepted);
+    } else {
+      stopTrackingPointer(event.pointer);
+    }
+  }
+
+  @override
+  void handleEvent(PointerEvent event) {
+    if (event is PointerMoveEvent) {
+      onPanUpdate(event.position);
+    }
+    if (event is PointerUpEvent) {
+      onPanEnd(event.position);
+      stopTrackingPointer(event.pointer);
+    }
+  }
+
+  @override
+  String get debugDescription => 'customPan';
+
+  @override
+  void didStopTrackingLastPointer(int pointer) {}
+}

lib/plugins/circular_slider/double_circular_slider.dart

@@ -0,0 +1,148 @@
+import 'package:flutter/material.dart';
+
+import 'circular_slider_paint.dart';
+
+/// Returns a widget which displays a circle to be used as a slider.
+///
+/// Required arguments are init and end to set the initial selection.
+/// onSelectionChange is a callback function which returns new values as the user
+/// changes the interval.
+/// The rest of the params are used to change the look and feel.
+///
+///     DoubleCircularSlider(5, 10, onSelectionChange: () => {});
+class DoubleCircularSlider extends StatefulWidget {
+  /// the selection will be values between 0..divisions; max value is 300
+  final int divisions;
+
+  /// the initial value in the selection
+  final int init;
+
+  /// the end value in the selection
+  final int end;
+
+  /// the number of primary sectors to be painted
+  /// will be painted using selectionColor
+  final int primarySectors;
+
+  /// the number of secondary sectors to be painted
+  /// will be painted using baseColor
+  final int secondarySectors;
+
+  /// an optional widget that would be mounted inside the circle
+  final Widget child;
+
+  /// height of the canvas, default at 220
+  final double height;
+
+  /// width of the canvas, default at 220
+  final double width;
+
+  /// color of the base circle and sections
+  final Color baseColor;
+
+  /// color of the selection
+  final Color selectionColor;
+
+  /// color of the handlers
+  final Color handlerColor;
+
+  /// callback function when init and end change
+  /// (int init, int end) => void
+  final SelectionChanged<int> onSelectionChange;
+
+  /// callback function when init and end finish
+  /// (int init, int end) => void
+  final SelectionChanged<int> onSelectionEnd;
+
+  /// outter radius for the handlers
+  final double handlerOutterRadius;
+
+  /// if true an extra handler ring will be displayed in the handler
+  final bool showHandlerOutter;
+
+  /// stroke width for the slider, defaults at 12.0
+  final double sliderStrokeWidth;
+
+  /// if true, the onSelectionChange will also return the number of laps in the slider
+  /// otherwise, everytime the user completes a full lap, the selection restarts from 0
+  final bool shouldCountLaps;
+
+  DoubleCircularSlider(
+      this.divisions,
+      this.init,
+      this.end, {
+        this.height,
+        this.width,
+        this.child,
+        this.primarySectors,
+        this.secondarySectors,
+        this.baseColor,
+        this.selectionColor,
+        this.handlerColor,
+        this.onSelectionChange,
+        this.onSelectionEnd,
+        this.handlerOutterRadius,
+        this.showHandlerOutter,
+        this.sliderStrokeWidth,
+        this.shouldCountLaps,
+      })  : assert(init >= 0 && init <= divisions,
+  'init has to be > 0 and < divisions value'),
+        assert(end >= 0 && end <= divisions,
+        'end has to be > 0 and < divisions value'),
+        assert(divisions >= 0 && divisions <= 300,
+        'divisions has to be > 0 and <= 300');
+
+  @override
+  _DoubleCircularSliderState createState() => _DoubleCircularSliderState();
+}
+
+class _DoubleCircularSliderState extends State<DoubleCircularSlider> {
+  int _init;
+  int _end;
+
+  @override
+  void initState() {
+    super.initState();
+    _init = widget.init;
+    _end = widget.end;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+        height: widget.height ?? 220,
+        width: widget.width ?? 220,
+        child: CircularSliderPaint(
+          mode: CircularSliderMode.doubleHandler,
+          init: _init,
+          end: _end,
+          divisions: widget.divisions,
+          primarySectors: widget.primarySectors ?? 0,
+          secondarySectors: widget.secondarySectors ?? 0,
+          child: widget.child,
+          onSelectionChange: (newInit, newEnd, laps) {
+            if (widget.onSelectionChange != null) {
+              widget.onSelectionChange(newInit, newEnd, laps);
+            }
+            setState(() {
+              _init = newInit;
+              _end = newEnd;
+            });
+          },
+          onSelectionEnd: (newInit, newEnd, laps) {
+            if (widget.onSelectionEnd != null) {
+              widget.onSelectionEnd(newInit, newEnd, laps);
+            }
+          },
+          sliderStrokeWidth: widget.sliderStrokeWidth ?? 12.0,
+          baseColor: widget.baseColor ?? Color.fromRGBO(255, 255, 255, 0.1),
+          selectionColor:
+          widget.selectionColor ?? Color.fromRGBO(255, 255, 255, 0.3),
+          handlerColor: widget.handlerColor ?? Colors.white,
+          handlerOutterRadius: widget.handlerOutterRadius ?? 12.0,
+          showRoundedCapInSelection: false,
+          showHandlerOutter: widget.showHandlerOutter ?? true,
+          shouldCountLaps: widget.shouldCountLaps ?? false,
+        ));
+  }
+}

lib/plugins/circular_slider/single_circular_slider.dart

@@ -0,0 +1,147 @@
+import 'package:flutter/material.dart';
+
+import 'circular_slider_paint.dart';
+
+import '../../utils/logger.dart';
+
+/// Returns a widget which displays a circle to be used as a slider.
+///
+/// Required arguments are position and divisions to set the initial selection.
+/// onSelectionChange is a callback function which returns new values as the user
+/// changes the interval.
+/// The rest of the params are used to change the look and feel.
+///
+///     SingleCircularSlider(5, 10, onSelectionChange: () => {});
+class SingleCircularSlider extends StatefulWidget {
+  /// the selection will be values between 0..divisions; max value is 300
+  final int divisions;
+
+  /// the initial value in the selection
+  int position;
+
+  /// the number of primary sectors to be painted
+  /// will be painted using selectionColor
+  final int primarySectors;
+
+  /// the number of secondary sectors to be painted
+  /// will be painted using baseColor
+  final int secondarySectors;
+
+  /// an optional widget that would be mounted inside the circle
+  final Widget child;
+
+  /// height of the canvas, default at 220
+  final double height;
+
+  /// width of the canvas, default at 220
+  final double width;
+
+  /// color of the base circle and sections
+  final Color baseColor;
+
+  /// color of the selection
+  final Color selectionColor;
+
+  /// color of the handlers
+  final Color handlerColor;
+
+  /// callback function when init and end change
+  /// (int init, int end) => void
+  final SelectionChanged<int> onSelectionChange;
+
+  /// callback function when init and end finish
+  /// (int init, int end) => void
+  final SelectionChanged<int> onSelectionEnd;
+
+  /// outter radius for the handlers
+  final double handlerOutterRadius;
+
+  /// if true will paint a rounded cap in the selection slider start
+  final bool showRoundedCapInSelection;
+
+  /// if true an extra handler ring will be displayed in the handler
+  final bool showHandlerOutter;
+
+  /// stroke width for the slider, defaults at 12.0
+  final double sliderStrokeWidth;
+
+  /// if true, the onSelectionChange will also return the number of laps in the slider
+  /// otherwise, everytime the user completes a full lap, the selection restarts from 0
+  final bool shouldCountLaps;
+
+  SingleCircularSlider(
+      this.divisions,
+      this.position, {
+        this.height,
+        this.width,
+        this.child,
+        this.primarySectors,
+        this.secondarySectors,
+        this.baseColor,
+        this.selectionColor,
+        this.handlerColor,
+        this.onSelectionChange,
+        this.onSelectionEnd,
+        this.handlerOutterRadius,
+        this.showRoundedCapInSelection,
+        this.showHandlerOutter,
+        this.sliderStrokeWidth,
+        this.shouldCountLaps,
+      })  : assert(position >= 0 && position <= divisions,
+  'init has to be > 0 and < divisions value'),
+        assert(divisions >= 0 && divisions <= 300,
+        'divisions has to be > 0 and <= 300');
+
+  @override
+  _SingleCircularSliderState createState() => _SingleCircularSliderState();
+}
+
+class _SingleCircularSliderState extends State<SingleCircularSlider> {
+  int _end;
+
+  @override
+  void initState() {
+    super.initState();
+    _end = widget.position;
+    Logger.d('Init: _end=$_end');
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Logger.d('Build: _end=$_end');
+    return Container(
+        height: widget.height ?? 220,
+        width: widget.width ?? 220,
+        child: CircularSliderPaint(
+          mode: CircularSliderMode.singleHandler,
+          init: 0,
+          end: _end,
+          divisions: widget.divisions,
+          primarySectors: widget.primarySectors ?? 0,
+          secondarySectors: widget.secondarySectors ?? 0,
+          child: widget.child,
+          onSelectionChange: (newInit, newEnd, laps) {
+            if (widget.onSelectionChange != null) {
+              widget.onSelectionChange(newInit, newEnd, laps);
+            }
+            setState(() {
+              _end = newEnd;
+            });
+          },
+          onSelectionEnd: (newInit, newEnd, laps) {
+            if (widget.onSelectionEnd != null) {
+              widget.onSelectionEnd(newInit, newEnd, laps);
+            }
+          },
+          sliderStrokeWidth: widget.sliderStrokeWidth ?? 12.0,
+          baseColor: widget.baseColor ?? Color.fromRGBO(255, 255, 255, 0.1),
+          selectionColor:
+          widget.selectionColor ?? Color.fromRGBO(255, 255, 255, 0.3),
+          handlerColor: widget.handlerColor ?? Colors.white,
+          handlerOutterRadius: widget.handlerOutterRadius ?? 12.0,
+          showRoundedCapInSelection: widget.showRoundedCapInSelection ?? false,
+          showHandlerOutter: widget.showHandlerOutter ?? true,
+          shouldCountLaps: widget.shouldCountLaps ?? false,
+        ));
+  }
+}

lib/plugins/circular_slider/slider_painter.dart

@@ -0,0 +1,77 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+
+import 'circular_slider_paint.dart' show CircularSliderMode;
+import 'utils.dart';
+
+class SliderPainter extends CustomPainter {
+  CircularSliderMode mode;
+  double startAngle;
+  double endAngle;
+  double sweepAngle;
+  Color selectionColor;
+  Color handlerColor;
+  double handlerOutterRadius;
+  bool showRoundedCapInSelection;
+  bool showHandlerOutter;
+  double sliderStrokeWidth;
+
+  Offset initHandler;
+  Offset endHandler;
+  Offset center;
+  double radius;
+
+  SliderPainter({
+    @required this.mode,
+    @required this.startAngle,
+    @required this.endAngle,
+    @required this.sweepAngle,
+    @required this.selectionColor,
+    @required this.handlerColor,
+    @required this.handlerOutterRadius,
+    @required this.showRoundedCapInSelection,
+    @required this.showHandlerOutter,
+    @required this.sliderStrokeWidth,
+  });
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    Paint progress = _getPaint(color: selectionColor);
+
+    center = Offset(size.width / 2, size.height / 2);
+    radius = min(size.width / 2, size.height / 2) - sliderStrokeWidth;
+
+    canvas.drawArc(Rect.fromCircle(center: center, radius: radius),
+        -pi / 2 + startAngle, sweepAngle, false, progress);
+
+    Paint handler = _getPaint(color: handlerColor, style: PaintingStyle.fill);
+    Paint handlerOutter = _getPaint(color: handlerColor, width: 2.0);
+
+    // draw handlers
+    if (mode == CircularSliderMode.doubleHandler) {
+      initHandler = radiansToCoordinates(center, -pi / 2 + startAngle, radius);
+      canvas.drawCircle(initHandler, 8.0, handler);
+      canvas.drawCircle(initHandler, handlerOutterRadius, handlerOutter);
+    }
+
+    endHandler = radiansToCoordinates(center, -pi / 2 + endAngle, radius);
+    canvas.drawCircle(endHandler, 8.0, handler);
+    if (showHandlerOutter) {
+      canvas.drawCircle(endHandler, handlerOutterRadius, handlerOutter);
+    }
+  }
+
+  Paint _getPaint({@required Color color, double width, PaintingStyle style}) =>
+      Paint()
+        ..color = color
+        ..strokeCap =
+        showRoundedCapInSelection ? StrokeCap.round : StrokeCap.butt
+        ..style = style ?? PaintingStyle.stroke
+        ..strokeWidth = width ?? sliderStrokeWidth;
+
+  @override
+  bool shouldRepaint(CustomPainter oldDelegate) {
+    return true;
+  }
+}