Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Update thumb movement range by thumb size, in app scrollbars

Yuya07d987733108
diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt
index 5041eff7b..1e5850f30 100644
--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt
+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt
@@ -91,6 +91,12 @@ class ScrollbarState {
*/
val thumbMovedPercent
get() = unpackFloat2(packedValue)
+
+ /**
+ * Returns the max distance the thumb can travel as a percentage of total track size
+ */
+ val thumbTrackSizePercent
+ get() = 1f - unpackFloat1(packedValue)
}
/**
@@ -310,27 +316,30 @@ fun Scrollbar(
b = minThumbSize.toPx(),
)
- val thumbTravelPercent = when {
- interactionThumbTravelPercent.isNaN() -> state.thumbMovedPercent
- else -> interactionThumbTravelPercent
+ val trackSizePx = when (state.thumbTrackSizePercent) {
+ 0f -> track.size
+ else -> (track.size - thumbSizePx) / state.thumbTrackSizePercent
}
- val thumbMovedPx = min(
- a = track.size * thumbTravelPercent,
- b = track.size - thumbSizePx,
+ val thumbTravelPercent = max(
+ a = min(
+ a = when {
+ interactionThumbTravelPercent.isNaN() -> state.thumbMovedPercent
+ else -> interactionThumbTravelPercent
+ },
+ b = state.thumbTrackSizePercent,
+ ),
+ b = 0f,
)
- val scrollbarThumbMovedPx = max(
- a = thumbMovedPx.roundToInt(),
- b = 0,
- )
+ val thumbMovedPx = trackSizePx * thumbTravelPercent
val y = when (orientation) {
Horizontal -> 0
- Vertical -> scrollbarThumbMovedPx
+ Vertical -> thumbMovedPx.roundToInt()
}
val x = when (orientation) {
- Horizontal -> scrollbarThumbMovedPx
+ Horizontal -> thumbMovedPx.roundToInt()
Vertical -> 0
}
diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ThumbExt.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ThumbExt.kt
index 847580361..a267ec2ec 100644
--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ThumbExt.kt
+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ThumbExt.kt
@@ -26,6 +26,7 @@ import androidx.compose.runtime.mutableFloatStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.runtime.setValue
+import kotlin.math.roundToInt
/**
* Remembers a function to react to [Scrollbar] thumb position displacements for a [LazyListState]
@@ -79,7 +80,7 @@ private inline fun rememberDraggableScroller(
LaunchedEffect(percentage) {
if (percentage.isNaN()) return@LaunchedEffect
- val indexToFind = (itemCount * percentage).toInt()
+ val indexToFind = (itemCount * percentage).roundToInt()
scroll(indexToFind)
}
return remember {