build 713

.github/ISSUE_TEMPLATE/bug_report.md

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

.gitignore

@@ -15,9 +15,7 @@ build/
 .settings/
 
 flutter_export_environment.sh
-.flutter-plugins-dependencies
 
 key.properties
-.secrets.dart
+premium_features_manager.class.dart
 pubspec.lock
-google-services.json

.gitpod.dockerfile

@@ -4,5 +4,9 @@ ENV ANDROID_HOME=/workspace/android-sdk \
     FLUTTER_ROOT=/workspace/flutter \
     FLUTTER_HOME=/workspace/flutter
 
-RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh \
-             && sdk install java 8.0.242.j9-adpt"
+USER root
+
+RUN apt-get update && \
+    apt-get -y install build-essential libkrb5-dev gcc make gradle openjdk-8-jdk && \
+    apt-get clean && \
+    apt-get -y autoremove

.gitpod.yml

@@ -3,12 +3,12 @@ image:
 
 tasks:
 - before: |
-    export PATH=$FLUTTER_HOME/bin:$FLUTTER_HOME/bin/cache/dart-sdk/bin:$ANDROID_HOME/bin:$ANDROID_HOME/platform-tools:$PATH
+    export PATH=$FLUTTER_HOME/bin:$ANDROID_HOME/bin:$ANDROID_HOME/platform-tools:$PATH
     mkdir -p /home/gitpod/.android
     touch /home/gitpod/.android/repositories.cfg
   init: |
     echo "Installing Flutter SDK..."
-    cd /workspace && wget -qO flutter_sdk.tar.xz https://storage.googleapis.com/flutter_infra/releases/stable/linux/flutter_linux_v1.12.13+hotfix.7-stable.tar.xz && tar -xf flutter_sdk.tar.xz && rm -f flutter_sdk.tar.xz
+    cd /workspace && wget -qO flutter_sdk.tar.xz https://storage.googleapis.com/flutter_infra/releases/stable/linux/flutter_linux_v1.9.1+hotfix.4-stable.tar.xz && tar -xf flutter_sdk.tar.xz && rm -f flutter_sdk.tar.xz
     echo "Installing Android SDK..."
     mkdir -p /workspace/android-sdk && cd /workspace/android-sdk && wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && unzip sdk-tools-linux-4333796.zip && rm -f sdk-tools-linux-4333796.zip
     /workspace/android-sdk/tools/bin/sdkmanager "platform-tools" "platforms;android-28" "build-tools;28.0.3"
@@ -18,6 +18,7 @@ tasks:
     flutter doctor --android-licenses
     flutter pub get
   command: |
+    flutter pub upgrade
     echo "Ready to go!"
     flutter doctor
 vscode:

README.md

@@ -1,23 +1,15 @@
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/estevez-dev/ha_client)
 # HA Client
-|  # IMPORTANT!  |
-|:-:|
-|  As you may know official Home Assistant android app continue to grow and improve. Today is the day when it has so much more and better functionality that I see no any reason not to move from HA Client to official Home Assistant app. You need to make the same as it has more device sensors, better location tracking, widgets etc.
-|  **I'm stopping an active HA Client development as now the only advantage it has over the official app is native UI that is very far from completeness.**  |
-|  I need to say a HUGE THANK YOU all for a grate support you all made for HA Client. I really appreciate each and every issue reported to GitHub, each and every message from each of you and each donation made to support development. Now it is time to cancel subscription if any and migrate your HA setup to an official Home Assistant app. You can find it in [Google Play](https://play.google.com/store/apps/details?id=io.homeassistant.companion.android).  |
 ## Native Android client for Home Assistant
-### With actionable notifications, location tracking and Lovelace UI support
+### With notifications and Lovelace UI support
 
-Visit [ha-client.app](http://ha-client.app/) for more info.
+Visit [homemade.systems](http://ha-client.homemade.systems/) for more info.
 
-Download the app from [Google Play](https://play.google.com/store/apps/details?id=com.keyboardcrumbs.haclient)
+Download the app from [Google Play](https://play.google.com/apps/testing/com.keyboardcrumbs.haclient)
 
-Discuss it on [Discord](https://discord.gg/u9vq7QE) or at [Home Assistant community](https://community.home-assistant.io/c/mobile-apps/ha-client-android)
+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)
 
-[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/estevez-dev/ha_client) 
-
-#### Last release build status
+#### Pre-release CI build
+[![Codemagic build status](https://api.codemagic.io/apps/5da8bdab9f20ef798f7c2c65/5da8bdab9f20ef798f7c2c64/status_badge.svg)](https://codemagic.io/apps/5da8bdab9f20ef798f7c2c65/5da8bdab9f20ef798f7c2c64/latest_build)
+#### Beta CI build
 [![Codemagic build status](https://api.codemagic.io/apps/5da8bdab9f20ef798f7c2c65/5db1862025dc3f0b0288a57a/status_badge.svg)](https://codemagic.io/apps/5da8bdab9f20ef798f7c2c65/5db1862025dc3f0b0288a57a/latest_build)
-
-#### Projects used
-- [HANotify](https://github.com/Crewski/HANotify) by [Crewski](https://github.com/Crewski)
-- [hassalarm](https://github.com/Johboh/hassalarm) by [Johboh](https://github.com/Johboh) distributed under [MIT License](https://github.com/Johboh/hassalarm/blob/master/LICENSE)

android/app/build.gradle

@@ -78,15 +78,10 @@ flutter {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-analytics:17.2.2'
-    implementation 'com.google.firebase:firebase-messaging:20.2.0'
-    implementation 'com.google.android.gms:play-services-location:17.0.0'
-    implementation 'androidx.work:work-runtime:2.3.4'
-    implementation "androidx.concurrent:concurrent-futures:1.0.0"
+    implementation 'com.google.firebase:firebase-core:16.0.8'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
 
-apply plugin: 'io.fabric'
 apply plugin: 'com.google.gms.google-services'

android/app/google-services.json

@@ -0,0 +1,64 @@
+{
+  "project_info": {
+    "project_number": "441874387819",
+    "firebase_url": "https://ha-client-c73c4.firebaseio.com",
+    "project_id": "ha-client-c73c4",
+    "storage_bucket": "ha-client-c73c4.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:441874387819:android:92c7efc892dc3d45",
+        "android_client_info": {
+          "package_name": "com.keyboardcrumbs.haclient"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "441874387819-uqmkibhf361828od1982o2jhl0n3m0ov.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.keyboardcrumbs.haclient",
+            "certificate_hash": "bebe4d970fbebf0bff2c93244fdc7fcbcefb3470"
+          }
+        },
+        {
+          "client_id": "441874387819-5q7vmimci4s2jl3v0ncugv1ocp4m48nb.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.keyboardcrumbs.haclient",
+            "certificate_hash": "0ea12348468be44bc2aa5792ee7e8924c633da81"
+          }
+        },
+        {
+          "client_id": "441874387819-joi8plo5345ebt8i1dug27u2aenv5tg7.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.keyboardcrumbs.haclient",
+            "certificate_hash": "fcbc805d965ccf6a4d5417398d191edc9c9890b0"
+          }
+        },
+        {
+          "client_id": "441874387819-id0hqsfprj3b5kc312faqv3lmdfpm7l8.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBsl9cjBY633IrdrTyCsLFlO9lfsYJ0OJU"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "441874387819-id0hqsfprj3b5kc312faqv3lmdfpm7l8.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/main/AndroidManifest.xml

@@ -1,31 +1,31 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.keyboardcrumbs.hassclient"
-    android:installLocation="auto">
+    package="com.keyboardcrumbs.hassclient">
 
     <uses-feature android:name="android.hardware.touchscreen"
         android:required="false" />
+
+    <!-- The INTERNET permission is required for development. Specifically,
+         flutter needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
     <uses-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.
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
+        android:name=".Application"
         android:label="HA Client"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:usesCleartextTraffic="true">
 
-        <meta-data
-            android:name="flutterEmbedding"
-            android:value="2" />
-
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="ha_notify" />
@@ -37,51 +37,31 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
+            <!-- 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).
             <meta-data
-                android:name="io.flutter.embedding.android.SplashScreenDrawable"
-                android:resource="@drawable/launch_background" />
-            <meta-data
-                android:name="io.flutter.embedding.android.NormalTheme"
-                android:resource="@style/NormalTheme" />
+                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
+                android:value="true" />-->
+            <intent-filter>
+                <action android:name="FLUTTER_NOTIFICATION_CLICK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data
+                android:scheme="haclient"
+                android:host="auth" />
+            </intent-filter>
         </activity>
 
-        <service
-            android:name=".MessagingService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
-        <service
-            android:name=".LocationUpdatesService"
-            android:enabled="true"
-            android:exported="false" />
-        <service
-            android:name=".LocationRequestService"
-            android:enabled="true"
-            android:exported="false" />
-        <receiver android:name=".NotificationActionReceiver"  android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
-                <action android:name="android.intent.action.INPUT_METHOD_CHANGED" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".NextAlarmBroadcastReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.app.action.NEXT_ALARM_CLOCK_CHANGED" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".RestartLocationUpdate">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-            </intent-filter>
-        </receiver>
         <service
             android:name="io.flutter.plugins.androidalarmmanager.AlarmService"
             android:permission="android.permission.BIND_JOB_SERVICE"
@@ -93,7 +73,7 @@
             android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
             android:enabled="false">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.BOOT_COMPLETED"></action>
             </intent-filter>
         </receiver>
     </application>

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

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

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

@@ -1,146 +0,0 @@
-package com.keyboardcrumbs.hassclient;
-
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.Service;
-import android.content.Intent;
-import android.location.Location;
-import android.os.Build;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.IBinder;
-import android.os.Looper;
-import android.util.Log;
-
-import androidx.annotation.Nullable;
-import androidx.work.Constraints;
-import androidx.work.Data;
-import androidx.work.ExistingWorkPolicy;
-import androidx.work.NetworkType;
-import androidx.work.OneTimeWorkRequest;
-import androidx.work.WorkManager;
-
-import com.google.android.gms.location.FusedLocationProviderClient;
-import com.google.android.gms.location.LocationCallback;
-import com.google.android.gms.location.LocationRequest;
-import com.google.android.gms.location.LocationResult;
-import com.google.android.gms.location.LocationServices;
-
-public class LocationRequestService extends Service {
-
-    private static final String TAG = LocationRequestService.class.getSimpleName();
-
-    private NotificationManager mNotificationManager;
-
-    private LocationRequest mLocationRequest;
-
-    private FusedLocationProviderClient mFusedLocationClient;
-
-    private LocationCallback mLocationCallback;
-
-    private Handler mServiceHandler;
-
-    public LocationRequestService() {
-    }
-
-    @Override
-    public void onCreate() {
-        mFusedLocationClient = LocationServices.getFusedLocationProviderClient(this);
-
-        mLocationCallback = new LocationCallback() {
-            @Override
-            public void onLocationResult(LocationResult locationResult) {
-                super.onLocationResult(locationResult);
-                onNewLocation(locationResult.getLastLocation());
-            }
-        };
-
-        mLocationRequest = new LocationRequest();
-
-        HandlerThread handlerThread = new HandlerThread(TAG);
-        handlerThread.start();
-        mServiceHandler = new Handler(handlerThread.getLooper());
-        mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            CharSequence name = "Location requests";
-            NotificationChannel mChannel =
-                    new NotificationChannel(LocationUtils.ONETIME_NOTIFICATION_CHANNEL_ID, name, NotificationManager.IMPORTANCE_LOW);
-
-            mNotificationManager.createNotificationChannel(mChannel);
-        }
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.i(TAG, "Service started. startId="+startId);
-
-        requestLocationUpdates();
-
-        return START_STICKY;
-    }
-
-    @Override
-    public void onDestroy() {
-        try {
-            mFusedLocationClient.removeLocationUpdates(mLocationCallback);
-        } catch (SecurityException unlikely) {
-            //When we lost permission
-            Log.i(TAG, "No location permission");
-        }
-        mServiceHandler.removeCallbacksAndMessages(null);
-    }
-
-    @Nullable
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    private void requestLocationUpdates() {
-        Log.i(TAG, "Requesting location update in 5 seconds.");
-        mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
-        mLocationRequest.setInterval(5000);
-
-        startForeground(LocationUtils.ONETIME_NOTIFICATION_ID, LocationUtils.getRequestNotification(this, null, LocationUtils.ONETIME_NOTIFICATION_CHANNEL_ID));
-        try {
-            mFusedLocationClient.requestLocationUpdates(mLocationRequest,
-                    mLocationCallback, Looper.myLooper());
-        } catch (SecurityException unlikely) {
-            stopSelf();
-        }
-    }
-
-    private void onNewLocation(Location location) {
-        Log.i(TAG, "New location: " + location);
-
-        mNotificationManager.notify(LocationUtils.ONETIME_NOTIFICATION_ID, LocationUtils.getRequestNotification(
-                this,
-                location,
-                LocationUtils.ONETIME_NOTIFICATION_CHANNEL_ID
-        ));
-
-        Constraints constraints = new Constraints.Builder()
-                .setRequiredNetworkType(NetworkType.CONNECTED)
-                .build();
-
-        Data locationData = new Data.Builder()
-                .putInt(SendDataHomeWorker.DATA_TYPE_KEY, SendDataHomeWorker.DATA_TYPE_LOCATION)
-                .putDouble("Lat", location.getLatitude())
-                .putDouble("Long", location.getLongitude())
-                .putFloat("Acc", location.getAccuracy())
-                .build();
-
-
-        OneTimeWorkRequest uploadWorkRequest =
-                new OneTimeWorkRequest.Builder(SendDataHomeWorker.class)
-                        .setConstraints(constraints)
-                        .setInputData(locationData)
-                        .build();
-
-        WorkManager
-                .getInstance(getApplicationContext())
-                .enqueueUniqueWork("SendLocationUpdate", ExistingWorkPolicy.REPLACE, uploadWorkRequest);
-        stopSelf();
-    }
-}

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

@@ -1,154 +0,0 @@
-package com.keyboardcrumbs.hassclient;
-
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.Service;
-import android.content.Intent;
-import android.location.Location;
-import android.os.Build;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.IBinder;
-import android.os.Looper;
-
-import androidx.annotation.Nullable;
-import androidx.work.Constraints;
-import androidx.work.Data;
-import androidx.work.ExistingWorkPolicy;
-import androidx.work.NetworkType;
-import androidx.work.OneTimeWorkRequest;
-import androidx.work.WorkManager;
-
-import android.util.Log;
-
-import com.google.android.gms.location.FusedLocationProviderClient;
-import com.google.android.gms.location.LocationCallback;
-import com.google.android.gms.location.LocationRequest;
-import com.google.android.gms.location.LocationResult;
-import com.google.android.gms.location.LocationServices;
-
-public class LocationUpdatesService extends Service {
-
-    private static final String TAG = LocationUpdatesService.class.getSimpleName();
-
-    private NotificationManager mNotificationManager;
-
-    private LocationRequest mLocationRequest;
-
-    private FusedLocationProviderClient mFusedLocationClient;
-
-    private LocationCallback mLocationCallback;
-
-    private Handler mServiceHandler;
-
-    public LocationUpdatesService() {
-    }
-
-    @Override
-    public void onCreate() {
-        mFusedLocationClient = LocationServices.getFusedLocationProviderClient(this);
-
-        mLocationCallback = new LocationCallback() {
-            @Override
-            public void onLocationResult(LocationResult locationResult) {
-                super.onLocationResult(locationResult);
-                onNewLocation(locationResult.getLastLocation());
-            }
-        };
-
-        mLocationRequest = new LocationRequest();
-
-        HandlerThread handlerThread = new HandlerThread(TAG);
-        handlerThread.start();
-        mServiceHandler = new Handler(handlerThread.getLooper());
-        mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            CharSequence name = "Location updates";
-            NotificationChannel mChannel =
-                    new NotificationChannel(LocationUtils.SERVICE_NOTIFICATION_CHANNEL_ID, name, NotificationManager.IMPORTANCE_LOW);
-
-            mNotificationManager.createNotificationChannel(mChannel);
-        }
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.i(TAG, "Service started. startId="+startId);
-
-        requestLocationUpdates();
-
-        return START_STICKY;
-    }
-
-    @Override
-    public void onDestroy() {
-        try {
-            mFusedLocationClient.removeLocationUpdates(mLocationCallback);
-        } catch (SecurityException unlikely) {
-            //When we lost permission
-            Log.i(TAG, "No location permission");
-        }
-        mServiceHandler.removeCallbacksAndMessages(null);
-    }
-
-    @Nullable
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    private void requestLocationUpdates() {
-        long requestInterval = LocationUtils.getLocationUpdateIntervals(getApplicationContext());
-        int priority;
-        if (requestInterval >= 600000) {
-            mLocationRequest.setFastestInterval(60000);
-            priority = LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY;
-        } else {
-            priority = LocationRequest.PRIORITY_HIGH_ACCURACY;
-        }
-        Log.i(TAG, "Requesting location updates. Every " + requestInterval + "ms with priority of " + priority);
-        mLocationRequest.setPriority(priority);
-        mLocationRequest.setInterval(requestInterval);
-
-        startForeground(LocationUtils.SERVICE_NOTIFICATION_ID, LocationUtils.getNotification(this, null, LocationUtils.SERVICE_NOTIFICATION_CHANNEL_ID));
-        try {
-            mFusedLocationClient.requestLocationUpdates(mLocationRequest,
-                    mLocationCallback, Looper.myLooper());
-        } catch (SecurityException unlikely) {
-            stopSelf();
-        }
-    }
-
-    private void onNewLocation(Location location) {
-        Log.i(TAG, "New location: " + location);
-
-        mNotificationManager.notify(LocationUtils.SERVICE_NOTIFICATION_ID, LocationUtils.getNotification(
-                this,
-                location,
-                LocationUtils.SERVICE_NOTIFICATION_CHANNEL_ID
-        ));
-
-        Constraints constraints = new Constraints.Builder()
-                .setRequiredNetworkType(NetworkType.CONNECTED)
-                .build();
-
-        Data locationData = new Data.Builder()
-                .putInt(SendDataHomeWorker.DATA_TYPE_KEY, SendDataHomeWorker.DATA_TYPE_LOCATION)
-                .putDouble("Lat", location.getLatitude())
-                .putDouble("Long", location.getLongitude())
-                .putFloat("Acc", location.getAccuracy())
-                .build();
-
-
-        OneTimeWorkRequest uploadWorkRequest =
-                new OneTimeWorkRequest.Builder(SendDataHomeWorker.class)
-                        .setConstraints(constraints)
-                        .setInputData(locationData)
-                        .build();
-
-        WorkManager
-                .getInstance(getApplicationContext())
-                .enqueueUniqueWork("SendLocationUpdate", ExistingWorkPolicy.REPLACE, uploadWorkRequest);
-    }
-}

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

@@ -1,112 +0,0 @@
-package com.keyboardcrumbs.hassclient;
-
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.location.Location;
-import android.os.Build;
-import android.os.Looper;
-
-import androidx.annotation.NonNull;
-import androidx.concurrent.futures.CallbackToFutureAdapter;
-import androidx.work.Constraints;
-import androidx.work.Data;
-import androidx.work.ExistingWorkPolicy;
-import androidx.work.ListenableWorker;
-import androidx.work.NetworkType;
-import androidx.work.OneTimeWorkRequest;
-import androidx.work.WorkManager;
-import androidx.work.WorkerParameters;
-
-import com.google.android.gms.location.FusedLocationProviderClient;
-import com.google.android.gms.location.LocationCallback;
-import com.google.android.gms.location.LocationRequest;
-import com.google.android.gms.location.LocationResult;
-import com.google.android.gms.location.LocationServices;
-import com.google.common.util.concurrent.ListenableFuture;
-
-import java.util.concurrent.TimeUnit;
-
-public class LocationUpdatesWorker extends ListenableWorker {
-
-    private Context currentContext;
-    private LocationCallback callback;
-    private FusedLocationProviderClient fusedLocationClient;
-
-    public LocationUpdatesWorker(Context context, WorkerParameters params) {
-        super(context, params);
-        currentContext = context;
-    }
-
-    private void finish() {
-        fusedLocationClient.removeLocationUpdates(callback);
-    }
-
-
-
-    @NonNull
-    @Override
-    public ListenableFuture<Result> startWork() {
-        return CallbackToFutureAdapter.getFuture(completer -> {
-            fusedLocationClient = LocationServices.getFusedLocationProviderClient(currentContext);
-
-            callback = new LocationCallback() {
-                @Override
-                public void onLocationResult(LocationResult locationResult) {
-                    super.onLocationResult(locationResult);
-                    Location location = locationResult.getLastLocation();
-                    Constraints constraints = new Constraints.Builder()
-                            .setRequiredNetworkType(NetworkType.CONNECTED)
-                            .build();
-
-                    Data locationData = new Data.Builder()
-                            .putInt(SendDataHomeWorker.DATA_TYPE_KEY, SendDataHomeWorker.DATA_TYPE_LOCATION)
-                            .putDouble("Lat", location.getLatitude())
-                            .putDouble("Long", location.getLongitude())
-                            .putFloat("Acc", location.getAccuracy())
-                            .build();
-
-
-                    OneTimeWorkRequest uploadWorkRequest =
-                            new OneTimeWorkRequest.Builder(SendDataHomeWorker.class)
-                                    .setConstraints(constraints)
-                                    .setInputData(locationData)
-                                    .build();
-
-                    WorkManager
-                            .getInstance(getApplicationContext())
-                            .enqueueUniqueWork("SendLocationUpdate", ExistingWorkPolicy.REPLACE, uploadWorkRequest);
-                    if (LocationUtils.showNotification(currentContext)) {
-                        NotificationManager notificationManager;
-                        if (android.os.Build.VERSION.SDK_INT >= 23) {
-                            notificationManager = currentContext.getSystemService(NotificationManager.class);
-                        } else {
-                            notificationManager = (NotificationManager)currentContext.getSystemService(Context.NOTIFICATION_SERVICE);
-                        }
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                            CharSequence name = "Location updates";
-                            NotificationChannel mChannel =
-                                    new NotificationChannel(LocationUtils.WORKER_NOTIFICATION_CHANNEL_ID, name, NotificationManager.IMPORTANCE_LOW);
-
-                            notificationManager.createNotificationChannel(mChannel);
-                        }
-                        notificationManager.notify(LocationUtils.WORKER_NOTIFICATION_ID, LocationUtils.getNotification(currentContext, location, LocationUtils.WORKER_NOTIFICATION_CHANNEL_ID));
-                    }
-                    finish();
-                    completer.set(Result.success());
-                }
-            };
-
-            LocationRequest locationRequest = new LocationRequest();
-            locationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
-            locationRequest.setInterval(5000);
-            try {
-                fusedLocationClient.requestLocationUpdates(locationRequest,
-                        callback, Looper.myLooper());
-            } catch (SecurityException e) {
-                completer.setException(e);
-            }
-            return callback;
-        });
-    }
-}

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

@@ -1,147 +0,0 @@
-package com.keyboardcrumbs.hassclient;
-
-import android.app.Notification;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.location.Location;
-import android.os.Build;
-
-import androidx.core.app.NotificationCompat;
-import androidx.work.ExistingPeriodicWorkPolicy;
-import androidx.work.ExistingWorkPolicy;
-import androidx.work.OneTimeWorkRequest;
-import androidx.work.PeriodicWorkRequest;
-import androidx.work.WorkManager;
-
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.concurrent.TimeUnit;
-
-class LocationUtils {
-
-    static final String KEY_REQUESTING_LOCATION_UPDATES = "flutter.location-updates-state";
-    static final String KEY_LOCATION_UPDATE_INTERVAL = "flutter.location-updates-interval";
-    static final String KEY_LOCATION_SHOW_NOTIFICATION = "flutter.location-updates-show-notification";
-
-    static final String WORKER_NOTIFICATION_CHANNEL_ID = "location_worker";
-    static final int WORKER_NOTIFICATION_ID = 954322;
-    static final String SERVICE_NOTIFICATION_CHANNEL_ID = "location_service";
-    static final int SERVICE_NOTIFICATION_ID = 954311;
-    static final String ONETIME_NOTIFICATION_CHANNEL_ID = "location_request";
-    static final int ONETIME_NOTIFICATION_ID = 954333;
-
-    static final String REQUEST_LOCATION_NOTIFICATION = "request_location_update";
-
-    static final String LOCATION_WORK_NAME = "HALocationWorker";
-    static final String LOCATION_REQUEST_NAME = "HALocationRequest";
-
-    static final int LOCATION_UPDATES_DISABLED = 0;
-    static final int LOCATION_UPDATES_SERVICE = 1;
-    static final int LOCATION_UPDATES_WORKER = 2;
-
-    static final int DEFAULT_LOCATION_UPDATE_INTERVAL_MS = 900000; //15 minutes
-    static final long MIN_WORKER_LOCATION_UPDATE_INTERVAL_MS = 900000; //15 minutes
-
-    static int getLocationUpdatesState(Context context) {
-        return context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE).getInt(KEY_REQUESTING_LOCATION_UPDATES, LOCATION_UPDATES_DISABLED);
-    }
-
-    static long getLocationUpdateIntervals(Context context) {
-        return context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE).getLong(KEY_LOCATION_UPDATE_INTERVAL, DEFAULT_LOCATION_UPDATE_INTERVAL_MS);
-    }
-
-    static boolean showNotification(Context context) {
-        return context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE).getBoolean(KEY_LOCATION_SHOW_NOTIFICATION, true);
-    }
-
-    static void setLocationUpdatesState(Context context, int locationUpdatesState) {
-        context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE)
-                .edit()
-                .putInt(KEY_REQUESTING_LOCATION_UPDATES, locationUpdatesState)
-                .apply();
-    }
-
-    static void setLocationUpdatesSettings(Context context, long interval, boolean showNotification) {
-        context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE)
-                .edit()
-                .putBoolean(KEY_LOCATION_SHOW_NOTIFICATION, showNotification)
-                .putLong(KEY_LOCATION_UPDATE_INTERVAL, interval)
-                .apply();
-    }
-
-    static void startService(Context context) {
-        Intent myService = new Intent(context, LocationUpdatesService.class);
-        context.startService(myService);
-    }
-
-    static void startServiceFromBroadcast(Context context) {
-        Intent serviceIntent = new Intent(context, LocationUpdatesService.class);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            context.startForegroundService(serviceIntent);
-        } else {
-            context.startService(serviceIntent);
-        }
-    }
-
-    static void startWorker(Context context, long interval) {
-        PeriodicWorkRequest periodicWork = new PeriodicWorkRequest.Builder(LocationUpdatesWorker.class, interval, TimeUnit.MILLISECONDS)
-                .build();
-        WorkManager.getInstance(context).enqueueUniquePeriodicWork(LocationUtils.LOCATION_WORK_NAME, ExistingPeriodicWorkPolicy.REPLACE, periodicWork);
-    }
-
-    static void requestLocationOnce(Context context) {
-        Intent myService = new Intent(context, LocationRequestService.class);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            context.startForegroundService(myService);
-        } else {
-            context.startService(myService);
-        }
-        //OneTimeWorkRequest oneTimeWork = new OneTimeWorkRequest.Builder(LocationUpdatesWorker.class)
-        //        .build();
-        //WorkManager.getInstance(context).enqueueUniqueWork(LocationUtils.LOCATION_REQUEST_NAME, ExistingWorkPolicy.REPLACE, oneTimeWork);
-    }
-
-    static Notification getNotification(Context context, Location location, String channelId) {
-        CharSequence title = "Location tracking";
-        CharSequence text = location == null ? "Accuracy: unknown" : "Accuracy: " + location.getAccuracy() + " m";
-        CharSequence bigText = location == null ? "Waiting for location..." : "Time: " + DateFormat.getDateTimeInstance().format(new Date(location.getTime())) +
-                System.getProperty("line.separator") + "Accuracy: " + location.getAccuracy() + " m" +
-                System.getProperty("line.separator") + "Location: " + location.getLatitude() + ", " + location.getLongitude();
-
-                PendingIntent activityPendingIntent = PendingIntent.getActivity(context, 0,
-                new Intent(context, MainActivity.class), 0);
-
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, channelId)
-                .setContentIntent(activityPendingIntent)
-                .setContentTitle(title)
-                .setContentText(text)
-                .setStyle(new NotificationCompat.BigTextStyle()
-                        .bigText(bigText))
-                .setPriority(-1)
-                .setOngoing(true)
-                .setSmallIcon(R.drawable.mini_icon_location)
-                .setWhen(System.currentTimeMillis());
-
-        return builder.build();
-    }
-
-    static Notification getRequestNotification(Context context, Location location, String channelId) {
-        CharSequence title = "Updating location...";
-        CharSequence text = location == null ? "Waiting for location..." : "Accuracy: " + location.getAccuracy() + " m";
-
-        PendingIntent activityPendingIntent = PendingIntent.getActivity(context, 0,
-                new Intent(context, MainActivity.class), 0);
-
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, channelId)
-                .setContentIntent(activityPendingIntent)
-                .setContentTitle(title)
-                .setContentText(text)
-                .setPriority(-1)
-                .setOngoing(true)
-                .setSmallIcon(R.drawable.mini_icon_location)
-                .setWhen(System.currentTimeMillis());
-
-        return builder.build();
-    }
-}

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

@@ -1,184 +1,15 @@
 package com.keyboardcrumbs.hassclient;
 
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.work.WorkManager;
-
-import io.flutter.embedding.android.FlutterActivity;
-import io.flutter.embedding.engine.FlutterEngine;
-import io.flutter.plugins.GeneratedPluginRegistrant;
-
-import android.Manifest;
-import android.app.NotificationManager;
-import android.content.Context;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.location.Location;
 import android.os.Bundle;
+import io.flutter.app.FlutterActivity;
+import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.plugins.share.FlutterShareReceiverActivity;
 
-import io.flutter.plugin.common.MethodChannel;
-
-import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.firebase.iid.FirebaseInstanceId;
-
-public class MainActivity extends FlutterActivity {
-
-    private static final String CHANNEL = "com.keyboardcrumbs.hassclient/native";
-
-    private static final int REQUEST_PERMISSIONS_REQUEST_CODE = 34;
-
-    private int locationUpdatesType = LocationUtils.LOCATION_UPDATES_DISABLED;
-    private long locationUpdatesInterval = LocationUtils.DEFAULT_LOCATION_UPDATE_INTERVAL_MS;
-
-    @Override
-    public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
-        GeneratedPluginRegistrant.registerWith(flutterEngine);
-        new MethodChannel(flutterEngine.getDartExecutor().getBinaryMessenger(), CHANNEL).setMethodCallHandler(
-                (call, result) -> {
-                    Context context = getActivity();
-                    switch (call.method) {
-                        case "getFCMToken":
-                            try {
-                                if (checkPlayServices()) {
-                                    FirebaseInstanceId.getInstance().getInstanceId()
-                                            .addOnCompleteListener(task -> {
-                                                if (task.isSuccessful()) {
-                                                    String token = task.getResult().getToken();
-                                                    context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE).edit().putString("flutter.npush-token", token).apply();
-                                                    result.success(token);
-                                                } else {
-                                                    Exception ex = task.getException();
-                                                    if (ex != null) {
-                                                        result.error("fcm_error", ex.getMessage(), null);
-                                                    } else {
-                                                        result.error("fcm_error", "Unknown", null);
-                                                    }
-
-                                                }
-                                            });
-                                } else {
-                                    result.error("google_play_service_error", "Google Play Services unavailable", null);
-                                }
-                            } catch (Exception e) {
-                                result.error("get_token_exception", e.getMessage(), e);
-                            }
-                            break;
-                        case "startLocationService":
-                            try {
-                                locationUpdatesInterval = ((Number)call.argument("location-updates-interval")).longValue();
-                                boolean useForegroundService = (boolean)call.argument("foreground-location-tracking");
-
-                                if (useForegroundService) {
-                                    locationUpdatesType = LocationUtils.LOCATION_UPDATES_SERVICE;
-                                } else {
-                                    locationUpdatesType = LocationUtils.LOCATION_UPDATES_WORKER;
-                                }
-                                LocationUtils.setLocationUpdatesSettings(this, locationUpdatesInterval, (boolean)call.argument("location-updates-show-notification"));
-                                if (isNoLocationPermissions()) {
-                                    requestLocationPermissions();
-                                } else {
-                                    startLocationUpdates();
-                                }
-                                result.success("");
-                            } catch (Exception e) {
-                                result.error("location_error", e.getMessage(), e);
-                            }
-                            break;
-                        case "stopLocationService":
-                            try {
-                                stopLocationUpdates();
-                                result.success("");
-                            } catch (Exception e) {
-                                result.error("location_error", e.getMessage(), e);
-                            }
-                            break;
-                        case "cancelOldLocationWorker":
-                            WorkManager.getInstance(this).cancelAllWorkByTag("haclocation");
-                            result.success("");
-                            break;
-                    }
-                }
-        );
-    }
-
-    private boolean checkPlayServices() {
-        return (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS);
-    }
-
-    private void startLocationUpdates() {
-        if (locationUpdatesType == LocationUtils.LOCATION_UPDATES_SERVICE) {
-            LocationUtils.startService(this);
-            LocationUtils.setLocationUpdatesState(this, locationUpdatesType);
-        } else if (locationUpdatesType == LocationUtils.LOCATION_UPDATES_WORKER) {
-            LocationUtils.startWorker(this, locationUpdatesInterval);
-            LocationUtils.setLocationUpdatesState(this, locationUpdatesType);
-        } else {
-            stopLocationUpdates();
-        }
-    }
-
-    private void stopLocationUpdates() {
-        Intent myService = new Intent(MainActivity.this, LocationUpdatesService.class);
-        stopService(myService);
-        WorkManager.getInstance(this).cancelUniqueWork(LocationUtils.LOCATION_WORK_NAME);
-        NotificationManager notificationManager;
-        if (android.os.Build.VERSION.SDK_INT >= 23) {
-            notificationManager = getSystemService(NotificationManager.class);
-        } else {
-            notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
-        }
-        notificationManager.cancel(LocationUtils.WORKER_NOTIFICATION_ID);
-        LocationUtils.setLocationUpdatesState(this, LocationUtils.LOCATION_UPDATES_DISABLED);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-    }
-
-    private boolean isNoLocationPermissions() {
-        return PackageManager.PERMISSION_GRANTED != ActivityCompat.checkSelfPermission(this,
-                Manifest.permission.ACCESS_FINE_LOCATION);
-    }
-
-    private void requestLocationPermissions() {
-        ActivityCompat.requestPermissions(MainActivity.this,
-                new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
-                REQUEST_PERMISSIONS_REQUEST_CODE);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
-                                           @NonNull int[] grantResults) {
-        if (requestCode == REQUEST_PERMISSIONS_REQUEST_CODE) {
-            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                startLocationUpdates();
-            } else {
-                stopLocationUpdates();
-            }
-        }
-    }
+public class MainActivity extends FlutterShareReceiverActivity {
   
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    GeneratedPluginRegistrant.registerWith(this);
+  }
 }

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

@@ -1,165 +0,0 @@
-package com.keyboardcrumbs.hassclient;
-
-import java.util.Map;
-import java.net.URL;
-import java.net.URLConnection;
-import java.io.InputStream;
-
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Build;
-
-import androidx.annotation.NonNull;
-import androidx.core.app.NotificationCompat;
-
-import com.google.firebase.messaging.FirebaseMessagingService;
-import com.google.firebase.messaging.RemoteMessage;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.util.Log;
-import android.webkit.URLUtil;
-
-
-public class MessagingService extends FirebaseMessagingService {
-
-    private static final String TAG = MessagingService.class.getSimpleName();
-
-    public static final String NOTIFICATION_ACTION_BROADCAST = "com.keyboardcrumbs.hassclient.haNotificationAction";
-
-    @Override
-    public void onMessageReceived(RemoteMessage remoteMessage) {
-        Map<String, String> data = remoteMessage.getData();
-        if (data.size() > 0) {
-           if (data.containsKey("body") || data.containsKey("title")) {
-                sendNotification(data);
-           }
-        }
-    }
-
-    @Override
-    public void onNewToken(@NonNull String token) {
-        getApplicationContext().getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE).edit().putString("flutter.npush-token", token).apply();
-    }
-
-    private void sendNotification(Map<String, String> data) {
-        String channelId, messageBody, messageTitle, imageUrl, nTag, channelDescription;
-        boolean autoCancel;
-        if (!data.containsKey("body")) {
-            messageBody = "";
-        } else {
-            messageBody = data.get("body");
-        }
-        if (messageBody != null && messageBody.equals(LocationUtils.REQUEST_LOCATION_NOTIFICATION)) {
-            Log.d(TAG, "Location update request received");
-            LocationUtils.requestLocationOnce(this);
-            return;
-        }
-        String customChannelId = data.get("channelId");
-        if (customChannelId == null) {
-            channelId = "ha_notify";
-            channelDescription = "Default notification channel";
-        } else {
-            channelId = customChannelId;
-            channelDescription = channelId;
-        }
-        if (!data.containsKey("title")) {
-            messageTitle = "HA Client";
-        } else {
-            messageTitle = data.get("title");
-        }
-        if (!data.containsKey("tag")) {
-            nTag = String.valueOf(System.currentTimeMillis());
-        } else {
-            nTag = data.get("tag");
-        }
-        if (data.containsKey("dismiss")) {
-            try {
-                boolean dismiss = Boolean.parseBoolean(data.get("dismiss"));
-                if (dismiss) {
-                    NotificationManager notificationManager =
-                        (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-                    notificationManager.cancel(nTag, 0);
-                    return;
-                }
-            } catch (Exception e) {
-                //nope
-            }
-        }
-        if (data.containsKey("autoDismiss")) {
-            try {
-                autoCancel = Boolean.parseBoolean(data.get("autoDismiss"));
-            } catch (Exception e) {
-                autoCancel = true;
-            }
-        } else {
-            autoCancel = true;
-        }
-        imageUrl = data.get("image");
-        Intent intent = new Intent(this, MainActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0 /* Request code */, intent,
-                PendingIntent.FLAG_ONE_SHOT);
-        Uri defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
-        NotificationCompat.Builder notificationBuilder =
-                new NotificationCompat.Builder(this, channelId)
-                        .setSmallIcon(R.drawable.mini_icon)
-                        .setContentTitle(messageTitle)
-                        .setContentText(messageBody)
-                        .setAutoCancel(autoCancel)
-                        .setSound(defaultSoundUri)
-                        .setContentIntent(pendingIntent);
-        Bitmap image = null;
-        if (URLUtil.isValidUrl(imageUrl)) {
-            image = getBitmapFromURL(imageUrl);
-        }
-        if (image != null) {
-            notificationBuilder.setStyle(new NotificationCompat.BigPictureStyle().bigPicture(image).bigLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.blank_icon)));
-            notificationBuilder.setLargeIcon(image);
-        } else {
-            notificationBuilder.setStyle(new NotificationCompat.BigTextStyle()
-                    .bigText(messageBody));
-        }
-        for (int i = 1; i <= 3; i++) {
-            if (data.containsKey("action" + i)) {
-                Intent broadcastIntent = new Intent(this, NotificationActionReceiver.class).setAction(NOTIFICATION_ACTION_BROADCAST);
-                if (autoCancel) {
-                    broadcastIntent.putExtra("tag", nTag);
-                }
-                broadcastIntent.putExtra("actionData", data.get("action" + i + "_data"));
-                PendingIntent actionIntent = PendingIntent.getBroadcast(this, i, broadcastIntent, PendingIntent.FLAG_CANCEL_CURRENT);
-                notificationBuilder.addAction(R.drawable.blank_icon, data.get("action" + i), actionIntent);
-            }   
-        }
-        NotificationManager notificationManager =
-                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-
-        // Since android Oreo notification channel is needed.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel(channelId,
-                    channelDescription,
-                    NotificationManager.IMPORTANCE_HIGH);
-            notificationManager.createNotificationChannel(channel);
-        }
-
-        notificationManager.notify(nTag, 0 /* ID of notification */, notificationBuilder.build());
-    }
-
-    private Bitmap getBitmapFromURL(String imageUrl) {
-        try {
-            URL url = new URL(imageUrl);
-            URLConnection connection = url.openConnection();
-            connection.setDoInput(true);
-            connection.connect();
-            InputStream input = connection.getInputStream();
-            return BitmapFactory.decodeStream(input);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-}

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

@@ -1,54 +0,0 @@
-package com.keyboardcrumbs.hassclient;
-
-import android.app.AlarmManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.work.BackoffPolicy;
-import androidx.work.Constraints;
-import androidx.work.Data;
-import androidx.work.ExistingWorkPolicy;
-import androidx.work.NetworkType;
-import androidx.work.OneTimeWorkRequest;
-import androidx.work.WorkManager;
-
-import java.util.concurrent.TimeUnit;
-
-
-public class NextAlarmBroadcastReceiver extends BroadcastReceiver {
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (intent == null) {
-            return;
-        }
-
-        final boolean isBootIntent = Intent.ACTION_BOOT_COMPLETED.equalsIgnoreCase(intent.getAction());
-        final boolean isNextAlarmIntent = AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED.equalsIgnoreCase(intent.getAction());
-        if (!isBootIntent && !isNextAlarmIntent) {
-            return;
-        }
-        Constraints constraints = new Constraints.Builder()
-                .setRequiredNetworkType(NetworkType.CONNECTED)
-                .build();
-
-        Data workerData = new Data.Builder()
-                .putInt(SendDataHomeWorker.DATA_TYPE_KEY, SendDataHomeWorker.DATA_TYPE_NEXT_ALARM)
-                .build();
-
-        OneTimeWorkRequest uploadWorkRequest =
-                new OneTimeWorkRequest.Builder(SendDataHomeWorker.class)
-                        .setBackoffCriteria(
-                                BackoffPolicy.EXPONENTIAL,
-                                10,
-                                TimeUnit.SECONDS)
-                        .setInputData(workerData)
-                        .setConstraints(constraints)
-                        .build();
-
-        WorkManager
-                .getInstance(context)
-                .enqueueUniqueWork("NextAlarmUpdate", ExistingWorkPolicy.REPLACE, uploadWorkRequest);
-    }
-}

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

@@ -1,58 +0,0 @@
-package com.keyboardcrumbs.hassclient;
-
-import android.content.Context;
-import android.content.BroadcastReceiver;
-import android.content.Intent;
-
-import android.app.NotificationManager;
-
-import androidx.work.BackoffPolicy;
-import androidx.work.Constraints;
-import androidx.work.Data;
-import androidx.work.ExistingWorkPolicy;
-import androidx.work.NetworkType;
-import androidx.work.OneTimeWorkRequest;
-import androidx.work.WorkManager;
-
-import java.util.concurrent.TimeUnit;
-
-public class NotificationActionReceiver extends BroadcastReceiver {
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (intent == null) {
-            return;
-        }
-        String intentAction = intent.getAction();
-        if (intentAction == null || !intentAction.equalsIgnoreCase(MessagingService.NOTIFICATION_ACTION_BROADCAST)) {
-            return;
-        }
-        String rawActionData = intent.getStringExtra("actionData");
-        if (intent.hasExtra("tag")) {
-            String notificationTag = intent.getStringExtra("tag");
-            NotificationManager notificationManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
-            notificationManager.cancel(notificationTag, 0);
-        }
-        Constraints constraints = new Constraints.Builder()
-                .setRequiredNetworkType(NetworkType.CONNECTED)
-                .build();
-        Data workerData = new Data.Builder()
-                .putInt(SendDataHomeWorker.DATA_TYPE_KEY, SendDataHomeWorker.DATA_TYPE_NOTIFICATION_ACTION)
-                .putString("rawActionData", rawActionData)
-                .build();
-
-        OneTimeWorkRequest uploadWorkRequest =
-                new OneTimeWorkRequest.Builder(SendDataHomeWorker.class)
-                        .setBackoffCriteria(
-                                BackoffPolicy.EXPONENTIAL,
-                                10,
-                                TimeUnit.SECONDS)
-                        .setInputData(workerData)
-                        .setConstraints(constraints)
-                        .build();
-
-        WorkManager
-                .getInstance(context)
-                .enqueueUniqueWork("NotificationAction", ExistingWorkPolicy.APPEND, uploadWorkRequest);
-    }
-}

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

@@ -1,15 +0,0 @@
-package com.keyboardcrumbs.hassclient;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-public class RestartLocationUpdate extends BroadcastReceiver {
-
-    public void onReceive(Context context, Intent intent) {
-        if (LocationUtils.getLocationUpdatesState(context) == LocationUtils.LOCATION_UPDATES_SERVICE &&
-                (Intent.ACTION_BOOT_COMPLETED.equalsIgnoreCase(intent.getAction()) || Intent.ACTION_MY_PACKAGE_REPLACED.equalsIgnoreCase(intent.getAction()))) {
-            LocationUtils.startServiceFromBroadcast(context);
-        }
-    }
-}

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

@@ -1,220 +0,0 @@
-package com.keyboardcrumbs.hassclient;
-
-import android.app.AlarmManager;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.BatteryManager;
-import android.util.Log;
-import android.webkit.URLUtil;
-
-import androidx.annotation.NonNull;
-import androidx.work.Worker;
-import androidx.work.WorkerParameters;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-public class SendDataHomeWorker extends Worker {
-    public static final String DATA_TYPE_KEY = "dataType";
-
-    public static final int DATA_TYPE_LOCATION = 1;
-    public static final int DATA_TYPE_NEXT_ALARM = 2;
-    public static final int DATA_TYPE_NOTIFICATION_ACTION = 3;
-
-    private Context currentContext;
-    private static final String TAG = "SendDataHomeWorker";
-
-    public static final String KEY_LAT_ARG = "Lat";
-    public static final String KEY_LONG_ARG = "Long";
-    public static final String KEY_ACC_ARG = "Acc";
-
-    private static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:00", Locale.ENGLISH);
-    private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH);
-    private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm:00", Locale.ENGLISH);
-
-    public SendDataHomeWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
-        super(context, workerParams);
-        currentContext = context;
-    }
-
-    @NonNull
-    @Override
-    public Result doWork() {
-        Log.d(TAG, "Start sending data home");
-        SharedPreferences prefs = currentContext.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE);
-        String webhookId = prefs.getString("flutter.app-webhook-id", null);
-        if (webhookId != null) {
-            try {
-                String requestUrl = prefs.getString("flutter.hassio-res-protocol", "") +
-                        "://" +
-                        prefs.getString("flutter.hassio-domain", "") +
-                        ":" +
-                        prefs.getString("flutter.hassio-port", "") + "/api/webhook/" + webhookId;
-                if (URLUtil.isValidUrl(requestUrl)) {
-                    int dataType = getInputData().getInt(DATA_TYPE_KEY, 0);
-                    String stringRequest;
-                    if (dataType == DATA_TYPE_LOCATION) {
-                        Log.d(TAG, "Location data");
-                        stringRequest = getLocationDataToSend();
-                    } else if (dataType == DATA_TYPE_NEXT_ALARM) {
-                        Log.d(TAG, "Next alarm data");
-                        stringRequest = getNextAlarmDataToSend();
-                    } else if (dataType == DATA_TYPE_NOTIFICATION_ACTION) {
-                        Log.d(TAG, "Notification action data");
-                        stringRequest = getNotificationActionData();
-                    } else {
-                        Log.e(TAG, "doWork() unknown data type: " + dataType);
-                        return Result.failure();
-                    }
-                    try {
-                        URL url = new URL(requestUrl);
-                        HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
-                        urlConnection.setRequestMethod("POST");
-                        urlConnection.setRequestProperty("Content-Type", "application/json");
-                        urlConnection.setDoOutput(true);
-                        assert stringRequest != null;
-                        byte[] outputBytes = stringRequest.getBytes(StandardCharsets.UTF_8);
-                        OutputStream os = urlConnection.getOutputStream();
-                        os.write(outputBytes);
-
-                        int responseCode = urlConnection.getResponseCode();
-                        urlConnection.disconnect();
-                        if (responseCode >= 300) {
-                            return Result.retry();
-                        }
-                    } catch (Exception e) {
-                        Log.e(TAG, "Error sending data", e);
-                        return Result.retry();
-                    }
-                } else {
-                    Log.w(TAG, "Invalid HA url");
-                    return Result.failure();
-                }
-            } catch (Exception e) {
-                Log.e(TAG, "Error =(", e);
-                return Result.failure();
-            }
-        } else {
-            Log.w(TAG, "Webhook id not found");
-            return Result.failure();
-        }
-        return Result.success();
-    }
-
-    private String getLocationDataToSend() {
-        try {
-            JSONObject dataToSend = new JSONObject();
-            dataToSend.put("type", "update_location");
-            JSONObject dataObject = new JSONObject();
-
-            JSONArray gps = new JSONArray();
-            gps.put(0, getInputData().getDouble(KEY_LAT_ARG, 0));
-            gps.put(1, getInputData().getDouble(KEY_LONG_ARG, 0));
-
-            dataObject.put("gps", gps);
-            dataObject.put("gps_accuracy", getInputData().getFloat(KEY_ACC_ARG, 0));
-
-            BatteryManager bm;
-            if (android.os.Build.VERSION.SDK_INT >= 23) {
-                bm = currentContext.getSystemService(BatteryManager.class);
-            } else {
-                bm = (BatteryManager)currentContext.getSystemService(Context.BATTERY_SERVICE);
-            }
-            int batLevel = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY);
-
-            dataObject.put("battery", batLevel);
-
-            dataToSend.put("data", dataObject);
-            return dataToSend.toString();
-        } catch (Exception e) {
-            Log.e(TAG,"getLocationDataToSend", e);
-            return null;
-        }
-    }
-
-    private String getNotificationActionData() {
-        try {
-            String rawActionData = getInputData().getString("rawActionData");
-            if (rawActionData == null || rawActionData.length() == 0) {
-                Log.e(TAG,"getNotificationActionData rawAction data is empty");
-                return null;
-            }
-            JSONObject actionData = new JSONObject(rawActionData);
-            JSONObject dataToSend = new JSONObject();
-            JSONObject requestData = new JSONObject();
-            if (actionData.getString("action").equals("call-service")) {
-                dataToSend.put("type", "call_service");
-                requestData.put("domain", actionData.getString("service").split("\\.")[0]);
-                requestData.put("service", actionData.getString("service").split("\\.")[1]);
-                if (actionData.has("service_data")) {
-                    requestData.put("service_data", actionData.get("service_data"));
-                }
-            } else {
-                dataToSend.put("type", "fire_event");
-                requestData.put("event_type", "ha_client_event");
-                JSONObject eventData = new JSONObject();
-                eventData.put("action", actionData.getString("action"));
-                requestData.put("event_data", eventData);
-            }
-            dataToSend.put("data", requestData);
-            return dataToSend.toString();
-        } catch (Exception e) {
-            Log.e(TAG,"getNotificationActionData", e);
-            return null;
-        }
-    }
-
-    private String getNextAlarmDataToSend() {
-        try {
-            final AlarmManager alarmManager;
-            if (android.os.Build.VERSION.SDK_INT >= 23) {
-                alarmManager = currentContext.getSystemService(AlarmManager.class);
-            } else {
-                alarmManager = (AlarmManager)currentContext.getSystemService(Context.ALARM_SERVICE);
-            }
-
-            final AlarmManager.AlarmClockInfo alarmClockInfo = alarmManager.getNextAlarmClock();
-
-            JSONObject dataToSend = new JSONObject();
-            dataToSend.put("type", "update_sensor_states");
-            JSONArray dataArray = new JSONArray();
-            JSONObject sensorData = new JSONObject();
-            JSONObject sensorAttrs = new JSONObject();
-            sensorData.put("unique_id", "next_alarm");
-            sensorData.put("type", "sensor");
-            final long triggerTimestamp;
-            if (alarmClockInfo != null) {
-                triggerTimestamp = alarmClockInfo.getTriggerTime();
-                final Calendar calendar = Calendar.getInstance();
-                calendar.setTimeInMillis(triggerTimestamp);
-                Date date = calendar.getTime();
-                sensorData.put("state", DATE_TIME_FORMAT.format(date));
-                sensorAttrs.put("date", DATE_FORMAT.format(date));
-                sensorAttrs.put("time", TIME_FORMAT.format(date));
-                sensorAttrs.put("timestamp", triggerTimestamp);
-            } else {
-                sensorData.put("state", "");
-                sensorAttrs.put("date", "");
-                sensorAttrs.put("time", "");
-                sensorAttrs.put("timestamp", 0);
-            }
-            sensorData.put("icon", "mdi:alarm");
-            sensorData.put("attributes", sensorAttrs);
-            dataArray.put(0, sensorData);
-            dataToSend.put("data", dataArray);
-            return dataToSend.toString();
-        } catch (Exception e) {
-            Log.e(TAG,"getNextAlarmDataToSend", e);
-            return null;
-        }
-    }
-}

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-
-    <group>
-        <clip-path
-            android:pathData="M 0 0 H 108 V 108 H 0 V 0 Z" />
-        <path
-            android:fillColor="#709ac1"
-            android:fillAlpha="0"
-            android:pathData="M 0 0 H 108 V 108 H 0 V 0 Z" />
-        <path
-            android:fillColor="#000000"
-            android:fillAlpha="0.12"
-            android:pathData="M 70.506 38.389 L 108 72.466 L 108 108 L 77 108 L 35.066 72.466 L 38.373 63.769 L 36.268 50.216 L 43.335 44.523 L 51.841 34.578 L 63.096 42.478 L 68.586 42.478 L 70.506 38.389 Z" />
-        <path
-            android:fillColor="#000000"
-            android:fillAlpha="0.12"
-            android:pathData="M 28.979 53.708 L 47.736 67.31 L 38.373 58.563 L 36.268 51.52 L 28.979 53.708 Z" />
-        <path
-            android:fillColor="#ffffff"
-            android:pathData="M 77.131 54.24 L 72.878 54.24 L 72.878 72.415 L 56.339 72.415 L 56.339 64.85 L 62.931 58.511 L 64.609 58.784 C 67.349 58.784 69.57 56.649 69.57 54.013 C 69.57 51.378 67.349 49.242 64.609 49.242 C 61.868 49.242 59.647 51.378 59.647 54.013 L 59.883 55.626 L 56.339 59.079 L 56.339 46.63 C 57.898 45.812 58.938 44.244 58.938 42.427 C 58.938 39.792 56.717 37.656 53.976 37.656 C 51.236 37.656 49.015 39.792 49.015 42.427 C 49.015 44.244 50.054 45.812 51.614 46.63 L 51.614 59.079 L 48.07 55.626 L 48.306 54.013 C 48.306 51.378 46.084 49.242 43.344 49.242 C 40.604 49.242 38.383 51.378 38.383 54.013 C 38.383 56.648 40.604 58.784 43.344 58.784 L 45.022 58.511 L 51.614 64.85 L 51.614 72.415 L 35.075 72.415 L 35.075 54.24 L 30.94 54.24 C 29.948 54.24 28.979 54.24 28.979 53.763 C 29.003 53.263 29.995 52.309 31.011 51.332 L 51.614 31.522 C 52.393 30.772 53.197 30 53.976 30 C 54.756 30 55.559 30.772 56.339 31.522 L 65.79 40.609 L 65.79 38.338 L 70.515 38.338 L 70.515 45.153 L 77.084 51.469 C 78.029 52.377 78.997 53.309 79.021 53.786 C 79.021 54.24 78.076 54.24 77.131 54.24 Z M 43.344 51.969 C 43.908 51.969 44.449 52.184 44.848 52.567 C 45.247 52.951 45.471 53.471 45.471 54.013 C 45.471 54.555 45.247 55.076 44.848 55.459 C 44.449 55.842 43.908 56.058 43.344 56.058 C 42.78 56.058 42.239 55.842 41.841 55.459 C 41.442 55.076 41.218 54.555 41.218 54.013 C 41.218 53.471 41.442 52.951 41.841 52.567 C 42.239 52.184 42.78 51.969 43.344 51.969 Z M 64.609 51.969 C 65.79 51.969 66.735 52.877 66.735 54.013 C 66.735 55.149 65.79 56.058 64.609 56.058 C 64.045 56.058 63.504 55.842 63.105 55.459 C 62.706 55.076 62.482 54.555 62.482 54.013 C 62.482 53.471 62.706 52.951 63.105 52.567 C 63.504 52.184 64.045 51.969 64.609 51.969 Z M 53.976 40.382 C 55.158 40.382 56.103 41.291 56.103 42.427 C 56.103 43.563 55.158 44.472 53.976 44.472 C 52.795 44.472 51.85 43.563 51.85 42.427 C 51.85 41.291 52.795 40.382 53.976 40.382 Z" />
-    </group>
-</vector>

android/app/src/main/res/drawable/launch_background.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/main_color" />
+    <item android:drawable="@android:color/white" />
 
     <!-- You can insert your own image assets here -->
     <!-- <item>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/main_color"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/main_color"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

android/app/src/main/res/values/styles.xml

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="main_color">#709AC1</color>
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
-    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <item name="android:windowBackground">@drawable/launch_background</item>
-    </style>
 </resources>

android/build.gradle

@@ -2,15 +2,11 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven {
-            url 'https://maven.fabric.io/public'
-        }
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.2'
-        classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'io.fabric.tools:gradle:1.26.1'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
@@ -18,9 +14,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven {
-            url 'https://maven.fabric.io/public'
-        }
     }
 }
 

android/gradle.properties

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

android/settings_aar.gradle

@@ -1 +0,0 @@
-include ':app'

assets/html/cameraLiveView.html

@@ -1,61 +0,0 @@
-<html>
-<head>
-<script src="https://cdn.jsdelivr.net/npm/hls.js@latest"></script>
-<style>
-    body {
-        padding: 0;
-        margin: 0;
-        widows: 100%;
-        height: 100%;
-    }
-
-    video {
-        width: 100%;
-    }
-</style>
-<script>
-    var messageChannel = '{{message_channel}}';
-</script>
-</head>
-<body>
-<video id="screen" width="100%" controls></video>
-<script>
-if (Hls.isSupported()) {
-    var video = document.getElementById('screen');
-    var hls = new Hls();
-    hls.on(Hls.Events.ERROR, function (event, data) {
-            if (data.fatal) {
-            switch(data.type) {
-            case Hls.ErrorTypes.NETWORK_ERROR:
-            // try to recover network error
-                console.log("fatal network error encountered, try to recover");
-                hls.startLoad();
-                break;
-            case Hls.ErrorTypes.MEDIA_ERROR:
-                console.log("fatal media error encountered, try to recover");
-                hls.recoverMediaError();
-                break;
-            default:
-            // cannot recover
-                hls.destroy();
-                break;
-            }
-            }
-        });
-    // bind them together
-    hls.attachMedia(video);
-    hls.on(Hls.Events.MEDIA_ATTACHED, function () {
-        console.log("video and hls.js are now bound together !");
-        hls.loadSource("{{stream_url}}");
-        hls.on(Hls.Events.MANIFEST_PARSED, function (event, data) {
-            console.log("manifest loaded, found " + data.levels.length + " quality level");
-            video.play();
-            video.onloadedmetadata = function() {
-                window[messageChannel].postMessage(document.body.clientWidth / video.offsetHeight);
-            };
-        });
-    });
-}
-</script>
-</body>
-</html>

assets/html/cameraView.html

@@ -1,28 +0,0 @@
-<html>
-<head>
-<style>
-    body {
-        padding: 0;
-        margin: 0;
-        widows: 100%;
-        height: 100%;
-    }
-
-    img {
-        width: 100%;
-    }
-</style>
-<script>
-    var messageChannel = '{{message_channel}}';
-    window.onload = function() {
-        var img = document.getElementById('screen');
-        if (img) {
-            window[messageChannel].postMessage(document.body.clientWidth / img.offsetHeight);
-        }
-    };
-</script>
-</head>
-<body>
-<img id="screen" src="{{stream_url}}">
-</body>
-</html>

assets/js/externalAuth.js

@@ -11,27 +11,6 @@ window.externalApp.getExternalAuth = function(options) {
         setTimeout(function(){
             console.log("Calling a callback");
             window[options.callback](true, responseData);
-        }, 900);
-    }
-};
-/*
-window.externalApp.externalBus = function(message) {
-    console.log("External bus message: " + message);
-    var messageObj = JSON.parse(message);
-    if (messageObj.type == "config/get") {
-        var responseData = {
-            id: messageObj.id,
-            type: "result",
-            success: true,
-            result: {
-                hasSettingsScreen: true
-            }
-        };
-        setTimeout(function(){
-            window.externalBus(responseData);
         }, 500);
-    } else if (messageObj.type == "config_screen/show") {
-        HAClient.postMessage('show-settings');
     }
 };
-*/

lib/cards/alarm_panel_card.dart

@@ -1,62 +0,0 @@
-part of '../main.dart';
-
-class AlarmPanelCard extends StatelessWidget {
-  final AlarmPanelCardData card;
-
-  const AlarmPanelCard({Key key, this.card}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    if (card.entity.entity.statelessType == StatelessEntityType.missed) {
-      return EntityModel(
-        entityWrapper: card.entity,
-        child: MissedEntityWidget(),
-        handleTap: false,
-      );
-    }
-    List<Widget> body = [];
-    body.add(CardHeader(
-      name: card.name ?? "",
-      subtitle: Text("${card.entity.entity.displayState}",
-    ),
-    trailing: Row(
-      mainAxisSize: MainAxisSize.min,
-      mainAxisAlignment: MainAxisAlignment.end,
-      children: [
-        EntityIcon(
-          size: 50.0,
-        ),
-        Container(
-            width: 26.0,
-            child: IconButton(
-                padding: EdgeInsets.all(0.0),
-                alignment: Alignment.centerRight,
-                icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
-                    "mdi:dots-vertical")),
-                onPressed: () => eventBus.fire(new ShowEntityPageEvent(entityId: card.entity.entity.entityId))
-            )
-        )
-      ]
-    ),
-    ));
-    body.add(
-        AlarmControlPanelControlsWidget(
-          extended: true,
-          states: card.states,
-        )
-    );
-    return CardWrapper(
-        child: EntityModel(
-            entityWrapper: card.entity,
-            handleTap: null,
-            child: Column(
-                crossAxisAlignment: CrossAxisAlignment.center,
-                mainAxisSize: MainAxisSize.min,
-                children: body
-            )
-        )
-    );
-  }
-
-  
-}

lib/cards/badges.dart

@@ -1,196 +0,0 @@
-part of '../main.dart';
-
-class Badges extends StatelessWidget {
-  final BadgesData badges;
-
-  const Badges({Key key, this.badges}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    List<EntityWrapper> entitiesToShow = badges.getEntitiesToShow();
-    
-    if (entitiesToShow.isNotEmpty) {
-      if (AppSettings().scrollBadges) {
-        return ConstrainedBox(
-          constraints: BoxConstraints.tightFor(height: 112),
-          child: SingleChildScrollView(
-            scrollDirection: Axis.horizontal,
-            child: Row(
-              mainAxisSize: MainAxisSize.min,
-              mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: entitiesToShow.map((entity) =>
-                EntityModel(
-                  entityWrapper: entity,
-                  child: Padding(
-                    padding: EdgeInsets.fromLTRB(5, 10, 5, 10),
-                    child: BadgeWidget(),
-                  ),
-                  handleTap: true,
-                )).toList()
-            ),
-          )
-        );
-      } else {
-        return Padding(
-          padding: EdgeInsets.fromLTRB(5, 10, 5, 10),
-          child: Wrap(
-            alignment: WrapAlignment.center,
-            spacing: 10.0,
-            runSpacing: 5,
-            children: entitiesToShow.map((entity) =>
-                EntityModel(
-                  entityWrapper: entity,
-                  child: BadgeWidget(),
-                  handleTap: true,
-                )).toList(),
-          )
-        );
-      }
-    }
-    return Container(height: 0.0, width: 0.0,);
-  }
-}
-
-class BadgeWidget extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    final entityModel = EntityModel.of(context);
-    Widget badgeIcon;
-    String onBadgeTextValue;
-    Color iconColor = HAClientTheme().getBadgeColor(entityModel.entityWrapper.entity.domain);
-    switch (entityModel.entityWrapper.entity.domain) {
-      case "sun":
-        {
-          IconData iconData;
-          if (entityModel.entityWrapper.entity.state == "below_horizon") {
-            iconData = MaterialDesignIcons.getIconDataFromIconCode(0xf0dc);
-          } else {
-            iconData = MaterialDesignIcons.getIconDataFromIconCode(0xf5a8);
-          }
-          badgeIcon = Padding(
-            padding: EdgeInsets.all(10),
-            child: Icon(
-              iconData,
-            )
-          );
-          break;
-        }
-      case "camera":
-      case "media_player":
-      case "binary_sensor":
-        {
-          badgeIcon = EntityIcon(
-            imagePadding: EdgeInsets.all(0.0),
-            iconPadding: EdgeInsets.all(10),
-            color: Theme.of(context).textTheme.body2.color
-          );
-          break;
-        }
-      case "device_tracker":
-      case "person":
-        {
-          badgeIcon = EntityIcon(
-            imagePadding: EdgeInsets.all(0.0),
-            iconPadding: EdgeInsets.all(10),
-            color: Theme.of(context).textTheme.body2.color
-          );
-          onBadgeTextValue = entityModel.entityWrapper.entity.displayState;
-          break;
-        }
-      default:
-        {
-          onBadgeTextValue = entityModel.entityWrapper.unitOfMeasurement;
-          badgeIcon = Padding(
-            padding: EdgeInsets.all(4),
-            child: Text(
-              "${entityModel.entityWrapper.entity.displayState}",
-              overflow: TextOverflow.fade,
-              softWrap: false,
-              textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.body1
-            )
-          );
-          break;
-        }
-    }
-    Widget onBadgeText;
-    if (onBadgeTextValue == null || onBadgeTextValue.length == 0) {
-      onBadgeText = Container(width: 0.0, height: 0.0);
-    } else {
-      onBadgeText = Container(
-        constraints: BoxConstraints(maxWidth: 50),
-        padding: EdgeInsets.fromLTRB(6.0, 2.0, 6.0, 2.0),
-        child: Text("$onBadgeTextValue",
-            style: Theme.of(context).textTheme.overline.copyWith(
-              color: HAClientTheme().getOnBadgeTextColor()
-            ),
-            textAlign: TextAlign.center,
-            softWrap: false,
-            overflow: TextOverflow.ellipsis
-          ),
-        decoration: new BoxDecoration(
-          color: iconColor,
-          borderRadius: BorderRadius.circular(9.0),
-        )
-      );
-    }
-    return GestureDetector(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: <Widget>[
-            Stack(
-              overflow: Overflow.visible,
-              alignment: Alignment.center,
-              children: <Widget>[
-                Container(
-                  width: 45,
-                  height: 45,
-                  decoration: new BoxDecoration(
-                    // Circle shape
-                    shape: BoxShape.circle,
-                    color: Theme.of(context).cardColor,
-                    // The border you want
-                    border: Border.all(
-                      width: 2.0,
-                      color: iconColor,
-                    ),
-                  ),
-                ),
-                SizedBox(
-                  width: 41,
-                  height: 41,
-                  child: FittedBox(
-                    fit: BoxFit.contain,
-                    alignment: Alignment.center,
-                    child: badgeIcon,
-                  )
-                ),
-                Positioned(
-                  bottom: -6,
-                  child: onBadgeText
-                )
-              ],
-            ),
-            Container(
-              constraints: BoxConstraints(maxWidth: 45),
-              padding: EdgeInsets.only(top: 10),
-              child: Text(
-                "${entityModel.entityWrapper.displayName}",
-                textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.caption.copyWith(
-                  fontSize: 10
-                ),
-                softWrap: true,
-                maxLines: 3,
-                overflow: TextOverflow.ellipsis,
-              ),
-            )
-          ],
-        ),
-        onTap: () => entityModel.entityWrapper.handleTap(),
-        onDoubleTap: () => entityModel.entityWrapper.handleDoubleTap(),
-        onLongPress: () => entityModel.entityWrapper.handleHold(),
-    );
-  }
-}

lib/cards/card.class.dart

@@ -1,730 +1,64 @@
 part of '../main.dart';
 
-class CardData {
-
-  String type;
+class HACard {
   List<EntityWrapper> entities = [];
-  List conditions;
+  List<HACard> childCards = [];
+  EntityWrapper linkedEntityWrapper;
+  String name;
+  String id;
+  String type;
+  bool showName;
+  bool showState;
   bool showEmpty;
+  int columnsCount;
   List stateFilter;
-  bool stateColor = true;
+  List states;
+  List conditions;
+  String content;
+  String unit;
+  int min;
+  int max;
+  Map severity;
 
-  EntityWrapper get entity => entities.isNotEmpty ? entities[0] : null;
-
-  factory CardData.parse(rawData) {
-    try {
-      if (rawData['type'] == null) {
-        rawData['type'] = CardType.ENTITIES;
-      } else if (!(rawData['type'] is String)) {
-        return CardData(null);
-      }
-      switch (rawData['type']) {
-          case CardType.ENTITIES:
-          case CardType.HISTORY_GRAPH:
-          case CardType.PICTURE_GLANCE:
-          case CardType.SENSOR:
-          case CardType.ENTITY:
-          case CardType.WEATHER_FORECAST:
-          case CardType.PLANT_STATUS:
-            if (rawData['entity'] != null) {
-              rawData['entities'] = [rawData['entity']];
-            }
-            return EntitiesCardData(rawData);
-            break;
-          case CardType.ALARM_PANEL:
-            return AlarmPanelCardData(rawData);
-            break;
-          case CardType.LIGHT:
-            return LightCardData(rawData);
-            break;
-          case CardType.PICTURE_ELEMENTS:
-            //TODO temporary solution 
-            if (rawData.containsKey('camera_image')) {
-              rawData['entity'] = rawData['camera_image'];
-              return ButtonCardData(rawData);
-            } else {
-              return CardData(null);
-            }
-            break;
-          case CardType.MAP:
-            return MapCardData(rawData);
-            break;
-          case CardType.ENTITY_BUTTON:
-          case CardType.BUTTON:
-          case CardType.PICTURE_ENTITY:
-            return ButtonCardData(rawData);
-            break;
-          case CardType.CONDITIONAL:
-            return CardData.parse(rawData['card']);
-            break;
-          case CardType.ENTITY_FILTER:
-            Map cardData = Map.from(rawData);
-            cardData.remove('type');
-            if (rawData.containsKey('card')) {
-              cardData.addAll(rawData['card']);
-            }
-            cardData['type'] ??= CardType.ENTITIES;
-            return CardData.parse(cardData);
-            break;
-          case CardType.GAUGE:
-            return GaugeCardData(rawData);
-            break;
-          case CardType.GLANCE:
-          case CardType.THERMOSTAT:
-            if (rawData['entity'] != null) {
-              rawData['entities'] = [rawData['entity']];
-            }
-            return GlanceCardData(rawData);
-            break;
-          case CardType.HORIZONTAL_STACK:
-            return HorizontalStackCardData(rawData);
-            break;
-          case CardType.VERTICAL_STACK:
-            return VerticalStackCardData(rawData);
-            break;
-          case CardType.MARKDOWN:
-            return MarkdownCardData(rawData);
-            break;
-          case CardType.MEDIA_CONTROL:
-            return MediaControlCardData(rawData);
-            break;
-          case CardType.BADGES:
-            return BadgesData(rawData);
-            break;
-          default:
-            if (rawData.containsKey('entity')) {
-              rawData['entities'] = [rawData['entity']]; 
-            }
-            if (rawData.containsKey('entities') && rawData['entities'] is List) {
-              return EntitiesCardData(rawData); 
-            }
-            return CardData(null);
-        }
-    } catch (error, stacktrace) {
-      Logger.e('Error parsing card $rawData: $error', stacktrace: stacktrace);
-      return ErrorCardData(rawData);
+  HACard({
+    this.name,
+    this.id,
+    this.linkedEntityWrapper,
+    this.columnsCount: 4,
+    this.showName: true,
+    this.showState: true,
+    this.stateFilter: const [],
+    this.showEmpty: true,
+    this.content,
+    this.states,
+    this.conditions: const [],
+    this.unit,
+    this.min,
+    this.max,
+    this.severity,
+    @required this.type
+  }) {
+    if (this.columnsCount <= 0) {
+      this.columnsCount = 4;
     }
   }
 
-  CardData(rawData) {
-    if (rawData != null && rawData is Map) {
-      type = rawData['type'];
-      conditions = rawData['conditions'] ?? [];
-      showEmpty = rawData['show_empty'] ?? true;
-      if (rawData.containsKey('state_filter') && rawData['state_filter'] is List) {
-        stateFilter = rawData['state_filter'];
-      } else {
-        stateFilter = [];
-      }
-    } else {
-      type = CardType.UNKNOWN;
-      conditions = [];
-      showEmpty = true;
-      stateFilter = [];
-    }
-  }
-
-  Widget buildCardWidget() {
-    return UnsupportedCard(card: this);
-  }
-
   List<EntityWrapper> getEntitiesToShow() {
     return entities.where((entityWrapper) {
-      if (entityWrapper.entity.isHidden) {
+      if (!ConnectionManager().useLovelace && entityWrapper.entity.isHidden) {
         return false;
       }
-      List currentStateFilter;
-      if (entityWrapper.stateFilter != null && entityWrapper.stateFilter.isNotEmpty) {
-        currentStateFilter = entityWrapper.stateFilter;
-      } else {
-        currentStateFilter = stateFilter;
+      if (stateFilter.isNotEmpty) {
+        return stateFilter.contains(entityWrapper.entity.state);
       }
-      bool showByFilter = currentStateFilter.isEmpty;
-      for (var allowedState in currentStateFilter) {
-        if (allowedState is String && allowedState == entityWrapper.entity.state) {
-          showByFilter = true;
-          break;
-        } else if (allowedState is Map) {
-          try {
-            var tmpVal = allowedState['attribute'] != null ? entityWrapper.entity.getAttribute(allowedState['attribute']) : entityWrapper.entity.state;
-            var valToCompareWith = allowedState['value'];
-            var valToCompare;
-            if (valToCompareWith is! String && tmpVal is String) {
-              valToCompare = double.tryParse(tmpVal);
-            } else {
-              valToCompare = tmpVal;
-            }
-            if (valToCompare != null) {
-              bool result;
-              switch (allowedState['operator']) {
-                case '<=': { result = valToCompare <= valToCompareWith;}
-                break;
-                
-                case '<': { result = valToCompare < valToCompareWith;}
-                break;
-
-                case '>=': { result = valToCompare >= valToCompareWith;}
-                break;
-
-                case '>': { result = valToCompare > valToCompareWith;}
-                break;
-
-                case '!=': { result = valToCompare != valToCompareWith;}
-                break;
-
-                case 'regex': {
-                  RegExp regExp = RegExp(valToCompareWith.toString());
-                  result = regExp.hasMatch(valToCompare.toString());
-                }
-                break;
-
-                default: {
-                    result = valToCompare == valToCompareWith;
-                  }
-              }
-              if (result) {
-                showByFilter = true;
-                break;
-              }  
-            }
-          } catch (e, stacktrace) {
-            Logger.e('Error filtering ${entityWrapper.entity.entityId} by $allowedState: $e', stacktrace: stacktrace);
-          }
-        }
-      }
-      return showByFilter;
+      return true;
     }).toList();
   }
 
-}
-
-class BadgesData extends CardData {
-
-  String title;
-  String icon;
-  bool showHeaderToggle;
-
-  @override
-  Widget buildCardWidget() {
-    return Badges(badges: this);
-  }
-  
-  BadgesData(rawData) : super(rawData) {
-    if (rawData['badges'] is List) {
-      rawData['badges'].forEach((dynamic rawBadge) {
-        if (rawBadge is String && HomeAssistant().entities.isExist(rawBadge)) {  
-          entities.add(EntityWrapper(entity: HomeAssistant().entities.get(rawBadge)));
-        } else if (rawBadge is Map && rawBadge.containsKey('entity') && HomeAssistant().entities.isExist(rawBadge['entity'])) {
-          entities.add(
-            EntityWrapper(
-              entity: HomeAssistant().entities.get(rawBadge['entity']),
-              overrideName: rawBadge["name"]?.toString(),
-              overrideIcon: rawBadge["icon"],
-            )
-          );
-        } else if (rawBadge is Map && rawBadge.containsKey('entities')) {
-          _parseEntities(rawBadge);
-        }
-      });    
-    }
-  }
-
-  void _parseEntities(rawData) {
-    var rawEntities = rawData['entities'] ?? [];
-    rawEntities.forEach((rawEntity) {
-      if (rawEntity is String) {
-        if (HomeAssistant().entities.isExist(rawEntity)) {
-          entities.add(EntityWrapper(
-            entity: HomeAssistant().entities.get(rawEntity),
-            stateFilter: rawData['state_filter'] ?? [],
-          ));
-        }
-      } else if (HomeAssistant().entities.isExist('${rawEntity['entity']}')) {
-        Entity e = HomeAssistant().entities.get(rawEntity["entity"]);
-        entities.add(
-          EntityWrapper(
-              entity: e,
-              overrideName: rawEntity["name"]?.toString(),
-              overrideIcon: rawEntity["icon"],
-              stateFilter: rawEntity['state_filter'] ?? (rawData['state_filter'] ?? []),
-              uiAction: EntityUIAction(rawEntityData: rawEntity)
-          )
-        );
-      }
-    });
-  }
-
-}
-
-class EntitiesCardData extends CardData {
-
-  String title;
-  String icon;
-  bool showHeaderToggle;
-
-  @override
-  Widget buildCardWidget() {
-    return EntitiesCard(card: this);
-  }
-  
-  EntitiesCardData(rawData) : super(rawData) {
-    //Parsing card data
-    title = rawData['title']?.toString();
-    icon = rawData['icon'] is String ? rawData['icon'] : null;
-    stateColor = rawData['state_color'] ?? false;
-    showHeaderToggle = rawData['show_header_toggle'] ?? false;
-    //Parsing entities
-    var rawEntities = rawData['entities'] ?? [];
-    rawEntities.forEach((rawEntity) {
-      if (rawEntity is String) {
-        if (HomeAssistant().entities.isExist(rawEntity)) {
-          entities.add(EntityWrapper(entity: HomeAssistant().entities.get(rawEntity)));
-        } else {
-          entities.add(EntityWrapper(entity: Entity.missed(rawEntity)));
-        }
-      } else {
-        if (rawEntity["type"] == "divider") {
-          entities.add(EntityWrapper(entity: Entity.divider()));
-        } else if (rawEntity["type"] == "section") {
-          entities.add(EntityWrapper(entity: Entity.section(rawEntity["label"] ?? "")));
-        } else if (rawEntity["type"] == "call-service") {
-          Map uiActionData = {
-            "tap_action": {
-              "action": EntityUIAction.callService,
-              "service": rawEntity["service"],
-              "service_data": rawEntity["service_data"]
-            },
-            "hold_action": EntityUIAction.none
-          };
-          entities.add(
-            EntityWrapper(
-              entity: Entity.callService(
-                icon: rawEntity["icon"],
-                name: rawEntity["name"]?.toString(),
-                service: rawEntity["service"],
-                actionName: rawEntity["action_name"]
-              ),
-              stateColor: rawEntity["state_color"] ?? stateColor,
-              uiAction: EntityUIAction(rawEntityData: uiActionData)
-            )
-          );
-        } else if (rawEntity["type"] == "weblink") {
-          Map uiActionData = {
-            "tap_action": {
-              "action": EntityUIAction.navigate,
-              "service": rawEntity["url"]
-            },
-            "hold_action": EntityUIAction.none
-          };
-          entities.add(EntityWrapper(
-              entity: Entity.weblink(
-                  icon: rawEntity["icon"],
-                  name: rawEntity["name"]?.toString(),
-                  url: rawEntity["url"]
-              ),
-              stateColor: rawEntity["state_color"] ?? stateColor,
-              uiAction: EntityUIAction(rawEntityData: uiActionData)
-          )
-          );
-        } else if (HomeAssistant().entities.isExist(rawEntity["entity"])) {
-          Entity e = HomeAssistant().entities.get(rawEntity["entity"]);
-          entities.add(
-            EntityWrapper(
-                entity: e,
-                stateColor: rawEntity["state_color"] ?? stateColor,
-                overrideName: rawEntity["name"]?.toString(),
-                overrideIcon: rawEntity["icon"],
-                stateFilter: rawEntity['state_filter'] ?? [],
-                uiAction: EntityUIAction(rawEntityData: rawEntity)
-            )
-          );
-        } else {
-          entities.add(EntityWrapper(entity: Entity.missed(rawEntity["entity"])));
-        }
-      }
-    });
-  }
-
-}
-
-class AlarmPanelCardData extends CardData {
-
-  String name;
-  List<dynamic> states;
-  
-  @override
-  Widget buildCardWidget() {
-    return AlarmPanelCard(card: this);
-  }
-  
-  AlarmPanelCardData(rawData) : super(rawData) {
-    //Parsing card data
-    name = rawData['name']?.toString();
-    states = rawData['states'];
-    //Parsing entity
-    var entitiId = rawData["entity"];
-    if (entitiId != null && entitiId is String) {
-      if (HomeAssistant().entities.isExist(entitiId)) {
-        entities.add(EntityWrapper(
-            entity: HomeAssistant().entities.get(entitiId),
-            stateColor: true,
-            overrideName: name
-        ));
-      } else {
-        entities.add(EntityWrapper(entity: Entity.missed(entitiId)));
-      }
-    }
-    
-  }
-
-}
-
-class LightCardData extends CardData {
-
-  String name;
-  String icon;
-  
-  @override
-  Widget buildCardWidget() {
-    if (this.entity != null && this.entity.entity is LightEntity) {
-      return LightCard(card: this);
-    }
-    return ErrorCard(
-      errorText: 'Specify an entity from within the light domain.',
-      showReportButton: false,
+  Widget build(BuildContext context) {
+    return CardWidget(
+      card: this,
     );
   }
 
-  LightCardData(rawData) : super(rawData) {
-    //Parsing card data
-    name = rawData['name']?.toString();
-    icon = rawData['icon'] is String ? rawData['icon'] : null;
-    //Parsing entity
-    var entitiId = rawData["entity"];
-    if (entitiId != null && entitiId is String) {
-      if (HomeAssistant().entities.isExist(entitiId)) {
-        entities.add(EntityWrapper(
-            entity: HomeAssistant().entities.get(entitiId),
-            overrideName: name,
-            overrideIcon: icon,
-            uiAction: EntityUIAction()..tapAction = EntityUIAction.toggle
-        ));
-      } else {
-        entities.add(EntityWrapper(entity: Entity.missed(entitiId)));
-      }
-    } else {
-      entities.add(EntityWrapper(entity: Entity.missed('$entitiId')));
-    }
-  }
-}
-
-class ButtonCardData extends CardData {
-
-  String name;
-  String icon;
-  bool showName;
-  bool showIcon;
-  double iconHeightPx = 0;
-  double iconHeightRem = 0;
-  
-  @override
-  Widget buildCardWidget() {
-    return EntityButtonCard(card: this);
-  }
-  
-  ButtonCardData(rawData) : super(rawData) {
-    //Parsing card data
-    name = rawData['name']?.toString();
-    icon = rawData['icon'] is String ? rawData['icon'] : null;
-    showName = rawData['show_name'] ?? true;
-    showIcon = rawData['show_icon'] ?? true;
-    stateColor = rawData['state_color'] ?? true;
-    var rawHeight = rawData['icon_height'];
-    if (rawHeight != null && rawHeight is String) {
-      if (rawHeight.contains('px')) {
-        iconHeightPx = double.tryParse(rawHeight.replaceFirst('px', '')) ?? 0;
-      } else if (rawHeight.contains('rem')) {
-        iconHeightRem = double.tryParse(rawHeight.replaceFirst('rem', '')) ?? 0; 
-      } else if (rawHeight.contains('em')) {
-        iconHeightRem = double.tryParse(rawHeight.replaceFirst('em', '')) ?? 0;
-      }
-    }
-    //Parsing entity
-    var entitiId = rawData["entity"];
-    if (entitiId != null && entitiId is String) {
-      if (HomeAssistant().entities.isExist(entitiId)) {
-        entities.add(EntityWrapper(
-            entity: HomeAssistant().entities.get(entitiId),
-            overrideName: name,
-            overrideIcon: icon,
-            stateColor: stateColor,
-            uiAction: EntityUIAction(
-              rawEntityData: rawData
-            )
-        ));
-      } else {
-        entities.add(EntityWrapper(entity: Entity.missed(entitiId)));
-      }
-    } else if (entitiId == null) {
-      entities.add(
-        EntityWrapper(
-          entity: Entity.ghost(
-            name,
-            icon,
-          ),
-          stateColor: stateColor,
-          uiAction: EntityUIAction(
-            rawEntityData: rawData
-          )
-        )
-      );
-    }
-  }
-}
-
-class GaugeCardData extends CardData {
-
-  String name;
-  String unit;
-  double min;
-  double max;
-  Map severity;
-
-  @override
-  Widget buildCardWidget() {
-    return GaugeCard(card: this);
-  }
-  
-  GaugeCardData(rawData) : super(rawData) {
-    //Parsing card data
-    name = rawData['name']?.toString();
-    unit = rawData['unit'];
-    if (rawData['min'] is int) {
-      min = rawData['min'].toDouble();  
-    } else if (rawData['min'] is double) {
-      min = rawData['min'];
-    } else {
-      min = 0;
-    }
-    if (rawData['max'] is int) {
-      max = rawData['max'].toDouble();  
-    } else if (rawData['max'] is double) {
-      max = rawData['max'];
-    } else {
-      max = 100;
-    }
-    severity = rawData['severity'];
-    //Parsing entity
-    var entitiId = rawData["entity"] is List ? rawData["entity"][0] : rawData["entity"];
-    if (entitiId != null && entitiId is String) {
-      if (HomeAssistant().entities.isExist(entitiId)) {
-        entities.add(EntityWrapper(
-            entity: HomeAssistant().entities.get(entitiId),
-            overrideName: name
-        ));
-      } else {
-        entities.add(EntityWrapper(entity: Entity.missed(entitiId)));
-      }
-    } else {
-      entities.add(EntityWrapper(entity: Entity.missed('$entitiId')));
-    }
-    
-  }
-
-}
-
-class GlanceCardData extends CardData {
-
-  String title;
-  bool showName;
-  bool showIcon;
-  bool showState;
-  bool stateColor;
-  int columnsCount;
-
-  @override
-  Widget buildCardWidget() {
-    return GlanceCard(card: this);
-  }
-  
-  GlanceCardData(rawData) : super(rawData) {
-    //Parsing card data
-    title = rawData["title"]?.toString();
-    showName = rawData['show_name'] ?? true;
-    showIcon = rawData['show_icon'] ?? true;
-    showState = rawData['show_state'] ?? true;
-    stateColor = rawData['state_color'] ?? true;
-    columnsCount = rawData['columns'] ?? 4;
-    //Parsing entities
-    var rawEntities = rawData["entities"] ?? [];
-    rawEntities.forEach((rawEntity) {
-      if (rawEntity is String) {
-        if (HomeAssistant().entities.isExist(rawEntity)) {
-          entities.add(EntityWrapper(entity: HomeAssistant().entities.get(rawEntity)));
-        } else {
-          entities.add(EntityWrapper(entity: Entity.missed(rawEntity)));
-        }
-      } else {
-        if (HomeAssistant().entities.isExist(rawEntity["entity"])) {
-          Entity e = HomeAssistant().entities.get(rawEntity["entity"]);
-          entities.add(
-            EntityWrapper(
-                entity: e,
-                stateColor: stateColor,
-                overrideName: rawEntity["name"]?.toString(),
-                overrideIcon: rawEntity["icon"],
-                stateFilter: rawEntity['state_filter'] ?? [],
-                uiAction: EntityUIAction(rawEntityData: rawEntity)
-            )
-          );
-        } else {
-          entities.add(EntityWrapper(entity: Entity.missed(rawEntity["entity"])));
-        }
-      }
-    });
-  }
-
-}
-
-class HorizontalStackCardData extends CardData {
-
-  List<CardData> childCards;
-
-  @override
-  Widget buildCardWidget() {
-    return HorizontalStackCard(card: this);
-  }
-  
-  HorizontalStackCardData(rawData) : super(rawData) {
-    if (rawData.containsKey('cards') && rawData['cards'] is List) {
-      childCards = rawData['cards'].map<CardData>((childCard) {
-        return CardData.parse(childCard);
-      }).toList();
-    } else {
-      childCards = [];
-    }
-  }
-
-}
-
-class VerticalStackCardData extends CardData {
-
-  List<CardData> childCards;
-
-  @override
-  Widget buildCardWidget() {
-    return VerticalStackCard(card: this);
-  }
-  
-  VerticalStackCardData(rawData) : super(rawData) {
-    if (rawData.containsKey('cards') && rawData['cards'] is List) {
-      childCards = rawData['cards'].map<CardData>((childCard) {
-        return CardData.parse(childCard);
-      }).toList();
-    } else {
-      childCards = [];
-    }
-  }
-
-}
-
-class MarkdownCardData extends CardData {
-
-  String title;
-  String content;
-
-  @override
-  Widget buildCardWidget() {
-    return MarkdownCard(card: this);
-  }
-  
-  MarkdownCardData(rawData) : super(rawData) {
-    //Parsing card data
-    title = rawData['title'];
-    content = rawData['content'];
-  }
-
-}
-
-class MapCardData extends CardData {
-
-  String title;
-
-  @override
-  Widget buildCardWidget() {
-    return MapCard(card: this);
-  }
-
-  MapCardData(rawData) : super(rawData) {
-    //Parsing card data
-    title = rawData['title'];
-    List<dynamic> geoLocationSources = rawData['geo_location_sources'] ?? [];
-    if (geoLocationSources.isNotEmpty) {
-      //TODO add entities by source
-    }
-    var rawEntities = rawData["entities"] ?? [];
-    rawEntities.forEach((rawEntity) {
-      if (rawEntity is String) {
-        if (HomeAssistant().entities.isExist(rawEntity)) {
-          entities.add(EntityWrapper(entity: HomeAssistant().entities.get(rawEntity)));
-        } else {
-          entities.add(EntityWrapper(entity: Entity.missed(rawEntity)));
-        }
-      } else {
-        if (HomeAssistant().entities.isExist(rawEntity["entity"])) {
-          Entity e = HomeAssistant().entities.get(rawEntity["entity"]);
-          entities.add(
-              EntityWrapper(
-                  entity: e,
-                  stateColor: stateColor,
-                  overrideName: rawEntity["name"]?.toString(),
-                  overrideIcon: rawEntity["icon"],
-                  stateFilter: rawEntity['state_filter'] ?? [],
-                  uiAction: EntityUIAction(rawEntityData: rawEntity)
-              )
-          );
-        } else {
-          entities.add(EntityWrapper(entity: Entity.missed(rawEntity["entity"])));
-        }
-      }
-    });
-  }
-
-}
-
-class MediaControlCardData extends CardData {
-
-  @override
-  Widget buildCardWidget() {
-    return MediaControlsCard(card: this);
-  }
-
-  MediaControlCardData(rawData) : super(rawData) {
-    var entitiId = rawData["entity"];
-    if (entitiId != null && entitiId is String) {
-      if (HomeAssistant().entities.isExist(entitiId)) {
-        entities.add(EntityWrapper(
-            entity: HomeAssistant().entities.get(entitiId),
-        ));
-      } else {
-        entities.add(EntityWrapper(entity: Entity.missed(entitiId)));
-      }
-    }
-  }
-
-}
-
-class ErrorCardData extends CardData {
-
-  String cardConfig;
-
-  @override
-  Widget buildCardWidget() {
-    return ErrorCard(card: this);
-  }
-
-  ErrorCardData(rawData) : super(rawData) {
-    cardConfig = '$rawData';
-  }
-
 }

lib/cards/card_widget.dart

@@ -0,0 +1,361 @@
+part of '../main.dart';
+
+class CardWidget extends StatelessWidget {
+
+  final HACard card;
+
+  const CardWidget({
+    Key key,
+    this.card
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    if (card.linkedEntityWrapper!= null) {
+      if (card.linkedEntityWrapper.entity.isHidden) {
+        return Container(width: 0.0, height: 0.0,);
+      }
+      if (card.linkedEntityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
+        return EntityModel(
+          entityWrapper: card.linkedEntityWrapper,
+          child: MissedEntityWidget(),
+          handleTap: false,
+        );
+      }
+    }
+
+    if (card.conditions.isNotEmpty) {
+      bool showCardByConditions = true;
+      for (var condition in card.conditions) {
+        Entity conditionEntity = HomeAssistant().entities.get(condition['entity']);
+        if (conditionEntity != null &&
+            ((condition['state'] != null && conditionEntity.state != condition['state']) ||
+            (condition['state_not'] != null && conditionEntity.state == condition['state_not']))
+          ) {
+          showCardByConditions = false;
+          break;
+        }
+      }
+      if (!showCardByConditions) {
+        return Container(width: 0.0, height: 0.0,);
+      }
+    }
+
+    switch (card.type) {
+
+      case CardType.ENTITIES: {
+        return _buildEntitiesCard(context);
+      }
+
+      case CardType.GLANCE: {
+        return _buildGlanceCard(context);
+      }
+
+      case CardType.MEDIA_CONTROL: {
+        return _buildMediaControlsCard(context);
+      }
+
+      case CardType.ENTITY_BUTTON: {
+        return _buildEntityButtonCard(context);
+      }
+
+      case CardType.GAUGE: {
+        return _buildGaugeCard(context);
+      }
+
+/*      case CardType.LIGHT: {
+        return _buildLightCard(context);
+      }*/
+
+      case CardType.MARKDOWN: {
+        return _buildMarkdownCard(context);
+      }
+
+      case CardType.ALARM_PANEL: {
+        return _buildAlarmPanelCard(context);
+      }
+
+      case CardType.HORIZONTAL_STACK: {
+        if (card.childCards.isNotEmpty) {
+          List<Widget> children = [];
+          card.childCards.forEach((card) {
+            if (card.getEntitiesToShow().isNotEmpty || card.showEmpty) {
+              children.add(
+                  Flexible(
+                    fit: FlexFit.tight,
+                    child: card.build(context),
+                  )
+              );
+            }
+          });
+          return Row(
+            mainAxisSize: MainAxisSize.max,
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: children,
+          );
+        }
+        return Container(height: 0.0, width: 0.0,);
+      }
+
+      case CardType.VERTICAL_STACK: {
+        if (card.childCards.isNotEmpty) {
+          List<Widget> children = [];
+          card.childCards.forEach((card) {
+            children.add(
+                card.build(context)
+            );
+          });
+          return Column(
+            mainAxisSize: MainAxisSize.min,
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: children,
+          );
+        }
+        return Container(height: 0.0, width: 0.0,);
+      }
+
+      default: {
+        if ((card.linkedEntityWrapper == null) && (card.entities.isNotEmpty)) {
+          return _buildEntitiesCard(context);
+        } else {
+          return _buildUnsupportedCard(context);
+        }
+      }
+
+    }
+  }
+
+  Widget _buildEntitiesCard(BuildContext context) {
+    List<EntityWrapper> entitiesToShow = card.getEntitiesToShow();
+    if (entitiesToShow.isEmpty && !card.showEmpty) {
+      return Container(height: 0.0, width: 0.0,);
+    }
+    List<Widget> body = [];
+    body.add(CardHeader(name: card.name));
+    entitiesToShow.forEach((EntityWrapper entity) {
+      body.add(
+          Padding(
+            padding: EdgeInsets.fromLTRB(0.0, 4.0, 0.0, 4.0),
+            child: EntityModel(
+                entityWrapper: entity,
+                handleTap: true,
+                child: entity.entity.buildDefaultWidget(context)
+            ),
+          ));
+    });
+    return Card(
+        child: Padding(
+          padding: EdgeInsets.only(right: Sizes.rightWidgetPadding, left: Sizes.leftWidgetPadding),
+          child: Column(mainAxisSize: MainAxisSize.min, children: body),
+        )
+    );
+  }
+
+  Widget _buildMarkdownCard(BuildContext context) {
+    if (card.content == null) {
+      return Container(height: 0.0, width: 0.0,);
+    }
+    List<Widget> body = [];
+    body.add(CardHeader(name: card.name));
+    body.add(MarkdownBody(data: card.content));
+    return Card(
+        child: Padding(
+          padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, Sizes.rowPadding, Sizes.rightWidgetPadding, Sizes.rowPadding),
+          child: new Column(mainAxisSize: MainAxisSize.min, children: body),
+        )
+    );
+  }
+
+  Widget _buildAlarmPanelCard(BuildContext context) {
+    List<Widget> body = [];
+    body.add(CardHeader(
+      name: card.name ?? "",
+      subtitle: Text("${card.linkedEntityWrapper.entity.displayState}",
+        style: TextStyle(
+            color: Colors.grey
+        ),
+      ),
+      trailing: Row(
+          mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.end,
+          children: [
+            EntityIcon(
+              size: 50.0,
+            ),
+            Container(
+                width: 26.0,
+                child: IconButton(
+                    padding: EdgeInsets.all(0.0),
+                    alignment: Alignment.centerRight,
+                    icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
+                        "mdi:dots-vertical")),
+                    onPressed: () => eventBus.fire(new ShowEntityPageEvent(entity: card.linkedEntityWrapper.entity))
+                )
+            )
+          ]
+      ),
+    ));
+    body.add(
+        AlarmControlPanelControlsWidget(
+          extended: true,
+          states: card.states,
+        )
+    );
+    return Card(
+        child: EntityModel(
+            entityWrapper: card.linkedEntityWrapper,
+            handleTap: null,
+            child: Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                mainAxisSize: MainAxisSize.min,
+                children: body
+            )
+        )
+    );
+  }
+
+  Widget _buildGlanceCard(BuildContext context) {
+    List<EntityWrapper> entitiesToShow = card.getEntitiesToShow();
+    if (entitiesToShow.isEmpty && !card.showEmpty) {
+      return Container(height: 0.0, width: 0.0,);
+    }
+    List<Widget> rows = [];
+    rows.add(CardHeader(name: card.name));
+
+    int columnsCount = entitiesToShow.length >= card.columnsCount ? card.columnsCount : entitiesToShow.length;
+
+    rows.add(
+        Padding(
+          padding: EdgeInsets.only(bottom: Sizes.rowPadding, top: Sizes.rowPadding),
+          child: FractionallySizedBox(
+            widthFactor: 1,
+            child: LayoutBuilder(
+                builder: (BuildContext context, BoxConstraints constraints) {
+                  List<Widget> buttons = [];
+                  double buttonWidth = constraints.maxWidth / columnsCount;
+                  entitiesToShow.forEach((EntityWrapper entity) {
+                    buttons.add(
+                        SizedBox(
+                          width: buttonWidth,
+                          child: EntityModel(
+                              entityWrapper: entity,
+                              child: GlanceCardEntityContainer(
+                                showName: card.showName,
+                                showState: card.showState,
+                              ),
+                              handleTap: true
+                          ),
+                        )
+                    );
+                  });
+                  return Wrap(
+                    //spacing: 5.0,
+                    //alignment: WrapAlignment.spaceEvenly,
+                    runSpacing: Sizes.doubleRowPadding,
+                    children: buttons,
+                  );
+                }
+            ),
+          ),
+        )
+    );
+
+    return Card(
+        child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: rows
+        )
+    );
+  }
+
+  Widget _buildMediaControlsCard(BuildContext context) {
+    return Card(
+        child: EntityModel(
+            entityWrapper: card.linkedEntityWrapper,
+            handleTap: null,
+            child: MediaPlayerWidget()
+        )
+    );
+  }
+
+  Widget _buildEntityButtonCard(BuildContext context) {
+    card.linkedEntityWrapper.displayName = card.name?.toUpperCase() ??
+        card.linkedEntityWrapper.displayName.toUpperCase();
+    return Card(
+        child: EntityModel(
+            entityWrapper: card.linkedEntityWrapper,
+            child: EntityButtonCardBody(),
+            handleTap: true
+        )
+    );
+  }
+
+  Widget _buildGaugeCard(BuildContext context) {
+    card.linkedEntityWrapper.displayName = card.name ??
+        card.linkedEntityWrapper.displayName;
+    card.linkedEntityWrapper.unitOfMeasurement = card.unit ??
+        card.linkedEntityWrapper.unitOfMeasurement;
+    return Card(
+        child: EntityModel(
+            entityWrapper: card.linkedEntityWrapper,
+            child: GaugeCardBody(
+              min: card.min,
+              max: card.max,
+              severity: card.severity,
+            ),
+            handleTap: true
+        )
+    );
+  }
+
+  Widget _buildLightCard(BuildContext context) {
+    card.linkedEntityWrapper.displayName = card.name ??
+        card.linkedEntityWrapper.displayName;
+    return Card(
+        child: EntityModel(
+            entityWrapper: card.linkedEntityWrapper,
+            child: LightCardBody(
+              min: card.min,
+              max: card.max,
+              severity: card.severity,
+            ),
+            handleTap: true
+        )
+    );
+  }
+
+  Widget _buildUnsupportedCard(BuildContext context) {
+    List<Widget> body = [];
+    body.add(CardHeader(name: card.name ?? ""));
+    List<Widget> result = [];
+    if (card.linkedEntityWrapper != null) {
+      result.addAll(<Widget>[
+        Padding(
+          padding: EdgeInsets.fromLTRB(0.0, Sizes.rowPadding, 0.0, Sizes.rowPadding),
+          child: EntityModel(
+              entityWrapper: card.linkedEntityWrapper,
+              handleTap: true,
+              child: card.linkedEntityWrapper.entity.buildDefaultWidget(context)
+          ),
+        )
+      ]);
+    } else {
+      result.addAll(<Widget>[
+        Padding(
+          padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, Sizes.rowPadding, Sizes.rightWidgetPadding, Sizes.rowPadding),
+          child: Text("'${card.type}' card is not supported yet"),
+        ),
+      ]);
+    }
+    body.addAll(result);
+    return Card(
+        child: new Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisSize: MainAxisSize.min,
+            children: body
+        )
+    );
+  }
+
+}

lib/cards/entities_card.dart

@@ -1,79 +0,0 @@
-part of '../main.dart';
-
-class EntitiesCard extends StatelessWidget {
-  final EntitiesCardData card;
-
-  const EntitiesCard({Key key, this.card}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    List<EntityWrapper> entitiesToShow = card.getEntitiesToShow();
-    if (entitiesToShow.isEmpty && !card.showEmpty) {
-      return Container(height: 0.0, width: 0.0,);
-    }
-    List<Widget> body = [];
-    Widget headerSwitch;
-    if (card.showHeaderToggle) {
-      bool headerToggleVal = entitiesToShow.any((EntityWrapper en){ return en.entity.state == EntityState.on; });
-      List<String> entitiesToToggle = entitiesToShow.where((EntityWrapper enw) {
-        return <String>["switch", "light", "automation", "input_boolean"].contains(enw.entity.domain);
-      }).map((EntityWrapper en) {
-          return en.entity.entityId;
-      }).toList();
-      headerSwitch = Switch(
-        value: headerToggleVal,
-        onChanged: (val) {
-          if (entitiesToToggle.isNotEmpty) {
-            ConnectionManager().callService(
-              domain: "homeassistant",
-              service: val ? "turn_on" : "turn_off",
-              entityId: entitiesToToggle
-            );
-          }
-        },
-      );
-    }
-    body.add(
-      CardHeader(
-        name: card.title,
-        trailing: headerSwitch,
-        emptyPadding: Sizes.rowPadding,
-        leading: card.icon != null ? Icon(
-          MaterialDesignIcons.getIconDataFromIconName(card.icon),
-          size: Sizes.iconSize,
-          color: Theme.of(context).textTheme.headline.color
-        ) : null,
-      )
-    );
-    body.addAll(
-      entitiesToShow.map((EntityWrapper entity) {
-        return Padding(
-            padding: EdgeInsets.fromLTRB(0.0, 4.0, 0.0, 4.0),
-            child: EntityModel(
-                entityWrapper: entity,
-                handleTap: true,
-                child: entity.entity.buildDefaultWidget(context)
-            ),
-          );
-      })  
-    );
-    return CardWrapper(
-        child: Padding(
-          padding: EdgeInsets.only(
-            right: Sizes.rightWidgetPadding,
-            left: Sizes.leftWidgetPadding,
-            bottom: Sizes.rowPadding,
-          ),
-          child: Center(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              mainAxisAlignment: MainAxisAlignment.start,
-              children: body
-            )
-          ),
-        )
-    );
-  }
-
-  
-}

lib/cards/entity_button_card.dart

@@ -1,96 +0,0 @@
-part of '../main.dart';
-
-class EntityButtonCard extends StatelessWidget {
-
-  final ButtonCardData card;
-
-  EntityButtonCard({
-    Key key, this.card
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    EntityWrapper entityWrapper = card.entity;
-    if (entityWrapper.entity.statelessType == StatelessEntityType.missed) {
-      return EntityModel(
-        entityWrapper: card.entity,
-        child: MissedEntityWidget(),
-        handleTap: false,
-      );
-    } else if (entityWrapper.entity.statelessType != StatelessEntityType.ghost && entityWrapper.entity.statelessType != StatelessEntityType.none) {
-      return Container(width: 0.0, height: 0.0,);
-    }
-    
-    double iconSize = math.max(card.iconHeightPx, card.iconHeightRem * Theme.of(context).textTheme.body1.fontSize);
-    
-    Widget buttonIcon;
-    if (!card.showIcon) {
-      buttonIcon = Container(height: Sizes.rowPadding, width: 10);
-    } else if (iconSize > 0) {
-      buttonIcon = SizedBox(
-        height: iconSize,
-        child: FractionallySizedBox(
-          widthFactor: 0.5,
-          child: FittedBox(
-            fit: BoxFit.contain,
-            child: EntityIcon(
-              //padding: EdgeInsets.only(top: 6),
-            ),
-          )
-        ),
-      );
-    } else {
-      buttonIcon = AspectRatio(
-        aspectRatio: 2,
-        child: FractionallySizedBox(
-          widthFactor: 0.5,
-          child: FittedBox(
-            fit: BoxFit.fitWidth,
-            child: EntityIcon(
-              //padding: EdgeInsets.only(top: 6),
-            ),
-          )
-        ),
-      );
-    }
-
-    return CardWrapper(
-      child: EntityModel(
-        entityWrapper: card.entity,
-        child: InkWell(
-          onTap: () => entityWrapper.handleTap(),
-          onLongPress: () => entityWrapper.handleHold(),
-          onDoubleTap: () => entityWrapper.handleDoubleTap(),
-          child: Center(
-            child: Padding(
-              padding: EdgeInsets.only(top: 5),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: <Widget>[
-                  buttonIcon,
-                  _buildName(context)
-                ],
-              )
-            )
-          ),
-        ),
-        handleTap: true
-      )
-    );
-  }
-
-  Widget _buildName(BuildContext context) {
-    if (card.showName) {
-      return EntityName(
-        padding: EdgeInsets.fromLTRB(Sizes.buttonPadding, 0.0, Sizes.buttonPadding, Sizes.rowPadding),
-        textOverflow: TextOverflow.ellipsis,
-        maxLines: 3,
-        textStyle: Theme.of(context).textTheme.subhead,
-        wordsWrap: true,
-        textAlign: TextAlign.center
-      );
-    }
-    return Container(width: 0, height: 0);
-  }
-}

lib/cards/error_card.dart

@@ -1,51 +0,0 @@
-part of '../main.dart';
-
-class ErrorCard extends StatelessWidget {
-  final ErrorCardData card;
-  final String errorText;
-  final bool showReportButton;
-
-  const ErrorCard({Key key, this.card, this.errorText, this.showReportButton: true}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    String error;
-    if (errorText == null) {
-      error = 'There was an error showing ${card?.type}';
-    } else {
-      error = errorText;
-    }
-    return CardWrapper(
-      color: Theme.of(context).errorColor,
-      child: Padding(
-        padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, Sizes.rowPadding, Sizes.rightWidgetPadding, Sizes.rowPadding),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: <Widget>[
-            Text(
-              error,
-              textAlign: TextAlign.center,
-            ),
-            card != null ?
-            RaisedButton(
-              onPressed: () {
-                Clipboard.setData(new ClipboardData(text: card.cardConfig));
-              },
-              child: Text('Copy card config'),
-            ) :
-            Container(width: 0, height: 0),
-            showReportButton ?
-            RaisedButton(
-              onPressed: () {
-                Launcher.launchURLInBrowser("https://github.com/estevez-dev/ha_client/issues/new?assignees=&labels=&template=bug_report.md&title=");
-              },
-              child: Text('Report issue'),
-            ) :
-            Container(width: 0, height: 0)
-          ],
-        ),
-      )
-    );
-  }  
-}

lib/cards/gauge_card.dart

@@ -1,201 +0,0 @@
-part of '../main.dart';
-
-class GaugeCard extends StatelessWidget {
-
-  final GaugeCardData card;
-
-  GaugeCard({Key key, this.card}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    EntityWrapper entityWrapper = card.entity;
-    if (entityWrapper.entity.statelessType == StatelessEntityType.missed) {
-      return EntityModel(
-        entityWrapper: card.entity,
-        child: MissedEntityWidget(),
-        handleTap: false,
-      );
-    }
-    entityWrapper.overrideName = card.name ??
-        entityWrapper.displayName;
-    entityWrapper.unitOfMeasurementOverride = card.unit ??
-        entityWrapper.unitOfMeasurement;
-    double fixedValue;
-    double value = entityWrapper.entity.doubleState;
-    if (value > card.max) {
-      fixedValue = card.max.toDouble();
-    } else if (value < card.min) {
-      fixedValue = card.min.toDouble();
-    } else {
-      fixedValue = value;
-    }
-    
-    List<GaugeRange> ranges;
-    Color currentColor;
-    if (card.severity != null && card.severity["green"] is int && card.severity["red"] is int && card.severity["yellow"] is int) {
-      List<RangeContainer> rangesList = <RangeContainer>[
-        RangeContainer(card.severity["green"], HAClientTheme().getGreenGaugeColor()),
-        RangeContainer(card.severity["red"], HAClientTheme().getRedGaugeColor()),
-        RangeContainer(card.severity["yellow"], HAClientTheme().getYellowGaugeColor())
-      ];
-      rangesList.sort((current, next) {
-        if (current.startFrom > next.startFrom) {
-          return 1;
-        }
-        if (current.startFrom < next.startFrom) {
-          return -1;
-        }
-        return 0;
-      });
-
-      if (fixedValue < rangesList[1].startFrom) {
-        currentColor = rangesList[0].color;
-      } else if (fixedValue < rangesList[2].startFrom && fixedValue >= rangesList[1].startFrom) {
-        currentColor = rangesList[1].color;
-      } else {
-        currentColor = rangesList[2].color;
-      }
-
-      ranges = [
-        GaugeRange(
-          startValue: rangesList[0].startFrom.toDouble(),
-          endValue: rangesList[1].startFrom.toDouble(),
-          color: rangesList[0].color.withOpacity(0.1),
-          sizeUnit: GaugeSizeUnit.factor,
-          endWidth: 0.3,
-          startWidth: 0.3
-        ),
-        GaugeRange(
-          startValue: rangesList[1].startFrom.toDouble(),
-          endValue: rangesList[2].startFrom.toDouble(),
-          color: rangesList[1].color.withOpacity(0.1),
-          sizeUnit: GaugeSizeUnit.factor,
-          endWidth: 0.3,
-          startWidth: 0.3
-        ),
-        GaugeRange(
-          startValue: rangesList[2].startFrom.toDouble(),
-          endValue: card.max.toDouble(),
-          color: rangesList[2].color.withOpacity(0.1),
-          sizeUnit: GaugeSizeUnit.factor,
-          endWidth: 0.3,
-          startWidth: 0.3
-        )
-      ];
-    }
-    if (ranges == null) {
-      currentColor = Theme.of(context).primaryColorDark;
-      ranges = <GaugeRange>[
-        GaugeRange(
-          startValue: card.min.toDouble(),
-          endValue: card.max.toDouble(),
-          color: Theme.of(context).primaryColorDark.withOpacity(0.1),
-          sizeUnit: GaugeSizeUnit.factor,
-          endWidth: 0.3,
-          startWidth: 0.3,
-        )
-      ];
-    }
-
-    return CardWrapper(
-      padding: EdgeInsets.all(4),
-      child: EntityModel(
-        entityWrapper: entityWrapper,
-        child: InkWell(
-          onTap: () => entityWrapper.handleTap(),
-          onLongPress: () => entityWrapper.handleHold(),
-          onDoubleTap: () => entityWrapper.handleDoubleTap(),
-          child: AspectRatio(
-            aspectRatio: 1.8,
-            child: Stack(
-              alignment: Alignment.bottomCenter,
-              children: <Widget>[
-                IgnorePointer(
-                  ignoring: true,
-                  child: SfRadialGauge(
-                    axes: <RadialAxis>[
-                      RadialAxis(
-                        maximum: card.max.toDouble(),
-                        minimum: card.min.toDouble(),
-                        showLabels: false,
-                        useRangeColorForAxis: true,
-                        showTicks: false,
-                        canScaleToFit: true,
-                        ranges: ranges,
-                        axisLineStyle: AxisLineStyle(
-                          thickness: 0.3,
-                          thicknessUnit: GaugeSizeUnit.factor,
-                          color: Colors.transparent
-                        ),
-                        startAngle: 180,
-                        endAngle: 0,
-                        pointers: <GaugePointer>[
-                          RangePointer(
-                            value: fixedValue,
-                            sizeUnit: GaugeSizeUnit.factor,
-                            width: 0.3,
-                            color: currentColor,
-                            enableAnimation: true,
-                            animationType: AnimationType.bounceOut,
-                          )
-                        ]
-                      )
-                    ],
-                  )
-                ),
-                Column(
-                  mainAxisSize: MainAxisSize.max,
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: <Widget>[
-                    Flexible(
-                      flex: 8,
-                      fit: FlexFit.tight,
-                      child: Container()
-                    ),
-                    Flexible(
-                      flex: 6,
-                      fit: FlexFit.tight,
-                      child: FractionallySizedBox(
-                        widthFactor: 0.4,
-                        child: FittedBox(
-                          fit: BoxFit.contain,
-                          alignment: Alignment.bottomCenter,
-                          child: SimpleEntityState(
-                            padding: EdgeInsets.all(0),
-                            expanded: false,
-                            maxLines: 1,
-                            textAlign: TextAlign.center
-                          ),
-                        )
-                      )
-                    ),
-                    Flexible(
-                      flex: 3,
-                      fit: FlexFit.tight,
-                      child: FittedBox(
-                        fit: BoxFit.contain,
-                        child: EntityName(
-                          padding: EdgeInsets.all(0),
-                          textStyle: Theme.of(context).textTheme.subhead
-                        ),
-                      )
-                    ),  
-                  ],
-                )
-              ],
-            )
-          ),
-        ),
-        handleTap: true
-      )
-    );
-  }
-  
-}
-
-class RangeContainer {
-  final int startFrom;
-  Color color;
-
-  RangeContainer(this.startFrom, this.color);
-}

lib/cards/glance_card.dart

@@ -1,126 +0,0 @@
-part of '../main.dart';
-
-class GlanceCard extends StatelessWidget {
-  final GlanceCardData card;
-
-  const GlanceCard({Key key, this.card}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    List<EntityWrapper> entitiesToShow = card.getEntitiesToShow();
-    if (entitiesToShow.isEmpty && !card.showEmpty) {
-      return Container(height: 0.0, width: 0.0,);
-    }
-    int length = entitiesToShow.length;
-    int rowsCount;
-    int columnsCount;
-    if (length == 0) {
-      columnsCount = 0;
-      rowsCount = 0;
-    } else {
-      columnsCount = length >= card.columnsCount ? card.columnsCount : entitiesToShow.length;
-      rowsCount = (length / columnsCount).round();
-    }
-    List<TableRow> rows = [];
-    for (int i = 0; i < rowsCount; i++) {
-      int start = i*columnsCount;
-      int end = start + math.min(columnsCount, length - start);
-      List<Widget> rowChildren = [];
-      rowChildren.addAll(entitiesToShow.sublist(
-          start, end
-        ).map(
-          (EntityWrapper entity){
-            return Padding(
-              padding: EdgeInsets.symmetric(vertical: Sizes.rowPadding),
-              child: EntityModel(
-                entityWrapper: entity,
-                child: _buildEntityContainer(context, entity),
-                handleTap: true
-              )
-            );
-          }
-        ).toList()
-      );
-      while (rowChildren.length < columnsCount) {
-        rowChildren.add(
-          Container()
-        );
-      }
-      rows.add(
-        TableRow(
-          children: rowChildren
-        )
-      );
-    }
-    return CardWrapper(
-      child: Center(
-        child: Padding(
-          padding: EdgeInsets.only(bottom: Sizes.rowPadding),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: <Widget>[
-              CardHeader(
-                name: card.title,
-                emptyPadding: Sizes.rowPadding,
-              ),
-              Table(
-                children: rows
-              )
-            ],
-          )
-        )
-      )
-    );
-  }
-
-  Widget _buildEntityContainer(BuildContext context, EntityWrapper entityWrapper) {
-    if (entityWrapper.entity.statelessType == StatelessEntityType.missed) {
-      return MissedEntityWidget();
-    } else if (entityWrapper.entity.statelessType != StatelessEntityType.none) {
-      return Container(width: 0.0, height: 0.0,);
-    }
-    List<Widget> result = [];
-    if (card.showName) {
-      result.add(_buildName(context));
-    }
-    result.add(
-        EntityIcon(
-          padding: EdgeInsets.all(0.0),
-          size: Sizes.iconSize,
-        )
-    );
-    if (card.showState) {
-      result.add(_buildState());
-    }
-
-    return InkResponse(
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: result,
-      ),
-      onTap: () => entityWrapper.handleTap(),
-      onLongPress: () => entityWrapper.handleHold(),
-      onDoubleTap: () => entityWrapper.handleDoubleTap(),
-    );
-  }
-
-  Widget _buildName(BuildContext context) {
-    return EntityName(
-      padding: EdgeInsets.only(bottom: Sizes.rowPadding),
-      textOverflow: TextOverflow.ellipsis,
-      wordsWrap: false,
-      textAlign: TextAlign.center,
-      textStyle: Theme.of(context).textTheme.body1,
-    );
-  }
-
-  Widget _buildState() {
-    return SimpleEntityState(
-      textAlign: TextAlign.center,
-      expanded: false,
-      maxLines: 1,
-      padding: EdgeInsets.only(top: Sizes.rowPadding),
-    );
-  }
-
-}

lib/cards/horizontal_srack_card.dart

@@ -1,30 +0,0 @@
-part of '../main.dart';
-
-class HorizontalStackCard extends StatelessWidget {
-  final HorizontalStackCardData card;
-
-  const HorizontalStackCard({Key key, this.card}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    if (card.childCards.isNotEmpty) {
-      List<Widget> children = [];
-      children = card.childCards.map((childCard) => Flexible(
-          fit: FlexFit.tight,
-          child: childCard.buildCardWidget()
-        )
-      ).toList();
-      return IntrinsicHeight(
-        child: Row(
-          mainAxisSize: MainAxisSize.max,
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: children,
-        ),
-      );
-    }
-    return Container(height: 0.0, width: 0.0,);
-  }
-
-  
-}

lib/cards/light_card.dart

@@ -1,161 +0,0 @@
-part of '../main.dart';
-
-class LightCard extends StatefulWidget {
-
-  final LightCardData card;
-
-  LightCard({Key key, this.card}) : super(key: key);
-
-  @override
-  State<StatefulWidget> createState() {
-    return _LightCardState();
-  }
-}
-
-class _LightCardState extends State<LightCard> {
-
-  double _actualBrightness;
-  double _newBrightness;
-  bool _changedHere = false;
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  void _setBrightness(double value, LightEntity entity) {
-    setState((){
-      _newBrightness = value;
-      _changedHere = true;
-    });
-    ConnectionManager().callService(
-      domain: entity.domain,
-      service: "turn_on",
-      entityId: entity.entityId,
-      data: {"brightness": value.round()}
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    EntityWrapper entityWrapper = widget.card.entity;
-    LightEntity entity = entityWrapper.entity;
-    if (entityWrapper.entity.statelessType == StatelessEntityType.missed) {
-      return EntityModel(
-        entityWrapper: widget.card.entity,
-        child: MissedEntityWidget(),
-        handleTap: false,
-      );
-    }
-    entityWrapper.overrideName = widget.card.name ??
-        entityWrapper.displayName;
-    entityWrapper.overrideIcon = widget.card.icon ??
-        entityWrapper.icon;
-    
-    if (!_changedHere) {
-      _actualBrightness = (entity.brightness ?? 0).toDouble();
-      _newBrightness = _actualBrightness;
-    } else {
-      _changedHere = false;
-    }
-    Color lightColor = entity.color?.toColor();
-    Color color;
-    if (lightColor != null && lightColor != Colors.white) {
-      color = lightColor;
-    } else {
-      color = Theme.of(context).accentColor;
-    }
-
-    return CardWrapper(
-      padding: EdgeInsets.all(4),
-      child: EntityModel(
-        entityWrapper: entityWrapper,
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: <Widget>[
-            ConstrainedBox(
-              constraints: BoxConstraints.loose(Size(200, 200)),
-              child: AspectRatio(
-                aspectRatio: 1,
-                child: Stack(
-                  alignment: Alignment.center,
-                  children: <Widget>[
-                    SfRadialGauge(
-                      axes: <RadialAxis>[
-                        RadialAxis(
-                          onAxisTapped: (val) {
-                            _setBrightness(val, entity);
-                          },
-                          maximum: 255,
-                          minimum: 0,
-                          showLabels: false,
-                          showTicks: false,
-                          axisLineStyle: AxisLineStyle(
-                            thickness: 0.05,
-                            thicknessUnit: GaugeSizeUnit.factor,
-                            color: HAClientTheme().getDisabledStateColor(context)
-                          ),
-                          pointers: <GaugePointer>[
-                            RangePointer(
-                              value: _actualBrightness,
-                              sizeUnit: GaugeSizeUnit.factor,
-                              width: 0.05,
-                              color: color,
-                              enableAnimation: true,
-                              animationType: AnimationType.bounceOut,
-                            ),
-                            MarkerPointer(
-                              value: _newBrightness,
-                              markerType: MarkerType.circle,
-                              markerHeight: 20,
-                              markerWidth: 20,
-                              enableDragging: true,
-                              onValueChangeEnd: (val) {
-                                _setBrightness(val, entity);
-                              },
-                              color: HAClientTheme().getColorByEntityState(entity.state, context)
-                              //enableAnimation: true,
-                              //animationType: AnimationType.bounceOut,
-                            )
-                          ]
-                        )
-                      ],
-                    ),
-                    FractionallySizedBox(
-                      heightFactor: 0.4,
-                      widthFactor: 0.4,
-                      child: AspectRatio(
-                        aspectRatio: 1,
-                        child: InkResponse(
-                          onTap: () => entityWrapper.handleTap(),
-                          onLongPress: () => entityWrapper.handleHold(),
-                          child: FittedBox(
-                            fit: BoxFit.contain,
-                            child: EntityIcon(
-                              showBadge: false,
-                              padding: EdgeInsets.all(0)
-                            )
-                          )
-                        ) 
-                      )
-                    )
-                  ],
-                )
-              )
-            ),
-            EntityName(
-              padding: EdgeInsets.all(0),
-              wordsWrap: true,
-              maxLines: 3,
-              textOverflow: TextOverflow.ellipsis,
-              textAlign: TextAlign.center,
-            )
-          ],
-        ),
-        handleTap: true
-      )
-    );
-  }
-}
-  

lib/cards/map_card.dart

@@ -1,88 +0,0 @@
-part of '../main.dart';
-
-class MapCard extends StatefulWidget {
-  final MapCardData card;
-
-  const MapCard({Key key, this.card}) : super(key: key);
-
-  @override
-  _MapCardState createState() => _MapCardState();
-}
-
-class _MapCardState extends State<MapCard> {
-
-  void _openMap(BuildContext context) {
-    Navigator.of(context).push(MaterialPageRoute(
-        builder: (bc) {
-          return Scaffold(
-            primary: false,
-              /*appBar: new AppBar(
-                backgroundColor: Colors.transparent,
-                leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
-                  Navigator.pop(context);
-                }),
-                actions: <Widget>[
-                  IconButton(
-                    icon: Icon(Icons.fullscreen),
-                    onPressed: () {},
-                  )
-                ],
-                // Here we take the value from the MyHomePage object that was created by
-                // the App.build method, and use it to set our appbar title.
-                title: new Text("${widget.card.title ?? ""}"),
-              ),*/
-              body: Container(
-                  color: Theme.of(context).primaryColor,
-                  child: SafeArea(
-                    child: Stack(
-                      children: <Widget>[
-                        EntitiesMap(
-                            entities: widget.card.entities,
-                            interactive: true
-                        ),
-                        Positioned(
-                            top: 0,
-                            left: 0,
-                            child: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
-                              Navigator.pop(context);
-                            })
-                        )
-                      ],
-                    )
-                )
-              )
-          );
-        }
-    ));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return CardWrapper(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: <Widget>[
-            CardHeader(name: widget.card.title),
-            Stack(
-              children: <Widget>[
-                GestureDetector(
-                    onTap: () => _openMap(context),
-                    child: EntitiesMap(
-                      aspectRatio: 1,
-                      interactive: false,
-                      entities: widget.card.entities,
-                    )
-                ),
-                Positioned(
-                  bottom: 0,
-                  left: 0,
-                  child: Text('Tap to open interactive map', style: Theme.of(context).textTheme.caption)
-                )
-              ],
-            ),
-          ],
-        )
-    );
-  }
-}

lib/cards/markdown_card.dart

@@ -1,33 +0,0 @@
-part of '../main.dart';
-
-class MarkdownCard extends StatelessWidget {
-  final MarkdownCardData card;
-
-  const MarkdownCard({Key key, this.card}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    if (card.content == null) {
-      return Container(height: 0.0, width: 0.0,);
-    } else if (card.content == '***') {
-      return Container(height: Sizes.rowPadding, width: 0.0,);
-    }
-    return CardWrapper(
-        child: Padding(
-          padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, Sizes.rowPadding, Sizes.rightWidgetPadding, Sizes.rowPadding),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: <Widget>[
-              CardHeader(name: card.title),
-              MarkdownBody(
-                data: card.content,
-              )
-            ],
-          ),
-        )
-    );
-  }
-
-  
-}

lib/cards/media_control_card.dart

@@ -1,35 +0,0 @@
-part of '../main.dart';
-
-class MediaControlsCard extends StatelessWidget {
-  final MediaControlCardData card;
-
-  const MediaControlsCard({Key key, this.card}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    if (card.entity.entity.statelessType == StatelessEntityType.missed) {
-      return EntityModel(
-        entityWrapper: card.entity,
-        child: MissedEntityWidget(),
-        handleTap: false,
-      );
-    } else if (card.entity.entity.domain == null || card.entity.entity.domain != 'media_player') {
-      return EntityModel(
-        entityWrapper: card.entity,
-        child: ErrorEntityWidget(
-          text: '${card.entity.entity?.entityId} is not a media_player',
-        ),
-        handleTap: false,
-      );
-    }
-    return CardWrapper(
-        child: EntityModel(
-            entityWrapper: card.entity,
-            handleTap: null,
-            child: MediaPlayerWidget()
-        )
-    );
-  }
-
-  
-}

lib/cards/unsupported_card.dart

@@ -1,12 +0,0 @@
-part of '../main.dart';
-
-class UnsupportedCard extends StatelessWidget {
-  final CardData card;
-
-  const UnsupportedCard({Key key, this.card}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(height: 20);
-  }  
-}

lib/cards/vertical_stack_card.dart

@@ -1,23 +0,0 @@
-part of '../main.dart';
-
-class VerticalStackCard extends StatelessWidget {
-  final VerticalStackCardData card;
-
-  const VerticalStackCard({Key key, this.card}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    if (card.childCards.isNotEmpty) {
-      return Column(
-        mainAxisSize: MainAxisSize.min,
-        mainAxisAlignment: MainAxisAlignment.start,
-        children: card.childCards.map<Widget>(
-          (childCard) => childCard.buildCardWidget()
-        ).toList(),
-      );
-    }
-    return Container(height: 0.0, width: 0.0,);
-  }
-
-  
-}

lib/cards/widgets/card_header.widget.dart

@@ -4,11 +4,9 @@ class CardHeader extends StatelessWidget {
 
   final String name;
   final Widget trailing;
-  final Widget leading;
   final Widget subtitle;
-  final double emptyPadding;
 
-  const CardHeader({Key key, this.name, this.leading, this.emptyPadding: 0, this.trailing, this.subtitle}) : super(key: key);
+  const CardHeader({Key key, this.name, this.trailing, this.subtitle}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -16,15 +14,14 @@ class CardHeader extends StatelessWidget {
     if ((name != null) && (name.trim().length > 0)) {
       result = new ListTile(
         trailing: trailing,
-        leading: leading,
         subtitle: subtitle,
         title: Text("$name",
             textAlign: TextAlign.left,
             overflow: TextOverflow.ellipsis,
-            style: Theme.of(context).textTheme.headline),
+            style: new TextStyle(fontWeight: FontWeight.bold, fontSize: Sizes.largeFontSize)),
       );
     } else {
-      result = new Container(width: 0.0, height: emptyPadding);
+      result = new Container(width: 0.0, height: 0.0);
     }
     return result;
   }

lib/cards/widgets/card_wrapper.widget.dart

@@ -1,23 +0,0 @@
-part of '../../main.dart';
-
-class CardWrapper extends StatelessWidget {
-  
-  final Widget child;
-  final EdgeInsets padding;
-  final Color color;
-
-  const CardWrapper({Key key, this.child, this.color, this.padding: const EdgeInsets.all(0)}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      color: color,
-      child: Padding(
-        padding: padding,
-        child: child
-      ),
-    );
-  }
-
-
-}

