mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-06 00:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix scrollbar not showing when animator duration scale animation is turned off (#2398)

Browse Source
This commit is contained in:
anirudhn
2025-11-01 07:34:07 -07:00
committed by GitHub
parent 87c6f34a55
commit 09ec9fc8c5
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
presentation-core/src/main/java/tachiyomi/presentation/core/components/VerticalFastScroller.kt
View File

@@ -47,6 +47,7 @@ import androidx.compose.ui.util.fastForEach
import androidx.compose.ui.util.fastLastOrNull
import androidx.compose.ui.util.fastMaxBy
import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.sample
@@ -177,7 +178,8 @@ fun VerticalFastScroller(
.collectLatest {
if (thumbAllowed()) {
alpha.snapTo(1f)
alpha.animateTo(0f, animationSpec = FadeOutAnimationSpec)
delay(ScrollBarVisibilityDurationMillis)
alpha.animateTo(0f, animationSpec = ImmediateFadeOutAnimationSpec)
} else {
alpha.animateTo(0f, animationSpec = ImmediateFadeOutAnimationSpec)
}
@@ -366,7 +368,8 @@ fun VerticalGridFastScroller(
.collectLatest {
if (thumbAllowed()) {
alpha.snapTo(1f)
alpha.animateTo(0f, animationSpec = FadeOutAnimationSpec)
delay(ScrollBarVisibilityDurationMillis)
alpha.animateTo(0f, animationSpec = ImmediateFadeOutAnimationSpec)
} else {
alpha.animateTo(0f, animationSpec = ImmediateFadeOutAnimationSpec)
}
@@ -460,10 +463,7 @@ object Scroller {
private val ThumbLength = 48.dp
private val ThumbThickness = 12.dp
private val ThumbShape = RoundedCornerShape(ThumbThickness / 2)
private val FadeOutAnimationSpec = tween<Float>(
durationMillis = ViewConfiguration.getScrollBarFadeDuration(),
delayMillis = 2000,
)
private val ScrollBarVisibilityDurationMillis = 2000L
private val ImmediateFadeOutAnimationSpec = tween<Float>(
durationMillis = ViewConfiguration.getScrollBarFadeDuration(),
)

8
presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollbar.kt
View File

@@ -64,6 +64,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.fastFirstOrNull
import androidx.compose.ui.util.fastSumBy
import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.sample
@@ -218,7 +219,8 @@ private fun Modifier.drawScrollbar(
.sample(100)
.collectLatest {
alpha.snapTo(1f)
alpha.animateTo(0f, animationSpec = FadeOutAnimationSpec)
delay(ScrollBarVisibilityDurationMillis)
alpha.animateTo(0f, animationSpec = ImmediateFadeOutAnimationSpec)
}
}
@@ -241,9 +243,9 @@ private fun Modifier.drawScrollbar(
}
}
private val FadeOutAnimationSpec = tween<Float>(
private val ScrollBarVisibilityDurationMillis = ViewConfiguration.getScrollDefaultDelay().toLong()
private val ImmediateFadeOutAnimationSpec = tween<Float>(
durationMillis = ViewConfiguration.getScrollBarFadeDuration(),
delayMillis = ViewConfiguration.getScrollDefaultDelay(),
)
@Preview(widthDp = 400, heightDp = 400, showBackground = true)