Gym mode: show upcoming set on timer pages, fix editing logged sets, persist rest timers - #1289
Open
BrianHotopp wants to merge 2 commits into
Open
Conversation
2 tasks
BrianHotopp
changed the title
The timer pages only showed the countdown, wasting the whole rest period: to prepare for the next set (e.g. walk over and preload the plates) the user had to swipe forward to see what comes next, which also restarted the timer. The timers now show the upcoming set below the time: exercise name, set configuration (reps, weight, etc.) and set counter. This is always the next log page, which can be the next set of the same exercise (e.g. when progressing weights within an exercise) or the first set of the next exercise. After the last set of the day nothing is shown.
Two related fixes for navigating back during gym mode: * Re-visiting an already logged page showed the set-config template again and saving inserted a second, duplicate log row. The saved log is now kept on the slot page and the form is seeded from it, so the previously entered values are shown and saving updates the existing row instead of duplicating it (e.g. adding a forgotten RiR). * The rest timers kept their start time in the widget, so leaving the page disposed it and restarted the countdown on return. The start time now lives in the gym state and both timers derive the elapsed or remaining time from it, so the countdown continues while the user e.g. goes back to correct a set. Revisiting an already expired countdown also no longer triggers the end-of-countdown alert again.
BrianHotopp
force-pushed
the
gym-mode-timer-up-next-and-edit-logs
branch
from
August 1, 2026 01:22
309f955 to
c2a76e7
Compare
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
2 participants
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.
Proposed Changes
Two gym mode fixes, one commit each:
1. Show the upcoming set on timer pages
Timer pages showed only the countdown. They now show the next set below the time: exercise name, reps × weight, set counter. This is always the next log page — the next set of the same exercise (weight progressions) or the first set of the next exercise. Hidden after the last set of the day.
2. Fix editing logged sets + keep rest timers running across navigation
updateEntry) — e.g. adding a forgotten RiR.Client-side only, no backend changes.
Related Issue(s)
Please check that the PR fulfills these requirements
dart format .)flutter analyzeclean;flutter test test/features/routines250/250 (+10 tests).