lib/cards/widgets/entities_map.dart

@@ -1,73 +0,0 @@
-part of '../../main.dart';
-
-
-class EntitiesMap extends StatelessWidget {
-
-  final List<EntityWrapper> entities;
-  final bool interactive;
-  final double aspectRatio;
-  final LatLng center;
-  final double zoom;
-
-  const EntitiesMap({Key key, this.entities: const [], this.aspectRatio, this.interactive: true, this.center, this.zoom}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    List<Marker> markers = [];
-    List<LatLng> points = [];
-    entities.forEach((entityWrapper) {
-      double lat = entityWrapper.entity._getDoubleAttributeValue("latitude");
-      double long = entityWrapper.entity._getDoubleAttributeValue("longitude");
-      if (lat != null && long != null) {
-        points.add(LatLng(lat, long));
-        markers.add(
-            Marker(
-                width: 36,
-                height: 36,
-                point: LatLng(lat, long),
-                builder: (ctx) => EntityModel(
-                  handleTap: true,
-                  entityWrapper: entityWrapper,
-                  child: EntityIcon(
-                    size: 36,
-                  ),
-                )
-            )
-        );
-      }
-    });
-    MapOptions mapOptions;
-    if (center != null) {
-      mapOptions = MapOptions(
-        interactive: interactive,
-        center: center,
-        zoom: zoom ?? 10,
-      );
-    } else {
-      mapOptions = MapOptions(
-        interactive: interactive,
-        bounds: LatLngBounds.fromPoints(points),
-        boundsOptions: FitBoundsOptions(padding: EdgeInsets.all(40)),
-      );
-    }
-    Widget map = FlutterMap(
-      options: mapOptions,
-      layers: [
-        new TileLayerOptions(
-            urlTemplate: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
-            subdomains: ['a', 'b', 'c']
-        ),
-        new MarkerLayerOptions(
-          markers: markers,
-        ),
-      ],
-    );
-    if (aspectRatio != null) {
-      return AspectRatio(
-          aspectRatio: aspectRatio,
-          child: map
-      );
-    }
-    return map;
-  }
-}

lib/cards/widgets/entity_button_card_body.widget.dart

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

lib/cards/widgets/gauge_card_body.dart

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

lib/cards/widgets/glance_card_entity_container.dart

@@ -0,0 +1,85 @@
+part of '../../main.dart';
+
+class GlanceCardEntityContainer extends StatelessWidget {
+
+  final bool showName;
+  final bool showState;
+  final bool nameInTheBottom;
+  final double iconSize;
+  final double nameFontSize;
+  final bool wordsWrapInName;
+
+  GlanceCardEntityContainer({
+    Key key,
+    @required this.showName,
+    @required this.showState,
+    this.nameInTheBottom: false,
+    this.iconSize: Sizes.iconSize,
+    this.nameFontSize: Sizes.smallFontSize,
+    this.wordsWrapInName: false
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
+    if (entityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
+      return MissedEntityWidget();
+    }
+    if (entityWrapper.entity.statelessType > StatelessEntityType.MISSED) {
+      return Container(width: 0.0, height: 0.0,);
+    }
+    List<Widget> result = [];
+    if (!nameInTheBottom) {
+      if (showName) {
+        result.add(_buildName());
+      }
+    } else {
+      if (showState) {
+        result.add(_buildState());
+      }
+    }
+    result.add(
+        EntityIcon(
+          padding: EdgeInsets.all(0.0),
+          size: iconSize,
+        )
+    );
+    if (!nameInTheBottom) {
+      if (showState) {
+        result.add(_buildState());
+      }
+    } else {
+      result.add(_buildName());
+    }
+
+    return Center(
+      child: InkResponse(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: result,
+        ),
+        onTap: () => entityWrapper.handleTap(),
+        onLongPress: () => entityWrapper.handleHold(),
+      ),
+    );
+  }
+
+  Widget _buildName() {
+    return EntityName(
+      padding: EdgeInsets.only(bottom: Sizes.rowPadding),
+      textOverflow: TextOverflow.ellipsis,
+      wordsWrap: wordsWrapInName,
+      textAlign: TextAlign.center,
+      fontSize: nameFontSize,
+    );
+  }
+
+  Widget _buildState() {
+    return SimpleEntityState(
+      textAlign: TextAlign.center,
+      expanded: false,
+      maxLines: 1,
+      padding: EdgeInsets.only(top: Sizes.rowPadding),
+    );
+  }
+}

lib/cards/widgets/light_card_body.dart

@@ -0,0 +1,90 @@
+part of '../../main.dart';
+
+class LightCardBody extends StatefulWidget {
+
+  final int min;
+  final int max;
+  final Map severity;
+
+  LightCardBody({Key key, this.min, this.max, this.severity}) : super(key: key);
+
+  @override
+  _LightCardBodyState createState() => _LightCardBodyState();
+}
+
+class _LightCardBodyState extends State<LightCardBody> {
+
+  @override
+  Widget build(BuildContext context) {
+    EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
+    LightEntity entity = entityWrapper.entity;
+    Logger.d("Light brightness: ${entity.brightness}");
+
+    return FractionallySizedBox(
+      widthFactor: 0.5,
+      child: Container(
+        //color: Colors.redAccent,
+        child: SingleCircularSlider(
+            255,
+            entity.brightness ?? 0,
+          baseColor: Colors.white,
+          handlerColor: Colors.blue[200],
+          selectionColor: Colors.blue[100],
+        ),
+      ),
+    );
+
+    return InkWell(
+      onTap: () => entityWrapper.handleTap(),
+      onLongPress: () => entityWrapper.handleHold(),
+      child: AspectRatio(
+          aspectRatio: 1.5,
+          child: Stack(
+              fit: StackFit.expand,
+              overflow: Overflow.clip,
+              children: [
+                Align(
+                  alignment: Alignment.bottomCenter,
+                  child: LayoutBuilder(
+                      builder: (BuildContext context, BoxConstraints constraints) {
+                        double fontSize = constraints.maxHeight / 7;
+                        return Padding(
+                          padding: EdgeInsets.only(bottom: 2*fontSize),
+                          child: SimpleEntityState(
+                            //textAlign: TextAlign.center,
+                            expanded: false,
+                            maxLines: 1,
+                            bold: true,
+                            textAlign: TextAlign.center,
+                            padding: EdgeInsets.all(0.0),
+                            fontSize: fontSize,
+                            //padding: EdgeInsets.only(top: Sizes.rowPadding),
+                          ),
+                        );
+                      }
+                  ),
+                ),
+                Align(
+                  alignment: Alignment.bottomCenter,
+                  child: LayoutBuilder(
+                      builder: (BuildContext context, BoxConstraints constraints) {
+                        double fontSize = constraints.maxHeight / 7;
+                        return Padding(
+                          padding: EdgeInsets.only(bottom: fontSize),
+                          child: EntityName(
+                            fontSize: fontSize,
+                            maxLines: 1,
+                            padding: EdgeInsets.all(0.0),
+                            textAlign: TextAlign.center,
+                            textOverflow: TextOverflow.ellipsis,
+                          ),
+                        );
+                      }
+                  ),
+                )
+              ]
+          )
+      ),
+    );
+  }
+}

lib/const.dart

@@ -36,6 +36,51 @@ class EntityState {
 
 }
 
+class EntityUIAction {
+  static const moreInfo = 'more-info';
+  static const toggle = 'toggle';
+  static const callService = 'call-service';
+  static const navigate = 'navigate';
+  static const none = 'none';
+
+  String tapAction = EntityUIAction.moreInfo;
+  String tapNavigationPath;
+  String tapService;
+  Map<String, dynamic> tapServiceData;
+  String holdAction = EntityUIAction.none;
+  String holdNavigationPath;
+  String holdService;
+  Map<String, dynamic> holdServiceData;
+
+  EntityUIAction({rawEntityData}) {
+    if (rawEntityData != null) {
+      if (rawEntityData["tap_action"] != null) {
+        if (rawEntityData["tap_action"] is String) {
+          tapAction = rawEntityData["tap_action"];
+        } else {
+          tapAction =
+              rawEntityData["tap_action"]["action"] ?? EntityUIAction.moreInfo;
+          tapNavigationPath = rawEntityData["tap_action"]["navigation_path"];
+          tapService = rawEntityData["tap_action"]["service"];
+          tapServiceData = rawEntityData["tap_action"]["service_data"];
+        }
+      }
+      if (rawEntityData["hold_action"] != null) {
+        if (rawEntityData["hold_action"] is String) {
+          holdAction = rawEntityData["hold_action"];
+        } else {
+          holdAction =
+              rawEntityData["hold_action"]["action"] ?? EntityUIAction.none;
+          holdNavigationPath = rawEntityData["hold_action"]["navigation_path"];
+          holdService = rawEntityData["hold_action"]["service"];
+          holdServiceData = rawEntityData["hold_action"]["service_data"];
+        }
+      }
+    }
+  }
+
+}
+
 class CardType {
   static const HORIZONTAL_STACK = "horizontal-stack";
   static const VERTICAL_STACK = "vertical-stack";
@@ -53,17 +98,10 @@ class CardType {
   static const IFRAME = "iframe";
   static const GAUGE = "gauge";
   static const ENTITY_BUTTON = "entity-button";
-  static const ENTITY = "entity";
-  static const BUTTON = "button";
   static const CONDITIONAL = "conditional";
   static const ALARM_PANEL = "alarm-panel";
   static const MARKDOWN = "markdown";
   static const LIGHT = "light";
-  static const ENTITY_FILTER = "entity-filter";
-  static const UNKNOWN = "unknown";
-  static const HISTORY_GRAPH = "history-graph";
-  static const PICTURE_GLANCE = "picture-glance";
-  static const BADGES = "badges";
 }
 
 class Sizes {
@@ -73,10 +111,10 @@ class Sizes {
   static const extendedWidgetHeight = 50.0;
   static const iconSize = 28.0;
   static const largeIconSize = 46.0;
-  //static const stateFontSize = 15.0;
-  //static const nameFontSize = 15.0;
-  //static const smallFontSize = 14.0;
-  //static const largeFontSize = 24.0;
+  static const stateFontSize = 15.0;
+  static const nameFontSize = 15.0;
+  static const smallFontSize = 14.0;
+  static const largeFontSize = 24.0;
   static const inputWidth = 160.0;
   static const rowPadding = 10.0;
   static const doubleRowPadding = rowPadding*2;

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

@@ -25,12 +25,9 @@ class _AlarmControlPanelControlsWidgetWidgetState extends State<AlarmControlPane
 
 
   void _callService(AlarmControlPanelEntity entity, String service) {
-    ConnectionManager().callService(
-      domain: entity.domain,
-      service: service,
-      entityId: entity.entityId,
-      data: {"code": "$code"}
-    );
+    eventBus.fire(new ServiceCallEvent(
+          entity.domain, service, entity.entityId,
+          {"code": "$code"}));
     setState(() {
       code = "";
     });
@@ -61,11 +58,7 @@ class _AlarmControlPanelControlsWidgetWidgetState extends State<AlarmControlPane
             FlatButton(
               child: new Text("Yes"),
               onPressed: () {
-                ConnectionManager().callService(
-                  domain: entity.domain,
-                  service: "alarm_trigger",
-                  entityId: entity.entityId
-                );
+                eventBus.fire(new ServiceCallEvent(entity.domain, "alarm_trigger", entity.entityId, null));
                 Navigator.of(context).pop();
               },
             ),
@@ -248,9 +241,7 @@ class _AlarmControlPanelControlsWidgetWidgetState extends State<AlarmControlPane
         FlatButton(
           child: Text(
             "TRIGGER",
-            style: Theme.of(context).textTheme.subhead.copyWith(
-              color: Theme.of(context).errorColor
-            )
+            style: TextStyle(color: Colors.redAccent)
           ),
           onPressed: () => _askToTrigger(entity),
         )

lib/entities/badge.widget.dart

@@ -0,0 +1,145 @@
+part of '../main.dart';
+
+class BadgeWidget extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final entityModel = EntityModel.of(context);
+    double iconSize = 26.0;
+    Widget badgeIcon;
+    String onBadgeTextValue;
+    Color iconColor = EntityColor.badgeColors[entityModel.entityWrapper.entity.domain] ??
+        EntityColor.badgeColors["default"];
+    switch (entityModel.entityWrapper.entity.domain) {
+      case "sun":
+        {
+          badgeIcon = entityModel.entityWrapper.entity.state == "below_horizon"
+              ? Icon(
+            MaterialDesignIcons.getIconDataFromIconCode(0xf0dc),
+            size: iconSize,
+          )
+              : Icon(
+            MaterialDesignIcons.getIconDataFromIconCode(0xf5a8),
+            size: iconSize,
+          );
+          break;
+        }
+      case "camera":
+      case "media_player":
+      case "binary_sensor":
+        {
+          badgeIcon = EntityIcon(
+            padding: EdgeInsets.all(0.0),
+            size: iconSize,
+            color: Colors.black
+          );
+          break;
+        }
+      case "device_tracker":
+      case "person":
+        {
+          badgeIcon = EntityIcon(
+              padding: EdgeInsets.all(0.0),
+              size: iconSize,
+              color: Colors.black
+          );
+          onBadgeTextValue = entityModel.entityWrapper.entity.displayState;
+          break;
+        }
+      default:
+        {
+          double stateFontSize;
+          if (entityModel.entityWrapper.entity.displayState.length <= 3) {
+            stateFontSize = 18.0;
+          } else if (entityModel.entityWrapper.entity.displayState.length <= 4) {
+            stateFontSize = 15.0;
+          } else if (entityModel.entityWrapper.entity.displayState.length <= 6) {
+            stateFontSize = 10.0;
+          } else if (entityModel.entityWrapper.entity.displayState.length <= 10) {
+            stateFontSize = 8.0;
+          }
+          onBadgeTextValue = entityModel.entityWrapper.unitOfMeasurement;
+          badgeIcon = Center(
+            child: Text(
+              "${entityModel.entityWrapper.entity.displayState}",
+              overflow: TextOverflow.fade,
+              softWrap: false,
+              textAlign: TextAlign.center,
+              style: TextStyle(fontSize: stateFontSize),
+            ),
+          );
+          break;
+        }
+    }
+    Widget onBadgeText;
+    if (onBadgeTextValue == null || onBadgeTextValue.length == 0) {
+      onBadgeText = Container(width: 0.0, height: 0.0);
+    } else {
+      onBadgeText = Container(
+          padding: EdgeInsets.fromLTRB(6.0, 2.0, 6.0, 2.0),
+          child: Text("$onBadgeTextValue",
+              style: TextStyle(fontSize: 12.0, color: Colors.white),
+              textAlign: TextAlign.center,
+              softWrap: false,
+              overflow: TextOverflow.fade),
+          decoration: new BoxDecoration(
+            // Circle shape
+            //shape: BoxShape.circle,
+            color: iconColor,
+            borderRadius: BorderRadius.circular(9.0),
+          ));
+    }
+    return GestureDetector(
+        child: Column(
+          children: <Widget>[
+            Container(
+              margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0),
+              width: 50.0,
+              height: 50.0,
+              decoration: new BoxDecoration(
+                // Circle shape
+                shape: BoxShape.circle,
+                color: Colors.white,
+                // The border you want
+                border: new Border.all(
+                  width: 2.0,
+                  color: iconColor,
+                ),
+              ),
+              child: Stack(
+                overflow: Overflow.visible,
+                children: <Widget>[
+                  Positioned(
+                    width: 46.0,
+                    height: 46.0,
+                    top: 0.0,
+                    left: 0.0,
+                    child: badgeIcon,
+                  ),
+                  Positioned(
+                    //width: 50.0,
+                      bottom: -9.0,
+                      left: -10.0,
+                      right: -10.0,
+                      child: Center(
+                        child: onBadgeText,
+                      ))
+                ],
+              ),
+            ),
+            Container(
+              width: 60.0,
+              child: Text(
+                "${entityModel.entityWrapper.displayName}",
+                textAlign: TextAlign.center,
+                style: TextStyle(fontSize: 12.0),
+                softWrap: true,
+                maxLines: 3,
+                overflow: TextOverflow.ellipsis,
+              ),
+            ),
+          ],
+        ),
+        onTap: () =>
+            eventBus.fire(new ShowEntityPageEvent(entity: entityModel.entityWrapper.entity)));
+  }
+}

lib/entities/camera/camera_entity.class.dart

@@ -3,16 +3,12 @@ part of '../../main.dart';
 class CameraEntity extends Entity {
 
   static const SUPPORT_ON_OFF = 1;
-  static const SUPPORT_STREAM = 2;
 
   CameraEntity(Map rawData, String webHost) : super(rawData, webHost);
 
   bool get supportOnOff => ((supportedFeatures &
   CameraEntity.SUPPORT_ON_OFF) ==
       CameraEntity.SUPPORT_ON_OFF);
-  bool get supportStream => ((supportedFeatures &
-  CameraEntity.SUPPORT_STREAM) ==
-      CameraEntity.SUPPORT_STREAM);
 
   @override
   Widget _buildAdditionalControlsForPage(BuildContext context) {

lib/entities/camera/widgets/camera_stream_view.dart

@@ -2,9 +2,7 @@ part of '../../../main.dart';
 
 class CameraStreamView extends StatefulWidget {
 
-  final bool withControls;
-
-  CameraStreamView({Key key, this.withControls: true}) : super(key: key);
+  CameraStreamView({Key key}) : super(key: key);
 
   @override
   _CameraStreamViewState createState() => _CameraStreamViewState();
@@ -12,175 +10,45 @@ class CameraStreamView extends StatefulWidget {
 
 class _CameraStreamViewState extends State<CameraStreamView> {
 
-  CameraEntity _entity;
-  String _streamUrl = "";
-  bool _isLoaded = false;
-  double _aspectRatio = 1.33;
-  String _webViewHtml;
-  String _jsMessageChannelName = 'unknown';
-  Completer _loading;
-
   @override
   void initState() {
     super.initState();
   }
 
-  Future _loadResources() {
-    if (_loading != null && !_loading.isCompleted) {
-      Logger.d("[Camera Player] Resources loading is not finished yet");
-      return _loading.future;  
-    }
-    Logger.d("[Camera Player] Loading resources");
-    _loading = Completer();
-    _entity = EntityModel
-          .of(context)
-          .entityWrapper
-          .entity;
-    if (_entity.supportStream && HomeAssistant().isComponentEnabled('stream')) {
-      HomeAssistant().getCameraStream(_entity.entityId)
-        .then((data) {
-          _jsMessageChannelName = 'HA_${_entity.entityId.replaceAll('.', '_')}';
-            rootBundle.loadString('assets/html/cameraLiveView.html').then((file) {
-              _webViewHtml = Uri.dataFromString(
-                  file.replaceFirst('{{stream_url}}', '${AppSettings().httpWebHost}${data["url"]}').replaceFirst('{{message_channel}}', _jsMessageChannelName),
-                  mimeType: 'text/html',
-                  encoding: Encoding.getByName('utf-8')
-              ).toString();
-              _loading.complete();
-            });
-        })
-        .catchError((e) {
-          if (e == 'start_stream_failed') {
-            Logger.e("[Camera Player] Home Assistant failed starting stream. Forcing MJPEG: $e");
-            _loadMJPEG().then((_) {
-              _loading.complete();
-            });
-          } else {
-            _loading.completeError(e);
-            Logger.e("[Camera Player] Error loading stream: $e");
-          }
-        });
-    } else {
-      _loadMJPEG().then((_) {
-        _loading.complete();
-      });
-    }
-    return _loading.future;
-  }
+  CameraEntity _entity;
+  bool started = false;
+  String streamUrl = "";
 
-  Future _loadMJPEG() async {
-    _streamUrl = '${AppSettings().httpWebHost}/api/camera_proxy_stream/${_entity
-        .entityId}?token=${_entity.attributes['access_token']}';
-    _jsMessageChannelName = 'HA_${_entity.entityId.replaceAll('.', '_')}';
-    var file = await rootBundle.loadString('assets/html/cameraView.html');
-    _webViewHtml = Uri.dataFromString(
-        file.replaceFirst('{{stream_url}}', _streamUrl).replaceFirst('{{message_channel}}', _jsMessageChannelName),
-        mimeType: 'text/html',
-        encoding: Encoding.getByName('utf-8')
-    ).toString();
-  }
-
-  Widget _buildScreen() {
-    Widget screenWidget;
-    if (!_isLoaded) {
-      screenWidget = Center(
-        child: EntityPicture(
-          fit: BoxFit.contain,
-        )
-      );
-    } else {
-      screenWidget = WebView(
-        initialUrl: _webViewHtml,
-        initialMediaPlaybackPolicy: AutoMediaPlaybackPolicy.always_allow,
-        debuggingEnabled: Logger.isInDebugMode,
-        gestureNavigationEnabled: false,
-        javascriptMode: JavascriptMode.unrestricted,
-        javascriptChannels: {
-          JavascriptChannel(
-            name: _jsMessageChannelName,
-            onMessageReceived: ((message) {
-              Logger.d('[Camera Player] Message from page: $message');
-              setState((){
-                _aspectRatio = double.tryParse(message.message) ?? 1.33;
-              });
-            })
-          )
-        }
-      );
-    }
-    return AspectRatio(
-      aspectRatio: _aspectRatio,
-      child: screenWidget
+  launchStream() {
+    Launcher.launchURLInCustomTab(
+      context: context,
+      url: streamUrl
     );
   }
 
-  Widget _buildControls() {
-      return Row(
-        mainAxisSize: MainAxisSize.max,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: <Widget>[
-          IconButton(
-            icon: Icon(Icons.refresh),
-            iconSize: 40,
-            color: Theme.of(context).accentColor,
-            onPressed: _isLoaded ? () {
-              setState(() {
-                _isLoaded = false;  
-              });
-            } : null,
-          ),
-          Expanded(
-            child: Container(),
-          ),
-          IconButton(
-            icon: Icon(Icons.fullscreen),
-            iconSize: 40,
-            color: Theme.of(context).accentColor,
-            onPressed: _isLoaded ? () {
-              Navigator.of(context).pushReplacement(
-                MaterialPageRoute(
-                  builder: (conext) => FullScreenPage(
-                    child: EntityModel(
-                      child: CameraStreamView(
-                        withControls: false
-                      ),
-                      handleTap: false,
-                      entityWrapper: EntityWrapper(
-                        entity: _entity
-                      ),
-                    ),
-                  ),
-                  fullscreenDialog: true
-                )
-              ).then((_){
-                eventBus.fire(ShowEntityPageEvent(entityId: _entity.entityId));
-              });
-            } : null,
-          )
-        ],
-      );
-  }
-
   @override
   Widget build(BuildContext context) {
-    if (!_isLoaded && (_loading == null || _loading.isCompleted)) {
-      _loadResources().then((_) => setState((){ _isLoaded = true; }));
+    if (!started) {
+      _entity = EntityModel
+          .of(context)
+          .entityWrapper
+          .entity;
+      started = true;
     }
-    if (widget.withControls) {
-      return Card(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: <Widget>[
-            _buildScreen(),
-            _buildControls()
-          ],
-        ),
-      );
-    } else {
-      return _buildScreen();
-    }
-    
+    streamUrl = '${ConnectionManager().httpWebHost}/api/camera_proxy_stream/${_entity
+        .entityId}?token=${_entity.attributes['access_token']}';
+    return Column(
+      children: <Widget>[
+        Container(
+            padding: const EdgeInsets.all(20.0),
+            child: IconButton(
+              icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:monitor-screenshot"), color: Colors.amber),
+              iconSize: 50.0,
+              onPressed: () => launchStream(),
+            )
+        )
+      ],
+    );
   }
 
   @override

lib/entities/climate/widgets/climate_controls.dart

@@ -10,8 +10,9 @@ class ClimateControlWidget extends StatefulWidget {
 
 class _ClimateControlWidgetState extends State<ClimateControlWidget> {
 
-  bool _temperaturePending = false;
+  bool _showPending = false;
   bool _changedHere = false;
+  Timer _resetTimer;
   Timer _tempThrottleTimer;
   Timer _targetTempThrottleTimer;
   double _tmpTemperature = 0.0;
@@ -26,11 +27,9 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   bool _tmpAuxHeat = false;
 
   void _resetVars(ClimateEntity entity) {
-    if (!_temperaturePending) {
-      _tmpTemperature = entity.temperature;
-      _tmpTargetHigh = entity.targetHigh;
-      _tmpTargetLow = entity.targetLow;
-    }
+    _tmpTemperature = entity.temperature;
+    _tmpTargetHigh = entity.targetHigh;
+    _tmpTargetLow = entity.targetLow;
     _tmpHVACMode = entity.state;
     _tmpFanMode = entity.fanMode;
     _tmpSwingMode = entity.swingMode;
@@ -39,6 +38,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     _tmpAuxHeat = entity.auxHeat;
     _tmpTargetHumidity = entity.targetHumidity;
 
+    _showPending = false;
     _changedHere = false;
   }
 
@@ -73,44 +73,36 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
   }
 
   void _setTemperature(ClimateEntity entity) {
-    _tempThrottleTimer?.cancel();
+    if (_tempThrottleTimer!=null) {
+      _tempThrottleTimer.cancel();
+    }
     setState(() {
       _changedHere = true;
-      _temperaturePending = true;
       _tmpTemperature = double.parse(_tmpTemperature.toStringAsFixed(1));
     });
     _tempThrottleTimer = Timer(Duration(seconds: 2), () {
       setState(() {
         _changedHere = true;
-        _temperaturePending = false;
-        ConnectionManager().callService(
-          domain: entity.domain,
-          service: "set_temperature",
-          entityId: entity.entityId,
-          data: {"temperature": "${_tmpTemperature.toStringAsFixed(1)}"}
-        );
+        eventBus.fire(new ServiceCallEvent(entity.domain, "set_temperature", entity.entityId,{"temperature": "${_tmpTemperature.toStringAsFixed(1)}"}));
+        _resetStateTimer(entity);
       });
     });
   }
 
   void _setTargetTemp(ClimateEntity entity) {
-    _targetTempThrottleTimer?.cancel();
+    if (_targetTempThrottleTimer!=null) {
+      _targetTempThrottleTimer.cancel();
+    }
     setState(() {
       _changedHere = true;
-      _temperaturePending = true;
       _tmpTargetLow = double.parse(_tmpTargetLow.toStringAsFixed(1));
       _tmpTargetHigh = double.parse(_tmpTargetHigh.toStringAsFixed(1));
     });
     _targetTempThrottleTimer = Timer(Duration(seconds: 2), () {
       setState(() {
         _changedHere = true;
-        _temperaturePending = false;
-        ConnectionManager().callService(
-          domain: entity.domain,
-          service: "set_temperature",
-          entityId: entity.entityId,
-          data: {"target_temp_high": "${_tmpTargetHigh.toStringAsFixed(1)}", "target_temp_low": "${_tmpTargetLow.toStringAsFixed(1)}"}
-        );
+        eventBus.fire(new ServiceCallEvent(entity.domain, "set_temperature", entity.entityId,{"target_temp_high": "${_tmpTargetHigh.toStringAsFixed(1)}", "target_temp_low": "${_tmpTargetLow.toStringAsFixed(1)}"}));
+        _resetStateTimer(entity);
       });
     });
   }
@@ -119,12 +111,8 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpTargetHumidity = value.roundToDouble();
       _changedHere = true;
-      ConnectionManager().callService(
-          domain: entity.domain,
-          service: "set_humidity",
-          entityId: entity.entityId,
-          data: {"humidity": "$_tmpTargetHumidity"}
-        );
+      eventBus.fire(new ServiceCallEvent(entity.domain, "set_humidity", entity.entityId,{"humidity": "$_tmpTargetHumidity"}));
+      _resetStateTimer(entity);
     });
   }
 
@@ -132,12 +120,8 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpHVACMode = value;
       _changedHere = true;
-      ConnectionManager().callService(
-          domain: entity.domain,
-          service: "set_hvac_mode",
-          entityId: entity.entityId,
-          data: {"hvac_mode": "$_tmpHVACMode"}
-        );
+      eventBus.fire(new ServiceCallEvent(entity.domain, "set_hvac_mode", entity.entityId,{"hvac_mode": "$_tmpHVACMode"}));
+      _resetStateTimer(entity);
     });
   }
 
@@ -145,12 +129,8 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpSwingMode = value;
       _changedHere = true;
-      ConnectionManager().callService(
-          domain: entity.domain,
-          service: "set_swing_mode",
-          entityId: entity.entityId,
-          data: {"swing_mode": "$_tmpSwingMode"}
-        );
+      eventBus.fire(new ServiceCallEvent(entity.domain, "set_swing_mode", entity.entityId,{"swing_mode": "$_tmpSwingMode"}));
+      _resetStateTimer(entity);
     });
   }
 
