v. 0.5.4

Resolves #373
2019-05-09 14:15:21 +03:00 · 2019-05-09 13:17:30 +03:00 · 2019-05-09 13:16:35 +03:00 · 2019-04-04 21:54:41 +03:00 · 2019-04-04 21:51:05 +03:00 · 2019-04-04 21:44:16 +03:00
60 changed files with 2104 additions and 587 deletions
--- a/README.md
+++ b/README.md
@ -1,13 +1,12 @@
+[![flutter](https://somegeeky.website/assets/badges/flutter_badge_v3.svg)](https://somegeeky.website/badges/flutter) [![dart](https://somegeeky.website/assets/badges/dart_badge_v3.svg)](https://somegeeky.website/badges/dart)
 # HA Client
 ## Native Android client for Home Assistant
 ### With Lovelace UI support

-Home Assistant Android client on Dart with Flutter.
-
-Visit [www.vynn.co](https://www.vynn.co/ha-client) for more info.
+Visit [homemade.systems](http://ha-client.homemade.systems/) for more info.

 Join [Google Group](https://groups.google.com/d/forum/ha-client-alpha-testing) to become an alpha tester

 Download the app from [Google Play](https://play.google.com/apps/testing/com.keyboardcrumbs.haclient) after joining the group

-Discuss it in [Home Assistant community](https://community.home-assistant.io/t/alpha-testing-ha-client-native-android-client-for-home-assistant/69912) or in [Discord](https://discord.gg/NSaQEQ8)
+Discuss it in [Home Assistant community](https://community.home-assistant.io/t/alpha-testing-ha-client-native-android-client-for-home-assistant/69912)
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -29,7 +29,7 @@ def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))

 android {
-    compileSdkVersion 27
+    compileSdkVersion 28

    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
@ -43,7 +43,7 @@ android {
    defaultConfig {
        applicationId "com.keyboardcrumbs.haclient"
        minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -36,4 +36,4 @@
            </intent-filter>
        </activity>
    </application>
-</manifest>
+</manifest>
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/android/gradle.properties
+++ b/android/gradle.properties
@ -1 +1,5 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx2g
+org.gradle.daemon=true
+org.gradle.caching=true
+android.useAndroidX=true
+android.enableJetifier=false
--- a/android/gradlew
+++ b/android/gradlew
--- a/fonts/materialdesignicons-webfont-3-5-95.ttf
+++ b/fonts/materialdesignicons-webfont-3-5-95.ttf
--- a/images/icon/icon.png
+++ b/images/icon/icon.png
--- a/lib/entity.page.dart
+++ b/lib/entity.page.dart
@ -19,8 +19,8 @@ class _EntityViewPageState extends State<EntityViewPage> {
  void initState() {
    super.initState();
    _stateSubscription = eventBus.on<StateChangedEvent>().listen((event) {
-      Logger.d("State change event handled by entity page: ${event.entityId}");
      if (event.entityId == widget.entityId) {
+        Logger.d("State change event handled by entity page: ${event.entityId}");
        setState(() {});
      }
    });
--- a/lib/entity_class/button_entity.class.dart
+++ b/lib/entity_class/button_entity.class.dart
@ -9,7 +9,7 @@ class ButtonEntity extends Entity {
      entityId: entityId,
      serviceDomain: domain,
      serviceName: 'turn_on',
-      text: "EXECUTE",
+      text: domain == "scene" ? "ACTIVATE" : "EXECUTE",
    );
  }
 }
--- a/lib/entity_class/camera_entity.class.dart
+++ b/lib/entity_class/camera_entity.class.dart
@ -6,14 +6,12 @@ class CameraEntity extends Entity {

  CameraEntity(Map rawData) : super(rawData);

-  bool get supportOnOff => ((attributes["supported_features"] &
+  bool get supportOnOff => ((supportedFeatures &
  CameraEntity.SUPPORT_ON_OFF) ==
      CameraEntity.SUPPORT_ON_OFF);

  @override
  Widget _buildAdditionalControlsForPage(BuildContext context) {
-    return CameraControlsWidget(
-      url: '$homeAssistantWebHost/api/camera_proxy_stream/camera.demo_camera?token=${this.attributes['access_token']}',
-    );
+    return CameraStreamView();
  }
 }
--- a/lib/entity_class/climate_entity.class.dart
+++ b/lib/entity_class/climate_entity.class.dart
@ -23,44 +23,44 @@ class ClimateEntity extends Entity {
  static const SUPPORT_AUX_HEAT = 2048;
  static const SUPPORT_ON_OFF = 4096;

-  bool get supportTargetTemperature => ((attributes["supported_features"] &
+  bool get supportTargetTemperature => ((supportedFeatures &
  ClimateEntity.SUPPORT_TARGET_TEMPERATURE) ==
      ClimateEntity.SUPPORT_TARGET_TEMPERATURE);
-  bool get supportTargetTemperatureHigh => ((attributes["supported_features"] &
+  bool get supportTargetTemperatureHigh => ((supportedFeatures &
  ClimateEntity.SUPPORT_TARGET_TEMPERATURE_HIGH) ==
      ClimateEntity.SUPPORT_TARGET_TEMPERATURE_HIGH);
-  bool get supportTargetTemperatureLow => ((attributes["supported_features"] &
+  bool get supportTargetTemperatureLow => ((supportedFeatures &
  ClimateEntity.SUPPORT_TARGET_TEMPERATURE_LOW) ==
      ClimateEntity.SUPPORT_TARGET_TEMPERATURE_LOW);
-  bool get supportTargetHumidity => ((attributes["supported_features"] &
+  bool get supportTargetHumidity => ((supportedFeatures &
  ClimateEntity.SUPPORT_TARGET_HUMIDITY) ==
      ClimateEntity.SUPPORT_TARGET_HUMIDITY);
-  bool get supportTargetHumidityHigh => ((attributes["supported_features"] &
+  bool get supportTargetHumidityHigh => ((supportedFeatures &
  ClimateEntity.SUPPORT_TARGET_HUMIDITY_HIGH) ==
      ClimateEntity.SUPPORT_TARGET_HUMIDITY_HIGH);
-  bool get supportTargetHumidityLow => ((attributes["supported_features"] &
+  bool get supportTargetHumidityLow => ((supportedFeatures &
  ClimateEntity.SUPPORT_TARGET_HUMIDITY_LOW) ==
      ClimateEntity.SUPPORT_TARGET_HUMIDITY_LOW);
  bool get supportFanMode =>
-      ((attributes["supported_features"] & ClimateEntity.SUPPORT_FAN_MODE) ==
+      ((supportedFeatures & ClimateEntity.SUPPORT_FAN_MODE) ==
          ClimateEntity.SUPPORT_FAN_MODE);
-  bool get supportOperationMode => ((attributes["supported_features"] &
+  bool get supportOperationMode => ((supportedFeatures &
  ClimateEntity.SUPPORT_OPERATION_MODE) ==
      ClimateEntity.SUPPORT_OPERATION_MODE);
  bool get supportHoldMode =>
-      ((attributes["supported_features"] & ClimateEntity.SUPPORT_HOLD_MODE) ==
+      ((supportedFeatures & ClimateEntity.SUPPORT_HOLD_MODE) ==
          ClimateEntity.SUPPORT_HOLD_MODE);
  bool get supportSwingMode =>
-      ((attributes["supported_features"] & ClimateEntity.SUPPORT_SWING_MODE) ==
+      ((supportedFeatures & ClimateEntity.SUPPORT_SWING_MODE) ==
          ClimateEntity.SUPPORT_SWING_MODE);
  bool get supportAwayMode =>
-      ((attributes["supported_features"] & ClimateEntity.SUPPORT_AWAY_MODE) ==
+      ((supportedFeatures & ClimateEntity.SUPPORT_AWAY_MODE) ==
          ClimateEntity.SUPPORT_AWAY_MODE);
  bool get supportAuxHeat =>
-      ((attributes["supported_features"] & ClimateEntity.SUPPORT_AUX_HEAT) ==
+      ((supportedFeatures & ClimateEntity.SUPPORT_AUX_HEAT) ==
          ClimateEntity.SUPPORT_AUX_HEAT);
  bool get supportOnOff =>
-      ((attributes["supported_features"] & ClimateEntity.SUPPORT_ON_OFF) ==
+      ((supportedFeatures & ClimateEntity.SUPPORT_ON_OFF) ==
          ClimateEntity.SUPPORT_ON_OFF);

  List<String> get operationList => attributes["operation_list"] != null
--- a/lib/entity_class/const.dart
+++ b/lib/entity_class/const.dart
@ -28,6 +28,7 @@ class EntityState {
  static const unavailable = 'unavailable';
  static const ok = 'ok';
  static const problem = 'problem';
+  static const active = 'active';
 }

 class EntityUIAction {
--- a/lib/entity_class/cover_entity.class.dart
+++ b/lib/entity_class/cover_entity.class.dart
@ -11,29 +11,29 @@ class CoverEntity extends Entity {
  static const SUPPORT_STOP_TILT = 64;
  static const SUPPORT_SET_TILT_POSITION = 128;

-  bool get supportOpen => ((attributes["supported_features"] &
+  bool get supportOpen => ((supportedFeatures &
  CoverEntity.SUPPORT_OPEN) ==
      CoverEntity.SUPPORT_OPEN);
-  bool get supportClose => ((attributes["supported_features"] &
+  bool get supportClose => ((supportedFeatures &
  CoverEntity.SUPPORT_CLOSE) ==
      CoverEntity.SUPPORT_CLOSE);
-  bool get supportSetPosition => ((attributes["supported_features"] &
+  bool get supportSetPosition => ((supportedFeatures &
  CoverEntity.SUPPORT_SET_POSITION) ==
      CoverEntity.SUPPORT_SET_POSITION);
-  bool get supportStop => ((attributes["supported_features"] &
+  bool get supportStop => ((supportedFeatures &
  CoverEntity.SUPPORT_STOP) ==
      CoverEntity.SUPPORT_STOP);

-  bool get supportOpenTilt => ((attributes["supported_features"] &
+  bool get supportOpenTilt => ((supportedFeatures &
  CoverEntity.SUPPORT_OPEN_TILT) ==
      CoverEntity.SUPPORT_OPEN_TILT);
-  bool get supportCloseTilt => ((attributes["supported_features"] &
+  bool get supportCloseTilt => ((supportedFeatures &
  CoverEntity.SUPPORT_CLOSE_TILT) ==
      CoverEntity.SUPPORT_CLOSE_TILT);
-  bool get supportStopTilt => ((attributes["supported_features"] &
+  bool get supportStopTilt => ((supportedFeatures &
  CoverEntity.SUPPORT_STOP_TILT) ==
      CoverEntity.SUPPORT_STOP_TILT);
-  bool get supportSetTiltPosition => ((attributes["supported_features"] &
+  bool get supportSetTiltPosition => ((supportedFeatures &
  CoverEntity.SUPPORT_SET_TILT_POSITION) ==
      CoverEntity.SUPPORT_SET_TILT_POSITION);

--- a/lib/entity_class/entity.class.dart
+++ b/lib/entity_class/entity.class.dart
@ -1,5 +1,14 @@
 part of '../main.dart';

+class StatelessEntityType {
+  static const NONE = 0;
+  static const MISSED = 1;
+  static const DIVIDER = 2;
+  static const SECTION = 3;
+  static const CALL_SERVICE = 4;
+  static const WEBLINK = 5;
+}
+
 class Entity {

  static List badgeDomains = [
@ -67,9 +76,9 @@ class Entity {
  String state;
  String displayState;
  DateTime _lastUpdated;
+  int statelessType = 0;

  List<Entity> childEntities = [];
-  List<String> attributesToShow = ["all"];
  String deviceClass;
  EntityHistoryConfig historyConfig = EntityHistoryConfig(
    chartType: EntityHistoryWidgetType.simple
@ -85,17 +94,60 @@ class Entity {
  bool get isBadge => Entity.badgeDomains.contains(domain);
  String get icon => attributes["icon"] ?? "";
  bool get isOn => state == EntityState.on;
-  String get entityPicture => attributes["entity_picture"];
+  String get entityPicture => _getEntityPictureUrl();
  String get unitOfMeasurement => attributes["unit_of_measurement"] ?? "";
  List get childEntityIds => attributes["entity_id"] ?? [];
  String get lastUpdated => _getLastUpdatedFormatted();
  bool get isHidden => attributes["hidden"] ?? false;
  double get doubleState => double.tryParse(state) ?? 0.0;
+  int get supportedFeatures => attributes["supported_features"] ?? 0;
+
+  String _getEntityPictureUrl() {
+    String result = attributes["entity_picture"];
+    if (result == null) return result;
+    if (!result.startsWith("http")) {
+      if (result.startsWith("/")) {
+        result = "$homeAssistantWebHost$result";
+      } else {
+        result = "$homeAssistantWebHost/$result";
+      }
+    }
+    return result;
+  }

  Entity(Map rawData) {
    update(rawData);
  }

+  Entity.missed(String entityId) {
+    statelessType = StatelessEntityType.MISSED;
+    attributes = {"hidden": false};
+    this.entityId = entityId;
+  }
+
+  Entity.divider() {
+    statelessType = StatelessEntityType.DIVIDER;
+    attributes = {"hidden": false};
+  }
+
+  Entity.section(String label) {
+    statelessType = StatelessEntityType.SECTION;
+    attributes = {"hidden": false, "friendly_name": "$label"};
+  }
+
+  Entity.callService({String icon, String name, String service, String actionName}) {
+    statelessType = StatelessEntityType.CALL_SERVICE;
+    entityId = service;
+    displayState = actionName?.toUpperCase() ?? "RUN";
+    attributes = {"hidden": false, "friendly_name": "$name", "icon": "$icon"};
+  }
+
+  Entity.weblink({String url, String name, String icon}) {
+    statelessType = StatelessEntityType.WEBLINK;
+    entityId = "custom.custom"; //TODO wtf??
+    attributes = {"hidden": false, "friendly_name": "${name ?? url}", "icon": "${icon ?? 'mdi:link'}"};
+  }
+
  void update(Map rawData) {
    attributes = rawData["attributes"] ?? {};
    domain = rawData["entity_id"].split(".")[0];
--- a/lib/entity_class/entity_wrapper.class.dart
+++ b/lib/entity_class/entity_wrapper.class.dart
@ -4,6 +4,7 @@ class EntityWrapper {

  String displayName;
  String icon;
+  String entityPicture;
  EntityUIAction uiAction;
  Entity entity;

@ -14,10 +15,15 @@ class EntityWrapper {
    String displayName,
    this.uiAction
  }) {
-    this.icon = icon ?? entity.icon;
-    this.displayName = displayName ?? entity.displayName;
-    if (this.uiAction == null) {
-      this.uiAction = EntityUIAction();
+    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();
+      }
    }
  }

@ -49,6 +55,16 @@ class EntityWrapper {
        break;
      }

+      case EntityUIAction.navigate: {
+        if (uiAction.tapService.startsWith("/")) {
+          //TODO handle local urls
+          Logger.w("Local urls is not supported yet");
+        } else {
+          HAUtils.launchURL(uiAction.tapService);
+        }
+        break;
+      }
+
      default: {
        break;
      }
@ -79,6 +95,16 @@ class EntityWrapper {
          break;
        }

+        case EntityUIAction.navigate: {
+          if (uiAction.holdService.startsWith("/")) {
+            //TODO handle local urls
+            Logger.w("Local urls is not supported yet");
+          } else {
+            HAUtils.launchURL(uiAction.holdService);
+          }
+          break;
+        }
+
        default: {
          break;
        }
--- a/lib/entity_class/fan_entity.class.dart
+++ b/lib/entity_class/fan_entity.class.dart
@ -8,13 +8,13 @@ class FanEntity extends Entity {

  FanEntity(Map rawData) : super(rawData);

-  bool get supportSetSpeed => ((attributes["supported_features"] &
+  bool get supportSetSpeed => ((supportedFeatures &
  FanEntity.SUPPORT_SET_SPEED) ==
      FanEntity.SUPPORT_SET_SPEED);
-  bool get supportOscillate => ((attributes["supported_features"] &
+  bool get supportOscillate => ((supportedFeatures &
  FanEntity.SUPPORT_OSCILLATE) ==
      FanEntity.SUPPORT_OSCILLATE);
-  bool get supportDirection => ((attributes["supported_features"] &
+  bool get supportDirection => ((supportedFeatures &
  FanEntity.SUPPORT_DIRECTION) ==
      FanEntity.SUPPORT_DIRECTION);

--- a/lib/entity_class/light_entity.class.dart
+++ b/lib/entity_class/light_entity.class.dart
@ -10,46 +10,50 @@ class LightEntity extends Entity {
  static const SUPPORT_TRANSITION = 32;
  static const SUPPORT_WHITE_VALUE = 128;

-  bool get supportBrightness => ((attributes["supported_features"] &
+  bool get supportBrightness => ((supportedFeatures &
  LightEntity.SUPPORT_BRIGHTNESS) ==
      LightEntity.SUPPORT_BRIGHTNESS);
-  bool get supportColorTemp => ((attributes["supported_features"] &
+  bool get supportColorTemp => ((supportedFeatures &
  LightEntity.SUPPORT_COLOR_TEMP) ==
      LightEntity.SUPPORT_COLOR_TEMP);
-  bool get supportEffect => ((attributes["supported_features"] &
+  bool get supportEffect => ((supportedFeatures &
  LightEntity.SUPPORT_EFFECT) ==
      LightEntity.SUPPORT_EFFECT);
-  bool get supportFlash => ((attributes["supported_features"] &
+  bool get supportFlash => ((supportedFeatures &
  LightEntity.SUPPORT_FLASH) ==
      LightEntity.SUPPORT_FLASH);
-  bool get supportColor => ((attributes["supported_features"] &
+  bool get supportColor => ((supportedFeatures &
  LightEntity.SUPPORT_COLOR) ==
      LightEntity.SUPPORT_COLOR);
-  bool get supportTransition => ((attributes["supported_features"] &
+  bool get supportTransition => ((supportedFeatures &
  LightEntity.SUPPORT_TRANSITION) ==
      LightEntity.SUPPORT_TRANSITION);
-  bool get supportWhiteValue => ((attributes["supported_features"] &
+  bool get supportWhiteValue => ((supportedFeatures &
  LightEntity.SUPPORT_WHITE_VALUE) ==
      LightEntity.SUPPORT_WHITE_VALUE);

  int get brightness => _getIntAttributeValue("brightness");
+  int get whiteValue => _getIntAttributeValue("white_value");
  String get effect => attributes["effect"];
  int get colorTemp => _getIntAttributeValue("color_temp");
  double get maxMireds => _getDoubleAttributeValue("max_mireds");
  double get minMireds => _getDoubleAttributeValue("min_mireds");
  HSVColor get color => _getColor();
-  bool get isAdditionalControls => ((attributes["supported_features"] != null) && (attributes["supported_features"] != 0));
+  bool get isAdditionalControls => ((supportedFeatures != null) && (supportedFeatures != 0));
  List<String> get effectList => getStringListAttributeValue("effect_list");

  LightEntity(Map rawData) : super(rawData);

  HSVColor _getColor() {
    List hs = attributes["hs_color"];
+    List rgb = attributes["rgb_color"];
    try {
-      if ((hs != null) && (hs.length > 0)) {
+      if (hs != null && hs.isNotEmpty) {
        double sat = hs[1]/100;
        String ssat = sat.toStringAsFixed(2);
        return HSVColor.fromAHSV(1.0, hs[0], double.parse(ssat), 1.0);
+      } else if (rgb != null && rgb.isNotEmpty) {
+        return HSVColor.fromColor(Color.fromARGB(255, rgb[0], rgb[1], rgb[2]));
      } else {
        return null;
      }
--- a/lib/entity_class/lock_entity.class.dart
+++ b/lib/entity_class/lock_entity.class.dart
@ -7,6 +7,15 @@ class LockEntity extends Entity {

  @override
  Widget _buildStatePart(BuildContext context) {
-    return LockStateWidget();
+    return LockStateWidget(
+      assumedState: false,
+    );
+  }
+
+  @override
+  Widget _buildStatePartForPage(BuildContext context) {
+    return LockStateWidget(
+      assumedState: true,
+    );
  }
 }
--- a/lib/entity_class/media_player_entity.class.dart
+++ b/lib/entity_class/media_player_entity.class.dart
@ -22,53 +22,53 @@ class MediaPlayerEntity extends Entity {

  MediaPlayerEntity(Map rawData) : super(rawData);

-  bool get supportPause => ((attributes["supported_features"] &
+  bool get supportPause => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_PAUSE) ==
      MediaPlayerEntity.SUPPORT_PAUSE);
-  bool get supportSeek => ((attributes["supported_features"] &
+  bool get supportSeek => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_SEEK) ==
      MediaPlayerEntity.SUPPORT_SEEK);
-  bool get supportVolumeSet => ((attributes["supported_features"] &
+  bool get supportVolumeSet => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_VOLUME_SET) ==
      MediaPlayerEntity.SUPPORT_VOLUME_SET);
-  bool get supportVolumeMute => ((attributes["supported_features"] &
+  bool get supportVolumeMute => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_VOLUME_MUTE) ==
      MediaPlayerEntity.SUPPORT_VOLUME_MUTE);
-  bool get supportPreviousTrack => ((attributes["supported_features"] &
+  bool get supportPreviousTrack => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_PREVIOUS_TRACK) ==
      MediaPlayerEntity.SUPPORT_PREVIOUS_TRACK);
-  bool get supportNextTrack => ((attributes["supported_features"] &
+  bool get supportNextTrack => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_NEXT_TRACK) ==
      MediaPlayerEntity.SUPPORT_NEXT_TRACK);

-  bool get supportTurnOn => ((attributes["supported_features"] &
+  bool get supportTurnOn => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_TURN_ON) ==
      MediaPlayerEntity.SUPPORT_TURN_ON);
-  bool get supportTurnOff => ((attributes["supported_features"] &
+  bool get supportTurnOff => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_TURN_OFF) ==
      MediaPlayerEntity.SUPPORT_TURN_OFF);
-  bool get supportPlayMedia => ((attributes["supported_features"] &
+  bool get supportPlayMedia => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_PLAY_MEDIA) ==
      MediaPlayerEntity.SUPPORT_PLAY_MEDIA);
-  bool get supportVolumeStep => ((attributes["supported_features"] &
+  bool get supportVolumeStep => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_VOLUME_STEP) ==
      MediaPlayerEntity.SUPPORT_VOLUME_STEP);
-  bool get supportSelectSource => ((attributes["supported_features"] &
+  bool get supportSelectSource => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_SELECT_SOURCE) ==
      MediaPlayerEntity.SUPPORT_SELECT_SOURCE);
-  bool get supportStop => ((attributes["supported_features"] &
+  bool get supportStop => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_STOP) ==
      MediaPlayerEntity.SUPPORT_STOP);
-  bool get supportClearPlaylist => ((attributes["supported_features"] &
+  bool get supportClearPlaylist => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_CLEAR_PLAYLIST) ==
      MediaPlayerEntity.SUPPORT_CLEAR_PLAYLIST);
-  bool get supportPlay => ((attributes["supported_features"] &
+  bool get supportPlay => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_PLAY) ==
      MediaPlayerEntity.SUPPORT_PLAY);
-  bool get supportShuffleSet => ((attributes["supported_features"] &
+  bool get supportShuffleSet => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_SHUFFLE_SET) ==
      MediaPlayerEntity.SUPPORT_SHUFFLE_SET);
-  bool get supportSelectSoundMode => ((attributes["supported_features"] &
+  bool get supportSelectSoundMode => ((supportedFeatures &
  MediaPlayerEntity.SUPPORT_SELECT_SOUND_MODE) ==
      MediaPlayerEntity.SUPPORT_SELECT_SOUND_MODE);

--- a/lib/entity_class/timer_entity.dart
+++ b/lib/entity_class/timer_entity.dart
@ -0,0 +1,45 @@
+part of '../main.dart';
+
+class TimerEntity extends Entity {
+  TimerEntity(Map rawData) : super(rawData);
+
+  Duration duration;
+
+  @override
+  void update(Map rawData) {
+    super.update(rawData);
+    String durationSource = "${attributes["duration"]}";
+    if (durationSource != null && durationSource.isNotEmpty) {
+      try {
+        List<String> durationList = durationSource.split(":");
+        if (durationList.length == 1) {
+          duration = Duration(seconds: int.tryParse(durationList[0] ?? 0));
+        } else if (durationList.length == 2) {
+          duration = Duration(
+              hours: int.tryParse(durationList[0]) ?? 0,
+              minutes: int.tryParse(durationList[1]) ?? 0
+          );
+        } else if (durationList.length == 3) {
+          duration = Duration(
+              hours: int.tryParse(durationList[0]) ?? 0,
+              minutes: int.tryParse(durationList[1]) ?? 0,
+              seconds: int.tryParse(durationList[2]) ?? 0
+          );
+        } else {
+          Logger.e("Strange $entityId duration format: $durationSource");
+          duration = Duration(seconds: 0);
+        }
+      } catch (e) {
+        Logger.e("Error parsing duration for $entityId: ${e.toString()}");
+        duration = Duration(seconds: 0);
+      }
+    } else {
+      duration = Duration(seconds: 0);
+    }
+  }
+
+  @override
+  Widget _buildStatePart(BuildContext context) {
+    return TimerState();
+  }
+}
--- a/lib/entity_collection.class.dart
+++ b/lib/entity_collection.class.dart
@ -92,6 +92,9 @@ class EntityCollection {
      case "alarm_control_panel": {
        return AlarmControlPanelEntity(rawEntityData);
      }
+      case "timer": {
+        return TimerEntity(rawEntityData);
+      }
      default: {
        return Entity(rawEntityData);
      }
--- a/lib/entity_widgets/button_entity_container.dart
+++ b/lib/entity_widgets/button_entity_container.dart
@ -9,7 +9,12 @@ class ButtonEntityContainer extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
-
+    if (entityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
+      return MissedEntityWidget();
+    }
+    if (entityWrapper.entity.statelessType > StatelessEntityType.MISSED) {
+      return Container(width: 0.0, height: 0.0,);
+    }
    return InkWell(
      onTap: () => entityWrapper.handleTap(),
      onLongPress: () => entityWrapper.handleHold(),
@ -19,11 +24,11 @@ class ButtonEntityContainer extends StatelessWidget {
          FractionallySizedBox(
            widthFactor: 0.4,
            child: FittedBox(
-              fit: BoxFit.fitHeight,
-              child: EntityIcon(
-                padding: EdgeInsets.fromLTRB(2.0, 6.0, 2.0, 2.0),
-                iconSize: Sizes.iconSize,
-              )
+                fit: BoxFit.fitHeight,
+                child: EntityIcon(
+                  padding: EdgeInsets.fromLTRB(2.0, 6.0, 2.0, 2.0),
+                  size: Sizes.iconSize,
+                )
            ),
          ),
          _buildName()
--- a/lib/entity_widgets/common/badge.dart
+++ b/lib/entity_widgets/common/badge.dart
@ -14,11 +14,11 @@ class BadgeWidget extends StatelessWidget {
        {
          badgeIcon = entityModel.entityWrapper.entity.state == "below_horizon"
              ? Icon(
-            MaterialDesignIcons.createIconDataFromIconCode(0xf0dc),
+            MaterialDesignIcons.getIconDataFromIconCode(0xf0dc),
            size: iconSize,
          )
              : Icon(
-            MaterialDesignIcons.createIconDataFromIconCode(0xf5a8),
+            MaterialDesignIcons.getIconDataFromIconCode(0xf5a8),
            size: iconSize,
          );
          break;
@ -27,14 +27,20 @@ class BadgeWidget extends StatelessWidget {
      case "media_player":
      case "binary_sensor":
        {
-          badgeIcon = MaterialDesignIcons.createIconWidgetFromEntityData(
-              entityModel.entityWrapper, iconSize, Colors.black);
+          badgeIcon = EntityIcon(
+            padding: EdgeInsets.all(0.0),
+            size: iconSize,
+            color: Colors.black
+          );
          break;
        }
      case "device_tracker":
        {
-          badgeIcon = MaterialDesignIcons.createIconWidgetFromEntityData(
-              entityModel.entityWrapper, iconSize, Colors.black);
+          badgeIcon = EntityIcon(
+              padding: EdgeInsets.all(0.0),
+              size: iconSize,
+              color: Colors.black
+          );
          onBadgeTextValue = entityModel.entityWrapper.entity.state;
          break;
        }
--- a/lib/entity_widgets/common/camera_stream_view.dart
+++ b/lib/entity_widgets/common/camera_stream_view.dart
@ -0,0 +1,175 @@
+part of '../../main.dart';
+
+class CameraStreamView extends StatefulWidget {
+
+  CameraStreamView({Key key}) : super(key: key);
+
+  @override
+  _CameraStreamViewState createState() => _CameraStreamViewState();
+}
+
+class _CameraStreamViewState extends State<CameraStreamView> {
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  CameraEntity _entity;
+
+  http.Client client;
+  http.StreamedResponse response;
+  List<int> binaryImage = [];
+  bool timeToStop = false;
+  Completer streamCompleter;
+  bool started = false;
+  bool useSVG = false;
+
+  void _connect() async {
+    started = true;
+    timeToStop = false;
+    String streamUrl = '$homeAssistantWebHost/api/camera_proxy_stream/${_entity.entityId}?token=${_entity.attributes['access_token']}';
+    client = new http.Client(); // create a client to make api calls
+    http.Request request = new http.Request("GET", Uri.parse(streamUrl));  // create get request
+    Logger.d("[Sending] ==> $streamUrl");
+    response = await client.send(request);
+    Logger.d("[Received] <== ${response.headers}");
+    String frameBoundary = response.headers['content-type'].split('boundary=')[1];
+    final int frameBoundarySize = frameBoundary.length;
+    List<int> primaryBuffer=[];
+    int imageSizeStart = 59;
+    int imageSizeEnd = 0;
+    int imageStart = 0;
+    int imageSize = 0;
+    String strBuffer = "";
+    String contentType = "";
+    streamCompleter = Completer();
+    response.stream.transform(
+        StreamTransformer.fromHandlers(
+          handleData: (data, sink) {
+            primaryBuffer.addAll(data);
+            imageStart = 0;
+            imageSizeEnd = 0;
+            if (primaryBuffer.length >= imageSizeStart + 10) {
+              contentType = utf8.decode(
+                  primaryBuffer.sublist(frameBoundarySize+16, imageSizeStart + 10), allowMalformed: true).split("\r\n")[0];
+              useSVG = contentType == "image/svg+xml";
+              imageSizeStart = frameBoundarySize + 16 + contentType.length + 18;
+              for (int i = imageSizeStart; i < primaryBuffer.length - 4; i++) {
+                strBuffer = utf8.decode(
+                    primaryBuffer.sublist(i, i + 4), allowMalformed: true);
+                if (strBuffer == "\r\n\r\n") {
+                  imageSizeEnd = i;
+                  imageStart = i + 4;
+                  break;
+                }
+              }
+              if (imageSizeEnd > 0) {
+                imageSize = int.tryParse(utf8.decode(
+                    primaryBuffer.sublist(imageSizeStart, imageSizeEnd),
+                    allowMalformed: true));
+                //Logger.d("content-length: $imageSize");
+                if (imageSize != null &&
+                    primaryBuffer.length >= imageStart + imageSize + 2) {
+                  sink.add(
+                      primaryBuffer.sublist(
+                          imageStart, imageStart + imageSize));
+                  primaryBuffer.removeRange(0, imageStart + imageSize + 2);
+                }
+              }
+            }
+            if (timeToStop) {
+              sink?.close();
+              streamCompleter.complete();
+            }
+          },
+          handleError: (error, stack, sink) {
+            Logger.e("Error parsing MJPEG stream: $error");
+          },
+          handleDone: (sink) {
+            Logger.d("Camera stream finished. Reconnecting...");
+            sink?.close();
+            streamCompleter?.complete();
+            _reconnect();
+          },
+        )
+    ).listen((d) {
+      if (!timeToStop) {
+        setState(() {
+          binaryImage = d;
+        });
+      }
+    });
+  }
+
+  void _reconnect() {
+    disconnect().then((_){
+      _connect();
+    });
+  }
+
+  Future disconnect() {
+    Completer disconF = Completer();
+    timeToStop = true;
+    if (streamCompleter != null && !streamCompleter.isCompleted) {
+      streamCompleter.future.then((_) {
+        client?.close();
+        disconF.complete();
+      });
+    } else {
+      client?.close();
+      disconF.complete();
+    }
+    return disconF.future;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (!started) {
+      _entity = EntityModel
+          .of(context)
+          .entityWrapper
+          .entity;
+      _connect();
+    }
+
+    if (binaryImage.isEmpty) {
+      return Column(
+        children: <Widget>[
+          Container(
+              padding: const EdgeInsets.all(20.0),
+              child: const CircularProgressIndicator()
+          )
+        ],
+      );
+    } else {
+      if (useSVG) {
+        return Column(
+          children: <Widget>[
+            SvgPicture.memory(
+              Uint8List.fromList(binaryImage),
+              placeholderBuilder: (BuildContext context) =>
+              new Container(
+                  padding: const EdgeInsets.all(20.0),
+                  child: const CircularProgressIndicator()
+              ),
+            )
+          ],
+        );
+      } else {
+        return Column(
+          children: <Widget>[
+            Image.memory(
+                Uint8List.fromList(binaryImage), gaplessPlayback: true),
+          ],
+        );
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    disconnect();
+    super.dispose();
+  }
+}
--- a/lib/entity_widgets/common/entity_attributes_list.dart
+++ b/lib/entity_widgets/common/entity_attributes_list.dart
@ -7,20 +7,9 @@ class EntityAttributesList extends StatelessWidget {
  Widget build(BuildContext context) {
    final entityModel = EntityModel.of(context);
    List<Widget> attrs = [];
-    if ((entityModel.entityWrapper.entity.attributesToShow == null) ||
-        (entityModel.entityWrapper.entity.attributesToShow.contains("all"))) {
-      entityModel.entityWrapper.entity.attributes.forEach((name, value) {
-        attrs.add(_buildSingleAttribute("$name", "$value"));
-      });
-    } else {
-      entityModel.entityWrapper.entity.attributesToShow.forEach((String attr) {
-        String attrValue = entityModel.entityWrapper.entity.getAttribute("$attr");
-        if (attrValue != null) {
-          attrs.add(
-              _buildSingleAttribute("$attr", "$attrValue"));
-        }
-      });
-    }
+    entityModel.entityWrapper.entity.attributes.forEach((name, value) {
+      attrs.add(_buildSingleAttribute("$name", "${value ?? '-'}"));
+    });
    return Padding(
      padding: EdgeInsets.only(bottom: Sizes.rowPadding),
      child: Column(
@ -49,7 +38,7 @@ class EntityAttributesList extends StatelessWidget {
            padding: EdgeInsets.fromLTRB(
                0.0, Sizes.rowPadding, Sizes.rightWidgetPadding, 0.0),
            child: Text(
-              "$value",
+              "${value}",
              textAlign: TextAlign.right,
            ),
          ),
--- a/lib/entity_widgets/controls/camera_controls.dart
+++ b/lib/entity_widgets/controls/camera_controls.dart
@ -1,115 +0,0 @@
-part of '../../main.dart';
-
-class CameraControlsWidget extends StatefulWidget {
-
-  final String url;
-
-  CameraControlsWidget({Key key, @required this.url}) : super(key: key);
-
-  @override
-  _CameraControlsWidgetState createState() => _CameraControlsWidgetState();
-}
-
-class _CameraControlsWidgetState extends State<CameraControlsWidget> {
-
-  @override
-  void initState() {
-    super.initState();
-    _getData();
-  }
-
-  http.Client client;
-  http.StreamedResponse response;
-  List<int> binaryImage = [];
-  String cameraState = "Connecting...";
-  bool timeToStop = false;
-  Completer streamCompleter;
-
-  void _getData() async {
-    client = new http.Client(); // create a client to make api calls
-    http.Request request = new http.Request("GET", Uri.parse(widget.url));  // create get request
-    Logger.d("[Sending] ==> ${widget.url}");
-    response = await client.send(request);
-    setState(() {
-      cameraState = "Starting...";
-    });
-    Logger.d("[Received] <== ${response.headers}");
-    List<int> primaryBuffer=[];
-    final int imageSizeStart = 59;
-    int imageSizeEnd = 0;
-    int imageStart = 0;
-    int imageSize = 0;
-    String strBuffer = "";
-    streamCompleter = Completer();
-    response.stream.transform(
-        StreamTransformer.fromHandlers(
-          handleData: (data, sink) {
-            primaryBuffer.addAll(data);
-            if (primaryBuffer.length >= 66) {
-              for (int i = imageSizeStart; i < primaryBuffer.length - 4; i++) {
-                strBuffer = utf8.decode(
-                    primaryBuffer.sublist(i, i + 4), allowMalformed: true);
-                if (strBuffer == "\r\n\r\n") {
-                  imageSizeEnd = i;
-                  imageStart = i + 4;
-                  break;
-                }
-              }
-              imageSize = int.tryParse(utf8.decode(
-                  primaryBuffer.sublist(imageSizeStart, imageSizeEnd),
-                  allowMalformed: true));
-              if (imageSize != null && primaryBuffer.length >= imageStart + imageSize + 2) {
-                sink.add(
-                    primaryBuffer.sublist(imageStart, imageStart + imageSize));
-                primaryBuffer.removeRange(0, imageStart + imageSize + 2);
-              }
-            }
-            if (timeToStop) {
-              sink?.close();
-              streamCompleter.complete();
-            }
-          },
-          handleError: (error, stack, sink) {
-            Logger.e("Error parsing MJPEG stream: $error");
-          },
-          handleDone: (sink) {
-            sink?.close();
-          },
-        )
-    ).listen((d) {
-      setState(() {
-        binaryImage = d;
-      });
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (binaryImage.isEmpty) {
-      return Column(
-        children: <Widget>[
-          Text("$cameraState")
-        ],
-      );
-    } else {
-      return Column(
-        children: <Widget>[
-          Image.memory(Uint8List.fromList(binaryImage), gaplessPlayback: true),
-        ],
-      );
-    }
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    timeToStop = true;
-    if (streamCompleter != null && !streamCompleter.isCompleted) {
-      streamCompleter.future.then((_) {
-        client?.close();
-      });
-    } else {
-      client?.close();
-    }
-  }
-}
--- a/lib/entity_widgets/controls/climate_controls.dart
+++ b/lib/entity_widgets/controls/climate_controls.dart
@ -440,13 +440,13 @@ class TemperatureControlWidget extends StatelessWidget {
        Column(
          children: <Widget>[
            IconButton(
-              icon: Icon(MaterialDesignIcons.createIconDataFromIconName(
+              icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
                  'mdi:chevron-up')),
              iconSize: 30.0,
              onPressed: () => onInc(),
            ),
            IconButton(
-              icon: Icon(MaterialDesignIcons.createIconDataFromIconName(
+              icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
                  'mdi:chevron-down')),
              iconSize: 30.0,
              onPressed: () => onDec(),
--- a/lib/entity_widgets/controls/cover_controls.dart
+++ b/lib/entity_widgets/controls/cover_controls.dart
@ -157,7 +157,7 @@ class CoverTiltControlsWidget extends StatelessWidget {
    if (entity.supportOpenTilt) {
      buttons.add(IconButton(
          icon: Icon(
-            MaterialDesignIcons.createIconDataFromIconName(
+            MaterialDesignIcons.getIconDataFromIconName(
                "mdi:arrow-top-right"),
            size: Sizes.iconSize,
          ),
@ -170,7 +170,7 @@ class CoverTiltControlsWidget extends StatelessWidget {
    if (entity.supportStopTilt) {
      buttons.add(IconButton(
          icon: Icon(
-            MaterialDesignIcons.createIconDataFromIconName("mdi:stop"),
+            MaterialDesignIcons.getIconDataFromIconName("mdi:stop"),
            size: Sizes.iconSize,
          ),
          onPressed: () => _stop(entity)));
@ -182,7 +182,7 @@ class CoverTiltControlsWidget extends StatelessWidget {
    if (entity.supportCloseTilt) {
      buttons.add(IconButton(
          icon: Icon(
-            MaterialDesignIcons.createIconDataFromIconName(
+            MaterialDesignIcons.getIconDataFromIconName(
                "mdi:arrow-bottom-left"),
            size: Sizes.iconSize,
          ),
--- a/lib/entity_widgets/controls/light_controls.dart
+++ b/lib/entity_widgets/controls/light_controls.dart
@ -10,6 +10,7 @@ class LightControlsWidget extends StatefulWidget {
 class _LightControlsWidgetState extends State<LightControlsWidget> {

  int _tmpBrightness;
+  int _tmpWhiteValue;
  int _tmpColorTemp = 0;
  HSVColor _tmpColor = HSVColor.fromAHSV(1.0, 30.0, 0.0, 1.0);
  bool _changedHere = false;
@ -17,6 +18,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {

  void _resetState(LightEntity entity) {
    _tmpBrightness = entity.brightness ?? 0;
+    _tmpWhiteValue = entity.whiteValue ?? 0;
    _tmpColorTemp = entity.colorTemp ?? entity.minMireds?.toInt();
    _tmpColor = entity.color ?? _tmpColor;
    _tmpEffect = entity.effect;
@ -38,6 +40,17 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
    });
  }

+  void _setWhiteValue(LightEntity entity, double value) {
+    setState(() {
+      _tmpWhiteValue = value.round();
+      _changedHere = true;
+      eventBus.fire(new ServiceCallEvent(
+            entity.domain, "turn_on", entity.entityId,
+            {"white_value": _tmpWhiteValue}));
+
+    });
+  }
+
  void _setColorTemp(LightEntity entity, double value) {
    setState(() {
      _tmpColorTemp = value.round();
@ -84,6 +97,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
      crossAxisAlignment: CrossAxisAlignment.center,
      children: <Widget>[
        _buildBrightnessControl(entity),
+        _buildWhiteValueControl(entity),
        _buildColorTempControl(entity),
        _buildColorControl(entity),
        _buildEffectControl(entity)
@ -112,6 +126,27 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
    }
  }

+  Widget _buildWhiteValueControl(LightEntity entity) {
+    if ((entity.supportWhiteValue) && (_tmpWhiteValue != null)) {
+      return UniversalSlider(
+        onChanged: (value) {
+          setState(() {
+            _changedHere = true;
+            _tmpWhiteValue = value.round();
+          });
+        },
+        min: 0.0,
+        max: 255.0,
+        onChangeEnd: (value) => _setWhiteValue(entity, value),
+        value: _tmpWhiteValue == null ? 0.0 : _tmpWhiteValue.toDouble(),
+        leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:file-word-box")),
+        title: "White",
+      );
+    } else {
+      return Container(width: 0.0, height: 0.0);
+    }
+  }
+
  Widget _buildColorTempControl(LightEntity entity) {
    if (entity.supportColorTemp) {
      return UniversalSlider(
@ -136,30 +171,45 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {

  Widget _buildColorControl(LightEntity entity) {
    if (entity.supportColor) {
-      return LightColorPicker(
-        color: _tmpColor,
-        onColorSelected: (color) => _setColor(entity, color),
+      HSVColor savedColor = HomeAssistantModel.of(context)?.homeAssistant?.savedColor;
+      return Column(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          LightColorPicker(
+            color: _tmpColor,
+            onColorSelected: (color) => _setColor(entity, color),
+          ),
+          Row(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              FlatButton(
+                color: _tmpColor.toColor(),
+                child: Text('Copy color'),
+                onPressed: _tmpColor == null ? null : () {
+                  setState(() {
+                    HomeAssistantModel
+                        .of(context)
+                        .homeAssistant
+                        .savedColor = _tmpColor;
+                  });
+                },
+              ),
+              FlatButton(
+                color: savedColor?.toColor() ?? Colors.transparent,
+                child: Text('Paste color'),
+                onPressed: savedColor == null ? null : () {
+                  _setColor(entity, savedColor);
+                },
+              )
+            ],
+          )
+        ],
      );
    } else {
      return Container(width: 0.0, height: 0.0);
    }
  }

-  void _showColorPicker(LightEntity entity) {
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          titlePadding: EdgeInsets.all(0.0),
-          contentPadding: EdgeInsets.all(0.0),
-          content: LightColorPicker(
-            color: _tmpColor,
-          ),
-        );
-      },
-    );
-  }
-
  Widget _buildEffectControl(LightEntity entity) {
    if ((entity.supportEffect) && (entity.effectList != null)) {
      return ModeSelectorWidget(
--- a/lib/entity_widgets/controls/media_player_widgets.dart
+++ b/lib/entity_widgets/controls/media_player_widgets.dart
@ -81,7 +81,7 @@ class MediaPlayerWidget extends StatelessWidget {
          children: <Widget>[
            Flexible(
              child: Image(
-                image: CachedNetworkImageProvider("$homeAssistantWebHost${entity.entityPicture}"),
+                image: CachedNetworkImageProvider("${entity.entityPicture}"),
                height: 240.0,
                //width: 320.0,
                fit: BoxFit.contain,
@ -95,7 +95,7 @@ class MediaPlayerWidget extends StatelessWidget {
        mainAxisAlignment: MainAxisAlignment.center,
        children: <Widget>[
          Icon(
-            MaterialDesignIcons.createIconDataFromIconName("mdi:movie"),
+            MaterialDesignIcons.getIconDataFromIconName("mdi:movie"),
            size: 150.0,
            color: EntityColor.stateColor("$state"),
          )
@ -227,7 +227,7 @@ class MediaPlayerPlaybackControls extends StatelessWidget {
    if (showMenu) {
      result.add(
          IconButton(
-              icon: Icon(MaterialDesignIcons.createIconDataFromIconName(
+              icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
                  "mdi:dots-vertical")),
              onPressed: () => eventBus.fire(new ShowEntityPageEvent(entity))
          )
@ -307,11 +307,11 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
    if (entity.state != EntityState.off && entity.state != EntityState.unknown && entity.state != EntityState.unavailable) {
      Widget muteWidget;
      Widget volumeStepWidget;
-      if (entity.supportVolumeMute) {
+      if (entity.supportVolumeMute  || entity.attributes["is_volume_muted"] != null) {
        bool isMuted = entity.attributes["is_volume_muted"] ?? false;
        muteWidget =
            IconButton(
-                icon: Icon(isMuted ? Icons.volume_off : Icons.volume_up),
+                icon: Icon(isMuted ? Icons.volume_up : Icons.volume_off),
                onPressed: () => _setVolumeMute(!isMuted, entity.entityId)
            );
      } else {
@ -322,11 +322,11 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
          mainAxisSize: MainAxisSize.min,
          children: <Widget>[
            IconButton(
-                icon: Icon(MaterialDesignIcons.createIconDataFromIconName("mdi:plus")),
+                icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:plus")),
                onPressed: () => _setVolumeUp(entity.entityId)
            ),
            IconButton(
-                icon: Icon(MaterialDesignIcons.createIconDataFromIconName("mdi:minus")),
+                icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:minus")),
                onPressed: () => _setVolumeDown(entity.entityId)
            )
          ],
--- a/lib/entity_widgets/default_entity_container.dart
+++ b/lib/entity_widgets/default_entity_container.dart
@ -11,6 +11,25 @@ class DefaultEntityContainer extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final EntityModel entityModel = EntityModel.of(context);
+    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
+      return MissedEntityWidget();
+    }
+    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.DIVIDER) {
+      return Divider();
+    }
+    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.SECTION) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          Divider(),
+          Text(
+              "${entityModel.entityWrapper.entity.displayName}",
+            style: TextStyle(color: Colors.blue),
+          )
+        ],
+      );
+    }
    return InkWell(
      onLongPress: () {
        if (entityModel.handleTap) {
@ -30,7 +49,9 @@ class DefaultEntityContainer extends StatelessWidget {
          Flexible(
            fit: FlexFit.tight,
            flex: 3,
-            child: EntityName(),
+            child: EntityName(
+              padding: EdgeInsets.fromLTRB(10.0, 2.0, 10.0, 2.0),
+            ),
          ),
          state
        ],
--- a/lib/entity_widgets/entity_colors.class.dart
+++ b/lib/entity_widgets/entity_colors.class.dart
@ -2,6 +2,8 @@ part of '../main.dart';

 class EntityColor {

+  static const defaultStateColor = Color.fromRGBO(68, 115, 158, 1.0);
+
  static const badgeColors = {
    "default": Color.fromRGBO(223, 76, 30, 1.0),
    "binary_sensor": Color.fromRGBO(3, 155, 229, 1.0)
@ -10,15 +12,16 @@ class EntityColor {
  static const _stateColors = {
    EntityState.on: Colors.amber,
    "auto": Colors.amber,
-    EntityState.idle: Colors.amber,
+    EntityState.active: Colors.amber,
    EntityState.playing: Colors.amber,
    "above_horizon": Colors.amber,
    EntityState.home:  Colors.amber,
    EntityState.open:  Colors.amber,
-    EntityState.off: Color.fromRGBO(68, 115, 158, 1.0),
-    EntityState.closed: Color.fromRGBO(68, 115, 158, 1.0),
-    "below_horizon": Color.fromRGBO(68, 115, 158, 1.0),
-    "default": Color.fromRGBO(68, 115, 158, 1.0),
+    EntityState.off: defaultStateColor,
+    EntityState.closed: defaultStateColor,
+    "below_horizon": defaultStateColor,
+    "default": defaultStateColor,
+    EntityState.idle: defaultStateColor,
    "heat": Colors.redAccent,
    "cool": Colors.lightBlue,
    EntityState.unavailable: Colors.black26,
--- a/lib/entity_widgets/entity_icon.dart
+++ b/lib/entity_widgets/entity_icon.dart
@ -3,20 +3,71 @@ part of '../main.dart';
 class EntityIcon extends StatelessWidget {

  final EdgeInsetsGeometry padding;
-  final double iconSize;
+  final double size;
+  final Color color;

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

  @override
  Widget build(BuildContext context) {
    final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
    return Padding(
      padding: padding,
-      child: MaterialDesignIcons.createIconWidgetFromEntityData(
+      child: buildIcon(
          entityWrapper,
-          iconSize,
-          EntityColor.stateColor(entityWrapper.entity.state)
+          color ?? EntityColor.stateColor(entityWrapper.entity.state)
      ),
    );
  }
--- a/lib/entity_widgets/entity_name.dart
+++ b/lib/entity_widgets/entity_name.dart
@ -14,6 +14,10 @@ class EntityName extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
+    TextStyle textStyle = TextStyle(fontSize: fontSize);
+    if (entityWrapper.entity.statelessType == StatelessEntityType.WEBLINK) {
+      textStyle = textStyle.apply(color: Colors.blue, decoration: TextDecoration.underline);
+    }
    return Padding(
      padding: padding,
      child: Text(
@ -21,7 +25,7 @@ class EntityName extends StatelessWidget {
        overflow: textOverflow,
        softWrap: wordsWrap,
        maxLines: maxLines,
-        style: TextStyle(fontSize: fontSize),
+        style: textStyle,
        textAlign: textAlign,
      ),
    );
--- a/lib/entity_widgets/glance_entity_container.dart
+++ b/lib/entity_widgets/glance_entity_container.dart
@ -22,6 +22,12 @@ class GlanceEntityContainer extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final EntityWrapper entityWrapper = EntityModel.of(context).entityWrapper;
+    if (entityWrapper.entity.statelessType == StatelessEntityType.MISSED) {
+      return MissedEntityWidget();
+    }
+    if (entityWrapper.entity.statelessType > StatelessEntityType.MISSED) {
+      return Container(width: 0.0, height: 0.0,);
+    }
    List<Widget> result = [];
    if (!nameInTheBottom) {
      if (showName) {
@ -35,7 +41,7 @@ class GlanceEntityContainer extends StatelessWidget {
    result.add(
      EntityIcon(
        padding: EdgeInsets.all(0.0),
-        iconSize: iconSize,
+        size: iconSize,
      )
    );
    if (!nameInTheBottom) {
--- a/lib/entity_widgets/history_chart/entity_history.dart
+++ b/lib/entity_widgets/history_chart/entity_history.dart
@ -32,6 +32,7 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
  List _history;
  bool _needToUpdateHistory;
  DateTime _historyLastUpdated;
+  bool _disposed = false;

  @override
  void initState() {
@ -47,16 +48,20 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
    if (_historyLastUpdated == null || now.difference(_historyLastUpdated).inSeconds > 30) {
      _historyLastUpdated = now;
      ha.getHistory(entityId).then((history){
-        setState(() {
-          _history = history.isNotEmpty ? history[0] : [];
-          _needToUpdateHistory = false;
-        });
+        if (!_disposed) {
+          setState(() {
+            _history = history.isNotEmpty ? history[0] : [];
+            _needToUpdateHistory = false;
+          });
+        }
      }).catchError((e) {
        Logger.e("Error loading $entityId history: $e");
-        setState(() {
-          _history = [];
-          _needToUpdateHistory = false;
-        });
+        if (!_disposed) {
+          setState(() {
+            _history = [];
+            _needToUpdateHistory = false;
+          });
+        }
      });
    }
  }
@ -131,4 +136,10 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {

  }

+  @override
+  void dispose() {
+    _disposed = true;
+    super.dispose();
+  }
+
 }
--- a/lib/entity_widgets/missed_entity.dart
+++ b/lib/entity_widgets/missed_entity.dart
@ -0,0 +1,19 @@
+part of '../main.dart';
+
+class MissedEntityWidget extends StatelessWidget {
+  MissedEntityWidget({
+    Key key
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final EntityModel entityModel = EntityModel.of(context);
+    return Container(
+        child: Padding(
+          padding: EdgeInsets.all(5.0),
+          child: Text("Entity not available: ${entityModel.entityWrapper.entity.entityId}"),
+        ),
+        color: Colors.amber[100],
+    );
+  }
+}
--- a/lib/entity_widgets/state/cover_state.dart
+++ b/lib/entity_widgets/state/cover_state.dart
@ -24,7 +24,7 @@ class CoverStateWidget extends StatelessWidget {
    if (entity.supportOpen) {
      buttons.add(IconButton(
          icon: Icon(
-            MaterialDesignIcons.createIconDataFromIconName("mdi:arrow-up"),
+            MaterialDesignIcons.getIconDataFromIconName("mdi:arrow-up"),
            size: Sizes.iconSize,
          ),
          onPressed: entity.canBeOpened ? () => _open(entity) : null));
@ -36,7 +36,7 @@ class CoverStateWidget extends StatelessWidget {
    if (entity.supportStop) {
      buttons.add(IconButton(
          icon: Icon(
-            MaterialDesignIcons.createIconDataFromIconName("mdi:stop"),
+            MaterialDesignIcons.getIconDataFromIconName("mdi:stop"),
            size: Sizes.iconSize,
          ),
          onPressed: () => _stop(entity)));
@ -48,7 +48,7 @@ class CoverStateWidget extends StatelessWidget {
    if (entity.supportClose) {
      buttons.add(IconButton(
          icon: Icon(
-            MaterialDesignIcons.createIconDataFromIconName("mdi:arrow-down"),
+            MaterialDesignIcons.getIconDataFromIconName("mdi:arrow-down"),
            size: Sizes.iconSize,
          ),
          onPressed: entity.canBeClosed ? () => _close(entity) : null));
--- a/lib/entity_widgets/state/lock_state.dart
+++ b/lib/entity_widgets/state/lock_state.dart
@ -2,6 +2,10 @@ part of '../../main.dart';

 class LockStateWidget extends StatelessWidget {

+  final bool assumedState;
+
+  const LockStateWidget({Key key, this.assumedState: false}) : super(key: key);
+
  void _lock(Entity entity) {
    eventBus.fire(new ServiceCallEvent("lock", "lock", entity.entityId, null));
  }
@ -14,19 +18,49 @@ class LockStateWidget extends StatelessWidget {
  Widget build(BuildContext context) {
    final entityModel = EntityModel.of(context);
    final LockEntity entity = entityModel.entityWrapper.entity;
-    return SizedBox(
-      height: 34.0,
-      child: FlatButton(
-        onPressed: (() {
-          entity.isLocked ? _unlock(entity) : _lock(entity);
-        }),
-        child: Text(
-          entity.isLocked ? "UNLOCK" : "LOCK",
-          textAlign: TextAlign.right,
-          style:
-          new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
+    if (assumedState) {
+      return Row(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+        SizedBox(
+        height: 34.0,
+        child: FlatButton(
+          onPressed: () => _unlock(entity),
+          child: Text("UNLOCK",
+              textAlign: TextAlign.right,
+              style:
+              new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
+            ),
+          )
        ),
-      )
-    );
+        SizedBox(
+            height: 34.0,
+            child: FlatButton(
+              onPressed: () => _lock(entity),
+              child: Text("LOCK",
+                textAlign: TextAlign.right,
+                style:
+                new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
+              ),
+            )
+        )
+        ],
+      );
+    } else {
+      return SizedBox(
+          height: 34.0,
+          child: FlatButton(
+            onPressed: (() {
+              entity.isLocked ? _unlock(entity) : _lock(entity);
+            }),
+            child: Text(
+              entity.isLocked ? "UNLOCK" : "LOCK",
+              textAlign: TextAlign.right,
+              style:
+              new TextStyle(fontSize: Sizes.stateFontSize, color: Colors.blue),
+            ),
+          )
+      );
+    }
  }
 }
--- a/lib/entity_widgets/state/simple_state.dart
+++ b/lib/entity_widgets/state/simple_state.dart
@ -6,14 +6,26 @@ class SimpleEntityState extends StatelessWidget {
  final TextAlign textAlign;
  final EdgeInsetsGeometry padding;
  final int maxLines;
+  final String customValue;

-  const SimpleEntityState({Key key, this.maxLines: 10, this.expanded: true, this.textAlign: TextAlign.right, this.padding: const EdgeInsets.fromLTRB(0.0, 0.0, Sizes.rightWidgetPadding, 0.0)}) : super(key: key);
+  const SimpleEntityState({Key key, this.maxLines: 10, this.expanded: true, this.textAlign: TextAlign.right, this.padding: const EdgeInsets.fromLTRB(0.0, 0.0, Sizes.rightWidgetPadding, 0.0), this.customValue}) : super(key: key);

  @override
  Widget build(BuildContext context) {
    final entityModel = EntityModel.of(context);
-    String state = entityModel.entityWrapper.entity.displayState ?? "";
-    state = state.replaceAll("\n", "").replaceAll("\t", " ").trim();
+    String state;
+    if (customValue == null) {
+      state = entityModel.entityWrapper.entity.displayState ?? "";
+      state = state.replaceAll("\n", "").replaceAll("\t", " ").trim();
+    } else {
+      state = customValue;
+    }
+    TextStyle textStyle =  TextStyle(
+      fontSize: Sizes.stateFontSize,
+    );
+    if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.CALL_SERVICE) {
+      textStyle = textStyle.apply(color: Colors.blue);
+    }
    while (state.contains("  ")){
      state = state.replaceAll("  ", " ");
    }
@ -25,9 +37,7 @@ class SimpleEntityState extends StatelessWidget {
        maxLines: maxLines,
        overflow: TextOverflow.ellipsis,
        softWrap: true,
-        style: new TextStyle(
-          fontSize: Sizes.stateFontSize,
-        )
+        style: textStyle
      )
    );
    if (expanded) {
--- a/lib/entity_widgets/state/switch_state.dart
+++ b/lib/entity_widgets/state/switch_state.dart
@ -71,13 +71,13 @@ class _SwitchStateWidgetState extends State<SwitchStateWidget> {
          children: <Widget>[
            IconButton(
              onPressed: () => _setNewState(false, entity),
-              icon: Icon(MaterialDesignIcons.createIconDataFromIconName("mdi:flash-off")),
+              icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:flash-off")),
              color: newState == EntityState.on ? Colors.black : Colors.blue,
              iconSize: Sizes.iconSize,
            ),
            IconButton(
                onPressed: () => _setNewState(true, entity),
-                icon: Icon(MaterialDesignIcons.createIconDataFromIconName("mdi:flash")),
+                icon: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:flash")),
                color: newState == EntityState.on ? Colors.blue : Colors.black,
                iconSize: Sizes.iconSize
            )
--- a/lib/entity_widgets/state/timer_state.dart
+++ b/lib/entity_widgets/state/timer_state.dart
@ -0,0 +1,65 @@
+part of '../../main.dart';
+
+class TimerState extends StatefulWidget  {
+  //final bool expanded;
+  //final TextAlign textAlign;
+  //final EdgeInsetsGeometry padding;
+  //final int maxLines;
+
+  const TimerState({Key key}) : super(key: key);
+
+  @override
+  _TimerStateState createState() => _TimerStateState();
+
+}
+
+class _TimerStateState extends State<TimerState> {
+
+  Timer timer;
+  Duration remaining = Duration(seconds: 0);
+
+  void checkState(TimerEntity entity) {
+    if (entity.state == EntityState.active) {
+      //Logger.d("Timer is active");
+      if (timer == null || !timer.isActive) {
+        timer = Timer.periodic(Duration(seconds: 1), (timer) {
+          setState(() {
+            try {
+              int passed = DateTime
+                  .now()
+                  .difference(entity._lastUpdated)
+                  .inSeconds;
+              remaining = Duration(seconds: entity.duration.inSeconds - passed);
+            } catch (e) {
+              Logger.e("Error calculating ${entity.entityId} remaining time: ${e.toString()}");
+              remaining = Duration(seconds: 0);
+            }
+          });
+        });
+      }
+    } else {
+      timer?.cancel();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    EntityModel model = EntityModel.of(context);
+    TimerEntity entity = model.entityWrapper.entity;
+    checkState(entity);
+    if (entity.state != EntityState.active) {
+      return SimpleEntityState();
+    } else {
+      return SimpleEntityState(
+        customValue: "${remaining.toString().split('.')[0]}",
+      );
+    }
+  }
+
+  @override
+  void dispose() {
+    timer?.cancel();
+    super.dispose();
+  }
+
+}
--- a/lib/home_assistant.class.dart
+++ b/lib/home_assistant.class.dart
@ -9,26 +9,20 @@ class HomeAssistant {
  SendMessageQueue _messageQueue;

  int _currentMessageId = 0;
-  int _statesMessageId = 0;
-  int _servicesMessageId = 0;
  int _subscriptionMessageId = 0;
-  int _configMessageId = 0;
-  int _userInfoMessageId = 0;
-  int _lovelaceMessageId = 0;
+  Map<int, Completer> _messageResolver = {};
  EntityCollection entities;
  HomeAssistantUI ui;
  Map _instanceConfig = {};
  String _userName;
+  HSVColor savedColor;

  Map _rawLovelaceData;

+  List<Panel> panels = [];
+
  Completer _fetchCompleter;
-  Completer _statesCompleter;
-  Completer _servicesCompleter;
-  Completer _lovelaceCompleter;
-  Completer _configCompleter;
  Completer _connectionCompleter;
-  Completer _userInfoCompleter;
  Timer _connectionTimer;
  Timer _fetchTimer;
  bool autoReconnect = false;
@ -167,6 +161,7 @@ class HomeAssistant {
    futures.add(_getConfig());
    futures.add(_getServices());
    futures.add(_getUserInfo());
+    futures.add(_getPanels());
    try {
      await Future.wait(futures);
      _createUI();
@ -211,7 +206,7 @@ class HomeAssistant {
  _handleMessage(String message) {
    var data = json.decode(message);
    if (data["type"] == "auth_required") {
-      _sendAuthMessageRaw('{"type": "auth","access_token": "$_password"}');
+      _sendAuthMessage('{"type": "auth","access_token": "$_password"}');
    } else if (data["type"] == "auth_ok") {
      _completeConnecting(null);
      _sendSubscribe();
@ -219,17 +214,8 @@ class HomeAssistant {
      _completeConnecting({"errorCode": 6, "errorMessage": "${data["message"]}"});
    } else if (data["type"] == "result") {
      Logger.d("[Received] <== id:${data["id"]}, ${data['success'] ? 'success' : 'error'}");
-      if (data["id"] == _configMessageId) {
-        _parseConfig(data);
-      } else if (data["id"] == _statesMessageId) {
-        _parseEntities(data);
-      } else if (data["id"] == _lovelaceMessageId) {
-        _handleLovelace(data);
-      } else if (data["id"] == _servicesMessageId) {
-        _parseServices(data);
-      } else if (data["id"] == _userInfoMessageId) {
-        _parseUserInfo(data);
-      }
+      _messageResolver[data["id"]]?.complete(data);
+      _messageResolver.remove(data["id"]);
    } else if (data["type"] == "event") {
      if ((data["event"] != null) && (data["event"]["event_type"] == "state_changed")) {
        Logger.d("[Received] <== ${data['type']}.${data["event"]["event_type"]}: ${data["event"]["data"]["entity_id"]}");
@ -247,64 +233,68 @@ class HomeAssistant {
  void _sendSubscribe() {
    _incrementMessageId();
    _subscriptionMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_subscriptionMessageId, "type": "subscribe_events", "event_type": "state_changed"}', false);
+    _send('{"id": $_subscriptionMessageId, "type": "subscribe_events", "event_type": "state_changed"}', false);
  }

-  Future _getConfig() {
-    _configCompleter = new Completer();
-    _incrementMessageId();
-    _configMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_configMessageId, "type": "get_config"}', false);
-
-    return _configCompleter.future;
+  Future _getConfig() async {
+    await _sendInitialMessage("get_config").then((data) => _instanceConfig = Map.from(data["result"]));
  }

-  Future _getStates() {
-    _statesCompleter = new Completer();
-    _incrementMessageId();
-    _statesMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_statesMessageId, "type": "get_states"}', false);
-
-    return _statesCompleter.future;
+  Future _getStates() async {
+    await _sendInitialMessage("get_states").then((data) => entities.parse(data["result"]));
  }

-  Future _getLovelace() {
-    _lovelaceCompleter = new Completer();
-    _incrementMessageId();
-    _lovelaceMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_lovelaceMessageId, "type": "lovelace/config"}', false);
-
-    return _lovelaceCompleter.future;
+  Future _getLovelace() async {
+    await _sendInitialMessage("lovelace/config").then((data) => _rawLovelaceData = data["result"]);
  }

-  Future _getUserInfo() {
-    _userInfoCompleter = new Completer();
-    _incrementMessageId();
-    _userInfoMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_userInfoMessageId, "type": "auth/current_user"}', false);
-
-    return _userInfoCompleter.future;
+  Future _getUserInfo() async {
+    _userName = null;
+    await _sendInitialMessage("auth/current_user").then((data) => _userName = data["result"]["name"]);
  }

-  Future _getServices() {
-    _servicesCompleter = new Completer();
-    _incrementMessageId();
-    _servicesMessageId = _currentMessageId;
-    _sendMessageRaw('{"id": $_servicesMessageId, "type": "get_services"}', false);
+  Future _getServices() async {
+    await _sendInitialMessage("get_services").then((data) => Logger.d("We actually don`t need the list of servcies for now"));
+  }

-    return _servicesCompleter.future;
+  Future _getPanels() async {
+    panels.clear();
+    await _sendInitialMessage("get_panels").then((data) {
+      if (data["success"]) {
+        data["result"].forEach((k,v) {
+            String title = v['title'] == null ? "${k[0]?.toUpperCase()}${k?.substring(1)}" : "${v['title'][0]?.toUpperCase()}${v['title']?.substring(1)}";
+            panels.add(Panel(
+                id: k,
+                type: v["component_name"],
+                title: title,
+                urlPath: v["url_path"],
+                config: v["config"],
+                icon: v["icon"]
+            )
+            );
+        });
+      }
+    });
  }

  _incrementMessageId() {
    _currentMessageId += 1;
  }

-  void _sendAuthMessageRaw(String message) {
+  void _sendAuthMessage(String message) {
    Logger.d( "[Sending] ==> auth request");
    _hassioChannel.sink.add(message);
  }

-  _sendMessageRaw(String message, bool queued) {
+  Future _sendInitialMessage(String type) {
+    Completer _completer = Completer();
+    _incrementMessageId();
+    _messageResolver[_currentMessageId] = _completer;
+    _send('{"id": $_currentMessageId, "type": "$type"}', false);
+    return _completer.future;
+  }
+
+  _send(String message, bool queued) {
    var sendCompleter = Completer();
    if (queued) _messageQueue.add(message);
    _connection().then((r) {
@ -359,7 +349,7 @@ class HomeAssistant {
      }
      message += '}';
    }
-    return _sendMessageRaw(message, true);
+    return _send(message, true);
  }

  void _handleEntityStateChange(Map eventData) {
@ -371,39 +361,6 @@ class HomeAssistant {
    ));
  }

-  void _parseConfig(Map data) {
-    if (data["success"] == true) {
-      _instanceConfig = Map.from(data["result"]);
-      _configCompleter.complete();
-    } else {
-      _configCompleter.completeError({"errorCode": 2, "errorMessage": data["error"]["message"]});
-    }
-  }
-
-  void _parseUserInfo(Map data) {
-    if (data["success"] == true) {
-      _userName = data["result"]["name"];
-    } else {
-      _userName = null;
-      Logger.w("There was an error getting current user: $data");
-    }
-    _userInfoCompleter.complete();
-  }
-
-  void _parseServices(response) {
-    _servicesCompleter.complete();
-  }
-
-  void _handleLovelace(response) {
-    if (response["success"] == true) {
-      _rawLovelaceData = response["result"];
-    } else {
-      Logger.e("There was an error getting Lovelace config: $response");
-      _rawLovelaceData = null;
-    }
-    _lovelaceCompleter.complete();
-  }
-
  void _parseLovelace() {
      Logger.d("--Title: ${_rawLovelaceData["title"]}");
      ui.title = _rawLovelaceData["title"];
@ -467,9 +424,51 @@ class HomeAssistant {
          if (rawEntity is String) {
            if (entities.isExist(rawEntity)) {
              card.entities.add(EntityWrapper(entity: entities.get(rawEntity)));
+            } else {
+              card.entities.add(EntityWrapper(entity: Entity.missed(rawEntity)));
            }
          } else {
-            if (entities.isExist(rawEntity["entity"])) {
+            if (rawEntity["type"] == "divider") {
+              card.entities.add(EntityWrapper(entity: Entity.divider()));
+            } else if (rawEntity["type"] == "section") {
+              card.entities.add(EntityWrapper(entity: Entity.section(rawEntity["label"] ?? "")));
+            } else if (rawEntity["type"] == "call-service") {
+              Map uiActionData = {
+                "tap_action": {
+                  "action": EntityUIAction.callService,
+                  "service": rawEntity["service"],
+                  "service_data": rawEntity["service_data"]
+                },
+                "hold_action": EntityUIAction.none
+              };
+              card.entities.add(EntityWrapper(
+                  entity: Entity.callService(
+                    icon: rawEntity["icon"],
+                    name: rawEntity["name"],
+                    service: rawEntity["service"],
+                    actionName: rawEntity["action_name"]
+                  ),
+                uiAction: EntityUIAction(rawEntityData: uiActionData)
+              )
+              );
+            } else if (rawEntity["type"] == "weblink") {
+              Map uiActionData = {
+                "tap_action": {
+                  "action": EntityUIAction.navigate,
+                  "service": rawEntity["url"]
+                },
+                "hold_action": EntityUIAction.none
+              };
+              card.entities.add(EntityWrapper(
+                  entity: Entity.weblink(
+                      icon: rawEntity["icon"],
+                      name: rawEntity["name"],
+                      url: rawEntity["url"]
+                  ),
+                  uiAction: EntityUIAction(rawEntityData: uiActionData)
+              )
+              );
+            } else if (entities.isExist(rawEntity["entity"])) {
              Entity e = entities.get(rawEntity["entity"]);
              card.entities.add(
                  EntityWrapper(
@ -479,6 +478,8 @@ class HomeAssistant {
                      uiAction: EntityUIAction(rawEntityData: rawEntity)
                  )
              );
+            } else {
+              card.entities.add(EntityWrapper(entity: Entity.missed(rawEntity["entity"])));
            }
          }
        });
@ -493,6 +494,8 @@ class HomeAssistant {
                  displayName: rawCard["name"],
                  uiAction: EntityUIAction(rawEntityData: rawCard)
              );
+            } else {
+              card.linkedEntityWrapper = EntityWrapper(entity: Entity.missed(en));
            }
          } else {
            if (entities.isExist(en["entity"])) {
@ -503,6 +506,8 @@ class HomeAssistant {
                  displayName: en["name"],
                  uiAction: EntityUIAction(rawEntityData: rawCard)
              );
+            } else {
+              card.linkedEntityWrapper = EntityWrapper(entity: Entity.missed(en["entity"]));
            }
          }
        }
@ -514,15 +519,6 @@ class HomeAssistant {
    return result;
  }

-  void _parseEntities(response) async {
-    if (response["success"] == false) {
-      _statesCompleter.completeError({"errorCode": 3, "errorMessage": response["error"]["message"]});
-      return;
-    }
-    entities.parse(response["result"]);
-    _statesCompleter.complete();
-  }
-
  void _createUI() {
    ui = HomeAssistantUI();
    if ((_useLovelace) && (_rawLovelaceData != null)) {
@ -559,8 +555,8 @@ class HomeAssistant {
    }
  }

-  Widget buildViews(BuildContext context, bool lovelace) {
-    return ui.build(context);
+  Widget buildViews(BuildContext context, bool lovelace, TabController tabController) {
+    return ui.build(context, tabController);
  }

  Future<List> getHistory(String entityId) async {
--- a/lib/main.dart
+++ b/lib/main.dart
@ -8,17 +8,20 @@ import 'package:web_socket_channel/io.dart';
 import 'package:event_bus/event_bus.dart';
 import 'package:flutter/widgets.dart';
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher.dart' as urlLauncher;
 import 'package:flutter/services.dart';
 import 'package:date_format/date_format.dart';
 import 'package:http/http.dart' as http;
 import 'package:charts_flutter/flutter.dart' as charts;
 import 'package:progress_indicators/progress_indicators.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_custom_tabs/flutter_custom_tabs.dart';

 part 'entity_class/const.dart';
 part 'entity_class/entity.class.dart';
 part 'entity_class/entity_wrapper.class.dart';
+part 'entity_class/timer_entity.dart';
 part 'entity_class/switch_entity.class.dart';
 part 'entity_class/button_entity.class.dart';
 part 'entity_class/text_entity.class.dart';
@ -39,6 +42,7 @@ part 'entity_class/alarm_control_panel.class.dart';
 part 'entity_widgets/common/badge.dart';
 part 'entity_widgets/model_widgets.dart';
 part 'entity_widgets/default_entity_container.dart';
+part 'entity_widgets/missed_entity.dart';
 part 'entity_widgets/glance_entity_container.dart';
 part 'entity_widgets/button_entity_container.dart';
 part 'entity_widgets/common/entity_attributes_list.dart';
@ -50,6 +54,7 @@ part 'entity_widgets/common/mode_selector.dart';
 part 'entity_widgets/common/universal_slider.dart';
 part 'entity_widgets/common/flat_service_button.dart';
 part 'entity_widgets/common/light_color_picker.dart';
+part 'entity_widgets/common/camera_stream_view.dart';
 part 'entity_widgets/entity_colors.class.dart';
 part 'entity_widgets/entity_page_container.dart';
 part 'entity_widgets/history_chart/entity_history.dart';
@ -63,6 +68,7 @@ part 'entity_widgets/controls/slider_controls.dart';
 part 'entity_widgets/state/text_input_state.dart';
 part 'entity_widgets/state/select_state.dart';
 part 'entity_widgets/state/simple_state.dart';
+part 'entity_widgets/state/timer_state.dart';
 part 'entity_widgets/state/climate_state.dart';
 part 'entity_widgets/state/cover_state.dart';
 part 'entity_widgets/state/date_time_state.dart';
@ -73,9 +79,8 @@ part 'entity_widgets/controls/light_controls.dart';
 part 'entity_widgets/controls/media_player_widgets.dart';
 part 'entity_widgets/controls/fan_controls.dart';
 part 'entity_widgets/controls/alarm_control_panel_controls.dart';
-part 'entity_widgets/controls/camera_controls.dart';
 part 'settings.page.dart';
-part 'configuration.page.dart';
+part 'panel.page.dart';
 part 'home_assistant.class.dart';
 part 'log.page.dart';
 part 'entity.page.dart';
@ -86,15 +91,16 @@ part 'ui_class/ui.dart';
 part 'ui_class/view.class.dart';
 part 'ui_class/card.class.dart';
 part 'ui_class/sizes_class.dart';
+part 'ui_class/panel_class.dart';
 part 'ui_widgets/view.dart';
 part 'ui_widgets/card_widget.dart';
 part 'ui_widgets/card_header_widget.dart';
+part 'ui_widgets/config_panel_widget.dart';


 EventBus eventBus = new EventBus();
 const String appName = "HA Client";
-const appVersion = "0.4.0";
-const appBuild = "91";
+const appVersion = "0.5.4";

 String homeAssistantWebHost;

@ -130,7 +136,7 @@ class HAClientApp extends StatelessWidget {
      routes: {
        "/": (context) => MainPage(title: 'HA Client'),
        "/connection-settings": (context) => ConnectionSettingsPage(title: "Settings"),
-        "/configuration": (context) => ConfigurationPage(title: "Configuration"),
+        "/configuration": (context) => PanelPage(title: "Configuration"),
        "/log-view": (context) => LogViewPage(title: "Log")
      },
    );
@ -146,7 +152,7 @@ class MainPage extends StatefulWidget {
  _MainPageState createState() => new _MainPageState();
 }

-class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
+class _MainPageState extends State<MainPage> with WidgetsBindingObserver, TickerProviderStateMixin {
  HomeAssistant _homeAssistant;
  //Map _instanceConfig;
  String _webSocketApiEndpoint;
@ -161,6 +167,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
  bool _settingsLoaded = false;
  bool _accountMenuExpanded = false;
  bool _useLovelaceUI;
+  int _previousViewCount;

  @override
  void initState() {
@ -255,6 +262,12 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
    _showInfoBottomBar(progress: true,);
    await _homeAssistant.fetch().then((result) {
      _hideBottomBar();
+      int currentViewCount = _homeAssistant.ui?.views?.length ?? 0;
+      if (_previousViewCount != currentViewCount) {
+        Logger.d("Views count changed ($_previousViewCount->$currentViewCount). Creating new tabs controller.");
+        _viewsTabController = TabController(vsync: this, length: currentViewCount);
+        _previousViewCount = currentViewCount;
+      }
    }).catchError((e) {
      _setErrorState(e);
    });
@ -340,15 +353,28 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
        Divider(),
      ]);
    } else {
+      if (_homeAssistant != null && _homeAssistant.panels.isNotEmpty) {
+        _homeAssistant.panels.forEach((Panel panel) {
+          if (!panel.isHidden) {
+            menuItems.add(
+                new ListTile(
+                    leading: Icon(MaterialDesignIcons.getIconDataFromIconName(panel.icon)),
+                    title: Text("${panel.title}"),
+                    onTap: () => panel.handleOpen(context)
+                )
+            );
+          }
+        });
+        menuItems.addAll([
+          new ListTile(
+            leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:home-assistant")),
+            title: Text("Open Web UI"),
+            onTap: () => HAUtils.launchURL(homeAssistantWebHost),
+          ),
+          Divider()
+        ]);
+      }
      menuItems.addAll([
-        new ListTile(
-          leading: Icon(Icons.settings),
-          title: Text("Configuration"),
-          onTap: () {
-            Navigator.of(context).pop();
-            Navigator.of(context).pushNamed('/configuration');
-          },
-        ),
        new ListTile(
          leading: Icon(Icons.insert_drive_file),
          title: Text("Log"),
@ -358,7 +384,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
          },
        ),
        new ListTile(
-          leading: Icon(MaterialDesignIcons.createIconDataFromIconName("mdi:github-circle")),
+          leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:github-circle")),
          title: Text("Report an issue"),
          onTap: () {
            Navigator.of(context).pop();
@ -366,6 +392,14 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
          },
        ),
        Divider(),
+        new ListTile(
+          leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:discord")),
+          title: Text("Join Discord server"),
+          onTap: () {
+            Navigator.of(context).pop();
+            HAUtils.launchURL("https://discord.gg/AUzEvwn");
+          },
+        ),
        new AboutListTile(
          aboutBoxChildren: <Widget>[
            GestureDetector(
@ -380,11 +414,42 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
                  decoration: TextDecoration.underline
                ),
              ),
+            ),
+            Container(
+              height: 10.0,
+            ),
+            GestureDetector(
+              onTap: () {
+                Navigator.of(context).pop();
+                HAUtils.launchURLInCustomTab(context, "http://ha-client.homemade.systems/terms_and_conditions");
+              },
+              child: Text(
+                "Terms and Conditions",
+                style: TextStyle(
+                    color: Colors.blue,
+                    decoration: TextDecoration.underline
+                ),
+              ),
+            ),
+            Container(
+              height: 10.0,
+            ),
+            GestureDetector(
+              onTap: () {
+                Navigator.of(context).pop();
+                HAUtils.launchURLInCustomTab(context, "http://ha-client.homemade.systems/privacy_policy");
+              },
+              child: Text(
+                "Privacy Policy",
+                style: TextStyle(
+                    color: Colors.blue,
+                    decoration: TextDecoration.underline
+                ),
+              ),
            )
          ],
          applicationName: appName,
-          applicationVersion: appVersion,
-          applicationLegalese: "build $appBuild",
+          applicationVersion: appVersion
        )
      ]);
    }
@ -530,7 +595,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
            title: Text(_homeAssistant != null ? _homeAssistant.locationName : ""),
            actions: <Widget>[
              IconButton(
-                icon: Icon(MaterialDesignIcons.createIconDataFromIconName(
+                icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
                    "mdi:dots-vertical"), color: Colors.white,),
                onPressed: () {
                  showMenu(
@ -558,6 +623,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
              },
            ),
            bottom: empty ? null : TabBar(
+              controller: _viewsTabController,
              tabs: buildUIViewTabs(),
              isScrollable: true,
            ),
@ -571,7 +637,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
            mainAxisAlignment: MainAxisAlignment.center,
            children: [
              Icon(
-                MaterialDesignIcons.createIconDataFromIconName("mdi:home-assistant"),
+                MaterialDesignIcons.getIconDataFromIconName("mdi:home-assistant"),
                size: 100.0,
                color: Colors.blue,
              ),
@ -579,10 +645,12 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
        ),
      )
          :
-      _homeAssistant.buildViews(context, _useLovelaceUI),
+      _homeAssistant.buildViews(context, _useLovelaceUI, _viewsTabController),
    );
  }

+  TabController _viewsTabController;
+
  @override
  Widget build(BuildContext context) {
    Widget bottomBar;
@ -648,9 +716,9 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
        drawer: _buildAppDrawer(),
        primary: false,
        bottomNavigationBar: bottomBar,
-        body: DefaultTabController(
-          length: _homeAssistant.ui?.views?.length ?? 0,
+        body: HomeAssistantModel(
          child: _buildScaffoldBody(false),
+          homeAssistant: _homeAssistant
        ),
      );
    }
@ -659,6 +727,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
  @override
  void dispose() {
    WidgetsBinding.instance.removeObserver(this);
+    _viewsTabController.dispose();
    if (_stateSubscription != null) _stateSubscription.cancel();
    if (_settingsSubscription != null) _settingsSubscription.cancel();
    if (_serviceCallSubscription != null) _serviceCallSubscription.cancel();
--- a/lib/mdi.class.dart
+++ b/lib/mdi.class.dart
--- a/lib/panel.page.dart
+++ b/lib/panel.page.dart
@ -0,0 +1,40 @@
+part of 'main.dart';
+
+class PanelPage extends StatefulWidget {
+  PanelPage({Key key, this.title, this.panel}) : super(key: key);
+
+  final String title;
+  final Panel panel;
+
+  @override
+  _PanelPageState createState() => new _PanelPageState();
+}
+
+class _PanelPageState extends State<PanelPage> {
+
+  List<ConfigurationItem> _items;
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+
+    return new Scaffold(
+      appBar: new AppBar(
+        leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
+          Navigator.pop(context);
+        }),
+        title: new Text(widget.title),
+      ),
+      body: widget.panel.getWidget(),
+    );
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+}
--- a/lib/ui_class/panel_class.dart
+++ b/lib/ui_class/panel_class.dart
@ -0,0 +1,57 @@
+part of '../main.dart';
+
+class Panel {
+
+  static const iconsByComponent = {
+    "config": "mdi:settings",
+    "history": "mdi:poll-box",
+    "map": "mdi:tooltip-account",
+    "logbook": "mdi:format-list-bulleted-type",
+    "custom": "mdi:home-assistant"
+  };
+
+  final String id;
+  final String type;
+  final String title;
+  final String urlPath;
+  final Map config;
+  String icon;
+  bool isHidden = true;
+
+  Panel({this.id, this.type, this.title, this.urlPath, this.icon, this.config}) {
+    if (icon == null || !icon.startsWith("mdi:")) {
+      icon = Panel.iconsByComponent[type];
+    }
+    isHidden = (type != "iframe" && type != "config");
+  }
+
+  void handleOpen(BuildContext context) {
+    if (type == "iframe") {
+      Logger.d("Launching custom tab with ${config["url"]}");
+      HAUtils.launchURLInCustomTab(context, config["url"]);
+    } else if (type == "config") {
+      Navigator.of(context).push(
+          MaterialPageRoute(
+            builder: (context) => PanelPage(title: "$title", panel: this),
+          )
+      );
+    } else {
+      String url = "$homeAssistantWebHost/$urlPath";
+      Logger.d("Launching custom tab with $url");
+      HAUtils.launchURLInCustomTab(context, url);
+    }
+  }
+
+  Widget getWidget() {
+    switch (type) {
+      case "config": {
+        return ConfigPanelWidget();
+      }
+
+      default: {
+        return Text("Unsupported panel component: $type");
+      }
+    }
+  }
+
+}
--- a/lib/ui_class/ui.dart
+++ b/lib/ui_class/ui.dart
@ -8,8 +8,9 @@ class HomeAssistantUI {
    views = [];
  }

-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, TabController tabController) {
    return TabBarView(
+      controller: tabController,
      children: _buildViews(context)
    );
  }
--- a/lib/ui_class/view.class.dart
+++ b/lib/ui_class/view.class.dart
@ -77,7 +77,7 @@ class HAView {
          Tab(
              icon:
              Icon(
-                MaterialDesignIcons.createIconDataFromIconName(
+                MaterialDesignIcons.getIconDataFromIconName(
                    iconName ?? "mdi:home-assistant"),
                size: 24.0,
              )
@ -85,21 +85,21 @@ class HAView {
      } else {
        return
          Tab(
-              text: name.toUpperCase(),
+              text: "${name?.toUpperCase()}",
          );
      }
    } else {
      if (linkedEntity.icon != null && linkedEntity.icon.length > 0) {
        return Tab(
          icon: Icon(
-              MaterialDesignIcons.createIconDataFromIconName(
+              MaterialDesignIcons.getIconDataFromIconName(
                  linkedEntity.icon),
              size: 24.0,
            )
        );
      } else {
        return Tab(
-            text: linkedEntity.displayName.toUpperCase(),
+            text: "${linkedEntity?.displayName?.toUpperCase()}",
        );
      }

--- a/lib/ui_widgets/card_widget.dart
+++ b/lib/ui_widgets/card_widget.dart
@ -11,8 +11,17 @@ class CardWidget extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    if ((card.linkedEntityWrapper!= null) && (card.linkedEntityWrapper.entity.isHidden)) {
-      return Container(width: 0.0, height: 0.0,);
+    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,
+        );
+      }
    }

    switch (card.type) {
@ -103,7 +112,7 @@ class CardWidget extends StatelessWidget {
      if (!entity.entity.isHidden) {
        body.add(
            Padding(
-              padding: EdgeInsets.fromLTRB(0.0, Sizes.rowPadding, 0.0, Sizes.rowPadding),
+              padding: EdgeInsets.fromLTRB(10.0, 4.0, 0.0, 4.0),
              child: EntityModel(
                  entityWrapper: entity,
                  handleTap: true,
@ -133,55 +142,51 @@ class CardWidget extends StatelessWidget {
  }

  Widget _buildAlarmPanelCard(BuildContext context) {
-    if (card.linkedEntityWrapper == null || card.linkedEntityWrapper.entity == null) {
-      return Container(width: 0, height: 0,);
-    } else {
-      List<Widget> body = [];
-      body.add(CardHeaderWidget(
-        name: card.name ?? "",
-        subtitle: Text("${card.linkedEntityWrapper.entity.displayState}",
-          style: TextStyle(
+    List<Widget> body = [];
+    body.add(CardHeaderWidget(
+      name: card.name ?? "",
+      subtitle: Text("${card.linkedEntityWrapper.entity.displayState}",
+        style: TextStyle(
            color: Colors.grey
-          ),
        ),
-        trailing: Row(
+      ),
+      trailing: Row(
          mainAxisSize: MainAxisSize.min,
          mainAxisAlignment: MainAxisAlignment.end,
          children: [
            EntityIcon(
-              iconSize: 50.0,
+              size: 50.0,
            ),
            Container(
-              width: 26.0,
-              child: IconButton(
-                  padding: EdgeInsets.all(0.0),
-                  alignment: Alignment.centerRight,
-                  icon: Icon(MaterialDesignIcons.createIconDataFromIconName(
-                      "mdi:dots-vertical")),
-                  onPressed: () => eventBus.fire(new ShowEntityPageEvent(card.linkedEntityWrapper.entity))
-              )
+                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(card.linkedEntityWrapper.entity))
+                )
            )
          ]
-        ),
-      ));
-      body.add(
+      ),
+    ));
+    body.add(
        AlarmControlPanelControlsWidget(
          extended: true,
          states: card.states,
        )
-      );
-      return Card(
+    );
+    return Card(
        child: EntityModel(
-          entityWrapper: card.linkedEntityWrapper,
-          handleTap: null,
-          child: Column(
-              crossAxisAlignment: CrossAxisAlignment.center,
-              mainAxisSize: MainAxisSize.min,
-              children: body
-          )
+            entityWrapper: card.linkedEntityWrapper,
+            handleTap: null,
+            child: Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                mainAxisSize: MainAxisSize.min,
+                children: body
+            )
        )
-      );
-    }
+    );
  }

  Widget _buildGlanceCard(BuildContext context) {
@ -227,33 +232,25 @@ class CardWidget extends StatelessWidget {
  }

  Widget _buildMediaControlsCard(BuildContext context) {
-    if (card.linkedEntityWrapper == null || card.linkedEntityWrapper.entity == null) {
-      return Container(width: 0, height: 0,);
-    } else {
-      return Card(
-          child: EntityModel(
-              entityWrapper: card.linkedEntityWrapper,
-              handleTap: null,
-              child: MediaPlayerWidget()
-          )
-      );
-    }
+    return Card(
+        child: EntityModel(
+            entityWrapper: card.linkedEntityWrapper,
+            handleTap: null,
+            child: MediaPlayerWidget()
+        )
+    );
  }

  Widget _buildEntityButtonCard(BuildContext context) {
-    if (card.linkedEntityWrapper == null || card.linkedEntityWrapper.entity == null) {
-      return Container(width: 0, height: 0,);
-    } else {
-      card.linkedEntityWrapper.displayName = card.name?.toUpperCase() ??
-          card.linkedEntityWrapper.displayName.toUpperCase();
-      return Card(
-          child: EntityModel(
-              entityWrapper: card.linkedEntityWrapper,
-              child: ButtonEntityContainer(),
-              handleTap: true
-          )
-      );
-    }
+    card.linkedEntityWrapper.displayName = card.name?.toUpperCase() ??
+        card.linkedEntityWrapper.displayName?.toUpperCase();
+    return Card(
+        child: EntityModel(
+            entityWrapper: card.linkedEntityWrapper,
+            child: ButtonEntityContainer(),
+            handleTap: true
+        )
+    );
  }

  Widget _buildUnsupportedCard(BuildContext context) {
--- a/lib/ui_widgets/config_panel_widget.dart
+++ b/lib/ui_widgets/config_panel_widget.dart
@ -1,12 +1,10 @@
-part of 'main.dart';
+part of '../main.dart';

-class ConfigurationPage extends StatefulWidget {
-  ConfigurationPage({Key key, this.title}) : super(key: key);
-
-  final String title;
+class ConfigPanelWidget extends StatefulWidget {
+  ConfigPanelWidget({Key key}) : super(key: key);

  @override
-  _ConfigurationPageState createState() => new _ConfigurationPageState();
+  _ConfigPanelWidgetState createState() => new _ConfigPanelWidgetState();
 }

 class ConfigurationItem {
@ -17,7 +15,7 @@ class ConfigurationItem {
  final Widget body;
 }

-class _ConfigurationPageState extends State<ConfigurationPage> {
+class _ConfigPanelWidgetState extends State<ConfigPanelWidget> {

  List<ConfigurationItem> _items;

@ -64,37 +62,29 @@ class _ConfigurationPageState extends State<ConfigurationPage> {
  @override
  Widget build(BuildContext context) {

-    return new Scaffold(
-      appBar: new AppBar(
-        leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
-          Navigator.pop(context);
-        }),
-        title: new Text(widget.title),
-      ),
-      body: ListView(
-        children: [
-          new ExpansionPanelList(
-            expansionCallback: (int index, bool isExpanded) {
-              setState(() {
-                _items[index].isExpanded = !_items[index].isExpanded;
-              });
-            },
-            children: _items.map((ConfigurationItem item) {
-              return new ExpansionPanel(
-                headerBuilder: (BuildContext context, bool isExpanded) {
-                  return CardHeaderWidget(
-                    name: item.header,
-                  );
-                },
-                isExpanded: item.isExpanded,
-                body: new Container(
-                  child: item.body,
-                ),
-              );
-            }).toList(),
-          ),
-        ],
-      ),
+    return ListView(
+      children: [
+        new ExpansionPanelList(
+          expansionCallback: (int index, bool isExpanded) {
+            setState(() {
+              _items[index].isExpanded = !_items[index].isExpanded;
+            });
+          },
+          children: _items.map((ConfigurationItem item) {
+            return new ExpansionPanel(
+              headerBuilder: (BuildContext context, bool isExpanded) {
+                return CardHeaderWidget(
+                  name: item.header,
+                );
+              },
+              isExpanded: item.isExpanded,
+              body: new Container(
+                child: item.body,
+              ),
+            );
+          }).toList(),
+        ),
+      ],
    );
  }

--- a/lib/utils.class.dart
+++ b/lib/utils.class.dart
@ -47,12 +47,44 @@ class Logger {

 class HAUtils {
  static void launchURL(String url) async {
-    if (await canLaunch(url)) {
-      await launch(url);
+    if (await urlLauncher.canLaunch(url)) {
+      await urlLauncher.launch(url);
    } else {
      Logger.e( "Could not launch $url");
    }
  }
+
+  static void launchURLInCustomTab(BuildContext context, String url) async {
+    try {
+      await launch(
+        "$url",
+        option: new CustomTabsOption(
+          toolbarColor: Theme.of(context).primaryColor,
+          enableDefaultShare: true,
+          enableUrlBarHiding: true,
+          showPageTitle: true,
+          animation: new CustomTabsAnimation.slideIn()
+          // or user defined animation.
+          /*animation: new CustomTabsAnimation(
+          startEnter: 'slide_up',
+          startExit: 'android:anim/fade_out',
+          endEnter: 'android:anim/fade_in',
+          endExit: 'slide_down',
+        )*/,
+        extraCustomTabs: <String>[
+          // ref. https://play.google.com/store/apps/details?id=org.mozilla.firefox
+          'org.mozilla.firefox',
+          // ref. https://play.google.com/store/apps/details?id=com.microsoft.emmx
+          'com.microsoft.emmx',
+        ],
+      ),
+    );
+    } catch (e) {
+      Logger.w("Can't open custom tab: ${e.toString()}");
+      Logger.w("Launching in default browser");
+      HAUtils.launchURL(url);
+    }
+  }
 }

 class StateChangedEvent {
--- a/pubspec.lock
+++ b/pubspec.lock
@ -35,7 +35,7 @@ packages:
      name: cached_network_image
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.6.0-alpha.2"
+    version: "0.8.0"
  charcode:
    dependency: transitive
    description:
@ -49,14 +49,14 @@ packages:
      name: charts_common
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.5.0"
+    version: "0.6.0"
  charts_flutter:
    dependency: "direct main"
    description:
      name: charts_flutter
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.5.0"
+    version: "0.6.0"
  collection:
    dependency: transitive
    description:
@ -100,7 +100,7 @@ packages:
      name: event_bus
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
  flutter:
    dependency: "direct main"
    description: flutter
@ -112,7 +112,14 @@ packages:
      name: flutter_cache_manager
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.3.0-beta.2+1"
+    version: "0.3.2"
+  flutter_custom_tabs:
+    dependency: "direct main"
+    description:
+      name: flutter_custom_tabs
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.0"
  flutter_launcher_icons:
    dependency: "direct dev"
    description:
@ -127,6 +134,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.2.0"
+  flutter_svg:
+    dependency: "direct main"
+    description:
+      name: flutter_svg
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.10.4"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@ -138,7 +152,7 @@ packages:
      name: http
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.0+1"
+    version: "0.12.0+2"
  http_parser:
    dependency: transitive
    description:
@ -152,14 +166,14 @@ packages:
      name: image
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.7"
+    version: "2.0.8"
  intl:
    dependency: transitive
    description:
      name: intl
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.15.7"
+    version: "0.15.8"
  logging:
    dependency: transitive
    description:
@ -173,7 +187,7 @@ packages:
      name: markdown
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
  matcher:
    dependency: transitive
    description:
@ -195,13 +209,34 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.6.2"
+  path_drawing:
+    dependency: transitive
+    description:
+      name: path_drawing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.1"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
  path_provider:
    dependency: transitive
    description:
      name: path_provider
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.4.1"
+    version: "0.5.0+1"
+  pedantic:
+    dependency: transitive
+    description:
+      name: pedantic
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.4.0"
  petitparser:
    dependency: transitive
    description:
@ -229,7 +264,7 @@ packages:
      name: shared_preferences
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.5.1+1"
+    version: "0.5.2"
  sky_engine:
    dependency: transitive
    description: flutter
@ -241,14 +276,14 @@ packages:
      name: source_span
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.4.1"
+    version: "1.5.4"
  sqflite:
    dependency: transitive
    description:
      name: sqflite
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.2+1"
+    version: "1.1.5"
  stack_trace:
    dependency: transitive
    description:
@ -276,21 +311,21 @@ packages:
      name: synchronized
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.5.3+2"
+    version: "2.1.0"
  term_glyph:
    dependency: transitive
    description:
      name: term_glyph
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
  test_api:
    dependency: transitive
    description:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.1"
+    version: "0.2.2"
  typed_data:
    dependency: transitive
    description:
@ -304,14 +339,14 @@ packages:
      name: url_launcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "5.0.1"
+    version: "5.0.2"
  uuid:
    dependency: transitive
    description:
      name: uuid
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.3"
+    version: "2.0.1"
  vector_math:
    dependency: transitive
    description:
@ -325,14 +360,14 @@ packages:
      name: web_socket_channel
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.9"
+    version: "1.0.12"
  xml:
    dependency: transitive
    description:
      name: xml
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.3.1"
+    version: "3.2.5"
  yaml:
    dependency: transitive
    description:
@ -341,5 +376,5 @@ packages:
    source: hosted
    version: "2.1.15"
 sdks:
-  dart: ">=2.0.0 <3.0.0"
-  flutter: ">=0.5.6 <2.0.0"
+  dart: ">=2.1.0 <3.0.0"
+  flutter: ">=1.2.1 <2.0.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client

-version: 0.4.0+91
+version: 0.5.4+541

 environment:
  sdk: ">=2.0.0-dev.68.0 <3.0.0"
@ -18,6 +18,8 @@ dependencies:
  date_format: any
  charts_flutter: any
  flutter_markdown: any
+  flutter_svg: ^0.10.3
+  flutter_custom_tabs: ^0.6.0

 dev_dependencies:
  flutter_test:
@ -58,7 +60,7 @@ flutter:
  fonts:
    - family: "Material Design Icons"
      fonts:
-        - asset: fonts/materialdesignicons-webfont.ttf
+        - asset: fonts/materialdesignicons-webfont-3-5-95.ttf
  # fonts:
  #   - family: Schyler
  #     fonts:
--- a/tools/mdi_array_builder.html
+++ b/tools/mdi_array_builder.html
Author	SHA1	Message	Date
estevez-dev	5211d1ff46	v. 0.5.4	2019-05-09 14:15:21 +03:00
estevez-dev	d1c9fddba6	v. 0.5.4	2019-05-09 13:17:30 +03:00
estevez-dev	14cc55a2c7	Resolves #373	2019-05-09 13:16:35 +03:00
estevez-dev	277c67fc6f	Add padding for links in About dialog	2019-04-04 21:54:41 +03:00
estevez-dev	2a01ff8a03	Bump version in UI	2019-04-04 21:51:05 +03:00
estevez-dev	b246b7bc1d	0.5.3 and new build numbers	2019-04-04 21:44:16 +03:00
estevez-dev	e1868b9a14	Add privacy polici and terms and conditions links	2019-04-04 21:43:23 +03:00
estevez-dev	125f3ac16c	Resolves #327 Timer duration parsing error	2019-04-04 21:38:23 +03:00
estevez-dev	be502b5668	Discord icon fix	2019-04-04 21:38:05 +03:00
estevez-dev	6f33fdca9f	New app icon	2019-04-04 21:37:41 +03:00
estevez-dev	db77cc43aa	Version 0.5.0	2019-03-13 22:42:03 +02:00
estevez-dev	b2269cc96d	Resolves #293 Fix updater icon	2019-03-13 22:40:54 +02:00
estevez-dev	8b28bb2e9e	Resolves #314 card icon priority	2019-03-13 22:12:01 +02:00
estevez-dev	fb456878bc	Resolves #258 Timer support	2019-03-13 21:33:58 +02:00
estevez-dev	8b961ebd69	Resolves #83 Calendar support	2019-03-13 20:07:44 +02:00
estevez-dev	9bd3a41cf5	Resolves #140 Scenes	2019-03-13 18:06:43 +02:00
estevez-dev	491ae55a2a	Resolves #299 , Resolves #234 Fix entity picture url issue	2019-03-13 17:48:49 +02:00
estevez-dev	e1d2981782	Add 'Open Web UI' menu link	2019-03-13 17:25:08 +02:00
estevez-dev	74572168ae	Resolves #116 Add Iframe panel support	2019-03-13 17:23:23 +02:00
estevez-dev	92d0b5c055	Migrate to AndroidX	2019-03-13 17:05:15 +02:00
estevez-dev	3504d3276c	Resolves #11 Add Panels fetching	2019-03-13 16:39:23 +02:00
estevez-dev	736b38b64c	Some UI improvements for #245	2019-03-13 14:08:54 +02:00
estevez-dev	cb118b599a	Resolves #245 Add special row elements support for entities card	2019-03-13 00:56:57 +02:00
estevez-dev	a08a056cff	Resolves #254 Missed entities	2019-03-12 23:35:33 +02:00
estevez-dev	0ef2ebfe31	Fix 'Paste color' button background when saved color is null	2019-03-10 23:49:05 +02:00
estevez-dev	4f4ac3b574	Resolves #310 Add assumed state for locks	2019-03-10 23:41:14 +02:00
estevez-dev	7064cb0e30	Resolves #272 Add 'Copy color' and 'Past color'	2019-03-10 23:28:23 +02:00
estevez-dev	91a99e17e0	Resolves #320 Fix eEntity_picture size	2019-03-10 22:50:39 +02:00
estevez-dev	2e9b7d20b9	Fix broken icons	2019-03-10 19:28:11 +02:00
estevez-dev	b8aa808de4	Update Material Design Icons to 3.5.95	2019-03-09 13:26:45 +00:00
estevez-dev	2cfa92a42b	Reverts #308	2019-03-06 16:50:30 +00:00
estevez-dev	146efef72d	Gradle config for Chrome OS build	2019-03-06 16:42:05 +00:00
estevez-dev	8c9804e16f	WIP #308	2019-03-02 20:13:24 +02:00
estevez-dev	a4736bfb5a	Message handling improvements	2019-03-02 18:00:25 +02:00
Yegor Vialov	15c54df629	Update README.md	2019-02-26 11:31:39 +02:00
Yegor Vialov	32ffef21e9	Update README.md	2019-02-26 11:31:08 +02:00
Yegor Vialov	848d3cb510	Update README.md	2019-02-26 10:45:25 +02:00
Yegor Vialov	8a4caeebba	Update README.md	2019-02-26 10:43:47 +02:00
Yegor Vialov	aa923f0fba	Update README.md	2019-02-26 10:39:09 +02:00
Yegor Vialov	4d8f50ddd5	Update README.md	2019-02-26 10:33:34 +02:00
Yegor Vialov	fe06b21a6c	Update README.md	2019-02-26 10:30:08 +02:00
Yegor Vialov	efed7fb1b5	Update README.md	2019-02-26 10:23:03 +02:00
estevez-dev	df2cbb7d13	Resolves #313 Fix missed mute button for media_player	2019-02-22 15:39:53 +02:00
estevez-dev	03edaa9ca2	Resolves #168 Fix error when entity view closed before history loaded	2019-02-22 15:33:10 +02:00
estevez-dev	1a7457abf9	Resolves #311 Rebuild tabs only if views count changes	2019-02-22 15:28:11 +02:00
estevez-dev	00889b13e0	Resolves #312 Add white value control for light	2019-02-22 15:15:27 +02:00
estevez-dev	0615073ec4	Get color from rgb_color if there is no hsv_color attribute	2019-02-22 14:20:01 +02:00
estevez-dev	eb7d17d147	WIP #308 Move entity icon generation into EntityIcon widget	2019-02-21 16:32:55 +02:00
estevez-dev	24f80feeee	Resolves #187 Fix crash on view count changes	2019-02-21 15:35:58 +02:00
estevez-dev	4b6dda5a9c	version 0.4.4	2019-02-20 18:54:54 +02:00
estevez-dev	4099fa0c83	WIP #302 fix SVG size	2019-02-20 18:50:58 +02:00
estevez-dev	76057e8797	WIP #302 simple SVG support	2019-02-20 17:55:56 +02:00
estevez-dev	538d3603dc	Resolves #306 Improve camera connection	2019-02-20 16:39:57 +02:00
estevez-dev	bc0e72ca52	version 0.4.3	2019-02-20 13:58:30 +02:00
estevez-dev	f25a47beb2	Add camera stream reconnect on closing	2019-02-20 13:57:25 +02:00
estevez-dev	cc3c6b0087	Resolves #307 Support different frame bounderies for MJPEG stream	2019-02-20 12:06:03 +02:00
estevez-dev	6cf80c0bfd	version 0.4.2	2019-02-19 19:22:40 +02:00
estevez-dev	8ce9bdb7a5	Resolves #303 , Resolves #304 Fix wrong camera stream url	2019-02-19 19:21:52 +02:00
Yegor Vialov	31e50150b1	Resolves #263 Fix error when supported_features is null	2019-02-17 13:52:24 +02:00