43f13c615e
Drops dead deps and stale doc content carried over from the pre-MIT art swap. Cargo.toml manifests: - solitaire_core no longer depends on chrono (no source references it since the original sync-payload timestamps moved to solitaire_data). - solitaire_sync no longer depends on serde_json (the sync types use serde-derive with whatever serializer the caller picks; the old json-specific helpers were removed earlier). Cargo.lock pruned by `cargo build` to drop the now-untransitively- referenced versions. CREDITS.md redistribution clause: "LGPL and OFL notices" tightened to "MIT (project + hayeah card art) and OFL (FiraMono)" since the LGPL art is gone. SESSION_HANDOFF.md: - HEAD bumped to 924a1e2; test count to 960; 9 ignored. - Punch list rewritten — the xCards-URL line is obsolete (we did the swap), v0.1.0 tag exists locally, and player smoke-test is the current top item. - New "Card-theme system (CARD_PLAN.md, fully shipped)" section summarises the seven-phase end-to-end flow so a future session has the integration map without re-reading the plan. - Optional list gains the SVG-vs-layout aspect-ratio note as a cosmetic-only follow-up. Removed the locked worktree at .claude/worktrees/agent-aa55a94d18c669d70 left behind by a prior Claude session. cargo build / clippy --workspace --all-targets -- -D warnings / test --workspace all green (960 passed, 0 failed, 9 ignored).
160 lines
9.3 KiB
Markdown
160 lines
9.3 KiB
Markdown
# Solitaire Quest — UX Overhaul Session Handoff
|
|
|
|
**Last updated:** 2026-05-01 — Phases 3, 4, 5 + the seven CARD_PLAN phases all shipped. v0.1.0 tagged locally. Bundled card art + runtime SVG theme system + in-Settings theme picker all live. Remaining work is desktop packaging and a player-side smoke test of the new theme.
|
|
|
|
## Status at pause
|
|
|
|
- **HEAD:** `924a1e2`. v0.1.0 tag created locally (push pending interactive credentials).
|
|
- **Working tree:** clean after the post-Phase cleanup pass.
|
|
- **Build:** `cargo clippy --workspace --all-targets -- -D warnings` clean.
|
|
- **Tests:** **960 passed / 0 failed / 9 ignored** across the workspace.
|
|
|
|
## Where we are
|
|
|
|
Phase 3 (design tokens + modal scaffold) and Phase 4 (release polish) shipped earlier. Phase 5 — running the binary end-to-end and fixing what broke — landed nine more commits today: a layout fit fix so tableau columns stop spilling off-screen, a three-pronged resize-lag fix, persisted window geometry, splash skip on subsequent launches, achievement tooltips, a code-quality sweep, client-side sync round-trip tests, and a hit-test fix so dragging a card no longer requires aiming for the bottom strip.
|
|
|
|
Polish is essentially complete; the remaining work is tagging v0.1.0 and desktop packaging.
|
|
|
|
### Design direction (unchanged)
|
|
|
|
- **Tone:** Balatro — chunky readable type, theatrical hierarchy, satisfying micro-interactions.
|
|
- **Palette:** Midnight Purple base + Balatro yellow primary + warm magenta secondary.
|
|
- See [memory/project_ux_overhaul_2026-04.md](.claude/projects/-home-manage-Rusty-Solitare/memory/project_ux_overhaul_2026-04.md) for full direction.
|
|
|
|
## Phase 3 (shipped)
|
|
|
|
- `solitaire_engine/src/ui_theme.rs` — every design token: colours, type scale, spacing scale, radius rungs, z-index hierarchy, motion durations.
|
|
- `solitaire_engine/src/ui_modal.rs` — `spawn_modal` scaffold + button-variant helpers + `paint_modal_buttons` system.
|
|
- All 12 overlays migrated to the modal scaffold with real Primary/Secondary/Tertiary buttons (no more Y/N debug prompts).
|
|
- HUD restructured into a 4-tier vertical stack with progressive disclosure.
|
|
- Animation upgrades: `SmoothSnap` slide curves, scoped settle bounce, deal jitter, win-cascade rotation.
|
|
|
|
## Phase 4 (shipped 2026-04-30)
|
|
|
|
| Area | Commit | What landed |
|
|
|---|---|---|
|
|
| Workspace lint | `9bfca92` | Test-only clippy warnings under `--all-targets` resolved. |
|
|
| App / window | `5f5aba8` | WM_CLASS, centered-on-primary window, panic hook → `crash.log`. |
|
|
| Modal animation | `71999e1` | `ModalEntering` + ease-out scrim fade and 0.96→1.0 card scale. |
|
|
| Score feedback | `dcfa976` | `ScorePulse` triangular 1.0→1.1→1.0; floating "+N" for jumps ≥ threshold. |
|
|
| Hit targets | `b082bd6` | `ICON_BUTTON_PX` 28 → 32; sync status reads "local only". |
|
|
| Microcopy | `abeb4e5` | Help "Close" → "Done"; final onboarding CTA → "Let's play". |
|
|
| Empty states | `65d595a` | First-launch em-dash zero-stats grid + welcome line on Profile. |
|
|
| Leaderboard | `1384365` | Idle/Loaded/Error enum; local-only guard. |
|
|
| Credits | `fd7fb7b`, `f866299` | CREDITS.md added; README links it. |
|
|
| Home | `c1bde18` | Home repurposed as Mode Launcher with level-5 lock state. |
|
|
| Focus rings (Phase 1) | `1278952` | Tab/Shift-Tab/Enter on every modal button; auto-focus primary. |
|
|
| Focus rings (Phase 2) | `51d3454` | HUD action bar (hover-gated) and Home mode cards. |
|
|
| Focus rings (Phase 3) | `b78a493` | Settings: icon buttons, swatches, toggles; arrow-key `FocusRow`; auto-scroll. |
|
|
| Achievement tests | `2e080d0` | Integration coverage for `draw_three_master` and `zen_winner`. |
|
|
| Microcopy | `0c86cac` | "New game" / "Forfeit" replace "Yes, abandon" / "Yes, forfeit". |
|
|
| Tooltip infra | `54d3497` | `Tooltip(Cow<'static, str>)` component + hover-delay overlay. |
|
|
| HUD tooltips | `220e3f0` | 10 readouts + 6 action buttons. |
|
|
| Settings tooltips | `74597a8` | Volume, toggles, swatches, Sync Now. |
|
|
| Popover tooltips | `dbe6c60` | Modes and Menu rows. |
|
|
| Splash | `5d57b67` | Branded splash overlay (300ms fade-in / ~1s hold / 300ms fade-out). |
|
|
| Doc-rot | `73e210b` | ARCHITECTURE.md `bevy_kira_audio` references → `kira`. |
|
|
| Doc | `de52c8a`, `60a8036` | Mid-session and end-of-Phase-4 SESSION_HANDOFF refreshes. |
|
|
|
|
## Phase 5 (shipped 2026-05-01)
|
|
|
|
Smoke test surfaced three issues: window-resize lag, tableau columns clipped below viewport, hit-target offset on cards. All fixed, plus four bonus polish items.
|
|
|
|
| Area | Commit | What landed |
|
|
|---|---|---|
|
|
| Layout fit | `8dda954` | `card_height` constrained by vertical budget; worst-case 13-card column always fits. |
|
|
| Resize perf | `1719fda` | In-place sprite/text mutation + 50ms `ResizeThrottle` (was full re-spawn per pixel). |
|
|
| Resize stall | `59316de` | `PresentMode::AutoNoVsync` eliminates the X11/Wayland vsync stall during drag. |
|
|
| Window geometry | `6e7705b` | `WindowGeometry` persisted to settings.json; debounced save on resize/move. |
|
|
| Achievements | `7448225` | Tooltips on rows: reward shown when unlocked, condition + reward when locked, secrets stay cryptic. |
|
|
| Lint sweep | `4b9d008` | 33 pedantic warnings cleared (`map_unwrap_or`, `uninlined_format_args`, `match_same_arms`). |
|
|
| Sync tests | `3ef4ecb` | Five client-side round-trip integration tests via in-process axum + mock keyring. |
|
|
| Splash | `912b08c` | Splash skipped on subsequent launches via existing `first_run_complete` flag. |
|
|
| Hit test | `902560c` | `card_position` mirrors face-down fan step (0.12) for accurate AABB on tableau columns. |
|
|
|
|
## Open punch list for v1
|
|
|
|
1. **Player smoke-test of the new theme system.** Launch
|
|
`cargo run -p solitaire_app --features bevy/dynamic_linking` and
|
|
confirm: (a) hayeah card faces render correctly, (b) the
|
|
midnight-purple `back.svg` shows on face-down cards, (c) the
|
|
"Card Theme" picker appears in Settings → Cosmetic with at least
|
|
the "Default" chip, (d) clicking the chip is a no-op (already
|
|
selected) without errors.
|
|
2. **Push the v0.1.0 tag** — `git push origin v0.1.0` once you're
|
|
happy with the smoke-test outcome. Tag exists locally; not yet on
|
|
origin.
|
|
3. **Desktop packaging** per ARCHITECTURE.md §17. The Arch PKGBUILD
|
|
exists in `/home/manage/solitaire-quest-pkgbuild/` (separate repo,
|
|
no remote yet — `git remote add origin <URL>` and push to your
|
|
gitea / AUR when ready). Still pending: app icon, macOS .icns +
|
|
notarisation cert, Windows .ico + Authenticode cert, AppImage
|
|
recipe.
|
|
|
|
### Optional, deferred
|
|
|
|
- Animated focus ring (currently a static overlay; could pulse on focus change).
|
|
- Achievement onboarding pass — show first-time players the achievement panel after their first win.
|
|
- Mode-switch keyboard shortcut from inside the Mode Launcher (today only mouse opens it).
|
|
- Runtime aspect-ratio fidelity for the bundled hayeah cards: the SVG
|
|
source is ~1.45 height/width while the engine layout assumes 1.4.
|
|
Cards display ~3% squashed vertically; either widen the layout or
|
|
letterbox the SVGs to match. Cosmetic-only; not blocking.
|
|
|
|
## Card-theme system (CARD_PLAN.md, fully shipped)
|
|
|
|
Seven phases landed across `b8fb3fb` → `924a1e2`. End-to-end flow:
|
|
|
|
- **Bundled default theme** ships in the binary via `embedded://` —
|
|
52 hayeah/playing-cards-assets SVGs (MIT) + a midnight-purple
|
|
`back.svg` (original work).
|
|
- **User themes** live under `themes://` rooted at
|
|
`solitaire_engine::assets::user_theme_dir()`. Drop a directory
|
|
containing a valid `theme.ron` + 53 SVG files there and it
|
|
appears in the registry on next launch.
|
|
- **Importer** at `solitaire_engine::theme::import_theme(zip)`
|
|
validates an archive (20 MB cap, zip-slip rejection, manifest
|
|
validation, every referenced SVG round-tripped through the
|
|
rasteriser) and atomically unpacks it into the user themes dir.
|
|
- **Picker UI** in Settings → Cosmetic offers one chip per
|
|
registered theme; selection persists to `settings.json` as
|
|
`selected_theme_id` and propagates to live card sprites via
|
|
`react_to_settings_theme_change` →
|
|
`sync_card_image_set_with_active_theme` → `StateChangedEvent`.
|
|
|
|
## Resume prompt
|
|
|
|
```
|
|
You are a senior Rust + Bevy developer finishing v1 of Solitaire
|
|
Quest. Working directory: /home/manage/Rusty_Solitare. Branch:
|
|
master. The polish phase is complete; the remaining work is release
|
|
prep, not new features.
|
|
|
|
State: HEAD=902560c, fully pushed to origin. Working tree clean.
|
|
Build: cargo clippy --workspace --all-targets -- -D warnings clean.
|
|
Tests: 906 passed / 0 failed.
|
|
|
|
READ FIRST (in order, before doing anything):
|
|
1. SESSION_HANDOFF.md — full state and punch list
|
|
2. CLAUDE.md — hard rules (UI-first, no panics, etc.)
|
|
3. ARCHITECTURE.md §15, §17 — platform targets, deployment guide
|
|
4. ~/.claude/projects/-home-manage-Rusty-Solitare/memory/MEMORY.md
|
|
— saved feedback / project context
|
|
|
|
PUNCH LIST (in priority order):
|
|
1. Confirm or fill the xCards upstream URL in CREDITS.md (one-line
|
|
edit; not a release blocker).
|
|
2. Tag v0.1.0 once the user signs off.
|
|
3. Desktop packaging: icon hookup, platform bundles (.ico/.icns/
|
|
AppImage), signing. Needs artwork and certs from the user.
|
|
|
|
WORKFLOW NOTES:
|
|
- Commits use:
|
|
git -c user.name=funman300 -c user.email=root@vscode.infinity commit -m "..."
|
|
- Sub-agents stage + verify only; orchestrator commits.
|
|
- Every commit must pass build / clippy / test.
|
|
|
|
OPEN AT THE START: ask which punch-list item to start on. Don't pick
|
|
unilaterally — release-readiness ordering is the user's call.
|
|
```
|