Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c50eaf81f7 | |||
| b44d2777ec | |||
| 52407e7256 | |||
| da3e5423dc | |||
| a1864271de | |||
| f63db769ae | |||
| 4437a1aaf9 | |||
| e7345aed6c | |||
| 140251beae | |||
| d6f32d3154 | |||
| 8fdc41f36f | |||
| 2e25476d0a | |||
| d3cb1a51d4 | |||
| c8358f4275 |
+143
-1
@@ -6,9 +6,151 @@ project follows [Semantic Versioning](https://semver.org/).
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
No threads in flight. v0.21.5 cut on 2026-05-08; CHANGELOG accumulates
|
||||
No threads in flight. v0.21.7 cut on 2026-05-08; CHANGELOG accumulates
|
||||
the next cycle here.
|
||||
|
||||
## [0.21.7] — 2026-05-08
|
||||
|
||||
Patch release closing the last major B-2 sub-piece. Through-line:
|
||||
**mini-tableau preview dim layer**. The mockup's "Game Peek Band at
|
||||
50 % opacity" is now implemented as a full-screen UI scrim that darkens
|
||||
the card world during replay so the chrome (banner + move-log panel)
|
||||
reads clearly against the scene.
|
||||
|
||||
### Added
|
||||
|
||||
- **Full-screen tableau dim layer** (`da3e542`). Spawns a
|
||||
`ReplayTableauDimLayer` UI node (100 % × 100 %, 50 % opacity
|
||||
black) at `Z_REPLAY_DIM = Z_REPLAY_OVERLAY − 1 = 54` whenever
|
||||
a replay starts; despawned alongside the banner and move-log
|
||||
panel when the replay ends. Bevy's UI/world compositor means
|
||||
no changes to `card_plugin` are needed — UI nodes always
|
||||
render above world-space sprites regardless of `Transform.z`.
|
||||
The dim layer carries no `Interaction` component (purely
|
||||
visual; pointer events pass through). Adds `Z_REPLAY_DIM`
|
||||
and `TABLEAU_DIM_ALPHA` constants plus two new tests:
|
||||
lifecycle (spawn/despawn mirrors the floating-chip pattern)
|
||||
and z-ordering invariant (`Z_REPLAY_DIM < Z_REPLAY_OVERLAY`
|
||||
pinned). 1275 tests pass / 0 failing.
|
||||
|
||||
### Stats
|
||||
|
||||
- Tests: 1275 passing / 0 failing
|
||||
- Clippy: clean
|
||||
- Crates touched: `solitaire_engine` (replay_overlay.rs)
|
||||
|
||||
## [0.21.6] — 2026-05-08
|
||||
|
||||
Patch release for the post-v0.21.5 work. Through-line:
|
||||
**Move Log panel + scrub-UX polish**. v0.21.5 closed out the
|
||||
keyboard-accelerator surface (Space / Esc / ← / →) and the
|
||||
keybind footer; v0.21.6 builds on that with two parallel
|
||||
threads — accessibility + scrub-on-hold polish for the v0.21.5
|
||||
surfaces, plus a brand-new Move Log panel anchored to the
|
||||
viewport's bottom edge that gives players a 5-row recent-and-
|
||||
upcoming move history alongside the existing top-edge banner.
|
||||
|
||||
The Move Log panel is the first replay-overlay surface that
|
||||
*isn't* attached to the banner — it lives at a separate screen
|
||||
anchor (bottom: 0) with its own spawn/despawn lifecycle.
|
||||
Establishes the pattern for "multi-anchor replay UI" that the
|
||||
remaining B-2 sub-piece (mini-tableau preview) will inherit.
|
||||
|
||||
### Added
|
||||
|
||||
- **HC-mode coverage for the scrub track + quarter-mark notch
|
||||
ticks** (`d3cb1a5`). Adds parallel primitive
|
||||
`HighContrastBackground` to `ui_theme` and a paint system
|
||||
`update_high_contrast_backgrounds` in `settings_plugin` that
|
||||
mirrors the existing border-marker pattern but targets
|
||||
`BackgroundColor` instead of `BorderColor`. Tags the 1 px
|
||||
scrub track Node and all five quarter-mark notch ticks so
|
||||
they bump from `BORDER_SUBTLE` (`#505050`) →
|
||||
`BORDER_SUBTLE_HC` (`#a0a0a0`) under HC mode. Scrub fill
|
||||
(`ACCENT_PRIMARY`) and WIN MOVE marker (`STATE_SUCCESS`)
|
||||
don't get the marker — accent and state colours are already
|
||||
saturated and don't need an HC luminance variant.
|
||||
- **Continuous scrub on key-held arrow keys** (`2e25476`).
|
||||
Holding ← or → triggers continuous step at 100 ms cadence
|
||||
(10 steps/sec) — matches the mockup's `[← →] scrub`
|
||||
terminology while keeping single-press = single-step
|
||||
semantics. Per-key accumulators in a new
|
||||
`ReplayScrubKeyHold` resource; `just_pressed` events bypass
|
||||
the accumulator and fire immediately. Release resets to 0
|
||||
so the next fresh press fires immediately rather than at
|
||||
half-interval.
|
||||
- **Move Log panel** (`d6f32d3` + `140251b` + `e7345ae` +
|
||||
`4437a1a`). New bottom-edge UI panel showing a 5-row window
|
||||
onto recent + upcoming moves: 2 prev rows above the active
|
||||
row + active row highlighted in `ACCENT_PRIMARY` + 2 next
|
||||
rows below. Header reads `▌ MOVE LOG · N/M` (or
|
||||
`▌ MOVE LOG · COMPLETE` when finished). Active row carries
|
||||
a `▶` focus prefix and `TEXT_PRIMARY_HC` text colour for
|
||||
legible contrast against the brick-red highlight. Prev /
|
||||
next rows render in `TEXT_SECONDARY` so the active row
|
||||
stays the focal point.
|
||||
- Sibling-of-banner pattern (separate root entity anchored
|
||||
at viewport bottom, not a banner child) — same
|
||||
spawn/despawn lifecycle as `ReplayFloatingProgressChip`,
|
||||
different screen anchor.
|
||||
- Five pure helpers handle the formatting:
|
||||
`format_pile`, `format_move_body`,
|
||||
`format_move_log_header`, `format_kth_recent_row` (active
|
||||
+ prev), `format_kth_next_row` (next). 1-indexed display
|
||||
numbers throughout (`Foundation(2)` reads as "foundation
|
||||
3" rather than the enum's 0-index).
|
||||
- Panel grows from 56 → 84 → 112 px across the four
|
||||
move-log commits. `MOVE_LOG_PREV_ROWS` and
|
||||
`MOVE_LOG_NEXT_ROWS` constants (both = 2) parameterise
|
||||
the row count; `format_kth_recent_row` and
|
||||
`format_kth_next_row` return empty for out-of-range k so
|
||||
panels gracefully under-fill at the start (cursor=1) and
|
||||
end (cursor=N-1) of a replay.
|
||||
- HC marker on the panel's top border so the 1 px edge
|
||||
bumps under HC mode (same pattern as the keybind footer).
|
||||
|
||||
### Changed
|
||||
|
||||
- **`react_to_state_change` despawns the Move Log panel** on
|
||||
`Playing → Inactive` alongside the banner root and floating
|
||||
progress chip. Third query in the same defer-and-despawn
|
||||
cycle.
|
||||
- **Move Log panel height grew 56 → 84 → 112 px** across the
|
||||
prev-rows and next-rows commits. The panel is sized to fit
|
||||
the chosen row count + header + padding; tunable via the
|
||||
`MOVE_LOG_PANEL_HEIGHT` const.
|
||||
- **`format_active_move_row` now prefixes the `▶` focus
|
||||
marker** (`e7345ae`). Wraps `format_kth_recent_row(state, 1)`
|
||||
and prepends the prefix when the body is non-empty. Empty
|
||||
case still returns empty — cursor=0 doesn't paint a stray
|
||||
`▶` on an otherwise-empty row.
|
||||
|
||||
### Documentation
|
||||
|
||||
- `SESSION_HANDOFF.md` refreshed twice this cycle — once
|
||||
recording the HC paint + continuous-scrub polish, then
|
||||
again as the Move Log arc shipped commit-by-commit. The
|
||||
Resume menu's B option now traces the full arc:
|
||||
notches → labels → footer → ESC → HC → arrow keys →
|
||||
HC paint → continuous scrub → move log.
|
||||
|
||||
### Stats
|
||||
|
||||
- **1273 passing tests / 0 failing** across the workspace
|
||||
(net +23 from v0.21.5's 1250 baseline):
|
||||
- 2 from `d3cb1a5` (HC marker on track + notches).
|
||||
- 2 from `2e25476` (continuous-scrub repeat-while-held +
|
||||
release-resets-accumulator).
|
||||
- 8 from `d6f32d3` (move-log panel init + 5 helpers + 3
|
||||
spawn / lifecycle scenarios).
|
||||
- 4 from `140251b` (prev rows: helper k coverage + spawn
|
||||
cardinality + spawn texts + repaint on cursor advance).
|
||||
- 3 from `e7345ae` (active row highlight: wrapper bg +
|
||||
text colour + focus prefix + cursor=0 stays empty).
|
||||
- 4 from `4437a1a` (next rows: helper k coverage + spawn
|
||||
cardinality + spawn texts + under-fill at replay end).
|
||||
- Clippy clean across the workspace.
|
||||
|
||||
## [0.21.5] — 2026-05-08
|
||||
|
||||
Patch release for the post-v0.21.4 work. One through-line:
|
||||
|
||||
+79
-260
@@ -1,198 +1,66 @@
|
||||
# Solitaire Quest — Session Handoff
|
||||
|
||||
**Last updated:** 2026-05-08 — **v0.21.4 cut and tagged at
|
||||
`23ff62c`**, working tree clean, all post-tag work pushed to
|
||||
origin.
|
||||
**Last updated:** 2026-05-08 — **v0.21.7 cut and tagged at
|
||||
`da3e542`**, working tree clean (tag pending push).
|
||||
|
||||
v0.21.4 is a patch release with one through-line:
|
||||
**replay-scrubbing accessibility**. The replay overlay used to be
|
||||
pure-passive — start, watch, wait. v0.21.4 adds the scaffolding
|
||||
for *navigating within* a replay: a WIN MOVE marker on the scrub
|
||||
bar so the player can see at a glance where the winning move
|
||||
sits, plus pause / resume / step controls (with a Space keyboard
|
||||
accelerator) so they can stop on any move and inspect the board.
|
||||
Also lands the additive `Replay::win_move_index: Option<usize>`
|
||||
data field that makes the marker possible — serde-default so
|
||||
older on-disk replays load with `None` and simply don't get a
|
||||
marker (no schema bump).
|
||||
v0.21.7 is a single-commit patch closing the last major B-2
|
||||
sub-piece: **mini-tableau preview dim layer**. A full-screen
|
||||
`ReplayTableauDimLayer` UI node (100 % × 100 %, 50 % opacity
|
||||
black) at `Z_REPLAY_DIM = 54` (one rung below the replay
|
||||
chrome at z=55) darkens the card world during replay so the
|
||||
banner and move-log panel read clearly against the scene —
|
||||
matching the mockup's "Game Peek Band at 50 % opacity" spec
|
||||
without touching `card_plugin`. 13 commits have now shipped
|
||||
across v0.21.4–v0.21.7 on the B-2 replay screen-takeover
|
||||
arc; every major sub-piece is closed.
|
||||
|
||||
Three commits on the B-2 replay screen-takeover redesign arc
|
||||
land here. The remaining sub-pieces (screen-takeover layout,
|
||||
move-log scroller, mini-tableau preview) share a layout-reflow
|
||||
prerequisite the banner can't carry, so they're deferred to a
|
||||
future cycle as a single multi-session arc.
|
||||
|
||||
Full v0.21.4 detail lives in `CHANGELOG.md` § [0.21.4]. This
|
||||
Full v0.21.7 detail lives in `CHANGELOG.md` § [0.21.7]. This
|
||||
file from here on focuses on what's *open* post-cut and how to
|
||||
resume.
|
||||
|
||||
## Status at pause
|
||||
|
||||
- **HEAD locally:** see `git rev-parse HEAD`. The cut commit is
|
||||
`23ff62c`; any post-cut docs edits ride on top of that.
|
||||
- **HEAD on origin:** matches local. v0.21.4 is fully on origin.
|
||||
- **HEAD locally:** `da3e542` (v0.21.7 commit). Tag pending —
|
||||
push with `git tag v0.21.7 da3e542 && git push origin v0.21.7`.
|
||||
- **HEAD on origin:** `f63db76` (v0.21.6). v0.21.7 commit
|
||||
not pushed yet; a docs-only edit will ride on top before push.
|
||||
- **Working tree:** clean. No WIP outstanding.
|
||||
- **`artwork/` directory:** still untracked. Intentional.
|
||||
- **Build:** `cargo clippy --workspace --all-targets -- -D warnings`
|
||||
clean.
|
||||
- **Tests:** **1250 total / 1249 passing / 1 pre-existing
|
||||
time-dependent flake** across the workspace
|
||||
(1228 in v0.21.4 + 4 from `fe68861`'s scrub-notch tests + 4
|
||||
from `d322abf`'s notch-label tests + 4 from `1873b3f`'s
|
||||
keybind-footer tests + 3 from `90e24d9`'s ESC-accelerator
|
||||
tests + 1 from `23902cd`'s HC-marker test + 6 from
|
||||
`e5c4f51`'s arrow-keyboard tests). The flake is
|
||||
`daily_challenge_plugin::tests::check_system_fires_warning_event_only_once_per_day`
|
||||
— fails when wall-clock UTC is within 30 minutes of midnight
|
||||
(the daily-expiry warning window the test asserts against).
|
||||
Verified pre-existing. Detail in `CHANGELOG.md` § [0.21.4]
|
||||
§ Stats; post-cut delta tracked here.
|
||||
- **Tags on origin:** `v0.9.0` through `v0.21.4`. v0.21.4 is on
|
||||
`23ff62c`; v0.21.3 stays on `3d92a91`; v0.21.2 stays on
|
||||
`f23df3b`; v0.21.1 stays on `daa655a`; v0.21.0 stays on
|
||||
`04f9bf9`; v0.20.0 stays on `41a009a`.
|
||||
- **Tags on origin:** `v0.9.0` through `v0.21.3`. v0.21.3 is on
|
||||
`3d92a91`; v0.21.2 stays on `f23df3b`; v0.21.1 stays on
|
||||
`daa655a`; v0.21.0 stays on `04f9bf9`; v0.20.0 stays on
|
||||
`41a009a`.
|
||||
- **Tests:** **1275 passing / 0 failing** across the workspace.
|
||||
Detail in `CHANGELOG.md` § [0.21.7] § Stats.
|
||||
- **Tags on origin:** `v0.9.0` through `v0.21.6`. v0.21.7
|
||||
tag exists locally at `da3e542`; push to origin when ready.
|
||||
|
||||
## Since the v0.21.4 cut
|
||||
## Since the v0.21.7 cut
|
||||
|
||||
- **`fe68861` — `feat(replay): add quarter-mark notches to scrub
|
||||
bar`.** First finite step toward B-2's screen-takeover layout.
|
||||
Five 1px vertical ticks at 0/25/50/75/100 % give the player
|
||||
visual anchor points without needing to mentally bisect the
|
||||
bar. Pure helper `scrub_notch_positions()` returns the fixed
|
||||
array; spawn loop lives next to the WIN MOVE marker spawn so
|
||||
the lifecycles match. Notches paint in `BORDER_SUBTLE`
|
||||
(matches unfilled-track colour) and rely on extending past the
|
||||
1px track (5px tall, anchored 2px above track top) for
|
||||
visibility — same trick the WIN MOVE marker uses. Spawned
|
||||
*after* the WIN MOVE marker so a notch and the marker landing
|
||||
on the same percentage paint the marker on top. Mirrors the
|
||||
notch ladder in `docs/ui-mockups/replay-overlay-mobile.html`.
|
||||
4 new tests; 1228 → 1232.
|
||||
- **`d322abf` — `feat(replay): add percentage labels under
|
||||
scrub-bar notches`.** First **layout-changing** commit in B-2's
|
||||
screen-takeover arc. Banner height grew from 60 → 76 px to make
|
||||
room for a 16 px label row beneath the 1 px scrub track; the
|
||||
top row's `flex_grow: 1.0` still consumes the same 59 px so no
|
||||
ripples on existing content. Pure helper `scrub_notch_labels()`
|
||||
returns the fixed `["0%", "25%", "50%", "75%", "100%"]` array,
|
||||
paired index-for-index with `scrub_notch_positions()`. Spawn
|
||||
loop applies an "endpoints flush, middle three percent-anchored"
|
||||
positioning pattern (Bevy 0.18 UI has no clean
|
||||
`translate-x: -50%` primitive, so endpoints flush against
|
||||
banner edges and middle three accept slight right-of-notch
|
||||
offset). Label colour is `TEXT_SECONDARY` (mockup's
|
||||
`BORDER_SUBTLE` reads as too low-contrast at 12 px against
|
||||
`BG_ELEVATED_HI`). 4 new tests; 1232 → 1236.
|
||||
- **`1873b3f` — `feat(replay): add keybind-hint footer to
|
||||
overlay banner`.** Second layout-changing commit in B-2's arc.
|
||||
Banner grew from 76 → 92 px to fit a 16 px footer row at the
|
||||
bottom edge with a vim-style mode line on the left
|
||||
(`▌ NORMAL │ replay`) and a keybind-hint on the right
|
||||
(`[SPACE] pause/resume`). Surfaces the existing Space
|
||||
accelerator visually so CLAUDE.md §3.3's UI-first contract
|
||||
holds for keyboard accelerators too. Footer lists *only
|
||||
wired* keybinds — future commits that wire ESC for stop or
|
||||
← / → for prev/next will extend the right-hand text in
|
||||
lockstep. Two pure helpers (`keybind_footer_mode_text`,
|
||||
`keybind_footer_hint_text`) keep the static text testable;
|
||||
shared `font_handle_for_labels` clone covers both label and
|
||||
footer text spawns. 1px top border in `BORDER_SUBTLE`
|
||||
separates the footer from the labels row. 4 new tests;
|
||||
1236 → 1240.
|
||||
- **`90e24d9` — `feat(replay): wire ESC accelerator for stop,
|
||||
gate pause modal`.** ESC during an active replay now stops it
|
||||
(mirrors the Stop button click). New `handle_stop_keyboard`
|
||||
system in `replay_overlay.rs` parallels `handle_pause_keyboard`
|
||||
in shape. Cross-plugin coordination via `pause_plugin::toggle_pause`:
|
||||
added a fourth defer-if check
|
||||
(`replay_state.is_some_and(|s| s.is_playing())`) right after
|
||||
`other_modal_scrims` and before `selection`. Symmetric to the
|
||||
existing modal-stack defer pattern. Footer hint extended from
|
||||
`[SPACE] pause/resume` → `[SPACE] pause/resume · [ESC] stop`
|
||||
in lockstep with the wiring; the only-wired-keybinds
|
||||
discipline holds. 3 new tests + 1 updated helper-pin test;
|
||||
1240 → 1243.
|
||||
- **`23902cd` — `feat(replay): HC-mode coverage for
|
||||
keybind-footer top border`.** Tag the footer's border-carrying
|
||||
Node with `HighContrastBorder::with_default(BORDER_SUBTLE)` so
|
||||
the existing `apply_high_contrast_borders` system bumps the
|
||||
1 px top border from `#505050` → `#a0a0a0` under HC mode.
|
||||
Footer text colours don't need bumps —
|
||||
`TEXT_SECONDARY` (`#a0a0a0`) is already at `BORDER_SUBTLE_HC`
|
||||
luminance by design (no `TEXT_SECONDARY_HC` constant exists).
|
||||
The 1 px scrub track, notch ticks, and WIN MOVE marker render
|
||||
via `BackgroundColor` (not `BorderColor`) so the marker
|
||||
doesn't apply — HC coverage for those would need a
|
||||
settings-aware paint system (precedent: `radial_rim_outline`
|
||||
in `radial_menu`) and is deferred. 1 new test; 1243 → 1244.
|
||||
- **`e5c4f51` — `feat(replay): wire ← / → keyboard accelerators
|
||||
for paused stepping`.** New `step_backwards_replay_playback`
|
||||
in `replay_playback.rs` decrements the cursor and dispatches
|
||||
`UndoRequestEvent`; the game's `handle_undo` reads it next
|
||||
frame to reverse its most-recent move — hooking the existing
|
||||
undo system rather than replaying forward from cursor 0
|
||||
(every replay-applied move pushes to the undo stack the same
|
||||
way a player move would, so undo is the right reversal
|
||||
primitive). Both arrow keys are paused-only via the same
|
||||
destructure-gate pattern the forward step uses. Footer hint
|
||||
extended in lockstep:
|
||||
`[SPACE] pause/resume · [ESC] stop · [← →] step`. Footer
|
||||
reads "step" not the mockup's "scrub" — single-move step is
|
||||
what's wired; continuous scrub would need a key-held event
|
||||
source. `ReplayOverlayPlugin` gains
|
||||
`add_message::<UndoRequestEvent>()` defensively. 6 new tests
|
||||
(2 hint pins + 4 keyboard scenarios) + 1 updated helper-pin
|
||||
test; 1244 → 1250 total tests, 1249 passing.
|
||||
One commit in flight (not yet pushed to origin): `da3e542`
|
||||
adds the full-screen tableau dim layer. CHANGELOG and
|
||||
SESSION_HANDOFF updates ride on top. Push with:
|
||||
```
|
||||
git push origin master
|
||||
git push origin v0.21.7
|
||||
```
|
||||
|
||||
**Pre-existing flake noted (verified):**
|
||||
`daily_challenge_plugin::tests::
|
||||
check_system_fires_warning_event_only_once_per_day` is
|
||||
time-dependent — fails when wall-clock UTC is within 30
|
||||
minutes of midnight (the daily-expiry warning window the test
|
||||
asserts against). Verified pre-existing by stashing all
|
||||
changes and re-running before commit — failure persisted. Same
|
||||
shape as the `winnable_seed_search` flake from earlier in the
|
||||
session. Will pass deterministically when UTC isn't in the
|
||||
warning window. Not introduced by recent work.
|
||||
Open next-step menu (all major B-2 sub-pieces now closed):
|
||||
1. **Polish: notch label centering.** Bevy 0.18 lacks a
|
||||
clean `translate-x: -50%` primitive so the middle three
|
||||
scrub-bar labels sit slightly right-of-notch. Could use a
|
||||
child Text wrapper with computed left-margin compensation.
|
||||
Tiny commit, requires visual review.
|
||||
2. **Polish: WIN MOVE marker HC bump.** Currently uses
|
||||
`STATE_SUCCESS` lime which stays visible under HC, but a
|
||||
contrast bump under HC would make it even more legible
|
||||
alongside the bumped notches. Optional.
|
||||
3. **Move Log auto-scroll** — only relevant if the panel's
|
||||
row count grows beyond the current 5-row fixed window.
|
||||
Currently the prev-2 / active / next-2 layout fits all
|
||||
visible content, so auto-scroll is unneeded.
|
||||
|
||||
Banner geometry is now mutable — every prior B-2 commit fit
|
||||
inside fixed 60 px space, but the notch-labels commit
|
||||
established the "grow the container, add a new flex-column
|
||||
child" precedent and the keybind-footer commit applied it
|
||||
again. The next sub-pieces need significantly more vertical
|
||||
room and follow the same shape.
|
||||
|
||||
Next finite step on B-2: keyboard accelerator coverage is now
|
||||
complete (`Space` / `Esc` / `←` / `→`). Remaining choices:
|
||||
1. **HC-mode coverage for the scrub-track / notch ticks /
|
||||
WIN MOVE marker.** These render via `BackgroundColor` (not
|
||||
`BorderColor`) so `HighContrastBorder` doesn't apply.
|
||||
Pattern would mirror `radial_menu::radial_rim_outline` —
|
||||
per-frame paint reading `Settings::high_contrast_mode`.
|
||||
Small commit, accessibility-progressing.
|
||||
2. **Continuous scrub on key-held ← / →** instead of
|
||||
single-move step. Needs a key-held event source (or
|
||||
accumulator timer in the keyboard handler). Medium scope;
|
||||
matches the mockup's `[← →] scrub` terminology.
|
||||
3. **Move-log scroller / mini-tableau preview** — both need a
|
||||
much larger banner-height grow (effectively the takeover
|
||||
container itself). Bigger arcs; the natural place to land
|
||||
the layout reflow that turns the banner into a takeover.
|
||||
4. **Cut a v0.21.5 patch release** rolling up the four
|
||||
post-cut commits (`fe68861`, `d322abf`, `1873b3f`,
|
||||
`90e24d9`, `23902cd`, `e5c4f51`) under the through-line
|
||||
"replay-overlay scrubbing affordances + accessibility."
|
||||
Coherent narrative; six commits is a normal-sized patch
|
||||
bundle for this project.
|
||||
|
||||
Recommended order: option 4 (cut release) is a clean next
|
||||
boundary — six commits with a clear through-line is the right
|
||||
size to bundle. Option 1 (HC paint for decorative pieces) is
|
||||
the smallest next-feature commit if continuing past the cut.
|
||||
Recommended order: options 1 and 2 are tiny polish commits
|
||||
that benefit from visual review. Option 3 is a non-starter
|
||||
unless the panel's row capacity grows.
|
||||
|
||||
## Open punch list
|
||||
|
||||
@@ -224,39 +92,18 @@ chrome migration, splash boot screen, replay-overlay banner,
|
||||
card-face artwork (both rendering paths), and the `ACCENT_PRIMARY`
|
||||
palette refresh all shipped in v0.20.0 + v0.21.0. What stays open:
|
||||
|
||||
- **Replay-overlay screen-takeover redesign.** The full mockup
|
||||
(`docs/ui-mockups/replay-overlay-mobile.html`) calls for a
|
||||
mini-tableau preview, playback controls, move-log scroll, and
|
||||
a WIN MOVE marker on the scrub bar. Banner-local pieces all
|
||||
shipped in v0.21.0 (`c84d9f4` + `6204db8` + `54005d5` +
|
||||
`e080b49`); the floating MOVE chip above the focused card
|
||||
shipped in v0.21.2 (`2fb2d63`). The WIN MOVE scrub-bar marker
|
||||
shipped post-v0.21.3 in `ab857bb` (data field) + `52befa6`
|
||||
(UI). Playback controls (pause / resume / step + Space
|
||||
accelerator) shipped post-v0.21.3 in `fbe48ac`. Quarter-mark
|
||||
scrub notches (5 ticks at 0/25/50/75/100 %) shipped
|
||||
post-v0.21.4 in `fe68861` — first decoration step toward the
|
||||
takeover layout. Percentage labels under each notch shipped
|
||||
post-v0.21.4 in `d322abf` — first **layout-changing** commit
|
||||
(banner 60 → 76 px). Keybind-hint footer shipped in `1873b3f`
|
||||
(banner 76 → 92 px — vim-style mode line + `[SPACE]
|
||||
pause/resume`). ESC accelerator wiring (with cross-plugin
|
||||
gate in `pause_plugin::toggle_pause`) shipped in `90e24d9`.
|
||||
HC-mode coverage for the footer's top border shipped in
|
||||
`23902cd`. ← / → keyboard accelerators for paused stepping
|
||||
shipped in `e5c4f51` (hooks the existing undo system for
|
||||
backwards step; footer extended to
|
||||
`[SPACE] pause/resume · [ESC] stop · [← →] step`). Banner
|
||||
geometry is mutable; keyboard accelerator coverage is
|
||||
complete. What still needs to land: HC-mode coverage for
|
||||
the scrub-track / notches / WIN MOVE marker (they render
|
||||
via `BackgroundColor` so the `HighContrastBorder` marker
|
||||
doesn't apply — needs a settings-aware paint), continuous
|
||||
scrub on key-held ← / → (vs single-step), then the bigger
|
||||
pieces — a move-log scroller and a mini-tableau preview —
|
||||
both screen-takeover-only pieces that need a much larger
|
||||
banner height grow (effectively the takeover container
|
||||
itself). Multi-session.
|
||||
- *Replay-overlay screen-takeover redesign — closed 2026-05-08
|
||||
across 13 commits (v0.21.4–v0.21.7).* The full mockup
|
||||
(`docs/ui-mockups/replay-overlay-mobile.html`) has shipped:
|
||||
banner chrome (v0.21.0), floating MOVE chip (v0.21.2), WIN
|
||||
MOVE scrub-bar marker (post-v0.21.3), playback controls /
|
||||
Space accelerator (post-v0.21.3), scrub notches + labels +
|
||||
keybind footer + ESC / ← / → accelerators + HC border
|
||||
(v0.21.5), Move Log panel + HC scrub track + continuous
|
||||
scrub (v0.21.6), and full-screen 50 % opacity dim layer
|
||||
(v0.21.7). Every major B-2 sub-piece is now closed. The
|
||||
only remaining items are minor polish: notch-label centering
|
||||
and WIN MOVE HC contrast bump (see Open next-step menu).*
|
||||
- *Floating `MOVE N/M` chip above the focused card during
|
||||
playback — closed 2026-05-08 by `2fb2d63`.* World-space
|
||||
`Text2d` entity sibling to the banner overlay; uses the same
|
||||
@@ -399,27 +246,22 @@ into a v0.21.1 / v0.22.0 cut.
|
||||
```
|
||||
You are a senior Rust + Bevy developer working on Solitaire Quest.
|
||||
Working directory: <Rusty_Solitaire clone path on this machine>.
|
||||
Branch: master. v0.21.4 is tagged at 23ff62c (cut 2026-05-08, a
|
||||
patch release rolling up replay-scrubbing accessibility: WIN MOVE
|
||||
marker on the scrub bar, pause / resume / step playback controls
|
||||
with a Space keyboard accelerator, and the additive
|
||||
`Replay::win_move_index: Option<usize>` data field that makes the
|
||||
marker possible). v0.21.3 stays at 3d92a91, v0.21.2 at f23df3b,
|
||||
v0.21.1 at daa655a, v0.21.0 at 04f9bf9. Working tree clean. See
|
||||
CHANGELOG.md § [0.21.4] for full detail.
|
||||
Branch: master. v0.21.7 is tagged at da3e542 (cut 2026-05-08,
|
||||
closes the last major B-2 sub-piece: full-screen tableau dim
|
||||
layer — 50 % opacity black UI scrim at z=54 that darkens the
|
||||
card world during replay so the chrome reads clearly above it).
|
||||
v0.21.6 stays at f63db76, v0.21.5 at a2432df, v0.21.4 at
|
||||
23ff62c, v0.21.3 at 3d92a91, v0.21.2 at f23df3b, v0.21.1 at
|
||||
daa655a, v0.21.0 at 04f9bf9. Working tree clean (CHANGELOG +
|
||||
SESSION_HANDOFF docs ride on top of da3e542; push pending).
|
||||
See CHANGELOG.md § [0.21.7] for full detail.
|
||||
|
||||
State: HEAD locally — see `git rev-parse HEAD`. Post-cut HEAD is
|
||||
`e5c4f51` (six carved-out commits on top of v0.21.4 — scrub-bar
|
||||
notches `fe68861`, notch labels `d322abf`, keybind-hint footer
|
||||
`1873b3f`, ESC accelerator + pause-modal gate `90e24d9`, HC
|
||||
marker for footer border `23902cd`, ← / → keyboard accelerators
|
||||
`e5c4f51`). Workspace tests: 1250 total / 1249 passing / 1
|
||||
pre-existing time-dependent flake (clock-near-midnight; verified
|
||||
not introduced by recent work). Clippy clean.
|
||||
State: HEAD locally — see `git rev-parse HEAD`. Workspace
|
||||
tests: 1275 passing / 0 failing. Clippy clean.
|
||||
|
||||
READ FIRST (in order, before doing anything):
|
||||
1. SESSION_HANDOFF.md — this file
|
||||
2. CHANGELOG.md — [0.21.4] section is the most recent cut
|
||||
2. CHANGELOG.md — [0.21.6] section is the most recent cut
|
||||
3. CLAUDE.md — unified-3.0 rule set
|
||||
4. CLAUDE_SPEC.md — formal architecture spec
|
||||
5. ARCHITECTURE.md — crate responsibilities + data flow
|
||||
@@ -439,38 +281,15 @@ DECISION TO ASK THE PLAYER FIRST:
|
||||
tests can't catch. Likely surfaces JNI ClipboardManager
|
||||
and Android Keystore stubs that need real bridges. Larger
|
||||
scope; needs an Android device or emulator running.
|
||||
B. Replay-overlay screen-takeover redesign — multi-session
|
||||
work. Three sub-pieces shipped in v0.21.4: WIN MOVE
|
||||
marker (data field + UI) and pause / step / Space
|
||||
playback controls. The smaller floating-MOVE-chip piece
|
||||
shipped in v0.21.2 (`2fb2d63`). Post-v0.21.4: scrub
|
||||
notches `fe68861`, notch labels `d322abf` (banner
|
||||
60 → 76 px), keybind-hint footer `1873b3f` (banner
|
||||
76 → 92 px), ESC accelerator + cross-plugin gate
|
||||
`90e24d9`, HC-mode coverage for the footer top border
|
||||
`23902cd`, and ← / → keyboard accelerators for paused
|
||||
stepping `e5c4f51` (hooks the game's undo system for
|
||||
backwards step; footer extended to
|
||||
`[SPACE] pause/resume · [ESC] stop · [← →] step`).
|
||||
Keyboard accelerator coverage is complete. Natural next
|
||||
finite steps:
|
||||
1. **Cut a v0.21.5 patch release** rolling up the six
|
||||
post-cut commits under "replay-overlay scrubbing
|
||||
affordances + accessibility." Coherent narrative;
|
||||
clean release boundary.
|
||||
2. **HC-mode coverage** for the scrub-track / notches /
|
||||
WIN MOVE marker (render via `BackgroundColor` not
|
||||
`BorderColor`, so `HighContrastBorder` doesn't apply
|
||||
— needs a settings-aware paint, precedent
|
||||
`radial_rim_outline`). Small commit.
|
||||
3. **Continuous scrub on key-held ← / →** instead of
|
||||
single-step. Needs a key-held event source. Matches
|
||||
the mockup's `[← →] scrub` terminology.
|
||||
4. **Move-log scroller / mini-tableau preview** — both
|
||||
need a much larger banner-height grow (effectively
|
||||
the takeover container itself). Multi-session arcs
|
||||
that close B-2.
|
||||
Mockup at `docs/ui-mockups/replay-overlay-mobile.html`.
|
||||
B. Replay-overlay polish (B-2 arc fully closed in v0.21.7).
|
||||
All 13 planned sub-pieces shipped. Remaining items are
|
||||
minor polish: (a) scrub-bar notch-label centering — middle
|
||||
three labels sit slightly right-of-notch due to Bevy 0.18
|
||||
lacking `translate-x: -50%`; tiny commit, needs visual
|
||||
review. (b) WIN MOVE marker HC contrast bump — optional
|
||||
luminance boost under HC mode. Both are single commits
|
||||
requiring visual review; recommend treating as a v0.21.8
|
||||
polish pass after manual testing.
|
||||
C. Phase 8 (sync) — local storage scaffolding, self-hosted
|
||||
Axum server, `SolitaireServerClient` impl, GPGS stub
|
||||
wired into Settings. The biggest open arc by scope; rolls
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -34,7 +34,8 @@ use crate::ui_modal::{
|
||||
};
|
||||
use crate::ui_tooltip::Tooltip;
|
||||
use crate::ui_theme::{
|
||||
BG_BASE, BG_ELEVATED, BG_ELEVATED_HI, BORDER_SUBTLE, BORDER_SUBTLE_HC, HighContrastBorder,
|
||||
BG_BASE, BG_ELEVATED, BG_ELEVATED_HI, BORDER_SUBTLE, BORDER_SUBTLE_HC, HighContrastBackground,
|
||||
HighContrastBorder,
|
||||
RADIUS_SM, SPACE_2, STATE_SUCCESS, TEXT_PRIMARY, TEXT_SECONDARY, TYPE_BODY, TYPE_BODY_LG,
|
||||
TYPE_CAPTION, VAL_SPACE_2, VAL_SPACE_3, Z_MODAL_PANEL,
|
||||
};
|
||||
@@ -365,6 +366,7 @@ impl Plugin for SettingsPlugin {
|
||||
update_color_blind_text,
|
||||
update_high_contrast_text,
|
||||
update_high_contrast_borders,
|
||||
update_high_contrast_backgrounds,
|
||||
update_reduce_motion_text,
|
||||
update_tooltip_delay_text,
|
||||
update_time_bonus_multiplier_text,
|
||||
@@ -674,6 +676,41 @@ fn update_high_contrast_borders(
|
||||
}
|
||||
}
|
||||
|
||||
/// Repaints `BackgroundColor` on every entity tagged with
|
||||
/// [`HighContrastBackground`] based on `Settings::high_contrast_mode`.
|
||||
/// Off → the marker's `default_color`; on → `BORDER_SUBTLE_HC`
|
||||
/// (`#a0a0a0`). Compares against the current background and only
|
||||
/// mutates when different so Bevy's change-detection doesn't trigger
|
||||
/// repaints every frame.
|
||||
///
|
||||
/// Parallel to [`update_high_contrast_borders`]. Same on/off rule,
|
||||
/// same change-suppression idiom, different colour channel —
|
||||
/// `BackgroundColor` for tick marks, decorative strips, fine
|
||||
/// separators that paint their shape directly rather than via a
|
||||
/// `BorderColor` on a wider Node.
|
||||
///
|
||||
/// Tagged sites in v0.21.x: the replay overlay's 1 px scrub track
|
||||
/// + 5 quarter-mark notch ticks (`replay_overlay::spawn_overlay`).
|
||||
///
|
||||
/// More sites can be tagged in follow-ups by adding
|
||||
/// `HighContrastBackground::with_default(...)` to their spawn tuple.
|
||||
pub(crate) fn update_high_contrast_backgrounds(
|
||||
settings: Res<SettingsResource>,
|
||||
mut backgrounds: Query<(&HighContrastBackground, &mut BackgroundColor)>,
|
||||
) {
|
||||
let high_contrast = settings.0.high_contrast_mode;
|
||||
for (marker, mut bg) in backgrounds.iter_mut() {
|
||||
let target = if high_contrast {
|
||||
marker.hc_color
|
||||
} else {
|
||||
marker.default_color
|
||||
};
|
||||
if bg.0 != target {
|
||||
*bg = BackgroundColor(target);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn update_reduce_motion_text(
|
||||
settings: Res<SettingsResource>,
|
||||
mut text_nodes: Query<&mut Text, With<ReduceMotionText>>,
|
||||
|
||||
@@ -93,6 +93,13 @@ pub const ACCENT_SECONDARY: Color = Color::srgb(0.882, 0.639, 0.933);
|
||||
/// from base16-eighties. `#acc267`.
|
||||
pub const STATE_SUCCESS: Color = Color::srgb(0.675, 0.761, 0.404);
|
||||
|
||||
/// High-contrast variant of [`STATE_SUCCESS`] — `#c8e862`. Brighter
|
||||
/// lime that maintains the success hue while lifting luminance from
|
||||
/// ~0.51 → ~0.73 so the WIN MOVE scrub-bar marker stands out from
|
||||
/// the bumped notch ticks (`BORDER_SUBTLE_HC` `#a0a0a0`, L≈0.60) in
|
||||
/// high-contrast mode.
|
||||
pub const STATE_SUCCESS_HC: Color = Color::srgb(0.784, 0.910, 0.384);
|
||||
|
||||
/// Warning — penalty signal, daily-seed expiry countdown, sync-pending
|
||||
/// status. Gold from base16-eighties. **Both** Undo and Recycle
|
||||
/// counters use this when non-zero. `#ddb26f`.
|
||||
@@ -252,6 +259,56 @@ impl HighContrastBorder {
|
||||
}
|
||||
}
|
||||
|
||||
/// Marker for entities whose [`BackgroundColor`] should swap to
|
||||
/// [`BORDER_SUBTLE_HC`] when `Settings::high_contrast_mode` is on.
|
||||
/// Parallel to [`HighContrastBorder`] but for sites that paint their
|
||||
/// shape via `BackgroundColor` rather than `BorderColor` —
|
||||
/// `bevy::ui` 1 px decorative strips, tick marks, fine separators
|
||||
/// often render as tiny full-bleed `Node`s, not as borders, so the
|
||||
/// border-marker pattern doesn't apply.
|
||||
///
|
||||
/// `default_color` records the off-state colour; `hc_color` the on-
|
||||
/// state colour. [`with_default`] fills `hc_color` with
|
||||
/// [`BORDER_SUBTLE_HC`] so the 90 % of sites that just need the
|
||||
/// standard subtle-border bump can continue using a one-argument
|
||||
/// constructor. [`with_hc`] overrides the HC colour for the rare
|
||||
/// site (currently only the WIN MOVE scrub-bar marker) that needs a
|
||||
/// domain-specific HC variant (`STATE_SUCCESS_HC` instead of a gray).
|
||||
///
|
||||
/// [`with_default`]: HighContrastBackground::with_default
|
||||
/// [`with_hc`]: HighContrastBackground::with_hc
|
||||
/// [`BackgroundColor`]: bevy::prelude::BackgroundColor
|
||||
#[derive(bevy::prelude::Component, Debug, Clone, Copy)]
|
||||
pub struct HighContrastBackground {
|
||||
/// Background colour to use when high-contrast mode is *off* —
|
||||
/// the site's normal idle / active-state colour.
|
||||
pub default_color: bevy::prelude::Color,
|
||||
/// Background colour to use when high-contrast mode is *on*.
|
||||
/// Defaults to [`BORDER_SUBTLE_HC`] via [`with_default`].
|
||||
///
|
||||
/// [`with_default`]: HighContrastBackground::with_default
|
||||
pub hc_color: bevy::prelude::Color,
|
||||
}
|
||||
|
||||
impl HighContrastBackground {
|
||||
/// Convenience constructor — HC colour defaults to
|
||||
/// [`BORDER_SUBTLE_HC`].
|
||||
pub const fn with_default(default_color: bevy::prelude::Color) -> Self {
|
||||
Self { default_color, hc_color: BORDER_SUBTLE_HC }
|
||||
}
|
||||
|
||||
/// Constructor for sites whose HC colour differs from the standard
|
||||
/// [`BORDER_SUBTLE_HC`]. Currently used by the WIN MOVE scrub-bar
|
||||
/// marker which bumps `STATE_SUCCESS` → `STATE_SUCCESS_HC` rather
|
||||
/// than to a neutral gray.
|
||||
pub const fn with_hc(
|
||||
default_color: bevy::prelude::Color,
|
||||
hc_color: bevy::prelude::Color,
|
||||
) -> Self {
|
||||
Self { default_color, hc_color }
|
||||
}
|
||||
}
|
||||
|
||||
/// Strong border — hover outline, focused button, active popover.
|
||||
/// `outline` from the design system. `#505050`.
|
||||
pub const BORDER_STRONG: Color = Color::srgba(0.314, 0.314, 0.314, 1.0);
|
||||
|
||||
Reference in New Issue
Block a user