Skip to content

Offline gym log for Android. No account, no ads, no internet.

An exercise added mid-session goes right after the current one

InlitXf5150ee681b1
diff --git a/lib/state/workout_state.dart b/lib/state/workout_state.dart
index 0c3ab6e..07f024c 100644
--- a/lib/state/workout_state.dart
+++ b/lib/state/workout_state.dart
@@ -1055,8 +1055,11 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsSt
final s = session;
final ex = exerciseById(id);
if (s == null || ex == null || s.exercises.any((e) => e.id == id)) return;
- s.exercises.add(SessionExercise(ex.id, ex.name, ex.primary, _openingSets(id)));
- s.currentIndex = s.exercises.length - 1;
+ final chain = chainAt(s.currentIndex);
+ final at = chain.isEmpty ? s.exercises.length : chain.last + 1;
+ s.exercises.insert(at, SessionExercise(ex.id, ex.name, ex.primary, _openingSets(id)));
+ _advanceTimer?.cancel();
+ s.currentIndex = at;
persistNow();
notifyListeners();
}
diff --git a/test/requests_27sep_test.dart b/test/requests_27sep_test.dart
index 162d068..d03b02e 100644
--- a/test/requests_27sep_test.dart
+++ b/test/requests_27sep_test.dart
@@ -149,7 +149,7 @@ void main() {
fit.startRoutine(r);
fit.removeSessionExercise(2);
fit.addExerciseToSession(idOf('Barbell Curl'));
- fit.reorderSessionExercise(1, 0);
+ fit.reorderSessionExercise(2, 0);
final changes = fit.sessionRoutineChanges;
expect(changes.added.map((e) => e.id), [idOf('Barbell Curl')]);
expect(changes.removed.map((e) => e.id), [idOf('Barbell Deadlift')]);
diff --git a/test/routine_session_edit_test.dart b/test/routine_session_edit_test.dart
index f3d5af4..4b357fe 100644
--- a/test/routine_session_edit_test.dart
+++ b/test/routine_session_edit_test.dart
@@ -117,6 +117,32 @@ void main() {
fit.saveAndExit();
});
+ test('an added exercise comes right after the current one', () {
+ final r = fit.createRoutine('Dos');
+ fit.toggleRoutineExercise(r, a);
+ fit.toggleRoutineExercise(r, c);
+ fit.startRoutine(fit.routines.single);
+
+ fit.addExerciseToSession(b);
+ expect(fit.session!.exercises.map((e) => e.id), [a, b, c]);
+ expect(fit.session!.currentIndex, 1);
+ fit.saveAndExit();
+ });
+
+ test('an added exercise never splits a superset', () {
+ final r = fit.createRoutine('Dos');
+ fit.toggleRoutineExercise(r, a);
+ fit.toggleRoutineExercise(r, b);
+ fit.startRoutine(fit.routines.single);
+ fit.session!.exercises[0].linkedNext = true;
+
+ fit.addExerciseToSession(c);
+ expect(fit.session!.exercises.map((e) => e.id), [a, b, c]);
+ expect(fit.session!.exercises[0].linkedNext, isTrue);
+ expect(fit.session!.currentIndex, 2);
+ fit.saveAndExit();
+ });
+
test('the same exercise cannot be added twice', () {
routineWithThree();
start();