feat: add warmup sets before an exercise in a workout - #120
Open
T1mo7hy wants to merge 21 commits into
Open
Conversation
added 21 commits
July 10, 2026 13:57
…et.kt to include a possible WarmupId instead of ExerciseId
…UiWarmup and UiWarmupWithSets. Also updated UiSet.kt to follow Set with an optional warmupId for linking to warmups instead of exercises. Includes adding warmupsWithSets for UiWorkoutWithExercisesAndSets.kt.
… and warmups using their wrapper UiWorkoutItem classes
Includes "Warmup", "Target", "Add warmup", the default warmup mode "40/60/70"
…iExerciseWithSets whilst retaining full functionality. This is mostly done with drop-in replacements, but filtering by class (UiWarmupItem or UiExerciseItem) for specific functions like updateExerciseSetMode or updateWarmupSetMode
…replaced with "workout items" and warmups by properly renaming temporary variables. (Basically cleaning up my laziness).
Update saving workout with exercises and sets to include saving warmups with the exercises
…orrect string in strings.xml
…th have the same id as they are in different tables. Warmups are prefixed with "w" and exercises with "e"
…at the screen view models can be guaranteed to be initalised with the correct exercises and warmups.
IamDg
reviewed
Jul 10, 2026
IamDg
left a comment
IamDg
left a comment
Member
There was a problem hiding this comment.
Hi,
Thank you for your contribution and pretty big PR!
I looked at the code and ran the debug apk. As far as I understood, the idea is to add warmups as card alongside exercise card, right?
Let me propose this other idea inspired from other workouts apps: instead of adding warmups as "exercises", what about adding them as sets? I think they would be more intuitive for the user and simpler for us to implement.
Here's an image from another workout app to give a better view:
Let me know what do you think!
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.
This PR adds warmups to workouts.
Currently there is only one warmup "type", but more can easily be added.
Warmups can be added from the "More options" button on the exercise card.
Issue #98