Repository navigation
Phase D2: rest chip in the top bar, and peek at the elapsed time - #26
Merged
Merged
Conversation
The logger's big title, timer and bottom Discard/Finish footer give way to a top bar: routine name, an elapsed-time chip, a filled Finish button, and a menu with Workout notes, Add exercises and Discard workout. Workout notes move to the end of the list, shown once they have text or are picked from the menu, which scrolls to them and focuses them. The finish summary offers Resume workout, which reopens the session after a Finish tapped by mistake (not for a workout the app ended for being idle). The workout detail's editor moves its Done button into its top bar, so the shared editor has no footer. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014thT5Fj3sGZDfK8zFRTiXW
Both are 40 dp tall and take the width of the wider of the two, so they stay matched when the timer passes an hour. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014thT5Fj3sGZDfK8zFRTiXW
The rest bar above the keypad is gone. During rest the top bar's time chip shows the countdown with a ring that empties; it turns primary and pulses in the last 10 seconds, and tapping it opens -15 / +15 / Skip. Outside rest it shows the elapsed time on a plain container. Tapping the routine title during rest spins the chip round to the elapsed time in inverted colours, with a line that drains over 5 seconds before it spins back; tapping again flips it back sooner. The chip's TalkBack label carries both times and offers the peek as an action. With animations off the faces cross-fade instead of spinning. A one-time tooltip under the title points the peek out on the first rest. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014thT5Fj3sGZDfK8zFRTiXW
…orce push Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014thT5Fj3sGZDfK8zFRTiXW
The -15 / +15 / Skip menu becomes a pill-shaped popup centred on the chip it opens from, kept inside the screen, growing in from the chip. It still closes on Skip, a tap outside it, or Back. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014thT5Fj3sGZDfK8zFRTiXW
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.
Finishes Phase D2 (F06 and F22 from the design review). The rest bar above the keypad is gone; the rest now lives in the top bar's time chip.
Rest chip (F06)
Peek at the elapsed time (F22)
HintStore, with a small Robolectric test).Plan
D2's last two items are ticked in
docs/IMPLEMENTATION_PLAN.md, and its progress notes now say D2 is done. Next up: D3, D4 and D5, in any order.D2's "Done when" check is met. On a Pixel 7, with the bottom bar, the keypad open and a rest running, all four sets of a four-set exercise show under its header. This was rendered with Roborazzi, outside the repo.
Note on the branch history
The branch was restarted from
mainafter #25 was squash-merged. A force push wasn't available, so GitHub's copy of the branch was merged in with-s ours. That merge changes no files, but the commit list shows #25's two original commits. The diff againstmainis only this change, and a squash merge lands it as one commit.Checks
./gradlew testDebugUnitTest ktlintCheck lintDebug assembleDebugpasses locally.Generated by Claude Code