Update subscribtions

.gitignore

@@ -11,3 +11,4 @@ build/
 .idea/
 
 key.properties
+pubspec.lock

README.md

@@ -1,13 +1,12 @@
+[![flutter](https://somegeeky.website/assets/badges/flutter_badge_v3.svg)](https://somegeeky.website/badges/flutter) [![dart](https://somegeeky.website/assets/badges/dart_badge_v3.svg)](https://somegeeky.website/badges/dart)
 # HA Client
 ## Native Android client for Home Assistant
 ### With Lovelace UI support
 
-Home Assistant Android client on Dart with Flutter.
-
-Visit [www.vynn.co](https://www.vynn.co/ha-client) for more info.
+Visit [homemade.systems](http://ha-client.homemade.systems/) for more info.
 
 Join [Google Group](https://groups.google.com/d/forum/ha-client-alpha-testing) to become an alpha tester
 
 Download the app from [Google Play](https://play.google.com/apps/testing/com.keyboardcrumbs.haclient) 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)
+Discuss it in [Home Assistant community](https://community.home-assistant.io/t/alpha-testing-ha-client-native-android-client-for-home-assistant/69912)

android/app/build.gradle

@@ -29,7 +29,7 @@ def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -43,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"
@@ -70,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,7 @@
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -15,7 +16,13 @@
     <application
         android:name="io.flutter.app.FlutterApplication"
         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,10 +33,14 @@
             <!-- 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"/>

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

lib/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...");
+        Connection().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/configuration.page.dart

@@ -1,105 +0,0 @@
-part of 'main.dart';
-
-class ConfigurationPage extends StatefulWidget {
-  ConfigurationPage({Key key, this.title}) : super(key: key);
-
-  final String title;
-
-  @override
-  _ConfigurationPageState createState() => new _ConfigurationPageState();
-}
-
-class ConfigurationItem {
-  ConfigurationItem({ this.isExpanded: false, this.header, this.body });
-
-  bool isExpanded;
-  final String header;
-  final Widget body;
-}
-
-class _ConfigurationPageState extends State<ConfigurationPage> {
-
-  List<ConfigurationItem> _items;
-
-  @override
-  void initState() {
-    super.initState();
-    _items = <ConfigurationItem>[
-      ConfigurationItem(
-          header: 'General',
-          body: Padding(
-            padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 0.0, Sizes.rightWidgetPadding, Sizes.rowPadding),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              mainAxisSize: MainAxisSize.min,
-              children: <Widget>[
-                Text("Server management", style: TextStyle(fontSize: Sizes.largeFontSize)),
-                Container(height: Sizes.rowPadding,),
-                Text("Control your Home Assistant server from HA Client."),
-                Divider(),
-                Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: <Widget>[
-                    FlatServiceButton(
-                      text: "Restart",
-                      serviceName: "restart",
-                      serviceDomain: "homeassistant",
-                      entityId: null,
-                    ),
-                    FlatServiceButton(
-                      text: "Stop",
-                      serviceName: "stop",
-                      serviceDomain: "homeassistant",
-                      entityId: null,
-                    ),
-                  ],
-                )
-              ],
-            ),
-          )
-      )
-    ];
-  }
-
-  @override
-  Widget build(BuildContext context) {
-
-    return new Scaffold(
-      appBar: new AppBar(
-        leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
-          Navigator.pop(context);
-        }),
-        title: new Text(widget.title),
-      ),
-      body: ListView(
-        children: [
-          new ExpansionPanelList(
-            expansionCallback: (int index, bool isExpanded) {
-              setState(() {
-                _items[index].isExpanded = !_items[index].isExpanded;
-              });
-            },
-            children: _items.map((ConfigurationItem item) {
-              return new ExpansionPanel(
-                headerBuilder: (BuildContext context, bool isExpanded) {
-                  return CardHeaderWidget(
-                    name: item.header,
-                  );
-                },
-                isExpanded: item.isExpanded,
-                body: new Container(
-                  child: item.body,
-                ),
-              );
-            }).toList(),
-          ),
-        ],
-      ),
-    );
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-}

lib/connection.class.dart

@@ -0,0 +1,416 @@
+part of 'main.dart';
+
+class Connection {
+
+  static final Connection _instance = Connection._internal();
+
+  factory Connection() {
+    return _instance;
+  }
+
+  Connection._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 {
+        //_token = prefs.getString('hassio-token');
+        final storage = new FlutterSecureStorage();
+        try {
+          _token = await storage.read(key: "hacl_llt");
+          Logger.e("Long-lived token read successful");
+        } catch (e) {
+          Logger.e("Cannt read secure storage. Need to relogin.");
+          _token = null;
+          await storage.delete(key: "hacl_llt");
+        }
+        oauthUrl = "$httpWebHost/auth/authorize?client_id=${Uri.encodeComponent(
+            'http://ha-client.homemade.systems/')}&redirect_uri=${Uri
+            .encodeComponent(
+            'http://ha-client.homemade.systems/service/auth_callback.html')}";
+        settingsLoaded = true;
+      }
+    } else {
+      if ((_domain == null) || (_port == null) ||
+          (_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");
+                logout().then((_) {
+                  if (!connecting.isCompleted) connecting.completeError(HAError("${data["message"]}", actions: [HAErrorAction.loginAgain()]));
+                });
+              } else {
+                _handleMessage(data);
+              }
+            },
+            cancelOnError: true,
+            onDone: () => _handleSocketClose(connecting),
+            onError: (e) => _handleSocketError(e, connecting)
+        );
+      });
+      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() {
+    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) {
+      logout();
+      completer.completeError(HAError("Authentication error: $e", actions: [HAErrorAction.loginAgain()]));
+    });
+    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;
+  }
+
+}

lib/const.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of 'main.dart';
 
 class EntityState {
   static const on = 'on';
@@ -28,6 +28,7 @@ class EntityState {
   static const unavailable = 'unavailable';
   static const ok = 'ok';
   static const problem = 'problem';
+  static const active = 'active';
 }
 
 class EntityUIAction {

lib/device.class.dart

@@ -0,0 +1,29 @@
+part of 'main.dart';
+
+class Device {
+
+  static final Device _instance = Device._internal();
+
+  factory Device() {
+    return _instance;
+  }
+
+  String unicDeviceId;
+  String manufacturer;
+  String model;
+  String osName;
+  String osVersion;
+
+  Device._internal();
+
+  loadDeviceInfo() {
+    DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
+    deviceInfo.androidInfo.then((androidInfo) {
+      unicDeviceId = "${androidInfo.model.toLowerCase().replaceAll(' ', '_')}_${androidInfo.androidId}";
+      manufacturer = "${androidInfo.manufacturer}";
+      model = "${androidInfo.model}";
+      osName = "Android";
+      osVersion = "${androidInfo.version.release}";
+    });
+  }
+}

lib/entities/alarm_control_panel/alarm_control_panel_entity.class.dart

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

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

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

lib/entities/automation/automation_entity.class.dart

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

lib/entities/button/button_entity.class.dart

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

lib/entities/camera/camera_entity.class.dart

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

lib/entities/climate/climate_entity.class.dart

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

lib/entities/climate/widgets/climate_controls.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class ClimateControlWidget extends StatefulWidget {
 
@@ -19,22 +19,22 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   double _tmpTargetLow = 0.0;
   double _tmpTargetHigh = 0.0;
   double _tmpTargetHumidity = 0.0;
-  String _tmpOperationMode;
+  String _tmpHVACMode;
   String _tmpFanMode;
   String _tmpSwingMode;
-  bool _tmpAwayMode = false;
-  bool _tmpIsOff = false;
+  String _tmpPresetMode;
+  //bool _tmpIsOff = false;
   bool _tmpAuxHeat = false;
 
   void _resetVars(ClimateEntity entity) {
     _tmpTemperature = entity.temperature;
     _tmpTargetHigh = entity.targetHigh;
     _tmpTargetLow = entity.targetLow;
-    _tmpOperationMode = entity.operationMode;
+    _tmpHVACMode = entity.state;
     _tmpFanMode = entity.fanMode;
     _tmpSwingMode = entity.swingMode;
-    _tmpAwayMode = entity.awayMode;
-    _tmpIsOff = entity.isOff;
+    _tmpPresetMode = entity.presetMode;
+    //_tmpIsOff = entity.isOff;
     _tmpAuxHeat = entity.auxHeat;
     _tmpTargetHumidity = entity.targetHumidity;
 
@@ -116,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);
     });
   }
