From be90dd815728e3406c2b1982a7bd3d7bf4be90ed Mon Sep 17 00:00:00 2001
From: Mike Scamell <mscamell@duckduckgo.com>
Date: Fri, 9 Aug 2024 15:13:31 +0100
Subject: [PATCH 1/4] Add splashscreen compat dependency

---
 common/common-ui/build.gradle | 1 +
 versions.properties           | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/common/common-ui/build.gradle b/common/common-ui/build.gradle
index 9e9c93a111a4..bf36030e672c 100644
--- a/common/common-ui/build.gradle
+++ b/common/common-ui/build.gradle
@@ -46,6 +46,7 @@ dependencies {
     implementation AndroidX.appCompat
     implementation Google.android.material
     implementation AndroidX.constraintLayout
+    implementation AndroidX.core.splashscreen
     implementation AndroidX.recyclerView
     implementation AndroidX.lifecycle.viewModelKtx
     // just to get the dagger annotations
diff --git a/versions.properties b/versions.properties
index a14655bf0d7b..e92796a4e0d6 100644
--- a/versions.properties
+++ b/versions.properties
@@ -19,6 +19,8 @@ version.androidx.constraintlayout=2.1.4
 
 version.androidx.biometric=1.1.0
 
+version.androidx.core-splashscreen=1.0.1
+
 version.androidx.datastore=1.1.1
 
 version.androidx.localbroadcastmanager=1.1.0

From ce9a57cab43f0bea395bd7dfad474c408f63fcaa Mon Sep 17 00:00:00 2001
From: Mike Scamell <mscamell@duckduckgo.com>
Date: Fri, 9 Aug 2024 15:40:39 +0100
Subject: [PATCH 2/4] Remove splashscreen styles in v31 files

The compat library will take care of this for us so we put everything in the root values files which is the next commit.
---
 .../design-system-theming.xml                 | 23 ---------------
 .../res/values-v31/design-system-theming.xml  | 28 -------------------
 2 files changed, 51 deletions(-)
 delete mode 100644 common/common-ui/src/main/res/values-night-v31/design-system-theming.xml
 delete mode 100644 common/common-ui/src/main/res/values-v31/design-system-theming.xml

diff --git a/common/common-ui/src/main/res/values-night-v31/design-system-theming.xml b/common/common-ui/src/main/res/values-night-v31/design-system-theming.xml
deleted file mode 100644
index ccb65956918b..000000000000
--- a/common/common-ui/src/main/res/values-night-v31/design-system-theming.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2021 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-    <style name="Theme.DuckDuckGo.SplashScreen" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="android:windowSplashScreenBackground">@color/black</item>
-        <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_dax_splash_screen_icon</item>
-        <item name="android:windowSplashScreenAnimationDuration">800</item>
-    </style>
-</resources>
diff --git a/common/common-ui/src/main/res/values-v31/design-system-theming.xml b/common/common-ui/src/main/res/values-v31/design-system-theming.xml
deleted file mode 100644
index 09fbc2b87231..000000000000
--- a/common/common-ui/src/main/res/values-v31/design-system-theming.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2021 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-    <style name="Theme.DuckDuckGo.SplashScreen" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="android:statusBarColor">?attr/colorSurface</item>
-        <item name="android:navigationBarColor">?android:attr/colorBackground</item>
-        <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:navigationBarDividerColor">?attr/colorControlHighlight</item>
-
-        <item name="android:windowSplashScreenBackground">@color/whiteFive</item>
-        <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_dax_splash_screen_icon</item>
-        <item name="android:windowSplashScreenAnimationDuration">800</item>
-    </style>
-</resources>

From bb32f4bb9874f45e00be47bb738cdca99bdd55fd Mon Sep 17 00:00:00 2001
From: Mike Scamell <mscamell@duckduckgo.com>
Date: Fri, 9 Aug 2024 15:43:35 +0100
Subject: [PATCH 3/4] Add new splashscreen style

As we're not inheriting from any theme we'll need to set the colors for the status bar and navigation bar in the splash style. I'm using what I found on the light and dark themes.
---
 .../main/res/values-night/design-system-theming.xml |  9 ++++++++-
 .../src/main/res/values/design-system-theming.xml   | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/common/common-ui/src/main/res/values-night/design-system-theming.xml b/common/common-ui/src/main/res/values-night/design-system-theming.xml
index 5be4428aeddb..4350821f20d8 100644
--- a/common/common-ui/src/main/res/values-night/design-system-theming.xml
+++ b/common/common-ui/src/main/res/values-night/design-system-theming.xml
@@ -15,5 +15,12 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="Theme.DuckDuckGo.SplashScreen" parent="Theme.DuckDuckGo.Dark" />
+    <style name="Theme.DuckDuckGo.SplashScreen" parent="Theme.DuckDuckGo.Splash">
+        <item name="android:statusBarColor">@color/black</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:navigationBarColor">@color/black</item>
+
+        <item name="windowSplashScreenBackground">@color/black</item>
+        <item name="postSplashScreenTheme">@style/Theme.DuckDuckGo.Dark</item>
+    </style>
 </resources>
diff --git a/common/common-ui/src/main/res/values/design-system-theming.xml b/common/common-ui/src/main/res/values/design-system-theming.xml
index de8a74c80137..766b83126357 100644
--- a/common/common-ui/src/main/res/values/design-system-theming.xml
+++ b/common/common-ui/src/main/res/values/design-system-theming.xml
@@ -296,7 +296,18 @@
         <item name="daxColorPrimaryIcon">@color/white</item>
     </style>
 
-    <style name="Theme.DuckDuckGo.SplashScreen" parent="Theme.DuckDuckGo.Light"/>
+    <style name="Theme.DuckDuckGo.SplashScreen" parent="Theme.DuckDuckGo.Splash">
+        <item name="android:statusBarColor">@color/whiteFive</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:navigationBarColor">@color/whiteFive</item>
+
+        <item name="windowSplashScreenBackground">@color/whiteFive</item>
+        <item name="postSplashScreenTheme">@style/Theme.DuckDuckGo.Light</item>
+    </style>
+
+    <style name="Theme.DuckDuckGo.Splash" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_dax_splash_screen_icon</item>
+    </style>
 
     <style name="Theme.AppCompat.Transparent.NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowIsTranslucent">true</item>

From 0b92a5e5160ebadb8f7b687cc2b47d1a0b0a7466 Mon Sep 17 00:00:00 2001
From: Mike Scamell <mscamell@duckduckgo.com>
Date: Fri, 9 Aug 2024 16:07:55 +0100
Subject: [PATCH 4/4] Install splashscreen in LaunchBridgeActivity

We need to install before super.onCreate is called as per docs.

As we use the LaunchBridgeActivity for routing it's best we call setKeepOnScreenCondition which keeps this activity but stops it from rendering.
---
 app/build.gradle                                              | 1 +
 .../java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index b443b1edce6e..bba1b6b3c9d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -388,6 +388,7 @@ dependencies {
 
     // Android KTX
     implementation AndroidX.core.ktx
+    implementation AndroidX.core.splashscreen
     implementation AndroidX.fragment.ktx
 
     // ViewModel and LiveData
diff --git a/app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt b/app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt
index 6d621d25b639..6796c4339c29 100644
--- a/app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt
@@ -17,6 +17,7 @@
 package com.duckduckgo.app.launch
 
 import android.os.Bundle
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.lifecycleScope
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.browser.BrowserActivity
@@ -32,7 +33,10 @@ class LaunchBridgeActivity : DuckDuckGoActivity() {
     private val viewModel: LaunchViewModel by bindViewModel()
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        val splashScreen = installSplashScreen()
         super.onCreate(savedInstanceState)
+        splashScreen.setKeepOnScreenCondition { true }
+
         setContentView(R.layout.activity_launch)
 
         configureObservers()