Skip to content

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

feat(train): add one-tap clear and restore picks button in exercise selection

ddd0242c04cc4cf
diff --git a/lib/screens/train_screen.dart b/lib/screens/train_screen.dart
index fa84a2c..ceecc99 100644
--- a/lib/screens/train_screen.dart
+++ b/lib/screens/train_screen.dart
@@ -228,6 +228,20 @@ class _TrainScreenState extends State<TrainScreen> {
),
),
const SizedBox(width: 10),
+ GestureDetector(
+ onTap: fit.toggleResetPicks,
+ child: Container(
+ width: 48,
+ height: 48,
+ decoration: BoxDecoration(
+ color: gc.bgRaised,
+ borderRadius: BorderRadius.circular(14),
+ border: Border.all(color: gc.border),
+ ),
+ child: Icon(PhosphorIconsRegular.arrowCounterClockwise, size: 20, color: gc.textSecondary),
+ ),
+ ),
+ const SizedBox(width: 10),
GestureDetector(
onTap: () => showCreateExerciseSheet(context, onCreated: (id) {
fit.togglePick(id);
diff --git a/lib/state/workout_state.dart b/lib/state/workout_state.dart
index 93dbdaf..c1095e2 100644
--- a/lib/state/workout_state.dart
+++ b/lib/state/workout_state.dart
@@ -104,6 +104,26 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsSt
bool isPicked(String id) => sessionPicks.contains(id);
+ void clearPicks() {
+ sessionPicks.clear();
+ notifyListeners();
+ }
+
+ void resetDefaultPicks() {
+ sessionPicks
+ ..clear()
+ ..addAll(_defaultPicks(selectedMuscles).map((e) => e.id));
+ notifyListeners();
+ }
+
+ void toggleResetPicks() {
+ if (sessionPicks.isNotEmpty) {
+ clearPicks();
+ } else {
+ resetDefaultPicks();
+ }
+ }
+
void trainBack() {
trainStep = 'select';
notifyListeners();
diff --git a/test/flow_test.dart b/test/flow_test.dart
index 6877fb0..f08416e 100644
--- a/test/flow_test.dart
+++ b/test/flow_test.dart
@@ -60,4 +60,30 @@ void main() {
expect(fit.trainStep, 'review');
expect(fit.sessionPicks, isNotEmpty);
});
+
+ test('toggleResetPicks clears picks when non-empty, and restores defaults when empty', () {
+ fit.sessions.clear();
+ fit.selectedMuscles.clear();
+ fit.startFocusWorkout();
+ fit.trainContinue();
+
+ expect(fit.sessionPicks, isNotEmpty);
+ final defaultCount = fit.sessionPicks.length;
+
+ // First toggle: clears all picks
+ fit.toggleResetPicks();
+ expect(fit.sessionPicks, isEmpty);
+
+ // Second toggle: restores default picks
+ fit.toggleResetPicks();
+ expect(fit.sessionPicks.length, defaultCount);
+
+ // Direct clearPicks
+ fit.clearPicks();
+ expect(fit.sessionPicks, isEmpty);
+
+ // Direct resetDefaultPicks
+ fit.resetDefaultPicks();
+ expect(fit.sessionPicks.length, defaultCount);
+ });
}
diff --git a/test/train_step2_test.dart b/test/train_step2_test.dart
new file mode 100644
index 0000000..938bc3a
--- /dev/null
+++ b/test/train_step2_test.dart
@@ -0,0 +1,38 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:gymmane/app/gymmane_app.dart';
+import 'package:gymmane/state/fit_state.dart';
+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';
+
+void main() {
+ testWidgets('TrainScreen step 2 displays reset picks button and toggles selection', (tester) async {
+ fit.onboarded = true;
+ fit.selectedMuscles.clear();
+ fit.selectedMuscles.addAll(['chest', 'triceps']);
+ fit.trainContinue();
+ fit.route = 'train';
+
+ await tester.pumpWidget(const GymManeApp());
+ await tester.pumpAndSettle();
+
+ // Verify Reset button icon is present
+ expect(find.byIcon(PhosphorIconsRegular.arrowCounterClockwise), findsOneWidget);
+
+ // Verify Plus button icon is present
+ expect(find.byIcon(PhosphorIconsRegular.plus), findsOneWidget);
+
+ // Verify picks initially non-empty
+ expect(fit.sessionPicks.isNotEmpty, true);
+
+ // Tap reset button -> clears picks
+ await tester.tap(find.byIcon(PhosphorIconsRegular.arrowCounterClockwise));
+ await tester.pumpAndSettle();
+ expect(fit.sessionPicks.isEmpty, true);
+
+ // Tap reset button again -> restores default picks
+ await tester.tap(find.byIcon(PhosphorIconsRegular.arrowCounterClockwise));
+ await tester.pumpAndSettle();
+ expect(fit.sessionPicks.isNotEmpty, true);
+
+ fit.route = 'home';
+ });
+}