浏览代码

Revert "Update core-splashscreen (#6471)"

This reverts commit 46ec655db583182aee9338c5e2630acf90cb0b85.

This broke the background color in Android 12+.
arkon 3 年之前
父节点
当前提交
2cc6794db5
共有 2 个文件被更改,包括 5 次插入2 次删除
  1. 1 1
      app/build.gradle.kts
  2. 4 1
      app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

+ 1 - 1
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")

+ 4 - 1
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

@@ -141,7 +141,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
         }
 
         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<MainActivityBinding>() {
             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