From a2dbadccd568d34bc2caf478dcecf8d636844498 Mon Sep 17 00:00:00 2001
From: zt64 <nwowens32@gmail.com>
Date: Mon, 4 Jul 2022 18:39:27 -0400
Subject: [PATCH] Fix splash screen

---
 app/src/main/AndroidManifest.xml                |  4 ++--
 .../kotlin/com/aliucord/manager/MainActivity.kt | 17 ++---------------
 app/src/main/res/values/themes.xml              |  7 +------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6544d1a..d6e9325 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,7 +32,6 @@
       android:label="@string/app_name"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
-      android:theme="@style/Theme.AliucordManager.SplashScreen"
       tools:ignore="AllowBackup">
     <service android:name=".installer.service.InstallService" />
     <provider
@@ -47,7 +46,8 @@
 
     <activity
         android:name=".MainActivity"
-        android:exported="true">
+        android:exported="true"
+        android:theme="@style/Theme.AliucordManager.SplashScreen">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt b/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt
index a9c0807..e96abc2 100644
--- a/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt
+++ b/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt
@@ -10,11 +10,9 @@ import android.content.Context
 import android.content.Intent
 import android.os.*
 import android.provider.Settings
-import android.view.animation.AccelerateInterpolator
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.aliucord.manager.preferences.Prefs
@@ -22,24 +20,13 @@ import com.aliucord.manager.preferences.sharedPreferences
 import com.aliucord.manager.ui.component.ManagerScaffold
 import com.aliucord.manager.ui.theme.ManagerTheme
 import com.aliucord.manager.ui.theme.Theme
-import com.google.accompanist.permissions.ExperimentalPermissionsApi
 
 class MainActivity : ComponentActivity() {
-    @OptIn(ExperimentalMaterial3Api::class, ExperimentalPermissionsApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
+        installSplashScreen()
+
         super.onCreate(savedInstanceState)
 
-        installSplashScreen().setOnExitAnimationListener { provider ->
-            provider.view.animate().apply {
-                interpolator = AccelerateInterpolator()
-                duration = 200L
-
-                alpha(0f)
-                withEndAction(provider::remove)
-                start()
-            }
-        }
-
         sharedPreferences = getPreferences(Context.MODE_PRIVATE)
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !Environment.isExternalStorageManager()) {
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index f335776..b2d4a46 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
   <style name="Theme.AliucordManager.SplashScreen" parent="Theme.SplashScreen">
     <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
-    <item name="postSplashScreenTheme">@style/Theme.AliucordManager</item>
-  </style>
-
-  <style name="Theme.AliucordManager" parent="Theme.AppCompat">
-    <item name="colorPrimary">@color/primary</item>
+    <item name="postSplashScreenTheme">@style/Theme.AppCompat.NoActionBar</item>
   </style>
 </resources>