remove SplashActivity and properly configure androidx splashscreen in MainActivity.

The final theme is set manually in BaseActivity.onCreate() so no need to specify it in SplashTheme.

app/src/main/AndroidManifest.xml

@@ -21,22 +21,6 @@
         android:localeConfig="@xml/locales_config"
         android:enableOnBackInvokedCallback="true">
 
-        <activity
-            android:name=".SplashActivity"
-            android:theme="@style/SplashTheme"
-            android:exported="true">
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/share_shortcuts" />
-
-        </activity>
         <activity
             android:name=".components.login.LoginActivity"
             android:windowSoftInputMode="adjustResize"
@@ -56,8 +40,14 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|screenLayout|smallestScreenSize"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/SplashTheme">
 
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
@@ -101,6 +91,9 @@
                 <data android:mimeType="audio/*" />
             </intent-filter>
 
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/share_shortcuts" />
             <meta-data
                 android:name="android.service.chooser.chooser_target_service"
                 android:value="androidx.sharetarget.ChooserTargetServiceCompat" />

app/src/main/java/com/keylesspalace/tusky/BaseActivity.java

@@ -92,6 +92,8 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
         Log.d("activeTheme", theme);
         if (ThemeUtils.isBlack(getResources().getConfiguration(), theme)) {
             setTheme(R.style.TuskyBlackTheme);
+        } else {
+            setTheme(R.style.TuskyTheme);
         }
 
         /* set the taskdescription programmatically, the theme would turn it blue */

app/src/main/java/com/keylesspalace/tusky/MainActivity.kt

@@ -47,6 +47,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.IntentCompat
 import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.GravityCompat
 import androidx.core.view.MenuProvider
 import androidx.core.view.forEach
@@ -211,6 +212,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
 
     @SuppressLint("RestrictedApi")
     override fun onCreate(savedInstanceState: Bundle?) {
+        installSplashScreen()
         super.onCreate(savedInstanceState)
 
         val activeAccount = accountManager.activeAccount

app/src/main/java/com/keylesspalace/tusky/SplashActivity.kt

@@ -1,46 +0,0 @@
-/* Copyright 2018 Conny Duck
- *
- * This file is a part of Tusky.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Tusky; if not,
- * see <http://www.gnu.org/licenses>. */
-
-package com.keylesspalace.tusky
-
-import android.annotation.SuppressLint
-import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import com.keylesspalace.tusky.components.login.LoginActivity
-import com.keylesspalace.tusky.db.AccountManager
-import com.keylesspalace.tusky.di.Injectable
-import javax.inject.Inject
-
-@SuppressLint("CustomSplashScreen")
-class SplashActivity : AppCompatActivity(), Injectable {
-
-    @Inject
-    lateinit var accountManager: AccountManager
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        /** Determine whether the user is currently logged in, and if so go ahead and load the
-         *  timeline. Otherwise, start the activity_login screen. */
-        val intent = if (accountManager.activeAccount != null) {
-            Intent(this, MainActivity::class.java)
-        } else {
-            LoginActivity.getIntent(this, LoginActivity.MODE_DEFAULT)
-        }
-        startActivity(intent)
-        finish()
-    }
-}

app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt

@@ -21,7 +21,6 @@ import com.keylesspalace.tusky.EditProfileActivity
 import com.keylesspalace.tusky.LicenseActivity
 import com.keylesspalace.tusky.ListsActivity
 import com.keylesspalace.tusky.MainActivity
-import com.keylesspalace.tusky.SplashActivity
 import com.keylesspalace.tusky.StatusListActivity
 import com.keylesspalace.tusky.TabPreferenceActivity
 import com.keylesspalace.tusky.ViewMediaActivity
@@ -124,9 +123,6 @@ abstract class ActivitiesModule {
     @ContributesAndroidInjector
     abstract fun contributesDraftActivity(): DraftsActivity
 
-    @ContributesAndroidInjector
-    abstract fun contributesSplashActivity(): SplashActivity
-
     @ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
     abstract fun contributesTrendingActivity(): TrendingActivity
 

app/src/main/res/values/styles.xml

@@ -33,7 +33,6 @@
     <style name="SplashTheme" parent="Theme.SplashScreen">
         <item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash</item>
         <item name="windowSplashScreenBackground">@color/tusky_grey_20</item>
-        <item name="postSplashScreenTheme">@style/TuskyTheme</item>
     </style>
 
     <style name="TuskyTheme" parent="TuskyBaseTheme" />