mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-17 12:49:19 +01:00
Revert "Update core-splashscreen (#6471)"
This reverts commit 46ec655db5
.
This broke the background color in Android 12+.
This commit is contained in:
parent
0cb4094dd9
commit
2cc6794db5
@ -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")
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user