Merge pull request #66 from NordicSemiconductor/improvement/accessibi…

…lity Accessibility improved
NordicSemiconductor · Nov 17, 2021 · 9fa7dea · 9fa7dea
2 parents 3b67eb0 + 981c91f
commit 9fa7dea
Show file tree

Hide file tree

Showing 22 changed files with 200 additions and 260 deletions.
diff --git a/app/src/main/res/drawable/ic_alert.xml b/app/src/main/res/drawable/ic_alert.xml
@@ -25,9 +25,9 @@
 	android:height="48dp"
 	android:alpha="0.6"
 	android:tint="@color/colorOnBackground"
-	android:viewportHeight="24.0"
-	android:viewportWidth="24.0">
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0">
 	<path
-		android:fillColor="#FF000000"
-		android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+		android:fillColor="@color/colorError"
+		android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_bluetooth_disabled.xml b/app/src/main/res/drawable/ic_bluetooth_disabled.xml
@@ -23,11 +23,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 	android:width="48dp"
 	android:height="48dp"
-	android:tint="@color/colorOnBackground"
 	android:alpha="0.6"
-	android:viewportHeight="24.0"
-	android:viewportWidth="24.0">
+	android:tint="@color/colorOnBackground"
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0">
 	<path
-		android:fillColor="#FF000000"
-		android:pathData="M13,5.83l1.88,1.88 -1.6,1.6 1.41,1.41 3.02,-3.02L12,2h-1v5.03l2,2v-3.2zM5.41,4L4,5.41 10.59,12 5,17.59 6.41,19 11,14.41V22h1l4.29,-4.29 2.3,2.29L20,18.59 5.41,4zM13,18.17v-3.76l1.88,1.88L13,18.17z"/>
+		android:fillColor="@color/colorError"
+		android:pathData="M13,5.83l1.88,1.88 -1.6,1.6 1.41,1.41 3.02,-3.02L12,2h-1v5.03l2,2v-3.2zM5.41,4L4,5.41 10.59,12 5,17.59 6.41,19 11,14.41V22h1l4.29,-4.29 2.3,2.29L20,18.59 5.41,4zM13,18.17v-3.76l1.88,1.88L13,18.17z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_bluetooth_searching.xml b/app/src/main/res/drawable/ic_bluetooth_searching.xml
@@ -28,6 +28,6 @@
 	android:viewportHeight="24.0"
 	android:viewportWidth="24.0">
 	<path
-		android:fillColor="#FF000000"
+		android:fillColor="@color/colorError"
 		android:pathData="M14.24,12.01l2.32,2.32c0.28,-0.72 0.44,-1.51 0.44,-2.33 0,-0.82 -0.16,-1.59 -0.43,-2.31l-2.33,2.32zM19.53,6.71l-1.26,1.26c0.63,1.21 0.98,2.57 0.98,4.02s-0.36,2.82 -0.98,4.02l1.2,1.2c0.97,-1.54 1.54,-3.36 1.54,-5.31 -0.01,-1.89 -0.55,-3.67 -1.48,-5.19zM15.71,7.71L10,2L9,2v7.59L4.41,5 3,6.41 8.59,12 3,17.59 4.41,19 9,14.41L9,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM11,5.83l1.88,1.88L11,9.59L11,5.83zM12.88,16.29L11,18.17v-3.76l1.88,1.88z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_blinky.xml b/app/src/main/res/drawable/ic_device_blinky.xml
