From 1d528df341a92879683458efd784098643bc0783 Mon Sep 17 00:00:00 2001
From: Yegor Vialov <vyalov.egor@gmail.com>
Date: Thu, 30 Apr 2020 14:04:37 +0000
Subject: [PATCH] Adoptive icon fixes

---
 .../main/res/drawable/ic_launcher_foreground.xml    | 13 +++++--------
 .../res/mipmap-anydpi-v26/ic_launcher_round.xml     |  5 +++++
 lib/managers/connection_manager.class.dart          |  1 +
 3 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
index e5becc9..3743145 100644
--- a/android/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -14,17 +14,14 @@
             android:pathData="M 0 0 H 108 V 108 H 0 V 0 Z" />
         <path
             android:fillColor="#000000"
-            android:fillAlpha="0.16"
-            android:pathData="M 69.841 41.655 L 108 75 L 108 108 L 62.733 108 L 35.847 74.342 L 39.02 66 L 37 53 L 43.779 47.539 L 51.938 38 L 62.733 45.578 L 68 45.578 L 69.841 41.655 Z" />
+            android:fillAlpha="0.12"
+            android:pathData="M 70.506 38.389 L 108 72.466 L 108 108 L 77 108 L 35.066 72.466 L 38.373 63.769 L 36.268 50.216 L 43.335 44.523 L 51.841 34.578 L 63.096 42.478 L 68.586 42.478 L 70.506 38.389 Z" />
         <path
             android:fillColor="#000000"
-            android:pathData="M 133 87 L 138 101" />
-        <path
-            android:fillColor="#000000"
-            android:fillAlpha="0.16"
-            android:pathData="M 30 56.909 L 43.779 73 L 39.02 61.006 L 37 54.251 L 30 56.909 Z" />
+            android:fillAlpha="0.12"
+            android:pathData="M 28.979 53.708 L 47.736 67.31 L 38.373 58.563 L 36.268 51.52 L 28.979 53.708 Z" />
         <path
             android:fillColor="#ffffff"
-            android:pathData="M 76.187 56.909 L 72.108 56.909 L 72.108 74.342 L 56.244 74.342 L 56.244 67.086 L 62.567 61.006 L 64.176 61.267 C 66.805 61.267 68.935 59.219 68.935 56.691 C 68.935 54.163 66.805 52.115 64.176 52.115 C 61.547 52.115 59.416 54.164 59.416 56.691 L 59.643 58.238 L 56.244 61.551 L 56.244 49.609 C 57.739 48.825 58.737 47.321 58.737 45.578 C 58.737 43.05 56.606 41.002 53.977 41.002 C 51.349 41.002 49.218 43.05 49.218 45.578 C 49.218 47.321 50.215 48.825 51.711 49.609 L 51.711 61.551 L 48.312 58.238 L 48.538 56.691 C 48.538 54.164 46.407 52.115 43.779 52.115 C 41.151 52.115 39.02 54.164 39.02 56.691 C 39.02 59.219 41.151 61.267 43.779 61.267 L 45.388 61.006 L 51.711 67.086 L 51.711 74.342 L 35.847 74.342 L 35.847 56.909 L 31.881 56.909 C 30.929 56.909 30 56.909 30 56.452 C 30.023 55.972 30.975 55.057 31.949 54.12 L 51.711 35.118 C 52.459 34.399 53.229 33.658 53.977 33.658 C 54.725 33.658 55.496 34.399 56.244 35.118 L 65.309 43.834 L 65.309 41.655 L 69.841 41.655 L 69.841 48.193 L 76.142 54.251 C 77.048 55.122 77.977 56.016 78 56.473 C 78 56.909 77.093 56.909 76.187 56.909 Z M 43.779 54.73 C 44.32 54.73 44.839 54.937 45.221 55.304 C 45.604 55.672 45.819 56.171 45.819 56.691 C 45.819 57.211 45.604 57.71 45.221 58.078 C 44.839 58.446 44.32 58.652 43.779 58.652 C 43.238 58.652 42.719 58.446 42.337 58.078 C 41.954 57.71 41.739 57.211 41.739 56.691 C 41.739 56.171 41.954 55.672 42.337 55.304 C 42.719 54.937 43.238 54.73 43.779 54.73 Z M 64.176 54.73 C 65.309 54.73 66.215 55.602 66.215 56.691 C 66.215 57.781 65.309 58.652 64.176 58.652 C 63.635 58.652 63.116 58.446 62.733 58.078 C 62.351 57.71 62.136 57.211 62.136 56.691 C 62.136 56.171 62.351 55.672 62.733 55.304 C 63.116 54.937 63.635 54.73 64.176 54.73 Z M 53.977 43.616 C 55.11 43.616 56.017 44.488 56.017 45.578 C 56.017 46.667 55.11 47.539 53.977 47.539 C 52.844 47.539 51.938 46.667 51.938 45.578 C 51.938 44.488 52.844 43.616 53.977 43.616 Z" />
+            android:pathData="M 77.131 54.24 L 72.878 54.24 L 72.878 72.415 L 56.339 72.415 L 56.339 64.85 L 62.931 58.511 L 64.609 58.784 C 67.349 58.784 69.57 56.649 69.57 54.013 C 69.57 51.378 67.349 49.242 64.609 49.242 C 61.868 49.242 59.647 51.378 59.647 54.013 L 59.883 55.626 L 56.339 59.079 L 56.339 46.63 C 57.898 45.812 58.938 44.244 58.938 42.427 C 58.938 39.792 56.717 37.656 53.976 37.656 C 51.236 37.656 49.015 39.792 49.015 42.427 C 49.015 44.244 50.054 45.812 51.614 46.63 L 51.614 59.079 L 48.07 55.626 L 48.306 54.013 C 48.306 51.378 46.084 49.242 43.344 49.242 C 40.604 49.242 38.383 51.378 38.383 54.013 C 38.383 56.648 40.604 58.784 43.344 58.784 L 45.022 58.511 L 51.614 64.85 L 51.614 72.415 L 35.075 72.415 L 35.075 54.24 L 30.94 54.24 C 29.948 54.24 28.979 54.24 28.979 53.763 C 29.003 53.263 29.995 52.309 31.011 51.332 L 51.614 31.522 C 52.393 30.772 53.197 30 53.976 30 C 54.756 30 55.559 30.772 56.339 31.522 L 65.79 40.609 L 65.79 38.338 L 70.515 38.338 L 70.515 45.153 L 77.084 51.469 C 78.029 52.377 78.997 53.309 79.021 53.786 C 79.021 54.24 78.076 54.24 77.131 54.24 Z M 43.344 51.969 C 43.908 51.969 44.449 52.184 44.848 52.567 C 45.247 52.951 45.471 53.471 45.471 54.013 C 45.471 54.555 45.247 55.076 44.848 55.459 C 44.449 55.842 43.908 56.058 43.344 56.058 C 42.78 56.058 42.239 55.842 41.841 55.459 C 41.442 55.076 41.218 54.555 41.218 54.013 C 41.218 53.471 41.442 52.951 41.841 52.567 C 42.239 52.184 42.78 51.969 43.344 51.969 Z M 64.609 51.969 C 65.79 51.969 66.735 52.877 66.735 54.013 C 66.735 55.149 65.79 56.058 64.609 56.058 C 64.045 56.058 63.504 55.842 63.105 55.459 C 62.706 55.076 62.482 54.555 62.482 54.013 C 62.482 53.471 62.706 52.951 63.105 52.567 C 63.504 52.184 64.045 51.969 64.609 51.969 Z M 53.976 40.382 C 55.158 40.382 56.103 41.291 56.103 42.427 C 56.103 43.563 55.158 44.472 53.976 44.472 C 52.795 44.472 51.85 43.563 51.85 42.427 C 51.85 41.291 52.795 40.382 53.976 40.382 Z" />
     </group>
 </vector>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..5e2f8ce
--- /dev/null
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/main_color"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/lib/managers/connection_manager.class.dart b/lib/managers/connection_manager.class.dart
index a58a9e7..bafedba 100644
--- a/lib/managers/connection_manager.class.dart
+++ b/lib/managers/connection_manager.class.dart
@@ -50,6 +50,7 @@ class ConnectionManager {
       "${prefs.getString('hassio-protocol')}://$_domain:$_port/api/websocket";
       httpWebHost =
       "${prefs.getString('hassio-res-protocol')}://$_domain:$_port";
+      Logger.d('$_domain$_port');
       if ((_domain == null) || (_port == null) ||
           (_domain.isEmpty) || (_port.isEmpty)) {
         completer.completeError(HAError.checkConnectionSettings());