Skip to content

ProCraft for Android: An Android native painting app written in Rust

Rust

fix(animation): full-screen pages cover the timeline

Josh145d61ffef0d
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AppRoot.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AppRoot.kt
index cb91f62..81d31fd 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AppRoot.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/AppRoot.kt
@@ -225,7 +225,10 @@ fun AppRoot(vm: CanvasViewModel) {
if (vm.adjustment == Adjustment.CLONE) ClonePuck(vm)
if (vm.recoloring) RecolorReticle(vm)
QuickShapeHandles(vm)
- if (!vm.barsHidden) AnimationBar(vm)
+ // a full-screen page covers the timeline, as it covers the canvas
+ val pageOver = vm.canvasInfoOpen || vm.gestureControlsOpen || vm.cropRect != null || vm.timeLapseReplaying ||
+ vm.animatedExport != null || vm.modelAnimatedExport != null
+ if (!vm.barsHidden && !pageOver) AnimationBar(vm)
CopyPastePanel(vm)
QuickMenu(vm)
LayerChoice(vm)