0.6.5

History tweaks

.gitignore

@@ -10,4 +10,6 @@ build/
 
 .idea/
 
-key.properties
+key.properties
+premium_features_manager.class.dart
+pubspec.lock

README.md

@@ -1,12 +1,9 @@
-[![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
 
 Visit [homemade.systems](http://ha-client.homemade.systems/) for more info.
 
-Join [Google Group](https://groups.google.com/d/forum/ha-client-alpha-testing) to become an alpha tester
+Download the app from [Google Play](https://play.google.com/apps/testing/com.keyboardcrumbs.haclient)
 
-Download the app from [Google Play](https://play.google.com/apps/testing/com.keyboardcrumbs.haclient) after joining the group
-
-Discuss it in [Home Assistant community](https://community.home-assistant.io/t/alpha-testing-ha-client-native-android-client-for-home-assistant/69912)
+Discuss it in [Home Assistant community](https://community.home-assistant.io/t/alpha-testing-ha-client-native-android-client-for-home-assistant/69912) or on [Discord server](https://discord.gg/AUzEvwn)

android/app/src/main/AndroidManifest.xml

@@ -6,6 +6,11 @@
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -13,10 +18,15 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name=".Application"
         android:label="HA Client"
         android:icon="@mipmap/ic_launcher"
         android: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"
@@ -27,10 +37,10 @@
             <!-- 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" />
@@ -40,5 +50,20 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
+        <service
+            android:name="io.flutter.plugins.androidalarmmanager.AlarmService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="false"/>
+        <receiver
+            android:name="io.flutter.plugins.androidalarmmanager.AlarmBroadcastReceiver"
+            android:exported="false"/>
+        <receiver
+            android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"></action>
+            </intent-filter>
+        </receiver>
     </application>
 </manifest>

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

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

assets/js/externalAuth.js

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

flutter_01.log

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

flutter_02.log

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

flutter_03.log

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

lib/connection.class.dart

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

lib/const.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of 'main.dart';
 
 class EntityState {
   static const on = 'on';

lib/entities/alarm_control_panel/alarm_control_panel_entity.class.dart

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

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

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

lib/entities/automation/automation_entity.class.dart

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

lib/entities/button/button_entity.class.dart

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

lib/entities/camera/camera_entity.class.dart

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

lib/entities/climate/climate_entity.class.dart

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

lib/entities/climate/widgets/climate_controls.dart

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

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

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class ClimateStateWidget extends StatelessWidget {
   @override
@@ -8,13 +8,19 @@ class ClimateStateWidget extends StatelessWidget {
     String targetTemp = "-";
     if ((entity.supportTargetTemperature) && (entity.temperature != null)) {
       targetTemp = "${entity.temperature}";
-    } else if ((entity.supportTargetTemperatureLow) &&
-        (entity.targetLow != null)) {
-      targetTemp = "${entity.targetLow}";
-      if ((entity.supportTargetTemperatureHigh) &&
-          (entity.targetHigh != null)) {
-        targetTemp += " - ${entity.targetHigh}";
-      }
+    } else if ((entity.supportTargetTemperatureRange) &&
+        (entity.targetLow != null) &&
+        (entity.targetHigh != null)) {
+      targetTemp = "${entity.targetLow} - ${entity.targetHigh}";
+    }
+    String displayState = '';
+    if (entity.hvacAction != null) {
+      displayState = "${entity.hvacAction} (${entity.displayState})";
+    } else {
+      displayState = "${entity.displayState}";
+    }
+    if (entity.presetMode != null) {
+      displayState += " - ${entity.presetMode}";
     }
     return Padding(
         padding: EdgeInsets.fromLTRB(
@@ -25,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/climate/widgets/temperature_control_widget.dart

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

lib/entities/cover/cover_entity.class.dart

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

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

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

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) {

lib/entities/date_time/date_time_entity.class.dart

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

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

@@ -27,7 +27,7 @@ class Entity {
     "cold.on": "Cold",
     "cold.off": "Normal",
     "connectivity.on": "Connected",
-    "connectivity.off": "Diconnected",
+    "connectivity.off": "Disconnected",
     "door.on": "Open",
     "door.off": "Closed",
     "garage_door.on": "Open",
@@ -154,7 +154,7 @@ class Entity {
     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);
   }
@@ -216,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

@@ -60,7 +60,7 @@ class EntityWrapper {
           //TODO handle local urls
           Logger.w("Local urls is not supported yet");
         } else {
-          HAUtils.launchURL(uiAction.tapService);
+          Launcher.launchURL(uiAction.tapService);
         }
         break;
       }
@@ -100,7 +100,7 @@ class EntityWrapper {
             //TODO handle local urls
             Logger.w("Local urls is not supported yet");
           } else {
-            HAUtils.launchURL(uiAction.holdService);
+            Launcher.launchURL(uiAction.holdService);
           }
           break;
         }

lib/entities/fan/fan_entity.class.dart

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

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

lib/entities/light/light_entity.class.dart

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

lib/entities/light/widgets/light_controls.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class LightControlsWidget extends StatefulWidget {
 
@@ -17,7 +17,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
   String _tmpEffect;
 
   void _resetState(LightEntity entity) {
-    _tmpBrightness = entity.brightness ?? 0;
+    _tmpBrightness = entity.brightness ?? 1;
     _tmpWhiteValue = entity.whiteValue ?? 0;
     _tmpColorTemp = entity.colorTemp ?? entity.minMireds?.toInt();
     _tmpColor = entity.color ?? _tmpColor;
@@ -28,15 +28,9 @@ 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));
-      }
+      eventBus.fire(new ServiceCallEvent(
+          entity.domain, "turn_on", entity.entityId,
+          {"brightness": _tmpBrightness}));
     });
   }
 
@@ -114,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",
       );
@@ -171,7 +165,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
 
   Widget _buildColorControl(LightEntity entity) {
     if (entity.supportColor) {
-      HSVColor savedColor = HomeAssistantModel.of(context)?.homeAssistant?.savedColor;
+      HSVColor savedColor = HomeAssistant().savedColor;
       return Column(
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
@@ -187,10 +181,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
                 child: Text('Copy color'),
                 onPressed: _tmpColor == null ? null : () {
                   setState(() {
-                    HomeAssistantModel
-                        .of(context)
-                        .homeAssistant
-                        .savedColor = _tmpColor;
+                    HomeAssistant().savedColor = _tmpColor;
                   });
                 },
               ),

lib/entities/lock/lock_entity.class.dart

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

lib/entities/lock/widgets/lock_state.dart

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

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 {
 

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 {
   

lib/entities/select/select_entity.class.dart

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

lib/entities/select/widgets/select_state.dart

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

lib/entities/sensor/sensor_entity.class.dart

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

lib/entities/slider/slider_entity.dart

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

lib/entities/slider/widgets/slider_controls.dart

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

lib/entities/sun/sun_entity.class.dart

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

lib/entities/switch/switch_entity.class.dart

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

lib/entities/switch/widget/switch_state.dart

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

lib/entities/text/text_entity.class.dart

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

lib/entities/text/widgets/text_input_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class TextInputStateWidget extends StatefulWidget {
 
@@ -73,13 +73,7 @@ class _TextInputStateWidgetState extends State<TextInputStateWidget> {
         child: TextField(
             focusNode: _focusNode,
             obscureText: entity.isPasswordField,
-            controller: new TextEditingController.fromValue(
-                new TextEditingValue(
-                    text: _tmpValue,
-                    selection:
-                    new TextSelection.collapsed(offset: _tmpValue.length)
-                )
-            ),
+            controller: TextEditingController.fromValue(TextEditingValue(text: _tmpValue)),
             onChanged: (value) {
               _tmpValue = value;
             }),

lib/entities/timer/timer_entity.class.dart

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

lib/entities/timer/widgets/timer_state.dart

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

lib/entity_widgets/common/badge.dart

@@ -35,25 +35,36 @@ class BadgeWidget extends StatelessWidget {
           break;
         }
       case "device_tracker":
+      case "person":
         {
           badgeIcon = EntityIcon(
               padding: EdgeInsets.all(0.0),
               size: iconSize,
               color: Colors.black
           );
-          onBadgeTextValue = entityModel.entityWrapper.entity.state;
+          onBadgeTextValue = entityModel.entityWrapper.entity.displayState;
           break;
         }
       default:
         {
+          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,112 +16,26 @@ class _CameraStreamViewState extends State<CameraStreamView> {
   }
 
   CameraEntity _entity;
-  String _webHost;
-
-  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 = '$_webHost/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
@@ -131,47 +45,26 @@ class _CameraStreamViewState extends State<CameraStreamView> {
           .of(context)
           .entityWrapper
           .entity;
-      _webHost = HomeAssistantModel.of(context).homeAssistant.connection.httpWebHost;
-      _connect();
+      started = true;
     }
-
-    if (binaryImage.isEmpty) {
-      return Column(
-        children: <Widget>[
-          Container(
-              padding: const EdgeInsets.all(20.0),
-              child: const CircularProgressIndicator()
-          )
-        ],
-      );
-    } 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()
-              ),
+    streamUrl = '${ConnectionManager().httpWebHost}/api/camera_proxy_stream/${_entity
+        .entityId}?token=${_entity.attributes['access_token']}';
+    return Column(
+      children: <Widget>[
+        Container(
+            padding: const EdgeInsets.all(20.0),
+            child: IconButton(
+              icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:monitor-screenshot"), color: Colors.amber),
+              iconSize: 50.0,
+              onPressed: () => launchStream(),
             )
-          ],
-        );
-      } else {
-        return Column(
-          children: <Widget>[
-            Image.memory(
-                Uint8List.fromList(binaryImage), gaplessPlayback: true),
-          ],
-        );
-      }
-    }
+        )
+      ],
+    );
   }
 
   @override
   void dispose() {
-    disconnect();
     super.dispose();
   }
 }

lib/entity_widgets/default_entity_container.dart

@@ -15,14 +15,18 @@ class DefaultEntityContainer extends StatelessWidget {
       return MissedEntityWidget();
     }
     if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.DIVIDER) {
-      return Divider();
+      return Divider(
+        color: Colors.black45,
+      );
     }
     if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.SECTION) {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
-          Divider(),
+          Divider(
+            color: Colors.black45,
+          ),
           Text(
               "${entityModel.entityWrapper.entity.displayName}",
             style: TextStyle(color: Colors.blue),

lib/entity_widgets/history_chart/combined_history_chart.dart

@@ -148,7 +148,7 @@ class _CombinedHistoryChartWidgetState extends State<CombinedHistoryChartWidget>
     });
 
     if ((_selectedId == -1) && (numericDataLists.isNotEmpty)) {
-      _selectedId = 0;
+      _selectedId = numericDataLists.length -1;
     }
     List<charts.Series<EntityHistoryMoment, DateTime>> result = [];
     numericDataLists.forEach((attrName, dataList) {
@@ -202,6 +202,11 @@ class _CombinedHistoryChartWidgetState extends State<CombinedHistoryChartWidget>
         _selectedId -= 1;
       });
     }
+    else {
+      setState(() {
+        _selectedId = _parsedHistory.first.data.length - 1;
+      });
+    }
   }
 
   void _selectNext() {
@@ -210,6 +215,12 @@ class _CombinedHistoryChartWidgetState extends State<CombinedHistoryChartWidget>
         _selectedId += 1;
       });
     }
