From 77d040d08bb008afc07489043a647c8fd7633df0 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Fri, 13 Jun 2025 22:33:16 +0200
Subject: [PATCH] Launcher icon was sometimes incorrectly scaled (e.g.,
 kvaesitso). Use same icon as OSMDashboard for launcher (w/o background).

Fixes #2108.
---
 src/main/res/drawable-v26/ic_launcher.xml     | 12 ++-----
 src/main/res/drawable/ic_logo_108dp.xml       | 16 +++++++++
 src/main/res/drawable/ic_logo_color_108dp.xml | 33 +++++++++++++++++++
 .../drawable/ic_logo_color_splashscreen.xml   | 33 -------------------
 src/main/res/values-night/styles_theme.xml    |  2 +-
 src/main/res/values/styles_theme.xml          |  2 +-
 6 files changed, 53 insertions(+), 45 deletions(-)
 create mode 100644 src/main/res/drawable/ic_logo_108dp.xml
 create mode 100644 src/main/res/drawable/ic_logo_color_108dp.xml
 delete mode 100644 src/main/res/drawable/ic_logo_color_splashscreen.xml

diff --git a/src/main/res/drawable-v26/ic_launcher.xml b/src/main/res/drawable-v26/ic_launcher.xml
index 8e155dd8b..a9070e741 100644
--- a/src/main/res/drawable-v26/ic_launcher.xml
+++ b/src/main/res/drawable-v26/ic_launcher.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background" />
-    <foreground>
-        <inset
-            android:inset="20dp"
-            android:drawable="@drawable/ic_logo_color_24dp" />
-    </foreground>
-    <monochrome>
-        <inset
-            android:inset="20dp"
-            android:drawable="@drawable/ic_logo_24dp" />
-    </monochrome>
+    <foreground android:drawable="@drawable/ic_logo_color_108dp" />
+    <monochrome android:drawable="@drawable/ic_logo_color_108dp" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/src/main/res/drawable/ic_logo_108dp.xml b/src/main/res/drawable/ic_logo_108dp.xml
new file mode 100644
index 000000000..f60bc83a5
--- /dev/null
+++ b/src/main/res/drawable/ic_logo_108dp.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <group
+        android:scaleX="0.56"
+        android:scaleY="0.56"
+        android:translateX="22"
+        android:translateY="24">
+        <path
+            android:fillColor="#FFFFFF"
+            android:pathData="M82.489,12.834C83.196,10.418 82.043,9.556 79.926,10.917L10.087,55.828c-2.117,1.361 -1.795,2.628 0.714,2.815L39.806,60.807c2.51,0.188 5.291,2.267 6.18,4.621l10.282,27.208c0.89,2.354 2.195,2.304 2.902,-0.111z" />
+    </group>
+</vector>
diff --git a/src/main/res/drawable/ic_logo_color_108dp.xml b/src/main/res/drawable/ic_logo_color_108dp.xml
new file mode 100644
index 000000000..9675ca16f
--- /dev/null
+++ b/src/main/res/drawable/ic_logo_color_108dp.xml
@@ -0,0 +1,33 @@
+<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.56"
+        android:scaleY="0.56"
+        android:translateX="22"
+        android:translateY="24">
+        <path
+            android:pathData="M85.133,20.59C85.731,18.546 84.756,17.817 82.965,18.968L23.874,56.967c-1.791,1.152 -1.519,2.224 0.604,2.382L49.019,61.18c2.124,0.159 4.477,1.918 5.229,3.91l8.7,23.021c0.753,1.992 1.857,1.949 2.455,-0.094z"
+            android:strokeWidth="1"
+            android:strokeColor="#f69123">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:endX="84.4913"
+                    android:endY="19.211866"
+                    android:startX="38.773293"
+                    android:startY="80.33152"
+                    android:type="linear">
+                    <item
+                        android:color="#FFFBB22F"
+                        android:offset="0" />
+                    <item
+                        android:color="#FFF58820"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+        </path>
+    </group>
+</vector>
diff --git a/src/main/res/drawable/ic_logo_color_splashscreen.xml b/src/main/res/drawable/ic_logo_color_splashscreen.xml
deleted file mode 100644
index c377f4ff2..000000000
--- a/src/main/res/drawable/ic_logo_color_splashscreen.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="100"
-    android:viewportHeight="100">
-
-    <group
-        android:name="rotationGroup"
-        android:pivotX="50"
-        android:pivotY="50"
-        android:scaleX="0.6"
-        android:scaleY="0.6"
-        >
-        <path android:pathData="M82.489,12.834C83.196,10.418 82.043,9.556 79.926,10.917L10.087,55.828c-2.117,1.361 -1.795,2.628 0.714,2.815L39.806,60.807c2.51,0.188 5.291,2.267 6.18,4.621l10.282,27.208c0.89,2.354 2.195,2.304 2.902,-0.111z">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:endX="70.0"
-                    android:endY="30.0"
-                    android:startX="7.0"
-                    android:startY="83.0"
-                    android:type="linear">
-                    <item
-                        android:color="#FFFBB22F"
-                        android:offset="0" />
-                    <item
-                        android:color="#FFFF6D00"
-                        android:offset="1" />
-                </gradient>
-            </aapt:attr>
-        </path>
-    </group>
-</vector>
diff --git a/src/main/res/values-night/styles_theme.xml b/src/main/res/values-night/styles_theme.xml
index deefc5893..60c395697 100644
--- a/src/main/res/values-night/styles_theme.xml
+++ b/src/main/res/values-night/styles_theme.xml
@@ -23,7 +23,7 @@
     <style name="SplashTheme" parent="Theme.SplashScreen">
         <item name="windowSplashScreenBackground">@color/splashscreen_background</item>
 
-        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_logo_color_splashscreen</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_logo_color_108dp</item>
         <item name="postSplashScreenTheme">@style/OpenTracksTheme</item>
     </style>
 
diff --git a/src/main/res/values/styles_theme.xml b/src/main/res/values/styles_theme.xml
index 369532ab6..993669e1e 100644
--- a/src/main/res/values/styles_theme.xml
+++ b/src/main/res/values/styles_theme.xml
@@ -27,7 +27,7 @@
     </style>
 
     <style name="SplashTheme" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_logo_color_splashscreen</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_logo_color_108dp</item>
         <item name="postSplashScreenTheme">@style/OpenTracksTheme</item>
     </style>