ProCraft for Android: An Android native painting app written in Rust
Rust
feat(animation): drag the timeline to scrub through frames
Josha2e0531a11fe
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.ktindex b321749..0bd5ab8 100644--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt@@ -5559,6 +5559,26 @@ class CanvasViewModel(app: Application) : AndroidViewModel(app) {animationFrames.getOrNull(i)?.let { selectLayer(it) }}+ /** The timeline dragged: playing stops and the frame's options close. */+ fun beginScrub() {+ stopPlaying()+ frameOptionsOpen = false+ }++ /** The timeline dragged past frame [i]: it shows alone, as playing shows frames. */+ fun scrubFrame(i: Int) {+ if (i in animationFrames.indices) session?.setPlayFrame(i.toUInt())+ }++ /**+ * The timeline let go with frame [i] in its middle: it becomes the current frame, as a tap+ * makes it (null: nothing chosen, the current frame shows again).+ */+ fun endScrub(i: Int?) {+ if (i != null && i != currentFrame) animationFrames.getOrNull(i)?.let { selectLayer(it) }+ session?.setPlayFrame(null)+ }+fun addFrame() {stopPlaying()frameOptionsOpen = falsediff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AnimationUi.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AnimationUi.ktindex d5077d2..ff58bf4 100644--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AnimationUi.kt+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AnimationUi.kt@@ -1,11 +1,17 @@package io.github.artcraftandroid.procraft.ui+import androidx.compose.animation.core.animate+import androidx.compose.animation.core.calculateTargetValue+import androidx.compose.animation.core.exponentialDecayimport androidx.compose.foundation.Imageimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.borderimport androidx.compose.foundation.clickable+import androidx.compose.foundation.gestures.Orientationimport androidx.compose.foundation.gestures.detectHorizontalDragGesturesimport androidx.compose.foundation.gestures.detectTapGestures+import androidx.compose.foundation.gestures.draggable+import androidx.compose.foundation.gestures.rememberDraggableStateimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.BoxScope@@ -25,9 +31,14 @@ import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.Iconimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable+import androidx.compose.runtime.DisposableEffect+import androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValue+import androidx.compose.runtime.mutableFloatStateOf+import androidx.compose.runtime.mutableIntStateOfimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.remember+import androidx.compose.runtime.rememberCoroutineScopeimport androidx.compose.runtime.setValueimport androidx.compose.runtime.rememberUpdatedStateimport androidx.compose.ui.Alignment@@ -53,6 +64,8 @@ import androidx.compose.ui.unit.spimport io.github.artcraftandroid.procraft.canvas.CanvasViewModelimport io.github.artcraftandroid.procraft.core.AnimationPlaybackimport kotlin.math.roundToInt+import kotlinx.coroutines.Job+import kotlinx.coroutines.launch/** The bar is 657 wide on a wide screen, 446 upright; the timeline 12 in from each side. */private val WideBarWidth = 657.dp@@ -129,6 +142,8 @@ private fun BarText(label: String, modifier: Modifier, onClick: () -> Unit) {/*** The frames in a rounded track [width] wide, the current (or played) one in the middle with a* blue line under it; each frame's card is 40 tall and as wide as the canvas's shape makes it.+ * Dragged, the track scrolls through the frames, each showing as it passes the middle; let go,+ * it coasts and settles on a frame, which becomes the current one.*/@Composableprivate fun Timeline(vm: CanvasViewModel, width: Dp, modifier: Modifier) {@@ -138,9 +153,56 @@ private fun Timeline(vm: CanvasViewModel, width: Dp, modifier: Modifier) {val aspect = if (cw > 0 && ch > 0) (cw.toFloat() / ch).coerceIn(0.25f, 2f) else 0.66fval frameWidth = FrameHeight * aspect + 1.dpval pitch = frameWidth + 1.dp- Box(modifier.size(width, 44.dp).clip(RoundedCornerShape(18.dp)).background(TrackFill).border(1.dp, TrackEdge, RoundedCornerShape(18.dp))) {+ val pitchPx = with(LocalDensity.current) { pitch.toPx() }+ val last = (frames.size - 1).coerceAtLeast(0)+ // the frame in the middle, fractional while the track moves+ var at by remember { mutableFloatStateOf(focus.toFloat()) }+ var dragging by remember { mutableStateOf(false) }+ // the frame shown last while dragging+ var shown by remember { mutableIntStateOf(focus) }+ var settling by remember { mutableStateOf<Job?>(null) }+ val scope = rememberCoroutineScope()+ fun scrubTo(p: Float) {+ at = p+ val i = p.roundToInt()+ if (i != shown) {+ shown = i+ vm.scrubFrame(i)+ }+ }+ LaunchedEffect(focus) {+ if (dragging) return@LaunchedEffect+ // played frames step; a frame chosen or added slides into the middle (a drag takes over)+ if (vm.playingFrame != null) at = focus.toFloat() else animate(at, focus.toFloat(), animationSpec = Motion.frameSlide()) { v, _ -> if (!dragging) at = v }+ }+ DisposableEffect(Unit) { onDispose { if (dragging) vm.endScrub(null) } }+ val drag = rememberDraggableState { delta -> scrubTo((at - delta / pitchPx).coerceIn(0f, last.toFloat())) }+ Box(+ modifier.size(width, 44.dp).clip(RoundedCornerShape(18.dp)).background(TrackFill).border(1.dp, TrackEdge, RoundedCornerShape(18.dp))+ .draggable(+ drag,+ Orientation.Horizontal,+ enabled = frames.size > 1,+ onDragStarted = {+ settling?.cancel()+ if (!dragging) {+ dragging = true+ shown = focus+ vm.beginScrub()+ }+ },+ onDragStopped = { velocity ->+ val target = exponentialDecay<Float>().calculateTargetValue(at, -velocity / pitchPx).roundToInt().coerceIn(0, last)+ settling = scope.launch {+ animate(at, target.toFloat(), -velocity / pitchPx, Motion.frameSlide()) { v, _ -> scrubTo(v.coerceIn(0f, last.toFloat())) }+ dragging = false+ vm.endScrub(target)+ }+ },+ ),+ ) {frames.forEachIndexed { i, id ->- val x = width / 2 - frameWidth / 2 + pitch * (i - focus)+ val x = width / 2 - frameWidth / 2 + pitch * (i - at)if (x > -frameWidth && x < width) {Box(Modifier.offset(x = x, y = 2.dp).size(frameWidth, FrameHeight).clip(RoundedCornerShape(6.dp)).background(Color.White)diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Motion.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Motion.ktindex b1a625d..3f9ab23 100644--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Motion.kt+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Motion.kt@@ -217,6 +217,9 @@ object Motion {private val Rows = Spring(0.3f, 0.75f, 0f)fun rowMove(): androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> = tween(350, easing = Settle)fun rowFade(): androidx.compose.animation.core.FiniteAnimationSpec<Float> = tween(300, easing = Rows)++ /** The timeline's frames sliding a frame into its middle, as rows move. */+ fun frameSlide(): AnimationSpec<Float> = tween(350, easing = Settle)}/**