+    else {
+      setState(() {
+        _selectedId = 0;
+      });
+
+    }
   }
 
   void _onSelectionChanged(charts.SelectionModel model) {

lib/entity_widgets/history_chart/entity_history.dart

@@ -40,14 +40,14 @@ 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.connection.getHistory(entityId).then((history){
+      ConnectionManager().getHistory(entityId).then((history){
         if (!_disposed) {
           setState(() {
             _history = history.isNotEmpty ? history[0] : [];
@@ -68,13 +68,12 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
 
   @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();
   }

lib/entity_widgets/history_chart/numeric_state_history_chart.dart

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

lib/entity_widgets/history_chart/simple_state_history_chart.dart

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

lib/entity_widgets/model_widgets.dart

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

lib/home_assistant.class.dart

@@ -2,21 +2,20 @@ part of 'main.dart';
 
 class HomeAssistant {
 
-  final Connection connection = Connection();
-
-  bool _useLovelace = false;
-  //bool isSettingsLoaded = false;
-
-
+  static final HomeAssistant _instance = HomeAssistant._internal();
 
+  factory HomeAssistant() {
+    return _instance;
+  }
 
   EntityCollection entities;
   HomeAssistantUI ui;
   Map _instanceConfig = {};
   String _userName;
-  String hostname;
   HSVColor savedColor;
 
+  String fcmToken;
+
   Map _rawLovelaceData;
 
   List<Panel> panels = [];
@@ -24,7 +23,7 @@ class HomeAssistant {
   Duration fetchTimeout = Duration(seconds: 30);
 
   String get locationName {
-    if (_useLovelace) {
+    if (ConnectionManager().useLovelace) {
       return ui?.title ?? "";
     } else {
       return _instanceConfig["location_name"] ?? "";
@@ -34,49 +33,43 @@ class HomeAssistant {
   String get userAvatarText => userName.length > 0 ? userName[0] : "";
   bool get isNoEntities => entities == null || entities.isEmpty;
   bool get isNoViews => ui == null || ui.isEmpty;
-  //int get viewsCount => entities.views.length ?? 0;
+  bool get isMobileAppEnabled => _instanceConfig["components"] != null && (_instanceConfig["components"] as List).contains("mobile_app");
 
-  HomeAssistant();
-
-  Completer _connectCompleter;
-
-  Future init() {
-    if (_connectCompleter != null && !_connectCompleter.isCompleted) {
-      Logger.w("Previous connection pending...");
-      return _connectCompleter.future;
-    }
-    Logger.d("init...");
-    _connectCompleter = Completer();
-    connection.init(_handleEntityStateChange).then((_) {
-      SharedPreferences.getInstance().then((prefs) {
-        if (entities == null) entities = EntityCollection(connection.httpWebHost);
-        _useLovelace = prefs.getBool('use-lovelace') ?? true;
-        _connectCompleter.complete();
-      }).catchError((e) => _connectCompleter.completeError(e));
-    }).catchError((e) => _connectCompleter.completeError(e));
-    return _connectCompleter.future;
+  HomeAssistant._internal() {
+    ConnectionManager().onStateChangeCallback = _handleEntityStateChange;
+    DeviceInfoManager().loadDeviceInfo();
   }
 
   Completer _fetchCompleter;
 
-  Future fetch() {
+  Future fetchData() {
     if (_fetchCompleter != null && !_fetchCompleter.isCompleted) {
       Logger.w("Previous data fetch is not completed yet");
       return _fetchCompleter.future;
     }
+    if (entities == null) entities = EntityCollection(ConnectionManager().httpWebHost);
     _fetchCompleter = Completer();
     List<Future> futures = [];
     futures.add(_getStates());
-    if (_useLovelace) {
+    if (ConnectionManager().useLovelace) {
       futures.add(_getLovelace());
     }
     futures.add(_getConfig());
     futures.add(_getServices());
     futures.add(_getUserInfo());
     futures.add(_getPanels());
+    futures.add(ConnectionManager().sendSocketMessage(
+      type: "subscribe_events",
+      additionalData: {"event_type": "state_changed"},
+    ));
     Future.wait(futures).then((_) {
-      _createUI();
-      _fetchCompleter.complete();
+      if (isMobileAppEnabled) {
+        _createUI();
+        _fetchCompleter.complete();
+        MobileAppIntegrationManager.checkAppRegistration();
+      } else {
+        _fetchCompleter.completeError(HAError("Mobile app component not found", actions: [HAErrorAction.tryAgain(), HAErrorAction(type: HAErrorActionType.URL ,title: "Help",url: "http://ha-client.homemade.systems/docs#mobile-app-integration")]));
+      }
     }).catchError((e) {
       _fetchCompleter.completeError(e);
     });
@@ -85,50 +78,51 @@ class HomeAssistant {
 
   Future logout() async {
     Logger.d("Logging out...");
-    await connection.logout().then((_) {
+    await ConnectionManager().logout().then((_) {
       ui?.clear();
       entities?.clear();
+      panels?.clear();
     });
   }
 
   Future _getConfig() async {
-    await connection.sendSocketMessage(type: "get_config").then((data) {
+    await ConnectionManager().sendSocketMessage(type: "get_config").then((data) {
       _instanceConfig = Map.from(data);
     }).catchError((e) {
-      throw {"errorCode": 1, "errorMessage": "Error getting config: $e"};
+      throw HAError("Error getting config: ${e}");
     });
   }
 
   Future _getStates() async {
-    await connection.sendSocketMessage(type: "get_states").then(
+    await ConnectionManager().sendSocketMessage(type: "get_states").then(
             (data) => entities.parse(data)
     ).catchError((e) {
-      throw {"errorCode": 1, "errorMessage": "Error getting states: $e"};
+      throw HAError("Error getting states: $e");
     });
   }
 
   Future _getLovelace() async {
-    await connection.sendSocketMessage(type: "lovelace/config").then((data) => _rawLovelaceData = data).catchError((e) {
-      throw {"errorCode": 1, "errorMessage": "Error getting lovelace config: $e"};
+    await ConnectionManager().sendSocketMessage(type: "lovelace/config").then((data) => _rawLovelaceData = data).catchError((e) {
+      throw HAError("Error getting lovelace config: $e");
     });
   }
 
   Future _getUserInfo() async {
     _userName = null;
-    await connection.sendSocketMessage(type: "auth/current_user").then((data) => _userName = data["name"]).catchError((e) {
+    await ConnectionManager().sendSocketMessage(type: "auth/current_user").then((data) => _userName = data["name"]).catchError((e) {
       Logger.w("Can't get user info: ${e}");
     });
   }
 
   Future _getServices() async {
-    await connection.sendSocketMessage(type: "get_services").then((data) => Logger.d("Services received")).catchError((e) {
+    await ConnectionManager().sendSocketMessage(type: "get_services").then((data) => Logger.d("Services received")).catchError((e) {
       Logger.w("Can't get services: ${e}");
     });
   }
 
   Future _getPanels() async {
     panels.clear();
-    await connection.sendSocketMessage(type: "get_panels").then((data) {
+    await ConnectionManager().sendSocketMessage(type: "get_panels").then((data) {
       data.forEach((k,v) {
         String title = v['title'] == null ? "${k[0].toUpperCase()}${k.substring(1)}" : "${v['title'][0].toUpperCase()}${v['title'].substring(1)}";
         panels.add(Panel(
@@ -142,17 +136,19 @@ class HomeAssistant {
         );
       });
     }).catchError((e) {
-      throw {"errorCode": 1, "errorMessage": "Error getting panels list: $e"};
+      throw HAError("Error getting panels list: $e");
     });
   }
 
   void _handleEntityStateChange(Map eventData) {
     //TheLogger.debug( "New state for ${eventData['entity_id']}");
-    Map data = Map.from(eventData);
-    eventBus.fire(new StateChangedEvent(
-      entityId: data["entity_id"],
-      needToRebuildUI: entities.updateState(data)
-    ));
+    if (_fetchCompleter.isCompleted) {
+      Map data = Map.from(eventData);
+      eventBus.fire(new StateChangedEvent(
+          entityId: data["entity_id"],
+          needToRebuildUI: entities.updateState(data)
+      ));
+    }
   }
 
   void _parseLovelace() {
@@ -190,31 +186,25 @@ 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'] ?? CardType.entities,
+            columnsCount: rawCardInfo['columns'] ?? 4,
+            showName: rawCardInfo['show_name'] ?? true,
+            showState: rawCardInfo['show_state'] ?? true,
+            showEmpty: rawCardInfo['show_empty'] ?? true,
+            stateFilter: rawCardInfo['state_filter'] ?? [],
+            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)));
@@ -277,15 +267,15 @@ class HomeAssistant {
             }
           }
         });
-        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 {
@@ -315,7 +305,7 @@ class HomeAssistant {
 
   void _createUI() {
     ui = HomeAssistantUI();
-    if ((_useLovelace) && (_rawLovelaceData != null)) {
+    if ((ConnectionManager().useLovelace) && (_rawLovelaceData != null)) {
       Logger.d("Creating Lovelace UI");
       _parseLovelace();
     } else {

lib/main.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 import 'dart:async';
-import 'dart:typed_data';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -15,33 +14,37 @@ import 'package:http/http.dart' as http;
 import 'package:charts_flutter/flutter.dart' as charts;
 import 'package:progress_indicators/progress_indicators.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_custom_tabs/flutter_custom_tabs.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:device_info/device_info.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:in_app_purchase/in_app_purchase.dart';
 
-part 'entity_class/const.dart';
-part 'entity_class/entity.class.dart';
-part 'entity_class/entity_wrapper.class.dart';
-part 'entity_class/timer_entity.dart';
-part 'entity_class/switch_entity.class.dart';
-part 'entity_class/button_entity.class.dart';
-part 'entity_class/text_entity.class.dart';
-part 'entity_class/climate_entity.class.dart';
-part 'entity_class/cover_entity.class.dart';
-part 'entity_class/date_time_entity.class.dart';
-part 'entity_class/light_entity.class.dart';
-part 'entity_class/select_entity.class.dart';
-part 'entity_class/other_entity.class.dart';
-part 'entity_class/slider_entity.dart';
-part 'entity_class/media_player_entity.class.dart';
-part 'entity_class/lock_entity.class.dart';
-part 'entity_class/group_entity.class.dart';
-part 'entity_class/fan_entity.class.dart';
-part 'entity_class/automation_entity.dart';
-part 'entity_class/camera_entity.class.dart';
-part 'entity_class/alarm_control_panel.class.dart';
+part 'const.dart';
+part 'utils/launcher.dart';
+part 'entities/entity.class.dart';
+part 'entities/entity_wrapper.class.dart';
+part 'entities/timer/timer_entity.class.dart';
+part 'entities/switch/switch_entity.class.dart';
+part 'entities/button/button_entity.class.dart';
+part 'entities/text/text_entity.class.dart';
+part 'entities/climate/climate_entity.class.dart';
+part 'entities/cover/cover_entity.class.dart';
+part 'entities/date_time/date_time_entity.class.dart';
+part 'entities/light/light_entity.class.dart';
+part 'entities/select/select_entity.class.dart';
+part 'entities/sun/sun_entity.class.dart';
+part 'entities/sensor/sensor_entity.class.dart';
+part 'entities/slider/slider_entity.dart';
+part 'entities/media_player/media_player_entity.class.dart';
+part 'entities/lock/lock_entity.class.dart';
+part 'entities/group/group_entity.class.dart';
+part 'entities/fan/fan_entity.class.dart';
+part 'entities/automation/automation_entity.class.dart';
+part 'entities/camera/camera_entity.class.dart';
+part 'entities/alarm_control_panel/alarm_control_panel_entity.class.dart';
 part 'entity_widgets/common/badge.dart';
 part 'entity_widgets/model_widgets.dart';
 part 'entity_widgets/default_entity_container.dart';
@@ -66,32 +69,41 @@ part 'entity_widgets/history_chart/numeric_state_history_chart.dart';
 part 'entity_widgets/history_chart/combined_history_chart.dart';
 part 'entity_widgets/history_chart/history_control_widget.dart';
 part 'entity_widgets/history_chart/entity_history_moment.dart';
-part 'entity_widgets/state/switch_state.dart';
-part 'entity_widgets/controls/slider_controls.dart';
-part 'entity_widgets/state/text_input_state.dart';
-part 'entity_widgets/state/select_state.dart';
-part 'entity_widgets/state/simple_state.dart';
-part 'entity_widgets/state/timer_state.dart';
-part 'entity_widgets/state/climate_state.dart';
-part 'entity_widgets/state/cover_state.dart';
-part 'entity_widgets/state/date_time_state.dart';
-part 'entity_widgets/state/lock_state.dart';
-part 'entity_widgets/controls/climate_controls.dart';
-part 'entity_widgets/controls/cover_controls.dart';
-part 'entity_widgets/controls/light_controls.dart';
-part 'entity_widgets/controls/media_player_widgets.dart';
-part 'entity_widgets/controls/fan_controls.dart';
-part 'entity_widgets/controls/alarm_control_panel_controls.dart';
-part 'settings.page.dart';
-part 'panel.page.dart';
+part 'entities/switch/widget/switch_state.dart';
+part 'entities/slider/widgets/slider_controls.dart';
+part 'entities/text/widgets/text_input_state.dart';
+part 'entities/select/widgets/select_state.dart';
+part 'entity_widgets/common/simple_state.dart';
+part 'entities/timer/widgets/timer_state.dart';
+part 'entities/climate/widgets/climate_state.widget.dart';
+part 'entities/cover/widgets/cover_state.dart';
+part 'entities/date_time/widgets/date_time_state.dart';
+part 'entities/lock/widgets/lock_state.dart';
+part 'entities/climate/widgets/climate_controls.dart';
+part 'entities/climate/widgets/temperature_control_widget.dart';
+part 'entities/cover/widgets/cover_controls.widget.dart';
+part 'entities/light/widgets/light_controls.dart';
+part 'entities/media_player/widgets/media_player_widgets.dart';
+part 'entities/fan/widgets/fan_controls.dart';
+part 'entities/alarm_control_panel/widgets/alarm_control_panel_controls.widget.dart';
+part 'pages/settings.page.dart';
+part 'pages/purchase.page.dart';
+part 'pages/widgets/product_purchase.widget.dart';
+part 'pages/widgets/page_loading_indicator.dart';
+part 'pages/widgets/page_loading_error.dart';
+part 'pages/panel.page.dart';
+part 'pages/main.page.dart';
 part 'home_assistant.class.dart';
-part 'log.page.dart';
-part 'entity.page.dart';
-part 'utils.class.dart';
+part 'pages/log.page.dart';
+part 'pages/entity.page.dart';
 part 'mdi.class.dart';
 part 'entity_collection.class.dart';
-part 'auth_manager.class.dart';
-part 'connection.class.dart';
+part 'managers/auth_manager.class.dart';
+part 'managers/location_manager.class.dart';
+part 'managers/mobile_app_integration_manager.class.dart';
+part 'managers/connection_manager.class.dart';
+part 'managers/device_info_manager.class.dart';
+part 'managers/startup_user_messages_manager.class.dart';
 part 'ui_class/ui.dart';
 part 'ui_class/view.class.dart';
 part 'ui_class/card.class.dart';
@@ -100,14 +112,20 @@ part 'ui_class/panel_class.dart';
 part 'ui_widgets/view.dart';
 part 'ui_widgets/card_widget.dart';
 part 'ui_widgets/card_header_widget.dart';
-part 'ui_widgets/config_panel_widget.dart';
+part 'panels/config_panel_widget.dart';
+part 'panels/widgets/link_to_web_config.dart';
+part 'utils/logger.dart';
+part 'types/ha_error.dart';
+part 'types/event_bus_events.dart';
 
 
 EventBus eventBus = new EventBus();
+final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
+FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = new FlutterLocalNotificationsPlugin();
 const String appName = "HA Client";
-const appVersion = "0.6.0-alpha1";
+const appVersion = "0.6.5";
 
-void main() {
+void main() async {
   FlutterError.onError = (errorDetails) {
     Logger.e( "${errorDetails.exception}");
     if (Logger.isInDebugMode) {
@@ -116,7 +134,11 @@ void main() {
   };
 
   runZoned(() {
-    runApp(new HAClientApp());
+    //AndroidAlarmManager.initialize().then((_) {
+      runApp(new HAClientApp());
+    //  print("Running MAIN isolate ${Isolate.current.hashCode}");
+    //});
+
   }, onError: (error, stack) {
     Logger.e("$error");
     Logger.e("$stack");
@@ -128,7 +150,6 @@ void main() {
 
 class HAClientApp extends StatelessWidget {
 
-  final HomeAssistant homeAssistant = HomeAssistant();
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
@@ -139,628 +160,39 @@ class HAClientApp extends StatelessWidget {
       ),
       initialRoute: "/",
       routes: {
-        "/": (context) => MainPage(title: 'HA Client', homeAssistant: homeAssistant,),
+        "/": (context) => MainPage(title: 'HA Client'),
         "/connection-settings": (context) => ConnectionSettingsPage(title: "Settings"),
-        "/configuration": (context) => PanelPage(title: "Configuration"),
-        "/log-view": (context) => LogViewPage(title: "Log")
-      },
-    );
-  }
-}
-
-class MainPage extends StatefulWidget {
-  MainPage({Key key, this.title, this.homeAssistant}) : super(key: key);
-
-  final String title;
-  final HomeAssistant homeAssistant;
-
-  @override
-  _MainPageState createState() => new _MainPageState();
-}
-
-class _MainPageState extends State<MainPage> with WidgetsBindingObserver, TickerProviderStateMixin {
-
-  StreamSubscription _stateSubscription;
-  StreamSubscription _settingsSubscription;
-  StreamSubscription _serviceCallSubscription;
-  StreamSubscription _showEntityPageSubscription;
-  StreamSubscription _showErrorSubscription;
-  StreamSubscription _startAuthSubscription;
-  StreamSubscription _reloadUISubscription;
-  int _previousViewCount;
-  //final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
-
-  @override
-  void initState() {
-    super.initState();
-    //widget.homeAssistant = HomeAssistant();
-    //_settingsLoaded = false;
-    WidgetsBinding.instance.addObserver(this);
-
-    _settingsSubscription = eventBus.on<SettingsChangedEvent>().listen((event) {
-      Logger.d("Settings change event: reconnect=${event.reconnect}");
-      if (event.reconnect) {
-        _reLoad();
-      }
-    });
-
-    _initialLoad();
-  }
-
-  void _initialLoad() {
-    _showInfoBottomBar(progress: true,);
-    _subscribe();
-    widget.homeAssistant.init().then((_){
-      _fetchData();
-    }, onError: (e) {
-      _setErrorState(e);
-    });
-  }
-
-  void _reLoad() {
-    _hideBottomBar();
-    _showInfoBottomBar(progress: true,);
-    widget.homeAssistant.init().then((_){
-      _fetchData();
-    }, onError: (e) {
-      _setErrorState(e);
-    });
-  }
-
-  _fetchData() async {
-    await widget.homeAssistant.fetch().then((_) {
-      _hideBottomBar();
-      int currentViewCount = widget.homeAssistant.ui?.views?.length ?? 0;
-      if (_previousViewCount != currentViewCount) {
-        Logger.d("Views count changed ($_previousViewCount->$currentViewCount). Creating new tabs controller.");
-        _viewsTabController = TabController(vsync: this, length: currentViewCount);
-        _previousViewCount = currentViewCount;
-      }
-    }).catchError((e) {
-      _setErrorState(e);
-    });
-    eventBus.fire(RefreshDataFinishedEvent());
-  }
-
-  @override
-  void didChangeAppLifecycleState(AppLifecycleState state) {
-    Logger.d("$state");
-    if (state == AppLifecycleState.resumed) {
-      _reLoad();
-    }
-  }
-
-  _subscribe() {
-    if (_stateSubscription == null) {
-      _stateSubscription = eventBus.on<StateChangedEvent>().listen((event) {
-        if (event.needToRebuildUI) {
-          Logger.d("New entity. Need to rebuild UI");
-          _reLoad();
-        } else {
-          setState(() {});
-        }
-      });
-    }
-    if (_reloadUISubscription == null) {
-      _reloadUISubscription = eventBus.on<ReloadUIEvent>().listen((event){
-        _reLoad();
-      });
-    }
-    if (_serviceCallSubscription == null) {
-      _serviceCallSubscription =
-          eventBus.on<ServiceCallEvent>().listen((event) {
-            _callService(event.domain, event.service, event.entityId,
-                event.additionalParams);
-          });
-    }
-
-    if (_showEntityPageSubscription == null) {
-      _showEntityPageSubscription =
-          eventBus.on<ShowEntityPageEvent>().listen((event) {
-            _showEntityPage(event.entity.entityId);
-          });
-    }
-
-    if (_showErrorSubscription == null) {
-      _showErrorSubscription = eventBus.on<ShowErrorEvent>().listen((event){
-        _showErrorBottomBar(message: event.text, errorCode: event.errorCode);
-      });
-    }
-
-    if (_startAuthSubscription == null) {
-      _startAuthSubscription = eventBus.on<StartAuthEvent>().listen((event){
-        _showOAuth();
-      });
-    }
-
-
-
-    /*_firebaseMessaging.getToken().then((String token) {
-      //Logger.d("FCM token: $token");
-      widget.homeAssistant.sendHTTPPost(
-          endPoint: '/api/notify.fcm-android',
-          jsonData:  '{"token": "$token"}'
-      );
-    });
-    _firebaseMessaging.configure(
-        onLaunch: (data) {
-          Logger.d("Notification [onLaunch]: $data");
-        },
-        onMessage: (data) {
-          Logger.d("Notification [onMessage]: $data");
-        },
-        onResume: (data) {
-          Logger.d("Notification [onResume]: $data");
-        }
-    );*/
-  }
-
-  void _showOAuth() {
-    Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => WebviewScaffold(
-            url: "${widget.homeAssistant.connection.oauthUrl}",
-            appBar: new AppBar(
-              leading: IconButton(
-                  icon: Icon(Icons.help),
-                  onPressed: () => HAUtils.launchURLInCustomTab(context, "http://ha-client.homemade.systems/docs#authentication")
-              ),
-              title: new Text("Login to your Home Assistant"),
+        "/putchase": (context) => PurchasePage(title: "Support app development"),
+        "/log-view": (context) => LogViewPage(title: "Log"),
+        "/login": (context) => WebviewScaffold(
+          url: "${ConnectionManager().oauthUrl}",
+          appBar: new AppBar(
+            leading: IconButton(
+                icon: Icon(Icons.help),
+                onPressed: () => Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.homemade.systems/docs#authentication")
             ),
-          ),
-        )
-    );
-  }
-
-  _setErrorState(e) {
-    if (e is Error) {
-      Logger.e(e.toString());
-      Logger.e("${e.stackTrace}");
-      _showErrorBottomBar(
-          message: "Unknown error",
-          errorCode: 13
-      );
-    } else {
-      _showErrorBottomBar(
-          message: e != null ? e["errorMessage"] ?? "$e" : "Unknown error",
-          errorCode: e["errorCode"] != null ? e["errorCode"] : 99
-      );
-    }
-  }
-
-  void _callService(String domain, String service, String entityId, Map additionalParams) {
-    _showInfoBottomBar(
-      message: "Calling $domain.$service",
-      duration: Duration(seconds: 3)
-    );
-    widget.homeAssistant.connection.callService(domain: domain, service: service, entityId: entityId, additionalServiceData: additionalParams).catchError((e) => _setErrorState(e));
-  }
-
-  void _showEntityPage(String entityId) {
-    Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => EntityViewPage(entityId: entityId, homeAssistant: widget.homeAssistant),
-        )
-    );
-  }
-
-  List<Tab> buildUIViewTabs() {
-    List<Tab> result = [];
-
-      if (widget.homeAssistant.ui.views.isNotEmpty) {
-        widget.homeAssistant.ui.views.forEach((HAView view) {
-          result.add(view.buildTab());
-        });
-      }
-
-    return result;
-  }
-
-  Drawer _buildAppDrawer() {
-    List<Widget> menuItems = [];
-    menuItems.add(
-        UserAccountsDrawerHeader(
-          accountName: Text(widget.homeAssistant.userName),
-          accountEmail: Text(widget.homeAssistant.hostname ?? "Not configured"),
-          /*onDetailsPressed: () {
-            setState(() {
-              _accountMenuExpanded = !_accountMenuExpanded;
-            });
-          },*/
-          currentAccountPicture: CircleAvatar(
-            child: Text(
-              widget.homeAssistant.userAvatarText,
-              style: TextStyle(
-                  fontSize: 32.0
-              ),
-            ),
-          ),
-        )
-    );
-      if (widget.homeAssistant.panels.isNotEmpty) {
-        widget.homeAssistant.panels.forEach((Panel panel) {
-          if (!panel.isHidden) {
-            menuItems.add(
-                new ListTile(
-                    leading: Icon(MaterialDesignIcons.getIconDataFromIconName(panel.icon)),
-                    title: Text("${panel.title}"),
-                    onTap: () => panel.handleOpen(context)
-                )
-            );
-          }
-        });
-      }
-      //TODO check for loaded
-      menuItems.add(
-          new ListTile(
-            leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:home-assistant")),
-            title: Text("Open Web UI"),
-            onTap: () => HAUtils.launchURL(widget.homeAssistant.connection.httpWebHost),
-          )
-      );
-      menuItems.addAll([
-        Divider(),
-        ListTile(
-          leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:login-variant")),
-          title: Text("Connection settings"),
-          onTap: () {
-            Navigator.of(context).pop();
-            Navigator.of(context).pushNamed('/connection-settings', arguments: {"homeAssistant", widget.homeAssistant});
-          },
-        )
-      ]);
-      menuItems.addAll([
-        Divider(),
-        new ListTile(
-          leading: Icon(Icons.insert_drive_file),
-          title: Text("Log"),
-          onTap: () {
-            Navigator.of(context).pop();
-            Navigator.of(context).pushNamed('/log-view');
-          },
-        ),
-        new ListTile(
-          leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:github-circle")),
-          title: Text("Report an issue"),
-          onTap: () {
-            Navigator.of(context).pop();
-            HAUtils.launchURL("https://github.com/estevez-dev/ha_client/issues/new");
-          },
-        ),
-        Divider(),
-        new ListTile(
-          leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:discord")),
-          title: Text("Join Discord server"),
-          onTap: () {
-            Navigator.of(context).pop();
-            HAUtils.launchURL("https://discord.gg/AUzEvwn");
-          },
-        ),
-        new AboutListTile(
-          aboutBoxChildren: <Widget>[
-            GestureDetector(
-              onTap: () {
-                Navigator.of(context).pop();
-                HAUtils.launchURL("http://ha-client.homemade.systems/");
-              },
-              child: Text(
-                "ha-client.homemade.systems",
-                style: TextStyle(
-                  color: Colors.blue,
-                  decoration: TextDecoration.underline
-                ),
-              ),
-            )
-          ],
-          applicationName: appName,
-          applicationVersion: appVersion
-        )
-      ]);
-    return new Drawer(
-      child: ListView(
-        children: menuItems,
-      ),
-    );
-  }
-
-  void _hideBottomBar() {
-    //_scaffoldKey?.currentState?.hideCurrentSnackBar();
-    setState(() {
-      _showBottomBar = false;
-    });
-  }
-
-  Widget _bottomBarAction;
-  bool _showBottomBar = false;
-  String _bottomBarText;
-  bool _bottomBarProgress;
-  Color _bottomBarColor;
-  Timer _bottomBarTimer;
-
-  void _showInfoBottomBar({String message, bool progress: false, Duration duration}) {
-    _bottomBarTimer?.cancel();
-    _bottomBarAction = Container(height: 0.0, width: 0.0,);
-    _bottomBarColor = Colors.grey.shade50;
-    setState(() {
-      _bottomBarText = message;
-      _bottomBarProgress = progress;
-      _showBottomBar = true;
-    });
-    if (duration != null) {
-      _bottomBarTimer = Timer(duration, () {
-        _hideBottomBar();
-      });
-    }
-  }
-
-  void _showErrorBottomBar({Key key, @required String message, @required int errorCode}) {
-    TextStyle textStyle = TextStyle(
-      color: Colors.blue,
-      fontSize: Sizes.nameFontSize
-    );
-    _bottomBarColor = Colors.red.shade100;
-      switch (errorCode) {
-        case 9:
-        case 11:
-        case 7:
-        case 1: {
-        _bottomBarAction = FlatButton(
-                child: Text("Retry", style: textStyle),
-                onPressed: () {
-                  //_scaffoldKey?.currentState?.hideCurrentSnackBar();
-                  _reLoad();
-                },
-            );
-            break;
-          }
-
-        case 5: {
-          message = "Check connection settings";
-          _bottomBarAction = FlatButton(
-              child: Text("Open", style: textStyle),
-            onPressed: () {
-              //_scaffoldKey?.currentState?.hideCurrentSnackBar();
-              Navigator.pushNamed(context, '/connection-settings');
-            },
-          );
-          break;
-        }
-
-        case 60: {
-          _bottomBarAction = FlatButton(
-              child: Text("Login", style: textStyle),
-            onPressed: () {
-              _reLoad();
-            },
-          );
-          break;
-        }
-
-        case 63:
-        case 61: {
-          _bottomBarAction = FlatButton(
-            child: Text("Try again", style: textStyle),
-            onPressed: () {
-              _reLoad();
-            },
-          );
-          break;
-        }
-
-        case 62: {
-          _bottomBarAction = FlatButton(
-            child: Text("Login again", style: textStyle),
-            onPressed: () {
-              _reLoad();
-            },
-          );
-          break;
-        }
-
-        case 10: {
-          _bottomBarAction = FlatButton(
-              child: Text("Refresh", style: textStyle),
-            onPressed: () {
-              //_scaffoldKey?.currentState?.hideCurrentSnackBar();
-              _reLoad();
-            },
-          );
-          break;
-        }
-
-        case 82:
-        case 81:
-        case 8: {
-          _bottomBarAction = FlatButton(
-              child: Text("Reconnect", style: textStyle),
-            onPressed: () {
-              _reLoad();
-            },
-          );
-          break;
-        }
-
-        default: {
-          _bottomBarAction = Container(width: 0.0, height: 0.0,);
-          break;
-        }
-      }
-      setState(() {
-        _bottomBarProgress = false;
-        _bottomBarText = "$message";
-        _showBottomBar = true;
-      });
-  }
-
-  final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
-
-  Widget _buildScaffoldBody(bool empty) {
-    List<PopupMenuItem<String>> popupMenuItems = [];
-    popupMenuItems.add(PopupMenuItem<String>(
-      child: new Text("Reload"),
-      value: "reload",
-    ));
-    if (widget.homeAssistant.connection.isAuthenticated) {
-      popupMenuItems.add(
-          PopupMenuItem<String>(
-            child: new Text("Logout"),
-            value: "logout",
-          ));
-    }
-    return NestedScrollView(
-      headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
-        return <Widget>[
-          SliverAppBar(
-            floating: true,
-            pinned: true,
-            primary: true,
-            title: Text(widget.homeAssistant.locationName ?? ""),
+            title: new Text("Login with HA"),
             actions: <Widget>[
-              IconButton(
-                icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
-                    "mdi:dots-vertical"), color: Colors.white,),
+              FlatButton(
+                child: Text("Manual", style: TextStyle(color: Colors.white)),
                 onPressed: () {
-                  showMenu(
-                    position: RelativeRect.fromLTRB(MediaQuery.of(context).size.width, 70.0, 0.0, 0.0),
-                    context: context,
-                    items: popupMenuItems
-                  ).then((String val) {
-                    if (val == "reload") {
-                      _reLoad();
-                    } else if (val == "logout") {
-                      widget.homeAssistant.logout().then((_) {
-                        _reLoad();
-                      });
-                    }
-                  });
-                }
+                  eventBus.fire(ShowPageEvent(path: "/connection-settings", goBackFirst: true));
+                },
               )
             ],
-            leading: IconButton(
-              icon: Icon(Icons.menu),
-              onPressed: () {
-                _scaffoldKey.currentState.openDrawer();
-              },
-            ),
-            bottom: empty ? null : TabBar(
-              controller: _viewsTabController,
-              tabs: buildUIViewTabs(),
-              isScrollable: true,
-            ),
           ),
-
-        ];
-      },
-      body: empty ?
-      Center(
-        child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Icon(
-                MaterialDesignIcons.getIconDataFromIconName("mdi:border-none-variant"),
-                size: 100.0,
-                color: Colors.black26,
-              ),
-            ]
         ),
-      )
-          :
-      widget.homeAssistant.buildViews(context, _viewsTabController),
+        "/webview": (context) => WebviewScaffold(
+          url: "${(ModalRoute.of(context).settings.arguments as Map)['url']}",
+          appBar: new AppBar(
+            leading: IconButton(
+                icon: Icon(Icons.arrow_back),
+                onPressed: () => Navigator.of(context).pop()
+            ),
+            title: new Text("${(ModalRoute.of(context).settings.arguments as Map)['title']}"),
+          ),
+        )
+      },
     );
   }
-
-  TabController _viewsTabController;
-
-  @override
-  Widget build(BuildContext context) {
-    Widget bottomBar;
-    if (_showBottomBar) {
-      List<Widget> bottomBarChildren = [];
-      if (_bottomBarText != null) {
-        bottomBarChildren.add(
-          Padding(
-            padding: EdgeInsets.fromLTRB(
-                Sizes.leftWidgetPadding, Sizes.rowPadding, 0.0,
-                Sizes.rowPadding),
-            child: Text(
-              "$_bottomBarText",
-              textAlign: TextAlign.left,
-              softWrap: true,
-            ),
-          )
-
-        );
-      }
-      if (_bottomBarProgress) {
-        bottomBarChildren.add(
-          CollectionScaleTransition(
-            children: <Widget>[
-              Icon(Icons.stop, size: 10.0, color: EntityColor.stateColor(EntityState.on),),
-              Icon(Icons.stop, size: 10.0, color: EntityColor.stateColor(EntityState.unavailable),),
-              Icon(Icons.stop, size: 10.0, color: EntityColor.stateColor(EntityState.off),),
-            ],
-          ),
-        );
-      }
-      if (bottomBarChildren.isNotEmpty) {
-        bottomBar = Container(
-          color: _bottomBarColor,
-          child: Row(
-            mainAxisSize: MainAxisSize.max,
-            children: <Widget>[
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: _bottomBarProgress ? CrossAxisAlignment.center : CrossAxisAlignment.start,
-                  mainAxisSize: MainAxisSize.min,
-                  children: bottomBarChildren,
-                ),
-              ),
-              _bottomBarAction
-            ],
-          ),
-        );
-      }
-    }
-    // This method is rerun every time setState is called.
-    if (widget.homeAssistant.isNoViews) {
-      return Scaffold(
-        key: _scaffoldKey,
-        primary: false,
-        drawer: _buildAppDrawer(),
-        bottomNavigationBar: bottomBar,
-        body: _buildScaffoldBody(true)
-      );
-    } else {
-      return Scaffold(
-        key: _scaffoldKey,
-        drawer: _buildAppDrawer(),
-        primary: false,
-        bottomNavigationBar: bottomBar,
-        body: HomeAssistantModel(
-          child: _buildScaffoldBody(false),
-          homeAssistant: widget.homeAssistant
-        ),
-      );
-    }
-  }
-
-  @override
-  void dispose() {
-    final flutterWebviewPlugin = new FlutterWebviewPlugin();
-    flutterWebviewPlugin.dispose();
-    WidgetsBinding.instance.removeObserver(this);
-    _viewsTabController?.dispose();
-    _stateSubscription?.cancel();
-    _settingsSubscription?.cancel();
-    _serviceCallSubscription?.cancel();
-    _showEntityPageSubscription?.cancel();
-    _showErrorSubscription?.cancel();
-    _startAuthSubscription?.cancel();
-    _reloadUISubscription?.cancel();
-    //TODO disconnect
-    //widget.homeAssistant?.disconnect();
-    super.dispose();
-  }
-}
+}

lib/managers/auth_manager.class.dart

@@ -1,4 +1,4 @@
-part of 'main.dart';
+part of '../main.dart';
 
 class AuthManager {
 
@@ -10,34 +10,35 @@ class AuthManager {
 
   AuthManager._internal();
 
-  Future getTempToken({String httpWebHost, String oauthUrl}) {
+  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(
-            host: httpWebHost,
+        ConnectionManager().sendHTTPPost(
             endPoint: "/auth/token",
             contentType: "application/x-www-form-urlencoded",
             includeAuthHeader: false,
             data: "grant_type=authorization_code&code=$authCode&client_id=${Uri.encodeComponent('http://ha-client.homemade.systems/')}"
         ).then((response) {
-          Logger.d("Gottemp token");
+          Logger.d("Got temp token");
           String tempToken = json.decode(response)['access_token'];
           Logger.d("Closing webview...");
-          flutterWebviewPlugin.close();
+          //flutterWebviewPlugin.close();
+          eventBus.fire(StartAuthEvent(oauthUrl, false));
           completer.complete(tempToken);
         }).catchError((e) {
-          flutterWebviewPlugin.close();
-          completer.completeError({"errorCode": 61, "errorMessage": "Error getting temp token"});
+          //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));
+    Logger.d("Launching OAuth");
+    eventBus.fire(StartAuthEvent(oauthUrl, true));
     return completer.future;
   }
 

lib/managers/connection_manager.class.dart

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

lib/managers/device_info_manager.class.dart

@@ -0,0 +1,29 @@
+part of '../main.dart';
+
+class DeviceInfoManager {
+
+  static final DeviceInfoManager _instance = DeviceInfoManager._internal();
+
+  factory DeviceInfoManager() {
+    return _instance;
+  }
+
+  String unicDeviceId;
+  String manufacturer;
+  String model;
+  String osName;
+  String osVersion;
+
+  DeviceInfoManager._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/managers/location_manager.class.dart

@@ -0,0 +1,5 @@
+part of '../main.dart';
+
+class LocationManager {
+
+}

lib/managers/mobile_app_integration_manager.class.dart

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

lib/managers/startup_user_messages_manager.class.dart

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

lib/mdi.class.dart

@@ -24,10 +24,12 @@ class MaterialDesignIcons {
     "cover.opening": "mdi:window-open",
     "camera": "mdi:cctv",
     "calendar": "mdi:calendar",
+    "device_tracker": "mdi:account",
     "timer": "mdi:timer",
     "lock.locked": "mdi:lock",
     "lock.unlocked": "mdi:lock-open",
     "fan": "mdi:fan",
+    "remote": "mdi:remote",
     "alarm_control_panel.disarmed" : "mdi:bell-outline",
     "alarm_control_panel.armed_home" : "mdi:bell-plus",
     "alarm_control_panel.armed_away" : "mdi:bell",
@@ -64,18 +66,18 @@ class MaterialDesignIcons {
     "binary_sensor.occupancy.off": "mdi:home-outline",
     "binary_sensor.opening.on": "mdi:square-outline",
     "binary_sensor.opening.off": "mdi:square",
-    //"binary_sensor.plug.on": "mdi:",
-    //"binary_sensor.plug.off": "mdi:",
+    "binary_sensor.plug.on": "mdi:power-plug",
+    "binary_sensor.plug.off": "mdi:power-plug-off",
     "binary_sensor.power.on": "mdi:alert",
-    "binary_sensor.power.off": "mdi:verified",
+    "binary_sensor.power.off": "mdi:shield-check",
     //"binary_sensor.presence.on": "mdi:",
     //"binary_sensor.presence.off": "mdi:",
     "binary_sensor.problem.on": "mdi:alert-outline",
     "binary_sensor.problem.off": "mdi:check-outline",
     "binary_sensor.safety.on": "mdi:alert",
-    "binary_sensor.safety.off": "mdi:verified",
+    "binary_sensor.safety.off": "mdi:shield-check",
     "binary_sensor.smoke.on": "mdi:alert",
-    "binary_sensor.smoke.off": "mdi:verified",
+    "binary_sensor.smoke.off": "mdi:shield-check",
     "binary_sensor.sound.on": "mdi:music-note",
     "binary_sensor.sound.off": "mdi:music-note-off",
     "binary_sensor.vibration.on": "mdi:vibrate",
@@ -96,8 +98,8 @@ class MaterialDesignIcons {
     "cover.window.closing": "mdi:window-open",
     "cover.window.opening": "mdi:window-open",
   };
-  static final Map iconsDataMap = {
 
+  static final Map iconsDataMap = {
     "mdi:access-point": 0xf002,
     "mdi:access-point-network": 0xf003,
     "mdi:access-point-network-off": 0xfbbd,
@@ -111,6 +113,8 @@ class MaterialDesignIcons {
     "mdi:account-badge": 0xfd83,
     "mdi:account-badge-alert": 0xfd84,
     "mdi:account-badge-alert-outline": 0xfd85,
+    "mdi:account-badge-horizontal": 0xfdf0,
+    "mdi:account-badge-horizontal-outline": 0xfdf1,
     "mdi:account-badge-outline": 0xfd86,
     "mdi:account-box": 0xf006,
     "mdi:account-box-multiple": 0xf933,
@@ -492,6 +496,7 @@ class MaterialDesignIcons {
     "mdi:auto-upload": 0xf069,
     "mdi:autorenew": 0xf06a,
     "mdi:av-timer": 0xf06b,
+    "mdi:aws": 0xfdf2,
     "mdi:axe": 0xf8c7,
     "mdi:axis": 0xfd24,
     "mdi:axis-arrow": 0xfd25,
@@ -519,6 +524,10 @@ class MaterialDesignIcons {
     "mdi:backspace-outline": 0xfb38,
     "mdi:backup-restore": 0xf06f,
     "mdi:badminton": 0xf850,
+    "mdi:bag-personal": 0xfdf3,
+    "mdi:bag-personal-off": 0xfdf4,
+    "mdi:bag-personal-off-outline": 0xfdf5,
+    "mdi:bag-personal-outline": 0xfdf6,
     "mdi:balloon": 0xfa25,
     "mdi:ballot": 0xf9c8,
     "mdi:ballot-outline": 0xf9c9,
@@ -626,6 +635,7 @@ class MaterialDesignIcons {
     "mdi:bell-sleep-outline": 0xfa92,
     "mdi:beta": 0xf0a1,
     "mdi:betamax": 0xf9ca,
+    "mdi:biathlon": 0xfdf7,
     "mdi:bible": 0xf0a2,
     "mdi:bike": 0xf0a3,
     "mdi:billiards": 0xfb3d,
@@ -680,6 +690,8 @@ class MaterialDesignIcons {
     "mdi:bookmark-check": 0xf0c1,
     "mdi:bookmark-minus": 0xf9cb,
     "mdi:bookmark-minus-outline": 0xf9cc,
+    "mdi:bookmark-multiple": 0xfdf8,
+    "mdi:bookmark-multiple-outline": 0xfdf9,
     "mdi:bookmark-music": 0xf0c2,
     "mdi:bookmark-off": 0xf9cd,
     "mdi:bookmark-off-outline": 0xf9ce,
@@ -791,6 +803,8 @@ class MaterialDesignIcons {
     "mdi:calendar-heart": 0xf9d1,
     "mdi:calendar-import": 0xfb0a,
     "mdi:calendar-minus": 0xfd38,
+    "mdi:calendar-month": 0xfdfa,
+    "mdi:calendar-month-outline": 0xfdfb,
     "mdi:calendar-multiple": 0xf0f1,
     "mdi:calendar-multiple-check": 0xf0f2,
     "mdi:calendar-multiselect": 0xfa31,
@@ -837,6 +851,8 @@ class MaterialDesignIcons {
     "mdi:camera-party-mode": 0xf105,
     "mdi:camera-rear": 0xf106,
     "mdi:camera-rear-variant": 0xf107,
+    "mdi:camera-retake": 0xfdfc,
+    "mdi:camera-retake-outline": 0xfdfd,
     "mdi:camera-switch": 0xf108,
     "mdi:camera-timer": 0xf109,
     "mdi:camera-wireless": 0xfd92,
@@ -847,6 +863,7 @@ class MaterialDesignIcons {
     "mdi:cannabis": 0xf7a5,
     "mdi:caps-lock": 0xfa9a,
     "mdi:car": 0xf10b,
+    "mdi:car-back": 0xfdfe,
     "mdi:car-battery": 0xf10c,
     "mdi:car-brake-abs": 0xfc23,
     "mdi:car-brake-alert": 0xfc24,
@@ -868,6 +885,7 @@ class MaterialDesignIcons {
     "mdi:car-light-high": 0xfc28,
     "mdi:car-limousine": 0xf8cc,
     "mdi:car-multiple": 0xfb4a,
+    "mdi:car-off": 0xfdff,
     "mdi:car-parking-lights": 0xfd3f,
     "mdi:car-pickup": 0xf7a9,
     "mdi:car-side": 0xf7aa,
@@ -916,6 +934,7 @@ class MaterialDesignIcons {
     "mdi:cassette": 0xf9d3,
     "mdi:cast": 0xf118,
     "mdi:cast-connected": 0xf119,
+    "mdi:cast-education": 0xfe6d,
     "mdi:cast-off": 0xf789,
     "mdi:castle": 0xf11a,
     "mdi:cat": 0xf11b,
@@ -966,6 +985,7 @@ class MaterialDesignIcons {
     "mdi:chat-processing": 0xfb57,
     "mdi:check": 0xf12c,
     "mdi:check-all": 0xf12d,
+    "mdi:check-bold": 0xfe6e,
     "mdi:check-box-multiple-outline": 0xfc2d,
     "mdi:check-box-outline": 0xfc2e,
     "mdi:check-circle": 0xf5e0,
@@ -974,6 +994,9 @@ class MaterialDesignIcons {
     "mdi:check-network": 0xfc2f,
     "mdi:check-network-outline": 0xfc30,
     "mdi:check-outline": 0xf854,
+    "mdi:check-underline": 0xfe70,
+    "mdi:check-underline-circle": 0xfe71,
+    "mdi:check-underline-circle-outline": 0xfe72,
     "mdi:checkbook": 0xfa9c,
     "mdi:checkbox-blank": 0xf12e,
     "mdi:checkbox-blank-circle": 0xf12f,
@@ -1049,6 +1072,7 @@ class MaterialDesignIcons {
     "mdi:circle-slice-7": 0xfaa3,
     "mdi:circle-slice-8": 0xfaa4,
     "mdi:circle-small": 0xf9de,
+    "mdi:circular-saw": 0xfe73,
     "mdi:cisco-webex": 0xf145,
     "mdi:city": 0xf146,
     "mdi:city-variant": 0xfa35,
@@ -1148,6 +1172,11 @@ class MaterialDesignIcons {
     "mdi:collapse-all": 0xfaa5,
     "mdi:collapse-all-outline": 0xfaa6,
     "mdi:color-helper": 0xf179,
+    "mdi:comma": 0xfe74,
+    "mdi:comma-box": 0xfe75,
+    "mdi:comma-box-outline": 0xfe76,
+    "mdi:comma-circle": 0xfe77,
+    "mdi:comma-circle-outline": 0xfe78,
     "mdi:comment": 0xf17a,
     "mdi:comment-account": 0xf17b,
     "mdi:comment-account-outline": 0xf17c,
@@ -1201,6 +1230,8 @@ class MaterialDesignIcons {
     "mdi:content-save-all": 0xf194,
     "mdi:content-save-edit": 0xfcd7,
     "mdi:content-save-edit-outline": 0xfcd8,
+    "mdi:content-save-move": 0xfe79,
+    "mdi:content-save-move-outline": 0xfe7a,
     "mdi:content-save-outline": 0xf817,
     "mdi:content-save-settings": 0xf61b,
     "mdi:content-save-settings-outline": 0xfb13,
@@ -1546,6 +1577,7 @@ class MaterialDesignIcons {
     "mdi:file-cancel-outline": 0xfda3,
     "mdi:file-chart": 0xf215,
     "mdi:file-check": 0xf216,
+    "mdi:file-check-outline": 0xfe7b,
     "mdi:file-cloud": 0xf217,
     "mdi:file-compare": 0xf8a9,
     "mdi:file-delimited": 0xf218,
@@ -1573,9 +1605,11 @@ class MaterialDesignIcons {
     "mdi:file-move": 0xfab8,
     "mdi:file-multiple": 0xf222,
     "mdi:file-music": 0xf223,
+    "mdi:file-music-outline": 0xfe7c,
     "mdi:file-outline": 0xf224,
     "mdi:file-pdf": 0xf225,
     "mdi:file-pdf-box": 0xf226,
+    "mdi:file-pdf-outline": 0xfe7d,
     "mdi:file-percent": 0xf81d,
     "mdi:file-plus": 0xf751,
     "mdi:file-powerpoint": 0xf227,
@@ -1596,6 +1630,7 @@ class MaterialDesignIcons {
     "mdi:file-upload": 0xfa4c,
     "mdi:file-upload-outline": 0xfa4d,
     "mdi:file-video": 0xf22b,
+    "mdi:file-video-outline": 0xfe10,
     "mdi:file-word": 0xf22c,
     "mdi:file-word-box": 0xf22d,
     "mdi:file-xml": 0xf22e,
@@ -1614,6 +1649,9 @@ class MaterialDesignIcons {
     "mdi:fire-truck": 0xf8aa,
     "mdi:firebase": 0xf966,
     "mdi:firefox": 0xf239,
+    "mdi:fireplace": 0xfe11,
+    "mdi:fireplace-off": 0xfe12,
+    "mdi:firework": 0xfe13,
     "mdi:fish": 0xf23a,
     "mdi:flag": 0xf23b,
     "mdi:flag-checkered": 0xf23c,
@@ -1715,6 +1753,7 @@ class MaterialDesignIcons {
     "mdi:format-bold": 0xf264,
     "mdi:format-clear": 0xf265,
     "mdi:format-color-fill": 0xf266,
+    "mdi:format-color-highlight": 0xfe14,
     "mdi:format-color-text": 0xf69d,
     "mdi:format-columns": 0xf8de,
     "mdi:format-float-center": 0xf267,
@@ -1769,6 +1808,7 @@ class MaterialDesignIcons {
     "mdi:format-text": 0xf284,
     "mdi:format-text-rotation-down": 0xfd4f,
     "mdi:format-text-rotation-none": 0xfd50,
+    "mdi:format-text-variant": 0xfe15,
     "mdi:format-text-wrapping-clip": 0xfcea,
     "mdi:format-text-wrapping-overflow": 0xfceb,
     "mdi:format-text-wrapping-wrap": 0xfcec,
@@ -1805,6 +1845,22 @@ class MaterialDesignIcons {
     "mdi:fuse": 0xfc61,
     "mdi:fuse-blade": 0xfc62,
     "mdi:gamepad": 0xf296,
+    "mdi:gamepad-circle": 0xfe16,
+    "mdi:gamepad-circle-down": 0xfe17,
+    "mdi:gamepad-circle-left": 0xfe18,
+    "mdi:gamepad-circle-outline": 0xfe19,
+    "mdi:gamepad-circle-right": 0xfe1a,
+    "mdi:gamepad-circle-up": 0xfe1b,
+    "mdi:gamepad-down": 0xfe1c,
+    "mdi:gamepad-left": 0xfe1d,
+    "mdi:gamepad-right": 0xfe1e,
+    "mdi:gamepad-round": 0xfe1f,
+    "mdi:gamepad-round-down": 0xfe7e,
+    "mdi:gamepad-round-left": 0xfe7f,
+    "mdi:gamepad-round-outline": 0xfe80,
+    "mdi:gamepad-round-right": 0xfe81,
+    "mdi:gamepad-round-up": 0xfe82,
+    "mdi:gamepad-up": 0xfe83,
     "mdi:gamepad-variant": 0xf297,
     "mdi:gantry-crane": 0xfdad,
     "mdi:garage": 0xf6d8,
@@ -1820,6 +1876,7 @@ class MaterialDesignIcons {
     "mdi:gate-or": 0xf8e4,
     "mdi:gate-xnor": 0xf8e5,
     "mdi:gate-xor": 0xf8e6,
+    "mdi:gatsby": 0xfe84,
     "mdi:gauge": 0xf29a,
     "mdi:gauge-empty": 0xf872,
     "mdi:gauge-full": 0xf873,
@@ -1848,7 +1905,8 @@ class MaterialDesignIcons {
     "mdi:ghost": 0xf2a0,
     "mdi:ghost-off": 0xf9f4,
     "mdi:gif": 0xfd54,
-    "mdi:gift": 0xf2a1,
+    "mdi:gift": 0xfe85,
+    "mdi:gift-outline": 0xf2a1,
     "mdi:git": 0xf2a2,
     "mdi:github-box": 0xf2a3,
     "mdi:github-circle": 0xf2a4,
@@ -1915,6 +1973,7 @@ class MaterialDesignIcons {
     "mdi:grid": 0xf2c1,
     "mdi:grid-large": 0xf757,
     "mdi:grid-off": 0xf2c2,
+    "mdi:grill": 0xfe86,
     "mdi:group": 0xf2c3,
     "mdi:guitar-acoustic": 0xf770,
     "mdi:guitar-electric": 0xf2c4,
@@ -1927,6 +1986,7 @@ class MaterialDesignIcons {
     "mdi:hamburger": 0xf684,
     "mdi:hammer": 0xf8e9,
     "mdi:hand": 0xfa4e,
+    "mdi:hand-left": 0xfe87,
     "mdi:hand-okay": 0xfa4f,
     "mdi:hand-peace": 0xfa50,
     "mdi:hand-peace-variant": 0xfa51,
@@ -1934,6 +1994,8 @@ class MaterialDesignIcons {
     "mdi:hand-pointing-left": 0xfa53,
     "mdi:hand-pointing-right": 0xf2c7,
     "mdi:hand-pointing-up": 0xfa54,
+    "mdi:hand-right": 0xfe88,
+    "mdi:hand-saw": 0xfe89,
     "mdi:hanger": 0xf2c8,
     "mdi:hard-hat": 0xf96e,
     "mdi:harddisk": 0xf2ca,
@@ -2070,6 +2132,7 @@ class MaterialDesignIcons {
     "mdi:image-filter-none": 0xf2f6,
     "mdi:image-filter-tilt-shift": 0xf2f7,
     "mdi:image-filter-vintage": 0xf2f8,
+    "mdi:image-frame": 0xfe8a,
     "mdi:image-move": 0xf9f7,
     "mdi:image-multiple": 0xf2f9,
     "mdi:image-off": 0xf82a,
@@ -2095,6 +2158,7 @@ class MaterialDesignIcons {
     "mdi:instapaper": 0xf2ff,
     "mdi:internet-explorer": 0xf300,
     "mdi:invert-colors": 0xf301,
+    "mdi:invert-colors-off": 0xfe8b,
     "mdi:ip": 0xfa5e,
     "mdi:ip-network": 0xfa5f,
     "mdi:ip-network-outline": 0xfc6c,
@@ -2124,6 +2188,7 @@ class MaterialDesignIcons {
     "mdi:keyboard-caps": 0xf30e,
     "mdi:keyboard-close": 0xf30f,
     "mdi:keyboard-off": 0xf310,
+    "mdi:keyboard-off-outline": 0xfe8c,
     "mdi:keyboard-outline": 0xf97a,
     "mdi:keyboard-return": 0xf311,
     "mdi:keyboard-settings": 0xf9f8,
@@ -2175,9 +2240,12 @@ class MaterialDesignIcons {
     "mdi:launch": 0xf327,
     "mdi:lava-lamp": 0xf7d4,
     "mdi:layers": 0xf328,
+    "mdi:layers-minus": 0xfe8d,
     "mdi:layers-off": 0xf329,
     "mdi:layers-off-outline": 0xf9fc,
     "mdi:layers-outline": 0xf9fd,
+    "mdi:layers-plus": 0xfe30,
+    "mdi:layers-remove": 0xfe31,
     "mdi:lead-pencil": 0xf64f,
     "mdi:leaf": 0xf32a,
     "mdi:leaf-maple": 0xfc6f,
@@ -2202,6 +2270,8 @@ class MaterialDesignIcons {
     "mdi:lifebuoy": 0xf87d,
     "mdi:light-switch": 0xf97d,
     "mdi:lightbulb": 0xf335,
+    "mdi:lightbulb-off": 0xfe32,
+    "mdi:lightbulb-off-outline": 0xfe33,
     "mdi:lightbulb-on": 0xf6e7,
     "mdi:lightbulb-on-outline": 0xf6e8,
     "mdi:lightbulb-outline": 0xf336,
@@ -2374,6 +2444,7 @@ class MaterialDesignIcons {
     "mdi:monitor-lock": 0xfdb7,
     "mdi:monitor-multiple": 0xf37a,
     "mdi:monitor-off": 0xfd6c,
+    "mdi:monitor-screenshot": 0xfe34,
     "mdi:monitor-star": 0xfdb8,
     "mdi:more": 0xf37b,
     "mdi:mother-nurse": 0xfcfd,
@@ -2437,8 +2508,11 @@ class MaterialDesignIcons {
     "mdi:new-box": 0xf394,
     "mdi:newspaper": 0xf395,
     "mdi:nfc": 0xf396,
+    "mdi:nfc-off": 0xfe35,
+    "mdi:nfc-search-variant": 0xfe36,
     "mdi:nfc-tap": 0xf397,
     "mdi:nfc-variant": 0xf398,
+    "mdi:nfc-variant-off": 0xfe37,
     "mdi:ninja": 0xf773,
     "mdi:nintendo-switch": 0xf7e0,
     "mdi:nodejs": 0xf399,
@@ -2452,6 +2526,7 @@ class MaterialDesignIcons {
     "mdi:note-plus-outline": 0xf39d,
     "mdi:note-text": 0xf39e,
     "mdi:notebook": 0xf82d,
+    "mdi:notebook-multiple": 0xfe38,
     "mdi:notification-clear-all": 0xf39f,
     "mdi:npm": 0xf6f6,
     "mdi:npm-variant": 0xf98e,
@@ -2573,7 +2648,7 @@ class MaterialDesignIcons {
     "mdi:page-previous-outline": 0xfb8f,
     "mdi:palette": 0xf3d8,
     "mdi:palette-advanced": 0xf3d9,
-    "mdi:palette-outline": 0xfde8,
+    "mdi:palette-outline": 0xfe6c,
     "mdi:palette-swatch": 0xf8b4,
     "mdi:pan": 0xfb90,
     "mdi:pan-bottom-left": 0xfb91,
@@ -2609,6 +2684,7 @@ class MaterialDesignIcons {
     "mdi:paw": 0xf3e9,
     "mdi:paw-off": 0xf657,
     "mdi:paypal": 0xf882,
+    "mdi:pdf-box": 0xfe39,
     "mdi:peace": 0xf883,
     "mdi:pen": 0xf3ea,
     "mdi:pen-lock": 0xfdbe,
@@ -2667,6 +2743,10 @@ class MaterialDesignIcons {
     "mdi:pi-hole": 0xfdcd,
     "mdi:piano": 0xf67c,
     "mdi:pickaxe": 0xf8b6,
+    "mdi:picture-in-picture-bottom-right": 0xfe3a,
+    "mdi:picture-in-picture-bottom-right-outline": 0xfe3b,
+    "mdi:picture-in-picture-top-right": 0xfe3c,
+    "mdi:picture-in-picture-top-right-outline": 0xfe3d,
     "mdi:pier": 0xf886,
     "mdi:pier-crane": 0xf887,
     "mdi:pig": 0xf401,
@@ -2762,7 +2842,10 @@ class MaterialDesignIcons {
     "mdi:presentation-play": 0xf429,
     "mdi:printer": 0xf42a,
     "mdi:printer-3d": 0xf42b,
+    "mdi:printer-3d-nozzle": 0xfe3e,
+    "mdi:printer-3d-nozzle-outline": 0xfe3f,
     "mdi:printer-alert": 0xf42c,
+    "mdi:printer-off": 0xfe40,
     "mdi:printer-settings": 0xf706,
     "mdi:printer-wireless": 0xfa0a,
     "mdi:priority-high": 0xf603,
@@ -2822,6 +2905,8 @@ class MaterialDesignIcons {
     "mdi:record": 0xf44a,
     "mdi:record-player": 0xf999,
     "mdi:record-rec": 0xf44b,
+    "mdi:rectangle": 0xfe41,
+    "mdi:rectangle-outline": 0xfe42,
     "mdi:recycle": 0xf44c,
     "mdi:reddit": 0xf44d,
     "mdi:redo": 0xf44e,
@@ -2866,6 +2951,7 @@ class MaterialDesignIcons {
     "mdi:ribbon": 0xf460,
     "mdi:rice": 0xf7e9,
     "mdi:ring": 0xf7ea,
+    "mdi:rivet": 0xfe43,
     "mdi:road": 0xf461,
     "mdi:road-variant": 0xf462,
     "mdi:robot": 0xf6a8,
@@ -2908,6 +2994,7 @@ class MaterialDesignIcons {
     "mdi:satellite-uplink": 0xf908,
     "mdi:satellite-variant": 0xf471,
     "mdi:sausage": 0xf8b9,
+    "mdi:saw-blade": 0xfe44,
     "mdi:saxophone": 0xf609,
     "mdi:scale": 0xf472,
     "mdi:scale-balance": 0xf5d1,
@@ -2919,10 +3006,10 @@ class MaterialDesignIcons {
     "mdi:screen-rotation": 0xf475,
     "mdi:screen-rotation-lock": 0xf476,
     "mdi:screw-flat-top": 0xfdcf,
-    "mdi:screw-lag": 0xfdd0,
-    "mdi:screw-machine-flat-top": 0xfdd1,
-    "mdi:screw-machine-round-top": 0xfdd2,
-    "mdi:screw-round-top": 0xfdd3,
+    "mdi:screw-lag": 0xfe54,
+    "mdi:screw-machine-flat-top": 0xfe55,
+    "mdi:screw-machine-round-top": 0xfe56,
+    "mdi:screw-round-top": 0xfe57,
     "mdi:screwdriver": 0xf477,
     "mdi:script": 0xfb9d,
     "mdi:script-outline": 0xf478,
@@ -2944,6 +3031,8 @@ class MaterialDesignIcons {
     "mdi:seatbelt": 0xfca1,
     "mdi:security": 0xf483,
     "mdi:security-network": 0xf484,
+    "mdi:seed": 0xfe45,
+    "mdi:seed-outline": 0xfe46,
     "mdi:select": 0xf485,
     "mdi:select-all": 0xf486,
     "mdi:select-color": 0xfd0d,
@@ -2956,8 +3045,8 @@ class MaterialDesignIcons {
     "mdi:selection-ellipse": 0xfd0e,
     "mdi:selection-off": 0xf776,
     "mdi:send": 0xf48a,
-    "mdi:send-circle": 0xfdd4,
-    "mdi:send-circle-outline": 0xfdd5,
+    "mdi:send-circle": 0xfe58,
+    "mdi:send-circle-outline": 0xfe59,
     "mdi:send-lock": 0xf7ec,
     "mdi:serial-port": 0xf65c,
     "mdi:server": 0xf48b,
@@ -3021,7 +3110,7 @@ class MaterialDesignIcons {
     "mdi:ship-wheel": 0xf832,
     "mdi:shoe-formal": 0xfb22,
     "mdi:shoe-heel": 0xfb23,
-    "mdi:shoe-print": 0xfdd6,
+    "mdi:shoe-print": 0xfe5a,
     "mdi:shopify": 0xfadd,
     "mdi:shopping": 0xf49a,
     "mdi:shopping-music": 0xf49b,
@@ -3047,14 +3136,15 @@ class MaterialDesignIcons {
     "mdi:signal-cellular-2": 0xf8bc,
     "mdi:signal-cellular-3": 0xf8bd,
     "mdi:signal-cellular-outline": 0xf8be,
+    "mdi:signal-distance-variant": 0xfe47,
     "mdi:signal-hspa": 0xf714,
     "mdi:signal-hspa-plus": 0xf715,
     "mdi:signal-off": 0xf782,
     "mdi:signal-variant": 0xf60a,
-    "mdi:signature": 0xfdd7,
-    "mdi:signature-freehand": 0xfdd8,
-    "mdi:signature-image": 0xfdd9,
-    "mdi:signature-text": 0xfdda,
+    "mdi:signature": 0xfe5b,
+    "mdi:signature-freehand": 0xfe5c,
+    "mdi:signature-image": 0xfe5d,
+    "mdi:signature-text": 0xfe5e,
     "mdi:silo": 0xfb24,
     "mdi:silverware": 0xf4a3,
     "mdi:silverware-fork": 0xf4a4,
@@ -3087,8 +3177,8 @@ class MaterialDesignIcons {
     "mdi:slackware": 0xf90a,
     "mdi:sleep": 0xf4b2,
     "mdi:sleep-off": 0xf4b3,
-    "mdi:slope-downhill": 0xfddb,
-    "mdi:slope-uphill": 0xfddc,
+    "mdi:slope-downhill": 0xfe5f,
+    "mdi:slope-uphill": 0xfe60,
     "mdi:smog": 0xfa70,
     "mdi:smoke-detector": 0xf392,
     "mdi:smoking": 0xf4b4,
@@ -3129,6 +3219,7 @@ class MaterialDesignIcons {
     "mdi:spa": 0xfcad,
     "mdi:spa-outline": 0xfcae,
     "mdi:space-invaders": 0xfba5,
+    "mdi:spade": 0xfe48,
     "mdi:speaker": 0xf4c3,
     "mdi:speaker-bluetooth": 0xf9a1,
     "mdi:speaker-multiple": 0xfd14,
@@ -3142,6 +3233,8 @@ class MaterialDesignIcons {
     "mdi:spotlight-beam": 0xf4c9,
     "mdi:spray": 0xf665,
     "mdi:spray-bottle": 0xfadf,
+    "mdi:sprout": 0xfe49,
+    "mdi:sprout-outline": 0xfe4a,
     "mdi:square": 0xf763,
     "mdi:square-edit-outline": 0xf90b,
     "mdi:square-inc": 0xf4ca,
@@ -3246,6 +3339,7 @@ class MaterialDesignIcons {
     "mdi:table-row-remove": 0xf4f5,
     "mdi:table-search": 0xf90e,
     "mdi:table-settings": 0xf837,
+    "mdi:table-tennis": 0xfe4b,
     "mdi:tablet": 0xf4f6,
     "mdi:tablet-android": 0xf4f7,
     "mdi:tablet-cellphone": 0xf9a6,
@@ -3301,12 +3395,12 @@ class MaterialDesignIcons {
     "mdi:theater": 0xf50d,
     "mdi:theme-light-dark": 0xf50e,
     "mdi:thermometer": 0xf50f,
-    "mdi:thermometer-alert": 0xfddd,
-    "mdi:thermometer-chevron-down": 0xfdde,
-    "mdi:thermometer-chevron-up": 0xfddf,
+    "mdi:thermometer-alert": 0xfe61,
+    "mdi:thermometer-chevron-down": 0xfe62,
+    "mdi:thermometer-chevron-up": 0xfe63,
     "mdi:thermometer-lines": 0xf510,
-    "mdi:thermometer-minus": 0xfde0,
-    "mdi:thermometer-plus": 0xfde1,
+    "mdi:thermometer-minus": 0xfe64,
+    "mdi:thermometer-plus": 0xfe65,
     "mdi:thermostat": 0xf393,
     "mdi:thermostat-box": 0xf890,
     "mdi:thought-bubble": 0xf7f5,
@@ -3384,12 +3478,13 @@ class MaterialDesignIcons {
     "mdi:transition": 0xf914,
     "mdi:transition-masked": 0xf915,
     "mdi:translate": 0xf5ca,
-    "mdi:translate-off": 0xfde2,
+    "mdi:translate-off": 0xfe66,
     "mdi:transmission-tower": 0xfd1a,
     "mdi:trash-can": 0xfa78,
     "mdi:trash-can-outline": 0xfa79,
     "mdi:treasure-chest": 0xf725,
     "mdi:tree": 0xf531,
+    "mdi:tree-outline": 0xfe4c,
     "mdi:trello": 0xf532,
     "mdi:trending-down": 0xf533,
     "mdi:trending-neutral": 0xf534,
@@ -3450,7 +3545,7 @@ class MaterialDesignIcons {
     "mdi:upload-multiple": 0xf83c,
     "mdi:upload-network": 0xf6f5,
     "mdi:upload-network-outline": 0xfcb4,
-    "mdi:upload-outline": 0xfde3,
+    "mdi:upload-outline": 0xfe67,
     "mdi:usb": 0xf553,
     "mdi:van-passenger": 0xf7f9,
     "mdi:van-utility": 0xf7fa,
@@ -3503,6 +3598,9 @@ class MaterialDesignIcons {
     "mdi:view-array": 0xf56b,
     "mdi:view-carousel": 0xf56c,
     "mdi:view-column": 0xf56d,
+    "mdi:view-comfy": 0xfe4d,
+    "mdi:view-compact": 0xfe4e,
+    "mdi:view-compact-outline": 0xfe4f,
     "mdi:view-dashboard": 0xf56e,
     "mdi:view-dashboard-outline": 0xfa1c,
     "mdi:view-dashboard-variant": 0xf842,
@@ -3537,11 +3635,12 @@ class MaterialDesignIcons {
     "mdi:volume-mute": 0xf75e,
     "mdi:volume-off": 0xf581,
     "mdi:volume-plus": 0xf75c,
-    "mdi:volume-variant-off": 0xfde4,
+    "mdi:volume-variant-off": 0xfe68,
     "mdi:vote": 0xfa1e,
     "mdi:vote-outline": 0xfa1f,
     "mdi:vpn": 0xf582,
     "mdi:vuejs": 0xf843,
+    "mdi:vuetify": 0xfe50,
     "mdi:walk": 0xf583,
     "mdi:wall": 0xf7fd,
     "mdi:wall-sconce": 0xf91b,
@@ -3552,7 +3651,7 @@ class MaterialDesignIcons {
     "mdi:wallet-membership": 0xf586,
     "mdi:wallet-outline": 0xfbb9,
     "mdi:wallet-travel": 0xf587,
-    "mdi:wallpaper": 0xfde5,
+    "mdi:wallpaper": 0xfe69,
     "mdi:wan": 0xf588,
     "mdi:washing-machine": 0xf729,
     "mdi:watch": 0xf589,
@@ -3565,13 +3664,14 @@ class MaterialDesignIcons {
     "mdi:watch-vibrate-off": 0xfcb6,
     "mdi:water": 0xf58c,
     "mdi:water-off": 0xf58d,
-    "mdi:water-outline": 0xfde6,
+    "mdi:water-outline": 0xfe6a,
     "mdi:water-percent": 0xf58e,
     "mdi:water-pump": 0xf58f,
     "mdi:watermark": 0xf612,
     "mdi:waves": 0xf78c,
     "mdi:waze": 0xfbba,
     "mdi:weather-cloudy": 0xf590,
+    "mdi:weather-cloudy-arrow-right": 0xfe51,
     "mdi:weather-fog": 0xf591,
     "mdi:weather-hail": 0xf592,
     "mdi:weather-hurricane": 0xf897,
@@ -3608,7 +3708,7 @@ class MaterialDesignIcons {
     "mdi:widgets": 0xf72b,
     "mdi:wifi": 0xf5a9,
     "mdi:wifi-off": 0xf5aa,
-    "mdi:wifi-star": 0xfde7,
+    "mdi:wifi-star": 0xfe6b,
     "mdi:wifi-strength-1": 0xf91e,
     "mdi:wifi-strength-1-alert": 0xf91f,
     "mdi:wifi-strength-1-lock": 0xf920,
@@ -3659,7 +3759,9 @@ class MaterialDesignIcons {
     "mdi:xbox-controller-battery-low": 0xf74d,
     "mdi:xbox-controller-battery-medium": 0xf74e,
     "mdi:xbox-controller-battery-unknown": 0xf74f,
+    "mdi:xbox-controller-menu": 0xfe52,
     "mdi:xbox-controller-off": 0xf5bb,
+    "mdi:xbox-controller-view": 0xfe53,
     "mdi:xda": 0xf5bc,
     "mdi:xing": 0xf5bd,
     "mdi:xing-box": 0xf5be,

lib/pages/entity.page.dart

@@ -1,10 +1,9 @@
-part of 'main.dart';
+part of '../main.dart';
 
 class EntityViewPage extends StatefulWidget {
-  EntityViewPage({Key key, @required this.entityId, @required this.homeAssistant }) : super(key: key);
+  EntityViewPage({Key key, @required this.entityId}) : super(key: key);
 
   final String entityId;
-  final HomeAssistant homeAssistant;
 
   @override
   _EntityViewPageState createState() => new _EntityViewPageState();
@@ -31,7 +30,7 @@ class _EntityViewPageState extends State<EntityViewPage> {
   }
 
   void _prepareData() async {
-    _title = widget.homeAssistant.entities.get(widget.entityId).displayName;
+    _title = HomeAssistant().entities.get(widget.entityId).displayName;
   }
 
 
@@ -46,10 +45,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: 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/main.page.dart

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

lib/pages/panel.page.dart

@@ -1,4 +1,4 @@
-part of 'main.dart';
+part of '../main.dart';
 
 class PanelPage extends StatefulWidget {
   PanelPage({Key key, this.title, this.panel}) : super(key: key);
@@ -12,8 +12,6 @@ class PanelPage extends StatefulWidget {
 
 class _PanelPageState extends State<PanelPage> {
 
-  List<ConfigurationItem> _items;
-
   @override
   void initState() {
     super.initState();

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 = {'one_time_support','just_few_bucks_per_year', 'app_fan_support_per_year', 'grateful_user_support_per_year'};
+      final ProductDetailsResponse response = await InAppPurchaseConnection.instance.queryProductDetails(_kIds);
+      if (!response.notFoundIDs.isEmpty) {
+        Logger.d("Products not found: ${response.notFoundIDs}");
+      }
+      _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);
@@ -16,10 +16,13 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
   String _newHassioPort = "";
   String _socketProtocol = "wss";
   String _newSocketProtocol = "wss";
+  String _longLivedToken = "";
+  String _newLongLivedToken = "";
   bool _useLovelace = true;
   bool _newUseLovelace = true;
 
   String oauthUrl;
+  bool useOAuth = false;
 
   @override
   void initState() {
@@ -30,6 +33,23 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
 
   _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")?? "";
@@ -48,16 +68,32 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
       (_newHassioPort != _hassioPort) ||
       (_newHassioDomain != _hassioDomain) ||
       (_newSocketProtocol != _socketProtocol) ||
-      (_newUseLovelace != _useLovelace));
+      (_newUseLovelace != _useLovelace) ||
+      (_newLongLivedToken != _longLivedToken));
 
   }
 
   _saveSettings() async {
+    _newHassioDomain = _newHassioDomain.trim();
     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) {
+      _newLongLivedToken = _newLongLivedToken.trim();
+      prefs.setBool("oauth-used", false);
+      await storage.write(key: "hacl_llt", value: _newLongLivedToken);
+    } else if (!useOAuth) {
+      await storage.delete(key: "hacl_llt");
+    }
     prefs.setString("hassio-domain", _newHassioDomain);
+    if (_newHassioPort == null || _newHassioPort.isEmpty) {
+      _newHassioPort = _newSocketProtocol == "wss" ? "443" : "80";
+    } else {
+      _newHassioPort = _newHassioPort.trim();
+    }
     prefs.setString("hassio-port", _newHassioPort);
     prefs.setString("hassio-protocol", _newSocketProtocol);
     prefs.setString("hassio-res-protocol", _newSocketProtocol == "wss" ? "https" : "http");
@@ -118,13 +154,7 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
             decoration: InputDecoration(
               labelText: "Home Assistant domain or ip address"
             ),
-            controller: new TextEditingController.fromValue(
-                new TextEditingValue(
-                    text: _newHassioDomain,
-                    selection:
-                    new TextSelection.collapsed(offset: _newHassioDomain.length)
-                )
-            ),
+            controller: TextEditingController.fromValue(TextEditingValue(text: _newHassioDomain)),
             onChanged: (value) {
               _newHassioDomain = value;
             }
@@ -133,13 +163,7 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
             decoration: InputDecoration(
               labelText: "Home Assistant port (default is 8123)"
             ),
-            controller: new TextEditingController.fromValue(
-                new TextEditingValue(
-                    text: _newHassioPort,
-                    selection:
-                    new TextSelection.collapsed(offset: _newHassioPort.length)
-                )
-            ),
+            controller: TextEditingController.fromValue(TextEditingValue(text: _newHassioPort)),
             onChanged: (value) {
               _newHassioPort = value;
             }
@@ -171,6 +195,27 @@ 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: TextEditingController.fromValue(TextEditingValue(text: _newLongLivedToken)),
+              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,74 @@
+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;
+    String buttonText = '';
+    String buttonTextInactive = '';
+    if (product.id.contains("year")) {
+      period += "/ year";
+      buttonText = "Subscribe";
+      buttonTextInactive = "Already";
+      priceColor = Colors.amber;
+    } else {
+      period += "";
+      buttonText = "Pay";
+      buttonTextInactive = "Paid";
+      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 ? buttonTextInactive : buttonText, style: TextStyle(color: Colors.white)),
+                  color: Colors.blue,
+                  onPressed: this.purchased ? null : () => this.onBuy(this.product),
+                ),
+              )
+            ],
+          ),
+        )
+    );
+  }
+}

lib/panels/config_panel_widget.dart

@@ -0,0 +1,120 @@
+part of '../main.dart';
+
+class ConfigPanelWidget extends StatefulWidget {
+  ConfigPanelWidget({Key key}) : super(key: key);
+
+  @override
+  _ConfigPanelWidgetState createState() => new _ConfigPanelWidgetState();
+}
+
+class _ConfigPanelWidgetState extends State<ConfigPanelWidget> {
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  restart() {
+    eventBus.fire(ShowPopupDialogEvent(
+      title: "Are you sure you want to restart Home Assistant?",
+      body: "This will restart your Home Assistant server.",
+      positiveText: "Sure. Make it so",
+      negativeText: "What?? No!",
+      onPositive: () {
+        ConnectionManager().callService(domain: "homeassistant", service: "restart", 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: () {
+        ConnectionManager().callService(domain: "homeassistant", service: "stop", entityId: null);
+      },
+    ));
+  }
+
+  updateRegistration() {
+    MobileAppIntegrationManager.checkAppRegistration(showOkDialog: true);
+  }
+
+  resetRegistration() {
+    eventBus.fire(ShowPopupDialogEvent(
+      title: "Waaaait",
+      body: "If you don't whant to have duplicate integrations and entities in your HA for your current device, first you need to remove MobileApp integration from Integration settings in HA and restart server.",
+      positiveText: "Done it already",
+      negativeText: "Ok, I will",
+      onPositive: () {
+        MobileAppIntegrationManager.checkAppRegistration(showOkDialog: true, forceRegister: true);
+      },
+    ));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView(
+      children: [
+        Card(
+          child: Padding(
+            padding: EdgeInsets.only(left: Sizes.leftWidgetPadding, right: Sizes.rightWidgetPadding),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                ListTile(
+                    title: Text("Mobile app integration",
+                        textAlign: TextAlign.left,
+                        overflow: TextOverflow.ellipsis,
+                        style: new TextStyle(fontWeight: FontWeight.bold, fontSize: Sizes.largeFontSize))
+                ),
+                Text("Registration", style: TextStyle(fontSize: Sizes.largeFontSize-2)),
+                Container(height: Sizes.rowPadding,),
+                Text("${HomeAssistant().userName}'s ${DeviceInfoManager().model}, ${DeviceInfoManager().osName} ${DeviceInfoManager().osVersion}"),
+                Container(height: 6.0,),
+                Text("Here you can manually check if HA Client integration with your Home Assistant works fine. As mobileApp integration in Home Assistant is still in development, this is not 100% correct check."),
+                //Divider(),
+                Row(
+                  mainAxisSize: MainAxisSize.max,
+                  children: <Widget>[
+                    RaisedButton(
+                        color: Colors.blue,
+                        onPressed: () => updateRegistration(),
+                        child: Text("Check registration", style: TextStyle(color: Colors.white))
+                    ),
+                    Container(width: 10.0,),
+                    RaisedButton(
+                        color: Colors.redAccent,
+                        onPressed: () => resetRegistration(),
+                        child: Text("Reset registration", style: TextStyle(color: Colors.white))
+                    )
+                  ],
+                ),
+              ],
+            ),
+          ),
+        ),
+        LinkToWebConfig(name: "Home Assistant Cloud", url: ConnectionManager().httpWebHost+"/config/cloud/account"),
+        Container(height: 8.0,),
+        LinkToWebConfig(name: "Integrations", url: ConnectionManager().httpWebHost+"/config/integrations/dashboard"),
+        LinkToWebConfig(name: "Users", url: ConnectionManager().httpWebHost+"/config/users/picker"),
+        Container(height: 8.0,),
+        LinkToWebConfig(name: "General", url: ConnectionManager().httpWebHost+"/config/core"),
+        LinkToWebConfig(name: "Server Control", url: ConnectionManager().httpWebHost+"/config/server_control"),
+        LinkToWebConfig(name: "Persons", url: ConnectionManager().httpWebHost+"/config/person"),
+        LinkToWebConfig(name: "Entity Registry", url: ConnectionManager().httpWebHost+"/config/entity_registry"),
+        LinkToWebConfig(name: "Area Registry", url: ConnectionManager().httpWebHost+"/config/area_registry"),
+        LinkToWebConfig(name: "Automation", url: ConnectionManager().httpWebHost+"/config/automation"),
+        LinkToWebConfig(name: "Script", url: ConnectionManager().httpWebHost+"/config/script"),
+        LinkToWebConfig(name: "Customization", url: ConnectionManager().httpWebHost+"/config/customize"),
+      ],
+    );
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+}

lib/panels/widgets/link_to_web_config.dart

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

lib/types/event_bus_events.dart

@@ -0,0 +1,82 @@
+part of '../main.dart';
+
+class StateChangedEvent {
+  String entityId;
+  String newState;
+  bool needToRebuildUI;
+
+  StateChangedEvent({
+    this.entityId,
+    this.newState,
+    this.needToRebuildUI: false
+  });
+}
+
+class SettingsChangedEvent {
+  bool reconnect;
+
+  SettingsChangedEvent(this.reconnect);
+}
+
+class RefreshDataFinishedEvent {
+  RefreshDataFinishedEvent();
+}
+
+class ReloadUIEvent {
+  ReloadUIEvent();
+}
+
+class StartAuthEvent {
+  String oauthUrl;
+  bool showButton;
+
+  StartAuthEvent(this.oauthUrl, this.showButton);
+}
+
+class ServiceCallEvent {
+  String domain;
+  String service;
+  String entityId;
+  Map<String, dynamic> additionalParams;
+
+  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;
+
+  ShowEntityPageEvent(this.entity);
+}
+
+class ShowPageEvent {
+  final String path;
+  final bool goBackFirst;
+
+  ShowPageEvent({@required this.path, this.goBackFirst: false});
+}
+
+class ShowErrorEvent {
+  final HAError error;
+
+  ShowErrorEvent(this.error);
+}

lib/types/ha_error.dart

@@ -0,0 +1,45 @@
+part of '../main.dart';
+
+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.RELOGIN, this.url});
+
+}
+
+class HAErrorActionType {
+  static const FULL_RELOAD = 0;
+  static const QUICK_RELOAD = 1;
+  static const URL = 3;
+  static const OPEN_CONNECTION_SETTINGS = 4;
+  static const RELOGIN = 5;
+}

lib/ui_class/card.class.dart

@@ -13,6 +13,7 @@ class HACard {
   int columnsCount;
   List stateFilter;
   List states;
+  List conditions;
   String content;
 
   HACard({
@@ -26,8 +27,13 @@ class HACard {
     this.showEmpty: true,
     this.content,
     this.states,
+    this.conditions: const [],
     @required this.type
-  });
+  }) {
+    if (this.columnsCount <= 0) {
+      this.columnsCount = 4;
+    }
+  }
 
   List<EntityWrapper> getEntitiesToShow() {
     return entities.where((entityWrapper) {

lib/ui_class/panel_class.dart

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

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_widgets/card_widget.dart

@@ -24,6 +24,22 @@ class CardWidget extends StatelessWidget {
       }
     }
 
+    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) {
 
       case CardType.entities: {
@@ -112,7 +128,7 @@ class CardWidget extends StatelessWidget {
       if (!entity.entity.isHidden) {
         body.add(
             Padding(
-              padding: EdgeInsets.fromLTRB(10.0, 4.0, 0.0, 4.0),
+              padding: EdgeInsets.fromLTRB(0.0, 4.0, 0.0, 4.0),
               child: EntityModel(
                   entityWrapper: entity,
                   handleTap: true,
@@ -122,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),
+        )
     );
   }
 
@@ -286,4 +305,4 @@ class CardWidget extends StatelessWidget {
     );
   }
 
-}
+}

lib/ui_widgets/config_panel_widget.dart

@@ -1,95 +0,0 @@
-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: '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 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

@@ -1,142 +0,0 @@
-part of 'main.dart';
-
-class Logger {
-
-  static List<String> _log = [];
-
-  static String getLog() {
-    String res = '';
-    _log.forEach((line) {
-      res += "$line\n";
-    });
-    return res;
-  }
-
-  static bool get isInDebugMode {
-    bool inDebugMode = false;
-
-    assert(inDebugMode = true);
-
-    return inDebugMode;
-  }
-
-  static void e(String message) {
-    _writeToLog("Error", message);
-  }
-
-  static void w(String message) {
-    _writeToLog("Warning", message);
-  }
-
-  static void d(String message) {
-    _writeToLog("Debug", message);
-  }
-
-  static void _writeToLog(String level, String message) {
-    if (isInDebugMode) {
-      debugPrint('$message');
-    }
-    DateTime t = DateTime.now();
-    _log.add("${formatDate(t, ["mm","dd"," ","HH",":","nn",":","ss"])} [$level] :  $message");
-    if (_log.length > 100) {
-      _log.removeAt(0);
-    }
-  }
-
-}
-
-class HAUtils {
-  static void launchURL(String url) async {
-    if (await urlLauncher.canLaunch(url)) {
-      await urlLauncher.launch(url);
-    } else {
-      Logger.e( "Could not launch $url");
-    }
-  }
-
-  static void launchURLInCustomTab(BuildContext context, String url) async {
-    try {
-      await launch(
-        "$url",
-        option: new CustomTabsOption(
-          toolbarColor: Theme.of(context).primaryColor,
-          enableDefaultShare: true,
-          enableUrlBarHiding: true,
-          showPageTitle: true,
-          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 {
-  String entityId;
-  String newState;
-  bool needToRebuildUI;
-
-  StateChangedEvent({
-    this.entityId,
-    this.newState,
-    this.needToRebuildUI: false
-  });
-}
-
-class SettingsChangedEvent {
-  bool reconnect;
-
-  SettingsChangedEvent(this.reconnect);
-}
-
-class RefreshDataFinishedEvent {
-  RefreshDataFinishedEvent();
-}
-
-class ReloadUIEvent {
-  ReloadUIEvent();
-}
-
-class StartAuthEvent {
-  String oauthUrl;
-
-  StartAuthEvent(this.oauthUrl);
-}
-
-class ServiceCallEvent {
-  String domain;
-  String service;
-  String entityId;
-  Map<String, dynamic> additionalParams;
-
-  ServiceCallEvent(this.domain, this.service, this.entityId, this.additionalParams);
-}
-
-class ShowEntityPageEvent {
-  Entity entity;
-
-  ShowEntityPageEvent(this.entity);
-}
-
-class ShowErrorEvent {
-  String text;
-  int errorCode;
-
-  ShowErrorEvent(this.text, this.errorCode);
-}

lib/utils/launcher.dart

@@ -0,0 +1,69 @@
+part of '../main.dart';
+
+class Launcher {
+
+  static void launchURL(String url) async {
+    if (await urlLauncher.canLaunch(url)) {
+      await urlLauncher.launch(url);
+    } else {
+      Logger.e( "Could not launch $url");
+    }
+  }
+
+  static void launchAuthenticatedWebView({BuildContext context, String url, String title}) {
+    if (url.contains("?")) {
+      url += "&external_auth=1";
+    } else {
+      url += "?external_auth=1";
+    }
+    final flutterWebViewPlugin = new FlutterWebviewPlugin();
+    flutterWebViewPlugin.onStateChanged.listen((viewState) async {
+      if (viewState.type == WebViewState.startLoad) {
+        Logger.d("[WebView] Injecting external auth JS");
+        rootBundle.loadString('assets/js/externalAuth.js').then((js){
+          flutterWebViewPlugin.evalJavascript(js.replaceFirst("[token]", ConnectionManager()._token));
+        });
+      }
+    });
+    Navigator.of(context).pushNamed(
+        "/webview",
+        arguments: {
+          "url": "$url",
+          "title": "${title ?? ''}"
+        }
+    );
+  }
+
+  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");
+      Launcher.launchURL(url);
+    }
+  }
+
+}

lib/utils/logger.dart

@@ -0,0 +1,46 @@
+part of '../main.dart';
+
+class Logger {
+
+  static List<String> _log = [];
+
+  static String getLog() {
+    String res = '';
+    _log.forEach((line) {
+      res += "$line\n";
+    });
+    return res;
+  }
+
+  static bool get isInDebugMode {
+    bool inDebugMode = false;
+
+    assert(inDebugMode = true);
+
+    return inDebugMode;
+  }
+
+  static void e(String message) {
+    _writeToLog("Error", message);
+  }
+
+  static void w(String message) {
+    _writeToLog("Warning", message);
+  }
+
+  static void d(String message) {
+    _writeToLog("Debug", message);
+  }
+
+  static void _writeToLog(String level, String message) {
+    if (isInDebugMode) {
+      debugPrint('$message');
+    }
+    DateTime t = DateTime.now();
+    _log.add("${formatDate(t, ["mm","dd"," ","HH",":","nn",":","ss"])} [$level] :  $message");
+    if (_log.length > 100) {
+      _log.removeAt(0);
+    }
+  }
+
+}

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.7.0"
+    version: "1.1.1"
   charcode:
     dependency: transitive
     description:
@@ -49,14 +49,14 @@ packages:
       name: charts_common
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.0"
+    version: "0.8.0"
   charts_flutter:
     dependency: "direct main"
     description:
       name: charts_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.0"
+    version: "0.8.0"
   collection:
     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.2"
   date_format:
     dependency: "direct main"
     description:
@@ -94,20 +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: "4.0.0+1"
+    version: "5.1.4"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -119,7 +117,7 @@ packages:
       name: flutter_cache_manager
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.2"
+    version: "1.1.1"
   flutter_custom_tabs:
     dependency: "direct main"
     description:
@@ -133,7 +131,14 @@ packages:
       name: flutter_launcher_icons
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.0"
+    version: "0.7.3"
+  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:
@@ -147,14 +152,7 @@ packages:
       name: flutter_secure_storage
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.0"
-  flutter_svg:
-    dependency: "direct main"
-    description:
-      name: flutter_svg
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.10.4"
+    version: "3.2.1+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -166,14 +164,14 @@ packages:
       name: flutter_webview_plugin
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.1"
+    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:
@@ -187,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+3"
   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:
@@ -208,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:
@@ -230,69 +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.4.0"
+    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.0"
+    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+2"
+    version: "0.5.3+4"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -304,14 +302,14 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.4"
+    version: "1.5.5"
   sqflite:
     dependency: transitive
     description:
       name: sqflite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.3"
+    version: "1.1.6+4"
   stack_trace:
     dependency: transitive
     description:
@@ -325,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:
@@ -339,7 +337,7 @@ packages:
       name: synchronized
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.0+1"
   term_glyph:
     dependency: transitive
     description:
@@ -353,7 +351,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.2"
+    version: "0.2.5"
   typed_data:
     dependency: transitive
     description:
@@ -367,14 +365,14 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.2"
+    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:
@@ -388,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: ">=1.2.1 <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.6.0+101
+version: 0.6.5+652
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"
@@ -18,11 +18,14 @@ dependencies:
   date_format: any
   charts_flutter: any
   flutter_markdown: any
-  flutter_svg: ^0.10.3
+  in_app_purchase: ^0.2.1+2
+#  flutter_svg: ^0.10.3
   flutter_custom_tabs: ^0.6.0
-  firebase_messaging: ^4.0.0+1
-  flutter_webview_plugin: ^0.3.1
-  flutter_secure_storage: ^3.2.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:
@@ -45,9 +48,9 @@ flutter:
   # the material Icons class.
   uses-material-design: true
 
-  # To add assets to your application, add an assets section, like this:
   assets:
     - images/hassio-192x192.png
+    - assets/js/externalAuth.js
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.io/assets-and-images/#resolution-aware.
@@ -63,7 +66,7 @@ flutter:
   fonts:
     - family: "Material Design Icons"
       fonts:
-        - asset: fonts/materialdesignicons-webfont-3-5-95.ttf
+        - asset: fonts/materialdesignicons-webfont-3-6-95.ttf
   # fonts:
   #   - family: Schyler
   #     fonts: