ProCraft for Android: An Android native painting app written in Rust
Rust
fix(ui): the animation bar keeps its touches off the canvas; thumbnails follow undo and redo
Joshf4fee942c352
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 5900ab1..e32b338 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@@ -4301,6 +4301,8 @@ class CanvasViewModel(app: Application) : AndroidViewModel(app) {val name = session?.undo()if (could) showNotice("Undo" + name?.let { " $it" }.orEmpty())refresh()+ // the thumbnails of the layers it put back (only those) read again+ if (panel == Panel.LAYERS) refreshThumbnails()}/**@@ -4347,6 +4349,7 @@ class CanvasViewModel(app: Application) : AndroidViewModel(app) {val name = session?.redo()if (could) showNotice("Redo" + name?.let { " $it" }.orEmpty())refresh()+ if (panel == Panel.LAYERS) refreshThumbnails()text?.let { resumeText(it) }}diff --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 182d3ad..d5077d2 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@@ -93,7 +93,8 @@ fun BoxScope.AnimationBar(vm: CanvasViewModel) {} else if (vm.frameOptionsOpen) {DownPopover(260.dp, 130.dp, Modifier.offset(x = barWidth / 2 - 130.dp)) { FrameOptionsPage(vm) }}- Box(Modifier.padding(bottom = BarGap).size(barWidth, BarHeight).clip(RoundedCornerShape(30.dp)).background(BarFill)) {+ // the whole bar takes its touches: none reach the canvas under it (a swipe would paint)+ Box(Modifier.padding(bottom = BarGap).size(barWidth, BarHeight).clip(RoundedCornerShape(30.dp)).background(BarFill).pointerInput(Unit) { detectTapGestures { } }) {val pages = vm.animation?.pages == trueRow(Modifier.fillMaxWidth().padding(start = BarInset, end = BarInset, top = 8.dp).height(30.dp), verticalAlignment = Alignment.CenterVertically) {Text(