@@ -1,4 +1,32 @@
-<vector android:height="24dp" android:viewportHeight="1024"
-    android:viewportWidth="1024" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M739.8,116.5C679,55.6 598.1,22.1 512,22.1s-167,33.5 -227.8,94.4c-60.8,60.8 -94.4,141.7 -94.4,227.8c0,103.8 66.5,186 115.1,245.9c13,16 24.2,29.9 32.2,41.8c9.4,13.9 10.2,19.1 10.3,19.8v144.8c0,19.5 12.5,36.1 29.9,42.3v120.4c0,15.7 12.8,28.5 28.5,28.5h212.4c15.7,0 28.5,-12.8 28.5,-28.5V839c17.4,-6.2 29.9,-22.8 29.9,-42.3V651.9c0.1,-0.8 1.1,-6 10.3,-19.6c7.9,-11.7 18.9,-25.3 31.7,-41c48.8,-60.3 115.6,-142.9 115.6,-247C834.2,258.2 800.6,177.3 739.8,116.5zM589.7,930.9H434.3v-89.3h155.4V930.9zM479.3,516.9c0.9,7.8 2.2,15.1 3.9,21.4c6.8,24.3 19.4,29.4 28.8,29.4c9.4,0 22,-5.1 28.8,-29.4c1.8,-6.3 3.1,-13.5 3.9,-21.4c0.9,7.8 2.2,15.1 3.9,21.4c1.1,3.9 2.4,7.3 3.7,10.3c-1.2,1.4 -2.2,2.9 -3,4.6c-1.4,3 -30.1,67.1 -37.3,190.6c-7.2,-123.5 -35.9,-187.6 -37.3,-190.6c-0.8,-1.8 -1.9,-3.4 -3.1,-4.8c1.3,-3 2.6,-6.3 3.7,-10.2C477.1,532 478.4,524.7 479.3,516.9zM674.3,555.5c-31.7,39.2 -54.7,67.6 -54.7,96.3v132.8h-1.4h-69.6c2.4,-141 35,-214.8 35.4,-215.6c0.4,-0.8 0.7,-1.7 0.9,-2.5c7.9,-2.5 16.3,-9.9 21.4,-28.2c3.3,-11.6 5.1,-26.7 5.1,-42.6s-1.8,-30.9 -5.1,-42.6c-6.8,-24.3 -19.4,-29.4 -28.8,-29.4s-22,5.1 -28.8,29.4c-1.8,6.3 -3.1,13.5 -3.9,21.4c-0.9,-7.8 -2.2,-15.1 -3.9,-21.4c-6.8,-24.3 -19.4,-29.4 -28.8,-29.4c-9.4,0 -22,5.1 -28.8,29.4c-1.8,6.3 -3.1,13.5 -3.9,21.4c-0.9,-7.8 -2.2,-15.1 -3.9,-21.4c-6.8,-24.3 -19.4,-29.4 -28.8,-29.4s-22,5.1 -28.8,29.4c-3.3,11.6 -5.1,26.7 -5.1,42.6s1.8,30.9 5.1,42.6c5.2,18.4 13.7,25.8 21.6,28.3c0.2,0.8 0.5,1.7 0.9,2.5c0.3,0.8 33,74.6 35.4,215.6h-69.8h-1.4V651.7c0,-29.2 -23.2,-57.8 -55.2,-97.4C303.6,498 246.9,427.9 246.9,344.3c0,-146.2 118.9,-265.1 265.1,-265.1c146.2,0 265.1,118.9 265.1,265.1C777.1,428.3 717.7,501.8 674.3,555.5z"/>
+<!--
+  ~ Copyright (c) 2018, Nordic Semiconductor
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+  ~
+  ~ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+  ~
+  ~ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
+  ~ documentation and/or other materials provided with the distribution.
+  ~
+  ~ 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this
+  ~ software without specific prior written permission.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+  ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+  ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="@color/colorOnPrimary"
+	android:viewportWidth="1024"
+	android:viewportHeight="1024">
+	<path
+		android:fillColor="@color/white"
+		android:pathData="M739.8,116.5C679,55.6 598.1,22.1 512,22.1s-167,33.5 -227.8,94.4c-60.8,60.8 -94.4,141.7 -94.4,227.8c0,103.8 66.5,186 115.1,245.9c13,16 24.2,29.9 32.2,41.8c9.4,13.9 10.2,19.1 10.3,19.8v144.8c0,19.5 12.5,36.1 29.9,42.3v120.4c0,15.7 12.8,28.5 28.5,28.5h212.4c15.7,0 28.5,-12.8 28.5,-28.5V839c17.4,-6.2 29.9,-22.8 29.9,-42.3V651.9c0.1,-0.8 1.1,-6 10.3,-19.6c7.9,-11.7 18.9,-25.3 31.7,-41c48.8,-60.3 115.6,-142.9 115.6,-247C834.2,258.2 800.6,177.3 739.8,116.5zM589.7,930.9H434.3v-89.3h155.4V930.9zM479.3,516.9c0.9,7.8 2.2,15.1 3.9,21.4c6.8,24.3 19.4,29.4 28.8,29.4c9.4,0 22,-5.1 28.8,-29.4c1.8,-6.3 3.1,-13.5 3.9,-21.4c0.9,7.8 2.2,15.1 3.9,21.4c1.1,3.9 2.4,7.3 3.7,10.3c-1.2,1.4 -2.2,2.9 -3,4.6c-1.4,3 -30.1,67.1 -37.3,190.6c-7.2,-123.5 -35.9,-187.6 -37.3,-190.6c-0.8,-1.8 -1.9,-3.4 -3.1,-4.8c1.3,-3 2.6,-6.3 3.7,-10.2C477.1,532 478.4,524.7 479.3,516.9zM674.3,555.5c-31.7,39.2 -54.7,67.6 -54.7,96.3v132.8h-1.4h-69.6c2.4,-141 35,-214.8 35.4,-215.6c0.4,-0.8 0.7,-1.7 0.9,-2.5c7.9,-2.5 16.3,-9.9 21.4,-28.2c3.3,-11.6 5.1,-26.7 5.1,-42.6s-1.8,-30.9 -5.1,-42.6c-6.8,-24.3 -19.4,-29.4 -28.8,-29.4s-22,5.1 -28.8,29.4c-1.8,6.3 -3.1,13.5 -3.9,21.4c-0.9,-7.8 -2.2,-15.1 -3.9,-21.4c-6.8,-24.3 -19.4,-29.4 -28.8,-29.4c-9.4,0 -22,5.1 -28.8,29.4c-1.8,6.3 -3.1,13.5 -3.9,21.4c-0.9,-7.8 -2.2,-15.1 -3.9,-21.4c-6.8,-24.3 -19.4,-29.4 -28.8,-29.4s-22,5.1 -28.8,29.4c-3.3,11.6 -5.1,26.7 -5.1,42.6s1.8,30.9 5.1,42.6c5.2,18.4 13.7,25.8 21.6,28.3c0.2,0.8 0.5,1.7 0.9,2.5c0.3,0.8 33,74.6 35.4,215.6h-69.8h-1.4V651.7c0,-29.2 -23.2,-57.8 -55.2,-97.4C303.6,498 246.9,427.9 246.9,344.3c0,-146.2 118.9,-265.1 265.1,-265.1c146.2,0 265.1,118.9 265.1,265.1C777.1,428.3 717.7,501.8 674.3,555.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml
@@ -1,7 +1,23 @@
 <!--
   ~ Copyright (c) 2018, Nordic Semiconductor
