Repository navigation
Conversation
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…flag Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
… the watch Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…ayed until the phone has them Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…e a removal Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
… never drops a newer change Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…on and a hold for the set menu Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…d the Set added toast Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…Failure that fits Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…ent, 12 pt tags Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
… page counts them, Add closes only when it added, send flushes only on main, black sheet, quiet close, 12 pt floor Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…e the clock, Add set centred like Remove Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…ed glyph frame, same label, centred) Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…ets) - No hold on the set page: it took the page swipe away on the wrist. The "…" button is the way in, now on the exercise name's line so it takes no line of its own. - The effort chip of a set being fixed sits on the tag line, not a line of its own. - Every mark closes the menu (Warm-up did, Failure and Drop did not). - A done set can be made a warm-up and back, as in the phone's own set menu; the fix page follows the moved row. - The menu's card shows the set page's numbers, the weight even at 0. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…gits sized from the room, Done down to the page dots - The "…" is the system's top-right toolbar button, so it takes no line of the page. - The weight and reps boxes take the height left; one digit size for both, each box as wide as its value needs. - Too short for the box names (40 mm with tags): the digits alone. - The page ignores the bottom inset and keeps 12 pt clear above the page dots. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…ler boxes A top-right toolbar button made watchOS drop the clock on 42 mm. The set pill is the menu's way in now, as the phone's set number; VoiceOver gets a More action. Digits 40 pt at most, boxes 62 pt at most. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
… the crown turns Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…et menu is open Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…shrinks back into it The pill's tint stretches to the whole screen and turns black, the menu fades in on it. The menu has its own close button where the sheet's X was. Reduce Motion and Always On: no growth. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…tall as they hold; digits roll to a new value The freed height takes the last-time line, unless a tag line already shows. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…d, side and Done Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…not a glyph Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
The set page draws the clock row's badges itself (pill, sync, heart rate), as the rest page already does, so the pill moves with its page instead of fading in and out in the fixed toolbar. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
Six roles in Theme (TypeScale): title, body, second line, label, the set's number and the countdown hero; one pill height; cards on Theme.radius; text 10 pt from the edge; nothing under 12 pt. Metrics keeps Apple Workout's sizes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
… labels The empty hint row made the gap above Add set / Remove twice the others. It now shows over the disc labels on black, only while it has something to say. The rest page's buttons keep 38 pt when the effort chips need the room. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
…last screens
- Last time: one load, then each set's reps ("60 kg × 8, 8, 7"), tested in WatchCore.
- Rest with the effort chips: Up next on one line on every case size, so the countdown keeps its room.
- 40 mm menu: Add set / Remove give way before they clip; disc labels keep a gap.
- Home, summary, hold and keypad on the type scale.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
- Done: a ring in the button's shape ripples out as the set is logged. - Weight/reps: each Crown step stretches the digits a touch and they spring back. - Rest: the last three seconds turn orange and each one punches in. - Countdown: heavier spring on each number; GO! flashes the ring. - Summary: with a record, the mark bounces and a short burst of sparks goes out. All of it still with the wrist down; Reduce Motion keeps only the colour. Demo screens done, spin and rest-end record clips of the motion. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
… set
- Rest: "+15 s" pops up out of the time and floats away; taps in a row add up ("+30 s"),
minus in orange.
- Set pill: after a rest it rolls from the set just done to the next and punches; the
fading pill keeps the done set's number meanwhile.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
- The set menu closes when its set is gone (removed on the phone, workout ended or changed), instead of leaving a black screen with no way out. - A menu edit that moves or removes rows moves the store's own pointers with them: the rest's heart rate, the effort chips, the fix and the page stay on the same set. - A snapshot during the Undo time sends the removal instead of letting Undo bring back an old state (even a workout the phone ended). - A held removal is kept on disk and sent at the next launch if the app dies before it goes out. - Ticks made after an unapplied add, remove or warm-up move land on their own rows when an older snapshot comes in (a trial run of the edits maps the rows). Tested. - An edit on the second copy of an exercise replays on that copy (PendingEdit.entryIdx). Tested. - Timed per-side L/R pairs: the phone says which half a row is; the watch offers no Add/Remove on them and marks Failure on both halves, as the phone does. Tested on both sides. - Per-side drop sets send their sides' drops (they read as 0 before). Tested. - The set pill shows again beside the clock during a hold and its countdown. - Last time is shortened only for plain sets (not drops, F, bursts or sides). Tested. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
Resolves the conflicts with the Live widget work: the watch's set-menu events (setMark, addSet, removeSet) now run inside the event loop's new try/catch and wait with a watch start like the other events. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9RamX7CVCttYsqtzmU
- The set menu closes when a different set slides into its place (the phone removed an earlier one), so a tap cannot hit the wrong set. - VoiceOver's Remove action asks to confirm first, as the spec says, instead of removing the set at once. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
Resolved toward release: its watch-sync.js (set ids, addSet/removeSet), SessionCore and title layouts; the Workout.jsx refactor onto watch-marks.js kept; watch strings regenerated. The set menu is rebuilt on the set ids in the commits after this one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…and remove through release's addSet / removeSet The snapshot carries failure, drop, drops, side and rp on each row and settings.setMenu. A new setMark event names the set by its sid (by place without one), goes through the same queue as the other set events, and applies each mark sent with the phone's own menu rules (watch-marks.js); the later at wins, and a done set whose marks change on the phone is stamped eat. Add and Remove are release's addWatchSet / removeWatchSet, unchanged: the position-based path and its w/r/done check are gone. Garmin rows leave the marks out. watch-sim.js plays a mark; WATCH_SYNC.md has the row. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…over snapshots until acked An edit is now the event itself (setMark, addSet or removeSet) with the set's sid, by place only while the phone has sent none. Add makes up a "w-<uuid>" id and goes at the end; Remove is offered only where the phone's removeWatchSet takes it (not done, no side done, not the only row, a set the phone named). applySnapshot replays the edits in the order made, before release's tick merge, so pending ticks keyed by sid land on added or moved sets. The trial run, the w/r/done identity check and the pending remap are gone. A removal waiting for Undo is a held edit: replayed like any other, released when its time is over, taken back by Undo. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
… waits in the state Marks and Add go out at once without flushing a held removal first (each names its own set). A removal is held in state.edits for its 4 s Undo and sent when the time is over; one left over at a launch goes out then. The merge's second scenePhase is gone, and the motion clip's demo screen is "tap-done" so release's "done" shot shows the finished exercise again. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…rating dial's timing, a Crown lockout Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…it is, and a re-rating replaces the first Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…watch ships Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…nd the - / + discs move it by 0.5 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…ng alone holds the Crown The discs' touch area was only as wide as the drawn disc (31 pt); it now runs 44 x 34 under the value. In the fix view no number box shows the crown glyph while the rating is armed, and a tap on a box lets the rating go. Opening the set menu or the fix view lets an armed rating go too, so the Crown never moves a rating hidden underneath. German says "Digital Crown", as elsewhere on the watch. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
|
Important Draft PR not reviewedDraft PRs are not automatically reviewed by default.
To automatically review draft PRs, update your CodeRabbit configuration: reviews:
auto_review:
drafts: true
|
The snapshot now carries a set's rpe/rir (and each side's), so the fix view starts on it instead of a grey dash. Saving untouched sends no effort. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
With the wrist down the seconds could count up and down between the dimmed frames. The timeline, the numeric content transition and the keyframe now run only when the screen is fully on, and the countdown's range starts when the rest started instead of at the time the view body ran. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
The set page drew its own top row and left the toolbar empty. An empty toolbar item drops the row under the clock, so every page moved 16 pt (18.5 on 49 mm) the moment a swipe settled, and Metrics resized its rows. The heart rate also showed twice, once fixed in the toolbar and once on the sliding set page. No page uses the toolbar now. Each page draws the clock's row itself (ClockRow), keeping the row the toolbar kept where the page was laid out with it, so the heights never change and the badges slide with their page. Measured on the 42 mm simulator: Metrics stays at 167 pt through every swipe (it flipped 183 to 167 before), and the set, overview, metrics, music, hold, done and menu screens look as before. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
# Conflicts: # frontend/ios/App/Watch/SessionView.swift
…s respond The watch gets a UI test target for CI runs (ios/ci/add-watch-ui-tests.rb, in the style of add-ui-tests.rb) that launches the demo session and taps. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…the fix pill arms on tap Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…E scale Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
Each PR that taps a watch control adds its own file under ios/App/OpenGymWatchUITests, and the script and the CI step stay the same, so two such PRs merge without a clash. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…a fade The tapped RIR chip grows into the armed capsule (and the fix view's pill the same), the other chips and DONE go in 0.12 s, and the minus and plus discs fade in from 0.9. Settling and re-arming only fade, and the label line crossfades. Reduce Motion: fades only. Always On: nothing moves. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
This branch has not been deployed
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.
Stacked on #1139. Merge it after #1139.
Why
A lifter on Discord asked for half steps on the watch. The phone already logs RIR 1.5 or RPE 8.5, but the watch could only give a whole number, so a half had to be fixed on the phone afterwards. Now the rating you mean goes in from the wrist, during the rest, with the Crown or two taps.
What changes
(−) RIR 1.5 (crown) (+). The Crown or the − / + discs move it by 0.5. Clockwise means the number goes up, for RIR and RPE alike. RIR runs 0 to 5, RPE 6 to 10, and it stops at the ends (no wrap, a light tick on a disc at an end).RIR 1.5 ✓and lets go of the Crown. Tap it to change the value again.–the first step lands on 2 (RIR) or 8 (RPE); one step below the bottom clears it back to–. Save works at any time.1.5, with the point in every language. A rated 3 reads "3", not the chip's "3+".Effortgets the 0.5 step, the ranges, the clamp and the Crown detents. The dead notch code is gone. NewEffortDialholds the timing;TouchLockgets the Crown lockout. All with tests.watch-sync.effort.test.jsnow covers RIR 1.5, RPE 6.5 and a re-rating replacing the first.Closes #1402
Screenshots (watch simulator)
No 46 mm simulator exists here, so the big size is the 49 mm Ultra. In Always On an armed rating lets go at once, so that frame shows the settled outline.
Needs a real wrist
The simulator cannot tell these. Please check on a watch:
Not shot: a real 46 mm (49 mm used). Not run: VoiceOver, Reduce Motion, the pulse.
Tests
swift testinfrontend/ios/App/WatchCore: 202 tests, 0 failures.npx vitest run src/lib/watch-sync.effort.test.js: 7 passed.Also: a done set now opens on the RIR/RPE logged on it (the snapshot carries
rpe/rirper row and per side), so fixing a set no longer shows a grey "–"; saving without touching the effort sends none.Also (from #1139, merged in): in Always On the rest countdown is plain system text now, with no timeline, number roll or pulse (the seconds counted up and down between the dimmed frames on a Series 10); full-on is unchanged.
Also (from #1139, merged in): swiping between the workout pages no longer jumps; each page draws the clock's row itself, so the bar's height stays put and the heart rate slides with its page.
Wear OS comes in a separate PR (part of #1402).
Related: #1317 (asks for a rating on every set, same effort code on Wear), #1319 (touches RestMath.swift / WatchLogic.kt)
Tap tests (frontend/ios/App/OpenGymWatchUITests): a RIR chip arms the capsule, + and - move it by halves, it settles to the full-width rating and a tap arms it again, and the fix view's pill arms on tap.
🤖 Generated with Claude Code
https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
Pictures added for RPE, the largest text size, the range ends and 49 mm; one demo flag added (-OpenGymWatchEffort rpe).
Motion, updated (this replaces the Motion bullet above): the tapped chip and the fix view's pill grow into the capsule (a spring without bounce, 0.3 s), − / + fade in, settling and re-arming only fade, the label line crossfades; Reduce Motion gets fades only, Always On nothing (reviewed, the four tap tests pass).