Skip to content

Android: touch timeline editor and timeline export - #1099

Merged
CaYatur merged 4 commits into
dev/androidfrom
android/timeline
Nov 17, 2026
Merged

CaYatur merged 4 commits into
dev/androidfrom
android/timeline

Conversation

@CaYatur

@CaYatur CaYatur commented Nov 17, 2026 •

Copy link
Copy Markdown
Owner

For #1054 (Faz 5 MVP).

What

  • New Timeline page in the mobile shell (scene card button): one clip track over the song.
    • Add a scene or template clip at the playhead; drag, trim (22px handles), split, duplicate, delete.
    • Snap to bars / beats / off, BPM slider, "Take tempo from audio", undo/redo (SVTimelineEdit history).
    • Play/seek: when the playhead enters a clip, that clip's scene (or template) is applied.
    • Stored as the desktop timeline model (cfg.timeline), so the same timeline opens on the computer.
  • Export: With the timeline toggle sets cfg.export.includeTimeline / timelineId, so the video follows the timeline, transitions included.
  • i18n: all new strings have English translations.

Not in this MVP

Single track only; no automation lanes, markers, tempo changes, loop region or video clips.

Verification (API 36 emulator)

  • node android/tools/probe.js timeline: two template scenes, two clips, real adb drag (snapped to bars), ruler taps fire the right clip, export with the timeline gives 600 frames and the frame at 1s differs clearly from the frame at 7s (diff 338 > 30).
  • Probe fix: the document picker now scrolls when the file is below the fold and only opens the roots drawer when not in Downloads (media and exportui probes were timing out).
  • Full rerun on this branch build: layers, pages, lyrics, milk, timeline, exportui (MP3, h264 + AAC) and import (last, it clears app data) pass; camera, floatcam, nowplaying and media passed on the dev/android build just before. pages needed a scene reset first: the import probe leaves its sample profile (one video layer, no visualizer) by design, so pages must not run right after import.
  • Export probe now opens Export by its label (the scene card gained the timeline button before it).
  • npm test: 4570 pass, 0 fail. node --test android/js-tests/*.test.js: 72 pass.

CaYatur and others added 4 commits November 17, 2026 21:47
Adds a single-track clip timeline page to the mobile shell (scene card
button). Scene and template clips can be added at the playhead, dragged,
trimmed, split, duplicated and deleted with snap to bars/beats, undo/redo,
BPM and tempo-from-audio. Playback applies a clip's scene when the playhead
enters it. The data is the desktop timeline model (cfg.timeline), so it
also opens on the computer.

Export gets a "With the timeline" toggle that sets
cfg.export.includeTimeline/timelineId, so the video is drawn from the
timeline with transitions.

Probe: new `timeline` command (real drag, ruler taps, export frame diff);
the document picker now scrolls when the file is below the fold and only
opens the roots drawer when it is not in Downloads.

Co-authored-by: caganturgut <[email protected]>
@CaYatur
CaYatur merged commit d5bc0ea into dev/android Nov 17, 2026
7 checks passed
@CaYatur
CaYatur deleted the android/timeline branch November 17, 2026 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant