From 9d6a1fb1ba13ff2e03a24d05d9f53a856e1b1e57 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Thu, 19 Dec 2024 18:37:16 +0000
Subject: [PATCH] fix splash light/dark implementation

---
 .../main/java/app/organicmaps/SplashActivity.java    | 10 ----------
 android/app/src/main/res/drawable/splash.xml         |  6 ------
 android/app/src/main/res/layout/activity_splash.xml  |  5 +++--
 android/app/src/main/res/values-night/themes.xml     | 12 ++++++++++++
 android/app/src/main/res/values/themes.xml           |  9 +--------
 5 files changed, 16 insertions(+), 26 deletions(-)
 delete mode 100644 android/app/src/main/res/drawable/splash.xml
 create mode 100644 android/app/src/main/res/values-night/themes.xml

diff --git a/android/app/src/main/java/app/organicmaps/SplashActivity.java b/android/app/src/main/java/app/organicmaps/SplashActivity.java
index 5f5fe41458..464842cc99 100644
--- a/android/app/src/main/java/app/organicmaps/SplashActivity.java
+++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java
@@ -61,16 +61,6 @@ public class SplashActivity extends AppCompatActivity
   {
     super.onCreate(savedInstanceState);
 
-    final Context context = getApplicationContext();
-    final String theme = Config.getUiThemeSettings(context);
-    //Need to change this to use android theme system instead of manually setting
-//    if (ThemeUtils.isDefaultTheme(context, theme))
-//      setTheme(R.style.MwmTheme_Splash);
-//    else if (ThemeUtils.isNightTheme(context, theme))
-//      setTheme(R.style.MwmTheme_Night_Splash);
-//    else
-//      throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
-
     UiThread.cancelDelayedTasks(mInitCoreDelayedTask);
     setContentView(R.layout.activity_splash);
     mPermissionRequest = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(),
diff --git a/android/app/src/main/res/drawable/splash.xml b/android/app/src/main/res/drawable/splash.xml
deleted file mode 100644
index 13c05b365f..0000000000
--- a/android/app/src/main/res/drawable/splash.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-            android:opacity="opaque">
-  <item android:drawable="?attr/colorPrimary"/>
-  <item android:drawable="@drawable/ic_splash" android:gravity="center"/>
-</layer-list>
diff --git a/android/app/src/main/res/layout/activity_splash.xml b/android/app/src/main/res/layout/activity_splash.xml
index 94da3281a2..e43bf0ab82 100644
--- a/android/app/src/main/res/layout/activity_splash.xml
+++ b/android/app/src/main/res/layout/activity_splash.xml
@@ -5,14 +5,15 @@
   android:layout_height="match_parent"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:orientation="vertical"
-  android:gravity="center">
+  android:gravity="center"
+  android:theme="@style/MwmTheme.Splash">
 
   <ImageView
       android:id="@+id/iv__logo"
       android:layout_width="wrap_content"
       android:layout_height="0dp"
       android:contentDescription="@null"
-      app:srcCompat="@drawable/splash"
+      app:srcCompat="@drawable/ic_splash"
       android:layout_weight="1000"
       android:layout_margin="@dimen/margin_double"/>
 
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000000..8a17b3f3a5
--- /dev/null
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <style name="MwmTheme" parent="MwmTheme.Base"/>
+  <style name="MwmTheme.Night" parent="MwmTheme.Night.Base"/>
+
+  <style name="MwmTheme.Splash">
+    <item name="android:background">@color/bg_primary_night</item>
+    <item name="android:textColorPrimary">@color/white_primary</item>
+    <item name="android:navigationBarColor">@color/bg_primary_night</item>
+    <item name="android:statusBarColor">@color/bg_primary_night</item>
+  </style>
+</resources>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 47a97a0165..3051d68bad 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -4,19 +4,12 @@
   <style name="MwmTheme.Night" parent="MwmTheme.Night.Base"/>
 
   <style name="MwmTheme.Splash">
-    <item name="android:windowBackground">@color/bg_primary</item>
+    <item name="android:background">@color/bg_primary</item>
     <item name="android:textColorPrimary">@color/white_primary</item>
     <item name="android:navigationBarColor">@color/bg_primary</item>
     <item name="android:statusBarColor">@color/bg_primary</item>
   </style>
 
-  <style name="MwmTheme.Night.Splash">
-    <item name="android:windowBackground">@color/bg_primary_night</item>
-    <item name="android:textColorPrimary">@color/white_primary</item>
-    <item name="android:navigationBarColor">@color/bg_primary_night</item>
-    <item name="android:statusBarColor">@color/bg_primary_night</item>
-  </style>
-
   <!-- Theme is overridden in v27 folder to handle cutouts -->
   <style name="MwmTheme.MainActivity">
     <item name="android:colorPrimaryDark">@android:color/black</item>