Repository navigation
Flower on unit: the page editor as a settings screen, and the Dioxus app as Flower.app - #6
Merged
Merged
Conversation
…onents The Dioxus widget is rebuilt on diaryx-org/unit, as the Swift app's FlowerPages draws a page: a section per group under its caption, a row per field with its value at the right, short lists as chips, a switch for a boolean and a menu for a field with a vocabulary, values typed in place, the demoted fields behind an Advanced fold, the picker in a modal, Rename and Add a Field as prompts, every row's operations in its context menu, and a refusal said under the row it refused or as a toast. The monospace cell grid and the footer edit line are gone. Blitz cannot be asked how tall anything came out, so every row's lines are fixed and the layout adds the heights up: a pane scrolls to follow the cursor, the wheel scrolls the pane under the pointer, and the input method is told where the open field's caret is. The app runs under unit's root with the host's keys, gives it the system clipboard and a sleep, and puts the inline budget (Fit, Pages, Roomy, Flat), Undo, Redo and Delete at the end of the editor's bar. Both workspaces take Blitz from diaryx-org's fork, as unit and leaf do. Behavioural-change: a host makes the editor in a component under a unit::UnitRoot with keys: Keys::Host; Editor::render takes the bar's trailing element (or use FlowerPages); Look is now the zoom and the root's name, and its mono, size and appearance fields are gone; Palette and themed are gone, the colours being the root's theme.
apps/flower-dioxus becomes the Mac app. `cargo xtask mac` builds it for aarch64-apple-darwin and puts Flower.app together around the binary, with apps/flower-dioxus/Info.plist (the document types the SwiftUI app declared) stamped with the workspace version; `cargo xtask package` signs that bundle for Developer ID with the hardened runtime and Flower.entitlements (the sandbox and the files the user opens), notarises it and images it, as it did the Xcode build. mac-app.yml loses Xcode and XcodeGen. The files the Finder asks the app to open arrive as an Apple Event, so the app installs an application delegate of its own before the event loop starts (winit registers none) and opens the last file asked for as ⌘O would. apps/flower-editor is removed. packages/flower-swift stays: it is the package a SwiftUI host links, and the bindings job still holds it to crates/flower-ffi. Behavioural-change: the Mac app in the release image and the flower-editor cask is the Dioxus app: one window, no autosave, Versions or Open Recent, and no iOS build. `cargo xtask swift`, `app-version` and `sync-versions` are gone (`cargo xtask mac` builds and launches the app), and the app-version CI job with them.
…r dependencies' debug info A job's `runner` table takes `apt`, the Ubuntu packages it needs (ship already hands any runner key through `ship ci --matrix`), and ci.yml installs them before the cache step. The `dioxus` job asks for libfontconfig-dev, which fontique links on Linux; its `run` is unchanged, so `ship ci dioxus` asks for no sudo here. Both Dioxus workspaces build their dependencies without debug info, which takes the job's two target directories from 14 GB to 7. Closes docs/tasks/dioxus-ci-lacks-fontconfig.md.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Three commits:
UnitRoot { keys: Keys::Host }.cargo xtask macbundlesapps/flower-dioxusasFlower.app, andcargo xtask packagesigns and notarises that. The SwiftUI app (apps/flower-editor) and its xtask commands and CI job are removed.packages/flower-swiftstays.libfontconfig-devthrough a newaptkey in the runner table, and dependencies are built without debug info. Closes the task "The Dioxus CI job has no fontconfig".Not verified on a Mac: the bundle, signing, notarisation, opening a file from the Finder, and the input method.