+  ~ All rights reserved.
   ~
-  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+  ~
+  ~ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+  ~
+  ~ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
+  ~ documentation and/or other materials provided with the distribution.
+  ~
+  ~ 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this
+  ~ software without specific prior written permission.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+  ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+  ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
@@ -11,6 +27,6 @@
 	android:viewportHeight="24.0"
 	android:viewportWidth="24.0">
 	<path
-		android:fillColor="#FF000000"
+		android:fillColor="@color/white"
 		android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,12 +1,35 @@
+<!--
+  ~ Copyright (c) 2018, Nordic Semiconductor
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+  ~
+  ~ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+  ~
+  ~ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
+  ~ documentation and/or other materials provided with the distribution.
+  ~
+  ~ 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this
+  ~ software without specific prior written permission.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+  ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+  ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="2275.5557"
-    android:viewportHeight="2275.5557">
-  <group android:translateX="625.7778"
-      android:translateY="625.7778">
-    <path
-        android:pathData="M739.8,116.5C679,55.6 598.1,22.1 512,22.1s-167,33.5 -227.8,94.4c-60.8,60.8 -94.4,141.7 -94.4,227.8c0,103.8 66.5,186 115.1,245.9c13,16 24.2,29.9 32.2,41.8c9.4,13.9 10.2,19.1 10.3,19.8v144.8c0,19.5 12.5,36.1 29.9,42.3v120.4c0,15.7 12.8,28.5 28.5,28.5h212.4c15.7,0 28.5,-12.8 28.5,-28.5V839c17.4,-6.2 29.9,-22.8 29.9,-42.3V651.9c0.1,-0.8 1.1,-6 10.3,-19.6c7.9,-11.7 18.9,-25.3 31.7,-41c48.8,-60.3 115.6,-142.9 115.6,-247C834.2,258.2 800.6,177.3 739.8,116.5zM589.7,930.9H434.3v-89.3h155.4V930.9zM479.3,516.9c0.9,7.8 2.2,15.1 3.9,21.4c6.8,24.3 19.4,29.4 28.8,29.4c9.4,0 22,-5.1 28.8,-29.4c1.8,-6.3 3.1,-13.5 3.9,-21.4c0.9,7.8 2.2,15.1 3.9,21.4c1.1,3.9 2.4,7.3 3.7,10.3c-1.2,1.4 -2.2,2.9 -3,4.6c-1.4,3 -30.1,67.1 -37.3,190.6c-7.2,-123.5 -35.9,-187.6 -37.3,-190.6c-0.8,-1.8 -1.9,-3.4 -3.1,-4.8c1.3,-3 2.6,-6.3 3.7,-10.2C477.1,532 478.4,524.7 479.3,516.9zM674.3,555.5c-31.7,39.2 -54.7,67.6 -54.7,96.3v132.8h-1.4h-69.6c2.4,-141 35,-214.8 35.4,-215.6c0.4,-0.8 0.7,-1.7 0.9,-2.5c7.9,-2.5 16.3,-9.9 21.4,-28.2c3.3,-11.6 5.1,-26.7 5.1,-42.6s-1.8,-30.9 -5.1,-42.6c-6.8,-24.3 -19.4,-29.4 -28.8,-29.4s-22,5.1 -28.8,29.4c-1.8,6.3 -3.1,13.5 -3.9,21.4c-0.9,-7.8 -2.2,-15.1 -3.9,-21.4c-6.8,-24.3 -19.4,-29.4 -28.8,-29.4c-9.4,0 -22,5.1 -28.8,29.4c-1.8,6.3 -3.1,13.5 -3.9,21.4c-0.9,-7.8 -2.2,-15.1 -3.9,-21.4c-6.8,-24.3 -19.4,-29.4 -28.8,-29.4s-22,5.1 -28.8,29.4c-3.3,11.6 -5.1,26.7 -5.1,42.6s1.8,30.9 5.1,42.6c5.2,18.4 13.7,25.8 21.6,28.3c0.2,0.8 0.5,1.7 0.9,2.5c0.3,0.8 33,74.6 35.4,215.6h-69.8h-1.4V651.7c0,-29.2 -23.2,-57.8 -55.2,-97.4C303.6,498 246.9,427.9 246.9,344.3c0,-146.2 118.9,-265.1 265.1,-265.1c146.2,0 265.1,118.9 265.1,265.1C777.1,428.3 717.7,501.8 674.3,555.5z"
-        android:fillColor="#FFFFFF"/>
-  </group>
+	android:width="108dp"
+	android:height="108dp"
+	android:viewportWidth="2275.5557"
+	android:viewportHeight="2275.5557">
+	<group
+		android:translateX="625.7778"
+		android:translateY="625.7778">
+		<path
+			android:fillColor="#FFFFFF"
+			android:pathData="M739.8,116.5C679,55.6 598.1,22.1 512,22.1s-167,33.5 -227.8,94.4c-60.8,60.8 -94.4,141.7 -94.4,227.8c0,103.8 66.5,186 115.1,245.9c13,16 24.2,29.9 32.2,41.8c9.4,13.9 10.2,19.1 10.3,19.8v144.8c0,19.5 12.5,36.1 29.9,42.3v120.4c0,15.7 12.8,28.5 28.5,28.5h212.4c15.7,0 28.5,-12.8 28.5,-28.5V839c17.4,-6.2 29.9,-22.8 29.9,-42.3V651.9c0.1,-0.8 1.1,-6 10.3,-19.6c7.9,-11.7 18.9,-25.3 31.7,-41c48.8,-60.3 115.6,-142.9 115.6,-247C834.2,258.2 800.6,177.3 739.8,116.5zM589.7,930.9H434.3v-89.3h155.4V930.9zM479.3,516.9c0.9,7.8 2.2,15.1 3.9,21.4c6.8,24.3 19.4,29.4 28.8,29.4c9.4,0 22,-5.1 28.8,-29.4c1.8,-6.3 3.1,-13.5 3.9,-21.4c0.9,7.8 2.2,15.1 3.9,21.4c1.1,3.9 2.4,7.3 3.7,10.3c-1.2,1.4 -2.2,2.9 -3,4.6c-1.4,3 -30.1,67.1 -37.3,190.6c-7.2,-123.5 -35.9,-187.6 -37.3,-190.6c-0.8,-1.8 -1.9,-3.4 -3.1,-4.8c1.3,-3 2.6,-6.3 3.7,-10.2C477.1,532 478.4,524.7 479.3,516.9zM674.3,555.5c-31.7,39.2 -54.7,67.6 -54.7,96.3v132.8h-1.4h-69.6c2.4,-141 35,-214.8 35.4,-215.6c0.4,-0.8 0.7,-1.7 0.9,-2.5c7.9,-2.5 16.3,-9.9 21.4,-28.2c3.3,-11.6 5.1,-26.7 5.1,-42.6s-1.8,-30.9 -5.1,-42.6c-6.8,-24.3 -19.4,-29.4 -28.8,-29.4s-22,5.1 -28.8,29.4c-1.8,6.3 -3.1,13.5 -3.9,21.4c-0.9,-7.8 -2.2,-15.1 -3.9,-21.4c-6.8,-24.3 -19.4,-29.4 -28.8,-29.4c-9.4,0 -22,5.1 -28.8,29.4c-1.8,6.3 -3.1,13.5 -3.9,21.4c-0.9,-7.8 -2.2,-15.1 -3.9,-21.4c-6.8,-24.3 -19.4,-29.4 -28.8,-29.4s-22,5.1 -28.8,29.4c-3.3,11.6 -5.1,26.7 -5.1,42.6s1.8,30.9 5.1,42.6c5.2,18.4 13.7,25.8 21.6,28.3c0.2,0.8 0.5,1.7 0.9,2.5c0.3,0.8 33,74.6 35.4,215.6h-69.8h-1.4V651.7c0,-29.2 -23.2,-57.8 -55.2,-97.4C303.6,498 246.9,427.9 246.9,344.3c0,-146.2 118.9,-265.1 265.1,-265.1c146.2,0 265.1,118.9 265.1,265.1C777.1,428.3 717.7,501.8 674.3,555.5z" />
+	</group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_location_off.xml b/app/src/main/res/drawable/ic_location_off.xml
@@ -28,6 +28,6 @@
 	android:viewportHeight="24.0"
 	android:viewportWidth="24.0">
 	<path
-		android:fillColor="#FF000000"
+		android:fillColor="@color/colorError"
 		android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_signal_0_bar.xml b/app/src/main/res/drawable/ic_signal_0_bar.xml
@@ -24,10 +24,10 @@
 	android:width="24dp"
 	android:height="24dp"
 	android:tint="@color/colorOnBackground"
-	android:viewportHeight="24.0"
-	android:viewportWidth="24.0">
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0">
 	<path
 		android:fillAlpha=".3"
-		android:fillColor="#FF000000"
-		android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/>
+		android:fillColor="@color/black"
+		android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_signal_1_bar.xml b/app/src/main/res/drawable/ic_signal_1_bar.xml
@@ -24,13 +24,13 @@
 	android:width="24dp"
 	android:height="24dp"
 	android:tint="@color/colorOnBackground"
-	android:viewportHeight="24.0"
-	android:viewportWidth="24.0">
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0">
 	<path
 		android:fillAlpha=".3"
-		android:fillColor="#FF000000"
-		android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/>
+		android:fillColor="@color/black"
+		android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z" />
 	<path
-		android:fillColor="#FF000000"
-		android:pathData="M6.67,14.86L12,21.49v0.01l0.01,-0.01 5.33,-6.63C17.06,14.65 15.03,13 12,13s-5.06,1.65 -5.33,1.86z"/>
+		android:fillColor="@color/black"
+		android:pathData="M6.67,14.86L12,21.49v0.01l0.01,-0.01 5.33,-6.63C17.06,14.65 15.03,13 12,13s-5.06,1.65 -5.33,1.86z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_signal_2_bar.xml b/app/src/main/res/drawable/ic_signal_2_bar.xml
@@ -24,13 +24,13 @@
 	android:width="24dp"
 	android:height="24dp"
 	android:tint="@color/colorOnBackground"
-	android:viewportHeight="24.0"
-	android:viewportWidth="24.0">
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0">
 	<path
 		android:fillAlpha=".3"
-		android:fillColor="#FF000000"
-		android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/>
+		android:fillColor="@color/black"
+		android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z" />
 	<path
-		android:fillColor="#FF000000"
-		android:pathData="M4.79,12.52l7.2,8.98H12l0.01,-0.01 7.2,-8.98C18.85,12.24 16.1,10 12,10s-6.85,2.24 -7.21,2.52z"/>
+		android:fillColor="@color/black"
+		android:pathData="M4.79,12.52l7.2,8.98H12l0.01,-0.01 7.2,-8.98C18.85,12.24 16.1,10 12,10s-6.85,2.24 -7.21,2.52z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_signal_3_bar.xml b/app/src/main/res/drawable/ic_signal_3_bar.xml
@@ -24,13 +24,13 @@
 	android:width="24dp"
 	android:height="24dp"
 	android:tint="@color/colorOnBackground"
-	android:viewportHeight="24.0"
-	android:viewportWidth="24.0">
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0">
 	<path
 		android:fillAlpha=".3"
-		android:fillColor="#FF000000"
-		android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/>
+		android:fillColor="@color/black"
+		android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z" />
 	<path
-		android:fillColor="#FF000000"
-		android:pathData="M3.53,10.95l8.46,10.54 0.01,0.01 0.01,-0.01 8.46,-10.54C20.04,10.62 16.81,8 12,8c-4.81,0 -8.04,2.62 -8.47,2.95z"/>
+		android:fillColor="@color/black"
+		android:pathData="M3.53,10.95l8.46,10.54 0.01,0.01 0.01,-0.01 8.46,-10.54C20.04,10.62 16.81,8 12,8c-4.81,0 -8.04,2.62 -8.47,2.95z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_signal_4_bar.xml b/app/src/main/res/drawable/ic_signal_4_bar.xml
@@ -24,9 +24,9 @@
 	android:width="24dp"
 	android:height="24dp"
 	android:tint="@color/colorOnBackground"
-	android:viewportHeight="24.0"
-	android:viewportWidth="24.0">
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0">
 	<path
-		android:fillColor="#FF000000"
-		android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/>
+		android:fillColor="@color/black"
+		android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_timeout.xml b/app/src/main/res/drawable/ic_timeout.xml
@@ -21,13 +21,13 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:alpha="0.6"
-    android:tint="@color/colorOnBackground"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M18,22l-0.01,-6L14,12l3.99,-4.01L18,2H6v6l4,4l-4,3.99V22H18zM8,7.5V4h8v3.5l-4,4L8,7.5z"/>
+	android:width="48dp"
+	android:height="48dp"
+	android:alpha="0.6"
+	android:tint="@color/colorOnBackground"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="@color/colorError"
+		android:pathData="M18,22l-0.01,-6L14,12l3.99,-4.01L18,2H6v6l4,4l-4,3.99V22H18zM8,7.5V4h8v3.5l-4,4L8,7.5z" />
 </vector>