yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Revert "Update core-splashscreen (#6471)"

Browse Source 
This reverts commit 46ec655db5.

This broke the background color in Android 12+.
This commit is contained in:
arkon 2022-01-18 22:51:37 -05:00
parent 0cb4094dd9
commit 2cc6794db5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@ -154,7 +154,7 @@ dependencies {
implementation("androidx.constraintlayout:constraintlayout:2.1.3") implementation("androidx.constraintlayout:constraintlayout:2.1.3")
implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0") implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0")
implementation("androidx.core:core-ktx:1.8.0-alpha02") 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.recyclerview:recyclerview:1.3.0-alpha01")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
implementation("androidx.viewpager:viewpager:1.1.0-alpha01") implementation("androidx.viewpager:viewpager:1.1.0-alpha01")

5
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -141,7 +141,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
} }
val startTime = System.currentTimeMillis() val startTime = System.currentTimeMillis()
splashScreen?.setKeepOnScreenCondition() { splashScreen?.setKeepVisibleCondition {
val elapsed = System.currentTimeMillis() - startTime val elapsed = System.currentTimeMillis() - startTime
elapsed <= SPLASH_MIN_DURATION || (!ready && elapsed <= SPLASH_MAX_DURATION) elapsed <= SPLASH_MIN_DURATION || (!ready && elapsed <= SPLASH_MAX_DURATION)
} }
@ -293,6 +293,9 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
window.navigationBarColor = Color.TRANSPARENT window.navigationBarColor = Color.TRANSPARENT
splashScreen.setOnExitAnimationListener { splashProvider -> 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 { val activityAnim = ValueAnimator.ofFloat(1F, 0F).apply {
interpolator = LinearOutSlowInInterpolator() interpolator = LinearOutSlowInInterpolator()
duration = SPLASH_EXIT_ANIM_DURATION duration = SPLASH_EXIT_ANIM_DURATION