From a2fd43deaba82a95010c767e2ca613d9470d621c Mon Sep 17 00:00:00 2001
From: GPUCode <47210458+GPUCode@users.noreply.github.com>
Date: Fri, 17 Mar 2023 10:34:00 +0200
Subject: [PATCH] Revert "citra_android: Use androidx splash screen (#6355)"
 (#6357)

This reverts commit 27c280534d6ed9cc4c41bba01c5bdcc9bf024235.
---
 src/android/app/build.gradle                                | 1 -
 src/android/app/src/main/AndroidManifest.xml                | 2 +-
 .../main/java/org/citra/citra_emu/ui/main/MainActivity.java | 4 ----
 src/android/app/src/main/res/values/themes.xml              | 6 ------
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle
index 8e665274e..7f4c64e55 100644
--- a/src/android/app/build.gradle
+++ b/src/android/app/build.gradle
@@ -126,7 +126,6 @@ dependencies {
     implementation 'androidx.fragment:fragment:1.5.3'
     implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
     implementation 'com.google.android.material:material:1.6.1'
-    implementation 'androidx.core:core-splashscreen:1.0.0'
 
     // For loading huge screenshots from the disk.
     implementation 'com.squareup.picasso:picasso:2.71828'
diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml
index 6df877dc9..7d35fe910 100644
--- a/src/android/app/src/main/AndroidManifest.xml
+++ b/src/android/app/src/main/AndroidManifest.xml
@@ -44,7 +44,7 @@
 
         <activity
             android:name="org.citra.citra_emu.ui.main.MainActivity"
-            android:theme="@style/Theme.Citra.Splash.Main"
+            android:theme="@style/Theme.Citra.Main"
             android:resizeableActivity="false">
 
             <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java
index 710910887..75e25c4b1 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java
@@ -11,7 +11,6 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.splashscreen.SplashScreen;
 
 import org.citra.citra_emu.NativeLibrary;
 import org.citra.citra_emu.R;
@@ -49,9 +48,6 @@ public final class MainActivity extends AppCompatActivity implements MainView {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
-        splashScreen.setKeepOnScreenCondition(() -> !DirectoryInitialization.areCitraDirectoriesReady());
-
         ThemeUtil.applyTheme(this);
 
         super.onCreate(savedInstanceState);
diff --git a/src/android/app/src/main/res/values/themes.xml b/src/android/app/src/main/res/values/themes.xml
index e74e37030..edff173fe 100644
--- a/src/android/app/src/main/res/values/themes.xml
+++ b/src/android/app/src/main/res/values/themes.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.Citra.Splash.Main" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenBackground">@color/citra_surface</item>
-        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_citra</item>
-        <item name="postSplashScreenTheme">@style/Theme.Citra.Main</item>
-    </style>
-
     <style name="Theme.Citra.Main" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Main theme colors -->
         <item name="colorPrimary">@color/citra_primary</item>