@@ -158,7 +138,8 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpFanMode = value;
       _changedHere = true;
-      ConnectionManager().callService(domain: entity.domain, service: "set_fan_mode", entityId: entity.entityId, data: {"fan_mode": "$_tmpFanMode"});
+      eventBus.fire(new ServiceCallEvent(entity.domain, "set_fan_mode", entity.entityId,{"fan_mode": "$_tmpFanMode"}));
+      _resetStateTimer(entity);
     });
   }
 
@@ -166,7 +147,8 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpPresetMode = value;
       _changedHere = true;
-      ConnectionManager().callService(domain: entity.domain, service: "set_preset_mode", entityId: entity.entityId, data: {"preset_mode": "$_tmpPresetMode"});
+      eventBus.fire(new ServiceCallEvent(entity.domain, "set_preset_mode", entity.entityId,{"preset_mode": "$_tmpPresetMode"}));
+      _resetStateTimer(entity);
     });
   }
 
@@ -183,7 +165,18 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     setState(() {
       _tmpAuxHeat = value;
       _changedHere = true;
-      ConnectionManager().callService(domain: entity.domain, service: "set_aux_heat", entityId: entity.entityId, data: {"aux_heat": "$_tmpAuxHeat"});
+      eventBus.fire(new ServiceCallEvent(entity.domain, "set_aux_heat", entity.entityId, {"aux_heat": "$_tmpAuxHeat"}));
+      _resetStateTimer(entity);
+    });
+  }
+
+  void _resetStateTimer(ClimateEntity entity) {
+    if (_resetTimer!=null) {
+      _resetTimer.cancel();
+    }
+    _resetTimer = Timer(Duration(seconds: 3), () {
+      setState(() {});
+      _resetVars(entity);
     });
   }
 
@@ -192,9 +185,10 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     final entityModel = EntityModel.of(context);
     final ClimateEntity entity = entityModel.entityWrapper.entity;
     if (_changedHere) {
-      //_showPending = (_tmpTemperature != entity.temperature || _tmpTargetHigh != entity.targetHigh || _tmpTargetLow != entity.targetLow);
+      _showPending = (_tmpTemperature != entity.temperature || _tmpTargetHigh != entity.targetHigh || _tmpTargetLow != entity.targetLow);
       _changedHere = false;
     } else {
+      _resetTimer?.cancel();
       _resetVars(entity);
     }
     return Padding(
@@ -203,20 +197,20 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           //_buildOnOffControl(entity),
-          _buildTemperatureControls(entity, context),
-          _buildTargetTemperatureControls(entity, context),
-          _buildHumidityControls(entity, context),
-          _buildOperationControl(entity, context),
-          _buildFanControl(entity, context),
-          _buildSwingControl(entity, context),
-          _buildPresetModeControl(entity, context),
-          _buildAuxHeatControl(entity, context)
+          _buildTemperatureControls(entity),
+          _buildTargetTemperatureControls(entity),
+          _buildHumidityControls(entity),
+          _buildOperationControl(entity),
+          _buildFanControl(entity),
+          _buildSwingControl(entity),
+          _buildPresetModeControl(entity),
+          _buildAuxHeatControl(entity)
         ],
       ),
     );
   }
 
