From 1dff1c3fe833f5b690ad6324914f5dff7813fb11 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Tue, 19 Jul 2022 00:23:57 -0400
Subject: [PATCH] Android: Add Androidx splash screen to wait for directory
 initialization

---
 Source/Android/app/build.gradle               |   1 +
 .../Android/app/src/main/AndroidManifest.xml  |   6 +++---
 .../dolphinemu/ui/main/MainActivity.java      |   5 +++++
 .../src/main/res/drawable-hdpi/ic_dolphin.png | Bin 2037 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_dolphin.png    | Bin 2692 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_dolphin.png   | Bin 4122 -> 0 bytes
 .../app/src/main/res/drawable/ic_dolphin.xml  |  20 ++++++++++++++++++
 .../app/src/main/res/values-night/colors.xml  |   2 ++
 .../app/src/main/res/values/colors.xml        |   2 ++
 .../app/src/main/res/values/themes.xml        |   6 ++++++
 10 files changed, 39 insertions(+), 3 deletions(-)
 delete mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_dolphin.png
 delete mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_dolphin.png
 delete mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_dolphin.png
 create mode 100644 Source/Android/app/src/main/res/drawable/ic_dolphin.xml

diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle
index 72779c3fb5..525c7be0fd 100644
--- a/Source/Android/app/build.gradle
+++ b/Source/Android/app/build.gradle
@@ -103,6 +103,7 @@ dependencies {
     implementation 'androidx.fragment:fragment:1.4.1'
     implementation 'androidx.slidingpanelayout:slidingpanelayout:1.2.0'
     implementation 'com.google.android.material:material:1.6.0'
+    implementation 'androidx.core:core-splashscreen:1.0.0'
 
     // Android TV UI libraries.
     implementation 'androidx.leanback:leanback:1.0.0'
diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
index 78bd53c35f..e1352b47c2 100644
--- a/Source/Android/app/src/main/AndroidManifest.xml
+++ b/Source/Android/app/src/main/AndroidManifest.xml
@@ -49,13 +49,13 @@
         <activity
             android:name=".ui.main.MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.Dolphin.Main">
+            android:theme="@style/Theme.Dolphin.Splash">
 
             <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
index 1224fa0397..c0238617f9 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
@@ -14,6 +14,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.splashscreen.SplashScreen;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.viewpager.widget.ViewPager;
 
@@ -55,6 +56,10 @@ public final class MainActivity extends AppCompatActivity
   @Override
   protected void onCreate(Bundle savedInstanceState)
   {
+    SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
+    splashScreen.setKeepOnScreenCondition(
+            () -> !DirectoryInitialization.areDolphinDirectoriesReady());
+
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_main);
 
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_dolphin.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_dolphin.png
deleted file mode 100644
index e50a86dac11e7aa333882860ded133bc4bcfe012..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2037
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
TqiGX%00000NkvXXu0mjfJv86;

diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_dolphin.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_dolphin.png
deleted file mode 100644
index f20aa29c6ab0d5091fa39138ff35888b9abbcdb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2692
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

diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_dolphin.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_dolphin.png
deleted file mode 100644
index c1a05c347bbb763a845007b0fa9d5b8331f4f05a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4122
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
YaQr#T1^3M<6951J07*qoM6N<$f*fu6{Qv*}

diff --git a/Source/Android/app/src/main/res/drawable/ic_dolphin.xml b/Source/Android/app/src/main/res/drawable/ic_dolphin.xml
new file mode 100644
index 0000000000..1cc88d50f5
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/ic_dolphin.xml
@@ -0,0 +1,20 @@
+<vector android:height="192dp" android:viewportHeight="500"
+    android:viewportWidth="500" android:width="192dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#0057AB" android:fillType="nonZero"
+        android:pathData="M362.51,306.61C361.76,304.1 357.09,288.95 349.22,274.43C338.85,255.3 329.93,241.62 315.07,227.73C310.29,223.26 305.77,219.27 301.05,215.68L301.06,215.68C301.06,215.68 301.02,215.66 300.96,215.61C300.87,215.54 300.78,215.47 300.69,215.41C298.93,214.05 291.52,207.81 294.16,200.91C295.04,198.6 297.18,196.68 299.71,195.13L313.36,195.02L313.36,189.96L313.36,189.96C313.36,189.96 313.36,189.96 313.36,189.96C313.36,189.96 305.37,187.24 291.38,188.14C278.26,188.98 266.46,196.66 264.26,197.74C257.19,195.71 249.12,193.93 239.69,192.33C207.06,186.79 179.45,195.62 165.59,205.24C147.43,217.84 147.93,229.59 146.44,235.46C145.51,239.1 137.26,245.83 137.36,250.55L137.36,255.52L139.07,257.28L145.49,255.09L146.26,252.41C148.9,251.47 151.79,250.15 154.42,249.07C160.98,246.38 161.48,244.91 179.41,242.24C187.65,241.01 196.33,240.65 202.79,240.6C205.3,245.91 211.55,256.82 222.38,262.05C229.43,265.46 237.32,267.2 243.6,268.09L242.78,272.24L255.28,274.09L255.28,269.03L255.27,269.03C255.27,269.03 255.27,269.03 255.27,269.03C255.27,269.03 244.78,264.67 238.32,258.21C233.92,253.82 232.87,247.14 232.65,243.32L232.69,243.33C243.27,245.34 252.51,246.79 274.61,255.25C278.7,256.82 282.52,258.54 285.99,260.27L285.34,260.64L295.3,268.67L307.2,278.52L307.2,273.46L307.16,273.43C306.98,273.21 293.43,256.42 270.66,245.19C251.84,235.91 236.38,231.32 214.97,230.28C191.57,229.15 174.33,232.15 174.33,232.15C174.33,232.15 174.81,221.75 192.48,213.46C207.84,206.26 232.01,205.05 259.75,212.13C298.94,222.13 312.3,239.15 329.16,256.74C339.85,267.9 349.69,283.61 355.88,294.47L354.84,294L358.05,302.3L362.64,312.1L362.64,307.01L362.51,306.61z"
+        android:strokeColor="#00000000" android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" android:strokeWidth="0.11"/>
+    <path android:fillType="nonZero"
+        android:pathData="M349.22,279.48C338.85,260.35 329.93,246.67 315.08,232.78C310.3,228.31 305.77,224.32 301.06,220.73L301.06,220.73C301.06,220.73 301.02,220.71 300.96,220.66C300.87,220.59 300.79,220.53 300.7,220.46C298.95,219.11 291.53,212.86 294.16,205.97C297.06,198.4 313.36,195.01 313.36,195.01C313.36,195.01 305.37,192.3 291.39,193.19C278.26,194.04 266.47,201.71 264.26,202.79C257.19,200.77 249.13,198.98 239.69,197.38C207.07,191.85 179.45,200.67 165.6,210.29C147.44,222.89 147.94,234.64 146.44,240.51C145.36,244.74 134.41,253.14 138.13,257.71C140.46,260.57 148.19,256.69 154.42,254.13C160.98,251.43 161.49,249.96 179.41,247.29C187.65,246.06 196.33,245.7 202.79,245.65C205.31,250.96 211.56,261.87 222.39,267.1C237.01,274.17 255.28,274.08 255.28,274.08C255.28,274.08 244.78,269.72 238.32,263.26C233.93,258.87 232.87,252.19 232.65,248.38L232.69,248.38C243.27,250.39 252.51,251.84 274.62,260.31C293.96,267.71 307.17,278.48 307.17,278.48C307.17,278.48 293.59,261.55 270.66,250.24C251.84,240.96 236.39,236.37 214.98,235.33C191.57,234.2 174.33,237.2 174.33,237.2C174.33,237.2 174.81,226.8 192.48,218.52C207.84,211.31 232.01,210.1 259.75,217.18C298.94,227.18 312.31,244.2 329.16,261.79C347.1,280.52 362.62,312.03 362.62,312.03C362.62,312.03 357.84,295.38 349.22,279.48z"
+        android:strokeColor="#00000000" android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" android:strokeWidth="0.11">
+        <aapt:attr name="android:fillColor">
+            <gradient android:endX="137.36" android:endY="312.04"
+                android:startX="137.36" android:startY="193.02" android:type="linear">
+                <item android:color="#FF46D4FF" android:offset="0"/>
+                <item android:color="#FF1792FF" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
diff --git a/Source/Android/app/src/main/res/values-night/colors.xml b/Source/Android/app/src/main/res/values-night/colors.xml
index 8db7ef7bc5..d792ba7d42 100644
--- a/Source/Android/app/src/main/res/values-night/colors.xml
+++ b/Source/Android/app/src/main/res/values-night/colors.xml
@@ -4,6 +4,8 @@
     <color name="dolphin_blue_secondary">#2196f3</color>
     <color name="dolphin_white">#FFFFFF</color>
 
+    <color name="dolphin_surface">#1A1C1E</color>
+
     <color name="tv_card_unselected">#444444</color>
 
     <color name="invalid_setting_overlay">#36ff0000</color>
diff --git a/Source/Android/app/src/main/res/values/colors.xml b/Source/Android/app/src/main/res/values/colors.xml
index 46bb372e2c..e6dc65f906 100644
--- a/Source/Android/app/src/main/res/values/colors.xml
+++ b/Source/Android/app/src/main/res/values/colors.xml
@@ -4,6 +4,8 @@
     <color name="dolphin_blue_secondary">#21b0f3</color>
     <color name="dolphin_white">#ffffff</color>
 
+    <color name="dolphin_surface">#FDFCFF</color>
+
     <color name="tv_card_unselected">#444444</color>
 
     <color name="invalid_setting_overlay">#36ff0000</color>
diff --git a/Source/Android/app/src/main/res/values/themes.xml b/Source/Android/app/src/main/res/values/themes.xml
index 110242a302..5b9dd6859d 100644
--- a/Source/Android/app/src/main/res/values/themes.xml
+++ b/Source/Android/app/src/main/res/values/themes.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <style name="Theme.Dolphin.Splash" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/dolphin_surface</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_dolphin</item>
+        <item name="postSplashScreenTheme">@style/Theme.Dolphin.Main</item>
+    </style>
+
     <!-- Base theme -->
     <style name="Theme.Dolphin.Main" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorSurface">@color/dolphin_blue</item>