A fully functional Android app built entirely with Kotlin and Jetpack Compose
Interact with scrollbar only if drag direction matches scrollbar orientation
TJ Dahunsi9babb50c5872
diff --git a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.ktindex 11997468c..74d9e0467 100644--- a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt+++ b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/Scrollbar.kt@@ -18,10 +18,11 @@ package com.google.samples.apps.nowinandroid.core.designsystem.component.scrollbimport androidx.compose.animation.core.animateDpAsStateimport androidx.compose.foundation.gestures.Orientation+import androidx.compose.foundation.gestures.detectHorizontalDragGesturesimport androidx.compose.foundation.gestures.detectTapGestures-import androidx.compose.foundation.gestures.draggable-import androidx.compose.foundation.gestures.rememberDraggableState+import androidx.compose.foundation.gestures.detectVerticalDragGesturesimport androidx.compose.foundation.hoverable+import androidx.compose.foundation.interaction.DragInteractionimport androidx.compose.foundation.interaction.MutableInteractionSourceimport androidx.compose.foundation.interaction.PressInteractionimport androidx.compose.foundation.layout.Box@@ -41,6 +42,7 @@ import androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.geometry.Offset+import androidx.compose.ui.input.pointer.PointerInputChangeimport androidx.compose.ui.input.pointer.pointerInputimport androidx.compose.ui.layout.onGloballyPositionedimport androidx.compose.ui.layout.positionInRoot@@ -53,7 +55,9 @@ import androidx.compose.ui.unit.maximport androidx.compose.ui.util.packFloatsimport androidx.compose.ui.util.unpackFloat1import androidx.compose.ui.util.unpackFloat2+import kotlinx.coroutines.TimeoutCancellationExceptionimport kotlinx.coroutines.delay+import kotlinx.coroutines.withTimeoutimport kotlin.math.maximport kotlin.math.min@@ -221,14 +225,6 @@ fun Scrollbar(a = track.size * thumbTravelPercent,b = track.size - thumbSizePx,)- val draggableState = rememberDraggableState { delta ->- if (draggedOffset == Offset.Unspecified) return@rememberDraggableState-- draggedOffset = when (orientation) {- Orientation.Vertical -> draggedOffset.copy(y = draggedOffset.y + delta)- Orientation.Horizontal -> draggedOffset.copy(x = draggedOffset.x + delta)- }- }// scrollbar track containerBox(@@ -251,36 +247,77 @@ fun Scrollbar(.pointerInput(Unit) {detectTapGestures(onPress = { offset ->- val initialPress = PressInteraction.Press(offset)- interactionSource?.tryEmit(initialPress)-- // Start the press- pressedOffset = offset+ try {+ // Wait for a long press before scrolling+ withTimeout(viewConfiguration.longPressTimeoutMillis) {+ tryAwaitRelease()+ }+ } catch (e: TimeoutCancellationException) {+ // Start the press triggered scroll+ val initialPress = PressInteraction.Press(offset)+ interactionSource?.tryEmit(initialPress)- interactionSource?.tryEmit(- when {- tryAwaitRelease() -> PressInteraction.Release(initialPress)- else -> PressInteraction.Cancel(initialPress)- },- )+ pressedOffset = offset+ interactionSource?.tryEmit(+ when {+ tryAwaitRelease() -> PressInteraction.Release(initialPress)+ else -> PressInteraction.Cancel(initialPress)+ },+ )- // End the press- pressedOffset = Offset.Unspecified+ // End the press+ pressedOffset = Offset.Unspecified+ }},)}// Process scrollbar drags- .draggable(- state = draggableState,- orientation = orientation,- interactionSource = interactionSource,- onDragStarted = { startedPosition: Offset ->- draggedOffset = startedPosition- },- onDragStopped = {+ .pointerInput(Unit) {+ var dragInteraction: DragInteraction.Start? = null+ val onDragStart: (Offset) -> Unit = { offset ->+ val start = DragInteraction.Start()+ dragInteraction = start+ interactionSource?.tryEmit(start)+ draggedOffset = offset+ }+ val onDragEnd: () -> Unit = {+ dragInteraction?.let { interactionSource?.tryEmit(DragInteraction.Stop(it)) }+ draggedOffset = Offset.Unspecified+ }+ val onDragCancel: () -> Unit = {+ dragInteraction?.let { interactionSource?.tryEmit(DragInteraction.Cancel(it)) }draggedOffset = Offset.Unspecified- },- ),+ }+ val onDrag: (change: PointerInputChange, dragAmount: Float) -> Unit =+ onDrag@{ _, delta ->+ if (draggedOffset == Offset.Unspecified) return@onDrag+ draggedOffset = when (orientation) {+ Orientation.Vertical -> draggedOffset.copy(+ y = draggedOffset.y + delta,+ )++ Orientation.Horizontal -> draggedOffset.copy(+ x = draggedOffset.x + delta,+ )+ }+ }++ when (orientation) {+ Orientation.Horizontal -> detectHorizontalDragGestures(+ onDragStart = onDragStart,+ onDragEnd = onDragEnd,+ onDragCancel = onDragCancel,+ onHorizontalDrag = onDrag,+ )++ Orientation.Vertical -> detectVerticalDragGestures(+ onDragStart = onDragStart,+ onDragEnd = onDragEnd,+ onDragCancel = onDragCancel,+ onVerticalDrag = onDrag,+ )+ }+ },) {val scrollbarThumbMovedDp = max(a = with(localDensity) { thumbMovedPx.toDp() },@@ -338,6 +375,7 @@ fun Scrollbar(a = currentThumbMovedPercent + delta,b = destinationThumbMovedPercent,)+else -> max(a = currentThumbMovedPercent + delta,b = destinationThumbMovedPercent,