-  Widget _buildPresetModeControl(ClimateEntity entity, BuildContext context) {
+  Widget _buildPresetModeControl(ClimateEntity entity) {
     if (entity.supportPresetMode) {
       return ModeSelectorWidget(
         options: entity.presetModes,
@@ -241,7 +235,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }*/
 
-  Widget _buildAuxHeatControl(ClimateEntity entity, BuildContext context) {
+  Widget _buildAuxHeatControl(ClimateEntity entity) {
     if (entity.supportAuxHeat ) {
       return ModeSwitchWidget(
           caption: "Aux heat",
@@ -253,7 +247,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildOperationControl(ClimateEntity entity, BuildContext context) {
+  Widget _buildOperationControl(ClimateEntity entity) {
     if (entity.hvacModes != null) {
       return ModeSelectorWidget(
         onChange: (mode) => _setHVACMode(entity, mode),
@@ -266,7 +260,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildFanControl(ClimateEntity entity, BuildContext context) {
+  Widget _buildFanControl(ClimateEntity entity) {
     if (entity.supportFanMode) {
       return ModeSelectorWidget(
         options: entity.fanModes,
@@ -279,7 +273,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildSwingControl(ClimateEntity entity, BuildContext context) {
+  Widget _buildSwingControl(ClimateEntity entity) {
     if (entity.supportSwingMode) {
       return ModeSelectorWidget(
           onChange: (mode) => _setSwingMode(entity, mode),
@@ -292,15 +286,17 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildTemperatureControls(ClimateEntity entity, BuildContext context) {
+  Widget _buildTemperatureControls(ClimateEntity entity) {
     if ((entity.supportTargetTemperature) && (entity.temperature != null)) {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
-          Text("Target temperature", style: Theme.of(context).textTheme.body1),
+          Text("Target temperature", style: TextStyle(
+              fontSize: Sizes.stateFontSize
+          )),
           TemperatureControlWidget(
             value: _tmpTemperature,
-            active: _temperaturePending,
+            fontColor: _showPending ? Colors.red : Colors.black,
             onDec: () => _temperatureDown(entity),
             onInc: () => _temperatureUp(entity),
           )
@@ -311,13 +307,13 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildTargetTemperatureControls(ClimateEntity entity, BuildContext context) {
+  Widget _buildTargetTemperatureControls(ClimateEntity entity) {
     List<Widget> controls = [];
     if ((entity.supportTargetTemperatureRange) && (entity.targetLow != null)) {
       controls.addAll(<Widget>[
         TemperatureControlWidget(
           value: _tmpTargetLow,
-          active: _temperaturePending,
+          fontColor: _showPending ? Colors.red : Colors.black,
           onDec: () => _targetLowDown(entity),
           onInc: () => _targetLowUp(entity),
         ),
@@ -330,7 +326,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
       controls.add(
           TemperatureControlWidget(
             value: _tmpTargetHigh,
-            active: _temperaturePending,
+            fontColor: _showPending ? Colors.red : Colors.black,
             onDec: () => _targetHighDown(entity),
             onInc: () => _targetHighUp(entity),
           )
@@ -340,7 +336,9 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
-          Text("Target temperature range", style: Theme.of(context).textTheme.body1),
+          Text("Target temperature range", style: TextStyle(
+              fontSize: Sizes.stateFontSize
+          )),
           Row(
             children: controls,
           )
@@ -351,20 +349,16 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
     }
   }
 
-  Widget _buildHumidityControls(ClimateEntity entity, BuildContext context) {
+  Widget _buildHumidityControls(ClimateEntity entity) {
+    List<Widget> result = [];
     if (entity.supportTargetHumidity) {
-      return Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: <Widget>[
-          Padding(
-            padding: EdgeInsets.only(top: Sizes.rowPadding),
-            child: Text("Target humidity", style: Theme.of(context).textTheme.body1),
-          ),
-          UniversalSlider(
-            leading: Text(
-              "$_tmpTargetHumidity%",
-              style: Theme.of(context).textTheme.display1,
-            ),
+      result.addAll(<Widget>[
+        Text(
+          "$_tmpTargetHumidity%",
+          style: TextStyle(fontSize: Sizes.largeFontSize),
+        ),
+        Expanded(
+          child: Slider(
             value: _tmpTargetHumidity,
             max: entity.maxHumidity,
             min: entity.minHumidity,
@@ -376,6 +370,24 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
             }),
             onChangeEnd: (double v) => _setTargetHumidity(entity, v),
           ),
+        )
+      ]);
+    }
+    if (result.isNotEmpty) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
+          Padding(
+            padding: EdgeInsets.fromLTRB(
+                0.0, Sizes.rowPadding, 0.0, Sizes.rowPadding),
+            child: Text("Target humidity", style: TextStyle(
+                fontSize: Sizes.stateFontSize
+            )),
+          ),
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: result,
+          ),
           Container(
             height: Sizes.rowPadding,
           )
@@ -392,6 +404,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
 
   @override
   void dispose() {
+    _resetTimer?.cancel();
     super.dispose();
   }
 

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

@@ -33,16 +33,23 @@ class ClimateStateWidget extends StatelessWidget {
               children: <Widget>[
                 Text("$displayState",
                     textAlign: TextAlign.right,
-                    style: Theme.of(context).textTheme.body2),
+                    style: new TextStyle(
+                      fontWeight: FontWeight.bold,
+                      fontSize: Sizes.stateFontSize,
+                    )),
                 Text(" $targetTemp",
                     textAlign: TextAlign.right,
-                    style: Theme.of(context).textTheme.body1)
+                    style: new TextStyle(
+                      fontSize: Sizes.stateFontSize,
+                    ))
               ],
             ),
             entity.currentTemperature != null ?
             Text("Currently: ${entity.currentTemperature}",
                 textAlign: TextAlign.right,
-                style: Theme.of(context).textTheme.subtitle
+                style: new TextStyle(
+                    fontSize: Sizes.stateFontSize,
+                    color: Colors.black45)
             ) :
             Container(height: 0.0,)
           ],

lib/entities/climate/widgets/mode_selector.dart

@@ -3,17 +3,21 @@ part of '../../../main.dart';
 class ModeSelectorWidget extends StatelessWidget {
 
   final String caption;
-  final List options;
+  final List<String> options;
   final String value;
+  final double captionFontSize;
+  final double valueFontSize;
   final onChange;
   final EdgeInsets padding;
 
   ModeSelectorWidget({
     Key key,
     @required this.caption,
-    this.options: const [],
+    @required this.options,
     this.value,
     @required this.onChange,
+    this.captionFontSize,
+    this.valueFontSize,
     this.padding: const EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, Sizes.rowPadding, Sizes.rightWidgetPadding, 0.0),
   }) : super(key: key);
 
@@ -24,7 +28,9 @@ class ModeSelectorWidget extends StatelessWidget {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
-          Text("$caption", style: Theme.of(context).textTheme.body1),
+          Text("$caption", style: TextStyle(
+              fontSize: captionFontSize ?? Sizes.stateFontSize
+          )),
           Row(
             children: <Widget>[
               Expanded(
@@ -34,12 +40,15 @@ class ModeSelectorWidget extends StatelessWidget {
                     value: value,
                     iconSize: 30.0,
                     isExpanded: true,
-                    style: Theme.of(context).textTheme.title,
+                    style: TextStyle(
+                      fontSize: valueFontSize ?? Sizes.largeFontSize,
+                      color: Colors.black,
+                    ),
                     hint: Text("Select ${caption.toLowerCase()}"),
-                    items: options.map((value) {
+                    items: options.map((String value) {
                       return new DropdownMenuItem<String>(
-                        value: '$value',
-                        child: Text('$value'),
+                        value: value,
+                        child: Text(value),
                       );
                     }).toList(),
                     onChanged: (mode) => onChange(mode),

lib/entities/climate/widgets/mode_swicth.dart

@@ -4,6 +4,7 @@ class ModeSwitchWidget extends StatelessWidget {
 
   final String caption;
   final onChange;
+  final double captionFontSize;
   final bool value;
   final bool expanded;
   final EdgeInsets padding;
@@ -12,6 +13,7 @@ class ModeSwitchWidget extends StatelessWidget {
     Key key,
     @required this.caption,
     @required this.onChange,
+    this.captionFontSize,
     this.value,
     this.expanded: true,
     this.padding: const EdgeInsets.only(left: Sizes.leftWidgetPadding, right: Sizes.rightWidgetPadding)
@@ -23,7 +25,7 @@ class ModeSwitchWidget extends StatelessWidget {
       padding: this.padding,
       child: Row(
         children: <Widget>[
-          _buildCaption(context),
+          _buildCaption(),
           Switch(
             onChanged: (value) => onChange(value),
             value: value ?? false,
@@ -33,10 +35,12 @@ class ModeSwitchWidget extends StatelessWidget {
     );
   }
 
-  Widget _buildCaption(BuildContext context) {
+  Widget _buildCaption() {
     Widget captionWidget = Text(
       "$caption",
-      style: Theme.of(context).textTheme.body1,
+      style: TextStyle(
+          fontSize: captionFontSize ?? Sizes.stateFontSize
+      ),
     );
     if (expanded) {
       return Expanded(

lib/entities/climate/widgets/temperature_control_widget.dart

@@ -2,7 +2,8 @@ part of '../../../main.dart';
 
 class TemperatureControlWidget extends StatelessWidget {
   final double value;
-  final bool active;
+  final double fontSize;
+  final Color fontColor;
   final onInc;
   final onDec;
 
@@ -11,9 +12,8 @@ class TemperatureControlWidget extends StatelessWidget {
         @required this.value,
         @required this.onInc,
         @required this.onDec,
-        //this.fontSize,
-        this.active: false
-      })
+        this.fontSize,
+        this.fontColor})
       : super(key: key);
 
   @override
@@ -23,7 +23,10 @@ class TemperatureControlWidget extends StatelessWidget {
       children: <Widget>[
         Text(
           "$value",
-          style: active ? Theme.of(context).textTheme.display2 : Theme.of(context).textTheme.display1,
+          style: TextStyle(
+              fontSize: fontSize ?? 24.0,
+              color: fontColor ?? Colors.black
+          ),
         ),
         Column(
           children: <Widget>[

lib/entities/cover/cover_entity.class.dart

@@ -40,8 +40,8 @@ class CoverEntity extends Entity {
       CoverEntity.SUPPORT_SET_TILT_POSITION);
 
 
-  double get currentPosition => _getDoubleAttributeValue('current_position') ?? 0;
-  double get currentTiltPosition => _getDoubleAttributeValue('current_tilt_position') ?? 0;
+  double get currentPosition => _getDoubleAttributeValue('current_position');
+  double get currentTiltPosition => _getDoubleAttributeValue('current_tilt_position');
   bool get canBeOpened => ((state != EntityState.opening) && (state != EntityState.open)) || (state == EntityState.open && currentPosition != null && currentPosition > 0.0 && currentPosition < 100.0);
   bool get canBeClosed => ((state != EntityState.closing) && (state != EntityState.closed));
   bool get canTiltBeOpened => currentTiltPosition < 100;

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

@@ -18,7 +18,7 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
     setState(() {
       _tmpPosition = position.roundToDouble();
       _changedHere = true;
-      ConnectionManager().callService(domain: entity.domain, service: "set_cover_position", entityId: entity.entityId, data: {"position": _tmpPosition.round()});
+      eventBus.fire(new ServiceCallEvent(entity.domain, "set_cover_position", entity.entityId,{"position": _tmpPosition.round()}));
     });
   }
 
@@ -26,7 +26,7 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
     setState(() {
       _tmpTiltPosition = position.roundToDouble();
       _changedHere = true;
-      ConnectionManager().callService(domain: entity.domain, service: "set_cover_tilt_position", entityId: entity.entityId, data: {"tilt_position": _tmpTiltPosition.round()});
+      eventBus.fire(new ServiceCallEvent(entity.domain, "set_cover_tilt_position", entity.entityId,{"tilt_position": _tmpTiltPosition.round()}));
     });
   }
 
@@ -62,10 +62,13 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           Padding(
-            padding: EdgeInsets.only(top: Sizes.rowPadding),
-            child: Text("Position"),
+            padding: EdgeInsets.fromLTRB(
+                0.0, Sizes.rowPadding, 0.0, Sizes.rowPadding),
+            child: Text("Position", style: TextStyle(
+                fontSize: Sizes.stateFontSize
+            )),
           ),
-          UniversalSlider(
+          Slider(
             value: _tmpPosition,
             min: 0.0,
             max: 100.0,
@@ -77,7 +80,8 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
               });
             },
             onChangeEnd: (double value) => _setNewPosition(entity, value),
-          )
+          ),
+          Container(height: Sizes.rowPadding,)
         ],
       );
     } else {
@@ -94,7 +98,7 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
     }
     if (entity.supportSetTiltPosition) {
       controls.addAll(<Widget>[
-        UniversalSlider(
+        Slider(
           value: _tmpTiltPosition,
           min: 0.0,
           max: 100.0,
@@ -113,8 +117,10 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
     if (controls.isNotEmpty) {
       controls.insert(0, Padding(
         padding: EdgeInsets.fromLTRB(
-            0.0, Sizes.rowPadding, 0.0, 0),
-        child: Text("Tilt position"),
+            0.0, Sizes.rowPadding, 0.0, Sizes.rowPadding),
+        child: Text("Tilt position", style: TextStyle(
+            fontSize: Sizes.stateFontSize
+        )),
       ));
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -129,18 +135,18 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
 
 class CoverTiltControlsWidget extends StatelessWidget {
   void _open(CoverEntity entity) {
-    ConnectionManager().callService(
-        domain: entity.domain, service: "open_cover_tilt", entityId: entity.entityId);
+    eventBus.fire(new ServiceCallEvent(
+        entity.domain, "open_cover_tilt", entity.entityId, null));
   }
 
   void _close(CoverEntity entity) {
-    ConnectionManager().callService(
-        domain: entity.domain, service: "close_cover_tilt", entityId: entity.entityId);
+    eventBus.fire(new ServiceCallEvent(
+        entity.domain, "close_cover_tilt", entity.entityId, null));
   }
 
   void _stop(CoverEntity entity) {
-    ConnectionManager().callService(
-        domain: entity.domain, service: "stop_cover_tilt", entityId: entity.entityId);
+    eventBus.fire(new ServiceCallEvent(
+        entity.domain, "stop_cover_tilt", entity.entityId, null));
   }
 
   @override

lib/entities/cover/widgets/cover_state.dart

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

lib/entities/date_time/date_time_entity.class.dart

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

lib/entities/date_time/widgets/date_time_state.dart

@@ -9,8 +9,10 @@ class DateTimeStateWidget extends StatelessWidget {
         padding: EdgeInsets.fromLTRB(0.0, 0.0, Sizes.rightWidgetPadding, 0.0),
         child: GestureDetector(
           child: Text("${entity.formattedState}",
-              textAlign: TextAlign.right
-            ),
+              textAlign: TextAlign.right,
+              style: new TextStyle(
+                fontSize: Sizes.stateFontSize,
+              )),
           onTap: () => _handleStateTap(context, entity),
         ));
   }

lib/entities/default_entity_container.widget.dart

@@ -11,23 +11,25 @@ class DefaultEntityContainer extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final EntityModel entityModel = EntityModel.of(context);
-    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.missed) {
+    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
       return MissedEntityWidget();
     }
-    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.divider) {
-      return Divider();
+    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.DIVIDER) {
+      return Divider(
+        color: Colors.black45,
+      );
     }
-    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.section) {
+    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: HAClientTheme().getLinkTextStyle(context).copyWith(
-              decoration: TextDecoration.none
-            )
+            style: TextStyle(color: Colors.blue),
           )
         ],
       );
@@ -36,6 +38,7 @@ class DefaultEntityContainer extends StatelessWidget {
       mainAxisSize: MainAxisSize.max,
       children: <Widget>[
         EntityIcon(),
+
         Flexible(
           fit: FlexFit.tight,
           flex: 3,
@@ -58,11 +61,6 @@ class DefaultEntityContainer extends StatelessWidget {
             entityModel.entityWrapper.handleTap();
           }
         },
-        onDoubleTap: () {
-          if (entityModel.handleTap) {
-            entityModel.entityWrapper.handleDoubleTap();
-          }
-        },
         child: result,
       );
     } else {

lib/entities/entity.class.dart

@@ -1,6 +1,13 @@
 part of '../main.dart';
 
-enum StatelessEntityType {none, missed, ghost, divider, section, callService, webLink}
+class StatelessEntityType {
+  static const NONE = 0;
+  static const MISSED = 1;
+  static const DIVIDER = 2;
+  static const SECTION = 3;
+  static const CALL_SERVICE = 4;
+  static const WEBLINK = 5;
+}
 
 class Entity {
 
@@ -69,8 +76,8 @@ class Entity {
   String entityPicture;
   String state;
   String displayState;
-  DateTime lastUpdatedTimestamp;
-  StatelessEntityType statelessType = StatelessEntityType.none;
+  DateTime _lastUpdated;
+  int statelessType = 0;
 
   List<Entity> childEntities = [];
   String deviceClass;
@@ -78,21 +85,8 @@ class Entity {
     chartType: EntityHistoryWidgetType.simple
   );
 
-  String get displayName {
-    if (attributes.containsKey('friendly_name')) {
-      return attributes['friendly_name'];
-    }
-    if (attributes.containsKey('name')) { 
-      return attributes['name'];
-    }
-    if (entityId == null) {
-      return "";
-    }
-    if (entityId.contains(".")) {
-      return entityId.split(".")[1].replaceAll("_", " ");
-    }
-    return entityId;
-  }
+  String get displayName =>
+      attributes["friendly_name"] ?? (attributes["name"] ?? entityId.split(".")[1].replaceAll("_", " "));
 
   bool get isView =>
       (domain == "group") &&
@@ -126,47 +120,42 @@ class Entity {
   }
 
   Entity.missed(String entityId) {
-    statelessType = StatelessEntityType.missed;
+    statelessType = StatelessEntityType.MISSED;
     attributes = {"hidden": false};
     this.entityId = entityId;
   }
 
   Entity.divider() {
-    statelessType = StatelessEntityType.divider;
+    statelessType = StatelessEntityType.DIVIDER;
     attributes = {"hidden": false};
   }
 
   Entity.section(String label) {
-    statelessType = StatelessEntityType.section;
+    statelessType = StatelessEntityType.SECTION;
     attributes = {"hidden": false, "friendly_name": "$label"};
   }
 
-  Entity.ghost(String name, String icon) {
-    statelessType = StatelessEntityType.ghost;
-    attributes = {"icon": icon, "hidden": false, "friendly_name": name};
-  }
-
   Entity.callService({String icon, String name, String service, String actionName}) {
-    statelessType = StatelessEntityType.callService;
+    statelessType = StatelessEntityType.CALL_SERVICE;
     entityId = service;
     displayState = actionName?.toUpperCase() ?? "RUN";
     attributes = {"hidden": false, "friendly_name": "$name", "icon": "$icon"};
   }
 
   Entity.weblink({String url, String name, String icon}) {
-    statelessType = StatelessEntityType.webLink;
-    entityId = "custom.custom";
+    statelessType = StatelessEntityType.WEBLINK;
+    entityId = "custom.custom"; //TODO wtf??
     attributes = {"hidden": false, "friendly_name": "${name ?? url}", "icon": "${icon ?? 'mdi:link'}"};
   }
 
   void update(Map rawData, String webHost) {
     attributes = rawData["attributes"] ?? {};
-    domain = rawData["entity_id"] != null ? rawData["entity_id"].split(".")[0] : null;
+    domain = rawData["entity_id"].split(".")[0];
     entityId = rawData["entity_id"];
     deviceClass = attributes["device_class"];
-    state = rawData["state"] is bool ? (rawData["state"] ? EntityState.on : EntityState.off) : rawData["state"];
+    state = rawData["state"];
     displayState = Entity.StateByDeviceClass["$deviceClass.$state"] ?? (state.toLowerCase() == 'unknown' ? '-' : state);
-    lastUpdatedTimestamp = DateTime.tryParse(rawData["last_updated"]);
+    _lastUpdated = DateTime.tryParse(rawData["last_updated"]);
     entityPicture = _getEntityPictureUrl(webHost);
   }
 
@@ -222,19 +211,27 @@ class Entity {
     );
   }
 
+  Widget buildBadgeWidget(BuildContext context) {
+    return EntityModel(
+      entityWrapper: EntityWrapper(entity: this),
+      child: BadgeWidget(),
+      handleTap: true,
+    );
+  }
+
   String getAttribute(String attributeName) {
     if (attributes != null) {
-      return attributes["$attributeName"].toString();
+      return attributes["$attributeName"];
     }
     return null;
   }
 
   String _getLastUpdatedFormatted() {
-    if (lastUpdatedTimestamp == null) {
+    if (_lastUpdated == null) {
       return "-";
     } else {
       DateTime now = DateTime.now();
-      Duration d = now.difference(lastUpdatedTimestamp);
+      Duration d = now.difference(_lastUpdated);
       String text;
       int v;
       if (d.inDays == 0) {

lib/entities/entity_colors.class.dart

@@ -0,0 +1,77 @@
+part of '../main.dart';
+
+class EntityColor {
+
+  static const defaultStateColor = Color.fromRGBO(68, 115, 158, 1.0);
+
+  static const badgeColors = {
+    "default": Color.fromRGBO(223, 76, 30, 1.0),
+    "binary_sensor": Color.fromRGBO(3, 155, 229, 1.0)
+  };
+
+  static const _stateColors = {
+    EntityState.on: Colors.amber,
+    "auto": Colors.amber,
+    EntityState.active: Colors.amber,
+    EntityState.playing: Colors.amber,
+    EntityState.paused: Colors.amber,
+    "above_horizon": Colors.amber,
+    EntityState.home:  Colors.amber,
+    EntityState.open:  Colors.amber,
+    EntityState.cleaning:  Colors.amber,
+    EntityState.returning:  Colors.amber,
+    EntityState.off: defaultStateColor,
+    EntityState.closed: defaultStateColor,
+    "below_horizon": defaultStateColor,
+    "default": defaultStateColor,
+    EntityState.idle: defaultStateColor,
+    "heat": Colors.redAccent,
+    "cool": Colors.lightBlue,
+    EntityState.unavailable: Colors.black26,
+    EntityState.unknown: Colors.black26,
+    EntityState.alarm_disarmed: Colors.green,
+    EntityState.alarm_armed_away: Colors.redAccent,
+    EntityState.alarm_armed_custom_bypass: Colors.redAccent,
+    EntityState.alarm_armed_home: Colors.redAccent,
+    EntityState.alarm_armed_night: Colors.redAccent,
+    EntityState.alarm_triggered: Colors.redAccent,
+    EntityState.alarm_arming: Colors.amber,
+    EntityState.alarm_disarming: Colors.amber,
+    EntityState.alarm_pending: Colors.amber,
+  };
+
+  static Color stateColor(String state) {
+    return _stateColors[state] ?? _stateColors["default"];
+  }
+
+  static charts.Color chartHistoryStateColor(String state, int id) {
+    Color c = _stateColors[state];
+    if (c != null) {
+      return charts.Color(
+          r: c.red,
+          g: c.green,
+          b: c.blue,
+          a: c.alpha
+      );
+    } else {
+      double r = id.toDouble() % 10;
+      return charts.MaterialPalette.getOrderedPalettes(10)[r.round()].shadeDefault;
+    }
+  }
+
+  static Color historyStateColor(String state, int id) {
+    Color c = _stateColors[state];
+    if (c != null) {
+      return c;
+    } else {
+      if (id > -1) {
+        double r = id.toDouble() % 10;
+        charts.Color c1 = charts.MaterialPalette.getOrderedPalettes(10)[r.round()].shadeDefault;
+        return Color.fromARGB(c1.a, c1.r, c1.g, c1.b);
+      } else {
+        return _stateColors[EntityState.on];
+      }
+    }
+  }
+
+}

lib/entities/entity_icon.widget.dart

@@ -3,18 +3,12 @@ part of '../main.dart';
 class EntityIcon extends StatelessWidget {
 
   final EdgeInsetsGeometry padding;
-  final EdgeInsetsGeometry iconPadding;
-  final EdgeInsetsGeometry imagePadding;
   final double size;
   final Color color;
-  final bool showBadge;
 
-  const EntityIcon({Key key, this.color, this.showBadge: true, this.size: Sizes.iconSize, this.padding: const EdgeInsets.all(0.0), this.iconPadding, this.imagePadding}) : super(key: key);
+  const EntityIcon({Key key, this.color, this.size: Sizes.iconSize, this.padding: const EdgeInsets.all(0.0)}) : super(key: key);
 
   int getDefaultIconByEntityId(String entityId, String deviceClass, String state) {
-    if (entityId == null) {
-      return 0;
-    }
     String domain = entityId.split(".")[0];
     String iconNameByDomain = MaterialDesignIcons.defaultIconsByDomains["$domain.$state"] ?? MaterialDesignIcons.defaultIconsByDomains["$domain"];
     String iconNameByDeviceClass;
@@ -29,110 +23,52 @@ class EntityIcon extends StatelessWidget {
     }
   }
 
-  @override
-  Widget build(BuildContext context) {
-    final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
-    Color iconColor;
-    if (color != null) {
-      iconColor = color;
-    } else if (entityWrapper.stateColor) {
-      iconColor = HAClientTheme().getColorByEntityState(entityWrapper.entity.state, context);
-    } else {
-      iconColor = HAClientTheme().getOffStateColor(context);
+  Widget buildIcon(EntityWrapper data, Color color) {
+    if (data == null) {
+      return null;
     }
-    Widget iconWidget;
-    bool isPicture = false;
-    if (entityWrapper == null) {
-      iconWidget = Container(
-        width: size,
-        height: size,
+    if (data.entityPicture != null) {
+      return Container(
+        height: size+12,
+        width: size+12,
+        decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            image: DecorationImage(
+              fit:BoxFit.cover,
+              image: CachedNetworkImageProvider(
+                "${data.entityPicture}"
+              ),
+            )
+        ),
       );
-    } else {
-      if (entityWrapper.entityPicture != null) {
-        iconWidget = ClipOval(
-          child: CachedNetworkImage(
-            imageUrl: '${entityWrapper.entityPicture}',
-            width: size+12,
-            fit: BoxFit.cover,
-            height: size+12,
-            errorWidget: (context, str, dyn) {
-              return Padding(
-                padding: iconPadding ?? padding,
-                child: _buildIcon(entityWrapper, iconColor)
-              );
-            },
-          ),
-        );
-        isPicture = true;
-      } else {
-        iconWidget = _buildIcon(entityWrapper, iconColor);
-      }
     }
-    EdgeInsetsGeometry computedPadding;
-    if (isPicture && imagePadding != null) {
-      computedPadding = imagePadding;
-    } else if (!isPicture && iconPadding != null) {
-      computedPadding = iconPadding;
-    } else {
-      computedPadding = padding;
-    }
-    return Padding(
-      padding: computedPadding,
-      child: iconWidget,
-    );
-  }
-
-  Widget _buildIcon(EntityWrapper entityWrapper, Color iconColor) {
-    Widget iconWidget;
-    String iconName = entityWrapper.icon;
+    String iconName = data.icon;
     int iconCode = 0;
     if (iconName.length > 0) {
       iconCode = MaterialDesignIcons.getIconCodeByIconName(iconName);
     } else {
-      iconCode = getDefaultIconByEntityId(entityWrapper.entity.entityId,
-          entityWrapper.entity.deviceClass, entityWrapper.entity.state); //
+      iconCode = getDefaultIconByEntityId(data.entity.entityId,
+          data.entity.deviceClass, data.entity.state); //
     }
-    if (showBadge && entityWrapper.entity is LightEntity &&
-      (entityWrapper.entity as LightEntity).supportColor &&
-      (entityWrapper.entity as LightEntity).color != null &&
-      (entityWrapper.entity as LightEntity).color.toColor() != Colors.white
-      ) {
-      Color lightColor = (entityWrapper.entity as LightEntity).color.toColor();  
-      iconWidget = Stack(
-        children: <Widget>[
-          Icon(
-            IconData(iconCode, fontFamily: 'Material Design Icons'),
-            size: size,
-            color: iconColor,
-          ),
-          Positioned(
-            bottom: 0,
-            right: 0,
-            child: Container(
-              width: size / 3,
-              height: size / 3,
-              decoration: BoxDecoration(
-                color: lightColor,
-                shape: BoxShape.circle,
-                boxShadow: <BoxShadow>[
-                  BoxShadow(
-                    spreadRadius: 0,
-                    blurRadius: 0,
-                    offset: Offset(0.3, 0.3)
-                  )
-                ]
-              ),
-            ),
-          )
-        ],
-      );
-    } else {
-      iconWidget = Icon(
-        IconData(iconCode, fontFamily: 'Material Design Icons'),
-        size: size,
-        color: iconColor,
-      );
-    }
-    return iconWidget;
+    return Padding(
+        padding: EdgeInsets.fromLTRB(6.0, 6.0, 6.0, 6.0),
+        child: Icon(
+          IconData(iconCode, fontFamily: 'Material Design Icons'),
+          size: size,
+          color: color,
+        )
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
+    return Padding(
+      padding: padding,
+      child: buildIcon(
+          entityWrapper,
+          color ?? EntityColor.stateColor(entityWrapper.entity.state)
+      ),
+    );
   }
 }

lib/entities/entity_model.widget.dart

@@ -12,11 +12,11 @@ class EntityModel extends InheritedWidget {
   final bool handleTap;
 
   static EntityModel of(BuildContext context) {
-    return context.dependOnInheritedWidgetOfExactType<EntityModel>();
+    return context.inheritFromWidgetOfExactType(EntityModel);
   }
 
   @override
-  bool updateShouldNotify(EntityModel oldWidget) {
-    return entityWrapper.entity.lastUpdatedTimestamp != oldWidget.entityWrapper.entity.lastUpdatedTimestamp;
+  bool updateShouldNotify(InheritedWidget oldWidget) {
+    return true;
   }
 }

lib/entities/entity_name.widget.dart

@@ -5,24 +5,18 @@ class EntityName extends StatelessWidget {
   final EdgeInsetsGeometry padding;
   final TextOverflow textOverflow;
   final bool wordsWrap;
+  final double fontSize;
   final TextAlign textAlign;
   final int maxLines;
-  final TextStyle textStyle;
 
-  const EntityName({Key key, this.maxLines, this.padding: const EdgeInsets.only(right: 10.0), this.textOverflow: TextOverflow.ellipsis, this.textStyle, this.wordsWrap: true, this.textAlign: TextAlign.left}) : super(key: key);
+  const EntityName({Key key, this.maxLines, this.padding: const EdgeInsets.only(right: 10.0), this.textOverflow: TextOverflow.ellipsis, this.wordsWrap: true, this.fontSize: Sizes.nameFontSize, this.textAlign: TextAlign.left}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
-    TextStyle tStyle;
-    if (textStyle == null) {
-      if (entityWrapper.entity.statelessType == StatelessEntityType.webLink) {
-        tStyle = HAClientTheme().getLinkTextStyle(context);
-      } else {
-        tStyle = Theme.of(context).textTheme.body1;
-      }
-    } else {
-      tStyle = textStyle;
+    TextStyle textStyle = TextStyle(fontSize: fontSize);
+    if (entityWrapper.entity.statelessType == StatelessEntityType.WEBLINK) {
+      textStyle = textStyle.apply(color: Colors.blue, decoration: TextDecoration.underline);
     }
     return Padding(
       padding: padding,
@@ -31,7 +25,7 @@ class EntityName extends StatelessWidget {
         overflow: textOverflow,
         softWrap: wordsWrap,
         maxLines: maxLines,
-        style: tStyle,
+        style: textStyle,
         textAlign: textAlign,
       ),
     );

lib/entities/entity_page_layout.widget.dart

@@ -2,9 +2,10 @@ part of '../main.dart';
 
 class EntityPageLayout extends StatelessWidget {
 
+  final bool showClose;
   final Entity entity;
 
-  EntityPageLayout({Key key, this.entity}) : super(key: key);
+  EntityPageLayout({Key key, this.showClose: false, this.entity}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -13,6 +14,38 @@ class EntityPageLayout extends StatelessWidget {
       child: ListView(
           padding: EdgeInsets.all(0),
           children: <Widget>[
+            showClose ?
+            Container(
+              color: Colors.blue[300],
+              height: 36,
+              child: Row(
+                children: <Widget>[
+                  Expanded(
+                    child: Padding(
+                      padding: EdgeInsets.only(left: 8),
+                      child: Text(
+                        entity.displayName,
+                        style: TextStyle(
+                            fontWeight: FontWeight.bold,
+                            color: Colors.white,
+                            fontSize: 22
+                        ),
+                      ),
+                    ),
+                  ),
+                  IconButton(
+                    padding: EdgeInsets.all(0),
+                    icon: Icon(Icons.close),
+                    color: Colors.white,
+                    iconSize: 30.0,
+                    onPressed: () {
+                      eventBus.fire(ShowEntityPageEvent());
+                    },
+                  )
+                ],
+              ),
+            ) :
+            Container(height: 0, width: 0,),
             Padding(
               padding: EdgeInsets.only(top: Sizes.rowPadding, left: Sizes.leftWidgetPadding),
               child: DefaultEntityContainer(state: entity._buildStatePartForPage(context)),

lib/entities/entity_picture.widget.dart

@@ -1,71 +0,0 @@
-part of '../main.dart';
-
-class EntityPicture extends StatelessWidget {
-
-  final EdgeInsetsGeometry padding;
-  final BoxFit fit;
-  
-  const EntityPicture({Key key, this.padding: const EdgeInsets.all(0.0), this.fit: BoxFit.cover}) : super(key: key);
-
-  int getDefaultIconByEntityId(String entityId, String deviceClass, String state) {
-    String domain = entityId.split(".")[0];
-    String iconNameByDomain = MaterialDesignIcons.defaultIconsByDomains["$domain.$state"] ?? MaterialDesignIcons.defaultIconsByDomains["$domain"];
-    String iconNameByDeviceClass;
-    if (deviceClass != null) {
-      iconNameByDeviceClass = MaterialDesignIcons.defaultIconsByDeviceClass["$domain.$deviceClass.$state"] ?? MaterialDesignIcons.defaultIconsByDeviceClass["$domain.$deviceClass"];
-    }
-    String iconName = iconNameByDeviceClass ?? iconNameByDomain;
-    if (iconName != null) {
-      return MaterialDesignIcons.iconsDataMap[iconName] ?? 0;
-    } else {
-      return 0;
-    }
-  }
-
-  Widget buildIcon(EntityWrapper data, BuildContext context) {
-    if (data == null) {
-      return null;
-    }
-    String iconName = data.icon;
-    int iconCode = 0;
-    if (iconName.length > 0) {
-      iconCode = MaterialDesignIcons.getIconCodeByIconName(iconName);
-    } else {
-      iconCode = getDefaultIconByEntityId(data.entity.entityId,
-          data.entity.deviceClass, data.entity.state); //
-    }
-    Widget iconPicture = Container(
-      child: Center(
-        child: Icon(
-          IconData(iconCode, fontFamily: 'Material Design Icons'),
-          size: Sizes.largeIconSize,
-          color: HAClientTheme().getOffStateColor(context),
-        )
-      )
-    );
-    
-    
-    if (data.entityPicture != null) {
-      return CachedNetworkImage(
-        imageUrl: data.entityPicture,
-        fit: this.fit,
-        errorWidget: (context, _, __) => iconPicture,
-        placeholder: (context, _) => iconPicture,
-      );
-    }
-    
-    return iconPicture;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
-    return Padding(
-      padding: padding,
-      child: buildIcon(
-          entityWrapper,
-          context
-      ),
-    );
-  }
-}

lib/entities/entity_wrapper.class.dart

@@ -2,48 +2,47 @@ part of '../main.dart';
 
 class EntityWrapper {
 
-  String overrideName;
-  String overrideIcon;
-  final bool stateColor;
+  String displayName;
+  String icon;
+  String unitOfMeasurement;
+  String entityPicture;
   EntityUIAction uiAction;
   Entity entity;
-  String unitOfMeasurementOverride;
-  final List stateFilter;
 
-  String get icon => overrideIcon ?? entity.icon;
-  String get entityPicture => entity.entityPicture;
-  String get displayName => overrideName ?? entity.displayName;
-  String get unitOfMeasurement => unitOfMeasurementOverride ?? entity.unitOfMeasurement;
 
   EntityWrapper({
     this.entity,
-    this.overrideIcon,
-    this.overrideName,
-    this.stateColor: true,
-    this.uiAction,
-    this.stateFilter
+    String icon,
+    String displayName,
+    this.uiAction
   }) {
-    if (entity.statelessType == StatelessEntityType.ghost || entity.statelessType == StatelessEntityType.none || entity.statelessType == StatelessEntityType.callService || entity.statelessType == StatelessEntityType.webLink) {
+    if (entity.statelessType == StatelessEntityType.NONE || entity.statelessType == StatelessEntityType.CALL_SERVICE || entity.statelessType == StatelessEntityType.WEBLINK) {
+      this.icon = icon ?? entity.icon;
+      if (icon == null) {
+        entityPicture = entity.entityPicture;
+      }
+      this.displayName = displayName ?? entity.displayName;
       if (uiAction == null) {
         uiAction = EntityUIAction();
       }
+      unitOfMeasurement = entity.unitOfMeasurement;
     }
   }
 
   void handleTap() {
     switch (uiAction.tapAction) {
       case EntityUIAction.toggle: {
-        ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
+        eventBus.fire(
+            ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
         break;
       }
 
       case EntityUIAction.callService: {
         if (uiAction.tapService != null) {
-          ConnectionManager().callService(
-            domain: uiAction.tapService.split(".")[0],
-            service: uiAction.tapService.split(".")[1],
-            data: uiAction.tapServiceData
-          );
+          eventBus.fire(
+              ServiceCallEvent(uiAction.tapService.split(".")[0],
+                  uiAction.tapService.split(".")[1], null,
+                  uiAction.tapServiceData));
         }
         break;
       }
@@ -54,16 +53,16 @@ class EntityWrapper {
 
       case EntityUIAction.moreInfo: {
         eventBus.fire(
-            new ShowEntityPageEvent(entityId: entity.entityId));
+            new ShowEntityPageEvent(entity: entity));
         break;
       }
 
       case EntityUIAction.navigate: {
-        if (uiAction.tapService != null && uiAction.tapService.startsWith("/")) {
+        if (uiAction.tapService.startsWith("/")) {
           //TODO handle local urls
-          Launcher.launchURLInBrowser('${AppSettings().httpWebHost}${uiAction.tapService}');
+          Logger.w("Local urls is not supported yet");
         } else {
-          Launcher.launchURLInBrowser(uiAction.tapService);
+          Launcher.launchURL(uiAction.tapService);
         }
         break;
       }
@@ -77,73 +76,33 @@ class EntityWrapper {
   void handleHold() {
       switch (uiAction.holdAction) {
         case EntityUIAction.toggle: {
-          ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
+          eventBus.fire(
+              ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
           break;
         }
 
         case EntityUIAction.callService: {
           if (uiAction.holdService != null) {
-            ConnectionManager().callService(
-              domain: uiAction.holdService.split(".")[0],
-              service: uiAction.holdService.split(".")[1],
-              data: uiAction.holdServiceData
-            );
+            eventBus.fire(
+                ServiceCallEvent(uiAction.holdService.split(".")[0],
+                    uiAction.holdService.split(".")[1], null,
+                    uiAction.holdServiceData));
           }
           break;
         }
 
         case EntityUIAction.moreInfo: {
           eventBus.fire(
-              new ShowEntityPageEvent(entityId: entity.entityId));
+              new ShowEntityPageEvent(entity: entity));
           break;
         }
 
         case EntityUIAction.navigate: {
-          if (uiAction.holdService != null && uiAction.holdService.startsWith("/")) {
+          if (uiAction.holdService.startsWith("/")) {
             //TODO handle local urls
-            Launcher.launchURLInBrowser('${AppSettings().httpWebHost}${uiAction.holdService}');
+            Logger.w("Local urls is not supported yet");
           } else {
-            Launcher.launchURLInBrowser(uiAction.holdService);
-          }
-          break;
-        }
-
-        default: {
-          break;
-        }
-      }
-  }
-
-  void handleDoubleTap() {
-      switch (uiAction.doubleTapAction) {
-        case EntityUIAction.toggle: {
-          ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
-          break;
-        }
-
-        case EntityUIAction.callService: {
-          if (uiAction.doubleTapService != null) {
-            ConnectionManager().callService(
-              domain: uiAction.doubleTapService.split(".")[0],
-              service: uiAction.doubleTapService.split(".")[1],
-              data: uiAction.doubleTapServiceData
-            );
-          }
-          break;
-        }
-
-        case EntityUIAction.moreInfo: {
-          eventBus.fire(
-              new ShowEntityPageEvent(entityId: entity.entityId));
-          break;
-        }
-
-        case EntityUIAction.navigate: {
-          if (uiAction.doubleTapService != null && uiAction.doubleTapService.startsWith("/")) {
-            //TODO handle local urls
-            Launcher.launchURLInBrowser('${AppSettings().httpWebHost}${uiAction.doubleTapService}');
-          } else {
-            Launcher.launchURLInBrowser(uiAction.doubleTapService);
+            Launcher.launchURL(uiAction.holdService);
           }
           break;
         }
@@ -155,63 +114,3 @@ class EntityWrapper {
   }
 
 }
-
-class EntityUIAction {
-  static const moreInfo = 'more-info';
-  static const toggle = 'toggle';
-  static const callService = 'call-service';
-  static const navigate = 'navigate';
-  static const none = 'none';
-
-  String tapAction = EntityUIAction.moreInfo;
-  String tapNavigationPath;
-  String tapService;
-  Map<String, dynamic> tapServiceData;
-  String holdAction = EntityUIAction.moreInfo;
-  String holdNavigationPath;
-  String holdService;
-  Map<String, dynamic> holdServiceData;
-  String doubleTapAction = EntityUIAction.none;
-  String doubleTapNavigationPath;
-  String doubleTapService;
-  Map<String, dynamic> doubleTapServiceData;
-
-  EntityUIAction({rawEntityData}) {
-    if (rawEntityData != null) {
-      if (rawEntityData["tap_action"] != null) {
-        if (rawEntityData["tap_action"] is String) {
-          tapAction = rawEntityData["tap_action"];
-        } else {
-          tapAction =
-              rawEntityData["tap_action"]["action"] ?? EntityUIAction.moreInfo;
-          tapNavigationPath = rawEntityData["tap_action"]["navigation_path"];
-          tapService = rawEntityData["tap_action"]["service"];
-          tapServiceData = rawEntityData["tap_action"]["service_data"];
-        }
-      }
-      if (rawEntityData["hold_action"] != null) {
-        if (rawEntityData["hold_action"] is String) {
-          holdAction = rawEntityData["hold_action"];
-        } else {
-          holdAction =
-              rawEntityData["hold_action"]["action"] ?? EntityUIAction.none;
-          holdNavigationPath = rawEntityData["hold_action"]["navigation_path"];
-          holdService = rawEntityData["hold_action"]["service"];
-          holdServiceData = rawEntityData["hold_action"]["service_data"];
-        }
-      }
-      if (rawEntityData["double_tap_action"] != null) {
-        if (rawEntityData["double_tap_action"] is String) {
-          doubleTapAction = rawEntityData["double_tap_action"];
-        } else {
-          doubleTapAction =
-              rawEntityData["double_tap_action"]["action"] ?? EntityUIAction.none;
-          doubleTapNavigationPath = rawEntityData["double_tap_action"]["navigation_path"];
-          doubleTapService = rawEntityData["double_tap_action"]["service"];
-          doubleTapServiceData = rawEntityData["double_tap_action"]["service_data"];
-        }
-      }
-    }
-  }
-
-}

lib/entities/error_entity_widget.dart

@@ -1,23 +0,0 @@
-part of '../main.dart';
-
-class ErrorEntityWidget extends StatelessWidget {
-  
-  final String text;
-
-  ErrorEntityWidget({
-    Key key, this.text
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    final EntityModel entityModel = EntityModel.of(context);
-    String errorText = text ?? "Entity error: ${entityModel.entityWrapper.entity?.entityId}";
-    return Container(
-        child: Padding(
-          padding: EdgeInsets.all(5.0),
-          child: Text(errorText),
-        ),
-        color: Theme.of(context).errorColor,
-    );
-  }
-}

lib/entities/fan/widgets/fan_controls.dart

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

lib/entities/flat_service_button.widget.dart

@@ -6,6 +6,7 @@ class FlatServiceButton extends StatelessWidget {
   final String serviceName;
   final String entityId;
   final String text;
+  final double fontSize;
 
   FlatServiceButton({
     Key key,
@@ -13,16 +14,17 @@ class FlatServiceButton extends StatelessWidget {
     @required this.serviceName,
     @required this.entityId,
     @required this.text,
+    this.fontSize: Sizes.stateFontSize
   }) : super(key: key);
 
   void _setNewState() {
-    ConnectionManager().callService(domain: serviceDomain, service: serviceName, entityId: entityId);
+    eventBus.fire(new ServiceCallEvent(serviceDomain, serviceName, entityId, null));
   }
 
   @override
   Widget build(BuildContext context) {
     return SizedBox(
-        height: Theme.of(context).textTheme.subhead.fontSize*2.5,
+        height: fontSize*2.5,
         child: FlatButton(
           onPressed: (() {
             _setNewState();
@@ -30,7 +32,8 @@ class FlatServiceButton extends StatelessWidget {
           child: Text(
             text,
             textAlign: TextAlign.right,
-            style: HAClientTheme().getActionTextStyle(context),
+            style:
+            new TextStyle(fontSize: fontSize, color: Colors.blue),
           ),
         )
     );