From b72d1bd2aca9bc27327d7f22557b52e96ad9dcf3 Mon Sep 17 00:00:00 2001
From: oliexdev <olie.xdev@googlemail.com>
Date: Tue, 16 Jun 2020 11:21:55 +0200
Subject: [PATCH] added support for round launcher icons and update version to
 2.3.0

---
 android_app/app/build.gradle                  |  13 +-
 android_app/app/src/main/AndroidManifest.xml  |   1 +
 .../res/drawable/ic_launcher_openscale.xml    |  80 +++++++----
 .../drawable/ic_launcher_openscale_light.xml  | 121 ++++++++++------
 .../drawable/ic_launcher_openscale_pro.xml    | 135 +++++++++---------
 .../ic_launcher_openscale_light_round.xml     |   5 +
 .../ic_launcher_openscale_pro_round.xml       |   5 +
 .../ic_launcher_openscale_round.xml           |   5 +
 fastlane/openScale/en-GB/changelogs/49.txt    |   9 ++
 .../openScale_light/en-GB/changelogs/49.txt   |   9 ++
 .../openScale_pro/en-GB/changelogs/49.txt     |   9 ++
 11 files changed, 254 insertions(+), 138 deletions(-)
 create mode 100644 android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_light_round.xml
 create mode 100644 android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_pro_round.xml
 create mode 100644 android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_round.xml
 create mode 100644 fastlane/openScale/en-GB/changelogs/49.txt
 create mode 100644 fastlane/openScale_light/en-GB/changelogs/49.txt
 create mode 100644 fastlane/openScale_pro/en-GB/changelogs/49.txt

diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle
index fe5ebf45..9c8c955c 100644
--- a/android_app/app/build.gradle
+++ b/android_app/app/build.gradle
@@ -8,12 +8,13 @@ android {
         testApplicationId "com.health.openscale.test"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 48
-        versionName "2.2.0"
+        versionCode 49
+        versionName "2.3.0"
         archivesBaseName = "openScale-$versionName"
 
         manifestPlaceholders = [
-                appIcon: "@drawable/ic_launcher_openscale"
+                appIcon: "@drawable/ic_launcher_openscale",
+                appIconRound: "@mipmap/ic_launcher_openscale_round"
         ]
 
         javaCompileOptions {
@@ -94,7 +95,8 @@ android {
         }
         light {
             manifestPlaceholders = [
-                    appIcon: "@drawable/ic_launcher_openscale_light"
+                    appIcon: "@drawable/ic_launcher_openscale_light",
+                    appIconRound: "@mipmap/ic_launcher_openscale_light_round"
             ]
             applicationIdSuffix ".light"
             versionNameSuffix "-light"
@@ -104,7 +106,8 @@ android {
         }
         pro {
             manifestPlaceholders = [
-                    appIcon: "@drawable/ic_launcher_openscale_pro"
+                    appIcon: "@drawable/ic_launcher_openscale_pro",
+                    appIconRound: "@mipmap/ic_launcher_openscale_pro_round"
             ]
             applicationIdSuffix ".pro"
             versionNameSuffix "-pro"
diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml
index 12ae3269..e4a7ed86 100644
--- a/android_app/app/src/main/AndroidManifest.xml
+++ b/android_app/app/src/main/AndroidManifest.xml
@@ -24,6 +24,7 @@
         android:allowBackup="true"
         android:requestLegacyExternalStorage="true"
         android:icon="${appIcon}"
+        android:roundIcon="${appIconRound}"
         android:label="@string/app_name"
         android:name=".core.Application"
         android:theme="@style/AppTheme" >
diff --git a/android_app/app/src/main/res/drawable/ic_launcher_openscale.xml b/android_app/app/src/main/res/drawable/ic_launcher_openscale.xml
index 0717be29..0991fca5 100644
--- a/android_app/app/src/main/res/drawable/ic_launcher_openscale.xml
+++ b/android_app/app/src/main/res/drawable/ic_launcher_openscale.xml
@@ -1,28 +1,54 @@
-<vector android:height="128dp" android:viewportHeight="469.333"
-    android:viewportWidth="469.333" android:width="128dp"
-    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#33b6ea"
-        android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z"
-        android:strokeColor="#00000000" android:strokeWidth="3"/>
-    <path android:fillColor="#33b6ea" android:pathData="m458.444,435.591c0,12.322 -10.075,22.352 -22.452,22.352l-404.138,0c-12.377,0 -22.452,-10.03 -22.452,-22.352l0,-402.348c0,-12.322 10.075,-22.352 22.452,-22.352l404.138,0c12.377,0 22.452,10.03 22.452,22.352l0,402.348z"/>
-    <path android:fillColor="#303C42" android:pathData="M234.667,64c-51.281,0 -99.5,19.969 -135.76,56.24c-4.167,4.167 -4.167,10.917 0,15.083l60.333,60.333c4.167,4.167 10.917,4.167 15.083,0c33.271,-33.271 87.417,-33.271 120.688,0c2.083,2.083 4.813,3.125 7.542,3.125s5.458,-1.042 7.542,-3.125l60.333,-60.333c4.167,-4.167 4.167,-10.917 0,-15.083C334.167,83.969 285.948,64 234.667,64z"/>
-    <path android:fillColor="#F2F2F2" android:pathData="M302.177,173.406c-19.563,-16.021 -43.542,-24.031 -67.51,-24.031c-10.073,0 -20.078,1.741 -29.826,4.57l-13.799,-30.362c-2.417,-5.354 -8.729,-7.75 -14.125,-5.292c-5.365,2.438 -7.729,8.76 -5.292,14.125l13.361,29.395c-6.214,3.271 -12.236,7.013 -17.829,11.595L121.76,128.01c31.198,-27.604 70.896,-42.677 112.906,-42.677s81.708,15.073 112.906,42.677L302.177,173.406z"/>
-    <path android:pathData="m471.303,396.814 l0.519,-184.642 -101.944,-92.793 -0.714,0.125c1.391,3.697 0.633,8.116 -2.389,11.287l-59.918,62.867c-2.069,2.17 -4.78,3.337 -7.49,3.467 -2.71,0.131 -4.717,-2.181 -6.787,-4.152 -33.042,-31.487 -90.502,-30.972 -123.544,3.696 -2.999,3.147 -6.107,0.56 -9.848,-0.61 69.563,63.97 204.795,194.348 281.942,273.248 19.432,-22.652 51.932,66.551 24.548,-85.533 -1.877,-10.424 6.146,46.77 6.146,35.079z">
-        <aapt:attr name="android:fillColor">
-            <gradient android:endX="566.51764" android:endY="440.8289"
-                android:startX="231.57214" android:startY="129.01874" android:type="linear">
-                <item android:color="#19000000" android:offset="0"/>
-                <item android:color="#00000000" android:offset="1"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z">
-        <aapt:attr name="android:fillColor">
-            <gradient android:endX="504.58307" android:endY="360.55725"
-                android:startX="-35.247547" android:startY="108.81792" android:type="linear">
-                <item android:color="#33FFFFFF" android:offset="0"/>
-                <item android:color="#00FFFFFF" android:offset="1"/>
-            </gradient>
-        </aapt:attr>
-    </path>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <group android:scaleX="0.15877852"
+        android:scaleY="0.15877852"
+        android:translateX="16.74"
+        android:translateY="16.74">
+        <path
+            android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z"
+            android:strokeWidth="3"
+            android:fillColor="#33b6ea"
+            android:strokeColor="#00000000"/>
+        <path
+            android:pathData="m458.444,435.591c0,12.322 -10.075,22.352 -22.452,22.352l-404.138,0c-12.377,0 -22.452,-10.03 -22.452,-22.352l0,-402.348c0,-12.322 10.075,-22.352 22.452,-22.352l404.138,0c12.377,0 22.452,10.03 22.452,22.352l0,402.348z"
+            android:fillColor="#33b6ea"/>
+        <path
+            android:pathData="M234.667,64c-51.281,0 -99.5,19.969 -135.76,56.24c-4.167,4.167 -4.167,10.917 0,15.083l60.333,60.333c4.167,4.167 10.917,4.167 15.083,0c33.271,-33.271 87.417,-33.271 120.688,0c2.083,2.083 4.813,3.125 7.542,3.125s5.458,-1.042 7.542,-3.125l60.333,-60.333c4.167,-4.167 4.167,-10.917 0,-15.083C334.167,83.969 285.948,64 234.667,64z"
+            android:fillColor="#303C42"/>
+        <path
+            android:pathData="M302.177,173.406c-19.563,-16.021 -43.542,-24.031 -67.51,-24.031c-10.073,0 -20.078,1.741 -29.826,4.57l-13.799,-30.362c-2.417,-5.354 -8.729,-7.75 -14.125,-5.292c-5.365,2.438 -7.729,8.76 -5.292,14.125l13.361,29.395c-6.214,3.271 -12.236,7.013 -17.829,11.595L121.76,128.01c31.198,-27.604 70.896,-42.677 112.906,-42.677s81.708,15.073 112.906,42.677L302.177,173.406z"
+            android:fillColor="#F2F2F2"/>
+        <path
+            android:pathData="m471.303,396.814 l0.519,-184.642 -101.944,-92.793 -0.714,0.125c1.391,3.697 0.633,8.116 -2.389,11.287l-59.918,62.867c-2.069,2.17 -4.78,3.337 -7.49,3.467 -2.71,0.131 -4.717,-2.181 -6.787,-4.152 -33.042,-31.487 -90.502,-30.972 -123.544,3.696 -2.999,3.147 -6.107,0.56 -9.848,-0.61 69.563,63.97 204.795,194.348 281.942,273.248 19.432,-22.652 51.932,66.551 24.548,-85.533 -1.877,-10.424 6.146,46.77 6.146,35.079z">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:startY="129.01874"
+                    android:startX="231.57214"
+                    android:endY="440.8289"
+                    android:endX="566.51764"
+                    android:type="linear">
+                    <item android:offset="0" android:color="#19000000"/>
+                    <item android:offset="1" android:color="#00000000"/>
+                </gradient>
+            </aapt:attr>
+        </path>
+        <path
+            android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:startY="108.81792"
+                    android:startX="-35.247547"
+                    android:endY="360.55725"
+                    android:endX="504.58307"
+                    android:type="linear">
+                    <item android:offset="0" android:color="#33FFFFFF"/>
+                    <item android:offset="1" android:color="#00FFFFFF"/>
+                </gradient>
+            </aapt:attr>
+        </path>
+    </group>
 </vector>
diff --git a/android_app/app/src/main/res/drawable/ic_launcher_openscale_light.xml b/android_app/app/src/main/res/drawable/ic_launcher_openscale_light.xml
index 4859c63f..736989ec 100644
--- a/android_app/app/src/main/res/drawable/ic_launcher_openscale_light.xml
+++ b/android_app/app/src/main/res/drawable/ic_launcher_openscale_light.xml
@@ -1,42 +1,81 @@
-<vector android:height="128dp" android:viewportHeight="469.333"
-    android:viewportWidth="469.333" android:width="128dp"
-    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#33b6ea"
-        android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z"
-        android:strokeColor="#00000000" android:strokeWidth="3"/>
-    <path android:fillColor="#33b6ea" android:pathData="m458.444,435.591c0,12.322 -10.075,22.352 -22.452,22.352l-404.138,0c-12.377,0 -22.452,-10.03 -22.452,-22.352l0,-402.348c0,-12.322 10.075,-22.352 22.452,-22.352l404.138,0c12.377,0 22.452,10.03 22.452,22.352l0,402.348z"/>
-    <path android:fillColor="#303C42" android:pathData="M234.667,64c-51.281,0 -99.5,19.969 -135.76,56.24c-4.167,4.167 -4.167,10.917 0,15.083l60.333,60.333c4.167,4.167 10.917,4.167 15.083,0c33.271,-33.271 87.417,-33.271 120.688,0c2.083,2.083 4.813,3.125 7.542,3.125s5.458,-1.042 7.542,-3.125l60.333,-60.333c4.167,-4.167 4.167,-10.917 0,-15.083C334.167,83.969 285.948,64 234.667,64z"/>
-    <path android:fillColor="#F2F2F2" android:pathData="M302.177,173.406c-19.563,-16.021 -43.542,-24.031 -67.51,-24.031c-10.073,0 -20.078,1.741 -29.826,4.57l-13.799,-30.362c-2.417,-5.354 -8.729,-7.75 -14.125,-5.292c-5.365,2.438 -7.729,8.76 -5.292,14.125l13.361,29.395c-6.214,3.271 -12.236,7.013 -17.829,11.595L121.76,128.01c31.198,-27.604 70.896,-42.677 112.906,-42.677s81.708,15.073 112.906,42.677L302.177,173.406z"/>
-    <path android:pathData="m471.303,396.814 l0.519,-184.642 -101.944,-92.793 -0.714,0.125c1.391,3.697 0.633,8.116 -2.389,11.287l-59.918,62.867c-2.069,2.17 -4.78,3.337 -7.49,3.467 -2.71,0.131 -4.717,-2.181 -6.787,-4.152 -33.042,-31.487 -90.502,-30.972 -123.544,3.696 -2.999,3.147 -6.107,0.56 -9.848,-0.61 69.563,63.97 204.795,194.348 281.942,273.248 19.432,-22.652 51.932,66.551 24.548,-85.533 -1.877,-10.424 6.146,46.77 6.146,35.079z">
-        <aapt:attr name="android:fillColor">
-            <gradient android:endX="566.51764" android:endY="440.8289"
-                android:startX="231.57214" android:startY="129.01874" android:type="linear">
-                <item android:color="#19000000" android:offset="0"/>
-                <item android:color="#00000000" android:offset="1"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z">
-        <aapt:attr name="android:fillColor">
-            <gradient android:endX="504.58307" android:endY="360.55725"
-                android:startX="-35.247547" android:startY="108.81792" android:type="linear">
-                <item android:color="#33FFFFFF" android:offset="0"/>
-                <item android:color="#00FFFFFF" android:offset="1"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path android:fillColor="#99cc00"
-        android:pathData="M34.048,331.345h199.064v97.59h-199.064z"
-        android:strokeColor="#99cc00" android:strokeLineCap="round"
-        android:strokeLineJoin="bevel" android:strokeWidth="7.37556124"/>
-    <path android:fillColor="#ffffff"
-        android:pathData="M42.833,347.214H55.885V403.944H42.833Z" android:strokeColor="#00000000"/>
-    <path android:fillColor="#ffffff"
-        android:pathData="M68.499,363.11L81.551,363.11L81.551,403.944L68.499,403.944ZM68.499,347.214L81.551,347.214v10.646L68.499,357.86Z" android:strokeColor="#00000000"/>
-    <path android:fillColor="#ffffff"
-        android:pathData="m121.947,397.017q-2.698,3.573 -5.943,5.25 -3.245,1.677 -7.51,1.677 -7.474,0 -12.359,-5.87 -4.885,-5.906 -4.885,-15.021 0,-9.151 4.885,-14.984 4.885,-5.87 12.359,-5.87 4.266,0 7.51,1.677 3.245,1.677 5.943,5.286v-6.052h13.125v36.714q0,9.844 -6.234,15.021 -6.198,5.214 -18.01,5.214 -3.828,0 -7.401,-0.583 -3.573,-0.583 -7.182,-1.786v-10.172q3.427,1.969 6.708,2.917 3.281,0.984 6.599,0.984 6.417,0 9.406,-2.807 2.99,-2.807 2.99,-8.786zM113.343,371.605q-4.047,0 -6.307,2.99 -2.26,2.99 -2.26,8.458 0,5.615 2.188,8.531 2.188,2.88 6.38,2.88 4.083,0 6.344,-2.99 2.26,-2.99 2.26,-8.422 0,-5.469 -2.26,-8.458 -2.26,-2.99 -6.344,-2.99z" android:strokeColor="#00000000"/>
-    <path android:fillColor="#ffffff"
-        android:pathData="m188.739,379.079v24.865h-13.125v-4.047,-14.911q0,-5.359 -0.255,-7.365 -0.219,-2.005 -0.802,-2.953 -0.766,-1.276 -2.078,-1.969 -1.313,-0.729 -2.99,-0.729 -4.083,0 -6.417,3.172 -2.333,3.135 -2.333,8.714V403.944H147.687v-56.729h13.052v21.875q2.953,-3.573 6.271,-5.25 3.318,-1.714 7.328,-1.714 7.073,0 10.719,4.339 3.682,4.339 3.682,12.615z" android:strokeColor="#00000000"/>
-    <path android:fillColor="#ffffff"
-        android:pathData="m215.171,351.517v11.594h13.453v9.333h-13.453v17.318q0,2.844 1.13,3.865 1.13,0.984 4.484,0.984h6.708v9.333h-11.193q-7.729,0 -10.974,-3.208 -3.208,-3.245 -3.208,-10.974V372.444h-6.49v-9.333h6.49v-11.594z" android:strokeColor="#00000000"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <group android:scaleX="0.15877852"
+        android:scaleY="0.15877852"
+        android:translateX="16.74"
+        android:translateY="16.74">
+        <path
+            android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z"
+            android:strokeWidth="3"
+            android:fillColor="#33b6ea"
+            android:strokeColor="#00000000"/>
+        <path
+            android:pathData="m458.444,435.591c0,12.322 -10.075,22.352 -22.452,22.352l-404.138,0c-12.377,0 -22.452,-10.03 -22.452,-22.352l0,-402.348c0,-12.322 10.075,-22.352 22.452,-22.352l404.138,0c12.377,0 22.452,10.03 22.452,22.352l0,402.348z"
+            android:fillColor="#33b6ea"/>
+        <path
+            android:pathData="M234.667,64c-51.281,0 -99.5,19.969 -135.76,56.24c-4.167,4.167 -4.167,10.917 0,15.083l60.333,60.333c4.167,4.167 10.917,4.167 15.083,0c33.271,-33.271 87.417,-33.271 120.688,0c2.083,2.083 4.813,3.125 7.542,3.125s5.458,-1.042 7.542,-3.125l60.333,-60.333c4.167,-4.167 4.167,-10.917 0,-15.083C334.167,83.969 285.948,64 234.667,64z"
+            android:fillColor="#303C42"/>
+        <path
+            android:pathData="M302.177,173.406c-19.563,-16.021 -43.542,-24.031 -67.51,-24.031c-10.073,0 -20.078,1.741 -29.826,4.57l-13.799,-30.362c-2.417,-5.354 -8.729,-7.75 -14.125,-5.292c-5.365,2.438 -7.729,8.76 -5.292,14.125l13.361,29.395c-6.214,3.271 -12.236,7.013 -17.829,11.595L121.76,128.01c31.198,-27.604 70.896,-42.677 112.906,-42.677s81.708,15.073 112.906,42.677L302.177,173.406z"
+            android:fillColor="#F2F2F2"/>
+        <path
+            android:pathData="m471.303,396.814 l0.519,-184.642 -101.944,-92.793 -0.714,0.125c1.391,3.697 0.633,8.116 -2.389,11.287l-59.918,62.867c-2.069,2.17 -4.78,3.337 -7.49,3.467 -2.71,0.131 -4.717,-2.181 -6.787,-4.152 -33.042,-31.487 -90.502,-30.972 -123.544,3.696 -2.999,3.147 -6.107,0.56 -9.848,-0.61 69.563,63.97 204.795,194.348 281.942,273.248 19.432,-22.652 51.932,66.551 24.548,-85.533 -1.877,-10.424 6.146,46.77 6.146,35.079z">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:startY="129.01874"
+                    android:startX="231.57214"
+                    android:endY="440.8289"
+                    android:endX="566.51764"
+                    android:type="linear">
+                    <item android:offset="0" android:color="#19000000"/>
+                    <item android:offset="1" android:color="#00000000"/>
+                </gradient>
+            </aapt:attr>
+        </path>
+        <path
+            android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:startY="108.81792"
+                    android:startX="-35.247547"
+                    android:endY="360.55725"
+                    android:endX="504.58307"
+                    android:type="linear">
+                    <item android:offset="0" android:color="#33FFFFFF"/>
+                    <item android:offset="1" android:color="#00FFFFFF"/>
+                </gradient>
+            </aapt:attr>
+        </path>
+        <path
+            android:pathData="M79.047,305.33h199.064v97.59h-199.064z"
+            android:strokeLineJoin="bevel"
+            android:strokeWidth="7.37556124"
+            android:fillColor="#99cc00"
+            android:strokeColor="#99cc00"
+            android:strokeLineCap="round"/>
+        <path
+            android:pathData="M87.832,321.199L100.884,321.199L100.884,377.928L87.832,377.928Z"
+            android:fillColor="#ffffff"
+            android:strokeColor="#00000000"/>
+        <path
+            android:pathData="M113.498,337.095L126.551,337.095L126.551,377.928L113.498,377.928ZM113.498,321.199L126.551,321.199v10.646L113.498,331.845Z"
+            android:fillColor="#ffffff"
+            android:strokeColor="#00000000"/>
+        <path
+            android:pathData="m166.946,371.001q-2.698,3.573 -5.943,5.25 -3.245,1.677 -7.51,1.677 -7.474,0 -12.359,-5.87 -4.885,-5.906 -4.885,-15.021 0,-9.151 4.885,-14.984 4.885,-5.87 12.359,-5.87 4.266,0 7.51,1.677 3.245,1.677 5.943,5.286v-6.052h13.125v36.714q0,9.844 -6.234,15.021 -6.198,5.214 -18.01,5.214 -3.828,0 -7.401,-0.583 -3.573,-0.583 -7.182,-1.786v-10.172q3.427,1.969 6.708,2.917 3.281,0.984 6.599,0.984 6.417,0 9.406,-2.807 2.99,-2.807 2.99,-8.786zM158.342,345.59q-4.047,0 -6.307,2.99 -2.26,2.99 -2.26,8.458 0,5.615 2.188,8.531 2.188,2.88 6.38,2.88 4.083,0 6.344,-2.99 2.26,-2.99 2.26,-8.422 0,-5.469 -2.26,-8.458 -2.26,-2.99 -6.344,-2.99z"
+            android:fillColor="#ffffff"
+            android:strokeColor="#00000000"/>
+        <path
+            android:pathData="m233.738,353.064v24.865h-13.125v-4.047,-14.911q0,-5.359 -0.255,-7.365 -0.219,-2.005 -0.802,-2.953 -0.766,-1.276 -2.078,-1.969 -1.313,-0.729 -2.99,-0.729 -4.083,0 -6.417,3.172 -2.333,3.135 -2.333,8.714L205.738,377.928L192.686,377.928v-56.729h13.052v21.875q2.953,-3.573 6.271,-5.25 3.318,-1.714 7.328,-1.714 7.073,0 10.719,4.339 3.682,4.339 3.682,12.615z"
+            android:fillColor="#ffffff"
+            android:strokeColor="#00000000"/>
+        <path
+            android:pathData="m260.17,325.501v11.594h13.453v9.333h-13.453v17.318q0,2.844 1.13,3.865 1.13,0.984 4.484,0.984h6.708v9.333h-11.193q-7.729,0 -10.974,-3.208 -3.208,-3.245 -3.208,-10.974L247.118,346.428h-6.49v-9.333h6.49v-11.594z"
+            android:fillColor="#ffffff"
+            android:strokeColor="#00000000"/>
+    </group>
 </vector>
diff --git a/android_app/app/src/main/res/drawable/ic_launcher_openscale_pro.xml b/android_app/app/src/main/res/drawable/ic_launcher_openscale_pro.xml
index 2c5d8067..c2b0a73d 100644
--- a/android_app/app/src/main/res/drawable/ic_launcher_openscale_pro.xml
+++ b/android_app/app/src/main/res/drawable/ic_launcher_openscale_pro.xml
@@ -1,68 +1,73 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="469.333"
-    android:viewportHeight="469.333">
-  <path
-      android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z"
-      android:strokeWidth="3"
-      android:fillColor="#33b6ea"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m458.444,435.591c0,12.322 -10.075,22.352 -22.452,22.352l-404.138,0c-12.377,0 -22.452,-10.03 -22.452,-22.352l0,-402.348c0,-12.322 10.075,-22.352 22.452,-22.352l404.138,0c12.377,0 22.452,10.03 22.452,22.352l0,402.348z"
-      android:fillColor="#33b6ea"/>
-  <path
-      android:pathData="M234.667,64c-51.281,0 -99.5,19.969 -135.76,56.24c-4.167,4.167 -4.167,10.917 0,15.083l60.333,60.333c4.167,4.167 10.917,4.167 15.083,0c33.271,-33.271 87.417,-33.271 120.688,0c2.083,2.083 4.813,3.125 7.542,3.125s5.458,-1.042 7.542,-3.125l60.333,-60.333c4.167,-4.167 4.167,-10.917 0,-15.083C334.167,83.969 285.948,64 234.667,64z"
-      android:fillColor="#303C42"/>
-  <path
-      android:pathData="M302.177,173.406c-19.563,-16.021 -43.542,-24.031 -67.51,-24.031c-10.073,0 -20.078,1.741 -29.826,4.57l-13.799,-30.362c-2.417,-5.354 -8.729,-7.75 -14.125,-5.292c-5.365,2.438 -7.729,8.76 -5.292,14.125l13.361,29.395c-6.214,3.271 -12.236,7.013 -17.829,11.595L121.76,128.01c31.198,-27.604 70.896,-42.677 112.906,-42.677s81.708,15.073 112.906,42.677L302.177,173.406z"
-      android:fillColor="#F2F2F2"/>
-  <path
-      android:pathData="m471.303,396.814 l0.519,-184.642 -101.944,-92.793 -0.714,0.125c1.391,3.697 0.633,8.116 -2.389,11.287l-59.918,62.867c-2.069,2.17 -4.78,3.337 -7.49,3.467 -2.71,0.131 -4.717,-2.181 -6.787,-4.152 -33.042,-31.487 -90.502,-30.972 -123.544,3.696 -2.999,3.147 -6.107,0.56 -9.848,-0.61 69.563,63.97 204.795,194.348 281.942,273.248 19.432,-22.652 51.932,66.551 24.548,-85.533 -1.877,-10.424 6.146,46.77 6.146,35.079z">
-    <aapt:attr name="android:fillColor">
-      <gradient 
-          android:startY="129.01874"
-          android:startX="231.57214"
-          android:endY="440.8289"
-          android:endX="566.51764"
-          android:type="linear">
-        <item android:offset="0" android:color="#19000000"/>
-        <item android:offset="1" android:color="#00000000"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z">
-    <aapt:attr name="android:fillColor">
-      <gradient 
-          android:startY="108.81792"
-          android:startX="-35.247547"
-          android:endY="360.55725"
-          android:endX="504.58307"
-          android:type="linear">
-        <item android:offset="0" android:color="#33FFFFFF"/>
-        <item android:offset="1" android:color="#00FFFFFF"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:pathData="M34.048,331.345h199.064v97.59h-199.064z"
-      android:strokeLineJoin="bevel"
-      android:strokeWidth="7.37556124"
-      android:fillColor="#ff4444"
-      android:strokeColor="#ff4444"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="m82.603,391.006v21.438L69.551,412.444v-56.365h13.052v5.979q2.698,-3.573 5.979,-5.25 3.281,-1.714 7.547,-1.714 7.547,0 12.396,6.016 4.849,5.979 4.849,15.422 0,9.443 -4.849,15.458 -4.849,5.979 -12.396,5.979 -4.266,0 -7.547,-1.677 -3.281,-1.714 -5.979,-5.286zM91.28,364.574q-4.193,0 -6.453,3.099 -2.224,3.063 -2.224,8.859 0,5.797 2.224,8.896 2.26,3.063 6.453,3.063 4.193,0 6.38,-3.063 2.224,-3.063 2.224,-8.896 0,-5.833 -2.224,-8.896 -2.187,-3.062 -6.38,-3.062z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m153.405,367.199q-1.714,-0.802 -3.427,-1.167 -1.677,-0.401 -3.391,-0.401 -5.031,0 -7.766,3.245 -2.698,3.208 -2.698,9.224v18.813h-13.052v-40.833h13.052v6.708q2.516,-4.01 5.76,-5.833 3.281,-1.859 7.839,-1.859 0.656,0 1.422,0.073 0.766,0.036 2.224,0.219z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m179.4,364.428q-4.339,0 -6.635,3.135 -2.26,3.099 -2.26,8.969 0,5.87 2.26,9.005 2.297,3.099 6.635,3.099 4.266,0 6.526,-3.099 2.26,-3.135 2.26,-9.005 0,-5.87 -2.26,-8.969 -2.26,-3.135 -6.526,-3.135zM179.4,355.095q10.536,0 16.443,5.688 5.943,5.688 5.943,15.75 0,10.063 -5.943,15.75 -5.906,5.688 -16.443,5.688 -10.573,0 -16.552,-5.688 -5.943,-5.688 -5.943,-15.75 0,-10.063 5.943,-15.75 5.979,-5.688 16.552,-5.688z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.15877852"
+      android:scaleY="0.15877852"
+      android:translateX="16.74"
+      android:translateY="16.74">
+    <path
+        android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z"
+        android:strokeWidth="3"
+        android:fillColor="#33b6ea"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="m458.444,435.591c0,12.322 -10.075,22.352 -22.452,22.352l-404.138,0c-12.377,0 -22.452,-10.03 -22.452,-22.352l0,-402.348c0,-12.322 10.075,-22.352 22.452,-22.352l404.138,0c12.377,0 22.452,10.03 22.452,22.352l0,402.348z"
+        android:fillColor="#33b6ea"/>
+    <path
+        android:pathData="M234.667,64c-51.281,0 -99.5,19.969 -135.76,56.24c-4.167,4.167 -4.167,10.917 0,15.083l60.333,60.333c4.167,4.167 10.917,4.167 15.083,0c33.271,-33.271 87.417,-33.271 120.688,0c2.083,2.083 4.813,3.125 7.542,3.125s5.458,-1.042 7.542,-3.125l60.333,-60.333c4.167,-4.167 4.167,-10.917 0,-15.083C334.167,83.969 285.948,64 234.667,64z"
+        android:fillColor="#303C42"/>
+    <path
+        android:pathData="M302.177,173.406c-19.563,-16.021 -43.542,-24.031 -67.51,-24.031c-10.073,0 -20.078,1.741 -29.826,4.57l-13.799,-30.362c-2.417,-5.354 -8.729,-7.75 -14.125,-5.292c-5.365,2.438 -7.729,8.76 -5.292,14.125l13.361,29.395c-6.214,3.271 -12.236,7.013 -17.829,11.595L121.76,128.01c31.198,-27.604 70.896,-42.677 112.906,-42.677s81.708,15.073 112.906,42.677L302.177,173.406z"
+        android:fillColor="#F2F2F2"/>
+    <path
+        android:pathData="m471.303,396.814 l0.519,-184.642 -101.944,-92.793 -0.714,0.125c1.391,3.697 0.633,8.116 -2.389,11.287l-59.918,62.867c-2.069,2.17 -4.78,3.337 -7.49,3.467 -2.71,0.131 -4.717,-2.181 -6.787,-4.152 -33.042,-31.487 -90.502,-30.972 -123.544,3.696 -2.999,3.147 -6.107,0.56 -9.848,-0.61 69.563,63.97 204.795,194.348 281.942,273.248 19.432,-22.652 51.932,66.551 24.548,-85.533 -1.877,-10.424 6.146,46.77 6.146,35.079z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startY="129.01874"
+            android:startX="231.57214"
+            android:endY="440.8289"
+            android:endX="566.51764"
+            android:type="linear">
+          <item android:offset="0" android:color="#19000000"/>
+          <item android:offset="1" android:color="#00000000"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startY="108.81792"
+            android:startX="-35.247547"
+            android:endY="360.55725"
+            android:endX="504.58307"
+            android:type="linear">
+          <item android:offset="0" android:color="#33FFFFFF"/>
+          <item android:offset="1" android:color="#00FFFFFF"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M57.954,299.002h199.064v97.59h-199.064z"
+        android:strokeLineJoin="bevel"
+        android:strokeWidth="7.37556124"
+        android:fillColor="#ff4444"
+        android:strokeColor="#ff4444"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="m106.509,358.663v21.438L93.457,380.101v-56.365h13.052v5.979q2.698,-3.573 5.979,-5.25 3.281,-1.714 7.547,-1.714 7.547,0 12.396,6.016 4.849,5.979 4.849,15.422 0,9.443 -4.849,15.458 -4.849,5.979 -12.396,5.979 -4.266,0 -7.547,-1.677 -3.281,-1.714 -5.979,-5.286zM115.186,332.231q-4.193,0 -6.453,3.099 -2.224,3.063 -2.224,8.859 0,5.797 2.224,8.896 2.26,3.063 6.453,3.063 4.193,0 6.38,-3.063 2.224,-3.063 2.224,-8.896 0,-5.833 -2.224,-8.896 -2.187,-3.062 -6.38,-3.062z"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="m177.311,334.856q-1.714,-0.802 -3.427,-1.167 -1.677,-0.401 -3.391,-0.401 -5.031,0 -7.766,3.245 -2.698,3.208 -2.698,9.224v18.813h-13.052v-40.833h13.052v6.708q2.516,-4.01 5.76,-5.833 3.281,-1.859 7.839,-1.859 0.656,0 1.422,0.073 0.766,0.036 2.224,0.219z"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="m203.306,332.085q-4.339,0 -6.635,3.135 -2.26,3.099 -2.26,8.969 0,5.87 2.26,9.005 2.297,3.099 6.635,3.099 4.266,0 6.526,-3.099 2.26,-3.135 2.26,-9.005 0,-5.87 -2.26,-8.969 -2.26,-3.135 -6.526,-3.135zM203.306,322.752q10.536,0 16.443,5.688 5.943,5.688 5.943,15.75 0,10.063 -5.943,15.75 -5.906,5.688 -16.443,5.688 -10.573,0 -16.552,-5.688 -5.943,-5.688 -5.943,-15.75 0,-10.063 5.943,-15.75 5.979,-5.688 16.552,-5.688z"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"/>
+  </group>
 </vector>
diff --git a/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_light_round.xml b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_light_round.xml
new file mode 100644
index 00000000..dbf74ca5
--- /dev/null
+++ b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_light_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/blue_pressed"/>
+    <foreground android:drawable="@drawable/ic_launcher_openscale_light"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_pro_round.xml b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_pro_round.xml
new file mode 100644
index 00000000..afda2507
--- /dev/null
+++ b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_pro_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/blue_pressed"/>
+    <foreground android:drawable="@drawable/ic_launcher_openscale_pro"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_round.xml b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_round.xml
new file mode 100644
index 00000000..78873763
--- /dev/null
+++ b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_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/blue_pressed"/>
+    <foreground android:drawable="@drawable/ic_launcher_openscale"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/fastlane/openScale/en-GB/changelogs/49.txt b/fastlane/openScale/en-GB/changelogs/49.txt
new file mode 100644
index 00000000..aea6776c
--- /dev/null
+++ b/fastlane/openScale/en-GB/changelogs/49.txt
@@ -0,0 +1,9 @@
+- added support for Vigorun YG and Quanta QTBL10 scale
+- added fastlane support
+- integration of Androidx navigation component
+- replaced obsoleted preferences with Androidx preferences
+- replaced png file with svg files
+- integration of DayNight theme
+- use of live data to have always up-to-date measurements
+- added support for round launcher icons
+- fixed minor bug
diff --git a/fastlane/openScale_light/en-GB/changelogs/49.txt b/fastlane/openScale_light/en-GB/changelogs/49.txt
new file mode 100644
index 00000000..aea6776c
--- /dev/null
+++ b/fastlane/openScale_light/en-GB/changelogs/49.txt
@@ -0,0 +1,9 @@
+- added support for Vigorun YG and Quanta QTBL10 scale
+- added fastlane support
+- integration of Androidx navigation component
+- replaced obsoleted preferences with Androidx preferences
+- replaced png file with svg files
+- integration of DayNight theme
+- use of live data to have always up-to-date measurements
+- added support for round launcher icons
+- fixed minor bug
diff --git a/fastlane/openScale_pro/en-GB/changelogs/49.txt b/fastlane/openScale_pro/en-GB/changelogs/49.txt
new file mode 100644
index 00000000..aea6776c
--- /dev/null
+++ b/fastlane/openScale_pro/en-GB/changelogs/49.txt
@@ -0,0 +1,9 @@
+- added support for Vigorun YG and Quanta QTBL10 scale
+- added fastlane support
+- integration of Androidx navigation component
+- replaced obsoleted preferences with Androidx preferences
+- replaced png file with svg files
+- integration of DayNight theme
+- use of live data to have always up-to-date measurements
+- added support for round launcher icons
+- fixed minor bug