From 2cc6794db52354102c35fc55816483966503b8d2 Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 18 Jan 2022 22:51:37 -0500 Subject: [PATCH] Revert "Update core-splashscreen (#6471)" This reverts commit 46ec655db583182aee9338c5e2630acf90cb0b85. This broke the background color in Android 12+. --- app/build.gradle.kts | 2 +- .../main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ba039770e8..47540f9824 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -154,7 +154,7 @@ dependencies { implementation("androidx.constraintlayout:constraintlayout:2.1.3") implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0") implementation("androidx.core:core-ktx:1.8.0-alpha02") - implementation("androidx.core:core-splashscreen:1.0.0-beta01") + implementation("androidx.core:core-splashscreen:1.0.0-alpha02") implementation("androidx.recyclerview:recyclerview:1.3.0-alpha01") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01") implementation("androidx.viewpager:viewpager:1.1.0-alpha01") 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 01ecfad5a2..a97d9eb407 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 @@ -141,7 +141,7 @@ class MainActivity : BaseViewBindingActivity() { } val startTime = System.currentTimeMillis() - splashScreen?.setKeepOnScreenCondition() { + splashScreen?.setKeepVisibleCondition { val elapsed = System.currentTimeMillis() - startTime elapsed <= SPLASH_MIN_DURATION || (!ready && elapsed <= SPLASH_MAX_DURATION) } @@ -293,6 +293,9 @@ class MainActivity : BaseViewBindingActivity() { window.navigationBarColor = Color.TRANSPARENT splashScreen.setOnExitAnimationListener { splashProvider -> + // For some reason the SplashScreen applies (incorrect) Y translation to the iconView + splashProvider.iconView.translationY = 0F + val activityAnim = ValueAnimator.ofFloat(1F, 0F).apply { interpolator = LinearOutSlowInInterpolator() duration = SPLASH_EXIT_ANIM_DURATION