From ac29e28eda115ce22db514a445b1c192da77e1b6 Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Tue, 27 Jun 2023 21:49:05 +0200
Subject: [PATCH] Fix "Missing app icon in splash screen"

> Your app does not show a 48x48dp app icon on a black background during app startup. For more information, see Branded launch.
---
 app-wear/build.gradle.kts                     |  2 +
 .../src/main/res/drawable/splash_graphic.xml  | 44 -------------------
 .../src/main/res/drawable/splash_graphic2.xml | 42 ------------------
 .../src/main/res/drawable/splash_screen.xml   | 10 ++---
 app-wear/src/main/res/values/themes.xml       |  5 ++-
 app/build.gradle.kts                          |  2 +
 buildSrc/src/main/java/Dependencies.kt        |  2 -
 7 files changed, 11 insertions(+), 96 deletions(-)
 delete mode 100644 app-wear/src/main/res/drawable/splash_graphic.xml
 delete mode 100644 app-wear/src/main/res/drawable/splash_graphic2.xml

diff --git a/app-wear/build.gradle.kts b/app-wear/build.gradle.kts
index 039b27d7..672a39d3 100644
--- a/app-wear/build.gradle.kts
+++ b/app-wear/build.gradle.kts
@@ -133,6 +133,8 @@ dependencies {
     addBaseAndroid()
     addBaseAndroidUi()
 
+    implementation("androidx.core:core-splashscreen:1.0.1")
+
     addNavigation()
 
     addTesting()
diff --git a/app-wear/src/main/res/drawable/splash_graphic.xml b/app-wear/src/main/res/drawable/splash_graphic.xml
deleted file mode 100644
index 5137ec19..00000000
--- a/app-wear/src/main/res/drawable/splash_graphic.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-  <path
-      android:pathData="M400.08,358.82l-220.33,59a58.52,58.52 0,0 1,-71.68 -41.38l-5,-18.53a171.22,171.22 0,0 1,24.44 -141.76l-23.43,-23.5a25,25 0,0 1,0 -35.35l0.82,-0.82a24.87,24.87 0,0 1,35.24 0l22.27,22.34a170.85,170.85 0,0 1,62 -31.09l0.48,-0.13a172.54,172.54 0,0 1,71.4 -3.89l8.63,-31.85a25.14,25.14 0,0 1,30.7 -17.66l1.13,0.29A24.8,24.8 0,0 1,354.42 125l-9.23,34.07a172.66,172.66 0,0 1,91.7 111l4.58,17.08A58.54,58.54 0,0 1,400.08 358.82Z"
-      android:fillColor="#41eb8e"
-      android:fillType="evenOdd" />
-  <path
-      android:pathData="M279.56,314.16c-13.7,-8 -31.7,-7.91 -45.66,-0.68L212,351.37c0.68,15.16 9.41,30.14 24.29,38.79a49.92,49.92 0,0 0,14.87 5.76l-20.81,36.44a8.28,8.28 0,0 0,3 11.33l12.8,7.44a8.26,8.26 0,0 0,11.31 -3l41.73,-72.75h0C310.82,354.32 306.77,330 279.56,314.16ZM247.67,347.24a6,6 0,1 1,-2.16 -8.26A6,6 0,0 1,247.67 347.24Z"
-      android:fillColor="#fff"
-      android:fillType="evenOdd" />
-  <path
-      android:pathData="M300.66,214.18a27.95,27.95 0,1 1,-19.8 34.24A28,28 0,0 1,300.66 214.18Z"
-      android:fillColor="#26845c"
-      android:fillType="evenOdd" />
-  <path
-      android:pathData="M194.53,242.62a27.95,27.95 0,1 1,-19.8 34.24A28,28 0,0 1,194.53 242.62Z"
-      android:fillColor="#26845c"
-      android:fillType="evenOdd" />
-  <path
-      android:pathData="M149.79,318.88l-36.3,-21.21a50.22,50.22 0,0 0,10 -12.43c8.56,-14.94 8.61,-32.3 1.59,-45.79l-38,-21.9c-15.72,0.7 -31.35,9.65 -39.22,23.41 -15.64,27.32 -6.94,50.45 13.74,62.85h0l72.64,42.25a8.26,8.26 0,0 0,11.31 -3l7.36,-12.85A8.31,8.31 0,0 0,149.79 318.88ZM100.3,251.53A6.06,6.06 0,1 1,98 243.28,6.07 6.07,0 0,1 100.3,251.53Z"
-      android:fillColor="#fff"
-      android:fillType="evenOdd" />
-  <path
-      android:pathData="M187.92,204.08a29.52,29.52 0,0 1,-38.6 -15.52A29.15,29.15 0,0 1,165 150.28a30.38,30.38 0,0 1,4.68 -1.52l-16.36,-38.48L148.6,99.07l-4.77,-11.21 40,-16.75 9.54,22.42L176,100.79l27.58,64.87 0.14,0.34a28.56,28.56 0,0 1,1.24 3.65A29.16,29.16 0,0 1,187.92 204.08Z"
-      android:fillColor="#ffda3e"
-      android:fillType="evenOdd" />
-  <path
-      android:pathData="M259.45,46l-0.77,13.75 -10.63,-0.57L245.84,99l-0.13,2.29h-0.16A16.6,16.6 0,1 1,232.87 82l1.32,-23.6h0l0.39,-6.87 0.38,-6.88Z"
-      android:fillColor="#ffcf3b"
-      android:fillType="evenOdd" />
-  <path
-      android:pathData="M205.22,169.54l-0.26,0.11a28.56,28.56 0,0 0,-1.24 -3.65Z"
-      android:fillColor="#e7b720"
-      android:fillType="evenOdd" />
-  <path
-      android:pathData="M95.05,247.69m-7.01,0a7.01,7.01 0,1 1,14.02 0a7.01,7.01 0,1 1,-14.02 0"
-      android:fillColor="#231f20" />
-  <path
-      android:pathData="M242.42,343.4m-7.01,0a7.01,7.01 0,1 1,14.02 0a7.01,7.01 0,1 1,-14.02 0"
-      android:fillColor="#231f20" />
-</vector>
diff --git a/app-wear/src/main/res/drawable/splash_graphic2.xml b/app-wear/src/main/res/drawable/splash_graphic2.xml
deleted file mode 100644
index 7bbe7036..00000000
--- a/app-wear/src/main/res/drawable/splash_graphic2.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-    <path
-        android:pathData="m256,13c134.21,0 243,108.79 243,243c0,134.21 -108.79,243 -243,243c-134.21,0 -243,-108.79 -243,-243c0,-134.21 108.79,-243 243,-243z"
-        android:fillColor="#3f7aff" />
-    <path
-        android:pathData="m404.3,630.55l-93.18,24.97c-59.46,15.93 -120.58,-19.35 -136.51,-78.82l-18.52,-69.12c-6.81,-25.42 8.28,-51.56 33.7,-58.37l216.44,-58c25.42,-6.81 51.56,8.28 58.37,33.7l18.52,69.12c15.93,59.46 -19.35,120.58 -78.82,136.51zM255.69,692.33l-1.04,-0.28c-12.36,-3.27 -19.67,-15.89 -16.33,-28.19l13.54,-49.96c3.33,-12.3 16.05,-19.62 28.41,-16.35l1.04,0.28c12.36,3.27 19.67,15.89 16.33,28.19l-13.54,49.96c-3.33,12.3 -16.05,19.62 -28.41,16.35zM436.6,634.7l-36.62,-36.73c-9.01,-9.04 -9.03,-23.69 -0.04,-32.71l0.76,-0.76c9,-9.02 23.6,-9.01 32.61,0.04l36.62,36.73c9.01,9.04 9.03,23.69 0.04,32.71l-0.76,0.76c-9,9.02 -23.6,9.01 -32.61,-0.04z"
-        android:fillColor="#41eb8e" />
-    <path
-        android:pathData="m229.33,167.8c88.82,-23.8 180.11,28.91 203.91,117.73l1.04,3.87c10.01,37.34 -12.15,75.73 -49.5,85.73l-186.4,49.95c-37.34,10.01 -75.73,-12.15 -85.73,-49.5l-1.04,-3.87c-23.8,-88.82 28.91,-180.11 117.73,-203.91zM335.69,116.4l1.09,0.29c12.88,3.41 20.51,16.57 17.03,29.39l-14.12,52.08c-3.48,12.82 -16.74,20.45 -29.62,17.04l-1.09,-0.29c-12.88,-3.41 -20.51,-16.57 -17.03,-29.39l14.12,-52.08c3.48,-12.82 16.74,-20.45 29.62,-17.04zM147.08,176.49l38.17,38.29c9.4,9.43 9.41,24.7 0.04,34.1l-0.79,0.79c-9.38,9.41 -24.6,9.39 -34,-0.04l-38.17,-38.29c-9.4,-9.43 -9.41,-24.7 -0.04,-34.1l0.79,-0.79c9.38,-9.41 24.6,-9.39 34,0.04z"
-        android:fillColor="#41eb8e" />
-    <path
-        android:pathData="m171.1,170.45c14.47,-6.06 31.14,0.64 37.24,14.97c6.09,14.33 -0.7,30.87 -15.17,36.93c-14.47,6.06 -31.14,-0.64 -37.24,-14.97c-6.09,-14.33 0.7,-30.87 15.17,-36.93zM155.24,121.04l21.83,-9.15l32.8,77.13l-21.83,9.15l-32.8,-77.13zM159.84,131.85l-9.2,-21.63l38.57,-16.16l9.2,21.63l-38.57,16.16zM233.88,104.24c8.87,0.47 15.66,7.98 15.17,16.76c-0.49,8.79 -8.07,15.53 -16.94,15.06c-8.87,-0.47 -15.66,-7.98 -15.17,-16.76c0.49,-8.79 8.07,-15.53 16.94,-15.06zM238.18,75.21l13.38,0.71l-2.63,47.3l-13.38,-0.71l2.63,-47.3zM237.81,81.84l0.74,-13.26l23.64,1.25l-0.74,13.26l-23.64,-1.25z"
-        android:fillColor="#ffcf3b" />
-    <path
-        android:pathData="m199.55,259.53c14.4,-3.86 29.2,4.67 33.06,19.06c3.85,14.38 -4.7,29.17 -19.1,33.03c-14.4,3.86 -29.2,-4.67 -33.06,-19.06c-3.85,-14.38 4.7,-29.17 19.1,-33.03z"
-        android:strokeAlpha="0.8"
-        android:fillColor="#1f6a50"
-        android:fillAlpha="0.8" />
-    <path
-        android:pathData="m301.94,232.09c14.4,-3.86 29.2,4.67 33.06,19.06c3.85,14.38 -4.7,29.17 -19.1,33.03c-14.4,3.86 -29.2,-4.67 -33.06,-19.06c-3.85,-14.38 4.7,-29.17 19.1,-33.03z"
-        android:strokeAlpha="0.8"
-        android:fillColor="#1f6a50"
-        android:fillAlpha="0.8" />
-    <path
-        android:pathData="m281.58,328.54c26.25,15.27 30.16,38.74 18.87,59.03l0.01,0.01l-40.26,70.19c-2.22,3.83 -7.1,5.13 -10.91,2.92l-12.35,-7.18c-3.81,-2.21 -5.1,-7.11 -2.88,-10.93l20.08,-35.15c-4.89,-1.04 -9.74,-2.87 -14.34,-5.55c-14.36,-8.35 -22.78,-22.8 -23.43,-37.43l21.17,-36.56c13.47,-6.97 30.83,-7.03 44.05,0.66z"
-        android:fillColor="#f9f9f9"
-        android:fillType="evenOdd" />
-    <path
-        android:pathData="m248.73,352.49c2.77,1.61 3.7,5.18 2.08,7.96c-1.62,2.79 -5.17,3.75 -7.93,2.14c-2.77,-1.61 -3.7,-5.18 -2.08,-7.96c1.62,-2.79 5.17,-3.75 7.93,-2.14z"
-        android:fillColor="#272727" />
-    <path
-        android:pathData="m131.01,300.65c-2.65,4.63 -5.93,8.64 -9.64,11.98l35.02,20.46c3.84,2.21 5.17,7.1 2.98,10.93l-7.1,12.39c-2.19,3.82 -7.08,5.13 -10.91,2.92l-70.08,-40.76l0.01,-0.01c-19.95,-11.96 -28.34,-34.28 -13.25,-60.64c7.6,-13.27 22.66,-21.9 37.83,-22.58l36.67,21.14c6.77,13.02 6.72,29.75 -1.54,44.17z"
-        android:fillColor="#f9f9f9"
-        android:fillType="evenOdd" />
-    <path
-        android:pathData="m106.46,260.17c2.8,1.61 3.78,5.17 2.19,7.95c-1.59,2.78 -5.15,3.72 -7.95,2.11c-2.8,-1.61 -3.78,-5.17 -2.19,-7.95c1.59,-2.78 5.15,-3.72 7.95,-2.11z"
-        android:fillColor="#272727" />
-</vector>
diff --git a/app-wear/src/main/res/drawable/splash_screen.xml b/app-wear/src/main/res/drawable/splash_screen.xml
index 810daa0c..c178ba82 100644
--- a/app-wear/src/main/res/drawable/splash_screen.xml
+++ b/app-wear/src/main/res/drawable/splash_screen.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:bottom="40dp"
-        android:drawable="@drawable/splash_graphic"
-        android:left="40dp"
-        android:right="40dp"
-        android:top="40dp" />
-
+        android:width="48dp"
+        android:height="48dp"
+        android:drawable="@mipmap/ic_launcher"
+        android:gravity="center" />
 </layer-list>
\ No newline at end of file
diff --git a/app-wear/src/main/res/values/themes.xml b/app-wear/src/main/res/values/themes.xml
index 1fbe7094..d64cea3b 100644
--- a/app-wear/src/main/res/values/themes.xml
+++ b/app-wear/src/main/res/values/themes.xml
@@ -29,9 +29,10 @@
         <item name="colorPrimaryInverse">@color/md_theme_dark_primaryInverse</item>
     </style>
 
-    <style name="AppThemeSplash" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenBackground">#3f7aff</item>
+    <style name="AppThemeSplash" parent="Theme.SplashScreen.IconBackground">
+        <item name="windowSplashScreenBackground">#000000</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/splash_screen</item>
+        <item name="windowSplashScreenIconBackgroundColor">#000000</item>
         <item name="postSplashScreenTheme">@style/AppTheme</item>
     </style>
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5d3271f0..ef23b25e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -141,6 +141,8 @@ dependencies {
     addBaseAndroid()
     addBaseAndroidUi()
 
+    implementation("androidx.core:core-splashscreen:1.0.0-alpha02")
+
     addNavigation()
     addBaseWorkManager()
 
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index d8322a1c..41ee77c0 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -107,8 +107,6 @@ fun DependencyHandlerScope.addBaseAndroidUi() {
     implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVers")
     implementation("androidx.lifecycle:lifecycle-process:$lifecycleVers")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVers")
-
-    implementation("androidx.core:core-splashscreen:1.0.0-alpha02")
 }
 
 fun DependencyHandlerScope.addTesting(junit: Boolean = true, instrumentation: Boolean = true) {