@@ -143,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(() {
@@ -196,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) {
-    if (entity.supportAwayMode) {
-      return ModeSwitchWidget(
-        caption: "Away mode",
-        onChange: (value) => _setAwayMode(entity, value),
-        value: _tmpAwayMode,
+  Widget _buildPresetModeControl(ClimateEntity entity) {
+    if (entity.supportPresetMode) {
+      return ModeSelectorWidget(
+        options: entity.presetModes,
+        onChange: (mode) => _setPresetMode(entity, mode),
+        caption: "Preset",
+        value: _tmpPresetMode,
       );
     } else {
       return Container(height: 0.0, width: 0.0,);
     }
   }
 
-  Widget _buildOnOffControl(ClimateEntity entity) {
+  /*Widget _buildOnOffControl(ClimateEntity entity) {
     if (entity.supportOnOff) {
       return ModeSwitchWidget(
           onChange: (value) => _setOnOf(entity, value),
@@ -232,7 +233,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     } else {
       return Container(height: 0.0, width: 0.0,);
     }
-  }
+  }*/
 
   Widget _buildAuxHeatControl(ClimateEntity entity) {
     if (entity.supportAuxHeat ) {
@@ -247,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),
-        options: entity.operationList,
+        onChange: (mode) => _setHVACMode(entity, mode),
+        options: entity.hvacModes,
         caption: "Operation",
-        value: _tmpOperationMode,
+        value: _tmpHVACMode,
       );
     } else {
       return Container(height: 0.0, width: 0.0);
@@ -262,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,
@@ -276,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"
       );
@@ -308,7 +309,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
 
   Widget _buildTargetTemperatureControls(ClimateEntity entity) {
     List<Widget> controls = [];
-    if ((entity.supportTargetTemperatureLow) && (entity.targetLow != null)) {
+    if ((entity.supportTargetTemperatureRange) && (entity.targetLow != null)) {
       controls.addAll(<Widget>[
         TemperatureControlWidget(
           value: _tmpTargetLow,
@@ -321,7 +322,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
         )
       ]);
     }
-    if ((entity.supportTargetTemperatureHigh) && (entity.targetHigh != null)) {
+    if ((entity.supportTargetTemperatureRange) && (entity.targetHigh != null)) {
       controls.add(
           TemperatureControlWidget(
             value: _tmpTargetHigh,
@@ -440,13 +441,13 @@ class TemperatureControlWidget extends StatelessWidget {
         Column(
           children: <Widget>[
             IconButton(
-              icon: Icon(MaterialDesignIcons.createIconDataFromIconName(
+              icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
                   'mdi:chevron-up')),
               iconSize: 30.0,
               onPressed: () => onInc(),
             ),
             IconButton(
-              icon: Icon(MaterialDesignIcons.createIconDataFromIconName(
+              icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
                   'mdi:chevron-down')),
               iconSize: 30.0,
               onPressed: () => onDec(),

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

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class ClimateStateWidget extends StatelessWidget {
   @override
@@ -8,13 +8,19 @@ class ClimateStateWidget extends StatelessWidget {
     String targetTemp = "-";
     if ((entity.supportTargetTemperature) && (entity.temperature != null)) {
       targetTemp = "${entity.temperature}";
-    } else if ((entity.supportTargetTemperatureLow) &&
-        (entity.targetLow != null)) {
-      targetTemp = "${entity.targetLow}";
-      if ((entity.supportTargetTemperatureHigh) &&
+    } else if ((entity.supportTargetTemperatureRange) &&
+        (entity.targetLow != null) &&
         (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 ?
-            Text("Currently: ${entity.attributes["current_temperature"]}",
+            entity.currentTemperature != null ?
+            Text("Currently: ${entity.currentTemperature}",
                 textAlign: TextAlign.right,
                 style: new TextStyle(
                     fontSize: Sizes.stateFontSize,

lib/entities/cover/cover_entity.class.dart

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

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

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

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 = [
@@ -18,7 +27,7 @@ class Entity {
     "cold.on": "Cold",
     "cold.off": "Normal",
     "connectivity.on": "Connected",
-    "connectivity.off": "Diconnected",
+    "connectivity.off": "Disconnected",
     "door.on": "Open",
     "door.off": "Closed",
     "garage_door.on": "Open",
@@ -64,12 +73,13 @@ class Entity {
   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
@@ -85,7 +95,6 @@ class Entity {
   bool get isBadge => Entity.badgeDomains.contains(domain);
   String get icon => attributes["icon"] ?? "";
   bool get isOn => state == EntityState.on;
-  String get entityPicture => attributes["entity_picture"];
   String get unitOfMeasurement => attributes["unit_of_measurement"] ?? "";
   List get childEntityIds => attributes["entity_id"] ?? [];
   String get lastUpdated => _getLastUpdatedFormatted();
@@ -93,18 +102,61 @@ class Entity {
   double get doubleState => double.tryParse(state) ?? 0.0;
   int get supportedFeatures => attributes["supported_features"] ?? 0;
 
-  Entity(Map rawData) {
-    update(rawData);
+  String _getEntityPictureUrl(String webHost) {
+    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;
+    displayState = Entity.StateByDeviceClass["$deviceClass.$state"] ?? (state.toLowerCase() == 'unknown' ? '-' : state);
     _lastUpdated = DateTime.tryParse(rawData["last_updated"]);
+    entityPicture = _getEntityPictureUrl(webHost);
   }
 
   double _getDoubleAttributeValue(String attributeName) {
@@ -164,7 +216,7 @@ class Entity {
       entityWrapper: EntityWrapper(entity: this),
       child: EntityPageContainer(children: <Widget>[
         Padding(
-          padding: EdgeInsets.only(top: Sizes.rowPadding),
+          padding: EdgeInsets.only(top: Sizes.rowPadding, left: Sizes.leftWidgetPadding),
           child: DefaultEntityContainer(state: _buildStatePartForPage(context)),
         ),
         LastUpdatedWidget(),

lib/entities/entity_wrapper.class.dart

@@ -4,6 +4,7 @@ class EntityWrapper {
 
   String displayName;
   String icon;
+  String entityPicture;
   EntityUIAction uiAction;
   Entity entity;
 
@@ -14,10 +15,15 @@ class EntityWrapper {
     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 (this.uiAction == null) {
-      this.uiAction = EntityUIAction();
+      if (uiAction == null) {
+        uiAction = EntityUIAction();
+      }
     }
   }
 
@@ -49,6 +55,16 @@ class EntityWrapper {
         break;
       }
 
+      case EntityUIAction.navigate: {
+        if (uiAction.tapService.startsWith("/")) {
+          //TODO handle local urls
+          Logger.w("Local urls is not supported yet");
+        } else {
+          HAUtils.launchURL(uiAction.tapService);
+        }
+        break;
+      }
+
       default: {
         break;
       }
@@ -79,6 +95,16 @@ class EntityWrapper {
           break;
         }
 
+        case EntityUIAction.navigate: {
+          if (uiAction.holdService.startsWith("/")) {
+            //TODO handle local urls
+            Logger.w("Local urls is not supported yet");
+          } else {
+            HAUtils.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,7 +6,7 @@ class FanEntity extends Entity {
   static const SUPPORT_OSCILLATE = 2;
   static const SUPPORT_DIRECTION = 4;
 
-  FanEntity(Map rawData) : super(rawData);
+  FanEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   bool get supportSetSpeed => ((supportedFeatures &
   FanEntity.SUPPORT_SET_SPEED) ==

lib/entities/fan/widgets/fan_controls.dart

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

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) {
-    super.update(rawData);
+  void update(Map rawData, String webHost) {
+    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 {
 
@@ -33,6 +33,7 @@ class LightEntity extends Entity {
       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");
@@ -41,15 +42,18 @@ class LightEntity extends Entity {
   bool get isAdditionalControls => ((supportedFeatures != null) && (supportedFeatures != 0));
   List<String> get effectList => getStringListAttributeValue("effect_list");
 
-  LightEntity(Map rawData) : super(rawData);
+  LightEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   HSVColor _getColor() {
     List hs = attributes["hs_color"];
+    List rgb = attributes["rgb_color"];
     try {
-      if ((hs != null) && (hs.length > 0)) {
+      if (hs != null && hs.isNotEmpty) {
         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;
       }

lib/entities/light/widgets/light_controls.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class LightControlsWidget extends StatefulWidget {
 
@@ -10,13 +10,15 @@ class LightControlsWidget extends StatefulWidget {
 class _LightControlsWidgetState extends State<LightControlsWidget> {
 
   int _tmpBrightness;
+  int _tmpWhiteValue;
   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;
+    _tmpWhiteValue = entity.whiteValue ?? 0;
     _tmpColorTemp = entity.colorTemp ?? entity.minMireds?.toInt();
     _tmpColor = entity.color ?? _tmpColor;
     _tmpEffect = entity.effect;
@@ -26,15 +28,20 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
     setState(() {
       _tmpBrightness = value.round();
       _changedHere = true;
-      if (_tmpBrightness > 0) {
       eventBus.fire(new ServiceCallEvent(
           entity.domain, "turn_on", entity.entityId,
           {"brightness": _tmpBrightness}));
-      } else {
-        eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_off", entity.entityId,
-            null));
+    });
   }
+
+  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}));
+
     });
   }
 
@@ -84,6 +91,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
       crossAxisAlignment: CrossAxisAlignment.center,
       children: <Widget>[
         _buildBrightnessControl(entity),
+        _buildWhiteValueControl(entity),
         _buildColorTempControl(entity),
         _buildColorControl(entity),
         _buildEffectControl(entity)
@@ -100,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 == null ? 0.0 : _tmpBrightness.toDouble(),
+        value: _tmpBrightness == null ? 1.0 : _tmpBrightness.toDouble(),
         leading: Icon(Icons.brightness_5),
         title: "Brightness",
       );
@@ -112,6 +120,27 @@ 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) {
       return UniversalSlider(
@@ -136,30 +165,42 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
 
   Widget _buildColorControl(LightEntity entity) {
     if (entity.supportColor) {
-      return LightColorPicker(
+      HSVColor savedColor = HomeAssistant().savedColor;
+      return Column(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          LightColorPicker(
             color: _tmpColor,
             onColorSelected: (color) => _setColor(entity, color),
+          ),
+          Row(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              FlatButton(
+                color: _tmpColor.toColor(),
+                child: Text('Copy color'),
+                onPressed: _tmpColor == null ? null : () {
+                  setState(() {
+                    HomeAssistant().savedColor = _tmpColor;
+                  });
+                },
+              ),
+              FlatButton(
+                color: savedColor?.toColor() ?? Colors.transparent,
+                child: Text('Paste color'),
+                onPressed: savedColor == null ? null : () {
+                  _setColor(entity, savedColor);
+                },
+              )
+            ],
+          )
+        ],
       );
     } else {
       return Container(width: 0.0, height: 0.0);
     }
   }
 
-  void _showColorPicker(LightEntity entity) {
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          titlePadding: EdgeInsets.all(0.0),
-          contentPadding: EdgeInsets.all(0.0),
-          content: LightColorPicker(
-            color: _tmpColor,
-          ),
-        );
-      },
-    );
-  }
-
   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,7 +20,7 @@ class MediaPlayerEntity extends Entity {
   static const SUPPORT_SHUFFLE_SET = 32768;
   static const SUPPORT_SELECT_SOUND_MODE = 65536;
 
-  MediaPlayerEntity(Map rawData) : super(rawData);
+  MediaPlayerEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   bool get supportPause => ((supportedFeatures &
   MediaPlayerEntity.SUPPORT_PAUSE) ==

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"),
           )
@@ -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';
-
-class SunEntity extends Entity {
-  SunEntity(Map rawData) : super(rawData);
-}
+part of '../../main.dart';
 
 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 {
 

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/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 = {};
   }
@@ -33,67 +35,74 @@ 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": {
-        return AutomationEntity(rawEntityData);
+        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);
+        return CameraEntity(rawEntityData, homeAssistantWebHost);
       }
       case "alarm_control_panel": {
-        return AlarmControlPanelEntity(rawEntityData);
+        return AlarmControlPanelEntity(rawEntityData, homeAssistantWebHost);
+      }
+      case "timer": {
+        return TimerEntity(rawEntityData, homeAssistantWebHost);
       }
       default: {
-        return Entity(rawEntityData);
+        return Entity(rawEntityData, homeAssistantWebHost);
       }
     }
   }
@@ -118,7 +127,7 @@ class EntityCollection {
   }
 
   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

@@ -9,7 +9,12 @@ class ButtonEntityContainer extends StatelessWidget {
   @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(),
@@ -22,7 +27,7 @@ class ButtonEntityContainer extends StatelessWidget {
                 fit: BoxFit.fitHeight,
                 child: EntityIcon(
                   padding: EdgeInsets.fromLTRB(2.0, 6.0, 2.0, 2.0),
-                iconSize: Sizes.iconSize,
+                  size: Sizes.iconSize,
                 )
             ),
           ),

lib/entity_widgets/common/badge.dart

@@ -14,11 +14,11 @@ 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;
@@ -27,27 +27,44 @@ class BadgeWidget extends StatelessWidget {
       case "media_player":
       case "binary_sensor":
         {
-          badgeIcon = MaterialDesignIcons.createIconWidgetFromEntityData(
-              entityModel.entityWrapper, iconSize, Colors.black);
+          badgeIcon = EntityIcon(
+            padding: EdgeInsets.all(0.0),
+            size: iconSize,
+            color: Colors.black
+          );
           break;
         }
       case "device_tracker":
+      case "person":
         {
-          badgeIcon = MaterialDesignIcons.createIconWidgetFromEntityData(
-              entityModel.entityWrapper, iconSize, Colors.black);
-          onBadgeTextValue = entityModel.entityWrapper.entity.state;
+          badgeIcon = EntityIcon(
+              padding: EdgeInsets.all(0.0),
+              size: iconSize,
+              color: Colors.black
+          );
+          onBadgeTextValue = entityModel.entityWrapper.entity.displayState;
           break;
         }
       default:
         {
+          double stateFontSize;
+          if (entityModel.entityWrapper.entity.displayState.length <= 3) {
+            stateFontSize = 18.0;
+          } else if (entityModel.entityWrapper.entity.displayState.length <= 4) {
+            stateFontSize = 15.0;
+          } else if (entityModel.entityWrapper.entity.displayState.length <= 6) {
+            stateFontSize = 10.0;
+          } else if (entityModel.entityWrapper.entity.displayState.length <= 10) {
+            stateFontSize = 8.0;
+          }
           onBadgeTextValue = entityModel.entityWrapper.entity.unitOfMeasurement;
           badgeIcon = Center(
             child: Text(
-              "${entityModel.entityWrapper.entity.state}",
+              "${entityModel.entityWrapper.entity.displayState}",
               overflow: TextOverflow.fade,
               softWrap: false,
               textAlign: TextAlign.center,
-              style: TextStyle(fontSize: 17.0),
+              style: TextStyle(fontSize: stateFontSize),
             ),
           );
           break;

lib/entity_widgets/common/camera_stream_view.dart

@@ -16,111 +16,26 @@ class _CameraStreamViewState extends State<CameraStreamView> {
   }
 
   CameraEntity _entity;
-
-  http.Client client;
-  http.StreamedResponse response;
-  List<int> binaryImage = [];
-  bool timeToStop = false;
-  Completer streamCompleter;
   bool started = false;
-  bool useSVG = false;
+  String streamUrl = "";
 
-  void _connect() async {
-    started = true;
-    timeToStop = false;
-    String streamUrl = '$homeAssistantWebHost/api/camera_proxy_stream/${_entity.entityId}?token=${_entity.attributes['access_token']}';
-    client = new http.Client(); // create a client to make api calls
-    http.Request request = new http.Request("GET", Uri.parse(streamUrl));  // create get request
-    Logger.d("[Sending] ==> $streamUrl");
-    response = await client.send(request);
-    Logger.d("[Received] <== ${response.headers}");
-    String frameBoundary = response.headers['content-type'].split('boundary=')[1];
-    final int frameBoundarySize = frameBoundary.length;
-    List<int> primaryBuffer=[];
-    int imageSizeStart = 59;
-    int imageSizeEnd = 0;
-    int imageStart = 0;
-    int imageSize = 0;
-    String strBuffer = "";
-    String contentType = "";
-    streamCompleter = Completer();
-    response.stream.transform(
-        StreamTransformer.fromHandlers(
-          handleData: (data, sink) {
-            primaryBuffer.addAll(data);
-            imageStart = 0;
-            imageSizeEnd = 0;
-            if (primaryBuffer.length >= imageSizeStart + 10) {
-              contentType = utf8.decode(
-                  primaryBuffer.sublist(frameBoundarySize+16, imageSizeStart + 10), allowMalformed: true).split("\r\n")[0];
-              useSVG = contentType == "image/svg+xml";
-              imageSizeStart = frameBoundarySize + 16 + contentType.length + 18;
-              for (int i = imageSizeStart; i < primaryBuffer.length - 4; i++) {
-                strBuffer = utf8.decode(
-                    primaryBuffer.sublist(i, i + 4), allowMalformed: true);
-                if (strBuffer == "\r\n\r\n") {
-                  imageSizeEnd = i;
-                  imageStart = i + 4;
-                  break;
-                }
-              }
-              if (imageSizeEnd > 0) {
-                imageSize = int.tryParse(utf8.decode(
-                    primaryBuffer.sublist(imageSizeStart, imageSizeEnd),
-                    allowMalformed: true));
-                //Logger.d("content-length: $imageSize");
-                if (imageSize != null &&
-                    primaryBuffer.length >= imageStart + imageSize + 2) {
-                  sink.add(
-                      primaryBuffer.sublist(
-                          imageStart, imageStart + imageSize));
-                  primaryBuffer.removeRange(0, imageStart + imageSize + 2);
-                }
-              }
-            }
-            if (timeToStop) {
-              sink?.close();
-              streamCompleter.complete();
-            }
-          },
-          handleError: (error, stack, sink) {
-            Logger.e("Error parsing MJPEG stream: $error");
-          },
-          handleDone: (sink) {
-            Logger.d("Camera stream finished. Reconnecting...");
-            sink?.close();
-            streamCompleter?.complete();
-            _reconnect();
-          },
+  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}"),
+            ),
+          ),
         )
-    ).listen((d) {
-      if (!timeToStop) {
-        setState(() {
-          binaryImage = d;
-        });
-      }
-    });
-  }
-
-  void _reconnect() {
-    disconnect().then((_){
-      _connect();
-    });
-  }
-
-  Future disconnect() {
-    Completer disconF = Completer();
-    timeToStop = true;
-    if (streamCompleter != null && !streamCompleter.isCompleted) {
-      streamCompleter.future.then((_) {
-        client?.close();
-        disconF.complete();
-      });
-    } else {
-      client?.close();
-      disconF.complete();
-    }
-    return disconF.future;
+    );
   }
 
   @override
@@ -130,46 +45,26 @@ class _CameraStreamViewState extends State<CameraStreamView> {
           .of(context)
           .entityWrapper
           .entity;
-      _connect();
+      started = true;
     }
-
-    if (binaryImage.isEmpty) {
+    streamUrl = '${Connection().httpWebHost}/api/camera_proxy_stream/${_entity
+        .entityId}?token=${_entity.attributes['access_token']}';
     return Column(
       children: <Widget>[
         Container(
             padding: const EdgeInsets.all(20.0),
-              child: const CircularProgressIndicator()
+            child: IconButton(
+              icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:monitor-screenshot"), color: Colors.amber),
+              iconSize: 50.0,
+              onPressed: () => launchStream(),
+            )
         )
       ],
     );
-    } else {
-      if (useSVG) {
-        return Column(
-          children: <Widget>[
-            SvgPicture.memory(
-              Uint8List.fromList(binaryImage),
-              placeholderBuilder: (BuildContext context) =>
-              new Container(
-                  padding: const EdgeInsets.all(20.0),
-                  child: const CircularProgressIndicator()
-              ),
-            )
-          ],
-        );
-      } else {
-        return Column(
-          children: <Widget>[
-            Image.memory(
-                Uint8List.fromList(binaryImage), gaplessPlayback: true),
-          ],
-        );
-      }
-    }
   }
 
   @override
   void dispose() {
-    disconnect();
     super.dispose();
   }
 }

lib/entity_widgets/common/entity_attributes_list.dart

@@ -7,20 +7,9 @@ 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 {
-      entityModel.entityWrapper.entity.attributesToShow.forEach((String attr) {
-        String attrValue = entityModel.entityWrapper.entity.getAttribute("$attr");
-        if (attrValue != null) {
-          attrs.add(
-              _buildSingleAttribute("$attr", "$attrValue"));
-        }
-      });
-    }
     return Padding(
       padding: EdgeInsets.only(bottom: Sizes.rowPadding),
       child: Column(
@@ -49,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/simple_state.dart

@@ -6,14 +6,26 @@ class SimpleEntityState extends StatelessWidget {
   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)}) : super(key: key);
+  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 = entityModel.entityWrapper.entity.displayState ?? "";
+    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("  ", " ");
     }
@@ -25,9 +37,7 @@ class SimpleEntityState extends StatelessWidget {
         maxLines: maxLines,
         overflow: TextOverflow.ellipsis,
         softWrap: true,
-        style: new TextStyle(
-          fontSize: Sizes.stateFontSize,
-        )
+        style: textStyle
       )
     );
     if (expanded) {

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,15 +12,16 @@ 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.closed: Color.fromRGBO(68, 115, 158, 1.0),
-    "below_horizon": Color.fromRGBO(68, 115, 158, 1.0),
-    "default": Color.fromRGBO(68, 115, 158, 1.0),
+    EntityState.off: defaultStateColor,
+    EntityState.closed: defaultStateColor,
+    "below_horizon": defaultStateColor,
+    "default": defaultStateColor,
+    EntityState.idle: defaultStateColor,
     "heat": Colors.redAccent,
     "cool": Colors.lightBlue,
     EntityState.unavailable: Colors.black26,

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(
-      Sizes.leftWidgetPadding, 0.0, 12.0, 0.0)}) : super(key: key);
+  const EntityIcon({Key key, this.color, this.size: Sizes.iconSize, this.padding: const EdgeInsets.all(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,
-          EntityColor.stateColor(entityWrapper.entity.state)
+          color ?? EntityColor.stateColor(entityWrapper.entity.state)
       ),
     );
   }

lib/entity_widgets/entity_name.dart

@@ -14,6 +14,10 @@ class EntityName extends StatelessWidget {
   @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(
@@ -21,7 +25,7 @@ class EntityName extends StatelessWidget {
         overflow: textOverflow,
         softWrap: wordsWrap,
         maxLines: maxLines,
-        style: TextStyle(fontSize: fontSize),
+        style: textStyle,
         textAlign: textAlign,
       ),
     );

lib/entity_widgets/glance_entity_container.dart

@@ -22,6 +22,12 @@ class GlanceEntityContainer extends StatelessWidget {
   @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) {
@@ -35,7 +41,7 @@ class GlanceEntityContainer extends StatelessWidget {
     result.add(
       EntityIcon(
         padding: EdgeInsets.all(0.0),
-        iconSize: iconSize,
+        size: iconSize,
       )
     );
     if (!nameInTheBottom) {

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) {
       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){
+      Connection().getHistory(entityId).then((history){
+        if (!_disposed) {
           setState(() {
             _history = history.isNotEmpty ? history[0] : [];
             _needToUpdateHistory = false;
           });
+        }
       }).catchError((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();
   }
@@ -131,4 +135,10 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
 
   }
 
+  @override
+  void dispose() {
+    _disposed = true;
+    super.dispose();
+  }
+
 }

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

@@ -1,46 +1,29 @@
 part of 'main.dart';
 
 class HomeAssistant {
-  String _webSocketAPIEndpoint;
-  String _password;
-  bool _useLovelace = false;
 
-  IOWebSocketChannel _hassioChannel;
-  SendMessageQueue _messageQueue;
+  static final HomeAssistant _instance = HomeAssistant._internal();
+
+  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;
-  Completer _statesCompleter;
-  Completer _servicesCompleter;
-  Completer _lovelaceCompleter;
-  Completer _configCompleter;
-  Completer _connectionCompleter;
-  Completer _userInfoCompleter;
-  Timer _connectionTimer;
-  Timer _fetchTimer;
-  bool autoReconnect = false;
+  List<Panel> panels = [];
 
-  StreamSubscription _socketSubscription;
-
-  int messageExpirationTime = 30; //seconds
   Duration fetchTimeout = Duration(seconds: 30);
-  Duration connectTimeout = Duration(seconds: 15);
 
   String get locationName {
-    if (_useLovelace) {
+    if (Connection().useLovelace) {
       return ui?.title ?? "";
     } else {
       return _instanceConfig["location_name"] ?? "";
@@ -48,360 +31,242 @@ 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() {
-    entities = EntityCollection();
-    _messageQueue = SendMessageQueue(messageExpirationTime);
+  HomeAssistant._internal() {
+    Connection().onStateChangeCallback = _handleEntityStateChange;
+    Device().loadDeviceInfo();
   }
 
-  void updateSettings(String url, String password, bool useLovelace) {
-    _webSocketAPIEndpoint = url;
-    _password = password;
-    _useLovelace = useLovelace;
-    Logger.d( "Use lovelace is $_useLovelace");
-  }
+  Completer _fetchCompleter;
 
-  Future fetch() {
-    if ((_fetchCompleter != null) && (!_fetchCompleter.isCompleted)) {
-      Logger.w("Previous fetch is not complited");
-    } else {
-      _fetchCompleter = new Completer();
-      _fetchTimer = Timer(fetchTimeout, () {
-        Logger.e( "Data fetching timeout");
-        disconnect().then((_) {
-          _completeFetching({
-            "errorCode": 9,
-            "errorMessage": "Couldn't get data from server"
-          });
-        });
-      });
-      _connection().then((r) {
-        _getData();
-      }).catchError((e) {
-        _completeFetching(e);
-      });
-    }
+  Future fetchData() {
+    if (_fetchCompleter != null && !_fetchCompleter.isCompleted) {
+      Logger.w("Previous data fetch is not completed yet");
       return _fetchCompleter.future;
     }
-
-  disconnect() async {
-    if ((_hassioChannel != null) && (_hassioChannel.closeCode == null) && (_hassioChannel.sink != null)) {
-      await _hassioChannel.sink.close().timeout(Duration(seconds: 3),
-        onTimeout: () => Logger.d( "Socket sink closed")
-      );
-      await _socketSubscription.cancel();
-      _hassioChannel = null;
-    }
-
-  }
-
-  Future _connection() {
-    if ((_connectionCompleter != null) && (!_connectionCompleter.isCompleted)) {
-      Logger.d("Previous connection is not complited");
-    } else {
-      if ((_hassioChannel == null) || (_hassioChannel.closeCode != null)) {
-        _connectionCompleter = new Completer();
-        autoReconnect = false;
-        disconnect().then((_){
-          Logger.d( "Socket connecting...");
-          _connectionTimer = Timer(connectTimeout, () {
-            Logger.e( "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() {
-    Logger.d("Socket disconnected. Automatic reconnect is $autoReconnect");
-    if (autoReconnect) {
-      _reconnect();
-    }
-  }
-
-  void _handleSocketError(e) {
-    Logger.e("Socket stream Error: $e");
-    Logger.d("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 {
+    if (entities == null) entities = EntityCollection(Connection().httpWebHost);
+    _fetchCompleter = Completer();
     List<Future> futures = [];
     futures.add(_getStates());
-    if (_useLovelace) {
+    if (Connection().useLovelace) {
       futures.add(_getLovelace());
     }
     futures.add(_getConfig());
     futures.add(_getServices());
     futures.add(_getUserInfo());
-    try {
-      await Future.wait(futures);
+    futures.add(_getPanels());
+    futures.add(Connection().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;
-        Logger.d( "Fetch complete successful");
         _fetchCompleter.complete();
-      }
-    }
-  }
-
-  void _completeConnecting(error) {
-    _connectionTimer.cancel();
-    if (!_connectionCompleter.isCompleted) {
-      if (error != null) {
-        _connectionCompleter.completeError(error);
+        checkAppRegistration();
       } 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")]));
       }
-    } else if (error != null) {
-      if (error is Error) {
-        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","access_token": "$_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") {
-      Logger.d("[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")) {
-        Logger.d("[Received] <== ${data['type']}.${data["event"]["event_type"]}: ${data["event"]["data"]["entity_id"]}");
-        _handleEntityStateChange(data["event"]["data"]);
-      } else if (data["event"] != null) {
-        Logger.w("Unhandled event type: ${data["event"]["event_type"]}");
-      } else {
-        Logger.e("Event is null: $message");
-      }
-    } else {
-      Logger.w("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) {
-    Logger.d( "[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){
-        Logger.d( "[Sending queued] ==> $message");
-        _hassioChannel.sink.add(message);
-      });
-      if (!queued) {
-        Logger.d( "[Sending] ==> $message");
-        _hassioChannel.sink.add(message);
-      }
-      sendCompleter.complete();
     }).catchError((e) {
-      sendCompleter.completeError(e);
+      _fetchCompleter.completeError(e);
     });
-    return sendCompleter.future;
+    return _fetchCompleter.future;
   }
 
-  Future callService(String domain, String service, String entityId, Map<String, dynamic> additionalParams) {
-    _incrementMessageId();
-    String message = "";
-    if (entityId != null) {
-      message = '{"id": $_currentMessageId, "type": "call_service", "domain": "$domain", "service": "$service", "service_data": {"entity_id": "$entityId"';
-      if (additionalParams != null) {
-        additionalParams.forEach((name, value) {
-          if ((value is double) || (value is int) || (value is List)) {
-            message += ', "$name" : $value';
-          } else {
-            message += ', "$name" : "$value"';
-          }
+  Future logout() async {
+    Logger.d("Logging out...");
+    await Connection().logout().then((_) {
+      ui?.clear();
+      entities?.clear();
+      panels?.clear();
     });
   }
-      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 += '}';
+  Map _getAppRegistrationData() {
+    return {
+      "app_version": "$appVersion",
+      "device_name": "$userName's ${Device().model}",
+      "manufacturer": Device().manufacturer,
+      "model": Device().model,
+      "os_version": Device().osVersion,
+      "app_data": {
+        "push_token": "$fcmToken",
+        "push_url": "https://us-central1-ha-client-c73c4.cloudfunctions.net/sendPushNotification"
       }
-      message += '}';
+    };
   }
-    return _sendMessageRaw(message, true);
+
+  Future checkAppRegistration({bool forceRegister: false, bool showOkDialog: false}) {
+    Completer completer = Completer();
+    if (Connection().webhookId == null || forceRegister) {
+      Logger.d("Mobile app was not registered yet or need to be reseted. Registering...");
+      var registrationData = _getAppRegistrationData();
+      registrationData.addAll({
+        "app_id": "ha_client",
+        "app_name": "$appName",
+        "os_name": Device().osName,
+        "supports_encryption": false,
+      });
+      Connection().sendHTTPPost(
+              endPoint: "/api/mobile_app/registrations",
+              includeAuthHeader: true,
+              data: json.encode(registrationData)
+          ).then((response) {
+            Logger.d("Processing registration responce...");
+            var responseObject = json.decode(response);
+            SharedPreferences.getInstance().then((prefs) {
+              prefs.setString("app-webhook-id", responseObject["webhook_id"]);
+              Connection().webhookId = responseObject["webhook_id"];
+              completer.complete();
+              eventBus.fire(ShowPopupDialogEvent(
+                title: "Mobile app Integration was created",
+                body: "HA Client was registered as MobileApp in your Home Assistant. To start using notifications you need to restart your Home Assistant",
+                positiveText: "Restart now",
+                negativeText: "Later",
+                onPositive: () {
+                  Connection().callService(domain: "homeassistant", service: "restart", entityId: null);
+                },
+              ));
+            });
+          }).catchError((e) {
+            completer.complete();
+            Logger.e("Error registering the app: ${e.toString()}");
+          });
+      return completer.future;
+    } else {
+      Logger.d("App was previously registered. Checking...");
+      var updateData = {
+        "type": "update_registration",
+        "data": _getAppRegistrationData()
+      };
+      Connection().sendHTTPPost(
+          endPoint: "/api/webhook/${Connection().webhookId}",
+          includeAuthHeader: false,
+          data: json.encode(updateData)
+      ).then((response) {
+        if (response == null || response.isEmpty) {
+          Logger.d("No registration data in response. MobileApp integration was removed");
+          _askToRegisterApp();
+        } else {
+          Logger.d("App registration works fine");
+          if (showOkDialog) {
+            eventBus.fire(ShowPopupDialogEvent(
+                title: "All good",
+                body: "HA Client integration with your Home Assistant server works fine",
+                positiveText: "Nice!",
+                negativeText: "Ok"
+            ));
+          }
+        }
+        completer.complete();
+      }).catchError((e) {
+        if (e['code'] != null && e['code'] == 410) {
+          Logger.e("MobileApp integration was removed");
+          _askToRegisterApp();
+        } else {
+          Logger.e("Error updating app registration: ${e.toString()}");
+          eventBus.fire(ShowPopupDialogEvent(
+            title: "App integration is not working properly",
+            body: "Something wrong with HA Client integration on your Home Assistant server. Please report this issue.",
+            positiveText: "Report to GitHub",
+            negativeText: "Report to Discord",
+            onPositive: () {
+              HAUtils.launchURL("https://github.com/estevez-dev/ha_client/issues/new");
+            },
+            onNegative: () {
+              HAUtils.launchURL("https://discord.gg/AUzEvwn");
+            },
+          ));
+        }
+        completer.complete();
+      });
+      return completer.future;
+    }
+  }
+
+  void _askToRegisterApp() {
+    eventBus.fire(ShowPopupDialogEvent(
+      title: "App integration was removed",
+      body: "Looks like app integration was removed from your Home Assistant. HA Client needs to be registered on your Home Assistant server to make it possible to use notifications and other useful stuff.",
+      positiveText: "Register now",
+      negativeText: "Cancel",
+      onPositive: () {
+        SharedPreferences.getInstance().then((prefs) {
+          prefs.remove("app-webhook-id");
+          Connection().webhookId = null;
+          HomeAssistant().checkAppRegistration();
+        });
+      },
+    ));
+  }
+
+  Future _getConfig() async {
+    await Connection().sendSocketMessage(type: "get_config").then((data) {
+      _instanceConfig = Map.from(data);
+    }).catchError((e) {
+      throw HAError("Error getting config: ${e}");
+    });
+  }
+
+  Future _getStates() async {
+    await Connection().sendSocketMessage(type: "get_states").then(
+            (data) => entities.parse(data)
+    ).catchError((e) {
+      throw HAError("Error getting states: $e");
+    });
+  }
+
+  Future _getLovelace() async {
+    await Connection().sendSocketMessage(type: "lovelace/config").then((data) => _rawLovelaceData = data).catchError((e) {
+      throw HAError("Error getting lovelace config: $e");
+    });
+  }
+
+  Future _getUserInfo() async {
+    _userName = null;
+    await Connection().sendSocketMessage(type: "auth/current_user").then((data) => _userName = data["name"]).catchError((e) {
+      Logger.w("Can't get user info: ${e}");
+    });
+  }
+
+  Future _getServices() async {
+    await Connection().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 Connection().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);
       eventBus.fire(new StateChangedEvent(
           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;
-      Logger.w("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 {
-      Logger.e("There was an error getting Lovelace config: $response");
-      _rawLovelaceData = null;
-    }
-    _lovelaceCompleter.complete();
   }
 
   void _parseLovelace() {
@@ -439,37 +304,73 @@ class HomeAssistant {
     List<HACard> result = [];
     rawCards.forEach((rawCard){
       try {
-        bool isThereCardOptionsInside = rawCard["card"] != null;
+        //bool isThereCardOptionsInside = rawCard["card"] != null;
+        var rawCardInfo =  rawCard["card"] ?? rawCard;
         HACard card = HACard(
             id: "card",
-            name: isThereCardOptionsInside ? rawCard["card"]["title"] ??
-                rawCard["card"]["name"] : rawCard["title"] ?? rawCard["name"],
-            type: isThereCardOptionsInside
-                ? rawCard["card"]['type']
-                : rawCard['type'],
-            columnsCount: isThereCardOptionsInside
-                ? rawCard["card"]['columns'] ?? 4
-                : rawCard['columns'] ?? 4,
-            showName: isThereCardOptionsInside ? rawCard["card"]['show_name'] ??
-                true : rawCard['show_name'] ?? true,
-            showState: isThereCardOptionsInside
-                ? rawCard["card"]['show_state'] ?? true
-                : rawCard['show_state'] ?? true,
-            showEmpty: rawCard['show_empty'] ?? true,
-            stateFilter: rawCard['state_filter'] ?? [],
-            states: rawCard['states'],
-            content: rawCard['content']
+            name: rawCardInfo["title"] ?? rawCardInfo["name"],
+            type: rawCardInfo['type'],
+            columnsCount: rawCardInfo['columns'] ?? 4,
+            showName: rawCardInfo['show_name'] ?? true,
+            showState: rawCardInfo['show_state'] ?? true,
+            showEmpty: rawCardInfo['show_empty'] ?? true,
+            stateFilter: rawCardInfo['state_filter'] ?? [],
+            states: rawCardInfo['states'],
+            conditions: rawCard['conditions'] ?? [],
+            content: rawCardInfo['content']
         );
-        if (rawCard["cards"] != null) {
-          card.childCards = _createLovelaceCards(rawCard["cards"]);
+        if (rawCardInfo["cards"] != null) {
+          card.childCards = _createLovelaceCards(rawCardInfo["cards"]);
         }
-        rawCard["entities"]?.forEach((rawEntity) {
+        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"]);
               card.entities.add(
                   EntityWrapper(
@@ -479,20 +380,24 @@ class HomeAssistant {
                       uiAction: EntityUIAction(rawEntityData: rawEntity)
                   )
               );
+            } else {
+              card.entities.add(EntityWrapper(entity: Entity.missed(rawEntity["entity"])));
             }
           }
         });
-        if (rawCard["entity"] != null) {
-          var en = rawCard["entity"];
+        if (rawCardInfo["entity"] != null) {
+          var en = rawCardInfo["entity"];
           if (en is String) {
             if (entities.isExist(en)) {
               Entity e = entities.get(en);
               card.linkedEntityWrapper = EntityWrapper(
                   entity: e,
-                  icon: rawCard["icon"],
-                  displayName: rawCard["name"],
+                  icon: rawCardInfo["icon"],
+                  displayName: rawCardInfo["name"],
                   uiAction: EntityUIAction(rawEntityData: rawCard)
               );
+            } else {
+              card.linkedEntityWrapper = EntityWrapper(entity: Entity.missed(en));
             }
           } else {
             if (entities.isExist(en["entity"])) {
@@ -503,6 +408,8 @@ class HomeAssistant {
                   displayName: en["name"],
                   uiAction: EntityUIAction(rawEntityData: rawCard)
               );
+            } else {
+              card.linkedEntityWrapper = EntityWrapper(entity: Entity.missed(en["entity"]));
             }
           }
         }
@@ -514,18 +421,9 @@ class HomeAssistant {
     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 ((Connection().useLovelace) && (_rawLovelaceData != null)) {
       Logger.d("Creating Lovelace UI");
       _parseLovelace();
     } else {
@@ -559,31 +457,12 @@ class HomeAssistant {
     }
   }
 
-  Widget buildViews(BuildContext context, bool lovelace) {
-    return ui.build(context);
-  }
-
-  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";
-    Logger.d("[Sending] ==> $url");
-    http.Response historyResponse;
-    historyResponse = await http.get(url, headers: {
-        "authorization": "Bearer $_password",
-        "Content-Type": "application/json"
-    });
-    var history = json.decode(historyResponse.body);
-    if (history is List) {
-      Logger.d( "[Received] <== ${history.first.length} history recors");
-      return history;
-    } else {
-      return [];
-    }
+  Widget buildViews(BuildContext context, TabController tabController) {
+    return ui.build(context, tabController);
   }
 }
 
+/*
 class SendMessageQueue {
   int _messageTimeout;
   List<HAMessage> _queue = [];
@@ -622,4 +501,4 @@ class HAMessage {
   bool isExpired() {
     return DateTime.now().difference(_timeStamp).inSeconds > _messageTimeout;
   }
-}
+}*/

lib/pages/entity.page.dart

@@ -1,4 +1,4 @@
-part of 'main.dart';
+part of '../main.dart';
 
 class EntityViewPage extends StatefulWidget {
   EntityViewPage({Key key, @required this.entityId, @required this.homeAssistant }) : super(key: key);
@@ -46,10 +46,7 @@ class _EntityViewPageState extends State<EntityViewPage> {
         // the App.build method, and use it to set our appbar title.
         title: new Text(_title),
       ),
-      body: HomeAssistantModel(
-          homeAssistant: widget.homeAssistant,
-          child: widget.homeAssistant.entities.get(widget.entityId).buildEntityPageWidget(context)
-      ),
+      body: widget.homeAssistant.entities.get(widget.entityId).buildEntityPageWidget(context),
     );
   }
 

lib/pages/log.page.dart

@@ -1,4 +1,4 @@
-part of 'main.dart';
+part of '../main.dart';
 
 class LogViewPage extends StatefulWidget {
   LogViewPage({Key key, this.title}) : super(key: key);

lib/pages/panel.page.dart

@@ -0,0 +1,40 @@
+part of '../main.dart';
+
+class PanelPage extends StatefulWidget {
+  PanelPage({Key key, this.title, this.panel}) : super(key: key);
+
+  final String title;
+  final Panel panel;
+
+  @override
+  _PanelPageState createState() => new _PanelPageState();
+}
+
+class _PanelPageState extends State<PanelPage> {
+
+  List<ConfigurationItem> _items;
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+
+    return new Scaffold(
+      appBar: new AppBar(
+        leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
+          Navigator.pop(context);
+        }),
+        title: new Text(widget.title),
+      ),
+      body: widget.panel.getWidget(),
+    );
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+}

lib/pages/purchase.page.dart

@@ -0,0 +1,107 @@
+part of '../main.dart';
+
+class PurchasePage extends StatefulWidget {
+  PurchasePage({Key key, this.title}) : super(key: key);
+
+  final String title;
+
+  @override
+  _PurchasePageState createState() => new _PurchasePageState();
+}
+
+class _PurchasePageState extends State<PurchasePage> {
+  
+  bool _loaded = false;
+  String _error = "";
+  List<ProductDetails> _products;
+  List<PurchaseDetails> _purchases;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadProducts();
+  }
+
+  _loadProducts() async {
+    final bool available = await InAppPurchaseConnection.instance.isAvailable();
+    if (!available) {
+      setState(() {
+        _error = "Error connecting to store";
+      });
+    } else {
+      const Set<String> _kIds = {'just_few_bucks_per_year', 'app_fan_support_per_year', 'grateful_user_support_per_year'};
+      final ProductDetailsResponse response = await InAppPurchaseConnection.instance.queryProductDetails(_kIds);
+      if (!response.notFoundIDs.isEmpty) {
+        Logger.d("Products not found: ${response.notFoundIDs}");
+      }
+      _products = response.productDetails;
+      _loadPreviousPurchases();
+    }
+  }
+
+  _loadPreviousPurchases() async {
+    final QueryPurchaseDetailsResponse response = await InAppPurchaseConnection.instance.queryPastPurchases();
+    if (response.error != null) {
+      setState(() {
+        _error = "Error loading previous purchases";
+      });
+    } else {
+      _purchases = response.pastPurchases;
+      for (PurchaseDetails purchase in _purchases) {
+        Logger.d("Previous purchase: ${purchase.status}");
+      }
+      if (_products.isEmpty) {
+        setState(() {
+          _error = "No data found in store";
+        });
+      } else {
+        setState(() {
+          _loaded = true;
+        });
+      }
+    }
+  }
+  
+  Widget _buildProducts() {
+    List<Widget> productWidgets = [];
+    for (ProductDetails product in _products) {
+      productWidgets.add(
+        ProductPurchase(
+          product: product,
+          onBuy: (product) => _buyProduct(product),
+          purchased: _purchases.any((purchase) { return purchase.productID == product.id;}),)
+      );
+    }
+    return ListView(
+        scrollDirection: Axis.vertical,
+        children: productWidgets
+      );
+  }
+
+  void _buyProduct(ProductDetails product) {
+    Logger.d("Starting purchase of ${product.id}");
+    final PurchaseParam purchaseParam = PurchaseParam(productDetails: product);
+    InAppPurchaseConnection.instance.buyNonConsumable(purchaseParam: purchaseParam);
+    Navigator.of(context).pop();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Widget body;
+    if (!_loaded) {
+      body = _error.isEmpty ? PageLoadingIndicator() : PageLoadingError(errorText: _error);
+    } else {
+      body = _buildProducts();
+    }
+    return new Scaffold(
+      appBar: new AppBar(
+        leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
+          Navigator.pop(context);
+        }),
+        title: new Text(widget.title),
+      ),
+      body: body,
+    );
+  }
+  
+}

lib/pages/settings.page.dart

@@ -1,4 +1,4 @@
-part of 'main.dart';
+part of '../main.dart';
 
 class ConnectionSettingsPage extends StatefulWidget {
   ConnectionSettingsPage({Key key, this.title}) : super(key: key);
@@ -14,26 +14,46 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
   String _newHassioDomain = "";
   String _hassioPort = "";
   String _newHassioPort = "";
-  String _hassioPassword = "";
-  String _newHassioPassword = "";
   String _socketProtocol = "wss";
   String _newSocketProtocol = "wss";
+  String _longLivedToken = "";
+  String _newLongLivedToken = "";
   bool _useLovelace = true;
   bool _newUseLovelace = true;
 
+  String oauthUrl;
+  bool useOAuth = false;
+
   @override
   void initState() {
     super.initState();
     _loadSettings();
+
   }
 
   _loadSettings() async {
     SharedPreferences prefs = await SharedPreferences.getInstance();
+    final storage = new FlutterSecureStorage();
+
+    try {
+      useOAuth = prefs.getBool("oauth-used") ?? true;
+    } catch (e) {
+      useOAuth = true;
+    }
+
+    if (!useOAuth) {
+      try {
+        _longLivedToken = _newLongLivedToken =
+        await storage.read(key: "hacl_llt");
+      } catch (e) {
+        _longLivedToken = _newLongLivedToken = "";
+        await storage.delete(key: "hacl_llt");
+      }
+    }
 
     setState(() {
       _hassioDomain = _newHassioDomain = prefs.getString("hassio-domain")?? "";
       _hassioPort = _newHassioPort = prefs.getString("hassio-port") ?? "";
-      _hassioPassword = _newHassioPassword = prefs.getString("hassio-password") ?? "";
       _socketProtocol = _newSocketProtocol = prefs.getString("hassio-protocol") ?? 'wss';
       try {
         _useLovelace = _newUseLovelace = prefs.getBool("use-lovelace") ?? true;
@@ -44,11 +64,12 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
   }
 
   bool _checkConfigChanged() {
-    return ((_newHassioPassword != _hassioPassword) ||
+    return (
       (_newHassioPort != _hassioPort) ||
       (_newHassioDomain != _hassioDomain) ||
       (_newSocketProtocol != _socketProtocol) ||
-      (_newUseLovelace != _useLovelace));
+      (_newUseLovelace != _useLovelace) ||
+      (_newLongLivedToken != _longLivedToken));
 
   }
 
@@ -56,10 +77,17 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
     if (_newHassioDomain.indexOf("http") == 0 && _newHassioDomain.indexOf("//") > 0) {
       _newHassioDomain = _newHassioDomain.split("//")[1];
     }
+    _newHassioDomain = _newHassioDomain.split("/")[0];
     SharedPreferences prefs = await SharedPreferences.getInstance();
+    final storage = new FlutterSecureStorage();
+    if (_newLongLivedToken.isNotEmpty) {
+      prefs.setBool("oauth-used", false);
+      await storage.write(key: "hacl_llt", value: _newLongLivedToken);
+    } else if (!useOAuth) {
+      await storage.delete(key: "hacl_llt");
+    }
     prefs.setString("hassio-domain", _newHassioDomain);
     prefs.setString("hassio-port", _newHassioPort);
-    prefs.setString("hassio-password", _newHassioPassword);
     prefs.setString("hassio-protocol", _newSocketProtocol);
     prefs.setString("hassio-res-protocol", _newSocketProtocol == "wss" ? "https" : "http");
     prefs.setBool("use-lovelace", _newUseLovelace);
@@ -149,21 +177,6 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
             "Try ports 80 and 443 if default is not working and you don't know why.",
             style: TextStyle(color: Colors.grey),
           ),
-          new TextField(
-            decoration: InputDecoration(
-                labelText: "Access token"
-            ),
-            controller: new TextEditingController.fromValue(
-                new TextEditingValue(
-                    text: _newHassioPassword,
-                    selection:
-                    new TextSelection.collapsed(offset: _newHassioPassword.length)
-                )
-            ),
-            onChanged: (value) {
-              _newHassioPassword = value;
-            }
-          ),
           Padding(
             padding: EdgeInsets.only(top: 20.0),
             child: Text(
@@ -187,6 +200,33 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
               )
             ],
           ),
+          Text(
+            "Authentication settings",
+            style: TextStyle(
+                color: Colors.black45,
+                fontSize: 20.0
+            ),
+          ),
+          Container(height: 10.0,),
+          Text(
+            "You can leave this field blank to make app generate new long-lived token automatically by asking you to login to your Home Assistant. Use this field only if you still want to use manually generated long-lived token. Leave it blank if you don't understand what we are talking about.",
+            style: TextStyle(color: Colors.redAccent),
+          ),
+          new TextField(
+              decoration: InputDecoration(
+                  labelText: "Long-lived token"
+              ),
+              controller: new TextEditingController.fromValue(
+                  new TextEditingValue(
+                      text: _newLongLivedToken ?? '',
+                      selection:
+                      new TextSelection.collapsed(offset: _newLongLivedToken != null ? _newLongLivedToken.length : 0)
+                  )
+              ),
+              onChanged: (value) {
+                _newLongLivedToken = value;
+              }
+          ),
         ],
       ),
     );

lib/pages/widgets/page_loading_error.dart

@@ -0,0 +1,32 @@
+part of '../../main.dart';
+
+class PageLoadingError extends StatelessWidget {
+
+  final String errorText;
+
+  const PageLoadingError({Key key, this.errorText: "Error"}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisSize: MainAxisSize.max,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: <Widget>[
+        Column(
+          children: <Widget>[
+            Padding(
+                padding: EdgeInsets.only(top: 40.0, bottom: 20.0),
+                child: Icon(
+                    Icons.error,
+                    color: Colors.redAccent,
+                    size: 48.0
+                )
+            ),
+            Text(this.errorText, style: TextStyle(color: Colors.black45))
+          ],
+        )
+      ],
+    );
+  }
+}

lib/pages/widgets/page_loading_indicator.dart

@@ -0,0 +1,23 @@
+part of '../../main.dart';
+
+class PageLoadingIndicator extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisSize: MainAxisSize.max,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: <Widget>[
+        Column(
+          children: <Widget>[
+            Padding(
+                padding: EdgeInsets.only(top: 40.0, bottom: 20.0),
+                child: CircularProgressIndicator()
+            ),
+            Text("Loading...", style: TextStyle(color: Colors.black45))
+          ],
+        )
+      ],
+    );
+  }
+}

lib/pages/widgets/product_purchase.widget.dart

@@ -0,0 +1,68 @@
+part of '../../main.dart';
+
+class ProductPurchase extends StatelessWidget {
+
+  final ProductDetails product;
+  final onBuy;
+  final purchased;
+
+  const ProductPurchase({Key key, @required this.product, @required this.onBuy, this.purchased}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    String period = "/ ";
+    Color priceColor;
+    if (product.id.contains("year")) {
+      period += "year";
+      priceColor = Colors.amber;
+    } else {
+      period += "month";
+      priceColor = Colors.deepOrangeAccent;
+    }
+    return Card(
+        child: Padding(
+          padding: EdgeInsets.all(Sizes.leftWidgetPadding),
+          child: Flex(
+            direction: Axis.horizontal,
+            children: <Widget>[
+              Expanded(
+                flex: 5,
+                child: Padding(
+                    padding: EdgeInsets.only(right: Sizes.rightWidgetPadding),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: <Widget>[
+                        Text(
+                          "${product.title}",
+                          style: TextStyle(
+                              fontWeight: FontWeight.bold,
+                              fontSize: 16.0
+                          ),
+                        ),
+                        Container(height: Sizes.rowPadding,),
+                        Text(
+                          "${product.description}",
+                          overflow: TextOverflow.ellipsis,
+                          maxLines: 4,
+                          softWrap: true,
+                        ),
+                        Container(height: Sizes.rowPadding,),
+                        Text("${product.price} $period", style: TextStyle(color: priceColor)),
+                      ],
+                    )
+                ),
+              ),
+              Expanded(
+                flex: 2,
+                child: RaisedButton(
+                  child: Text(this.purchased ? "Bought" : "Buy", style: TextStyle(color: Colors.white)),
+                  color: Colors.blue,
+                  onPressed: this.purchased ? null : () => this.onBuy(this.product),
+                ),
+              )
+            ],
+          ),
+        )
+    );
+  }
+}

lib/ui_class/card.class.dart

@@ -13,6 +13,7 @@ class HACard {
   int columnsCount;
   List stateFilter;
   List states;
+  List conditions;
   String content;
 
   HACard({
@@ -26,6 +27,7 @@ class HACard {
     this.showEmpty: true,
     this.content,
     this.states,
+    this.conditions,
     @required this.type
   });
 

lib/ui_class/panel_class.dart

@@ -0,0 +1,57 @@
+part of '../main.dart';
+
+class Panel {
+
+  static const iconsByComponent = {
+    "config": "mdi:settings",
+    "history": "mdi:poll-box",
+    "map": "mdi:tooltip-account",
+    "logbook": "mdi:format-list-bulleted-type",
+    "custom": "mdi:home-assistant"
+  };
+
+  final String id;
+  final String type;
+  final String title;
+  final String urlPath;
+  final Map config;
+  String icon;
+  bool isHidden = true;
+
+  Panel({this.id, this.type, this.title, this.urlPath, this.icon, this.config}) {
+    if (icon == null || !icon.startsWith("mdi:")) {
+      icon = Panel.iconsByComponent[type];
+    }
+    isHidden = (type != "iframe" && type != "config");
+  }
+
+  void handleOpen(BuildContext context) {
+    if (type == "iframe") {
+      Logger.d("Launching custom tab with ${config["url"]}");
+      HAUtils.launchURLInCustomTab(context: context, url: config["url"]);
+    } else if (type == "config") {
+      Navigator.of(context).push(
+          MaterialPageRoute(
+            builder: (context) => PanelPage(title: "$title", panel: this),
+          )
+      );
+    } else {
+      String url = "${Connection().httpWebHost}/$urlPath";
+      Logger.d("Launching custom tab with $url");
+      HAUtils.launchURLInCustomTab(context: context, url: url);
+    }
+  }
+
+  Widget getWidget() {
+    switch (type) {
+      case "config": {
+        return ConfigPanelWidget();
+      }
+
+      default: {
+        return Text("Unsupported panel component: $type");
+      }
+    }
+  }
+
+}

lib/ui_class/sizes_class.dart

@@ -1,8 +1,8 @@
 part of '../main.dart';
 
 class Sizes {
-  static const rightWidgetPadding = 16.0;
-  static const leftWidgetPadding = 16.0;
+  static const rightWidgetPadding = 10.0;
+  static const leftWidgetPadding = 10.0;
   static const buttonPadding = 4.0;
   static const extendedWidgetHeight = 50.0;
   static const iconSize = 28.0;

lib/ui_class/ui.dart

@@ -4,12 +4,15 @@ class HomeAssistantUI {
   List<HAView> views;
   String title;
 
+  bool get isEmpty => views == null || views.isEmpty;
+
   HomeAssistantUI() {
     views = [];
   }
 
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, TabController tabController) {
     return TabBarView(
+      controller: tabController,
       children: _buildViews(context)
     );
   }
@@ -24,4 +27,8 @@ class HomeAssistantUI {
     return result;
   }
 
+  void clear() {
+    views.clear();
+  }
+
 }

lib/ui_class/view.class.dart

@@ -77,7 +77,7 @@ class HAView {
           Tab(
               icon:
               Icon(
-                MaterialDesignIcons.createIconDataFromIconName(
+                MaterialDesignIcons.getIconDataFromIconName(
                     iconName ?? "mdi:home-assistant"),
                 size: 24.0,
               )
@@ -92,7 +92,7 @@ class HAView {
       if (linkedEntity.icon != null && linkedEntity.icon.length > 0) {
         return Tab(
           icon: Icon(
-              MaterialDesignIcons.createIconDataFromIconName(
+              MaterialDesignIcons.getIconDataFromIconName(
                   linkedEntity.icon),
               size: 24.0,
             )

lib/ui_widgets/card_widget.dart

@@ -11,9 +11,34 @@ class CardWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if ((card.linkedEntityWrapper!= null) && (card.linkedEntityWrapper.entity.isHidden)) {
+    if (card.linkedEntityWrapper!= null) {
+      if (card.linkedEntityWrapper.entity.isHidden) {
         return Container(width: 0.0, height: 0.0,);
       }
+      if (card.linkedEntityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
+        return EntityModel(
+          entityWrapper: card.linkedEntityWrapper,
+          child: MissedEntityWidget(),
+          handleTap: false,
+        );
+      }
+    }
+
+    if (card.conditions.isNotEmpty) {
+      bool showCardByConditions = false;
+      for (var condition in card.conditions) {
+        Entity conditionEntity = HomeAssistant().entities.get(condition['entity']);
+        if (conditionEntity != null &&
+            (condition['state'] != null && conditionEntity.state == condition['state']) ||
+            (condition['state_not'] != null && conditionEntity.state != condition['state_not'])
+          ) {
+          showCardByConditions = true;
+        }
+      }
+      if (!showCardByConditions) {
+        return Container(width: 0.0, height: 0.0,);
+      }
+    }
 
     switch (card.type) {
 
@@ -103,7 +128,7 @@ class CardWidget extends StatelessWidget {
       if (!entity.entity.isHidden) {
         body.add(
             Padding(
-              padding: EdgeInsets.fromLTRB(0.0, Sizes.rowPadding, 0.0, Sizes.rowPadding),
+              padding: EdgeInsets.fromLTRB(0.0, 4.0, 0.0, 4.0),
               child: EntityModel(
                   entityWrapper: entity,
                   handleTap: true,
@@ -113,7 +138,10 @@ class CardWidget extends StatelessWidget {
       }
     });
     return Card(
-        child: new Column(mainAxisSize: MainAxisSize.min, children: body)
+        child: Padding(
+          padding: EdgeInsets.only(right: Sizes.rightWidgetPadding, left: Sizes.leftWidgetPadding),
+          child: Column(mainAxisSize: MainAxisSize.min, children: body),
+        )
     );
   }
 
@@ -133,9 +161,6 @@ class CardWidget extends StatelessWidget {
   }
 
   Widget _buildAlarmPanelCard(BuildContext context) {
-    if (card.linkedEntityWrapper == null || card.linkedEntityWrapper.entity == null) {
-      return Container(width: 0, height: 0,);
-    } else {
     List<Widget> body = [];
     body.add(CardHeaderWidget(
       name: card.name ?? "",
@@ -149,14 +174,14 @@ class CardWidget extends StatelessWidget {
           mainAxisAlignment: MainAxisAlignment.end,
           children: [
             EntityIcon(
-              iconSize: 50.0,
+              size: 50.0,
             ),
             Container(
                 width: 26.0,
                 child: IconButton(
                     padding: EdgeInsets.all(0.0),
                     alignment: Alignment.centerRight,
-                  icon: Icon(MaterialDesignIcons.createIconDataFromIconName(
+                    icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
                         "mdi:dots-vertical")),
                     onPressed: () => eventBus.fire(new ShowEntityPageEvent(card.linkedEntityWrapper.entity))
                 )
@@ -182,7 +207,6 @@ class CardWidget extends StatelessWidget {
         )
     );
   }
-  }
 
   Widget _buildGlanceCard(BuildContext context) {
     List<EntityWrapper> entitiesToShow = card.getEntitiesToShow();
@@ -227,9 +251,6 @@ class CardWidget extends StatelessWidget {
   }
 
   Widget _buildMediaControlsCard(BuildContext context) {
-    if (card.linkedEntityWrapper == null || card.linkedEntityWrapper.entity == null) {
-      return Container(width: 0, height: 0,);
-    } else {
     return Card(
         child: EntityModel(
             entityWrapper: card.linkedEntityWrapper,
@@ -238,12 +259,8 @@ class CardWidget extends StatelessWidget {
         )
     );
   }
-  }
 
   Widget _buildEntityButtonCard(BuildContext context) {
-    if (card.linkedEntityWrapper == null || card.linkedEntityWrapper.entity == null) {
-      return Container(width: 0, height: 0,);
-    } else {
     card.linkedEntityWrapper.displayName = card.name?.toUpperCase() ??
         card.linkedEntityWrapper.displayName.toUpperCase();
     return Card(
@@ -254,7 +271,6 @@ class CardWidget extends StatelessWidget {
         )
     );
   }
-  }
 
   Widget _buildUnsupportedCard(BuildContext context) {
     List<Widget> body = [];

lib/ui_widgets/config_panel_widget.dart

@@ -0,0 +1,331 @@
+part of '../main.dart';
+
+class ConfigPanelWidget extends StatefulWidget {
+  ConfigPanelWidget({Key key}) : super(key: key);
+
+  @override
+  _ConfigPanelWidgetState createState() => new _ConfigPanelWidgetState();
+}
+
+class ConfigurationItem {
+  ConfigurationItem({ this.isExpanded: false, this.header, this.body });
+
+  bool isExpanded;
+  final String header;
+  final Widget body;
+}
+
+class _ConfigPanelWidgetState extends State<ConfigPanelWidget> {
+
+  List<ConfigurationItem> _items;
+
+  @override
+  void initState() {
+    super.initState();
+    _items = <ConfigurationItem>[
+      ConfigurationItem(
+          header: 'Home Assistant Cloud',
+          body: Padding(
+            padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 0.0, Sizes.rightWidgetPadding, Sizes.rowPadding),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                FlatButton(
+                  child: Text('Open web version', style: TextStyle(color: Colors.blue)),
+                  onPressed: () {
+                    HAUtils.launchURLInCustomTab(context: context, url: Connection().httpWebHost+"/config/cloud/account");
+                  },
+                )
+              ],
+            ),
+          )
+      ),
+      ConfigurationItem(
+          header: 'Integrations',
+          body: Padding(
+            padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 0.0, Sizes.rightWidgetPadding, Sizes.rowPadding),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                FlatButton(
+                  child: Text('Open web version', style: TextStyle(color: Colors.blue)),
+                  onPressed: () {
+                    HAUtils.launchURLInCustomTab(context: context, url: Connection().httpWebHost+"/config/integrations/dashboard");
+                  },
+                )
+              ],
+            ),
+          )
+      ),
+      ConfigurationItem(
+          header: 'Users',
+          body: Padding(
+            padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 0.0, Sizes.rightWidgetPadding, Sizes.rowPadding),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                FlatButton(
+                  child: Text('Open web version', style: TextStyle(color: Colors.blue)),
+                  onPressed: () {
+                    HAUtils.launchURLInCustomTab(context: context, url: Connection().httpWebHost+"/config/users/picker");
+                  },
+                )
+              ],
+            ),
+          )
+      ),
+      ConfigurationItem(
+          header: 'General',
+          body: Padding(
+            padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 0.0, Sizes.rightWidgetPadding, Sizes.rowPadding),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                FlatButton(
+                  child: Text('Open web version', style: TextStyle(color: Colors.blue)),
+                  onPressed: () {
+                    HAUtils.launchURLInCustomTab(context: context, url: Connection().httpWebHost+"/config/core");
+                  },
+                ),
+                Container(height: Sizes.rowPadding,),
+                Text("Server management", style: TextStyle(fontSize: Sizes.largeFontSize)),
+                Container(height: Sizes.rowPadding,),
+                Text("Control your Home Assistant server from HA Client."),
+                Divider(),
+                Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: <Widget>[
+                    FlatButton(
+                      child: Text('Restart', style: TextStyle(color: Colors.blue)),
+                      onPressed: () => restart(),
+                    ),
+                    FlatButton(
+                      child: Text("Stop", style: TextStyle(color: Colors.blue)),
+                      onPressed: () => stop(),
+                    ),
+                  ],
+                )
+              ],
+            ),
+          )
+      ),
+      ConfigurationItem(
+          header: 'Persons',
+          body: Padding(
+            padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 0.0, Sizes.rightWidgetPadding, Sizes.rowPadding),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                FlatButton(
+                  child: Text('Open web version', style: TextStyle(color: Colors.blue)),
+                  onPressed: () {
+                    HAUtils.launchURLInCustomTab(context: context, url: Connection().httpWebHost+"/config/person");
+                  },
+                )
+              ],
+            ),
+          )
+      ),
+      ConfigurationItem(
+          header: 'Entity Registry',
+          body: Padding(
+            padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 0.0, Sizes.rightWidgetPadding, Sizes.rowPadding),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                FlatButton(
+                  child: Text('Open web version', style: TextStyle(color: Colors.blue)),
+                  onPressed: () {
+                    HAUtils.launchURLInCustomTab(context: context, url: Connection().httpWebHost+"/config/entity_registry");
+                  },
+                )
+              ],
+            ),
+          )
+      ),
+      ConfigurationItem(
+          header: 'Area Registry',
+          body: Padding(
+            padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 0.0, Sizes.rightWidgetPadding, Sizes.rowPadding),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                FlatButton(
+                  child: Text('Open web version', style: TextStyle(color: Colors.blue)),
+                  onPressed: () {
+                    HAUtils.launchURLInCustomTab(context: context, url: Connection().httpWebHost+"/config/area_registry");
+                  },
+                )
+              ],
+            ),
+          )
+      ),
+      ConfigurationItem(
+          header: 'Automation',
+          body: Padding(
+            padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 0.0, Sizes.rightWidgetPadding, Sizes.rowPadding),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                FlatButton(
+                  child: Text('Open web version', style: TextStyle(color: Colors.blue)),
+                  onPressed: () {
+                    HAUtils.launchURLInCustomTab(context: context, url: Connection().httpWebHost+"/config/automation");
+                  },
+                )
+              ],
+            ),
+          )
+      ),
+      ConfigurationItem(
+          header: 'Script',
+          body: Padding(
+            padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 0.0, Sizes.rightWidgetPadding, Sizes.rowPadding),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                FlatButton(
+                  child: Text('Open web version', style: TextStyle(color: Colors.blue)),
+                  onPressed: () {
+                    HAUtils.launchURLInCustomTab(context: context, url: Connection().httpWebHost+"/config/script");
+                  },
+                )
+              ],
+            ),
+          )
+      ),
+      ConfigurationItem(
+          header: 'Customization',
+          body: Padding(
+            padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 0.0, Sizes.rightWidgetPadding, Sizes.rowPadding),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                FlatButton(
+                  child: Text('Open web version', style: TextStyle(color: Colors.blue)),
+                  onPressed: () {
+                    HAUtils.launchURLInCustomTab(context: context, url: Connection().httpWebHost+"/config/customize");
+                  },
+                )
+              ],
+            ),
+          )
+      ),
+      ConfigurationItem(
+          header: 'Mobile app',
+          body: Padding(
+            padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 0.0, Sizes.rightWidgetPadding, Sizes.rowPadding),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                Text("Registration", style: TextStyle(fontSize: Sizes.largeFontSize)),
+                Container(height: Sizes.rowPadding,),
+                Text("${HomeAssistant().userName}'s ${Device().model}, ${Device().osName} ${Device().osVersion}"),
+                Container(height: 6.0,),
+                Text("Here you can manually check if HA Client integration with your Home Assistant works fine. As mobileApp integration in Home Assistant is still in development, this is not 100% correct check."),
+                Divider(),
+                Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: <Widget>[
+                    FlatButton(
+                        onPressed: () => updateRegistration(),
+                        child: Text("Check registration", style: TextStyle(color: Colors.blue))
+                    ),
+                    FlatButton(
+                        onPressed: () => resetRegistration(),
+                        child: Text("Reset registration", style: TextStyle(color: Colors.red))
+                    )
+                  ],
+                )
+              ],
+            ),
+          )
+      )
+    ];
+  }
+
+  restart() {
+    eventBus.fire(ShowPopupDialogEvent(
+      title: "Are you sure you want to restart Home Assistant?",
+      body: "This will restart your Home Assistant server.",
+      positiveText: "Sure. Make it so",
+      negativeText: "What?? No!",
+      onPositive: () {
+        Connection().callService(domain: "homeassistant", service: "restart", entityId: null);
+      },
+    ));
+  }
+
+  stop() {
+    eventBus.fire(ShowPopupDialogEvent(
+      title: "Are you sure you wanr to STOP Home Assistant?",
+      body: "This will STOP your Home Assistant server. It means that your web interface as well as HA Client will not work untill you'll find a way to start your server using ssh or something.",
+      positiveText: "Sure. Make it so",
+      negativeText: "What?? No!",
+      onPositive: () {
+        Connection().callService(domain: "homeassistant", service: "stop", entityId: null);
+      },
+    ));
+  }
+
+  updateRegistration() {
+    HomeAssistant().checkAppRegistration(showOkDialog: true);
+  }
+
+  resetRegistration() {
+    eventBus.fire(ShowPopupDialogEvent(
+      title: "Waaaait",
+      body: "If you don't whant to have duplicate integrations and entities in your HA for your current device, first you need to remove MobileApp integration from Integration settings in HA and restart server.",
+      positiveText: "Done it already",
+      negativeText: "Ok, I will",
+      onPositive: () {
+        HomeAssistant().checkAppRegistration(showOkDialog: true, forceRegister: true);
+      },
+    ));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+
+    return ListView(
+      children: [
+        new ExpansionPanelList(
+          expansionCallback: (int index, bool isExpanded) {
+            setState(() {
+              _items[index].isExpanded = !_items[index].isExpanded;
+            });
+          },
+          children: _items.map((ConfigurationItem item) {
+            return new ExpansionPanel(
+              headerBuilder: (BuildContext context, bool isExpanded) {
+                return CardHeaderWidget(
+                  name: item.header,
+                );
+              },
+              isExpanded: item.isExpanded,
+              body: new Container(
+                child: item.body,
+              ),
+            );
+          }).toList(),
+        ),
+      ],
+    );
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+}

lib/utils.class.dart

@@ -45,14 +45,90 @@ class Logger {
 
 }
 
+class HAError {
+  String message;
+  final List<HAErrorAction> actions;
+
+  HAError(this.message, {this.actions: const [HAErrorAction.tryAgain()]});
+
+  HAError.unableToConnect({this.actions = const [HAErrorAction.tryAgain()]}) {
+    this.message = "Unable to connect to Home Assistant";
+  }
+
+  HAError.disconnected({this.actions = const [HAErrorAction.reconnect()]}) {
+    this.message = "Disconnected";
+  }
+
+  HAError.checkConnectionSettings({this.actions = const [HAErrorAction.reload(), HAErrorAction(title: "Settings", type: HAErrorActionType.OPEN_CONNECTION_SETTINGS)]}) {
+    this.message = "Check connection settings";
+  }
+}
+
+class HAErrorAction {
+  final String title;
+  final int type;
+  final String url;
+
+  const HAErrorAction({@required this.title, this.type: HAErrorActionType.FULL_RELOAD, this.url});
+
+  const HAErrorAction.tryAgain({this.title = "Try again", this.type = HAErrorActionType.FULL_RELOAD, this.url});
+
+  const HAErrorAction.reconnect({this.title = "Reconnect", this.type = HAErrorActionType.FULL_RELOAD, this.url});
+
+  const HAErrorAction.reload({this.title = "Reload", this.type = HAErrorActionType.FULL_RELOAD, this.url});
+
+  const HAErrorAction.loginAgain({this.title = "Login again", this.type = HAErrorActionType.FULL_RELOAD, this.url});
+
+}
+
+class HAErrorActionType {
+  static const FULL_RELOAD = 0;
+  static const QUICK_RELOAD = 1;
+  static const LOGOUT = 2;
+  static const URL = 3;
+  static const OPEN_CONNECTION_SETTINGS = 4;
+}
+
 class HAUtils {
   static void launchURL(String url) async {
-    if (await canLaunch(url)) {
-      await launch(url);
+    if (await urlLauncher.canLaunch(url)) {
+      await urlLauncher.launch(url);
     } else {
       Logger.e( "Could not launch $url");
     }
   }
+
+  static void launchURLInCustomTab({BuildContext context, String url, bool enableDefaultShare: true, bool showPageTitle: true}) async {
+    try {
+      await launch(
+        "$url",
+        option: new CustomTabsOption(
+          toolbarColor: Theme.of(context).primaryColor,
+          enableDefaultShare: enableDefaultShare,
+          enableUrlBarHiding: true,
+          showPageTitle: showPageTitle,
+          animation: new CustomTabsAnimation.slideIn()
+          // or user defined animation.
+          /*animation: new CustomTabsAnimation(
+          startEnter: 'slide_up',
+          startExit: 'android:anim/fade_out',
+          endEnter: 'android:anim/fade_in',
+          endExit: 'slide_down',
+        )*/,
+        extraCustomTabs: <String>[
+          // ref. https://play.google.com/store/apps/details?id=org.mozilla.firefox
+          'org.mozilla.firefox',
+          // ref. https://play.google.com/store/apps/details?id=com.microsoft.emmx
+          'com.microsoft.emmx',
+        ],
+      ),
+    );
+    } catch (e) {
+      Logger.w("Can't open custom tab: ${e.toString()}");
+      Logger.w("Launching in default browser");
+      HAUtils.launchURL(url);
+    }
+  }
 }
 
 class StateChangedEvent {
@@ -77,6 +153,17 @@ class RefreshDataFinishedEvent {
   RefreshDataFinishedEvent();
 }
 
+class ReloadUIEvent {
+  ReloadUIEvent();
+}
+
+class StartAuthEvent {
+  String oauthUrl;
+  bool showButton;
+
+  StartAuthEvent(this.oauthUrl, this.showButton);
+}
+
 class ServiceCallEvent {
   String domain;
   String service;
@@ -86,6 +173,26 @@ class ServiceCallEvent {
   ServiceCallEvent(this.domain, this.service, this.entityId, this.additionalParams);
 }
 
+class ShowPopupDialogEvent {
+  final String title;
+  final String body;
+  final String positiveText;
+  final String negativeText;
+  final  onPositive;
+  final  onNegative;
+
+  ShowPopupDialogEvent({this.title, this.body, this.positiveText: "Ok", this.negativeText: "Cancel", this.onPositive, this.onNegative});
+}
+
+class ShowPopupMessageEvent {
+  final String title;
+  final String body;
+  final String buttonText;
+  final  onButtonClick;
+
+  ShowPopupMessageEvent({this.title, this.body, this.buttonText: "Ok", this.onButtonClick});
+}
+
 class ShowEntityPageEvent {
   Entity entity;
 
@@ -93,8 +200,7 @@ class ShowEntityPageEvent {
 }
 
 class ShowErrorEvent {
-  String text;
-  int errorCode;
+  final HAError error;
 
-  ShowErrorEvent(this.text, this.errorCode);
+  ShowErrorEvent(this.error);
 }

pubspec.lock

@@ -1,5 +1,5 @@
 # Generated by pub
-# See https://www.dartlang.org/tools/pub/glossary#lockfile
+# See https://dart.dev/tools/pub/glossary#lockfile
 packages:
   archive:
     dependency: transitive
@@ -7,21 +7,21 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.0.10"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.1"
+    version: "1.5.2"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.2.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -35,7 +35,7 @@ packages:
       name: cached_network_image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.0+1"
+    version: "1.1.1"
   charcode:
     dependency: transitive
     description:
@@ -77,16 +77,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.6"
-  dart_config:
-    dependency: transitive
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: a7ed88a4793e094a4d5d5c2d88a89e55510accde
-      url: "https://github.com/MarkOSullivan94/dart_config.git"
-    source: git
-    version: "0.5.0"
+    version: "2.1.1+1"
   date_format:
     dependency: "direct main"
     description:
@@ -94,13 +85,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.6"
+  device_info:
+    dependency: "direct main"
+    description:
+      name: device_info
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.0+2"
   event_bus:
     dependency: "direct main"
     description:
       name: event_bus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.1.0"
+  firebase_messaging:
+    dependency: "direct main"
+    description:
+      name: firebase_messaging
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.1.4"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -112,14 +117,28 @@ packages:
       name: flutter_cache_manager
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "1.1.1"
+  flutter_custom_tabs:
+    dependency: "direct main"
+    description:
+      name: flutter_custom_tabs
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.0"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
       name: flutter_launcher_icons
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.0"
+    version: "0.7.2+1"
+  flutter_local_notifications:
+    dependency: "direct main"
+    description:
+      name: flutter_local_notifications
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.8.2"
   flutter_markdown:
     dependency: "direct main"
     description:
@@ -127,25 +146,32 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0"
-  flutter_svg:
+  flutter_secure_storage:
     dependency: "direct main"
     description:
-      name: flutter_svg
+      name: flutter_secure_storage
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.3"
+    version: "3.2.1+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_webview_plugin:
+    dependency: "direct main"
+    description:
+      name: flutter_webview_plugin
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.7"
   http:
     dependency: transitive
     description:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.0+1"
+    version: "0.12.0+2"
   http_parser:
     dependency: transitive
     description:
@@ -159,14 +185,28 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.7"
+    version: "2.1.4"
+  in_app_purchase:
+    dependency: "direct main"
+    description:
+      name: in_app_purchase
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.1"
   intl:
     dependency: transitive
     description:
       name: intl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.15.7"
+    version: "0.15.8"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
   logging:
     dependency: transitive
     description:
@@ -180,14 +220,14 @@ packages:
       name: markdown
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.3+1"
+    version: "0.12.5"
   meta:
     dependency: transitive
     description:
@@ -202,55 +242,55 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.6.2"
-  path_drawing:
-    dependency: transitive
-    description:
-      name: path_drawing
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.4.0"
-  path_parsing:
-    dependency: transitive
-    description:
-      name: path_parsing
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.3"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.0+1"
+    version: "1.2.0"
+  pedantic:
+    dependency: transitive
+    description:
+      name: pedantic
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.7.0"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.4.0"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.1"
   progress_indicators:
     dependency: "direct main"
     description:
       name: progress_indicators
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2"
+    version: "0.1.4"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.3"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.1+1"
+    version: "0.5.3+4"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -262,14 +302,14 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.1"
+    version: "1.5.5"
   sqflite:
     dependency: transitive
     description:
       name: sqflite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0+1"
+    version: "1.1.6+3"
   stack_trace:
     dependency: transitive
     description:
@@ -283,7 +323,7 @@ packages:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.8"
+    version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
@@ -297,21 +337,21 @@ packages:
       name: synchronized
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2+1"
+    version: "2.1.0+1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.1"
+    version: "0.2.5"
   typed_data:
     dependency: transitive
     description:
@@ -325,14 +365,14 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.1"
+    version: "5.1.2"
   uuid:
     dependency: transitive
     description:
       name: uuid
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.2"
   vector_math:
     dependency: transitive
     description:
@@ -346,21 +386,21 @@ packages:
       name: web_socket_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.9"
+    version: "1.0.15"
   xml:
     dependency: transitive
     description:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.5"
+    version: "3.5.0"
   yaml:
     dependency: transitive
     description:
       name: yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.15"
+    version: "2.1.16"
 sdks:
-  dart: ">=2.1.0 <3.0.0"
-  flutter: ">=0.7.3 <2.0.0"
+  dart: ">=2.4.0 <3.0.0"
+  flutter: ">=1.5.0 <2.0.0"

pubspec.yaml

@@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 0.4.4+95
+version: 0.6.3+630
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"
@@ -18,7 +18,14 @@ dependencies:
   date_format: any
   charts_flutter: any
   flutter_markdown: any
-  flutter_svg: ^0.10.3
+  in_app_purchase: ^0.2.1
+#  flutter_svg: ^0.10.3
+  flutter_custom_tabs: ^0.6.0
+  firebase_messaging: ^5.1.4
+  flutter_webview_plugin: ^0.3.7
+  flutter_secure_storage: ^3.2.1+1
+  device_info: ^0.4.0+2
+  flutter_local_notifications: ^0.8.2
 
 dev_dependencies:
   flutter_test:
@@ -59,7 +66,7 @@ flutter:
   fonts:
     - family: "Material Design Icons"
       fonts:
-        - asset: fonts/materialdesignicons-webfont.ttf
+        - asset: fonts/materialdesignicons-webfont-3-6-95.ttf
   # fonts:
   #   - family: Schyler
   #     fonts: