Skip to content

Wear OS rest: Up next and the effort question at 12 sp - #1184

Merged
DuarteSantos8 merged 10 commits into
DuarteSantos8:release-1.4.5from
cubetes:wear/rest-text
Nov 14, 2026
Merged

DuarteSantos8 merged 10 commits into
DuarteSantos8:release-1.4.5from
cubetes:wear/rest-text

Conversation

@cubetes

@cubetes cubetes commented Nov 13, 2026 •

Copy link
Copy Markdown
Contributor

Suggested labels: enhancement, mobile

Stacked on #1181 (which sits on #1174). This PR's own commit is the last one. Merge those first.

Why

Between sets you read Up next and the effort question at arm's length. They were the last texts on the rest screen under 12 sp (11 and 10 sp), the size #1183 sets as the floor everywhere else.

What changes

All in ui/Screens.kt:

  • Up next's set line and its compact "Up next: …" line: 11 to 12 sp.
  • The effort question over the chips ("RIR · How hard was that set?"): 10 to 12 sp.
  • The small-watch rule (with no room for both, the effort question comes before Up next) is re-measured for the taller line: 222 + (fontScale-1)*60 becomes 224 + (fontScale-1)*62.

Checks

  • 40 mm emulator (Wear OS 5), font 1.0 and 1.3, Always On: nothing cut; a long exercise name ends in "…".
  • CI: :wear:testDebugUnitTest, :wear:assembleDebug.

🤖 Generated with Claude Code

https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp

Summary by CodeRabbit

  • New Features
    • Rest timers now display the combined effect of recent adjustments and highlight the final few seconds.
    • Improved watch workout layout adapts to available space and ambient mode, with compact and roomy views for upcoming exercises.
    • Upcoming workout details include elapsed time, which stays aligned with the phone’s pause time.
    • Rest time is displayed more prominently for easier viewing.

cubetes and others added 10 commits November 12, 2026 22:35
- The time left is the screen's one number: in the accent, sized to the room the rest leaves
  (both ways, 28 to 76), no "Rest" label over it. The heart rate was already by the clock.
- −15, Skip and +15 move up to the middle, where a round screen is widest; the effort chips get a
  fixed place under them, so rating moves nothing; Up next last.
- Up next in the accent with the workout's time at its end (standing still while the phone has the
  workout paused), then the set and what to load.
- Always On keeps the same layout: the buttons and chips are hidden but keep their place.

The 40/41 mm rule stays as measured: without room for both, the effort question comes first.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
Seen on a 40 mm watch (Wear OS 3 emulator): with Up next in the chips' place the countdown row was
under 48 dp and ‹ was cut at its corner under the clock. The row is never shorter than ‹, which
steps 6 dp in from the curve on a round screen.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
The clock's arc reaches lower at its ends, where ‹ sits (40 mm emulator, Up next showing).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…ver over the bar

Seen on a 40 mm watch (Wear OS 3 emulator): with Up next in the chips' place the screen needed
~209 dp of its 192. There Up next is one line again ("Up next: the set") with what to load and
the workout's time on the next; a roomy watch keeps three. The countdown is sized to a line of
text (~1.1 of its size), not to the digits alone.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
Seen on a 45 mm Wear OS 5 emulator at the largest font: under the buttons the chips sit where the
circle narrows, and 0 and 3+ lost their outer corners.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…a small watch

Seen on a 40 mm Wear OS 5 emulator: the chips kept their place in Always On, so a watch without
room for both showed an empty space where release-1.4.5 showed what's next and what to load.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
… a small watch

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
…up ±15 taps

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
The "both" height threshold goes from 222 to 224 dp (+ 62 per font scale, was 60), since the 12 sp lines are a little taller.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp
@coderabbitai

coderabbitai Bot commented Nov 13, 2026 •

Copy link
Copy Markdown

Explain Change →

No actionable comments were generated in the recent review.

Walkthrough

The Wear rest screen now tracks rest-time adjustments, changes its timer and content layout, and displays elapsed workout time with the up-next information. Tests cover adjustment totals, adjustment text, and warning thresholds.

Changes: Wear rest screen

Layer / File(s) Summary
Rest adjustment rules and tests
frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/WatchLogic.kt, frontend/android/wear/src/test/java/ch/duartesantos/opengym/wear/WatchLogicTest.kt
RestMath accumulates eligible rest-time changes, formats nonzero totals, and checks whether remaining time falls within the warning threshold. Tests cover these calculations and formats.
Rest timer and screen layout
frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt
RestView temporarily displays accumulated adjustments outside ambient mode. It changes timer sizing and warning tint, and rearranges controls, effort rating, and up-next content.
Up-next content
frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt
UpNext adds roomy and compact layouts and displays elapsed workout time. It uses the pause time when available.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Merge Risk: Minimal · up to e19a1

The change raises the Up next and effort-question text to 12 sp, adds a brief rest-adjustment indicator, and shows elapsed workout time. No concrete merge-blocking risk was found. The author reports checking a 40 mm emulator at two font scales with no cut-off text. Merge the stacked PRs in the requested order.

Pre-merge checks: Passed 4

Check name Status Explanation
Title check Passed The title names the two changes in the PR: the Up next text and the effort question on the Wear OS rest screen are raised to 12 sp. It matches the PR objectives and the description. The title is speci…
Description check Passed The description has a clear 'Why' and 'What changes' section. It names the files and the sizes changed, and it gives a device test and CI checks. It does not follow the template exactly. The 'What and…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Full details: Title check

Explanation

The title names the two changes in the PR: the Up next text and the effort question on the Wear OS rest screen are raised to 12 sp. It matches the PR objectives and the description. The title is specific and short, so it is a pass.

Full details: Description check

Explanation

The description has a clear 'Why' and 'What changes' section. It names the files and the sizes changed, and it gives a device test and CI checks. It does not follow the template exactly. The 'What and why' section has no 'Fixes #' issue link. The 'Where did you try it?' checklist is missing. The tests and screenshot checklist items are not marked. The CLA item is not marked. The PR is mostly complete, so it passes. The author should add the issue link, the platform checkbox (Android app), and screenshots or a clip, since this is a UI change.

Finishing Touches

Generate unit tests (beta)

  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Recent review info

Run configuration

Commits

Reviewing files that changed from the base of the PR and between 4df8939 and e19a181.

Files selected for processing: 3

  • frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/WatchLogic.kt
  • frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt
  • frontend/android/wear/src/test/java/ch/duartesantos/opengym/wear/WatchLogicTest.kt

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 9 remain after this review.

@cubetes
cubetes marked this pull request as ready for review November 13, 2026 14:10
@DuarteSantos8
DuarteSantos8 merged commit 84c3548 into DuarteSantos8:release-1.4.5 Nov 14, 2026
16 checks passed
@github-actions github-actions Bot locked and limited conversation to collaborators Nov 14, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants