0.6.5

History tweaks

.gitignore

@@ -11,3 +11,5 @@ build/
 .idea/
 
 key.properties
+premium_features_manager.class.dart
+pubspec.lock

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at vyalov.egor@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

README.md

@@ -2,12 +2,8 @@
 ## Native Android client for Home Assistant
 ### With Lovelace UI support
 
-Home Assistant Android client on Dart with Flutter.
+Visit [homemade.systems](http://ha-client.homemade.systems/) for more info.
 
-Visit [www.keyboardcrumbs.io](http://www.keyboardcrumbs.io/ha-client) for more info.
+Download the app from [Google Play](https://play.google.com/apps/testing/com.keyboardcrumbs.haclient)
 
-Join [Google Group](https://groups.google.com/d/forum/ha-client-alpha-testing) to become an alpha tester
+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)
-
-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 in [Discord](https://discord.gg/NSaQEQ8)

android/app/build.gradle

@@ -29,7 +29,12 @@ def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
     lintOptions {
         disable 'InvalidPackage'
@@ -38,7 +43,7 @@ android {
     defaultConfig {
         applicationId "com.keyboardcrumbs.haclient"
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -65,7 +70,10 @@ flutter {
 }
 
 dependencies {
+    implementation 'com.google.firebase:firebase-core:16.0.8'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
+
+apply plugin: 'com.google.gms.google-services'

android/app/google-services.json

@@ -0,0 +1,42 @@
+{
+  "project_info": {
+    "project_number": "441874387819",
+    "firebase_url": "https://ha-client-c73c4.firebaseio.com",
+    "project_id": "ha-client-c73c4",
+    "storage_bucket": "ha-client-c73c4.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:441874387819:android:92c7efc892dc3d45",
+        "android_client_info": {
+          "package_name": "com.keyboardcrumbs.haclient"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "441874387819-id0hqsfprj3b5kc312faqv3lmdfpm7l8.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBsl9cjBY633IrdrTyCsLFlO9lfsYJ0OJU"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/main/AndroidManifest.xml

@@ -6,6 +6,11 @@
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -13,9 +18,15 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name=".Application"
         android:label="HA Client"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:usesCleartextTraffic="true">
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="ha_notify" />
+
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
@@ -26,14 +37,33 @@
             <!-- This keeps the window background of the activity showing
                  until Flutter renders its first frame. It can be removed if
                  there is no splash screen (such as the default splash screen
-                 defined in @style/LaunchTheme). -->
+                 defined in @style/LaunchTheme).
             <meta-data
                 android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
+                android:value="true" />-->
+            <intent-filter>
+                <action android:name="FLUTTER_NOTIFICATION_CLICK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </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,18 @@
+package com.keyboardcrumbs.hassclient;
+
+import io.flutter.app.FlutterApplication;
+import io.flutter.plugin.common.PluginRegistry;
+import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback;
+import io.flutter.plugins.GeneratedPluginRegistrant;
+
+public class Application extends FlutterApplication implements PluginRegistrantCallback {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+    }
+
+    @Override
+    public void registerWith(PluginRegistry registry) {
+        GeneratedPluginRegistrant.registerWith(registry);
+    }
+}

android/build.gradle

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

android/gradle.properties

@@ -1 +1,5 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx2g
+org.gradle.daemon=true
+org.gradle.caching=true
+android.useAndroidX=true
+android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

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

assets/js/externalAuth.js

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

docs/empty

@@ -0,0 +1 @@
+

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/const.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of 'main.dart';
 
 class EntityState {
   static const on = 'on';
@@ -28,16 +28,57 @@ class EntityState {
   static const unavailable = 'unavailable';
   static const ok = 'ok';
   static const problem = 'problem';
+  static const active = 'active';
 }
 
-class EntityTapAction {
+class EntityUIAction {
   static const moreInfo = 'more-info';
   static const toggle = 'toggle';
   static const callService = 'call-service';
+  static const navigate = 'navigate';
   static const none = 'none';
+
+  String tapAction = EntityUIAction.moreInfo;
+  String tapNavigationPath;
+  String tapService;
+  Map<String, dynamic> tapServiceData;
+  String holdAction = EntityUIAction.none;
+  String holdNavigationPath;
+  String holdService;
+  Map<String, dynamic> holdServiceData;
+
+  EntityUIAction({rawEntityData}) {
+    if (rawEntityData != null) {
+      if (rawEntityData["tap_action"] != null) {
+        if (rawEntityData["tap_action"] is String) {
+          tapAction = rawEntityData["tap_action"];
+        } else {
+          tapAction =
+              rawEntityData["tap_action"]["action"] ?? EntityUIAction.moreInfo;
+          tapNavigationPath = rawEntityData["tap_action"]["navigation_path"];
+          tapService = rawEntityData["tap_action"]["service"];
+          tapServiceData = rawEntityData["tap_action"]["service_data"];
+        }
+      }
+      if (rawEntityData["hold_action"] != null) {
+        if (rawEntityData["hold_action"] is String) {
+          holdAction = rawEntityData["hold_action"];
+        } else {
+          holdAction =
+              rawEntityData["hold_action"]["action"] ?? EntityUIAction.none;
+          holdNavigationPath = rawEntityData["hold_action"]["navigation_path"];
+          holdService = rawEntityData["hold_action"]["service"];
+          holdServiceData = rawEntityData["hold_action"]["service_data"];
+        }
+      }
+    }
+  }
+
 }
 
 class CardType {
+  static const horizontalStack = "horizontal-stack";
+  static const verticalStack = "vertical-stack";
   static const entities = "entities";
   static const glance = "glance";
   static const mediaControl = "media-control";
@@ -54,4 +95,5 @@ class CardType {
   static const entityButton = "entity-button";
   static const conditional = "conditional";
   static const alarmPanel = "alarm-panel";
+  static const markdown = "markdown";
 }

lib/entities/alarm_control_panel/alarm_control_panel_entity.class.dart

@@ -0,0 +1,13 @@
+part of '../../main.dart';
+
+class AlarmControlPanelEntity extends Entity {
+  AlarmControlPanelEntity(Map rawData, String webHost) : super(rawData, webHost);
+
+
+  @override
+  Widget _buildAdditionalControlsForPage(BuildContext context) {
+    return AlarmControlPanelControlsWidget(
+      extended: false,
+    );
+  }
+}

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

@@ -0,0 +1,262 @@
+part of '../../../main.dart';
+
+class AlarmControlPanelControlsWidget extends StatefulWidget {
+
+  final bool extended;
+  final List states;
+
+  const AlarmControlPanelControlsWidget({Key key, @required this.extended, this.states}) : super(key: key);
+
+  @override
+  _AlarmControlPanelControlsWidgetWidgetState createState() => _AlarmControlPanelControlsWidgetWidgetState();
+
+}
+
+class _AlarmControlPanelControlsWidgetWidgetState extends State<AlarmControlPanelControlsWidget> {
+
+  String code = "";
+  List supportedStates;
+
+  @override
+  void initState() {
+    super.initState();
+    supportedStates = widget.states ?? ["arm_home", "arm_away"];
+  }
+
+
+  void _callService(AlarmControlPanelEntity entity, String service) {
+    eventBus.fire(new ServiceCallEvent(
+          entity.domain, service, entity.entityId,
+          {"code": "$code"}));
+    setState(() {
+      code = "";
+    });
+  }
+
+  void _pinPadHandler(value) {
+    setState(() {
+      code += "$value";
+    });
+  }
+
+  void _pinPadClear() {
+    setState(() {
+      code = "";
+    });
+  }
+
+  void _askToTrigger(AlarmControlPanelEntity entity) {
+    // flutter defined function
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        // return object of type Dialog
+        return AlertDialog(
+          title: new Text("Are you sure?"),
+          content: new Text("Are you sure want to trigger alarm ${entity.displayName}?"),
+          actions: <Widget>[
+            FlatButton(
+              child: new Text("Yes"),
+              onPressed: () {
+                eventBus.fire(new ServiceCallEvent(entity.domain, "alarm_trigger", entity.entityId, null));
+                Navigator.of(context).pop();
+              },
+            ),
+            FlatButton(
+              child: new Text("No"),
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final entityModel = EntityModel.of(context);
+    final AlarmControlPanelEntity entity = entityModel.entityWrapper.entity;
+    List<Widget> buttons = [];
+    if (entity.state == EntityState.alarm_disarmed) {
+      if (supportedStates.contains("arm_home")) {
+        buttons.add(
+          RaisedButton(
+            onPressed: () => _callService(entity, "alarm_arm_home"),
+            child: Text("ARM HOME"),
+          )
+        );
+      }
+      if (supportedStates.contains("arm_away")) {
+        buttons.add(
+            RaisedButton(
+              onPressed: () => _callService(entity, "alarm_arm_away"),
+              child: Text("ARM AWAY"),
+            )
+        );
+      }
+      if (widget.extended) {
+        if (supportedStates.contains("arm_night")) {
+          buttons.add(
+              RaisedButton(
+                onPressed: () => _callService(entity, "alarm_arm_night"),
+                child: Text("ARM NIGHT"),
+              )
+          );
+        }
+        if (supportedStates.contains("arm_custom_bypass")) {
+          buttons.add(
+              RaisedButton(
+                onPressed: () =>
+                    _callService(entity, "alarm_arm_custom_bypass"),
+                child: Text("ARM CUSTOM BYPASS"),
+              )
+          );
+        }
+      }
+    } else {
+      buttons.add(
+        RaisedButton(
+          onPressed: () => _callService(entity, "alarm_disarm"),
+          child: Text("DISARM"),
+        )
+      );
+    }
+    Widget pinPad;
+    if (entity.attributes["code_format"] == null) {
+      pinPad = Container(width: 0.0, height: 0.0,);
+    } else {
+      pinPad = Padding(
+          padding: EdgeInsets.only(bottom: Sizes.rowPadding),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              Wrap(
+                spacing: 5.0,
+                children: <Widget>[
+                  RaisedButton(
+                    onPressed: () => _pinPadHandler("1"),
+                    child: Text("1"),
+                  ),
+                  RaisedButton(
+                    onPressed: () => _pinPadHandler("2"),
+                    child: Text("2"),
+                  ),
+                  RaisedButton(
+                    onPressed: () => _pinPadHandler("3"),
+                    child: Text("3"),
+                  )
+                ],
+              ),
+              Wrap(
+                spacing: 5.0,
+                children: <Widget>[
+                  RaisedButton(
+                    onPressed: () => _pinPadHandler("4"),
+                    child: Text("4"),
+                  ),
+                  RaisedButton(
+                    onPressed: () => _pinPadHandler("5"),
+                    child: Text("5"),
+                  ),
+                  RaisedButton(
+                    onPressed: () => _pinPadHandler("6"),
+                    child: Text("6"),
+                  )
+                ],
+              ),
+              Wrap(
+                spacing: 5.0,
+                children: <Widget>[
+                  RaisedButton(
+                    onPressed: () => _pinPadHandler("7"),
+                    child: Text("7"),
+                  ),
+                  RaisedButton(
+                    onPressed: () => _pinPadHandler("8"),
+                    child: Text("8"),
+                  ),
+                  RaisedButton(
+                    onPressed: () => _pinPadHandler("9"),
+                    child: Text("9"),
+                  )
+                ],
+              ),
+              Wrap(
+                spacing: 5.0,
+                alignment: WrapAlignment.end,
+                children: <Widget>[
+                  RaisedButton(
+                    onPressed: () => _pinPadHandler("0"),
+                    child: Text("0"),
+                  ),
+                  RaisedButton(
+                    onPressed: () => _pinPadClear(),
+                    child: Text("CLEAR"),
+                  )
+                ],
+              )
+            ],
+          )
+      );
+    }
+    Widget inputWrapper;
+    if (entity.attributes["code_format"] == null) {
+      inputWrapper = Container(width: 0.0, height: 0.0,);
+    } else {
+      inputWrapper = Container(
+          width: 150.0,
+          child: TextField(
+              decoration: InputDecoration(
+                  labelText: "Alarm Code"
+              ),
+              //focusNode: _focusNode,
+              obscureText: true,
+              controller: new TextEditingController.fromValue(
+                  new TextEditingValue(
+                      text: code,
+                      selection:
+                      new TextSelection.collapsed(offset: code.length)
+                  )
+              ),
+              onChanged: (value) {
+                code = value;
+              }
+          )
+      );
+    }
+    Widget buttonsWrapper = Padding(
+        padding: EdgeInsets.symmetric(vertical: Sizes.rowPadding),
+        child: Wrap(
+            alignment: WrapAlignment.center,
+            spacing: 15.0,
+            runSpacing: Sizes.rowPadding,
+            children: buttons
+        )
+    );
+    Widget triggerButton = Row(
+      mainAxisAlignment: MainAxisAlignment.end,
+      children: [
+        FlatButton(
+          child: Text(
+            "TRIGGER",
+            style: TextStyle(color: Colors.redAccent)
+          ),
+          onPressed: () => _askToTrigger(entity),
+        )
+      ]
+    );
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: <Widget>[
+        widget.extended ? buttonsWrapper : inputWrapper,
+        widget.extended ? inputWrapper : buttonsWrapper,
+        widget.extended ? pinPad : triggerButton
+      ]
+
+    );
+  }
+
+
+}

lib/entities/automation/automation_entity.class.dart

@@ -0,0 +1,27 @@
+part of '../../main.dart';
+
+class AutomationEntity extends Entity {
+  AutomationEntity(Map rawData, String webHost) : super(rawData, webHost);
+
+
+  @override
+  Widget _buildStatePart(BuildContext context) {
+    return SwitchStateWidget();
+  }
+
+  @override
+  Widget _buildAdditionalControlsForPage(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      mainAxisSize: MainAxisSize.max,
+      children: <Widget>[
+        FlatServiceButton(
+          serviceDomain: domain,
+          entityId: entityId,
+          text: "TRIGGER",
+          serviceName: "trigger",
+        )
+      ],
+    );
+  }
+}

lib/entities/button/button_entity.class.dart

@@ -0,0 +1,16 @@
+part of '../../main.dart';
+
+class ButtonEntity extends Entity {
+  ButtonEntity(Map rawData, String webHost) : super(rawData, webHost);
+
+
+  @override
+  Widget _buildStatePart(BuildContext context) {
+    return FlatServiceButton(
+      entityId: entityId,
+      serviceDomain: domain,
+      serviceName: 'turn_on',
+      text: domain == "scene" ? "ACTIVATE" : "EXECUTE",
+    );
+  }
+}

lib/entities/camera/camera_entity.class.dart

@@ -0,0 +1,17 @@
+part of '../../main.dart';
+
+class CameraEntity extends Entity {
+
+  static const SUPPORT_ON_OFF = 1;
+
+  CameraEntity(Map rawData, String webHost) : super(rawData, webHost);
+
+  bool get supportOnOff => ((supportedFeatures &
+  CameraEntity.SUPPORT_ON_OFF) ==
+      CameraEntity.SUPPORT_ON_OFF);
+
+  @override
+  Widget _buildAdditionalControlsForPage(BuildContext context) {
+    return CameraStreamView();
+  }
+}

lib/entities/climate/climate_entity.class.dart

@@ -0,0 +1,114 @@
+part of '../../main.dart';
+
+class ClimateEntity extends Entity {
+
+  @override
+  EntityHistoryConfig historyConfig = EntityHistoryConfig(
+    chartType: EntityHistoryWidgetType.numericAttributes,
+    numericState: false,
+    numericAttributesToShow: ["current_temperature"]
+  );
+
+  static const SUPPORT_TARGET_TEMPERATURE = 1;
+  static const SUPPORT_TARGET_TEMPERATURE_RANGE = 2;
+  static const SUPPORT_TARGET_HUMIDITY = 4;
+  static const SUPPORT_FAN_MODE = 8;
+  static const SUPPORT_PRESET_MODE = 16;
+  static const SUPPORT_SWING_MODE = 32;
+  static const SUPPORT_AUX_HEAT = 64;
+
+
+  //static const SUPPORT_OPERATION_MODE = 16;
+  //static const SUPPORT_HOLD_MODE = 256;
+  //static const SUPPORT_AWAY_MODE = 1024;
+  //static const SUPPORT_ON_OFF = 4096;
+
+  ClimateEntity(Map rawData, String webHost) : super(rawData, webHost);
+
+  bool get supportTargetTemperature => ((supportedFeatures &
+  ClimateEntity.SUPPORT_TARGET_TEMPERATURE) ==
+      ClimateEntity.SUPPORT_TARGET_TEMPERATURE);
+  bool get supportTargetTemperatureRange => ((supportedFeatures &
+  ClimateEntity.SUPPORT_TARGET_TEMPERATURE_RANGE) ==
+      ClimateEntity.SUPPORT_TARGET_TEMPERATURE_RANGE);
+  bool get supportTargetHumidity => ((supportedFeatures &
+  ClimateEntity.SUPPORT_TARGET_HUMIDITY) ==
+      ClimateEntity.SUPPORT_TARGET_HUMIDITY);
+  bool get supportFanMode =>
+      ((supportedFeatures & ClimateEntity.SUPPORT_FAN_MODE) ==
+          ClimateEntity.SUPPORT_FAN_MODE);
+  bool get supportSwingMode =>
+      ((supportedFeatures & ClimateEntity.SUPPORT_SWING_MODE) ==
+          ClimateEntity.SUPPORT_SWING_MODE);
+  bool get supportPresetMode =>
+      ((supportedFeatures & ClimateEntity.SUPPORT_PRESET_MODE) ==
+          ClimateEntity.SUPPORT_PRESET_MODE);
+  bool get supportAuxHeat =>
+      ((supportedFeatures & ClimateEntity.SUPPORT_AUX_HEAT) ==
+          ClimateEntity.SUPPORT_AUX_HEAT);
+
+  List<String> get hvacModes => attributes["hvac_modes"] != null
+      ? (attributes["hvac_modes"] as List).cast<String>()
+      : null;
+  List<String> get fanModes => attributes["fan_modes"] != null
+      ? (attributes["fan_modes"] as List).cast<String>()
+      : null;
+  List<String> get presetModes => attributes["preset_modes"] != null
+      ? (attributes["preset_modes"] as List).cast<String>()
+      : null;
+  List<String> get swingModes => attributes["swing_modes"] != null
+      ? (attributes["swing_modes"] as List).cast<String>()
+      : null;
+  double get temperature => _getDoubleAttributeValue('temperature');
+  double get currentTemperature => _getDoubleAttributeValue('current_temperature');
+  double get targetHigh => _getDoubleAttributeValue('target_temp_high');
+  double get targetLow => _getDoubleAttributeValue('target_temp_low');
+  double get maxTemp => _getDoubleAttributeValue('max_temp') ?? 100.0;
+  double get minTemp => _getDoubleAttributeValue('min_temp') ?? -100.0;
+  double get targetHumidity => _getDoubleAttributeValue('humidity');
+  double get maxHumidity => _getDoubleAttributeValue('max_humidity');
+  double get minHumidity => _getDoubleAttributeValue('min_humidity');
+  double get temperatureStep => _getDoubleAttributeValue('target_temp_step') ?? 0.5;
+  String get hvacAction => attributes['hvac_action'];
+  String get fanMode => attributes['fan_mode'];
+  String get presetMode => attributes['preset_mode'];
+  String get swingMode => attributes['swing_mode'];
+  bool get awayMode => attributes['away_mode'] == "on";
+  //bool get isOff => state == EntityState.off;
+  bool get auxHeat => attributes['aux_heat'] == "on";
+
+  @override
+  void update(Map rawData, String webHost) {
+    super.update(rawData, webHost);
+    if (supportTargetTemperature) {
+      historyConfig.numericAttributesToShow.add("temperature");
+    }
+    if (supportTargetTemperatureRange) {
+      historyConfig.numericAttributesToShow.add("target_temp_high");
+      historyConfig.numericAttributesToShow.add("target_temp_low");
+    }
+  }
+
+  @override
+  Widget _buildStatePart(BuildContext context) {
+    return ClimateStateWidget();
+  }
+
+  @override
+  Widget _buildAdditionalControlsForPage(BuildContext context) {
+    return ClimateControlWidget();
+  }
+
+  @override
+  double _getDoubleAttributeValue(String attributeName) {
+    var temp1 = attributes["$attributeName"];
+    if (temp1 is int) {
+      return temp1.toDouble();
+    } else if (temp1 is double) {
+      return temp1;
+    } else {
+      return null;
+    }
+  }
+
+}

lib/entities/climate/widgets/climate_controls.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class ClimateControlWidget extends StatefulWidget {
 
@@ -13,26 +13,28 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   bool _showPending = false;
   bool _changedHere = false;
   Timer _resetTimer;
+  Timer _tempThrottleTimer;
+  Timer _targetTempThrottleTimer;
   double _tmpTemperature = 0.0;
   double _tmpTargetLow = 0.0;
   double _tmpTargetHigh = 0.0;
   double _tmpTargetHumidity = 0.0;
-  String _tmpOperationMode;
+  String _tmpHVACMode;
   String _tmpFanMode;
   String _tmpSwingMode;
-  bool _tmpAwayMode = false;
+  String _tmpPresetMode;
-  bool _tmpIsOff = false;
+  //bool _tmpIsOff = false;
   bool _tmpAuxHeat = false;
 
   void _resetVars(ClimateEntity entity) {
     _tmpTemperature = entity.temperature;
     _tmpTargetHigh = entity.targetHigh;
     _tmpTargetLow = entity.targetLow;
-    _tmpOperationMode = entity.operationMode;
+    _tmpHVACMode = entity.state;
     _tmpFanMode = entity.fanMode;
     _tmpSwingMode = entity.swingMode;
-    _tmpAwayMode = entity.awayMode;
+    _tmpPresetMode = entity.presetMode;
-    _tmpIsOff = entity.isOff;
+    //_tmpIsOff = entity.isOff;
     _tmpAuxHeat = entity.auxHeat;
     _tmpTargetHumidity = entity.targetHumidity;
 
@@ -40,53 +42,69 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     _changedHere = false;
   }
 
-  void _temperatureUp(ClimateEntity entity, double step) {
+  void _temperatureUp(ClimateEntity entity) {
-    _tmpTemperature = ((_tmpTemperature + step) <= entity.maxTemp) ? _tmpTemperature + step : entity.maxTemp;
+    _tmpTemperature = ((_tmpTemperature + entity.temperatureStep) <= entity.maxTemp) ? _tmpTemperature + entity.temperatureStep : entity.maxTemp;
     _setTemperature(entity);
   }
 
-  void _temperatureDown(ClimateEntity entity, double step) {
+  void _temperatureDown(ClimateEntity entity) {
-    _tmpTemperature = ((_tmpTemperature - step) >= entity.minTemp) ? _tmpTemperature - step : entity.minTemp;
+    _tmpTemperature = ((_tmpTemperature - entity.temperatureStep) >= entity.minTemp) ? _tmpTemperature - entity.temperatureStep : entity.minTemp;
     _setTemperature(entity);
   }
 
-  void _targetLowUp(ClimateEntity entity, double step) {
+  void _targetLowUp(ClimateEntity entity) {
-    _tmpTargetLow = ((_tmpTargetLow + step) <= entity.maxTemp) ? _tmpTargetLow + step : entity.maxTemp;
+    _tmpTargetLow = ((_tmpTargetLow + entity.temperatureStep) <= entity.maxTemp) ? _tmpTargetLow + entity.temperatureStep : entity.maxTemp;
     _setTargetTemp(entity);
   }
 
-  void _targetLowDown(ClimateEntity entity, double step) {
+  void _targetLowDown(ClimateEntity entity) {
-    _tmpTargetLow = ((_tmpTargetLow - step) >= entity.minTemp) ? _tmpTargetLow - step : entity.minTemp;
+    _tmpTargetLow = ((_tmpTargetLow - entity.temperatureStep) >= entity.minTemp) ? _tmpTargetLow - entity.temperatureStep : entity.minTemp;
     _setTargetTemp(entity);
   }
 
-  void _targetHighUp(ClimateEntity entity, double step) {
+  void _targetHighUp(ClimateEntity entity) {
-    _tmpTargetHigh = ((_tmpTargetHigh + step) <= entity.maxTemp) ? _tmpTargetHigh + step : entity.maxTemp;
+    _tmpTargetHigh = ((_tmpTargetHigh + entity.temperatureStep) <= entity.maxTemp) ? _tmpTargetHigh + entity.temperatureStep : entity.maxTemp;
     _setTargetTemp(entity);
   }
 
-  void _targetHighDown(ClimateEntity entity, double step) {
+  void _targetHighDown(ClimateEntity entity) {
-    _tmpTargetHigh = ((_tmpTargetHigh - step) >= entity.minTemp) ? _tmpTargetHigh - step : entity.minTemp;
+    _tmpTargetHigh = ((_tmpTargetHigh - entity.temperatureStep) >= entity.minTemp) ? _tmpTargetHigh - entity.temperatureStep : entity.minTemp;
     _setTargetTemp(entity);
   }
 
   void _setTemperature(ClimateEntity entity) {
+    if (_tempThrottleTimer!=null) {
+      _tempThrottleTimer.cancel();
+    }
     setState(() {
+      _changedHere = true;
       _tmpTemperature = double.parse(_tmpTemperature.toStringAsFixed(1));
+    });
+    _tempThrottleTimer = Timer(Duration(seconds: 2), () {
+      setState(() {
         _changedHere = true;
         eventBus.fire(new ServiceCallEvent(entity.domain, "set_temperature", entity.entityId,{"temperature": "${_tmpTemperature.toStringAsFixed(1)}"}));
         _resetStateTimer(entity);
       });
+    });
   }
 
   void _setTargetTemp(ClimateEntity entity) {
+    if (_targetTempThrottleTimer!=null) {
+      _targetTempThrottleTimer.cancel();
+    }
     setState(() {
+      _changedHere = true;
       _tmpTargetLow = double.parse(_tmpTargetLow.toStringAsFixed(1));
       _tmpTargetHigh = double.parse(_tmpTargetHigh.toStringAsFixed(1));
+    });
+    _targetTempThrottleTimer = Timer(Duration(seconds: 2), () {
+      setState(() {
         _changedHere = true;
         eventBus.fire(new ServiceCallEvent(entity.domain, "set_temperature", entity.entityId,{"target_temp_high": "${_tmpTargetHigh.toStringAsFixed(1)}", "target_temp_low": "${_tmpTargetLow.toStringAsFixed(1)}"}));
         _resetStateTimer(entity);
       });
+    });
   }
 
   void _setTargetHumidity(ClimateEntity entity, double value) {
@@ -98,11 +116,11 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     });
   }
 
-  void _setOperationMode(ClimateEntity entity, value) {
+  void _setHVACMode(ClimateEntity entity, value) {
     setState(() {
-      _tmpOperationMode = value;
+      _tmpHVACMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_operation_mode", entity.entityId,{"operation_mode": "$_tmpOperationMode"}));
+      eventBus.fire(new ServiceCallEvent(entity.domain, "set_hvac_mode", entity.entityId,{"hvac_mode": "$_tmpHVACMode"}));
       _resetStateTimer(entity);
     });
   }
@@ -125,23 +143,23 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     });
   }
 
-  void _setAwayMode(ClimateEntity entity, value) {
+  void _setPresetMode(ClimateEntity entity, value) {
     setState(() {
-      _tmpAwayMode = value;
+      _tmpPresetMode = value;
       _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_away_mode", entity.entityId,{"away_mode": "${_tmpAwayMode ? 'on' : 'off'}"}));
+      eventBus.fire(new ServiceCallEvent(entity.domain, "set_preset_mode", entity.entityId,{"preset_mode": "$_tmpPresetMode"}));
       _resetStateTimer(entity);
     });
   }
 
-  void _setOnOf(ClimateEntity entity, value) {
+  /*void _setOnOf(ClimateEntity entity, value) {
     setState(() {
       _tmpIsOff = !value;
       _changedHere = true;
       eventBus.fire(new ServiceCallEvent(entity.domain, "${_tmpIsOff ? 'turn_off' : 'turn_on'}", entity.entityId, null));
       _resetStateTimer(entity);
     });
-  }
+  }*/
 
   void _setAuxHeat(ClimateEntity entity, value) {
     setState(() {
@@ -167,7 +185,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     final entityModel = EntityModel.of(context);
     final ClimateEntity entity = entityModel.entityWrapper.entity;
     if (_changedHere) {
-      _showPending = (_tmpTemperature != entity.temperature);
+      _showPending = (_tmpTemperature != entity.temperature || _tmpTargetHigh != entity.targetHigh || _tmpTargetLow != entity.targetLow);
       _changedHere = false;
     } else {
       _resetTimer?.cancel();
@@ -178,33 +196,34 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
-          _buildOnOffControl(entity),
+          //_buildOnOffControl(entity),
           _buildTemperatureControls(entity),
           _buildTargetTemperatureControls(entity),
           _buildHumidityControls(entity),
           _buildOperationControl(entity),
           _buildFanControl(entity),
           _buildSwingControl(entity),
-          _buildAwayModeControl(entity),
+          _buildPresetModeControl(entity),
           _buildAuxHeatControl(entity)
         ],
       ),
     );
   }
 
-  Widget _buildAwayModeControl(ClimateEntity entity) {
+  Widget _buildPresetModeControl(ClimateEntity entity) {
-    if (entity.supportAwayMode) {
+    if (entity.supportPresetMode) {
-      return ModeSwitchWidget(
+      return ModeSelectorWidget(
-        caption: "Away mode",
+        options: entity.presetModes,
-        onChange: (value) => _setAwayMode(entity, value),
+        onChange: (mode) => _setPresetMode(entity, mode),
-        value: _tmpAwayMode,
+        caption: "Preset",
+        value: _tmpPresetMode,
       );
     } else {
       return Container(height: 0.0, width: 0.0,);
     }
   }
 
-  Widget _buildOnOffControl(ClimateEntity entity) {
+  /*Widget _buildOnOffControl(ClimateEntity entity) {
     if (entity.supportOnOff) {
       return ModeSwitchWidget(
           onChange: (value) => _setOnOf(entity, value),
@@ -214,7 +233,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     } else {
       return Container(height: 0.0, width: 0.0,);
     }
-  }
+  }*/
 
   Widget _buildAuxHeatControl(ClimateEntity entity) {
     if (entity.supportAuxHeat ) {
@@ -229,12 +248,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   }
 
   Widget _buildOperationControl(ClimateEntity entity) {
-    if (entity.supportOperationMode) {
+    if (entity.hvacModes != null) {
       return ModeSelectorWidget(
-        onChange: (mode) => _setOperationMode(entity, mode),
+        onChange: (mode) => _setHVACMode(entity, mode),
-        options: entity.operationList,
+        options: entity.hvacModes,
         caption: "Operation",
-        value: _tmpOperationMode,
+        value: _tmpHVACMode,
       );
     } else {
       return Container(height: 0.0, width: 0.0);
@@ -244,7 +263,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   Widget _buildFanControl(ClimateEntity entity) {
     if (entity.supportFanMode) {
       return ModeSelectorWidget(
-        options: entity.fanList,
+        options: entity.fanModes,
         onChange: (mode) => _setFanMode(entity, mode),
         caption: "Fan mode",
         value: _tmpFanMode,
@@ -258,7 +277,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     if (entity.supportSwingMode) {
       return ModeSelectorWidget(
           onChange: (mode) => _setSwingMode(entity, mode),
-          options: entity.swingList,
+          options: entity.swingModes,
           value: _tmpSwingMode,
           caption: "Swing mode"
       );
@@ -278,10 +297,8 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
           TemperatureControlWidget(
             value: _tmpTemperature,
             fontColor: _showPending ? Colors.red : Colors.black,
-            onLargeDec: () => _temperatureDown(entity, 0.5),
+            onDec: () => _temperatureDown(entity),
-            onLargeInc: () => _temperatureUp(entity, 0.5),
+            onInc: () => _temperatureUp(entity),
-            onSmallDec: () => _temperatureDown(entity, 0.1),
-            onSmallInc: () => _temperatureUp(entity, 0.1),
           )
         ],
       );
@@ -292,30 +309,26 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
 
   Widget _buildTargetTemperatureControls(ClimateEntity entity) {
     List<Widget> controls = [];
-    if ((entity.supportTargetTemperatureLow) && (entity.targetLow != null)) {
+    if ((entity.supportTargetTemperatureRange) && (entity.targetLow != null)) {
       controls.addAll(<Widget>[
         TemperatureControlWidget(
           value: _tmpTargetLow,
           fontColor: _showPending ? Colors.red : Colors.black,
-          onLargeDec: () => _targetLowDown(entity, 0.5),
+          onDec: () => _targetLowDown(entity),
-          onLargeInc: () => _targetLowUp(entity, 0.5),
+          onInc: () => _targetLowUp(entity),
-          onSmallDec: () => _targetLowDown(entity, 0.1),
-          onSmallInc: () => _targetLowUp(entity, 0.1),
         ),
         Expanded(
           child: Container(height: 10.0),
         )
       ]);
     }
-    if ((entity.supportTargetTemperatureHigh) && (entity.targetHigh != null)) {
+    if ((entity.supportTargetTemperatureRange) && (entity.targetHigh != null)) {
       controls.add(
           TemperatureControlWidget(
             value: _tmpTargetHigh,
             fontColor: _showPending ? Colors.red : Colors.black,
-            onLargeDec: () => _targetHighDown(entity, 0.5),
+            onDec: () => _targetHighDown(entity),
-            onLargeInc: () => _targetHighUp(entity, 0.5),
+            onInc: () => _targetHighUp(entity),
-            onSmallDec: () => _targetHighDown(entity, 0.1),
-            onSmallInc: () => _targetHighUp(entity, 0.1),
           )
       );
     }
@@ -396,72 +409,3 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   }
 
 }
-
-class TemperatureControlWidget extends StatelessWidget {
-  final double value;
-  final double fontSize;
-  final Color fontColor;
-  final onSmallInc;
-  final onLargeInc;
-  final onSmallDec;
-  final onLargeDec;
-
-  TemperatureControlWidget(
-      {Key key,
-        @required this.value,
-        @required this.onSmallInc,
-        @required this.onSmallDec,
-        @required this.onLargeInc,
-        @required this.onLargeDec,
-        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.createIconDataFromIconName(
-                  'mdi:chevron-up')),
-              iconSize: 30.0,
-              onPressed: () => onSmallInc(),
-            ),
-            IconButton(
-              icon: Icon(MaterialDesignIcons.createIconDataFromIconName(
-                  'mdi:chevron-down')),
-              iconSize: 30.0,
-              onPressed: () => onSmallDec(),
-            )
-          ],
-        ),
-        Column(
-          children: <Widget>[
-            IconButton(
-              icon: Icon(MaterialDesignIcons.createIconDataFromIconName(
-                  'mdi:chevron-double-up')),
-              iconSize: 30.0,
-              onPressed: () => onLargeInc(),
-            ),
-            IconButton(
-              icon: Icon(MaterialDesignIcons.createIconDataFromIconName(
-                  'mdi:chevron-double-down')),
-              iconSize: 30.0,
-              onPressed: () => onLargeDec(),
-            )
-          ],
-        )
-      ],
-    );
-  }
-}

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

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class ClimateStateWidget extends StatelessWidget {
   @override
@@ -8,13 +8,19 @@ class ClimateStateWidget extends StatelessWidget {
     String targetTemp = "-";
     if ((entity.supportTargetTemperature) && (entity.temperature != null)) {
       targetTemp = "${entity.temperature}";
-    } else if ((entity.supportTargetTemperatureLow) &&
+    } else if ((entity.supportTargetTemperatureRange) &&
-        (entity.targetLow != null)) {
+        (entity.targetLow != null) &&
-      targetTemp = "${entity.targetLow}";
-      if ((entity.supportTargetTemperatureHigh) &&
         (entity.targetHigh != null)) {
-        targetTemp += " - ${entity.targetHigh}";
+      targetTemp = "${entity.targetLow} - ${entity.targetHigh}";
     }
+    String displayState = '';
+    if (entity.hvacAction != null) {
+      displayState = "${entity.hvacAction} (${entity.displayState})";
+    } else {
+      displayState = "${entity.displayState}";
+    }
+    if (entity.presetMode != null) {
+      displayState += " - ${entity.presetMode}";
     }
     return Padding(
         padding: EdgeInsets.fromLTRB(
@@ -25,7 +31,7 @@ class ClimateStateWidget extends StatelessWidget {
           children: <Widget>[
             Row(
               children: <Widget>[
-                Text("${entity.state}",
+                Text("$displayState",
                     textAlign: TextAlign.right,
                     style: new TextStyle(
                       fontWeight: FontWeight.bold,
@@ -38,8 +44,8 @@ class ClimateStateWidget extends StatelessWidget {
                     ))
               ],
             ),
-            entity.attributes["current_temperature"] != null ?
+            entity.currentTemperature != null ?
-            Text("Currently: ${entity.attributes["current_temperature"]}",
+            Text("Currently: ${entity.currentTemperature}",
                 textAlign: TextAlign.right,
                 style: new TextStyle(
                     fontSize: Sizes.stateFontSize,

lib/entities/climate/widgets/temperature_control_widget.dart

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

lib/entities/cover/cover_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class CoverEntity extends Entity {
 
@@ -11,29 +11,31 @@ class CoverEntity extends Entity {
   static const SUPPORT_STOP_TILT = 64;
   static const SUPPORT_SET_TILT_POSITION = 128;
 
-  bool get supportOpen => ((attributes["supported_features"] &
+  CoverEntity(Map rawData, String webHost) : super(rawData, webHost);
+
+  bool get supportOpen => ((supportedFeatures &
   CoverEntity.SUPPORT_OPEN) ==
       CoverEntity.SUPPORT_OPEN);
-  bool get supportClose => ((attributes["supported_features"] &
+  bool get supportClose => ((supportedFeatures &
   CoverEntity.SUPPORT_CLOSE) ==
       CoverEntity.SUPPORT_CLOSE);
-  bool get supportSetPosition => ((attributes["supported_features"] &
+  bool get supportSetPosition => ((supportedFeatures &
   CoverEntity.SUPPORT_SET_POSITION) ==
       CoverEntity.SUPPORT_SET_POSITION);
-  bool get supportStop => ((attributes["supported_features"] &
+  bool get supportStop => ((supportedFeatures &
   CoverEntity.SUPPORT_STOP) ==
       CoverEntity.SUPPORT_STOP);
 
-  bool get supportOpenTilt => ((attributes["supported_features"] &
+  bool get supportOpenTilt => ((supportedFeatures &
   CoverEntity.SUPPORT_OPEN_TILT) ==
       CoverEntity.SUPPORT_OPEN_TILT);
-  bool get supportCloseTilt => ((attributes["supported_features"] &
+  bool get supportCloseTilt => ((supportedFeatures &
   CoverEntity.SUPPORT_CLOSE_TILT) ==
       CoverEntity.SUPPORT_CLOSE_TILT);
-  bool get supportStopTilt => ((attributes["supported_features"] &
+  bool get supportStopTilt => ((supportedFeatures &
   CoverEntity.SUPPORT_STOP_TILT) ==
       CoverEntity.SUPPORT_STOP_TILT);
-  bool get supportSetTiltPosition => ((attributes["supported_features"] &
+  bool get supportSetTiltPosition => ((supportedFeatures &
   CoverEntity.SUPPORT_SET_TILT_POSITION) ==
       CoverEntity.SUPPORT_SET_TILT_POSITION);
 
@@ -45,8 +47,6 @@ class CoverEntity extends Entity {
   bool get canTiltBeOpened => currentTiltPosition < 100;
   bool get canTiltBeClosed => currentTiltPosition > 0;
 
-  CoverEntity(Map rawData) : super(rawData);
-
   @override
   Widget _buildStatePart(BuildContext context) {
     return CoverStateWidget();

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

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class CoverControlWidget extends StatefulWidget {
 
@@ -157,7 +157,7 @@ class CoverTiltControlsWidget extends StatelessWidget {
     if (entity.supportOpenTilt) {
       buttons.add(IconButton(
           icon: Icon(
-            MaterialDesignIcons.createIconDataFromIconName(
+            MaterialDesignIcons.getIconDataFromIconName(
                 "mdi:arrow-top-right"),
             size: Sizes.iconSize,
           ),
@@ -170,7 +170,7 @@ class CoverTiltControlsWidget extends StatelessWidget {
     if (entity.supportStopTilt) {
       buttons.add(IconButton(
           icon: Icon(
-            MaterialDesignIcons.createIconDataFromIconName("mdi:stop"),
+            MaterialDesignIcons.getIconDataFromIconName("mdi:stop"),
             size: Sizes.iconSize,
           ),
           onPressed: () => _stop(entity)));
@@ -182,7 +182,7 @@ class CoverTiltControlsWidget extends StatelessWidget {
     if (entity.supportCloseTilt) {
       buttons.add(IconButton(
           icon: Icon(
-            MaterialDesignIcons.createIconDataFromIconName(
+            MaterialDesignIcons.getIconDataFromIconName(
                 "mdi:arrow-bottom-left"),
             size: Sizes.iconSize,
           ),

lib/entities/cover/widgets/cover_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class CoverStateWidget extends StatelessWidget {
   void _open(CoverEntity entity) {
@@ -24,7 +24,7 @@ class CoverStateWidget extends StatelessWidget {
     if (entity.supportOpen) {
       buttons.add(IconButton(
           icon: Icon(
-            MaterialDesignIcons.createIconDataFromIconName("mdi:arrow-up"),
+            MaterialDesignIcons.getIconDataFromIconName("mdi:arrow-up"),
             size: Sizes.iconSize,
           ),
           onPressed: entity.canBeOpened ? () => _open(entity) : null));
@@ -36,7 +36,7 @@ class CoverStateWidget extends StatelessWidget {
     if (entity.supportStop) {
       buttons.add(IconButton(
           icon: Icon(
-            MaterialDesignIcons.createIconDataFromIconName("mdi:stop"),
+            MaterialDesignIcons.getIconDataFromIconName("mdi:stop"),
             size: Sizes.iconSize,
           ),
           onPressed: () => _stop(entity)));
@@ -48,7 +48,7 @@ class CoverStateWidget extends StatelessWidget {
     if (entity.supportClose) {
       buttons.add(IconButton(
           icon: Icon(
-            MaterialDesignIcons.createIconDataFromIconName("mdi:arrow-down"),
+            MaterialDesignIcons.getIconDataFromIconName("mdi:arrow-down"),
             size: Sizes.iconSize,
           ),
           onPressed: entity.canBeClosed ? () => _close(entity) : null));

lib/entities/date_time/date_time_entity.class.dart

@@ -1,6 +1,8 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class DateTimeEntity extends Entity {
+  DateTimeEntity(Map rawData, String webHost) : super(rawData, webHost);
+
   bool get hasDate => attributes["has_date"] ?? false;
   bool get hasTime => attributes["has_time"] ?? false;
   int get year => attributes["year"] ?? 1970;
@@ -12,8 +14,6 @@ class DateTimeEntity extends Entity {
   String get formattedState => _getFormattedState();
   DateTime get dateTimeState => _getDateTimeState();
 
-  DateTimeEntity(Map rawData) : super(rawData);
-
   @override
   Widget _buildStatePart(BuildContext context) {
     return DateTimeStateWidget();

lib/entities/date_time/widgets/date_time_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class DateTimeStateWidget extends StatelessWidget {
   @override
@@ -54,7 +54,7 @@ class DateTimeStateWidget extends StatelessWidget {
         }
       });
     } else {
-      TheLogger.warning( "${entity.entityId} has no date and no time");
+      Logger.w( "${entity.entityId} has no date and no time");
     }
   }
 

lib/entities/entity.class.dart

@@ -1,5 +1,14 @@
 part of '../main.dart';
 
+class StatelessEntityType {
+  static const NONE = 0;
+  static const MISSED = 1;
+  static const DIVIDER = 2;
+  static const SECTION = 3;
+  static const CALL_SERVICE = 4;
+  static const WEBLINK = 5;
+}
+
 class Entity {
 
   static List badgeDomains = [
@@ -12,14 +21,66 @@ class Entity {
     "sensor"
   ];
 
+  static Map StateByDeviceClass = {
+    "battery.on": "Low",
+    "battery.off": "Normal",
+    "cold.on": "Cold",
+    "cold.off": "Normal",
+    "connectivity.on": "Connected",
+    "connectivity.off": "Disconnected",
+    "door.on": "Open",
+    "door.off": "Closed",
+    "garage_door.on": "Open",
+    "garage_door.off": "Closed",
+    "gas.on": "Detected",
+    "gas.off": "Clear",
+    "heat.on": "Hot",
+    "heat.off": "Normal",
+    "light.on": "Detected",
+    "lignt.off": "No light",
+    "lock.on": "Unlocked",
+    "lock.off": "Locked",
+    "moisture.on": "Wet",
+    "moisture.off": "Dry",
+    "motion.on": "Detected",
+    "motion.off": "Clear",
+    "moving.on": "Moving",
+    "moving.off": "Stopped",
+    "occupancy.on": "Occupied",
+    "occupancy.off": "Clear",
+    "opening.on": "Open",
+    "opening.off": "Closed",
+    "plug.on": "Plugged in",
+    "plug.off": "Unplugged",
+    "power.on": "Powered",
+    "power.off": "No power",
+    "presence.on": "Home",
+    "presence.off": "Away",
+    "problem.on": "Problem",
+    "problem.off": "OK",
+    "safety.on": "Unsafe",
+    "safety.off": "Safe",
+    "smoke.on": "Detected",
+    "smoke.off": "Clear",
+    "sound.on": "Detected",
+    "sound.off": "Clear",
+    "vibration.on": "Detected",
+    "vibration.off": "Clear",
+    "window.on": "Open",
+    "window.off": "Closed"
+  };
+
   Map attributes;
   String domain;
   String entityId;
+  String entityPicture;
   String state;
+  String displayState;
   DateTime _lastUpdated;
+  int statelessType = 0;
 
   List<Entity> childEntities = [];
-  List<String> attributesToShow = ["all"];
+  String deviceClass;
   EntityHistoryConfig historyConfig = EntityHistoryConfig(
     chartType: EntityHistoryWidgetType.simple
   );
@@ -27,7 +88,6 @@ class Entity {
   String get displayName =>
       attributes["friendly_name"] ?? (attributes["name"] ?? entityId.split(".")[1].replaceAll("_", " "));
 
-  String get deviceClass => attributes["device_class"] ?? null;
   bool get isView =>
       (domain == "group") &&
       (attributes != null ? attributes["view"] ?? false : false);
@@ -35,23 +95,68 @@ class Entity {
   bool get isBadge => Entity.badgeDomains.contains(domain);
   String get icon => attributes["icon"] ?? "";
   bool get isOn => state == EntityState.on;
-  String get entityPicture => attributes["entity_picture"];
   String get unitOfMeasurement => attributes["unit_of_measurement"] ?? "";
   List get childEntityIds => attributes["entity_id"] ?? [];
   String get lastUpdated => _getLastUpdatedFormatted();
   bool get isHidden => attributes["hidden"] ?? false;
   double get doubleState => double.tryParse(state) ?? 0.0;
+  int get supportedFeatures => attributes["supported_features"] ?? 0;
 
-  Entity(Map rawData) {
+  String _getEntityPictureUrl(String webHost) {
-    update(rawData);
+    String result = attributes["entity_picture"];
+    if (result == null) return result;
+    if (!result.startsWith("http")) {
+      if (result.startsWith("/")) {
+        result = "$webHost$result";
+      } else {
+        result = "$webHost/$result";
+      }
+    }
+    return result;
   }
 
-  void update(Map rawData) {
+  Entity(Map rawData, String webHost) {
+    update(rawData, webHost);
+  }
+
+  Entity.missed(String entityId) {
+    statelessType = StatelessEntityType.MISSED;
+    attributes = {"hidden": false};
+    this.entityId = entityId;
+  }
+
+  Entity.divider() {
+    statelessType = StatelessEntityType.DIVIDER;
+    attributes = {"hidden": false};
+  }
+
+  Entity.section(String label) {
+    statelessType = StatelessEntityType.SECTION;
+    attributes = {"hidden": false, "friendly_name": "$label"};
+  }
+
+  Entity.callService({String icon, String name, String service, String actionName}) {
+    statelessType = StatelessEntityType.CALL_SERVICE;
+    entityId = service;
+    displayState = actionName?.toUpperCase() ?? "RUN";
+    attributes = {"hidden": false, "friendly_name": "$name", "icon": "$icon"};
+  }
+
+  Entity.weblink({String url, String name, String icon}) {
+    statelessType = StatelessEntityType.WEBLINK;
+    entityId = "custom.custom"; //TODO wtf??
+    attributes = {"hidden": false, "friendly_name": "${name ?? url}", "icon": "${icon ?? 'mdi:link'}"};
+  }
+
+  void update(Map rawData, String webHost) {
     attributes = rawData["attributes"] ?? {};
     domain = rawData["entity_id"].split(".")[0];
     entityId = rawData["entity_id"];
+    deviceClass = attributes["device_class"];
     state = rawData["state"];
+    displayState = Entity.StateByDeviceClass["$deviceClass.$state"] ?? (state.toLowerCase() == 'unknown' ? '-' : state);
     _lastUpdated = DateTime.tryParse(rawData["last_updated"]);
+    entityPicture = _getEntityPictureUrl(webHost);
   }
 
   double _getDoubleAttributeValue(String attributeName) {
@@ -91,13 +196,6 @@ class Entity {
     );
   }
 
-  Widget buildGlanceWidget(BuildContext context, bool showName, bool showState) {
-    return GlanceEntityContainer(
-      showName: showName,
-      showState: showState,
-    );
-  }
-
   Widget _buildStatePart(BuildContext context) {
     return SimpleEntityState();
   }
@@ -117,7 +215,10 @@ class Entity {
     return EntityModel(
       entityWrapper: EntityWrapper(entity: this),
       child: EntityPageContainer(children: <Widget>[
-        DefaultEntityContainer(state: _buildStatePartForPage(context)),
+        Padding(
+          padding: EdgeInsets.only(top: Sizes.rowPadding, left: Sizes.leftWidgetPadding),
+          child: DefaultEntityContainer(state: _buildStatePartForPage(context)),
+        ),
         LastUpdatedWidget(),
         Divider(),
         _buildAdditionalControlsForPage(context),

lib/entities/entity_wrapper.class.dart

@@ -0,0 +1,114 @@
+part of '../main.dart';
+
+class EntityWrapper {
+
+  String displayName;
+  String icon;
+  String entityPicture;
+  EntityUIAction uiAction;
+  Entity entity;
+
+
+  EntityWrapper({
+    this.entity,
+    String icon,
+    String displayName,
+    this.uiAction
+  }) {
+    if (entity.statelessType == StatelessEntityType.NONE || entity.statelessType == StatelessEntityType.CALL_SERVICE || entity.statelessType == StatelessEntityType.WEBLINK) {
+      this.icon = icon ?? entity.icon;
+      if (icon == null) {
+        entityPicture = entity.entityPicture;
+      }
+      this.displayName = displayName ?? entity.displayName;
+      if (uiAction == null) {
+        uiAction = EntityUIAction();
+      }
+    }
+  }
+
+  void handleTap() {
+    switch (uiAction.tapAction) {
+      case EntityUIAction.toggle: {
+        eventBus.fire(
+            ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
+        break;
+      }
+
+      case EntityUIAction.callService: {
+        if (uiAction.tapService != null) {
+          eventBus.fire(
+              ServiceCallEvent(uiAction.tapService.split(".")[0],
+                  uiAction.tapService.split(".")[1], null,
+                  uiAction.tapServiceData));
+        }
+        break;
+      }
+
+      case EntityUIAction.none: {
+        break;
+      }
+
+      case EntityUIAction.moreInfo: {
+        eventBus.fire(
+            new ShowEntityPageEvent(entity));
+        break;
+      }
+
+      case EntityUIAction.navigate: {
+        if (uiAction.tapService.startsWith("/")) {
+          //TODO handle local urls
+          Logger.w("Local urls is not supported yet");
+        } else {
+          Launcher.launchURL(uiAction.tapService);
+        }
+        break;
+      }
+
+      default: {
+        break;
+      }
+    }
+  }
+
+  void handleHold() {
+      switch (uiAction.holdAction) {
+        case EntityUIAction.toggle: {
+          eventBus.fire(
+              ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
+          break;
+        }
+
+        case EntityUIAction.callService: {
+          if (uiAction.holdService != null) {
+            eventBus.fire(
+                ServiceCallEvent(uiAction.holdService.split(".")[0],
+                    uiAction.holdService.split(".")[1], null,
+                    uiAction.holdServiceData));
+          }
+          break;
+        }
+
+        case EntityUIAction.moreInfo: {
+          eventBus.fire(
+              new ShowEntityPageEvent(entity));
+          break;
+        }
+
+        case EntityUIAction.navigate: {
+          if (uiAction.holdService.startsWith("/")) {
+            //TODO handle local urls
+            Logger.w("Local urls is not supported yet");
+          } else {
+            Launcher.launchURL(uiAction.holdService);
+          }
+          break;
+        }
+
+        default: {
+          break;
+        }
+      }
+  }
+
+}

lib/entities/fan/fan_entity.class.dart

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

lib/entities/fan/widgets/fan_controls.dart

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

lib/entities/group/group_entity.class.dart

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

lib/entities/light/light_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class LightEntity extends Entity {
 
@@ -10,43 +10,50 @@ class LightEntity extends Entity {
   static const SUPPORT_TRANSITION = 32;
   static const SUPPORT_WHITE_VALUE = 128;
 
-  bool get supportBrightness => ((attributes["supported_features"] &
+  bool get supportBrightness => ((supportedFeatures &
   LightEntity.SUPPORT_BRIGHTNESS) ==
       LightEntity.SUPPORT_BRIGHTNESS);
-  bool get supportColorTemp => ((attributes["supported_features"] &
+  bool get supportColorTemp => ((supportedFeatures &
   LightEntity.SUPPORT_COLOR_TEMP) ==
       LightEntity.SUPPORT_COLOR_TEMP);
-  bool get supportEffect => ((attributes["supported_features"] &
+  bool get supportEffect => ((supportedFeatures &
   LightEntity.SUPPORT_EFFECT) ==
       LightEntity.SUPPORT_EFFECT);
-  bool get supportFlash => ((attributes["supported_features"] &
+  bool get supportFlash => ((supportedFeatures &
   LightEntity.SUPPORT_FLASH) ==
       LightEntity.SUPPORT_FLASH);
-  bool get supportColor => ((attributes["supported_features"] &
+  bool get supportColor => ((supportedFeatures &
   LightEntity.SUPPORT_COLOR) ==
       LightEntity.SUPPORT_COLOR);
-  bool get supportTransition => ((attributes["supported_features"] &
+  bool get supportTransition => ((supportedFeatures &
   LightEntity.SUPPORT_TRANSITION) ==
       LightEntity.SUPPORT_TRANSITION);
-  bool get supportWhiteValue => ((attributes["supported_features"] &
+  bool get supportWhiteValue => ((supportedFeatures &
   LightEntity.SUPPORT_WHITE_VALUE) ==
       LightEntity.SUPPORT_WHITE_VALUE);
 
   int get brightness => _getIntAttributeValue("brightness");
+  int get whiteValue => _getIntAttributeValue("white_value");
+  String get effect => attributes["effect"];
   int get colorTemp => _getIntAttributeValue("color_temp");
   double get maxMireds => _getDoubleAttributeValue("max_mireds");
   double get minMireds => _getDoubleAttributeValue("min_mireds");
-  Color get color => _getColor();
+  HSVColor get color => _getColor();
-  bool get isAdditionalControls => ((attributes["supported_features"] != null) && (attributes["supported_features"] != 0));
+  bool get isAdditionalControls => ((supportedFeatures != null) && (supportedFeatures != 0));
   List<String> get effectList => getStringListAttributeValue("effect_list");
 
-  LightEntity(Map rawData) : super(rawData);
+  LightEntity(Map rawData, String webHost) : super(rawData, webHost);
 
-  Color _getColor() {
+  HSVColor _getColor() {
+    List hs = attributes["hs_color"];
     List rgb = attributes["rgb_color"];
     try {
-      if ((rgb != null) && (rgb.length > 0)) {
+      if (hs != null && hs.isNotEmpty) {
-        return Color.fromARGB(255, rgb[0], rgb[1], rgb[2]);
+        double sat = hs[1]/100;
+        String ssat = sat.toStringAsFixed(2);
+        return HSVColor.fromAHSV(1.0, hs[0], double.parse(ssat), 1.0);
+      } else if (rgb != null && rgb.isNotEmpty) {
+        return HSVColor.fromColor(Color.fromARGB(255, rgb[0], rgb[1], rgb[2]));
       } else {
         return null;
       }
@@ -62,7 +69,7 @@ class LightEntity extends Entity {
 
   @override
   Widget _buildAdditionalControlsForPage(BuildContext context) {
-    if (!isAdditionalControls) {
+    if (!isAdditionalControls || state == EntityState.unavailable) {
       return Container(height: 0.0, width: 0.0);
     } else {
       return LightControlsWidget();

lib/entities/light/widgets/light_controls.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class LightControlsWidget extends StatefulWidget {
 
@@ -10,31 +10,38 @@ class LightControlsWidget extends StatefulWidget {
 class _LightControlsWidgetState extends State<LightControlsWidget> {
 
   int _tmpBrightness;
-  int _tmpColorTemp;
+  int _tmpWhiteValue;
-  Color _tmpColor;
+  int _tmpColorTemp = 0;
+  HSVColor _tmpColor = HSVColor.fromAHSV(1.0, 30.0, 0.0, 1.0);
   bool _changedHere = false;
   String _tmpEffect;
 
   void _resetState(LightEntity entity) {
-    _tmpBrightness = entity.brightness ?? 0;
+    _tmpBrightness = entity.brightness ?? 1;
-    _tmpColorTemp = entity.colorTemp;
+    _tmpWhiteValue = entity.whiteValue ?? 0;
-    _tmpColor = entity.color;
+    _tmpColorTemp = entity.colorTemp ?? entity.minMireds?.toInt();
-    _tmpEffect = null;
+    _tmpColor = entity.color ?? _tmpColor;
+    _tmpEffect = entity.effect;
   }
 
   void _setBrightness(LightEntity entity, double value) {
     setState(() {
       _tmpBrightness = value.round();
       _changedHere = true;
-      if (_tmpBrightness > 0) {
       eventBus.fire(new ServiceCallEvent(
           entity.domain, "turn_on", entity.entityId,
           {"brightness": _tmpBrightness}));
-      } else {
+    });
-        eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_off", entity.entityId,
-            null));
   }
+
+  void _setWhiteValue(LightEntity entity, double value) {
+    setState(() {
+      _tmpWhiteValue = value.round();
+      _changedHere = true;
+      eventBus.fire(new ServiceCallEvent(
+            entity.domain, "turn_on", entity.entityId,
+            {"white_value": _tmpWhiteValue}));
+
     });
   }
 
@@ -48,20 +55,14 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     });
   }
 
-  void _setColor(LightEntity entity, Color color) {
+  void _setColor(LightEntity entity, HSVColor color) {
     setState(() {
       _tmpColor = color;
       _changedHere = true;
-      TheLogger.debug( "Color: [${color.red}, ${color.green}, ${color.blue}]");
+      Logger.d( "HS Color: [${color.hue}, ${color.saturation}]");
-      if ((color == Colors.black) || ((color.red == color.green) && (color.green == color.blue)))  {
-        eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_off", entity.entityId,
-            null));
-      } else {
       eventBus.fire(new ServiceCallEvent(
         entity.domain, "turn_on", entity.entityId,
-            {"rgb_color": [color.red, color.green, color.blue]}));
+          {"hs_color": [color.hue, color.saturation*100]}));
-      }
     });
   }
 
@@ -90,6 +91,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
       crossAxisAlignment: CrossAxisAlignment.center,
       children: <Widget>[
         _buildBrightnessControl(entity),
+        _buildWhiteValueControl(entity),
         _buildColorTempControl(entity),
         _buildColorControl(entity),
         _buildEffectControl(entity)
@@ -98,7 +100,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
   }
 
   Widget _buildBrightnessControl(LightEntity entity) {
-    if ((entity.supportBrightness) && (_tmpBrightness != null) && (entity.state != EntityState.unavailable)) {
+    if ((entity.supportBrightness) && (_tmpBrightness != null)) {
       return UniversalSlider(
         onChanged: (value) {
           setState(() {
@@ -106,10 +108,10 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
             _tmpBrightness = value.round();
           });
         },
-        min: 0.0,
+        min: 1.0,
         max: 255.0,
         onChangeEnd: (value) => _setBrightness(entity, value),
-        value: _tmpBrightness.toDouble(),
+        value: _tmpBrightness == null ? 1.0 : _tmpBrightness.toDouble(),
         leading: Icon(Icons.brightness_5),
         title: "Brightness",
       );
@@ -118,12 +120,33 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     }
   }
 
+  Widget _buildWhiteValueControl(LightEntity entity) {
+    if ((entity.supportWhiteValue) && (_tmpWhiteValue != null)) {
+      return UniversalSlider(
+        onChanged: (value) {
+          setState(() {
+            _changedHere = true;
+            _tmpWhiteValue = value.round();
+          });
+        },
+        min: 0.0,
+        max: 255.0,
+        onChangeEnd: (value) => _setWhiteValue(entity, value),
+        value: _tmpWhiteValue == null ? 0.0 : _tmpWhiteValue.toDouble(),
+        leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:file-word-box")),
+        title: "White",
+      );
+    } else {
+      return Container(width: 0.0, height: 0.0);
+    }
+  }
+
   Widget _buildColorTempControl(LightEntity entity) {
-    if ((entity.supportColorTemp) && (_tmpColorTemp != null)) {
+    if (entity.supportColorTemp) {
       return UniversalSlider(
         title: "Color temperature",
         leading: Text("Cold", style: TextStyle(color: Colors.lightBlue),),
-        value:  _tmpColorTemp.toDouble(),
+        value:  _tmpColorTemp == null ? entity.maxMireds : _tmpColorTemp.toDouble(),
         onChangeEnd: (value) => _setColorTemp(entity, value),
         max: entity.maxMireds,
         min: entity.minMireds,
@@ -141,25 +164,36 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
   }
 
   Widget _buildColorControl(LightEntity entity) {
-    if ((entity.supportColor) && (entity.color != null)) {
+    if (entity.supportColor) {
+      HSVColor savedColor = HomeAssistant().savedColor;
       return Column(
-        crossAxisAlignment: CrossAxisAlignment.center,
+        mainAxisSize: MainAxisSize.min,
         children: <Widget>[
-          Container(height: Sizes.rowPadding,),
+          LightColorPicker(
-          RaisedButton(
+            color: _tmpColor,
-            onPressed: () => _showColorPicker(entity),
+            onColorSelected: (color) => _setColor(entity, color),
-            color: _tmpColor ?? Colors.black45,
-            child: Text(
-              "COLOR",
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                fontSize: 50.0,
-                fontWeight: FontWeight.bold,
-                color: Colors.black12,
           ),
+          Row(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              FlatButton(
+                color: _tmpColor.toColor(),
+                child: Text('Copy color'),
+                onPressed: _tmpColor == null ? null : () {
+                  setState(() {
+                    HomeAssistant().savedColor = _tmpColor;
+                  });
+                },
               ),
-          ),
+              FlatButton(
-          Container(height: 2*Sizes.rowPadding,),
+                color: savedColor?.toColor() ?? Colors.transparent,
+                child: Text('Paste color'),
+                onPressed: savedColor == null ? null : () {
+                  _setColor(entity, savedColor);
+                },
+              )
+            ],
+          )
         ],
       );
     } else {
@@ -167,28 +201,6 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     }
   }
 
-  void _showColorPicker(LightEntity entity) {
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          titlePadding: EdgeInsets.all(0.0),
-          contentPadding: EdgeInsets.all(0.0),
-          content: SingleChildScrollView(
-            child: MaterialPicker(
-              pickerColor: _tmpColor,
-              onColorChanged: (color) {
-                _setColor(entity, color);
-                Navigator.of(context).pop();
-              },
-              enableLabel: true,
-            ),
-          ),
-        );
-      },
-    );
-  }
-
   Widget _buildEffectControl(LightEntity entity) {
     if ((entity.supportEffect) && (entity.effectList != null)) {
       return ModeSelectorWidget(

lib/entities/lock/lock_entity.class.dart

@@ -0,0 +1,21 @@
+part of '../../main.dart';
+
+class LockEntity extends Entity {
+  LockEntity(Map rawData, String webHost) : super(rawData, webHost);
+
+  bool get isLocked => state == "locked";
+
+  @override
+  Widget _buildStatePart(BuildContext context) {
+    return LockStateWidget(
+      assumedState: false,
+    );
+  }
+
+  @override
+  Widget _buildStatePartForPage(BuildContext context) {
+    return LockStateWidget(
+      assumedState: true,
+    );
+  }
+}

lib/entities/lock/widgets/lock_state.dart

@@ -0,0 +1,66 @@
+part of '../../../main.dart';
+
+class LockStateWidget extends StatelessWidget {
+
+  final bool assumedState;
+
+  const LockStateWidget({Key key, this.assumedState: false}) : super(key: key);
+
+  void _lock(Entity entity) {
+    eventBus.fire(new ServiceCallEvent("lock", "lock", entity.entityId, null));
+  }
+
+  void _unlock(Entity entity) {
+    eventBus.fire(new ServiceCallEvent("lock", "unlock", entity.entityId, null));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final entityModel = EntityModel.of(context);
+    final LockEntity entity = entityModel.entityWrapper.entity;
+    if (assumedState) {
+      return Row(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+        SizedBox(
+        height: 34.0,
+        child: FlatButton(
+          onPressed: () => _unlock(entity),
+          child: Text("UNLOCK",
+              textAlign: TextAlign.right,
+              style:
+              new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
+            ),
+          )
+        ),
+        SizedBox(
+            height: 34.0,
+            child: FlatButton(
+              onPressed: () => _lock(entity),
+              child: Text("LOCK",
+                textAlign: TextAlign.right,
+                style:
+                new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
+              ),
+            )
+        )
+        ],
+      );
+    } else {
+      return SizedBox(
+          height: 34.0,
+          child: FlatButton(
+            onPressed: (() {
+              entity.isLocked ? _unlock(entity) : _lock(entity);
+            }),
+            child: Text(
+              entity.isLocked ? "UNLOCK" : "LOCK",
+              textAlign: TextAlign.right,
+              style:
+              new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
+            ),
+          )
+      );
+    }
+  }
+}

lib/entities/media_player/media_player_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class MediaPlayerEntity extends Entity {
 
@@ -20,55 +20,55 @@ class MediaPlayerEntity extends Entity {
   static const SUPPORT_SHUFFLE_SET = 32768;
   static const SUPPORT_SELECT_SOUND_MODE = 65536;
 
-  MediaPlayerEntity(Map rawData) : super(rawData);
+  MediaPlayerEntity(Map rawData, String webHost) : super(rawData, webHost);
 
-  bool get supportPause => ((attributes["supported_features"] &
+  bool get supportPause => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_PAUSE) ==
       MediaPlayerEntity.SUPPORT_PAUSE);
-  bool get supportSeek => ((attributes["supported_features"] &
+  bool get supportSeek => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_SEEK) ==
       MediaPlayerEntity.SUPPORT_SEEK);
-  bool get supportVolumeSet => ((attributes["supported_features"] &
+  bool get supportVolumeSet => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_VOLUME_SET) ==
       MediaPlayerEntity.SUPPORT_VOLUME_SET);
-  bool get supportVolumeMute => ((attributes["supported_features"] &
+  bool get supportVolumeMute => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_VOLUME_MUTE) ==
       MediaPlayerEntity.SUPPORT_VOLUME_MUTE);
-  bool get supportPreviousTrack => ((attributes["supported_features"] &
+  bool get supportPreviousTrack => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_PREVIOUS_TRACK) ==
       MediaPlayerEntity.SUPPORT_PREVIOUS_TRACK);
-  bool get supportNextTrack => ((attributes["supported_features"] &
+  bool get supportNextTrack => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_NEXT_TRACK) ==
       MediaPlayerEntity.SUPPORT_NEXT_TRACK);
 
-  bool get supportTurnOn => ((attributes["supported_features"] &
+  bool get supportTurnOn => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_TURN_ON) ==
       MediaPlayerEntity.SUPPORT_TURN_ON);
-  bool get supportTurnOff => ((attributes["supported_features"] &
+  bool get supportTurnOff => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_TURN_OFF) ==
       MediaPlayerEntity.SUPPORT_TURN_OFF);
-  bool get supportPlayMedia => ((attributes["supported_features"] &
+  bool get supportPlayMedia => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_PLAY_MEDIA) ==
       MediaPlayerEntity.SUPPORT_PLAY_MEDIA);
-  bool get supportVolumeStep => ((attributes["supported_features"] &
+  bool get supportVolumeStep => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_VOLUME_STEP) ==
       MediaPlayerEntity.SUPPORT_VOLUME_STEP);
-  bool get supportSelectSource => ((attributes["supported_features"] &
+  bool get supportSelectSource => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_SELECT_SOURCE) ==
       MediaPlayerEntity.SUPPORT_SELECT_SOURCE);
-  bool get supportStop => ((attributes["supported_features"] &
+  bool get supportStop => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_STOP) ==
       MediaPlayerEntity.SUPPORT_STOP);
-  bool get supportClearPlaylist => ((attributes["supported_features"] &
+  bool get supportClearPlaylist => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_CLEAR_PLAYLIST) ==
       MediaPlayerEntity.SUPPORT_CLEAR_PLAYLIST);
-  bool get supportPlay => ((attributes["supported_features"] &
+  bool get supportPlay => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_PLAY) ==
       MediaPlayerEntity.SUPPORT_PLAY);
-  bool get supportShuffleSet => ((attributes["supported_features"] &
+  bool get supportShuffleSet => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_SHUFFLE_SET) ==
       MediaPlayerEntity.SUPPORT_SHUFFLE_SET);
-  bool get supportSelectSoundMode => ((attributes["supported_features"] &
+  bool get supportSelectSoundMode => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_SELECT_SOUND_MODE) ==
       MediaPlayerEntity.SUPPORT_SELECT_SOUND_MODE);
 

lib/entities/media_player/widgets/media_player_widgets.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class MediaPlayerWidget extends StatelessWidget {
   
@@ -73,7 +73,7 @@ class MediaPlayerWidget extends StatelessWidget {
 
   Widget _buildImage(MediaPlayerEntity entity) {
     String state = entity.state;
-    if (homeAssistantWebHost != null && entity.entityPicture != null && state != EntityState.off && state != EntityState.unavailable && state != EntityState.idle) {
+    if (entity.entityPicture != null && state != EntityState.off && state != EntityState.unavailable && state != EntityState.idle) {
       return Container(
         color: Colors.black,
         child: Row(
@@ -81,7 +81,7 @@ class MediaPlayerWidget extends StatelessWidget {
           children: <Widget>[
             Flexible(
               child: Image(
-                image: CachedNetworkImageProvider("$homeAssistantWebHost${entity.entityPicture}"),
+                image: CachedNetworkImageProvider("${entity.entityPicture}"),
                 height: 240.0,
                 //width: 320.0,
                 fit: BoxFit.contain,
@@ -95,7 +95,7 @@ class MediaPlayerWidget extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.center,
         children: <Widget>[
           Icon(
-            MaterialDesignIcons.createIconDataFromIconName("mdi:movie"),
+            MaterialDesignIcons.getIconDataFromIconName("mdi:movie"),
             size: 150.0,
             color: EntityColor.stateColor("$state"),
           )
@@ -120,12 +120,12 @@ class MediaPlayerPlaybackControls extends StatelessWidget {
   void _setPower(MediaPlayerEntity entity) {
     if (entity.state != EntityState.unavailable && entity.state != EntityState.unknown) {
       if (entity.state == EntityState.off) {
-        TheLogger.debug("${entity.entityId} turn_on");
+        Logger.d("${entity.entityId} turn_on");
         eventBus.fire(new ServiceCallEvent(
             entity.domain, "turn_on", entity.entityId,
             null));
       } else {
-        TheLogger.debug("${entity.entityId} turn_off");
+        Logger.d("${entity.entityId} turn_off");
         eventBus.fire(new ServiceCallEvent(
             entity.domain, "turn_off", entity.entityId,
             null));
@@ -134,7 +134,7 @@ class MediaPlayerPlaybackControls extends StatelessWidget {
   }
 
   void _callAction(MediaPlayerEntity entity, String action) {
-    TheLogger.debug("${entity.entityId} $action");
+    Logger.d("${entity.entityId} $action");
     eventBus.fire(new ServiceCallEvent(
         entity.domain, "$action", entity.entityId,
         null));
@@ -227,7 +227,7 @@ class MediaPlayerPlaybackControls extends StatelessWidget {
     if (showMenu) {
       result.add(
           IconButton(
-              icon: Icon(MaterialDesignIcons.createIconDataFromIconName(
+              icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
                   "mdi:dots-vertical")),
               onPressed: () => eventBus.fire(new ShowEntityPageEvent(entity))
           )
@@ -307,11 +307,11 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
     if (entity.state != EntityState.off && entity.state != EntityState.unknown && entity.state != EntityState.unavailable) {
       Widget muteWidget;
       Widget volumeStepWidget;
-      if (entity.supportVolumeMute) {
+      if (entity.supportVolumeMute  || entity.attributes["is_volume_muted"] != null) {
         bool isMuted = entity.attributes["is_volume_muted"] ?? false;
         muteWidget =
             IconButton(
-                icon: Icon(isMuted ? Icons.volume_off : Icons.volume_up),
+                icon: Icon(isMuted ? Icons.volume_up : Icons.volume_off),
                 onPressed: () => _setVolumeMute(!isMuted, entity.entityId)
             );
       } else {
@@ -322,11 +322,11 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
           mainAxisSize: MainAxisSize.min,
           children: <Widget>[
             IconButton(
-                icon: Icon(MaterialDesignIcons.createIconDataFromIconName("mdi:plus")),
+                icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:plus")),
                 onPressed: () => _setVolumeUp(entity.entityId)
             ),
             IconButton(
-                icon: Icon(MaterialDesignIcons.createIconDataFromIconName("mdi:minus")),
+                icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:minus")),
                 onPressed: () => _setVolumeDown(entity.entityId)
             )
           ],

lib/entities/select/select_entity.class.dart

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

lib/entities/select/widgets/select_state.dart

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

lib/entities/sensor/sensor_entity.class.dart

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

lib/entities/slider/slider_entity.dart

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

lib/entities/slider/widgets/slider_controls.dart

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

lib/entities/sun/sun_entity.class.dart

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

lib/entities/switch/switch_entity.class.dart

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

lib/entities/switch/widget/switch_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class SwitchStateWidget extends StatefulWidget {
 
@@ -71,13 +71,13 @@ class _SwitchStateWidgetState extends State<SwitchStateWidget> {
           children: <Widget>[
             IconButton(
               onPressed: () => _setNewState(false, entity),
-              icon: Icon(MaterialDesignIcons.createIconDataFromIconName("mdi:flash-off")),
+              icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:flash-off")),
               color: newState == EntityState.on ? Colors.black : Colors.blue,
               iconSize: Sizes.iconSize,
             ),
             IconButton(
                 onPressed: () => _setNewState(true, entity),
-                icon: Icon(MaterialDesignIcons.createIconDataFromIconName("mdi:flash")),
+                icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:flash")),
                 color: newState == EntityState.on ? Colors.blue : Colors.black,
                 iconSize: Sizes.iconSize
             )

lib/entities/text/text_entity.class.dart

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

lib/entities/text/widgets/text_input_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class TextInputStateWidget extends StatefulWidget {
 
@@ -73,19 +73,13 @@ class _TextInputStateWidgetState extends State<TextInputStateWidget> {
         child: TextField(
             focusNode: _focusNode,
             obscureText: entity.isPasswordField,
-            controller: new TextEditingController.fromValue(
+            controller: TextEditingController.fromValue(TextEditingValue(text: _tmpValue)),
-                new TextEditingValue(
-                    text: _tmpValue,
-                    selection:
-                    new TextSelection.collapsed(offset: _tmpValue.length)
-                )
-            ),
             onChanged: (value) {
               _tmpValue = value;
             }),
       );
     } else {
-      TheLogger.warning( "Unsupported input mode for ${entity.entityId}");
+      Logger.w( "Unsupported input mode for ${entity.entityId}");
       return SimpleEntityState();
     }
   }

lib/entities/timer/timer_entity.class.dart

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

lib/entities/timer/widgets/timer_state.dart

@@ -0,0 +1,65 @@
+part of '../../../main.dart';
+
+class TimerState extends StatefulWidget  {
+  //final bool expanded;
+  //final TextAlign textAlign;
+  //final EdgeInsetsGeometry padding;
+  //final int maxLines;
+
+  const TimerState({Key key}) : super(key: key);
+
+  @override
+  _TimerStateState createState() => _TimerStateState();
+
+}
+
+class _TimerStateState extends State<TimerState> {
+
+  Timer timer;
+  Duration remaining = Duration(seconds: 0);
+
+  void checkState(TimerEntity entity) {
+    if (entity.state == EntityState.active) {
+      //Logger.d("Timer is active");
+      if (timer == null || !timer.isActive) {
+        timer = Timer.periodic(Duration(seconds: 1), (timer) {
+          setState(() {
+            try {
+              int passed = DateTime
+                  .now()
+                  .difference(entity._lastUpdated)
+                  .inSeconds;
+              remaining = Duration(seconds: entity.duration.inSeconds - passed);
+            } catch (e) {
+              Logger.e("Error calculating ${entity.entityId} remaining time: ${e.toString()}");
+              remaining = Duration(seconds: 0);
+            }
+          });
+        });
+      }
+    } else {
+      timer?.cancel();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    EntityModel model = EntityModel.of(context);
+    TimerEntity entity = model.entityWrapper.entity;
+    checkState(entity);
+    if (entity.state != EntityState.active) {
+      return SimpleEntityState();
+    } else {
+      return SimpleEntityState(
+        customValue: "${remaining.toString().split('.')[0]}",
+      );
+    }
+  }
+
+  @override
+  void dispose() {
+    timer?.cancel();
+    super.dispose();
+  }
+
+}

lib/entity_class/button_entity.class.dart

@@ -1,10 +0,0 @@
-part of '../main.dart';
-
-class ButtonEntity extends Entity {
-  ButtonEntity(Map rawData) : super(rawData);
-
-  @override
-  Widget _buildStatePart(BuildContext context) {
-    return ButtonStateWidget();
-  }
-}

lib/entity_class/climate_entity.class.dart

@@ -1,128 +0,0 @@
-part of '../main.dart';
-
-class ClimateEntity extends Entity {
-
-  @override
-  EntityHistoryConfig historyConfig = EntityHistoryConfig(
-    chartType: EntityHistoryWidgetType.numericAttributes,
-    numericState: false,
-    numericAttributesToShow: ["current_temperature"]
-  );
-
-  static const SUPPORT_TARGET_TEMPERATURE = 1;
-  static const SUPPORT_TARGET_TEMPERATURE_HIGH = 2;
-  static const SUPPORT_TARGET_TEMPERATURE_LOW = 4;
-  static const SUPPORT_TARGET_HUMIDITY = 8;
-  static const SUPPORT_TARGET_HUMIDITY_HIGH = 16;
-  static const SUPPORT_TARGET_HUMIDITY_LOW = 32;
-  static const SUPPORT_FAN_MODE = 64;
-  static const SUPPORT_OPERATION_MODE = 128;
-  static const SUPPORT_HOLD_MODE = 256;
-  static const SUPPORT_SWING_MODE = 512;
-  static const SUPPORT_AWAY_MODE = 1024;
-  static const SUPPORT_AUX_HEAT = 2048;
-  static const SUPPORT_ON_OFF = 4096;
-
-  bool get supportTargetTemperature => ((attributes["supported_features"] &
-  ClimateEntity.SUPPORT_TARGET_TEMPERATURE) ==
-      ClimateEntity.SUPPORT_TARGET_TEMPERATURE);
-  bool get supportTargetTemperatureHigh => ((attributes["supported_features"] &
-  ClimateEntity.SUPPORT_TARGET_TEMPERATURE_HIGH) ==
-      ClimateEntity.SUPPORT_TARGET_TEMPERATURE_HIGH);
-  bool get supportTargetTemperatureLow => ((attributes["supported_features"] &
-  ClimateEntity.SUPPORT_TARGET_TEMPERATURE_LOW) ==
-      ClimateEntity.SUPPORT_TARGET_TEMPERATURE_LOW);
-  bool get supportTargetHumidity => ((attributes["supported_features"] &
-  ClimateEntity.SUPPORT_TARGET_HUMIDITY) ==
-      ClimateEntity.SUPPORT_TARGET_HUMIDITY);
-  bool get supportTargetHumidityHigh => ((attributes["supported_features"] &
-  ClimateEntity.SUPPORT_TARGET_HUMIDITY_HIGH) ==
-      ClimateEntity.SUPPORT_TARGET_HUMIDITY_HIGH);
-  bool get supportTargetHumidityLow => ((attributes["supported_features"] &
-  ClimateEntity.SUPPORT_TARGET_HUMIDITY_LOW) ==
-      ClimateEntity.SUPPORT_TARGET_HUMIDITY_LOW);
-  bool get supportFanMode =>
-      ((attributes["supported_features"] & ClimateEntity.SUPPORT_FAN_MODE) ==
-          ClimateEntity.SUPPORT_FAN_MODE);
-  bool get supportOperationMode => ((attributes["supported_features"] &
-  ClimateEntity.SUPPORT_OPERATION_MODE) ==
-      ClimateEntity.SUPPORT_OPERATION_MODE);
-  bool get supportHoldMode =>
-      ((attributes["supported_features"] & ClimateEntity.SUPPORT_HOLD_MODE) ==
-          ClimateEntity.SUPPORT_HOLD_MODE);
-  bool get supportSwingMode =>
-      ((attributes["supported_features"] & ClimateEntity.SUPPORT_SWING_MODE) ==
-          ClimateEntity.SUPPORT_SWING_MODE);
-  bool get supportAwayMode =>
-      ((attributes["supported_features"] & ClimateEntity.SUPPORT_AWAY_MODE) ==
-          ClimateEntity.SUPPORT_AWAY_MODE);
-  bool get supportAuxHeat =>
-      ((attributes["supported_features"] & ClimateEntity.SUPPORT_AUX_HEAT) ==
-          ClimateEntity.SUPPORT_AUX_HEAT);
-  bool get supportOnOff =>
-      ((attributes["supported_features"] & ClimateEntity.SUPPORT_ON_OFF) ==
-          ClimateEntity.SUPPORT_ON_OFF);
-
-  List<String> get operationList => attributes["operation_list"] != null
-      ? (attributes["operation_list"] as List).cast<String>()
-      : null;
-  List<String> get fanList => attributes["fan_list"] != null
-      ? (attributes["fan_list"] as List).cast<String>()
-      : null;
-  List<String> get swingList => attributes["swing_list"] != null
-      ? (attributes["swing_list"] as List).cast<String>()
-      : null;
-  double get temperature => _getDoubleAttributeValue('temperature');
-  double get targetHigh => _getDoubleAttributeValue('target_temp_high');
-  double get targetLow => _getDoubleAttributeValue('target_temp_low');
-  double get maxTemp => _getDoubleAttributeValue('max_temp') ?? 100.0;
-  double get minTemp => _getDoubleAttributeValue('min_temp') ?? -100.0;
-  double get targetHumidity => _getDoubleAttributeValue('humidity');
-  double get maxHumidity => _getDoubleAttributeValue('max_humidity');
-  double get minHumidity => _getDoubleAttributeValue('min_humidity');
-  String get operationMode => attributes['operation_mode'];
-  String get fanMode => attributes['fan_mode'];
-  String get swingMode => attributes['swing_mode'];
-  bool get awayMode => attributes['away_mode'] == "on";
-  bool get isOff => state == EntityState.off;
-  bool get auxHeat => attributes['aux_heat'] == "on";
-
-  ClimateEntity(Map rawData) : super(rawData);
-
-  @override
-  void update(Map rawData) {
-    super.update(rawData);
-    if (supportTargetTemperature) {
-      historyConfig.numericAttributesToShow.add("temperature");
-    }
-    if (supportTargetTemperatureHigh) {
-      historyConfig.numericAttributesToShow.add("target_temp_high");
-    }
-    if (supportTargetTemperatureLow) {
-      historyConfig.numericAttributesToShow.add("target_temp_low");
-    }
-  }
-
-  @override
-  Widget _buildStatePart(BuildContext context) {
-    return ClimateStateWidget();
-  }
-
-  @override
-  Widget _buildAdditionalControlsForPage(BuildContext context) {
-    return ClimateControlWidget();
-  }
-
-  @override
-  double _getDoubleAttributeValue(String attributeName) {
-    var temp1 = attributes["$attributeName"];
-    if (temp1 is int) {
-      return temp1.toDouble();
-    } else if (temp1 is double) {
-      return temp1;
-    } else {
-      return null;
-    }
-  }
-
-}

lib/entity_class/entity_wrapper.class.dart

@@ -1,83 +0,0 @@
-part of '../main.dart';
-
-class EntityWrapper {
-
-  String displayName;
-  String icon;
-  String tapAction;
-  String holdAction;
-  String tapActionService;
-  Map<String, dynamic> tapActionServiceData;
-  String holdActionService;
-  Map<String, dynamic> holdActionServiceData;
-  Entity entity;
-
-
-  EntityWrapper({
-    this.entity,
-    String icon,
-    String displayName,
-    this.tapAction: EntityTapAction.moreInfo,
-    this.holdAction: EntityTapAction.none,
-    this.tapActionService,
-    this.tapActionServiceData,
-    this.holdActionService,
-    this.holdActionServiceData
-  }) {
-    this.icon = icon ?? entity.icon;
-    this.displayName = displayName ?? entity.displayName;
-  }
-
-  void handleTap() {
-    switch (tapAction) {
-      case EntityTapAction.toggle: {
-        eventBus.fire(
-            ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
-        break;
-      }
-
-      case EntityTapAction.callService: {
-        eventBus.fire(
-            ServiceCallEvent(tapActionService.split(".")[0], tapActionService.split(".")[1], null, tapActionServiceData));
-        break;
-      }
-
-      case EntityTapAction.none: {
-        break;
-      }
-
-      default: {
-        eventBus.fire(
-            new ShowEntityPageEvent(entity));
-        break;
-      }
-    }
-  }
-
-  void handleHold() {
-      switch (holdAction) {
-        case EntityTapAction.toggle: {
-          eventBus.fire(
-              ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
-          break;
-        }
-
-        case EntityTapAction.callService: {
-          eventBus.fire(
-              ServiceCallEvent(tapActionService.split(".")[0], tapActionService.split(".")[1], null, tapActionServiceData));
-          break;
-        }
-
-        case EntityTapAction.moreInfo: {
-          eventBus.fire(
-              new ShowEntityPageEvent(entity));
-          break;
-        }
-
-        default: {
-          break;
-        }
-      }
-  }
-
-}

lib/entity_class/lock_entity.class.dart

@@ -1,12 +0,0 @@
-part of '../main.dart';
-
-class LockEntity extends Entity {
-  LockEntity(Map rawData) : super(rawData);
-
-  bool get isLocked => state == "locked";
-
-  @override
-  Widget _buildStatePart(BuildContext context) {
-    return LockStateWidget();
-  }
-}

lib/entity_collection.class.dart

@@ -2,13 +2,15 @@ part of 'main.dart';
 
 class EntityCollection {
 
+  final homeAssistantWebHost;
+
   Map<String, Entity> _allEntities;
   //Map<String, Entity> views;
 
   bool get isEmpty => _allEntities.isEmpty;
   List<Entity> get viewEntities => _allEntities.values.where((entity) => entity.isView).toList();
 
-  EntityCollection() {
+  EntityCollection(this.homeAssistantWebHost) {
     _allEntities = {};
     //views = {};
   }
@@ -19,7 +21,7 @@ class EntityCollection {
     _allEntities.clear();
     //views.clear();
 
-    TheLogger.debug("Parsing ${rawData.length} Home Assistant entities");
+    Logger.d("Parsing ${rawData.length} Home Assistant entities");
     rawData.forEach((rawEntityData) {
       addFromRaw(rawEntityData);
     });
@@ -33,67 +35,85 @@ class EntityCollection {
     });
   }
 
+  void clear() {
+    _allEntities.clear();
+  }
+
   Entity _createEntityInstance(rawEntityData) {
     switch (rawEntityData["entity_id"].split(".")[0]) {
       case 'sun': {
-        return SunEntity(rawEntityData);
+        return SunEntity(rawEntityData, homeAssistantWebHost);
       }
       case "media_player": {
-        return MediaPlayerEntity(rawEntityData);
+        return MediaPlayerEntity(rawEntityData, homeAssistantWebHost);
       }
       case 'sensor': {
-        return SensorEntity(rawEntityData);
+        return SensorEntity(rawEntityData, homeAssistantWebHost);
       }
       case 'lock': {
-        return LockEntity(rawEntityData);
+        return LockEntity(rawEntityData, homeAssistantWebHost);
       }
-      case "automation":
+      case "automation": {
+        return AutomationEntity(rawEntityData, homeAssistantWebHost);
+      }
+
       case "input_boolean":
       case "switch": {
-        return SwitchEntity(rawEntityData);
+        return SwitchEntity(rawEntityData, homeAssistantWebHost);
       }
       case "light": {
-        return LightEntity(rawEntityData);
+        return LightEntity(rawEntityData, homeAssistantWebHost);
       }
       case "group": {
-        return GroupEntity(rawEntityData);
+        return GroupEntity(rawEntityData, homeAssistantWebHost);
       }
       case "script":
       case "scene": {
-        return ButtonEntity(rawEntityData);
+        return ButtonEntity(rawEntityData, homeAssistantWebHost);
       }
       case "input_datetime": {
-        return DateTimeEntity(rawEntityData);
+        return DateTimeEntity(rawEntityData, homeAssistantWebHost);
       }
       case "input_select": {
-        return SelectEntity(rawEntityData);
+        return SelectEntity(rawEntityData, homeAssistantWebHost);
       }
       case "input_number": {
-        return SliderEntity(rawEntityData);
+        return SliderEntity(rawEntityData, homeAssistantWebHost);
       }
       case "input_text": {
-        return TextEntity(rawEntityData);
+        return TextEntity(rawEntityData, homeAssistantWebHost);
       }
       case "climate": {
-        return ClimateEntity(rawEntityData);
+        return ClimateEntity(rawEntityData, homeAssistantWebHost);
       }
       case "cover": {
-        return CoverEntity(rawEntityData);
+        return CoverEntity(rawEntityData, homeAssistantWebHost);
       }
       case "fan": {
-        return FanEntity(rawEntityData);
+        return FanEntity(rawEntityData, homeAssistantWebHost);
+      }
+      case "camera": {
+        return CameraEntity(rawEntityData, homeAssistantWebHost);
+      }
+      case "alarm_control_panel": {
+        return AlarmControlPanelEntity(rawEntityData, homeAssistantWebHost);
+      }
+      case "timer": {
+        return TimerEntity(rawEntityData, homeAssistantWebHost);
       }
       default: {
-        return Entity(rawEntityData);
+        return Entity(rawEntityData, homeAssistantWebHost);
       }
     }
   }
 
-  void updateState(Map rawStateData) {
+  bool updateState(Map rawStateData) {
     if (isExist(rawStateData["entity_id"])) {
       updateFromRaw(rawStateData["new_state"] ?? rawStateData["old_state"]);
+      return false;
     } else {
       addFromRaw(rawStateData["new_state"] ?? rawStateData["old_state"]);
+      return true;
     }
   }
 
@@ -101,14 +121,13 @@ class EntityCollection {
     _allEntities[entity.entityId] = entity;
   }
 
-  Entity addFromRaw(Map rawEntityData) {
+  void addFromRaw(Map rawEntityData) {
     Entity entity = _createEntityInstance(rawEntityData);
     _allEntities[entity.entityId] = entity;
-    return entity;
   }
 
   void updateFromRaw(Map rawEntityData) {
-    get("${rawEntityData["entity_id"]}")?.update(rawEntityData);
+    get("${rawEntityData["entity_id"]}")?.update(rawEntityData, homeAssistantWebHost);
   }
 
   Entity get(String entityId) {

lib/entity_widgets/button_entity_container.dart

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

lib/entity_widgets/common/badge.dart

@@ -14,40 +14,60 @@ class BadgeWidget extends StatelessWidget {
         {
           badgeIcon = entityModel.entityWrapper.entity.state == "below_horizon"
               ? Icon(
-            MaterialDesignIcons.createIconDataFromIconCode(0xf0dc),
+            MaterialDesignIcons.getIconDataFromIconCode(0xf0dc),
             size: iconSize,
           )
               : Icon(
-            MaterialDesignIcons.createIconDataFromIconCode(0xf5a8),
+            MaterialDesignIcons.getIconDataFromIconCode(0xf5a8),
             size: iconSize,
           );
           break;
         }
-      case "sensor":
+      case "camera":
+      case "media_player":
+      case "binary_sensor":
         {
-          onBadgeTextValue = entityModel.entityWrapper.entity.unitOfMeasurement;
+          badgeIcon = EntityIcon(
-          badgeIcon = Center(
+            padding: EdgeInsets.all(0.0),
-            child: Text(
+            size: iconSize,
-              "${entityModel.entityWrapper.entity.state}",
+            color: Colors.black
-              overflow: TextOverflow.fade,
-              softWrap: false,
-              textAlign: TextAlign.center,
-              style: TextStyle(fontSize: 17.0),
-            ),
           );
           break;
         }
       case "device_tracker":
+      case "person":
         {
-          badgeIcon = MaterialDesignIcons.createIconWidgetFromEntityData(
+          badgeIcon = EntityIcon(
-              entityModel.entityWrapper, iconSize, Colors.black);
+              padding: EdgeInsets.all(0.0),
-          onBadgeTextValue = entityModel.entityWrapper.entity.state;
+              size: iconSize,
+              color: Colors.black
+          );
+          onBadgeTextValue = entityModel.entityWrapper.entity.displayState;
           break;
         }
       default:
         {
-          badgeIcon = MaterialDesignIcons.createIconWidgetFromEntityData(
+          double stateFontSize;
-              entityModel.entityWrapper, iconSize, Colors.black);
+          if (entityModel.entityWrapper.entity.displayState.length <= 3) {
+            stateFontSize = 18.0;
+          } else if (entityModel.entityWrapper.entity.displayState.length <= 4) {
+            stateFontSize = 15.0;
+          } else if (entityModel.entityWrapper.entity.displayState.length <= 6) {
+            stateFontSize = 10.0;
+          } else if (entityModel.entityWrapper.entity.displayState.length <= 10) {
+            stateFontSize = 8.0;
+          }
+          onBadgeTextValue = entityModel.entityWrapper.entity.unitOfMeasurement;
+          badgeIcon = Center(
+            child: Text(
+              "${entityModel.entityWrapper.entity.displayState}",
+              overflow: TextOverflow.fade,
+              softWrap: false,
+              textAlign: TextAlign.center,
+              style: TextStyle(fontSize: stateFontSize),
+            ),
+          );
+          break;
         }
     }
     Widget onBadgeText;

lib/entity_widgets/common/camera_stream_view.dart

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

lib/entity_widgets/common/entity_attributes_list.dart

@@ -7,24 +7,16 @@ class EntityAttributesList extends StatelessWidget {
   Widget build(BuildContext context) {
     final entityModel = EntityModel.of(context);
     List<Widget> attrs = [];
-    if ((entityModel.entityWrapper.entity.attributesToShow == null) ||
-        (entityModel.entityWrapper.entity.attributesToShow.contains("all"))) {
     entityModel.entityWrapper.entity.attributes.forEach((name, value) {
-        attrs.add(_buildSingleAttribute("$name", "$value"));
+      attrs.add(_buildSingleAttribute("$name", "${value ?? '-'}"));
     });
-    } else {
+    return Padding(
-      entityModel.entityWrapper.entity.attributesToShow.forEach((String attr) {
+      padding: EdgeInsets.only(bottom: Sizes.rowPadding),
-        String attrValue = entityModel.entityWrapper.entity.getAttribute("$attr");
+      child: Column(
-        if (attrValue != null) {
-          attrs.add(
-              _buildSingleAttribute("$attr", "$attrValue"));
-        }
-      });
-    }
-    return Column(
         children: attrs,
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisSize: MainAxisSize.min,
+      )
     );
   }
 
@@ -46,7 +38,7 @@ class EntityAttributesList extends StatelessWidget {
             padding: EdgeInsets.fromLTRB(
                 0.0, Sizes.rowPadding, Sizes.rightWidgetPadding, 0.0),
             child: Text(
-              "$value",
+              "${value}",
               textAlign: TextAlign.right,
             ),
           ),

lib/entity_widgets/common/flat_service_button.dart

@@ -0,0 +1,41 @@
+part of '../../main.dart';
+
+class FlatServiceButton extends StatelessWidget {
+
+  final String serviceDomain;
+  final String serviceName;
+  final String entityId;
+  final String text;
+  final double fontSize;
+
+  FlatServiceButton({
+    Key key,
+    @required this.serviceDomain,
+    @required this.serviceName,
+    @required this.entityId,
+    @required this.text,
+    this.fontSize: Sizes.stateFontSize
+  }) : super(key: key);
+
+  void _setNewState() {
+    eventBus.fire(new ServiceCallEvent(serviceDomain, serviceName, entityId, null));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+        height: fontSize*2.5,
+        child: FlatButton(
+          onPressed: (() {
+            _setNewState();
+          }),
+          child: Text(
+            text,
+            textAlign: TextAlign.right,
+            style:
+            new TextStyle(fontSize: fontSize, color: Colors.blue),
+          ),
+        )
+    );
+  }
+}

lib/entity_widgets/common/last_updated.dart

@@ -6,7 +6,7 @@ class LastUpdatedWidget extends StatelessWidget {
     final entityModel = EntityModel.of(context);
     return Padding(
       padding: EdgeInsets.fromLTRB(
-          Sizes.leftWidgetPadding, 0.0, 0.0, 0.0),
+          Sizes.leftWidgetPadding, Sizes.rowPadding, 0.0, 0.0),
       child: Text(
         '${entityModel.entityWrapper.entity.lastUpdated}',
         textAlign: TextAlign.left,

lib/entity_widgets/common/light_color_picker.dart

@@ -0,0 +1,101 @@
+part of '../../main.dart';
+
+class LightColorPicker extends StatefulWidget {
+
+  final HSVColor color;
+  final onColorSelected;
+  final double hueStep;
+  final double saturationStep;
+  final EdgeInsets padding;
+
+  LightColorPicker({this.color, this.onColorSelected, this.hueStep: 15.0, this.saturationStep: 0.2, this.padding: const EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, Sizes.rowPadding, Sizes.rightWidgetPadding, 0.0)});
+
+  @override
+  LightColorPickerState createState() => new LightColorPickerState();
+}
+
+class LightColorPickerState extends State<LightColorPicker> {
+
+  @override
+  void initState() {
+    super.initState();
+
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    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");
+      double roundedSaturation = double.parse(widget.color.saturation.toStringAsFixed(1));
+      //Logger.d("Rounded saturation=$roundedSaturation");
+      for (double hue = 0; hue <= (365 - widget.hueStep);
+      hue += widget.hueStep) {
+        bool isExactHue = widget.color.hue.round() == hue;
+        bool isHueInRange = widget.color.hue.round() > hue && widget.color.hue.round() < (hue+widget.hueStep);
+        bool isExactSaturation = roundedSaturation == saturation;
+        bool isSaturationInRange = roundedSaturation > saturation && roundedSaturation < double.parse((saturation+widget.saturationStep).toStringAsFixed(1));
+        if ((isExactHue || isHueInRange) && (isExactSaturation || isSaturationInRange)) {
+          //Logger.d("$isExactHue $isHueInRange $isExactSaturation $isSaturationInRange (${saturation+widget.saturationStep})");
+          border = Border.all(
+            width: 2.0,
+            color: Colors.white,
+          );
+          isSomethingSelected = true;
+        } else {
+          border = null;
+        }
+        HSVColor currentColor = HSVColor.fromAHSV(1.0, hue, double.parse(saturation.toStringAsFixed(2)), 1.0);
+        rowChildren.add(
+            Flexible(
+                child: GestureDetector(
+                  child: Container(
+                    height: 40.0,
+                    decoration: BoxDecoration(
+                        color: currentColor.toColor(),
+                        border: border,
+                    ),
+                  ),
+                  onTap: () => widget.onColorSelected(currentColor),
+                )
+            )
+        );
+      }
+      colorRows.add(
+          Row(
+            children: rowChildren,
+          )
+      );
+    }
+    colorRows.add(
+        Flexible(
+            child: GestureDetector(
+              child: Container(
+                height: 40.0,
+                decoration: BoxDecoration(
+                  color: Colors.white,
+                  border: isSomethingSelected ? null : Border.all(
+                    width: 2.0,
+                    color: Colors.amber[200],
+                  )
+                ),
+              ),
+              onTap: () => widget.onColorSelected(HSVColor.fromAHSV(1.0, 30.0, 0.0, 1.0)),
+            )
+        )
+    );
+    return Padding(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: colorRows,
+      ),
+      padding: widget.padding,
+    );
+
+  }
+}

lib/entity_widgets/common/mode_selector.dart

@@ -7,8 +7,8 @@ class ModeSelectorWidget extends StatelessWidget {
   final String value;
   final double captionFontSize;
   final double valueFontSize;
-  final double bottomPadding;
   final onChange;
+  final EdgeInsets padding;
 
   ModeSelectorWidget({
     Key key,
@@ -18,12 +18,14 @@ class ModeSelectorWidget extends StatelessWidget {
     @required this.onChange,
     this.captionFontSize,
     this.valueFontSize,
-    this.bottomPadding
+    this.padding: const EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, Sizes.rowPadding, Sizes.rightWidgetPadding, 0.0),
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return Column(
+    return Padding(
+      padding: padding,
+      child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           Text("$caption", style: TextStyle(
@@ -54,9 +56,9 @@ class ModeSelectorWidget extends StatelessWidget {
                 ),
               )
             ],
-        ),
+          )
-        Container(height: bottomPadding ?? Sizes.rowPadding,)
         ],
+      ),
     );
   }
 }

lib/entity_widgets/common/mode_swicth.dart

@@ -7,6 +7,7 @@ class ModeSwitchWidget extends StatelessWidget {
   final double captionFontSize;
   final bool value;
   final bool expanded;
+  final EdgeInsets padding;
 
   ModeSwitchWidget({
     Key key,
@@ -14,12 +15,15 @@ class ModeSwitchWidget extends StatelessWidget {
     @required this.onChange,
     this.captionFontSize,
     this.value,
-    this.expanded: true
+    this.expanded: true,
+    this.padding: const EdgeInsets.only(left: Sizes.leftWidgetPadding, right: Sizes.rightWidgetPadding)
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return Row(
+    return Padding(
+      padding: this.padding,
+      child: Row(
         children: <Widget>[
           _buildCaption(),
           Switch(
@@ -27,6 +31,7 @@ class ModeSwitchWidget extends StatelessWidget {
             value: value ?? false,
           )
         ],
+      )
     );
   }
 

lib/entity_widgets/common/simple_state.dart

@@ -0,0 +1,53 @@
+part of '../../main.dart';
+
+class SimpleEntityState extends StatelessWidget {
+
+  final bool expanded;
+  final TextAlign textAlign;
+  final EdgeInsetsGeometry padding;
+  final int maxLines;
+  final String customValue;
+
+  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);
+
+  @override
+  Widget build(BuildContext context) {
+    final entityModel = EntityModel.of(context);
+    String state;
+    if (customValue == null) {
+      state = entityModel.entityWrapper.entity.displayState ?? "";
+      state = state.replaceAll("\n", "").replaceAll("\t", " ").trim();
+    } else {
+      state = customValue;
+    }
+    TextStyle textStyle =  TextStyle(
+      fontSize: Sizes.stateFontSize,
+    );
+    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.CALL_SERVICE) {
+      textStyle = textStyle.apply(color: Colors.blue);
+    }
+    while (state.contains("  ")){
+      state = state.replaceAll("  ", " ");
+    }
+    Widget result = Padding(
+      padding: padding,
+      child: Text(
+        "$state ${entityModel.entityWrapper.entity.unitOfMeasurement}",
+        textAlign: textAlign,
+        maxLines: maxLines,
+        overflow: TextOverflow.ellipsis,
+        softWrap: true,
+        style: textStyle
+      )
+    );
+    if (expanded) {
+      return Flexible(
+        fit: FlexFit.tight,
+        flex: 2,
+        child: result,
+      );
+    } else {
+      return result;
+    }
+  }
+}

lib/entity_widgets/common/universal_slider.dart

@@ -10,8 +10,9 @@ class UniversalSlider extends StatelessWidget {
   final double min;
   final double max;
   final double value;
+  final EdgeInsets padding;
 
-  const UniversalSlider({Key key, this.onChanged, this.onChangeEnd, this.leading, this.closing, this.title, this.min, this.max, this.value}) : super(key: key);
+  const UniversalSlider({Key key, this.onChanged, this.onChangeEnd, this.leading, this.closing, this.title, this.min, this.max, this.value, this.padding: const EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, Sizes.rowPadding, Sizes.rightWidgetPadding, 0.0)}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -33,7 +34,9 @@ class UniversalSlider extends StatelessWidget {
     if (closing != null) {
       row.add(closing);
     }
-    return Column(
+    return Padding(
+      padding: padding,
+      child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           Container(height: Sizes.rowPadding,),
@@ -48,6 +51,7 @@ class UniversalSlider extends StatelessWidget {
           ),
           Container(height: Sizes.rowPadding,)
         ],
+      ),
     );
   }
 

lib/entity_widgets/default_entity_container.dart

@@ -11,6 +11,29 @@ class DefaultEntityContainer extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final EntityModel entityModel = EntityModel.of(context);
+    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
+      return MissedEntityWidget();
+    }
+    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.DIVIDER) {
+      return Divider(
+        color: Colors.black45,
+      );
+    }
+    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.SECTION) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          Divider(
+            color: Colors.black45,
+          ),
+          Text(
+              "${entityModel.entityWrapper.entity.displayName}",
+            style: TextStyle(color: Colors.blue),
+          )
+        ],
+      );
+    }
     return InkWell(
       onLongPress: () {
         if (entityModel.handleTap) {
@@ -30,7 +53,9 @@ class DefaultEntityContainer extends StatelessWidget {
           Flexible(
             fit: FlexFit.tight,
             flex: 3,
-            child: EntityName(),
+            child: EntityName(
+              padding: EdgeInsets.fromLTRB(10.0, 2.0, 10.0, 2.0),
+            ),
           ),
           state
         ],

lib/entity_widgets/entity_colors.class.dart

@@ -2,6 +2,8 @@ part of '../main.dart';
 
 class EntityColor {
 
+  static const defaultStateColor = Color.fromRGBO(68, 115, 158, 1.0);
+
   static const badgeColors = {
     "default": Color.fromRGBO(223, 76, 30, 1.0),
     "binary_sensor": Color.fromRGBO(3, 155, 229, 1.0)
@@ -10,19 +12,29 @@ class EntityColor {
   static const _stateColors = {
     EntityState.on: Colors.amber,
     "auto": Colors.amber,
-    EntityState.idle: Colors.amber,
+    EntityState.active: Colors.amber,
     EntityState.playing: Colors.amber,
     "above_horizon": Colors.amber,
     EntityState.home:  Colors.amber,
     EntityState.open:  Colors.amber,
-    EntityState.off: Color.fromRGBO(68, 115, 158, 1.0),
+    EntityState.off: defaultStateColor,
-    EntityState.closed: Color.fromRGBO(68, 115, 158, 1.0),
+    EntityState.closed: defaultStateColor,
-    "below_horizon": Color.fromRGBO(68, 115, 158, 1.0),
+    "below_horizon": defaultStateColor,
-    "default": Color.fromRGBO(68, 115, 158, 1.0),
+    "default": defaultStateColor,
+    EntityState.idle: defaultStateColor,
     "heat": Colors.redAccent,
     "cool": Colors.lightBlue,
     EntityState.unavailable: Colors.black26,
     EntityState.unknown: Colors.black26,
+    EntityState.alarm_disarmed: Colors.green,
+    EntityState.alarm_armed_away: Colors.redAccent,
+    EntityState.alarm_armed_custom_bypass: Colors.redAccent,
+    EntityState.alarm_armed_home: Colors.redAccent,
+    EntityState.alarm_armed_night: Colors.redAccent,
+    EntityState.alarm_triggered: Colors.redAccent,
+    EntityState.alarm_arming: Colors.amber,
+    EntityState.alarm_disarming: Colors.amber,
+    EntityState.alarm_pending: Colors.amber,
   };
 
   static Color stateColor(String state) {

lib/entity_widgets/entity_icon.dart

@@ -3,20 +3,71 @@ part of '../main.dart';
 class EntityIcon extends StatelessWidget {
 
   final EdgeInsetsGeometry padding;
-  final double iconSize;
+  final double size;
+  final Color color;
 
-  const EntityIcon({Key key, this.iconSize: Sizes.iconSize, this.padding: const EdgeInsets.fromLTRB(
+  const EntityIcon({Key key, this.color, this.size: Sizes.iconSize, this.padding: const EdgeInsets.all(0.0)}) : super(key: key);
-      Sizes.leftWidgetPadding, 0.0, 12.0, 0.0)}) : super(key: key);
+
+  int getDefaultIconByEntityId(String entityId, String deviceClass, String state) {
+    String domain = entityId.split(".")[0];
+    String iconNameByDomain = MaterialDesignIcons.defaultIconsByDomains["$domain.$state"] ?? MaterialDesignIcons.defaultIconsByDomains["$domain"];
+    String iconNameByDeviceClass;
+    if (deviceClass != null) {
+      iconNameByDeviceClass = MaterialDesignIcons.defaultIconsByDeviceClass["$domain.$deviceClass.$state"] ?? MaterialDesignIcons.defaultIconsByDeviceClass["$domain.$deviceClass"];
+    }
+    String iconName = iconNameByDeviceClass ?? iconNameByDomain;
+    if (iconName != null) {
+      return MaterialDesignIcons.iconsDataMap[iconName] ?? 0;
+    } else {
+      return 0;
+    }
+  }
+
+  Widget buildIcon(EntityWrapper data, Color color) {
+    if (data == null) {
+      return null;
+    }
+    if (data.entityPicture != null) {
+      return Container(
+        height: size+12,
+        width: size+12,
+        decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            image: DecorationImage(
+              fit:BoxFit.cover,
+              image: CachedNetworkImageProvider(
+                "${data.entityPicture}"
+              ),
+            )
+        ),
+      );
+    }
+    String iconName = data.icon;
+    int iconCode = 0;
+    if (iconName.length > 0) {
+      iconCode = MaterialDesignIcons.getIconCodeByIconName(iconName);
+    } else {
+      iconCode = getDefaultIconByEntityId(data.entity.entityId,
+          data.entity.deviceClass, data.entity.state); //
+    }
+    return Padding(
+        padding: EdgeInsets.fromLTRB(6.0, 6.0, 6.0, 6.0),
+        child: Icon(
+          IconData(iconCode, fontFamily: 'Material Design Icons'),
+          size: size,
+          color: color,
+        )
+    );
+  }
 
   @override
   Widget build(BuildContext context) {
     final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
     return Padding(
       padding: padding,
-      child: MaterialDesignIcons.createIconWidgetFromEntityData(
+      child: buildIcon(
           entityWrapper,
-          iconSize,
+          color ?? EntityColor.stateColor(entityWrapper.entity.state)
-          EntityColor.stateColor(entityWrapper.entity.state)
       ),
     );
   }

lib/entity_widgets/entity_name.dart

@@ -7,19 +7,25 @@ class EntityName extends StatelessWidget {
   final bool wordsWrap;
   final double fontSize;
   final TextAlign textAlign;
+  final int maxLines;
 
-  const EntityName({Key key, this.padding: const EdgeInsets.only(right: 10.0), this.textOverflow: TextOverflow.ellipsis, this.wordsWrap: true, this.fontSize: Sizes.nameFontSize, this.textAlign: TextAlign.left}) : super(key: key);
+  const EntityName({Key key, this.maxLines, this.padding: const EdgeInsets.only(right: 10.0), this.textOverflow: TextOverflow.ellipsis, this.wordsWrap: true, this.fontSize: Sizes.nameFontSize, this.textAlign: TextAlign.left}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
+    TextStyle textStyle = TextStyle(fontSize: fontSize);
+    if (entityWrapper.entity.statelessType == StatelessEntityType.WEBLINK) {
+      textStyle = textStyle.apply(color: Colors.blue, decoration: TextDecoration.underline);
+    }
     return Padding(
       padding: padding,
       child: Text(
         "${entityWrapper.displayName}",
         overflow: textOverflow,
         softWrap: wordsWrap,
-        style: TextStyle(fontSize: fontSize),
+        maxLines: maxLines,
+        style: textStyle,
         textAlign: textAlign,
       ),
     );

lib/entity_widgets/glance_entity_container.dart

@@ -4,41 +4,58 @@ class GlanceEntityContainer extends StatelessWidget {
 
   final bool showName;
   final bool showState;
+  final bool nameInTheBottom;
+  final double iconSize;
+  final double nameFontSize;
+  final bool wordsWrapInName;
 
   GlanceEntityContainer({
-    Key key, @required this.showName, @required this.showState,
+    Key key,
+    @required this.showName,
+    @required this.showState,
+    this.nameInTheBottom: false,
+    this.iconSize: Sizes.iconSize,
+    this.nameFontSize: Sizes.smallFontSize,
+    this.wordsWrapInName: false
   }) : super(key: key);
 
   @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,);
+    }
     List<Widget> result = [];
+    if (!nameInTheBottom) {
       if (showName) {
-      result.add(EntityName(
+        result.add(_buildName());
-        padding: EdgeInsets.only(bottom: Sizes.rowPadding),
+      }
-        textOverflow: TextOverflow.ellipsis,
+    } else {
-        wordsWrap: false,
+      if (showState) {
-        textAlign: TextAlign.center,
+        result.add(_buildState());
-        fontSize: Sizes.smallFontSize,
+      }
-      ));
     }
     result.add(
       EntityIcon(
         padding: EdgeInsets.all(0.0),
-        iconSize: Sizes.iconSize,
+        size: iconSize,
       )
     );
+    if (!nameInTheBottom) {
       if (showState) {
-      result.add(SimpleEntityState(
+        result.add(_buildState());
-        textAlign: TextAlign.center,
-        expanded: false,
-        padding: EdgeInsets.only(top: Sizes.rowPadding),
-      ));
       }
+    } else {
+      result.add(_buildName());
+    }
+
     return Center(
       child: InkResponse(
         child: ConstrainedBox(
-          constraints: BoxConstraints(minWidth: Sizes.iconSize*2),
+          constraints: BoxConstraints(minWidth: Sizes.iconSize * 2),
           child: Column(
             mainAxisSize: MainAxisSize.min,
             //mainAxisAlignment: MainAxisAlignment.start,
@@ -51,4 +68,23 @@ class GlanceEntityContainer extends StatelessWidget {
       ),
     );
   }
+
+  Widget _buildName() {
+    return EntityName(
+      padding: EdgeInsets.only(bottom: Sizes.rowPadding),
+      textOverflow: TextOverflow.ellipsis,
+      wordsWrap: wordsWrapInName,
+      textAlign: TextAlign.center,
+      fontSize: nameFontSize,
+    );
+  }
+
+  Widget _buildState() {
+    return SimpleEntityState(
+      textAlign: TextAlign.center,
+      expanded: false,
+      maxLines: 1,
+      padding: EdgeInsets.only(top: Sizes.rowPadding),
+    );
+  }
 }

lib/entity_widgets/history_chart/combined_history_chart.dart

@@ -94,11 +94,11 @@ class _CombinedHistoryChartWidgetState extends State<CombinedHistoryChartWidget>
   }
 
   List<charts.Series<EntityHistoryMoment, DateTime>> _parseHistory() {
-    TheLogger.debug("  parsing history...");
+    Logger.d("  parsing history...");
     Map<String, List<EntityHistoryMoment>> numericDataLists = {};
     int colorIdCounter = 0;
     widget.config.numericAttributesToShow.forEach((String attrName) {
-      TheLogger.debug("    parsing attribute $attrName");
+      Logger.d("    parsing attribute $attrName");
       List<EntityHistoryMoment> data = [];
       DateTime now = DateTime.now();
       for (var i = 0; i < widget.rawHistory.length; i++) {
@@ -148,11 +148,11 @@ class _CombinedHistoryChartWidgetState extends State<CombinedHistoryChartWidget>
     });
 
     if ((_selectedId == -1) && (numericDataLists.isNotEmpty)) {
-      _selectedId = 0;
+      _selectedId = numericDataLists.length -1;
     }
     List<charts.Series<EntityHistoryMoment, DateTime>> result = [];
     numericDataLists.forEach((attrName, dataList) {
-      TheLogger.debug("  adding ${dataList.length} data values");
+      Logger.d("  adding ${dataList.length} data values");
       result.add(
         new charts.Series<EntityHistoryMoment, DateTime>(
           id: "value",
@@ -202,6 +202,11 @@ class _CombinedHistoryChartWidgetState extends State<CombinedHistoryChartWidget>
         _selectedId -= 1;
       });
     }
+    else {
+      setState(() {
+        _selectedId = _parsedHistory.first.data.length - 1;
+      });
+    }
   }
 
   void _selectNext() {
@@ -210,6 +215,12 @@ class _CombinedHistoryChartWidgetState extends State<CombinedHistoryChartWidget>
         _selectedId += 1;
       });
     }
+    else {
+      setState(() {
+        _selectedId = 0;
+      });
+
+    }
   }
 
   void _onSelectionChanged(charts.SelectionModel model) {

lib/entity_widgets/history_chart/entity_history.dart

@@ -32,6 +32,7 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
   List _history;
   bool _needToUpdateHistory;
   DateTime _historyLastUpdated;
+  bool _disposed = false;
 
   @override
   void initState() {
@@ -39,37 +40,40 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
     _needToUpdateHistory = true;
   }
 
-  void _loadHistory(HomeAssistant ha, String entityId) {
+  void _loadHistory(String entityId) {
     DateTime now = DateTime.now();
     if (_historyLastUpdated != null) {
-      TheLogger.debug("History was updated ${now.difference(_historyLastUpdated).inSeconds} seconds ago");
+      Logger.d("History was updated ${now.difference(_historyLastUpdated).inSeconds} seconds ago");
     }
     if (_historyLastUpdated == null || now.difference(_historyLastUpdated).inSeconds > 30) {
       _historyLastUpdated = now;
-      ha.getHistory(entityId).then((history){
+      ConnectionManager().getHistory(entityId).then((history){
+        if (!_disposed) {
           setState(() {
             _history = history.isNotEmpty ? history[0] : [];
             _needToUpdateHistory = false;
           });
+        }
       }).catchError((e) {
-        TheLogger.error("Error loading $entityId history: $e");
+        Logger.e("Error loading $entityId history: $e");
+        if (!_disposed) {
           setState(() {
             _history = [];
             _needToUpdateHistory = false;
           });
+        }
       });
     }
   }
 
   @override
   Widget build(BuildContext context) {
-    final HomeAssistantModel homeAssistantModel = HomeAssistantModel.of(context);
     final EntityModel entityModel = EntityModel.of(context);
     final Entity entity = entityModel.entityWrapper.entity;
     if (!_needToUpdateHistory) {
       _needToUpdateHistory = true;
     } else {
-      _loadHistory(homeAssistantModel.homeAssistant, entity.entityId);
+      _loadHistory(entity.entityId);
     }
     return _buildChart();
   }
@@ -122,7 +126,7 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
       }
 
       default: {
-        TheLogger.debug("  Simple selected as default");
+        Logger.d("  Simple selected as default");
         return SimpleStateHistoryChartWidget(
           rawHistory: _history,
         );
@@ -131,4 +135,10 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
 
   }
 
+  @override
+  void dispose() {
+    _disposed = true;
+    super.dispose();
+  }
+
 }

lib/entity_widgets/history_chart/numeric_state_history_chart.dart

@@ -103,7 +103,7 @@ class _NumericStateHistoryChartWidgetState extends State<NumericStateHistoryChar
         id: widget.rawHistory.length
     ));
     if (_selectedId == -1) {
-      _selectedId = 0;
+      _selectedId = data.length - 1;
     }
     return [
       new charts.Series<EntityHistoryMoment, DateTime>(
@@ -132,6 +132,11 @@ class _NumericStateHistoryChartWidgetState extends State<NumericStateHistoryChar
         _selectedId -= 1;
       });
     }
+    else {
+      setState(() {
+        _selectedId = _parsedHistory.first.data.length - 1;
+      });
+    }
   }
 
   void _selectNext() {
@@ -140,6 +145,12 @@ class _NumericStateHistoryChartWidgetState extends State<NumericStateHistoryChar
         _selectedId += 1;
       });
     }
+    else {
+      setState(() {
+        _selectedId = 0;
+      });
+
+    }
   }
 
   void _onSelectionChanged(charts.SelectionModel model) {

lib/entity_widgets/history_chart/simple_state_history_chart.dart

@@ -101,7 +101,7 @@ class _SimpleStateHistoryChartWidgetState extends State<SimpleStateHistoryChartW
         colorId: data.last.colorId
     ));
     if (_selectedId == -1) {
-      _selectedId = 0;
+      _selectedId = data.length - 1;
     }
     return [
       new charts.Series<EntityHistoryMoment, DateTime>(
@@ -137,14 +137,25 @@ class _SimpleStateHistoryChartWidgetState extends State<SimpleStateHistoryChartW
         _selectedId -= 1;
       });
     }
+    else {
+      setState(() {
+        _selectedId = _parsedHistory.first.data.length - 1;
+      });
+    }
   }
 
   void _selectNext() {
-    if (_selectedId < (_parsedHistory.first.data.length - 2)) {
+    if (_selectedId < (_parsedHistory.first.data.length - 1)) {
       setState(() {
         _selectedId += 1;
       });
     }
+    else {
+      setState(() {
+        _selectedId = 0;
+      });
+
+    }
   }
 
   void _onSelectionChanged(charts.SelectionModel model) {

lib/entity_widgets/missed_entity.dart

@@ -0,0 +1,19 @@
+part of '../main.dart';
+
+class MissedEntityWidget extends StatelessWidget {
+  MissedEntityWidget({
+    Key key
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final EntityModel entityModel = EntityModel.of(context);
+    return Container(
+        child: Padding(
+          padding: EdgeInsets.all(5.0),
+          child: Text("Entity not available: ${entityModel.entityWrapper.entity.entityId}"),
+        ),
+        color: Colors.amber[100],
+    );
+  }
+}

lib/entity_widgets/model_widgets.dart

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

lib/entity_widgets/state/button_state.dart

@@ -1,27 +0,0 @@
-part of '../../main.dart';
-
-class ButtonStateWidget extends StatelessWidget {
-
-  void _setNewState(Entity entity) {
-    eventBus.fire(new ServiceCallEvent(entity.domain, "turn_on", entity.entityId, null));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final entityModel = EntityModel.of(context);
-    return SizedBox(
-      height: 34.0,
-      child: FlatButton(
-        onPressed: (() {
-          _setNewState(entityModel.entityWrapper.entity);
-        }),
-        child: Text(
-          "EXECUTE",
-          textAlign: TextAlign.right,
-          style:
-          new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
-        ),
-      )
-    );
-  }
-}

lib/entity_widgets/state/lock_state.dart

@@ -1,32 +0,0 @@
-part of '../../main.dart';
-
-class LockStateWidget extends StatelessWidget {
-
-  void _lock(Entity entity) {
-    eventBus.fire(new ServiceCallEvent("lock", "lock", entity.entityId, null));
-  }
-
-  void _unlock(Entity entity) {
-    eventBus.fire(new ServiceCallEvent("lock", "unlock", entity.entityId, null));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final entityModel = EntityModel.of(context);
-    final LockEntity entity = entityModel.entityWrapper.entity;
-    return SizedBox(
-      height: 34.0,
-      child: FlatButton(
-        onPressed: (() {
-          entity.isLocked ? _unlock(entity) : _lock(entity);
-        }),
-        child: Text(
-          entity.isLocked ? "UNLOCK" : "LOCK",
-          textAlign: TextAlign.right,
-          style:
-          new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
-        ),
-      )
-    );
-  }
-}

lib/entity_widgets/state/simple_state.dart

@@ -1,37 +0,0 @@
-part of '../../main.dart';
-
-class SimpleEntityState extends StatelessWidget {
-
-  final bool expanded;
-  final TextAlign textAlign;
-  final EdgeInsetsGeometry padding;
-
-  const SimpleEntityState({Key key, this.expanded: true, this.textAlign: TextAlign.right, this.padding: const EdgeInsets.fromLTRB(0.0, 0.0, Sizes.rightWidgetPadding, 0.0)}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    final entityModel = EntityModel.of(context);
-    Widget result = Padding(
-      padding: padding,
-      child: Text(
-        "${entityModel.entityWrapper.entity.state} ${entityModel.entityWrapper.entity.unitOfMeasurement}",
-        textAlign: textAlign,
-        maxLines: 10,
-        overflow: TextOverflow.ellipsis,
-        softWrap: true,
-        style: new TextStyle(
-          fontSize: Sizes.stateFontSize,
-        )
-      )
-    );
-    if (expanded) {
-      return Flexible(
-        fit: FlexFit.tight,
-        flex: 2,
-        child: result,
-      );
-    } else {
-      return result;
-    }
-  }
-}

lib/home_assistant.class.dart

@@ -1,47 +1,29 @@
 part of 'main.dart';
 
 class HomeAssistant {
-  String _webSocketAPIEndpoint;
-  String _password;
-  String _authType;
-  bool _useLovelace = false;
 
-  IOWebSocketChannel _hassioChannel;
+  static final HomeAssistant _instance = HomeAssistant._internal();
-  SendMessageQueue _messageQueue;
+
+  factory HomeAssistant() {
+    return _instance;
+  }
 
-  int _currentMessageId = 0;
-  int _statesMessageId = 0;
-  int _servicesMessageId = 0;
-  int _subscriptionMessageId = 0;
-  int _configMessageId = 0;
-  int _userInfoMessageId = 0;
-  int _lovelaceMessageId = 0;
   EntityCollection entities;
   HomeAssistantUI ui;
   Map _instanceConfig = {};
   String _userName;
+  HSVColor savedColor;
+
+  String fcmToken;
 
   Map _rawLovelaceData;
 
-  Completer _fetchCompleter;
+  List<Panel> panels = [];
-  Completer _statesCompleter;
-  Completer _servicesCompleter;
-  Completer _lovelaceCompleter;
-  Completer _configCompleter;
-  Completer _connectionCompleter;
-  Completer _userInfoCompleter;
-  Timer _connectionTimer;
-  Timer _fetchTimer;
-  bool autoReconnect = false;
 
-  StreamSubscription _socketSubscription;
-
-  int messageExpirationTime = 30; //seconds
   Duration fetchTimeout = Duration(seconds: 30);
-  Duration connectTimeout = Duration(seconds: 15);
 
   String get locationName {
-    if (_useLovelace) {
+    if (ConnectionManager().useLovelace) {
       return ui?.title ?? "";
     } else {
       return _instanceConfig["location_name"] ?? "";
@@ -49,374 +31,149 @@ class HomeAssistant {
   }
   String get userName => _userName ?? locationName;
   String get userAvatarText => userName.length > 0 ? userName[0] : "";
-  //int get viewsCount => entities.views.length ?? 0;
+  bool get isNoEntities => entities == null || entities.isEmpty;
+  bool get isNoViews => ui == null || ui.isEmpty;
+  bool get isMobileAppEnabled => _instanceConfig["components"] != null && (_instanceConfig["components"] as List).contains("mobile_app");
 
-  HomeAssistant() {
+  HomeAssistant._internal() {
-    entities = EntityCollection();
+    ConnectionManager().onStateChangeCallback = _handleEntityStateChange;
-    _messageQueue = SendMessageQueue(messageExpirationTime);
+    DeviceInfoManager().loadDeviceInfo();
   }
 
-  void updateSettings(String url, String password, String authType, bool useLovelace) {
+  Completer _fetchCompleter;
-    _webSocketAPIEndpoint = url;
-    _password = password;
-    _authType = authType;
-    _useLovelace = useLovelace;
-    TheLogger.debug( "Use lovelace is $_useLovelace");
-  }
 
-  Future fetch() {
+  Future fetchData() {
-    if ((_fetchCompleter != null) && (!_fetchCompleter.isCompleted)) {
+    if (_fetchCompleter != null && !_fetchCompleter.isCompleted) {
-      TheLogger.warning("Previous fetch is not complited");
+      Logger.w("Previous data fetch is not completed yet");
-    } else {
-      _fetchCompleter = new Completer();
-      _fetchTimer = Timer(fetchTimeout, () {
-        TheLogger.error( "Data fetching timeout");
-        disconnect().then((_) {
-          _completeFetching({
-            "errorCode": 9,
-            "errorMessage": "Couldn't get data from server"
-          });
-        });
-      });
-      _connection().then((r) {
-        _getData();
-      }).catchError((e) {
-        _completeFetching(e);
-      });
-    }
       return _fetchCompleter.future;
     }
-
+    if (entities == null) entities = EntityCollection(ConnectionManager().httpWebHost);
-  disconnect() async {
+    _fetchCompleter = Completer();
-    if ((_hassioChannel != null) && (_hassioChannel.closeCode == null) && (_hassioChannel.sink != null)) {
-      await _hassioChannel.sink.close().timeout(Duration(seconds: 3),
-        onTimeout: () => TheLogger.debug( "Socket sink closed")
-      );
-      await _socketSubscription.cancel();
-      _hassioChannel = null;
-    }
-
-  }
-
-  Future _connection() {
-    if ((_connectionCompleter != null) && (!_connectionCompleter.isCompleted)) {
-      TheLogger.debug("Previous connection is not complited");
-    } else {
-      if ((_hassioChannel == null) || (_hassioChannel.closeCode != null)) {
-        _connectionCompleter = new Completer();
-        autoReconnect = false;
-        disconnect().then((_){
-          TheLogger.debug( "Socket connecting...");
-          _connectionTimer = Timer(connectTimeout, () {
-            TheLogger.error( "Socket connection timeout");
-            _handleSocketError(null);
-          });
-          if (_socketSubscription != null) {
-            _socketSubscription.cancel();
-          }
-          _hassioChannel = IOWebSocketChannel.connect(
-              _webSocketAPIEndpoint, pingInterval: Duration(seconds: 30));
-          _socketSubscription = _hassioChannel.stream.listen(
-                  (message) => _handleMessage(message),
-              cancelOnError: true,
-              onDone: () => _handleSocketClose(),
-              onError: (e) => _handleSocketError(e)
-          );
-        });
-      } else {
-        _completeConnecting(null);
-      }
-    }
-    return _connectionCompleter.future;
-  }
-
-  void _handleSocketClose() {
-    TheLogger.debug("Socket disconnected. Automatic reconnect is $autoReconnect");
-    if (autoReconnect) {
-      _reconnect();
-    }
-  }
-
-  void _handleSocketError(e) {
-    TheLogger.error("Socket stream Error: $e");
-    TheLogger.debug("Automatic reconnect is $autoReconnect");
-    if (autoReconnect) {
-      _reconnect();
-    } else {
-      disconnect().then((_) {
-        _completeConnecting({
-          "errorCode": 1,
-          "errorMessage": "Couldn't connect to Home Assistant. Check network connection or connection settings."
-        });
-      });
-    }
-  }
-
-  void _reconnect() {
-    disconnect().then((_) {
-      _connection().catchError((e){
-        _completeConnecting(e);
-      });
-    });
-  }
-
-  _getData() async {
     List<Future> futures = [];
     futures.add(_getStates());
-    if (_useLovelace) {
+    if (ConnectionManager().useLovelace) {
       futures.add(_getLovelace());
     }
     futures.add(_getConfig());
     futures.add(_getServices());
     futures.add(_getUserInfo());
-    try {
+    futures.add(_getPanels());
-      await Future.wait(futures);
+    futures.add(ConnectionManager().sendSocketMessage(
+      type: "subscribe_events",
+      additionalData: {"event_type": "state_changed"},
+    ));
+    Future.wait(futures).then((_) {
+      if (isMobileAppEnabled) {
         _createUI();
-      _completeFetching(null);
-    } catch (error) {
-      _completeFetching(error);
-    }
-  }
-
-  void _completeFetching(error) {
-    _fetchTimer.cancel();
-    _completeConnecting(error);
-    if (!_fetchCompleter.isCompleted) {
-      if (error != null) {
-        _fetchCompleter.completeError(error);
-      } else {
-        autoReconnect = true;
-        TheLogger.debug( "Fetch complete successful");
         _fetchCompleter.complete();
-      }
+        MobileAppIntegrationManager.checkAppRegistration();
-    }
-  }
-
-  void _completeConnecting(error) {
-    _connectionTimer.cancel();
-    if (!_connectionCompleter.isCompleted) {
-      if (error != null) {
-        _connectionCompleter.completeError(error);
       } else {
-        _connectionCompleter.complete();
+        _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")]));
       }
-    } else if (error != null) {
+    }).catchError((e) {
-      if (error is Error) {
+      _fetchCompleter.completeError(e);
-        eventBus.fire(ShowErrorEvent(error.toString(), 12));
-      } else {
-        eventBus.fire(ShowErrorEvent(error["errorMessage"], error["errorCode"]));
-      }
-
-    }
-  }
-
-  _handleMessage(String message) {
-    var data = json.decode(message);
-    if (data["type"] == "auth_required") {
-      _sendAuthMessageRaw('{"type": "auth","$_authType": "$_password"}');
-    } else if (data["type"] == "auth_ok") {
-      _completeConnecting(null);
-      _sendSubscribe();
-    } else if (data["type"] == "auth_invalid") {
-      _completeConnecting({"errorCode": 6, "errorMessage": "${data["message"]}"});
-    } else if (data["type"] == "result") {
-      TheLogger.debug("[Received] <== id:${data["id"]}, ${data['success'] ? 'success' : 'error'}");
-      if (data["id"] == _configMessageId) {
-        _parseConfig(data);
-      } else if (data["id"] == _statesMessageId) {
-        _parseEntities(data);
-      } else if (data["id"] == _lovelaceMessageId) {
-        _handleLovelace(data);
-      } else if (data["id"] == _servicesMessageId) {
-        _parseServices(data);
-      } else if (data["id"] == _userInfoMessageId) {
-        _parseUserInfo(data);
-      }
-    } else if (data["type"] == "event") {
-      if ((data["event"] != null) && (data["event"]["event_type"] == "state_changed")) {
-        TheLogger.debug("[Received] <== ${data['type']}.${data["event"]["event_type"]}: ${data["event"]["data"]["entity_id"]}");
-        _handleEntityStateChange(data["event"]["data"]);
-      } else if (data["event"] != null) {
-        TheLogger.warning("Unhandled event type: ${data["event"]["event_type"]}");
-      } else {
-        TheLogger.error("Event is null: $message");
-      }
-    } else {
-      TheLogger.warning("Unknown message type: $message");
-    }
-  }
-
-  void _sendSubscribe() {
-    _incrementMessageId();
-    _subscriptionMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_subscriptionMessageId, "type": "subscribe_events", "event_type": "state_changed"}', false);
-  }
-
-  Future _getConfig() {
-    _configCompleter = new Completer();
-    _incrementMessageId();
-    _configMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_configMessageId, "type": "get_config"}', false);
-
-    return _configCompleter.future;
-  }
-
-  Future _getStates() {
-    _statesCompleter = new Completer();
-    _incrementMessageId();
-    _statesMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_statesMessageId, "type": "get_states"}', false);
-
-    return _statesCompleter.future;
-  }
-
-  Future _getLovelace() {
-    _lovelaceCompleter = new Completer();
-    _incrementMessageId();
-    _lovelaceMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_lovelaceMessageId, "type": "lovelace/config"}', false);
-
-    return _lovelaceCompleter.future;
-  }
-
-  Future _getUserInfo() {
-    _userInfoCompleter = new Completer();
-    _incrementMessageId();
-    _userInfoMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_userInfoMessageId, "type": "auth/current_user"}', false);
-
-    return _userInfoCompleter.future;
-  }
-
-  Future _getServices() {
-    _servicesCompleter = new Completer();
-    _incrementMessageId();
-    _servicesMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_servicesMessageId, "type": "get_services"}', false);
-
-    return _servicesCompleter.future;
-  }
-
-  _incrementMessageId() {
-    _currentMessageId += 1;
-  }
-
-  void _sendAuthMessageRaw(String message) {
-    TheLogger.debug( "[Sending] ==> auth request");
-    _hassioChannel.sink.add(message);
-  }
-
-  _sendMessageRaw(String message, bool queued) {
-    var sendCompleter = Completer();
-    if (queued) _messageQueue.add(message);
-    _connection().then((r) {
-      _messageQueue.getActualMessages().forEach((message){
-        TheLogger.debug( "[Sending queued] ==> $message");
-        _hassioChannel.sink.add(message);
     });
-      if (!queued) {
+    return _fetchCompleter.future;
-        TheLogger.debug( "[Sending] ==> $message");
-        _hassioChannel.sink.add(message);
-      }
-      sendCompleter.complete();
-    }).catchError((e){
-      sendCompleter.completeError(e);
-    });
-    return sendCompleter.future;
   }
 
-  Future callService(String domain, String service, String entityId, Map<String, dynamic> additionalParams) {
+  Future logout() async {
-    _incrementMessageId();
+    Logger.d("Logging out...");
-    String message = "";
+    await ConnectionManager().logout().then((_) {
-    if (entityId != null) {
+      ui?.clear();
-      message = '{"id": $_currentMessageId, "type": "call_service", "domain": "$domain", "service": "$service", "service_data": {"entity_id": "$entityId"';
+      entities?.clear();
-      if (additionalParams != null) {
+      panels?.clear();
-        additionalParams.forEach((name, value) {
-          if ((value is double) || (value is int) || (value is List)) {
-            message += ', "$name" : $value';
-          } else {
-            message += ', "$name" : "$value"';
-          }
     });
   }
-      message += '}}';
-    } else {
-      message = '{"id": $_currentMessageId, "type": "call_service", "domain": "$domain", "service": "$service"';
-      if (additionalParams != null && additionalParams.isNotEmpty) {
-        message += ', "service_data": {';
-        bool first = true;
-        additionalParams.forEach((name, value) {
-          if (!first) {
-            message += ', ';
-          }
-          if ((value is double) || (value is int) || (value is List)) {
-            message += '"$name" : $value';
-          } else {
-            message += '"$name" : "$value"';
-          }
-          first = false;
-        });
 
-        message += '}';
+  Future _getConfig() async {
+    await ConnectionManager().sendSocketMessage(type: "get_config").then((data) {
+      _instanceConfig = Map.from(data);
+    }).catchError((e) {
+      throw HAError("Error getting config: ${e}");
+    });
   }
-      message += '}';
+
+  Future _getStates() async {
+    await ConnectionManager().sendSocketMessage(type: "get_states").then(
+            (data) => entities.parse(data)
+    ).catchError((e) {
+      throw HAError("Error getting states: $e");
+    });
   }
-    return _sendMessageRaw(message, true);
+
+  Future _getLovelace() async {
+    await ConnectionManager().sendSocketMessage(type: "lovelace/config").then((data) => _rawLovelaceData = data).catchError((e) {
+      throw HAError("Error getting lovelace config: $e");
+    });
+  }
+
+  Future _getUserInfo() async {
+    _userName = null;
+    await ConnectionManager().sendSocketMessage(type: "auth/current_user").then((data) => _userName = data["name"]).catchError((e) {
+      Logger.w("Can't get user info: ${e}");
+    });
+  }
+
+  Future _getServices() async {
+    await ConnectionManager().sendSocketMessage(type: "get_services").then((data) => Logger.d("Services received")).catchError((e) {
+      Logger.w("Can't get services: ${e}");
+    });
+  }
+
+  Future _getPanels() async {
+    panels.clear();
+    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(
+            id: k,
+            type: v["component_name"],
+            title: title,
+            urlPath: v["url_path"],
+            config: v["config"],
+            icon: v["icon"]
+        )
+        );
+      });
+    }).catchError((e) {
+      throw HAError("Error getting panels list: $e");
+    });
   }
 
   void _handleEntityStateChange(Map eventData) {
     //TheLogger.debug( "New state for ${eventData['entity_id']}");
+    if (_fetchCompleter.isCompleted) {
       Map data = Map.from(eventData);
-    entities.updateState(data);
+      eventBus.fire(new StateChangedEvent(
-    eventBus.fire(new StateChangedEvent(data["entity_id"], null));
+          entityId: data["entity_id"],
+          needToRebuildUI: entities.updateState(data)
+      ));
     }
-
-  void _parseConfig(Map data) {
-    if (data["success"] == true) {
-      _instanceConfig = Map.from(data["result"]);
-      _configCompleter.complete();
-    } else {
-      _configCompleter.completeError({"errorCode": 2, "errorMessage": data["error"]["message"]});
-    }
-  }
-
-  void _parseUserInfo(Map data) {
-    if (data["success"] == true) {
-      _userName = data["result"]["name"];
-    } else {
-      _userName = null;
-      TheLogger.warning("There was an error getting current user: $data");
-    }
-    _userInfoCompleter.complete();
-  }
-
-  void _parseServices(response) {
-    _servicesCompleter.complete();
-  }
-
-  void _handleLovelace(response) {
-    if (response["success"] == true) {
-      _rawLovelaceData = response["result"];
-    } else {
-      TheLogger.error("There was an error getting Lovelace config: $response");
-      _rawLovelaceData = null;
-    }
-    _lovelaceCompleter.complete();
   }
 
   void _parseLovelace() {
-      TheLogger.debug("--Title: ${_rawLovelaceData["title"]}");
+      Logger.d("--Title: ${_rawLovelaceData["title"]}");
       ui.title = _rawLovelaceData["title"];
       int viewCounter = 0;
-      TheLogger.debug("--Views count: ${_rawLovelaceData['views'].length}");
+      Logger.d("--Views count: ${_rawLovelaceData['views'].length}");
       _rawLovelaceData["views"].forEach((rawView){
-        TheLogger.debug("----view id: ${rawView['id']}");
+        Logger.d("----view id: ${rawView['id']}");
         HAView view = HAView(
             count: viewCounter,
             id: "${rawView['id']}",
             name: rawView['title'],
             iconName: rawView['icon']
         );
+
+        if (rawView['badges'] != null && rawView['badges'] is List) {
+          rawView['badges'].forEach((entity) {
+            if (entities.isExist(entity)) {
+              Entity e = entities.get(entity);
+              view.badges.add(e);
+            }
+          });
+        }
+
         view.cards.addAll(_createLovelaceCards(rawView["cards"] ?? []));
         ui.views.add(
             view
@@ -428,84 +185,131 @@ class HomeAssistant {
   List<HACard> _createLovelaceCards(List rawCards) {
     List<HACard> result = [];
     rawCards.forEach((rawCard){
-      if (rawCard["cards"] != null) {
+      try {
-        result.addAll(_createLovelaceCards(rawCard["cards"]));
+        //bool isThereCardOptionsInside = rawCard["card"] != null;
-      } else {
+        var rawCardInfo =  rawCard["card"] ?? rawCard;
         HACard card = HACard(
             id: "card",
-            name: rawCard["title"],
+            name: rawCardInfo["title"] ?? rawCardInfo["name"],
-            type: rawCard['type'],
+            type: rawCardInfo['type'] ?? CardType.entities,
-            columnsCount: rawCard['columns'] ?? 4,
+            columnsCount: rawCardInfo['columns'] ?? 4,
-            showName: rawCard['show_name'] ?? true,
+            showName: rawCardInfo['show_name'] ?? true,
-            showState: rawCard['show_state'] ?? true,
+            showState: rawCardInfo['show_state'] ?? true,
+            showEmpty: rawCardInfo['show_empty'] ?? true,
+            stateFilter: rawCardInfo['state_filter'] ?? [],
+            states: rawCardInfo['states'],
+            conditions: rawCard['conditions'] ?? [],
+            content: rawCardInfo['content']
         );
-        rawCard["entities"]?.forEach((rawEntity) {
+        if (rawCardInfo["cards"] != null) {
+          card.childCards = _createLovelaceCards(rawCardInfo["cards"]);
+        }
+        rawCardInfo["entities"]?.forEach((rawEntity) {
           if (rawEntity is String) {
             if (entities.isExist(rawEntity)) {
               card.entities.add(EntityWrapper(entity: entities.get(rawEntity)));
+            } else {
+              card.entities.add(EntityWrapper(entity: Entity.missed(rawEntity)));
             }
           } else {
-            if (entities.isExist(rawEntity["entity"])) {
+            if (rawEntity["type"] == "divider") {
+              card.entities.add(EntityWrapper(entity: Entity.divider()));
+            } else if (rawEntity["type"] == "section") {
+              card.entities.add(EntityWrapper(entity: Entity.section(rawEntity["label"] ?? "")));
+            } else if (rawEntity["type"] == "call-service") {
+              Map uiActionData = {
+                "tap_action": {
+                  "action": EntityUIAction.callService,
+                  "service": rawEntity["service"],
+                  "service_data": rawEntity["service_data"]
+                },
+                "hold_action": EntityUIAction.none
+              };
+              card.entities.add(EntityWrapper(
+                  entity: Entity.callService(
+                    icon: rawEntity["icon"],
+                    name: rawEntity["name"],
+                    service: rawEntity["service"],
+                    actionName: rawEntity["action_name"]
+                  ),
+                uiAction: EntityUIAction(rawEntityData: uiActionData)
+              )
+              );
+            } else if (rawEntity["type"] == "weblink") {
+              Map uiActionData = {
+                "tap_action": {
+                  "action": EntityUIAction.navigate,
+                  "service": rawEntity["url"]
+                },
+                "hold_action": EntityUIAction.none
+              };
+              card.entities.add(EntityWrapper(
+                  entity: Entity.weblink(
+                      icon: rawEntity["icon"],
+                      name: rawEntity["name"],
+                      url: rawEntity["url"]
+                  ),
+                  uiAction: EntityUIAction(rawEntityData: uiActionData)
+              )
+              );
+            } else if (entities.isExist(rawEntity["entity"])) {
               Entity e = entities.get(rawEntity["entity"]);
-              String tapAction = EntityTapAction.moreInfo;
-              String holdAction = EntityTapAction.none;
-              if (card.type == CardType.glance) {
-                tapAction = rawEntity["tap_action"] ?? EntityTapAction.moreInfo;
-                holdAction = rawEntity["hold_action"] ?? EntityTapAction.none;
-              }
               card.entities.add(
                   EntityWrapper(
                       entity: e,
                       displayName: rawEntity["name"],
                       icon: rawEntity["icon"],
-                    tapAction: tapAction,
+                      uiAction: EntityUIAction(rawEntityData: rawEntity)
-                    holdAction: holdAction,
-                    tapActionService: rawEntity["service"],
-                    tapActionServiceData: rawEntity["service_data"] ?? {"entity_id": e.entityId}
                   )
               );
+            } else {
+              card.entities.add(EntityWrapper(entity: Entity.missed(rawEntity["entity"])));
             }
           }
         });
-        if (rawCard["entity"] != null) {
+        if (rawCardInfo["entity"] != null) {
-          var en = rawCard["entity"];
+          var en = rawCardInfo["entity"];
           if (en is String) {
             if (entities.isExist(en)) {
-              card.linkedEntity = EntityWrapper(entity: entities.get(en));
+              Entity e = entities.get(en);
+              card.linkedEntityWrapper = EntityWrapper(
+                  entity: e,
+                  icon: rawCardInfo["icon"],
+                  displayName: rawCardInfo["name"],
+                  uiAction: EntityUIAction(rawEntityData: rawCard)
+              );
+            } else {
+              card.linkedEntityWrapper = EntityWrapper(entity: Entity.missed(en));
             }
           } else {
             if (entities.isExist(en["entity"])) {
-              card.linkedEntity = EntityWrapper(
+              Entity e = entities.get(en["entity"]);
-                entity: entities.get(en["entity"]),
+              card.linkedEntityWrapper = EntityWrapper(
+                  entity: e,
                   icon: en["icon"],
-                displayName: en["name"]
+                  displayName: en["name"],
+                  uiAction: EntityUIAction(rawEntityData: rawCard)
               );
+            } else {
+              card.linkedEntityWrapper = EntityWrapper(entity: Entity.missed(en["entity"]));
             }
           }
-
         }
         result.add(card);
+      } catch (e) {
+          Logger.e("There was an error parsing card: ${e.toString()}");
       }
     });
     return result;
   }
 
-  void _parseEntities(response) async {
-    if (response["success"] == false) {
-      _statesCompleter.completeError({"errorCode": 3, "errorMessage": response["error"]["message"]});
-      return;
-    }
-    entities.parse(response["result"]);
-    _statesCompleter.complete();
-  }
-
   void _createUI() {
     ui = HomeAssistantUI();
-    if ((_useLovelace) && (_rawLovelaceData != null)) {
+    if ((ConnectionManager().useLovelace) && (_rawLovelaceData != null)) {
-      TheLogger.debug("Creating Lovelace UI");
+      Logger.d("Creating Lovelace UI");
       _parseLovelace();
     } else {
-      TheLogger.debug("Creating group-based UI");
+      Logger.d("Creating group-based UI");
       int viewCounter = 0;
       if (!entities.hasDefaultView) {
         HAView view = HAView(
@@ -535,38 +339,12 @@ class HomeAssistant {
     }
   }
 
-  Widget buildViews(BuildContext context, bool lovelace) {
+  Widget buildViews(BuildContext context, TabController tabController) {
-    return ui.build(context);
+    return ui.build(context, tabController);
-  }
-
-  Future<List> getHistory(String entityId) async {
-    DateTime now = DateTime.now();
-    //String endTime = formatDate(now, [yyyy, '-', mm, '-', dd, 'T', HH, ':', nn, ':', ss, z]);
-    String startTime = formatDate(now.subtract(Duration(hours: 24)), [yyyy, '-', mm, '-', dd, 'T', HH, ':', nn, ':', ss, z]);
-    String url = "$homeAssistantWebHost/api/history/period/$startTime?&filter_entity_id=$entityId";
-    TheLogger.debug("[Sending] ==> $url");
-    http.Response historyResponse;
-    if (_authType == "access_token") {
-      historyResponse = await http.get(url, headers: {
-        "authorization": "Bearer $_password",
-        "Content-Type": "application/json"
-      });
-    } else {
-      historyResponse = await http.get(url, headers: {
-        "X-HA-Access": "$_password",
-        "Content-Type": "application/json"
-      });
-    }
-    var history = json.decode(historyResponse.body);
-    if (history is List) {
-      TheLogger.debug( "[Received] <== ${history.first.length} history recors");
-      return history;
-    } else {
-      return [];
-    }
   }
 }
 
+/*
 class SendMessageQueue {
   int _messageTimeout;
   List<HAMessage> _queue = [];
@@ -605,4 +383,4 @@ class HAMessage {
   bool isExpired() {
     return DateTime.now().difference(_timeStamp).inSeconds > _messageTimeout;
   }
-}
+}*/

lib/main.dart

@@ -7,35 +7,50 @@ import 'package:web_socket_channel/io.dart';
 import 'package:event_bus/event_bus.dart';
 import 'package:flutter/widgets.dart';
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher.dart' as urlLauncher;
 import 'package:flutter/services.dart';
 import 'package:date_format/date_format.dart';
 import 'package:http/http.dart' as http;
-import 'package:flutter_colorpicker/material_picker.dart';
 import 'package:charts_flutter/flutter.dart' as charts;
 import 'package:progress_indicators/progress_indicators.dart';
+import 'package:flutter_markdown/flutter_markdown.dart';
+import 'package:flutter_custom_tabs/flutter_custom_tabs.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:device_info/device_info.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:in_app_purchase/in_app_purchase.dart';
 
-part 'entity_class/const.dart';
+part 'const.dart';
-part 'entity_class/entity.class.dart';
+part 'utils/launcher.dart';
-part 'entity_class/entity_wrapper.class.dart';
+part 'entities/entity.class.dart';
-part 'entity_class/switch_entity.class.dart';
+part 'entities/entity_wrapper.class.dart';
-part 'entity_class/button_entity.class.dart';
+part 'entities/timer/timer_entity.class.dart';
-part 'entity_class/text_entity.class.dart';
+part 'entities/switch/switch_entity.class.dart';
-part 'entity_class/climate_entity.class.dart';
+part 'entities/button/button_entity.class.dart';
-part 'entity_class/cover_entity.class.dart';
+part 'entities/text/text_entity.class.dart';
-part 'entity_class/date_time_entity.class.dart';
+part 'entities/climate/climate_entity.class.dart';
-part 'entity_class/light_entity.class.dart';
+part 'entities/cover/cover_entity.class.dart';
-part 'entity_class/select_entity.class.dart';
+part 'entities/date_time/date_time_entity.class.dart';
-part 'entity_class/other_entity.class.dart';
+part 'entities/light/light_entity.class.dart';
-part 'entity_class/slider_entity.dart';
+part 'entities/select/select_entity.class.dart';
-part 'entity_class/media_player_entity.class.dart';
+part 'entities/sun/sun_entity.class.dart';
-part 'entity_class/lock_entity.class.dart';
+part 'entities/sensor/sensor_entity.class.dart';
-part 'entity_class/group_entity.class.dart';
+part 'entities/slider/slider_entity.dart';
-part 'entity_class/fan_entity.class.dart';
+part 'entities/media_player/media_player_entity.class.dart';
+part 'entities/lock/lock_entity.class.dart';
+part 'entities/group/group_entity.class.dart';
+part 'entities/fan/fan_entity.class.dart';
+part 'entities/automation/automation_entity.class.dart';
+part 'entities/camera/camera_entity.class.dart';
+part 'entities/alarm_control_panel/alarm_control_panel_entity.class.dart';
 part 'entity_widgets/common/badge.dart';
 part 'entity_widgets/model_widgets.dart';
 part 'entity_widgets/default_entity_container.dart';
+part 'entity_widgets/missed_entity.dart';
 part 'entity_widgets/glance_entity_container.dart';
+part 'entity_widgets/button_entity_container.dart';
 part 'entity_widgets/common/entity_attributes_list.dart';
 part 'entity_widgets/entity_icon.dart';
 part 'entity_widgets/entity_name.dart';
@@ -43,6 +58,9 @@ part 'entity_widgets/common/last_updated.dart';
 part 'entity_widgets/common/mode_swicth.dart';
 part 'entity_widgets/common/mode_selector.dart';
 part 'entity_widgets/common/universal_slider.dart';
+part 'entity_widgets/common/flat_service_button.dart';
+part 'entity_widgets/common/light_color_picker.dart';
+part 'entity_widgets/common/camera_stream_view.dart';
 part 'entity_widgets/entity_colors.class.dart';
 part 'entity_widgets/entity_page_container.dart';
 part 'entity_widgets/history_chart/entity_history.dart';
@@ -51,66 +69,87 @@ part 'entity_widgets/history_chart/numeric_state_history_chart.dart';
 part 'entity_widgets/history_chart/combined_history_chart.dart';
 part 'entity_widgets/history_chart/history_control_widget.dart';
 part 'entity_widgets/history_chart/entity_history_moment.dart';
-part 'entity_widgets/state/switch_state.dart';
+part 'entities/switch/widget/switch_state.dart';
-part 'entity_widgets/controls/slider_controls.dart';
+part 'entities/slider/widgets/slider_controls.dart';
-part 'entity_widgets/state/text_input_state.dart';
+part 'entities/text/widgets/text_input_state.dart';
-part 'entity_widgets/state/select_state.dart';
+part 'entities/select/widgets/select_state.dart';
-part 'entity_widgets/state/simple_state.dart';
+part 'entity_widgets/common/simple_state.dart';
-part 'entity_widgets/state/climate_state.dart';
+part 'entities/timer/widgets/timer_state.dart';
-part 'entity_widgets/state/cover_state.dart';
+part 'entities/climate/widgets/climate_state.widget.dart';
-part 'entity_widgets/state/date_time_state.dart';
+part 'entities/cover/widgets/cover_state.dart';
-part 'entity_widgets/state/button_state.dart';
+part 'entities/date_time/widgets/date_time_state.dart';
-part 'entity_widgets/state/lock_state.dart';
+part 'entities/lock/widgets/lock_state.dart';
-part 'entity_widgets/controls/climate_controls.dart';
+part 'entities/climate/widgets/climate_controls.dart';
-part 'entity_widgets/controls/cover_controls.dart';
+part 'entities/climate/widgets/temperature_control_widget.dart';
-part 'entity_widgets/controls/light_controls.dart';
+part 'entities/cover/widgets/cover_controls.widget.dart';
-part 'entity_widgets/controls/media_player_widgets.dart';
+part 'entities/light/widgets/light_controls.dart';
-part 'entity_widgets/controls/fan_controls.dart';
+part 'entities/media_player/widgets/media_player_widgets.dart';
-part 'settings.page.dart';
+part 'entities/fan/widgets/fan_controls.dart';
+part 'entities/alarm_control_panel/widgets/alarm_control_panel_controls.widget.dart';
+part 'pages/settings.page.dart';
+part 'pages/purchase.page.dart';
+part 'pages/widgets/product_purchase.widget.dart';
+part 'pages/widgets/page_loading_indicator.dart';
+part 'pages/widgets/page_loading_error.dart';
+part 'pages/panel.page.dart';
+part 'pages/main.page.dart';
 part 'home_assistant.class.dart';
-part 'log.page.dart';
+part 'pages/log.page.dart';
-part 'entity.page.dart';
+part 'pages/entity.page.dart';
-part 'utils.class.dart';
 part 'mdi.class.dart';
 part 'entity_collection.class.dart';
+part 'managers/auth_manager.class.dart';
+part 'managers/location_manager.class.dart';
+part 'managers/mobile_app_integration_manager.class.dart';
+part 'managers/connection_manager.class.dart';
+part 'managers/device_info_manager.class.dart';
+part 'managers/startup_user_messages_manager.class.dart';
 part 'ui_class/ui.dart';
 part 'ui_class/view.class.dart';
 part 'ui_class/card.class.dart';
 part 'ui_class/sizes_class.dart';
+part 'ui_class/panel_class.dart';
 part 'ui_widgets/view.dart';
-part 'ui_widgets/entities_card.dart';
+part 'ui_widgets/card_widget.dart';
-part 'ui_widgets/glance_card.dart';
-part 'ui_widgets/unsupported_card.dart';
-part 'ui_widgets/media_control_card.dart';
 part 'ui_widgets/card_header_widget.dart';
+part 'panels/config_panel_widget.dart';
+part 'panels/widgets/link_to_web_config.dart';
+part 'utils/logger.dart';
+part 'types/ha_error.dart';
+part 'types/event_bus_events.dart';
 
 
 EventBus eventBus = new EventBus();
+final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
+FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = new FlutterLocalNotificationsPlugin();
 const String appName = "HA Client";
-const appVersion = "0.3.10";
+const appVersion = "0.6.5";
 
-String homeAssistantWebHost;
+void main() async {
-
-void main() {
   FlutterError.onError = (errorDetails) {
-    TheLogger.error( "${errorDetails.exception}");
+    Logger.e( "${errorDetails.exception}");
-    if (TheLogger.isInDebugMode) {
+    if (Logger.isInDebugMode) {
       FlutterError.dumpErrorToConsole(errorDetails);
     }
   };
 
   runZoned(() {
+    //AndroidAlarmManager.initialize().then((_) {
       runApp(new HAClientApp());
+    //  print("Running MAIN isolate ${Isolate.current.hashCode}");
+    //});
+
   }, onError: (error, stack) {
-    TheLogger.error("$error");
+    Logger.e("$error");
-    TheLogger.error("$stack");
+    Logger.e("$stack");
-    if (TheLogger.isInDebugMode) {
+    if (Logger.isInDebugMode) {
       debugPrint("$stack");
     }
   });
 }
 
 class HAClientApp extends StatelessWidget {
+
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
@@ -123,517 +162,37 @@ class HAClientApp extends StatelessWidget {
       routes: {
         "/": (context) => MainPage(title: 'HA Client'),
         "/connection-settings": (context) => ConnectionSettingsPage(title: "Settings"),
-        "/log-view": (context) => LogViewPage(title: "Log")
+        "/putchase": (context) => PurchasePage(title: "Support app development"),
-      },
+        "/log-view": (context) => LogViewPage(title: "Log"),
-    );
+        "/login": (context) => WebviewScaffold(
-  }
+          url: "${ConnectionManager().oauthUrl}",
-}
+          appBar: new AppBar(
-
-class MainPage extends StatefulWidget {
-  MainPage({Key key, this.title}) : super(key: key);
-
-  final String title;
-
-  @override
-  _MainPageState createState() => new _MainPageState();
-}
-
-class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
-  HomeAssistant _homeAssistant;
-  //Map _instanceConfig;
-  String _webSocketApiEndpoint;
-  String _password;
-  String _authType;
-  //int _uiViewsCount = 0;
-  String _instanceHost;
-  StreamSubscription _stateSubscription;
-  StreamSubscription _settingsSubscription;
-  StreamSubscription _serviceCallSubscription;
-  StreamSubscription _showEntityPageSubscription;
-  StreamSubscription _refreshDataSubscription;
-  StreamSubscription _showErrorSubscription;
-  bool _settingsLoaded = false;
-  bool _accountMenuExpanded = false;
-  bool _useLovelaceUI;
-
-  @override
-  void initState() {
-    super.initState();
-    _settingsLoaded = false;
-    WidgetsBinding.instance.addObserver(this);
-
-    TheLogger.debug("<!!!> Creating new HomeAssistant instance");
-    _homeAssistant = HomeAssistant();
-
-    _settingsSubscription = eventBus.on<SettingsChangedEvent>().listen((event) {
-      TheLogger.debug("Settings change event: reconnect=${event.reconnect}");
-      if (event.reconnect) {
-        _homeAssistant.disconnect().then((_){
-          _initialLoad();
-        });
-      }
-    });
-    _initialLoad();
-  }
-
-  void _initialLoad() {
-    _loadConnectionSettings().then((_){
-      _subscribe();
-      _refreshData();
-    }, onError: (_) {
-      _showErrorBottomBar(message: _, errorCode: 5);
-    });
-  }
-
-  @override
-  void didChangeAppLifecycleState(AppLifecycleState state) {
-    TheLogger.debug("$state");
-    if (state == AppLifecycleState.resumed && _settingsLoaded) {
-      _refreshData();
-    }
-  }
-
-  _loadConnectionSettings() async {
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    String domain = prefs.getString('hassio-domain');
-    String port = prefs.getString('hassio-port');
-    _instanceHost = "$domain:$port";
-    _webSocketApiEndpoint = "${prefs.getString('hassio-protocol')}://$domain:$port/api/websocket";
-    homeAssistantWebHost = "${prefs.getString('hassio-res-protocol')}://$domain:$port";
-    _password = prefs.getString('hassio-password');
-    _authType = prefs.getString('hassio-auth-type');
-    _useLovelaceUI = prefs.getBool('use-lovelace') ?? false;
-    if ((domain == null) || (port == null) || (_password == null) ||
-        (domain.length == 0) || (port.length == 0) || (_password.length == 0)) {
-      throw("Check connection settings");
-    } else {
-      _settingsLoaded = true;
-    }
-  }
-
-  _subscribe() {
-    if (_stateSubscription == null) {
-      _stateSubscription = eventBus.on<StateChangedEvent>().listen((event) {
-        setState(() {});
-      });
-    }
-    if (_serviceCallSubscription == null) {
-      _serviceCallSubscription =
-          eventBus.on<ServiceCallEvent>().listen((event) {
-            _callService(event.domain, event.service, event.entityId,
-                event.additionalParams);
-          });
-    }
-
-    if (_showEntityPageSubscription == null) {
-      _showEntityPageSubscription =
-          eventBus.on<ShowEntityPageEvent>().listen((event) {
-            _showEntityPage(event.entity.entityId);
-          });
-    }
-
-    if (_refreshDataSubscription == null) {
-      _refreshDataSubscription = eventBus.on<RefreshDataEvent>().listen((event){
-        _refreshData();
-      });
-    }
-
-    if (_showErrorSubscription == null) {
-      _showErrorSubscription = eventBus.on<ShowErrorEvent>().listen((event){
-        _showErrorBottomBar(message: event.text, errorCode: event.errorCode);
-      });
-    }
-  }
-
-  _refreshData() async {
-    _homeAssistant.updateSettings(_webSocketApiEndpoint, _password, _authType, _useLovelaceUI);
-    _hideBottomBar();
-    _showInfoBottomBar(progress: true,);
-    await _homeAssistant.fetch().then((result) {
-      _hideBottomBar();
-    }).catchError((e) {
-      _setErrorState(e);
-    });
-    eventBus.fire(RefreshDataFinishedEvent());
-  }
-
-  _setErrorState(e) {
-    if (e is Error) {
-      TheLogger.error(e.toString());
-      TheLogger.error("${e.stackTrace}");
-      _showErrorBottomBar(
-          message: "There was some error",
-          errorCode: 13
-      );
-    } else {
-      _showErrorBottomBar(
-          message: e != null ? e["errorMessage"] ?? "$e" : "Unknown error",
-          errorCode: e["errorCode"] != null ? e["errorCode"] : 99
-      );
-    }
-  }
-
-  void _callService(String domain, String service, String entityId, Map<String, dynamic> additionalParams) {
-    _showInfoBottomBar(
-      message: "Calling $domain.$service",
-      duration: Duration(seconds: 3)
-    );
-    _homeAssistant.callService(domain, service, entityId, additionalParams).catchError((e) => _setErrorState(e));
-  }
-
-  void _showEntityPage(String entityId) {
-    Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => EntityViewPage(entityId: entityId, homeAssistant: _homeAssistant),
-        )
-    );
-  }
-
-  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(_instanceHost ?? "Not configured"),
-          onDetailsPressed: () {
-            setState(() {
-              _accountMenuExpanded = !_accountMenuExpanded;
-            });
-          },
-          currentAccountPicture: CircleAvatar(
-            child: Text(
-              _homeAssistant.userAvatarText,
-              style: TextStyle(
-                  fontSize: 32.0
-              ),
-            ),
-          ),
-        )
-    );
-    if (_accountMenuExpanded) {
-      menuItems.addAll([
-        ListTile(
-          leading: Icon(Icons.settings),
-          title: Text("Settings"),
-          onTap: () {
-            Navigator.of(context).pop();
-            Navigator.of(context).pushNamed('/connection-settings');
-          },
-        ),
-        Divider(),
-      ]);
-    } else {
-      menuItems.addAll([
-        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.createIconDataFromIconName("mdi:github-circle")),
-          title: Text("Report an issue"),
-          onTap: () {
-            Navigator.of(context).pop();
-            HAUtils.launchURL("https://github.com/estevez-dev/ha_client/issues/new");
-          },
-        ),
-        Divider(),
-        new AboutListTile(
-          aboutBoxChildren: <Widget>[
-            GestureDetector(
-              onTap: () {
-                Navigator.of(context).pop();
-                HAUtils.launchURL("http://www.keyboardcrumbs.io/");
-              },
-              child: Text(
-                "www.keyboardcrumbs.io",
-                style: TextStyle(
-                  color: Colors.blue,
-                  decoration: TextDecoration.underline
-                ),
-              ),
-            )
-          ],
-          applicationName: appName,
-          applicationVersion: appVersion,
-          applicationLegalese: "Keyboard Crumbs",
-        )
-      ]);
-    }
-    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({Key key, @required String message, @required int errorCode}) {
-    TextStyle textStyle = TextStyle(
-      color: Colors.blue,
-      fontSize: Sizes.nameFontSize
-    );
-    _bottomBarColor = Colors.red.shade100;
-      switch (errorCode) {
-        case 9:
-        case 11:
-        case 7:
-        case 1: {
-        _bottomBarAction = FlatButton(
-                child: Text("Retry", style: textStyle),
-                onPressed: () {
-                  //_scaffoldKey?.currentState?.hideCurrentSnackBar();
-                  _refreshData();
-                },
-            );
-            break;
-          }
-
-        case 5: {
-          message = "Check connection settings";
-          _bottomBarAction = FlatButton(
-              child: Text("Open", style: textStyle),
-            onPressed: () {
-              //_scaffoldKey?.currentState?.hideCurrentSnackBar();
-              Navigator.pushNamed(context, '/connection-settings');
-            },
-          );
-          break;
-        }
-
-        case 6: {
-          _bottomBarAction = FlatButton(
-              child: Text("Settings", style: textStyle),
-            onPressed: () {
-              //_scaffoldKey?.currentState?.hideCurrentSnackBar();
-              Navigator.pushNamed(context, '/connection-settings');
-            },
-          );
-          break;
-        }
-
-        case 10: {
-          _bottomBarAction = FlatButton(
-              child: Text("Refresh", style: textStyle),
-            onPressed: () {
-              //_scaffoldKey?.currentState?.hideCurrentSnackBar();
-              _refreshData();
-            },
-          );
-          break;
-        }
-
-        case 8: {
-          _bottomBarAction = FlatButton(
-              child: Text("Reconnect", style: textStyle),
-            onPressed: () {
-              //_scaffoldKey?.currentState?.hideCurrentSnackBar();
-              _refreshData();
-            },
-          );
-          break;
-        }
-
-        default: {
-          _bottomBarAction = FlatButton(
-              child: Text("Reload", style: textStyle),
-            onPressed: () {
-              //_scaffoldKey?.currentState?.hideCurrentSnackBar();
-              _refreshData();
-            },
-          );
-          break;
-        }
-      }
-      setState(() {
-        _bottomBarProgress = false;
-        _bottomBarText = "$message (code: $errorCode)";
-        _showBottomBar = true;
-      });
-      /*_scaffoldKey.currentState.hideCurrentSnackBar();
-      _scaffoldKey.currentState.showSnackBar(
-        SnackBar(
-          content: Text("$message (code: $errorCode)"),
-          action: action,
-          duration: Duration(hours: 1),
-        )
-      );*/
-  }
-
-  final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
-
-  Widget _buildScaffoldBody(bool empty) {
-    return NestedScrollView(
-      headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
-        return <Widget>[
-          SliverAppBar(
-            floating: true,
-            pinned: true,
-            primary: true,
-            title: Text(_homeAssistant != null ? _homeAssistant.locationName : ""),
             leading: IconButton(
-              icon: Icon(Icons.menu),
+                icon: Icon(Icons.help),
+                onPressed: () => Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.homemade.systems/docs#authentication")
+            ),
+            title: new Text("Login with HA"),
+            actions: <Widget>[
+              FlatButton(
+                child: Text("Manual", style: TextStyle(color: Colors.white)),
                 onPressed: () {
-                _scaffoldKey.currentState.openDrawer();
+                  eventBus.fire(ShowPageEvent(path: "/connection-settings", goBackFirst: true));
-                setState(() {
-                  _accountMenuExpanded = false;
-                });
                 },
-            ),
-            bottom: empty ? null : TabBar(
-              tabs: buildUIViewTabs(),
-              isScrollable: true,
-            ),
-          ),
-
-        ];
-      },
-      body: empty ?
-      Center(
-        child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Icon(
-                MaterialDesignIcons.createIconDataFromIconName("mdi:home-assistant"),
-                size: 100.0,
-                color: Colors.blue,
-              ),
-            ]
-        ),
               )
-          :
-      _homeAssistant.buildViews(context, _useLovelaceUI),
-    );
-  }
-
-  @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,
         ),
+        "/webview": (context) => WebviewScaffold(
+          url: "${(ModalRoute.of(context).settings.arguments as Map)['url']}",
+          appBar: new AppBar(
+            leading: IconButton(
+                icon: Icon(Icons.arrow_back),
+                onPressed: () => Navigator.of(context).pop()
             ),
-              _bottomBarAction
+            title: new Text("${(ModalRoute.of(context).settings.arguments as Map)['title']}"),
-            ],
           ),
+        )
+      },
     );
   }
-    }
-    // This method is rerun every time setState is called.
-    if (_homeAssistant.ui == null || _homeAssistant.ui.views == null) {
-      return Scaffold(
-        key: _scaffoldKey,
-        primary: false,
-        drawer: _buildAppDrawer(),
-        bottomNavigationBar: bottomBar,
-        body: _buildScaffoldBody(true)
-      );
-    } else {
-      return Scaffold(
-        key: _scaffoldKey,
-        drawer: _buildAppDrawer(),
-        primary: false,
-        bottomNavigationBar: bottomBar,
-        body: DefaultTabController(
-          length: _homeAssistant.ui?.views?.length ?? 0,
-          child: _buildScaffoldBody(false),
-        ),
-      );
-    }
-  }
-
-  @override
-  void dispose() {
-    WidgetsBinding.instance.removeObserver(this);
-    if (_stateSubscription != null) _stateSubscription.cancel();
-    if (_settingsSubscription != null) _settingsSubscription.cancel();
-    if (_serviceCallSubscription != null) _serviceCallSubscription.cancel();
-    if (_showEntityPageSubscription != null) _showEntityPageSubscription.cancel();
-    if (_refreshDataSubscription != null) _refreshDataSubscription.cancel();
-    if (_showErrorSubscription != null) _showErrorSubscription.cancel();
-    _homeAssistant.disconnect();
-    super.dispose();
-  }
 }

lib/managers/auth_manager.class.dart

@@ -0,0 +1,45 @@
+part of '../main.dart';
+
+class AuthManager {
+
+  static final AuthManager _instance = AuthManager._internal();
+
+  factory AuthManager() {
+    return _instance;
+  }
+
+  AuthManager._internal();
+
+  Future getTempToken({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...");
+        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/')}"
+        ).then((response) {
+          Logger.d("Got temp token");
+          String tempToken = json.decode(response)['access_token'];
+          Logger.d("Closing webview...");
+          //flutterWebviewPlugin.close();
+          eventBus.fire(StartAuthEvent(oauthUrl, false));
+          completer.complete(tempToken);
+        }).catchError((e) {
+          //flutterWebviewPlugin.close();
+          Logger.e("Error getting temp token: ${e.toString()}");
+          eventBus.fire(StartAuthEvent(oauthUrl, false));
+          completer.completeError(HAError("Error getting temp token"));
+        });
+      }
+    });
+    Logger.d("Launching OAuth");
+    eventBus.fire(StartAuthEvent(oauthUrl, true));
+    return completer.future;
+  }
+
+}

lib/managers/connection_manager.class.dart

@@ -0,0 +1,413 @@
+part of '../main.dart';
+
+class ConnectionManager {
+
+  static final ConnectionManager _instance = ConnectionManager._internal();
+
+  factory ConnectionManager() {
+    return _instance;
+  }
+
+  ConnectionManager._internal();
+
+  String _domain;
+  String _port;
+  String displayHostname;
+  String _webSocketAPIEndpoint;
+  String httpWebHost;
+  String _token;
+  String _tempToken;
+  String oauthUrl;
+  String webhookId;
+  bool useLovelace = true;
+  bool settingsLoaded = false;
+  bool get isAuthenticated => _token != null;
+  StreamSubscription _socketSubscription;
+  Duration connectTimeout = Duration(seconds: 15);
+
+  bool isConnected = false;
+
+  var onStateChangeCallback;
+
+  IOWebSocketChannel _socket;
+
+  int _currentMessageId = 0;
+  Map<String, Completer> _messageResolver = {};
+
+  Future init({bool loadSettings, bool forceReconnect: false}) async {
+    Completer completer = Completer();
+    bool stopInit = false;
+    if (loadSettings) {
+      Logger.e("Loading settings...");
+      SharedPreferences prefs = await SharedPreferences.getInstance();
+      useLovelace = prefs.getBool('use-lovelace') ?? true;
+      _domain = prefs.getString('hassio-domain');
+      _port = prefs.getString('hassio-port');
+      webhookId = prefs.getString('app-webhook-id');
+      displayHostname = "$_domain:$_port";
+      _webSocketAPIEndpoint =
+      "${prefs.getString('hassio-protocol')}://$_domain:$_port/api/websocket";
+      httpWebHost =
+      "${prefs.getString('hassio-res-protocol')}://$_domain:$_port";
+      if ((_domain == null) || (_port == null) ||
+          (_domain.isEmpty) || (_port.isEmpty)) {
+        completer.completeError(HAError.checkConnectionSettings());
+        stopInit = true;
+      } else {
+        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(
+              'http://ha-client.homemade.systems/service/auth_callback.html')}";
+          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.");
+          stopInit = true;
+        }
+      }
+    } else {
+      if ((_domain == null) || (_port == null) ||
+          (_domain.isEmpty) || (_port.isEmpty)) {
+        completer.completeError(HAError.checkConnectionSettings());
+        stopInit = true;
+      }
+    }
+
+    if (!stopInit) {
+      if (_token == null) {
+        AuthManager().getTempToken(
+            oauthUrl: oauthUrl
+        ).then((token) {
+          Logger.d("Token from AuthManager recived");
+          _tempToken = token;
+          _doConnect(completer: completer, forceReconnect: forceReconnect);
+        }).catchError((e) {
+          completer.completeError(e);
+        });
+      } else {
+        _doConnect(completer: completer, forceReconnect: forceReconnect);
+      }
+    }
+
+    return completer.future;
+  }
+
+  void _doConnect({Completer completer, bool forceReconnect}) {
+    if (forceReconnect || !isConnected) {
+      _connect().timeout(connectTimeout, onTimeout: () {
+        _disconnect().then((_) {
+          completer?.completeError(HAError("Connection timeout"));
+        });
+      }).then((_) {
+        completer?.complete();
+      }).catchError((e) {
+        completer?.completeError(e);
+      });
+    } else {
+      completer?.complete();
+    }
+  }
+
+  Completer connecting;
+
+  Future _connect() {
+    if (connecting != null && !connecting.isCompleted) {
+      Logger.w("Previous connection attempt pending...");
+      return connecting.future;
+    } else {
+      connecting = Completer();
+      _disconnect().then((_) {
+        Logger.d("Socket connecting...");
+        _socket = IOWebSocketChannel.connect(
+            _webSocketAPIEndpoint, pingInterval: Duration(seconds: 15));
+        _socketSubscription = _socket.stream.listen(
+                (message) {
+              isConnected = true;
+              var data = json.decode(message);
+              if (data["type"] == "auth_required") {
+                Logger.d("[Received] <== ${data.toString()}");
+                _authenticate().then((_) {
+                  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();
+                }
+              } 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);
+              }
+            },
+            cancelOnError: true,
+            onDone: () => _handleSocketClose(connecting),
+            onError: (e) => _handleSocketError(e, connecting)
+        );
+      });
+      return connecting.future;
+    }
+  }
+
+
+
+  Future _disconnect() {
+    Completer completer = Completer();
+    if (!isConnected) {
+      completer.complete();
+    } else {
+      isConnected = false;
+      List<Future> fl = [];
+      Logger.d("Socket disconnecting...");
+      if (_socketSubscription != null) {
+        fl.add(_socketSubscription.cancel());
+      }
+      if (_socket != null && _socket.sink != null &&
+          _socket.closeCode == null) {
+        fl.add(_socket.sink.close().timeout(Duration(seconds: 3)));
+      }
+      Future.wait(fl).whenComplete(() => completer.complete());
+    }
+    return completer.future;
+  }
+
+  _handleMessage(data) {
+    if (data["type"] == "result") {
+      if (data["id"] != null && data["success"]) {
+        Logger.d("[Received] <== Request id ${data['id']} was successful");
+        _messageResolver["${data["id"]}"]?.complete(data["result"]);
+      } else if (data["id"] != null) {
+        Logger.e("[Received] <== Error received on request id ${data['id']}: ${data['error']}");
+        _messageResolver["${data["id"]}"]?.completeError("${data['error']["message"]}");
+      }
+      _messageResolver.remove("${data["id"]}");
+    } else if (data["type"] == "event") {
+      if ((data["event"] != null) && (data["event"]["event_type"] == "state_changed")) {
+        Logger.d("[Received] <== ${data['type']}.${data["event"]["event_type"]}: ${data["event"]["data"]["entity_id"]}");
+        onStateChangeCallback(data["event"]["data"]);
+      } else if (data["event"] != null) {
+        Logger.w("Unhandled event type: ${data["event"]["event_type"]}");
+      } else {
+        Logger.e("Event is null: $data");
+      }
+    } else {
+      Logger.d("[Received unhandled] <== ${data.toString()}");
+    }
+  }
+
+  void _handleSocketClose(Completer connectionCompleter) {
+    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")));
+          });
+        });
+      });
+    }
+  }
+
+  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")));
+          });
+        });
+      });
+    }
+  }
+
+  Future _authenticate() {
+    Completer completer = Completer();
+    if (_token != null) {
+      Logger.d( "Long-lived token exist");
+      Logger.d( "[Sending] ==> auth request");
+      sendSocketMessage(
+          type: "auth",
+          additionalData: {"access_token": "$_token"},
+          auth: true
+      ).then((_) {
+        completer.complete();
+      }).catchError((e) => completer.completeError(e));
+    } else if (_tempToken != null) {
+      Logger.d("We have temp token. Loging in...");
+      sendSocketMessage(
+          type: "auth",
+          additionalData: {"access_token": "$_tempToken"},
+          auth: true
+      ).then((_) {
+        Logger.d("Requesting long-lived token...");
+        _getLongLivedToken().then((_) {
+          Logger.d("getLongLivedToken finished");
+          completer.complete();
+        }).catchError((e) {
+          Logger.e("Can't get long-lived token: $e");
+          throw e;
+        });
+      }).catchError((e) => completer.completeError(e));
+    } else {
+      completer.completeError(HAError("General login error"));
+    }
+    return completer.future;
+  }
+
+  Future logout() {
+    Logger.d("Logging out");
+    Completer completer = Completer();
+    _disconnect().whenComplete(() {
+      _token = null;
+      _tempToken = null;
+      final storage = new FlutterSecureStorage();
+      storage.delete(key: "hacl_llt").whenComplete((){
+        completer.complete();
+      });
+    });
+    return completer.future;
+  }
+
+  Future _getLongLivedToken() {
+    Completer completer = Completer();
+    sendSocketMessage(type: "auth/long_lived_access_token", additionalData: {"client_name": "HA Client app ${DateTime.now().millisecondsSinceEpoch}", "lifespan": 365}).then((data) {
+      Logger.d("Got long-lived token.");
+      _token = data;
+      _tempToken = null;
+      final storage = new FlutterSecureStorage();
+      storage.write(key: "hacl_llt", value: "$_token").then((_) {
+        SharedPreferences.getInstance().then((prefs) {
+          prefs.setBool("oauth-used", true);
+          completer.complete();
+        });
+      }).catchError((e) {
+        throw e;
+      });
+    }).catchError((e) {
+      completer.completeError(HAError("Authentication error: $e", actions: [HAErrorAction.reload(title: "Retry"), HAErrorAction.loginAgain(title: "Relogin")]));
+    });
+    return completer.future;
+  }
+
+  Future sendSocketMessage({String type, Map additionalData, bool auth: false}) {
+    Completer _completer = Completer();
+    Map dataObject = {"type": "$type"};
+    String callbackName;
+    if (!auth) {
+      _incrementMessageId();
+      dataObject["id"] = _currentMessageId;
+      callbackName = "$_currentMessageId";
+    } else {
+      callbackName = "auth";
+    }
+    if (additionalData != null) {
+      dataObject.addAll(additionalData);
+    }
+    _messageResolver[callbackName] = _completer;
+    String rawMessage = json.encode(dataObject);
+    if (!isConnected) {
+      _connect().timeout(connectTimeout, onTimeout: (){
+        _completer.completeError(HAError("No connection to Home Assistant", actions: [HAErrorAction.reconnect()]));
+      }).then((_) {
+        Logger.d("[Sending] ==> ${auth ? "type="+dataObject['type'] : rawMessage}");
+        _socket.sink.add(rawMessage);
+      }).catchError((e) {
+        _completer.completeError(e);
+      });
+    } else {
+      Logger.d("[Sending] ==> ${auth ? "type="+dataObject['type'] : rawMessage}");
+      _socket.sink.add(rawMessage);
+    }
+    return _completer.future;
+  }
+
+  void _incrementMessageId() {
+    _currentMessageId += 1;
+  }
+
+  Future callService({String domain, String service, String entityId, Map additionalServiceData}) {
+    Map serviceData = {};
+    if (entityId != null) {
+      serviceData["entity_id"] = entityId;
+    }
+    if (additionalServiceData != null && additionalServiceData.isNotEmpty) {
+      serviceData.addAll(additionalServiceData);
+    }
+    if (serviceData.isNotEmpty)
+      return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service, "service_data": serviceData});
+    else
+      return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service});
+  }
+
+  Future<List> getHistory(String entityId) async {
+    DateTime now = DateTime.now();
+    //String endTime = formatDate(now, [yyyy, '-', mm, '-', dd, 'T', HH, ':', nn, ':', ss, z]);
+    String startTime = formatDate(now.subtract(Duration(hours: 24)), [yyyy, '-', mm, '-', dd, 'T', HH, ':', nn, ':', ss, z]);
+    String url = "$httpWebHost/api/history/period/$startTime?&filter_entity_id=$entityId";
+    Logger.d("[Sending] ==> HTTP /api/history/period/$startTime?&filter_entity_id=$entityId");
+    http.Response historyResponse;
+    historyResponse = await http.get(url, headers: {
+      "authorization": "Bearer $_token",
+      "Content-Type": "application/json"
+    });
+    var history = json.decode(historyResponse.body);
+    if (history is List) {
+      Logger.d( "[Received] <== HTTP ${history.first.length} history recors");
+      return history;
+    } else {
+      return [];
+    }
+  }
+
+  Future sendHTTPPost({String endPoint, String data, String contentType: "application/json", bool includeAuthHeader: true}) async {
+    Completer completer = Completer();
+    String url = "$httpWebHost$endPoint";
+    Logger.d("[Sending] ==> HTTP $endPoint");
+    Map<String, String> headers = {};
+    if (contentType != null) {
+      headers["Content-Type"] = contentType;
+    }
+    if (includeAuthHeader) {
+      headers["authorization"] = "Bearer $_token";
+    }
+    http.post(
+        url,
+        headers: headers,
+        body: data
+    ).then((response) {
+      Logger.d("[Received] <== HTTP ${response.statusCode}");
+      if (response.statusCode >= 200 && response.statusCode < 300 ) {
+        completer.complete(response.body);
+      } else {
+        completer.completeError({"code": response.statusCode, "message": "${response.body}"});
+      }
+    }).catchError((e) {
+      completer.completeError(e);
+    });
+    return completer.future;
+  }
+
+}