Skip to content

Wear OS: rate effort in half steps (RIR 1.5, RPE 8.5) with the crown or - / + - #1412

Draft
cubetes wants to merge 87 commits into
DuarteSantos8:release-1.4.6from
cubetes:feat/wear-rir-half
Draft

cubetes wants to merge 87 commits into
DuarteSantos8:release-1.4.6from
cubetes:feat/wear-rir-half

Conversation

@cubetes

@cubetes cubetes commented Nov 20, 2026 •

Copy link
Copy Markdown
Contributor

Suggested labels: enhancement, mobile

Why a lifter cares. A Discord user asked to rate effort in halves (RIR 1.5, RPE 8.5) on the wrist. The phone already takes halves, but the watch only offered whole numbers. This closes that gap on Wear OS, so you do not have to fix the number on the phone after the set.

What changes

Part of #1402

Stacking

Stacked on #1185 and on the Apple Watch PR #1411. Merge after both.

Not checked yet

  • Kotlin was not compiled locally (no Java here). The CI android job is the first compile.
  • No screenshots yet.
  • Needs a real wrist: whether the crown clashes with paging, whether 5 s is the right settle time, the detent feel at 0.5, a sleeve rolling the crown, and whether DONE hiding in the fix view feels right.

Related: #1317 (asks for a rating on every set, same effort code on Wear), #1319 (touches RestMath.swift / WatchLogic.kt)

Merged feat/watch-rir-half: it brings the Apple Watch tap tests (OpenGymWatchUITests) for the shared rating screens.

🤖 Generated with Claude Code

https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp

cubetes and others added 30 commits November 10, 2026 20:30
… 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
…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
cubetes and others added 10 commits November 20, 2026 16:46
…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
…ckout

Effort.step walks RIR 0 to 5 / RPE 6 to 10 by 0.5 (from none RIR 2 / RPE 8, below the floor
clears it in the fix view), valueLabel never says "3+" for a 3.5, and the timings (0.6 s send,
5 s settle, 0.6 s crown lockout) match the Apple Watch. rateLast takes the set it means and a
quiet mode for a burst's own send.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…alf (DuarteSantos8#1402)

Always-visible - and + buttons (many watches have no rotary), the rotary moving 0.5 while armed,
one adjustable TalkBack node, a tick strip where there is height, a settled full-width capsule,
and the same arming on the fix view's effort pill.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
… steps land when the rest ends

A small watch dropped the effort row as soon as a chip rated the set, so the capsule never armed
there. The row now stays while armed and gives way to Up next when it settles. A burst still
waiting as the rest ended was refused by the touch lock the end sets; the burst's own send now
skips it. Swiping to another page sends and disarms, and the - and + are hidden from TalkBack
with the house order (clear first, then the click).

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
@coderabbitai

coderabbitai Bot commented Nov 20, 2026

Copy link
Copy Markdown

Important

Draft PR not reviewed

Draft PRs are not automatically reviewed by default.

  • Trigger a manual review

To automatically review draft PRs, update your CodeRabbit configuration:

reviews:
  auto_review:
    drafts: true
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

cubetes and others added 18 commits November 21, 2026 10:46
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
The snapshot's rpe/rir are parsed (set and each side). The fix view starts on
it, and Save sends a rating only when it differs from the logged one.

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
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

This branch has not been deployed

No deployments
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