diff --git a/CHANGELOG.md b/CHANGELOG.md index 3105399904..804b1bd1e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Since there's a lot of new people coming over, I'll repeat my statement a few re ## Changes - Repositioned cutout options in settings - Splash icon now uses coloured variant of the icon +- Removed deep link for sources, this should be handled by extensions ## Fixes - Fixed splash icon hardcoded to white diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 55f293e811..7663975daa 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -240,10 +240,23 @@ open class MainActivity : BaseActivity() { } } + var skipSplashInstall = false var ready = false override fun onCreate(savedInstanceState: Bundle?) { - val splashScreen = if (savedInstanceState == null) installSplashScreen() else null + if (this !is SearchActivity) skipSplashInstall = intent.action !in listOf(Intent.ACTION_MAIN, Intent.ACTION_VIEW) + skipSplashInstall = intent.extras?.getBoolean(SPLASH_SKIP, false) ?: skipSplashInstall + + val splashScreen = if (skipSplashInstall) { + null + } else { + if (savedInstanceState == null) installSplashScreen() else null + } + + if (skipSplashInstall && splashScreen == null) { + setTheme(R.style.Theme_Tachiyomi) + ready = true + } // Set up shared element transition and disable overlay so views don't show above system bars window.requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS) @@ -1626,6 +1639,7 @@ open class MainActivity : BaseActivity() { private const val SPLASH_MIN_DURATION = 500 // ms private const val SPLASH_MAX_DURATION = 5000 // ms private const val SPLASH_EXIT_ANIM_DURATION = 400L // ms + const val SPLASH_SKIP = "${BuildConfig.APPLICATION_ID}.SHOULD_SKIP_SPLASH" var chapterIdToExitTo = 0L var backVelocity = 0f diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt index 15ebf747e1..7575c14939 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt @@ -33,6 +33,8 @@ class SearchActivity : MainActivity() { private var backToMain = false override fun onCreate(savedInstanceState: Bundle?) { + skipSplashInstall = intentShouldGoBack() + super.onCreate(savedInstanceState) binding.toolbar.navigationIcon = backDrawable binding.toolbar.setNavigationOnClickListener { popToRoot() } @@ -73,6 +75,7 @@ class SearchActivity : MainActivity() { } else if (!router.handleBack()) { val intent = Intent(this, MainActivity::class.java).apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK + putExtra(SPLASH_SKIP, true) } backToMain = true startActivity(intent)