Offline gym log for Android. No account, no ads, no internet.
Dart androidbodybuildingdartexercisesf-droidfitnessfluttergymgym-apphealthprivacyself-hostedworkoutworkout-appworkout-tracker
Give the app a real route stack and the state behind the new screens
InlitXbb12afeeb496
diff --git a/lib/app/app_shell.dart b/lib/app/app_shell.dartindex f7199e5..188d97a 100644--- a/lib/app/app_shell.dart+++ b/lib/app/app_shell.dart@@ -4,16 +4,22 @@ import 'package:phosphor_flutter/phosphor_flutter.dart';import '../l10n/l10n.dart';import '../screens/about_screen.dart';+import '../screens/compare_screen.dart';import '../screens/exercise_detail_screen.dart';import '../screens/exercises_screen.dart';import '../screens/home_screen.dart';+import '../screens/measures_screen.dart';+import '../screens/note_edit_screen.dart';+import '../screens/notes_screen.dart';import '../screens/onboarding_screen.dart';+import '../screens/places_screen.dart';import '../screens/progress_screen.dart';import '../screens/routine_edit_screen.dart';import '../screens/routines_screen.dart';import '../screens/session_screen.dart';import '../screens/settings_screen.dart';import '../screens/tool_detail_screen.dart';+import '../screens/timeline_screen.dart';import '../screens/tools_screen.dart';import '../screens/train_screen.dart';import '../state/fit_state.dart';@@ -117,19 +123,16 @@ class _AppShellState extends State<AppShell> with WidgetsBindingObserver {Widget _animatedScreen() {return AnimatedSwitcher(- duration: const Duration(milliseconds: 280),- switchInCurve: Curves.easeOutCubic,- switchOutCurve: Curves.easeInCubic,- transitionBuilder: (child, animation) {- final slide = Tween<Offset>(- begin: const Offset(0, 0.018),- end: Offset.zero,- ).animate(animation);- return FadeTransition(- opacity: animation,- child: SlideTransition(position: slide, child: child),- );- },+ duration: const Duration(milliseconds: 260),+ switchInCurve: const Interval(0.35, 1, curve: Curves.easeOutCubic),+ switchOutCurve: const Interval(0.6, 1, curve: Curves.easeOut),+ transitionBuilder: (child, animation) => FadeTransition(+ opacity: animation,+ child: ScaleTransition(+ scale: Tween<double>(begin: 0.97, end: 1).animate(animation),+ child: child,+ ),+ ),layoutBuilder: (currentChild, previousChildren) => Stack(children: <Widget>[for (final c in previousChildren) Positioned.fill(child: c),@@ -164,6 +167,18 @@ class _AppShellState extends State<AppShell> with WidgetsBindingObserver {return RoutinesScreen();case 'routine-edit':return RoutineEditScreen();+ case 'measures':+ return MeasuresScreen();+ case 'places':+ return PlacesScreen();+ case 'timeline':+ return TimelineScreen();+ case 'compare':+ return CompareScreen();+ case 'notes':+ return NotesScreen();+ case 'note-edit':+ return NoteEditScreen(key: ValueKey(fit.editingNoteId ?? 'new'));case 'home':default:return HomeScreen();diff --git a/lib/main.dart b/lib/main.dartindex 12166cb..9b6e73d 100644--- a/lib/main.dart+++ b/lib/main.dart@@ -22,6 +22,7 @@ Future<void> main() async {await AlarmStore.init();fit.loadFromStore();await RestAlarm.instance.init();+ fit.syncPhotoReminder();fit.onWidgetsShouldUpdate = HomeWidgetBridge.update;runApp(const GymManeApp());diff --git a/lib/state/fit_core.dart b/lib/state/fit_core.dartindex b1f2d69..65ffa81 100644--- a/lib/state/fit_core.dart+++ b/lib/state/fit_core.dart@@ -10,24 +10,58 @@ double _round3(double n) => (n * 1000).round() / 1000;double _roundTo(double n, double step) => (n / step).round() * step;DateTime _dayKey(DateTime d) => DateTime(d.year, d.month, d.day);+/// Sumar días con Duration se queda corto en el cambio de hora; el calendario no.+DateTime shiftDays(DateTime d, int n) => DateTime(d.year, d.month, d.day + n);++/// Con horario de verano por medio, restar dos DateTime locales se queda corto.+int daysBetween(DateTime from, DateTime to) =>+ DateTime.utc(to.year, to.month, to.day)+ .difference(DateTime.utc(from.year, from.month, from.day))+ .inDays;+const int kHeatmapDays = 84;+const int heatLevels = 4;++/// 0 = untouched, 4 = at or over the target for the period.+int heatLevel(double v) {+ if (v <= 0) return 0;+ if (v < 0.25) return 1;+ if (v < 0.5) return 2;+ if (v < 0.75) return 3;+ return 4;+}+abstract class FitCore extends ChangeNotifier {Map<String, dynamic> toJson();String route = 'home';- String prevRoute = 'home';+ final List<String> _routeStack = [];final Map<String, bool> favorites = {};Profile profile = Profile();final List<LoggedSession> sessions = [];final List<BodyweightEntry> bodyweight = [];- final Map<String, List<ExerciseNote>> exNotes = {};+ final List<GymNote> notes = [];+ final List<BodyMeasure> measures = [];+ final List<ProgressEntry> shots = [];final Set<String> checkins = {};final List<Routine> routines = [];final Map<int, String> weeklyPlan = {};final List<Exercise> customExercises = [];+ final List<GymPlace> places = [];++ /// Media propio del usuario por ejercicio: id -> fichero en MediaStore.+ final Map<String, String> exerciseMedia = {};++ /// Ejercicios que el usuario marca como "solo repeticiones", sin peso.+ final Map<String, int> exerciseRest = {};++ final Set<String> repsOnly = {};++ /// Los que ha desmarcado a mano, para no volver a deducirlo por el material.+ final Set<String> repsOnlyOff = {};VoidCallback? onWidgetsShouldUpdate;void _refreshWidgets() {@@ -62,8 +96,32 @@ abstract class FitCore extends ChangeNotifier {void goSettings() => _setRoute('settings', reset: true);void _setRoute(String r, {bool reset = false}) {+ if (reset) _routeStack.clear();route = r;- if (reset) prevRoute = r;+ notifyListeners();+ }++ void pushRoute(String r) {+ if (route != r) _routeStack.add(route);+ route = r;+ notifyListeners();+ }++ void resetRoute(String r) {+ _routeStack.clear();+ route = r;+ }++ void popRoute({String fallback = 'home'}) {+ while (_routeStack.isNotEmpty) {+ final r = _routeStack.removeLast();+ if (r != route) {+ route = r;+ notifyListeners();+ return;+ }+ }+ route = fallback == route ? 'home' : fallback;notifyListeners();}diff --git a/lib/state/fit_state.dart b/lib/state/fit_state.dartindex f8e2164..b22e5ce 100644--- a/lib/state/fit_state.dart+++ b/lib/state/fit_state.dart@@ -11,25 +11,34 @@ import '../catalog/exercise_catalog.dart';import '../l10n/l10n.dart';import '../models/exercise.dart';import '../models/live_session.dart';+import '../models/measure.dart';+import '../models/note.dart';+import '../models/place.dart';+import '../models/progress_shot.dart';import '../models/profile.dart';import '../models/workout.dart';import '../services/alarm_store.dart';import '../services/local_store.dart';import '../services/media_store.dart';+import '../services/progress_reminder.dart';import '../services/rest_alarm.dart';import '../services/exercise_match.dart';import '../services/workout_import.dart';part 'fit_core.dart';part 'library_state.dart';+part 'measures_state.dart';+part 'notes_state.dart';+part 'places_state.dart';part 'routines_state.dart';part 'settings_state.dart';part 'stats_state.dart';+part 'timeline_state.dart';part 'tools_state.dart';part 'workout_state.dart';class FitState extends FitCore- with ToolsState, SettingsState, LibraryState, StatsState, RoutinesState, WorkoutState {+ with ToolsState, SettingsState, LibraryState, NotesState, PlacesState, MeasuresState, TimelineState, StatsState, RoutinesState, WorkoutState {void loadFromStore() {final data = Store.instance.load();_loading = true;@@ -51,13 +60,14 @@ class FitState extends FitCorealarmSound = null;alarmSoundName = null;}- bgPattern = data['bg'] as String? ?? 'none';+ bgPattern = data['bg'] as String? ?? 'dots';alarmAskedAt = (data['alarmAskedAt'] as num?)?.toInt();onboarded = data['onboarded'] as bool? ?? false;favorites..clear()..addAll(((data['favorites'] as Map?) ?? {}).map((k, v) => MapEntry(k as String, v as bool)));_loadNotes(data);+ _loadPlaces(data);checkins..clear()..addAll(((data['checkins'] as List?) ?? []).cast<String>());@@ -73,6 +83,9 @@ class FitState extends FitCore..clear()..addAll(((data['custom'] as List?) ?? []).map((e) => Exercise.fromJson((e as Map).cast<String, dynamic>())));+ _loadMedia(data);+ _loadRepsOnly(data);+ _loadExerciseRest(data);sessions..clear()..addAll(((data['sessions'] as List?) ?? [])@@ -81,6 +94,10 @@ class FitState extends FitCore..clear()..addAll(((data['bodyweight'] as List?) ?? []).map((e) => BodyweightEntry.fromJson((e as Map).cast<String, dynamic>())));+ _loadMeasures(data);+ _loadShots(data);+ photoIntervalDays = (data['photoEvery'] as num?)?.toInt() ?? 30;+ bodyTimeline = data['bodyTl'] as bool? ?? false;_restoreLiveSession(data);}_seedCalculatorsFromProfile();@@ -101,23 +118,112 @@ class FitState extends FitCore_runningSince = DateTime.tryParse(started);_startTicking(from: _runningSince);}- route = 'session';- prevRoute = 'home';+ resetRoute('session');+ }++ void _loadMedia(Map<String, dynamic> data, {Map<String, String>? restored}) {+ exerciseMedia.clear();+ if (restored != null) {+ exerciseMedia.addAll(restored);+ return;+ }+ ((data['media'] as Map?) ?? {}).forEach((k, v) {+ if (v is String && v.isNotEmpty) exerciseMedia[k as String] = v;+ });+ for (final e in (data['custom'] as List?) ?? const []) {+ final legacy = (e as Map)['m'];+ final id = e['id'];+ if (id is String && legacy is String && legacy.isNotEmpty) {+ exerciseMedia.putIfAbsent(id, () => legacy);+ }+ }+ }++ void _loadExerciseRest(Map<String, dynamic> data) {+ exerciseRest.clear();+ ((data['exRest'] as Map?) ?? const {}).forEach((k, v) {+ final n = (v as num?)?.toInt();+ if (k is String && n != null) exerciseRest[k] = n.clamp(15, 600);+ });+ }++ void _loadRepsOnly(Map<String, dynamic> data) {+ repsOnly+ ..clear()+ ..addAll(((data['repsOnly'] as List?) ?? const []).cast<String>());+ repsOnlyOff+ ..clear()+ ..addAll(((data['repsOnlyOff'] as List?) ?? const []).cast<String>());+ }++ void _loadShots(Map<String, dynamic> data, {Map<String, String>? restored}) {+ shots+ ..clear()+ ..addAll(((data['shots'] as List?) ?? const [])+ .map((e) => ProgressEntry.fromJson((e as Map).cast<String, dynamic>()))+ .where((e) => !e.isEmpty));+ if (restored == null) return;+ for (var i = 0; i < shots.length; i++) {+ final e = shots[i];+ final kept = <String, String>{};+ e.shots.forEach((pose, name) {+ final now = restored[name];+ if (now != null) kept[pose] = now;+ });+ shots[i] = e.copyWith(shots: kept);+ }+ shots.removeWhere((e) => e.isEmpty);+ }++ void _loadMeasures(Map<String, dynamic> data) {+ measures+ ..clear()+ ..addAll(((data['measures'] as List?) ?? const [])+ .map((e) => BodyMeasure.fromJson((e as Map).cast<String, dynamic>()))+ .where((m) => kMeasureKeys.contains(m.key)));+ }++ void _loadPlaces(Map<String, dynamic> data) {+ places.clear();+ final raw = data['places'];+ if (raw is List) {+ places.addAll(raw.map((e) => GymPlace.fromJson((e as Map).cast<String, dynamic>())));+ }+ activePlaceId = data['place'] as String? ?? '';+ if (places.every((p) => p.id != activePlaceId)) activePlaceId = '';}void _loadNotes(Map<String, dynamic> data) {- exNotes.clear();- final raw = data['exNotes'] as Map?;- if (raw != null) {+ notes.clear();+ final raw = data['notes'];+ if (raw is List) {+ notes.addAll(raw.map((e) => GymNote.fromJson((e as Map).cast<String, dynamic>())));+ return;+ }++ var seq = 0;+ GymNote legacy(String exId, DateTime when, String text) => GymNote(+ id: 'n${when.microsecondsSinceEpoch}${seq++}',+ exerciseId: exId,+ date: _dayKey(when),+ kind: NoteKind.note,+ text: text,+ createdAt: when,+ );++ (data['exNotes'] as Map?)?.forEach((k, v) {+ for (final e in (v as List)) {+ final m = (e as Map).cast<String, dynamic>();+ final text = ((m['t'] ?? '') as String).trim();+ if (text.isEmpty) continue;+ notes.add(legacy(+ k as String, DateTime.tryParse((m['d'] ?? '') as String) ?? DateTime.now(), text));+ }+ });+ if (raw is Map) {raw.forEach((k, v) {- exNotes[k as String] = (v as List)- .map((e) => ExerciseNote.fromJson((e as Map).cast<String, dynamic>()))- .toList();- });- } else {- (data['notes'] as Map?)?.forEach((k, v) {- final t = (v as String).trim();- if (t.isNotEmpty) exNotes[k as String] = [ExerciseNote(DateTime.now(), t)];+ final text = (v as String).trim();+ if (text.isNotEmpty) notes.add(legacy(k as String, DateTime.now(), text));});}}@@ -135,13 +241,23 @@ class FitState extends FitCore'alarmAskedAt': alarmAskedAt,'onboarded': onboarded,'favorites': favorites,- 'exNotes': exNotes.map((k, v) => MapEntry(k, v.map((n) => n.toJson()).toList())),+ 'notes': notes.map((n) => n.toJson()).toList(),+ 'places': places.map((p) => p.toJson()).toList(),+ 'place': activePlaceId,'checkins': checkins.toList(),'routines': routines.map((r) => r.toJson()).toList(),'weeklyPlan': weeklyPlan.map((k, v) => MapEntry(k.toString(), v)),'custom': customExercises.map((e) => e.toJson()).toList(),+ 'media': exerciseMedia,+ 'exRest': exerciseRest,+ 'repsOnly': repsOnly.toList(),+ 'repsOnlyOff': repsOnlyOff.toList(),'sessions': sessions.map((s) => s.toJson()).toList(),'bodyweight': bodyweight.map((b) => b.toJson()).toList(),+ 'measures': measures.map((m) => m.toJson()).toList(),+ 'shots': shots.map((s) => s.toJson()).toList(),+ 'photoEvery': photoIntervalDays,+ 'bodyTl': bodyTimeline,if (session != null && !session!.complete) ...{'live': session!.toJson(),'liveStart': _runningSince?.toIso8601String(),@@ -155,17 +271,29 @@ class FitState extends FitCore_sessionTimer?.cancel();_restTimer?.cancel();RestAlarm.instance.cancel();+ ProgressReminder.instance.cancel();session = null;_runningSince = null;_elapsedBefore = 0;sessionPaused = false;sessions.clear();bodyweight.clear();- exNotes.clear();+ measures.clear();+ shots.clear();+ compareFromId = null;+ compareToId = null;+ notes.clear();+ places.clear();+ activePlaceId = '';checkins.clear();routines.clear();weeklyPlan.clear();customExercises.clear();+ exerciseMedia.clear();+ repsOnly.clear();+ repsOnlyOff.clear();+ exerciseRest.clear();+ MediaStore.clearAll();favorites.clear();sessionPicks.clear();selectedMuscles.clear();@@ -175,8 +303,7 @@ class FitState extends FitCore_photoBytes = null;_photoCacheKey = null;_seedCalculatorsFromProfile();- route = 'home';- prevRoute = 'home';+ resetRoute('home');trainStep = 'select';persistNow();_refreshWidgets();@@ -190,6 +317,16 @@ class FitState extends FitCorebool importJson(String raw) {final map = Store.instance.tryParse(raw);if (map == null) return false;+ applyBackup(map);+ return true;+ }++ /// [restoredMedia] llega de una copia en zip: los ficheros ya están en+ /// MediaStore con nombres nuevos y sustituyen al mapa del JSON.+ void applyBackup(Map<String, dynamic> map,+ {Map<String, String>? restoredMedia,+ Map<String, String>? restoredNoteMedia,+ Map<String, String>? restoredShots}) {_loading = true;profile = Profile.fromJson((map['profile'] as Map?)?.cast<String, dynamic>() ?? {});dark = map['dark'] as bool? ?? dark;@@ -201,7 +338,9 @@ class FitState extends FitCorefavorites..clear()..addAll(((map['favorites'] as Map?) ?? {}).map((k, v) => MapEntry(k as String, v as bool)));+ _loadPlaces(map);_loadNotes(map);+ if (restoredNoteMedia != null) _remapNoteMedia(restoredNoteMedia);checkins..clear()..addAll(((map['checkins'] as List?) ?? []).cast<String>());@@ -217,6 +356,9 @@ class FitState extends FitCore..clear()..addAll(((map['custom'] as List?) ?? []).map((e) => Exercise.fromJson((e as Map).cast<String, dynamic>())));+ _loadMedia(map, restored: restoredMedia);+ _loadRepsOnly(map);+ _loadExerciseRest(map);sessions..clear()..addAll(((map['sessions'] as List?) ?? [])@@ -225,12 +367,27 @@ class FitState extends FitCore..clear()..addAll(((map['bodyweight'] as List?) ?? []).map((e) => BodyweightEntry.fromJson((e as Map).cast<String, dynamic>())));+ _loadMeasures(map);+ _loadShots(map, restored: restoredShots);+ photoIntervalDays = (map['photoEvery'] as num?)?.toInt() ?? photoIntervalDays;+ bodyTimeline = map['bodyTl'] as bool? ?? bodyTimeline;_seedCalculatorsFromProfile();_loading = false;_persist();_refreshWidgets();notifyListeners();- return true;+ }++ void _remapNoteMedia(Map<String, String> restored) {+ for (var i = 0; i < notes.length; i++) {+ final n = notes[i];+ if (n.media.isEmpty) continue;+ final kept = [+ for (final m in n.media)+ if (restored[m] != null) restored[m]!,+ ];+ notes[i] = n.copyWith(media: kept);+ }}static String _normName(String s) =>@@ -308,6 +465,18 @@ class FitState extends FitCorebackFromRoutines();case 'routine-edit':closeRoutineEdit();+ case 'measures':+ backFromMeasures();+ case 'places':+ backFromPlaces();+ case 'timeline':+ backFromTimeline();+ case 'compare':+ backFromCompare();+ case 'notes':+ backFromNotes();+ case 'note-edit':+ closeNoteEditor();case 'train':trainStep == 'review' ? trainBack() : closeTrain();case 'progress':@@ -320,16 +489,9 @@ class FitState extends FitCorereturn true;}- void goAbout() {- if (route != 'about') prevRoute = route;- route = 'about';- notifyListeners();- }+ void goAbout() => pushRoute('about');- void backFromAbout() {- route = prevRoute;- notifyListeners();- }+ void backFromAbout() => popRoute(fallback: 'settings');@overridevoid dispose() {diff --git a/lib/state/library_state.dart b/lib/state/library_state.dartindex 72cb0f2..1979a77 100644--- a/lib/state/library_state.dart+++ b/lib/state/library_state.dart@@ -4,6 +4,7 @@ mixin LibraryState on FitCore {String exSearch = '';String? exMuscleFilter;String? exDifficultyFilter;+ String? exEquipmentFilter;String? activeExerciseId;List<Exercise> get allExercises => [...kExercises, ...customExercises];@@ -15,16 +16,11 @@ mixin LibraryState on FitCore {}void openExercise(String id) {- if (route != 'exercise-detail') prevRoute = route;- route = 'exercise-detail';activeExerciseId = id;- notifyListeners();+ pushRoute('exercise-detail');}- void closeExerciseDetail() {- route = prevRoute;- notifyListeners();- }+ void closeExerciseDetail() => popRoute(fallback: 'exercises');void toggleFavorite(String id) {favorites[id] = !(favorites[id] ?? false);@@ -41,6 +37,7 @@ mixin LibraryState on FitCore {exSearch = '';exMuscleFilter = null;exDifficultyFilter = null;+ exEquipmentFilter = null;exFavouritesOnly = false;notifyListeners();}@@ -55,6 +52,11 @@ mixin LibraryState on FitCore {notifyListeners();}+ void setEquipmentFilter(String e) {+ exEquipmentFilter = exEquipmentFilter == e ? null : e;+ notifyListeners();+ }+bool exFavouritesOnly = false;void toggleFavouritesFilter() {@@ -80,6 +82,7 @@ mixin LibraryState on FitCore {return false;}if (exDifficultyFilter != null && ex.difficulty != exDifficultyFilter) return false;+ if (exEquipmentFilter != null && ex.equipment != exEquipmentFilter) return false;return true;}).toList();}@@ -89,25 +92,6 @@ mixin LibraryState on FitCore {List<String> activeExerciseSteps(Exercise ex) => exerciseSteps(ex);- List<ExerciseNote> notesFor(String id) => exNotes[id] ?? const [];-- void addNote(String id, String text) {- final t = text.trim();- if (t.isEmpty) return;- (exNotes[id] ??= []).insert(0, ExerciseNote(DateTime.now(), t));- _persist();- notifyListeners();- }-- void deleteNote(String id, int index) {- final list = exNotes[id];- if (list == null || index < 0 || index >= list.length) return;- list.removeAt(index);- if (list.isEmpty) exNotes.remove(id);- _persist();- notifyListeners();- }-List<Exercise> similarExercises(Exercise ex, int n) => allExercises.where((e) => e.id != ex.id && e.primary == ex.primary).take(n)@@ -136,8 +120,7 @@ mixin LibraryState on FitCore {}void deleteCustomExercise(String id) {- final ex = exerciseById(id);- if (ex != null && ex.media.isNotEmpty) MediaStore.delete(ex.media);+ clearExerciseMedia(id);customExercises.removeWhere((e) => e.id == id);for (final r in routines) {r.exerciseIds.remove(id);@@ -147,24 +130,53 @@ mixin LibraryState on FitCore {notifyListeners();}+ String mediaFor(String id) => exerciseMedia[id] ?? '';++ bool hasCustomMedia(String id) => mediaFor(id).isNotEmpty;+Future<void> attachExerciseMedia(String id, String srcPath) async {- final i = customExercises.indexWhere((e) => e.id == id);- if (i < 0) return;- final old = customExercises[i].media;final base = await MediaStore.importFor(id, srcPath);if (base == null) return;+ final old = mediaFor(id);if (old.isNotEmpty && old != base) await MediaStore.delete(old);- customExercises[i] = customExercises[i].copyWith(media: base);+ exerciseMedia[id] = base;_persist();notifyListeners();}void clearExerciseMedia(String id) {- final i = customExercises.indexWhere((e) => e.id == id);- if (i < 0) return;- final old = customExercises[i].media;- if (old.isNotEmpty) MediaStore.delete(old);- customExercises[i] = customExercises[i].copyWith(media: '');+ final old = exerciseMedia.remove(id);+ if (old != null && old.isNotEmpty) MediaStore.delete(old);+ _persist();+ notifyListeners();+ }++ /// Sin peso: o lo ha marcado el usuario, o es de peso corporal y nunca lo+ /// ha cargado con lastre.+ bool isRepsOnly(String id) {+ if (repsOnly.contains(id)) return true;+ if (repsOnlyOff.contains(id)) return false;+ if (exerciseById(id)?.equipment != 'Bodyweight') return false;+ return !_hasLoadedHistory(id);+ }++ bool _hasLoadedHistory(String id) {+ for (final s in sessions) {+ for (final e in s.exercises) {+ if (e.id == id && e.sets.any((st) => st.weight > 0)) return true;+ }+ }+ return false;+ }++ void toggleRepsOnly(String id) {+ if (isRepsOnly(id)) {+ repsOnly.remove(id);+ repsOnlyOff.add(id);+ } else {+ repsOnlyOff.remove(id);+ repsOnly.add(id);+ }_persist();notifyListeners();}diff --git a/lib/state/routines_state.dart b/lib/state/routines_state.dartindex 748295b..f6c3c4a 100644--- a/lib/state/routines_state.dart+++ b/lib/state/routines_state.dart@@ -3,16 +3,9 @@ part of 'fit_state.dart';mixin RoutinesState on FitCore, LibraryState {String? activeRoutineId;- void goRoutines() {- if (route != 'routines') prevRoute = route;- route = 'routines';- notifyListeners();- }+ void goRoutines() => pushRoute('routines');- void backFromRoutines() {- route = prevRoute == 'routines' || prevRoute == 'routine-edit' ? 'home' : prevRoute;- notifyListeners();- }+ void backFromRoutines() => popRoute();Routine? _routine(String id) {for (final r in routines) {diff --git a/lib/state/settings_state.dart b/lib/state/settings_state.dartindex b02833b..05ce0ea 100644--- a/lib/state/settings_state.dart+++ b/lib/state/settings_state.dart@@ -9,7 +9,7 @@ mixin SettingsState on FitCore, ToolsState {String? get alarmSoundPath => AlarmStore.pathFor(alarmSound);- String bgPattern = 'none';+ String bgPattern = 'dots';bool onboarded = false;bool alarmAllowed = true;int? alarmAskedAt;@@ -115,6 +115,20 @@ mixin SettingsState on FitCore, ToolsState {notifyListeners();}+ int restFor(String exerciseId) => exerciseRest[exerciseId] ?? restSeconds;++ bool hasCustomRest(String exerciseId) => exerciseRest.containsKey(exerciseId);++ void setExerciseRest(String exerciseId, int? seconds) {+ if (seconds == null) {+ exerciseRest.remove(exerciseId);+ } else {+ exerciseRest[exerciseId] = seconds.clamp(15, 600);+ }+ _persist();+ notifyListeners();+ }+void setAlarmSound(String basename, String displayName) {alarmSound = basename;alarmSoundName = displayName;diff --git a/lib/state/stats_state.dart b/lib/state/stats_state.dartindex 34cd5e3..5e3e9d5 100644--- a/lib/state/stats_state.dart+++ b/lib/state/stats_state.dart@@ -1,6 +1,6 @@part of 'fit_state.dart';-mixin StatsState on FitCore, ToolsState, LibraryState {+mixin StatsState on FitCore, ToolsState, LibraryState, TimelineState {List<Exercise> recommendedExercises(int n) {final muscles = suggestedFocus.muscles;final picks = <Exercise>[];@@ -43,12 +43,12 @@ mixin StatsState on FitCore, ToolsState, LibraryState {DateTime get _weekStart {final t = _dayKey(DateTime.now());- return t.subtract(Duration(days: t.weekday - 1));+ return shiftDays(t, 1 - t.weekday);}Iterable<LoggedSession> get _thisWeekSessions {final start = _weekStart;- final end = start.add(const Duration(days: 7));+ final end = shiftDays(start, 7);return sessions.where((s) {final k = _dayKey(s.date);return !k.isBefore(start) && k.isBefore(end);@@ -63,7 +63,7 @@ mixin StatsState on FitCore, ToolsState, LibraryState {byDay[k] = (byDay[k] ?? 0) + s.volume;}return List.generate(days, (i) {- final d = today.subtract(Duration(days: days - 1 - i));+ final d = shiftDays(today, i - (days - 1));return byDay[d] ?? 0;});}@@ -75,6 +75,34 @@ mixin StatsState on FitCore, ToolsState, LibraryState {bool get hasData => sessions.isNotEmpty;int get totalSessions => sessions.length;+ int get totalSets => sessions.fold(0, (n, s) => n + s.setCount);++ double get totalVolumeKg => sessions.fold(0.0, (a, s) => a + s.volume);++ Duration get totalTime => Duration(seconds: sessions.fold(0, (n, s) => n + s.durationSec));++ Duration get averageSession => sessions.isEmpty+ ? Duration.zero+ : Duration(seconds: totalTime.inSeconds ~/ sessions.length);++ /// Sesiones por día de la semana (1 = lunes … 7 = domingo).+ Map<int, int> get sessionsByWeekday {+ final out = {for (int w = 1; w <= 7; w++) w: 0};+ for (final s in sessions) {+ out[s.date.weekday] = out[s.date.weekday]! + 1;+ }+ return out;+ }++ /// 0 si no hay entrenos o si hay empate: entonces no hay "tu día".+ int get busiestWeekday {+ final by = sessionsByWeekday;+ final top = by.values.fold(0, (m, v) => v > m ? v : m);+ if (top == 0) return 0;+ final tied = by.entries.where((e) => e.value == top).toList();+ return tied.length == 1 ? tied.first.key : 0;+ }+double get volume30dKg {final now = DateTime.now();return _volumeBetween(now.subtract(const Duration(days: 30)), now);@@ -110,17 +138,11 @@ mixin StatsState on FitCore, ToolsState, LibraryState {final daily = _dailyVolumes(days);final maxV = daily.fold(0.0, (m, v) => v > m ? v : m);if (maxV <= 0) return List.filled(days, 0);- return daily.map((v) {- if (v <= 0) return 0;- final r = v / maxV;- if (r > 0.66) return 3;- if (r > 0.33) return 2;- return 1;- }).toList();+ return daily.map((v) => heatLevel(v / maxV)).toList();}DateTime heatmapDate(int i) =>- _dayKey(DateTime.now()).subtract(Duration(days: kHeatmapDays - 1 - i));+ shiftDays(_dayKey(DateTime.now()), i - (kHeatmapDays - 1));List<LoggedSession> sessionsOn(DateTime day) {final k = _dayKey(day);@@ -142,6 +164,53 @@ mixin StatsState on FitCore, ToolsState, LibraryState {notifyListeners();}+ void setLoggedReps(LoggedExercise e, int i, int reps) {+ if (i < 0 || i >= e.sets.length) return;+ e.sets[i] = LoggedSet(reps.clamp(0, 999), e.sets[i].weight);+ persistNow();+ _refreshWidgets();+ notifyListeners();+ }++ void setLoggedWeight(LoggedExercise e, int i, double kg) {+ if (i < 0 || i >= e.sets.length) return;+ e.sets[i] = LoggedSet(e.sets[i].reps, _round3(kg.clamp(0, 1000)));+ persistNow();+ _refreshWidgets();+ notifyListeners();+ }++ void setLoggedWeightShown(LoggedExercise e, int i, double shown) =>+ setLoggedWeight(e, i, fromDisplayWeight(shown));++ void bumpLoggedReps(LoggedExercise e, int i, int d) =>+ setLoggedReps(e, i, e.sets[i].reps + d);++ void bumpLoggedWeight(LoggedExercise e, int i, int dir) {+ final next = _roundTo(toDisplayWeight(e.sets[i].weight), weightStep) + dir * weightStep;+ setLoggedWeight(e, i, fromDisplayWeight(math.max(0, next)));+ }++ void addLoggedSet(LoggedExercise e) {+ final last = e.sets.isNotEmpty ? e.sets.last : LoggedSet(10, isRepsOnly(e.id) ? 0 : 20);+ e.sets.add(LoggedSet(last.reps, last.weight));+ persistNow();+ _refreshWidgets();+ notifyListeners();+ }++ void removeLoggedSet(LoggedSession s, LoggedExercise e, int i) {+ if (i < 0 || i >= e.sets.length) return;+ e.sets.removeAt(i);+ if (e.sets.isEmpty) {+ deleteLoggedExercise(s, e);+ return;+ }+ persistNow();+ _refreshWidgets();+ notifyListeners();+ }+void deleteBodyweight(BodyweightEntry e) {bodyweight.remove(e);final latest = latestBodyweight;@@ -164,7 +233,8 @@ mixin StatsState on FitCore, ToolsState, LibraryState {final names = <String>[];for (final s in ofDay) {for (final e in s.exercises) {- if (!names.contains(e.name)) names.add(e.name);+ final n = t.catalogName(e.id, e.name);+ if (!names.contains(n)) names.add(n);}}return (@@ -188,13 +258,13 @@ mixin StatsState on FitCore, ToolsState, LibraryState {if (days.isEmpty) return 0;var cursor = _dayKey(DateTime.now());if (!days.contains(cursor)) {- cursor = cursor.subtract(const Duration(days: 1));+ cursor = shiftDays(cursor, -1);if (!days.contains(cursor)) return 0;}var n = 0;while (days.contains(cursor)) {n++;- cursor = cursor.subtract(const Duration(days: 1));+ cursor = shiftDays(cursor, -1);}return n;}@@ -202,12 +272,12 @@ mixin StatsState on FitCore, ToolsState, LibraryState {List<bool> get weekMask {final start = _weekStart;final days = sessions.map((s) => _dayKey(s.date)).toSet();- return List.generate(7, (i) => days.contains(start.add(Duration(days: i))));+ return List.generate(7, (i) => days.contains(shiftDays(start, i)));}String _dayId(DateTime d) => '${d.year}-${d.month}-${d.day}';- DateTime _dateForWeekday(int i) => _weekStart.add(Duration(days: i));+ DateTime _dateForWeekday(int i) => shiftDays(_weekStart, i);bool _hasSessionOn(DateTime day) {final k = _dayKey(day);@@ -252,13 +322,14 @@ mixin StatsState on FitCore, ToolsState, LibraryState {return ((sessionsThisWeek / g) * 100).round().clamp(0, 100);}- List<({String name, double topWeight, double oneRm})> get personalRecords {- final best = <String, ({String name, double topWeight, double oneRm})>{};+ List<({String id, String name, double topWeight, double oneRm})> get personalRecords {+ final best = <String, ({String id, String name, double topWeight, double oneRm})>{};for (final s in sessions) {for (final e in s.exercises) {- for (final st in e.sets) {+ for (final st in e.workingSets) {final c = best[e.id];best[e.id] = (+ id: e.id,name: e.name,topWeight: c == null ? st.weight : math.max(c.topWeight, st.weight),oneRm: c == null ? st.oneRm : math.max(c.oneRm, st.oneRm),@@ -284,7 +355,7 @@ mixin StatsState on FitCore, ToolsState, LibraryState {}}final start = _weekStart;- final end = start.add(const Duration(days: 7));+ final end = shiftDays(start, 7);var n = 0;bestDate.forEach((_, d) {final k = _dayKey(d);@@ -318,12 +389,63 @@ mixin StatsState on FitCore, ToolsState, LibraryState {double muscleTargetFor(int days) => weeklySetTarget * days / 7;Map<String, double> muscleSetsOver(int days) {- final start = _dayKey(DateTime.now()).subtract(Duration(days: days - 1));+ final start = shiftDays(_dayKey(DateTime.now()), -(days - 1));final out = <String, double>{};for (final s in sessions) {if (_dayKey(s.date).isBefore(start)) continue;for (final e in s.exercises) {- final n = e.sets.length.toDouble();+ final n = e.workingSets.length.toDouble();+ if (n <= 0) continue;+ out[e.primary] = (out[e.primary] ?? 0) + n;+ for (final m in exerciseById(e.id)?.secondary ?? const <String>[]) {+ out[m] = (out[m] ?? 0) + n / 2;+ }+ }+ }+ return out;+ }++ int get bodyWindowDays => photoIntervalDays > 0 ? photoIntervalDays : 30;++ List<BodyWindow> get bodyWindows {+ if (sessions.isEmpty) return const [];+ final step = bodyWindowDays;+ final first = _dayKey(sessions.map((s) => s.date).reduce((a, b) => a.isBefore(b) ? a : b));+ final out = <BodyWindow>[];+ var to = _dayKey(DateTime.now());++ while (!to.isBefore(first) && out.length < 12) {+ final from = DateTime(to.year, to.month, to.day - (step - 1));+ var count = 0;+ var volume = 0.0;+ for (final s in sessions) {+ final d = _dayKey(s.date);+ if (d.isBefore(from) || d.isAfter(to)) continue;+ count++;+ volume += s.volume;+ }+ if (count > 0 || out.isEmpty) {+ out.add((+ from: from,+ to: to,+ heat: muscleHeatBetween(from, to),+ sessions: count,+ volume: volume,+ ));+ }+ to = DateTime(from.year, from.month, from.day - 1);+ }+ return out;+ }++ Map<String, double> muscleSetsBetween(DateTime from, DateTime to) {+ final a = _dayKey(from), b = _dayKey(to);+ final out = <String, double>{};+ for (final s in sessions) {+ final d = _dayKey(s.date);+ if (d.isBefore(a) || d.isAfter(b)) continue;+ for (final e in s.exercises) {+ final n = e.workingSets.length.toDouble();if (n <= 0) continue;out[e.primary] = (out[e.primary] ?? 0) + n;for (final m in exerciseById(e.id)?.secondary ?? const <String>[]) {@@ -334,6 +456,14 @@ mixin StatsState on FitCore, ToolsState, LibraryState {return out;}+ Map<String, double> muscleHeatBetween(DateTime from, DateTime to) {+ final target = muscleTargetFor(daysBetween(from, to) + 1);+ return {+ for (final e in muscleSetsBetween(from, to).entries)+ e.key: (e.value / target).clamp(0.0, 1.0),+ };+ }+Map<String, double> muscleHeatOver(int days) {final target = muscleTargetFor(days);return {diff --git a/lib/state/tools_state.dart b/lib/state/tools_state.dartindex 0722c34..136ecad 100644--- a/lib/state/tools_state.dart+++ b/lib/state/tools_state.dart@@ -32,28 +32,16 @@ mixin ToolsState on FitCore {bfSex = profile.sex;}- void goTools() {- if (route != 'tools') prevRoute = route;- route = 'tools';- notifyListeners();- }+ void goTools() => pushRoute('tools');void openTool(String id) {- if (route != 'tools-detail') prevRoute = route;- route = 'tools-detail';activeToolId = id;- notifyListeners();+ pushRoute('tools-detail');}- void closeTool() {- route = 'tools';- notifyListeners();- }+ void closeTool() => popRoute(fallback: 'tools');- void backFromTools() {- route = prevRoute == 'tools' ? 'home' : prevRoute;- notifyListeners();- }+ void backFromTools() => popRoute();double get rmResult => _round1(rmWeight * (1 + rmReps / 30));@@ -121,6 +109,33 @@ mixin ToolsState on FitCore {return out;}+ double get defaultBar => isLb ? 45 : 20;++ /// Discos por lado para una barra, en las unidades que se estén enseñando.+ List<({double weight, int count})> platesPerSide(double displayTarget, double displayBar) {+ double perSide = math.max(0, (displayTarget - displayBar) / 2);+ final out = <({double weight, int count})>[];+ for (final p in _plateSteps) {+ final count = (perSide / p + 1e-6).floor();+ if (count > 0) {+ out.add((weight: p, count: count));+ perSide = _round1(perSide - count * p);+ }+ }+ return out;+ }++ String? plateHint(String equipment, double weightKg) {+ if (equipment != 'Barbell') return null;+ final target = _round1(toDisplayWeight(weightKg));+ if (target <= defaultBar) return null;+ final parts = platesPerSide(target, defaultBar);+ if (parts.isEmpty) return null;+ return parts+ .map((p) => p.count == 1 ? fmt(p.weight) : '${fmt(p.weight)}×${p.count}')+ .join(' · ');+ }+List<({String pct, int reps, double weight})> get warmupSets {const spec = [(40, 10), (60, 5), (80, 3), (90, 1)];final step = isLb ? 5.0 : 2.5;diff --git a/lib/state/workout_state.dart b/lib/state/workout_state.dartindex 217ad22..2eae835 100644--- a/lib/state/workout_state.dart+++ b/lib/state/workout_state.dart@@ -1,6 +1,6 @@part of 'fit_state.dart';-mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, RoutinesState {+mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsState, RoutinesState {final List<String> selectedMuscles = [];final Set<String> sessionPicks = {};String trainStep = 'select';@@ -12,16 +12,15 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, Routinesbool sessionPaused = false;void startWorkout() {- if (route != 'train') prevRoute = route;- route = 'train';trainStep = 'select';- notifyListeners();+ pushRoute('train');}List<Exercise> getFilteredExercises(List<String> sel) {if (sel.isEmpty) return const [];return allExercises.where((ex) => sel.contains(ex.primary) || ex.secondary.any(sel.contains))+ .where(fitsHere).toList();}@@ -100,11 +99,10 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, Routines}void closeTrain() {- route = prevRoute;trainStep = 'select';selectedMuscles.clear();sessionPicks.clear();- notifyListeners();+ popRoute();}void startRoutine(Routine r) {@@ -118,15 +116,18 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, Routinesif (exs.isNotEmpty) _beginSession(exs);}+ List<SessionSet> _openingSets(String id) {+ final last = lastSetsFor(id);+ if (last.isNotEmpty) return last.map((l) => SessionSet(l.reps, l.weight, false)).toList();+ final w = isRepsOnly(id) ? 0.0 : 20.0;+ return [SessionSet(10, w, false), SessionSet(10, w, false), SessionSet(10, w, false)];+ }+void _beginSession(List<Exercise> exs) {final s = WorkoutSession();- s.exercises = exs.map((ex) {- final last = lastSetsFor(ex.id);- final sets = last.isNotEmpty- ? last.map((l) => SessionSet(l.reps, l.weight, false)).toList()- : [SessionSet(10, 20, false), SessionSet(10, 20, false), SessionSet(10, 20, false)];- return SessionExercise(ex.id, ex.name, ex.primary, sets);- }).toList();+ s.exercises = exs+ .map((ex) => SessionExercise(ex.id, ex.name, ex.primary, _openingSets(ex.id)))+ .toList();_restTimer?.cancel();_elapsedBefore = 0;sessionPaused = false;@@ -192,9 +193,12 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, Routinesif (sessionPaused) return;_restTimer?.cancel();RestAlarm.instance.stopSound();- session!.restRemaining = restSeconds;+ final seconds = restFor(session!.exercises.isEmpty+ ? ''+ : session!.exercises[session!.currentIndex.clamp(0, session!.exercises.length - 1)].id);+ session!.restRemaining = seconds;- RestAlarm.instance.schedule(Duration(seconds: restSeconds));+ RestAlarm.instance.schedule(Duration(seconds: seconds));askAlarmPermission();notifyListeners();_restTimer = Timer.periodic(const Duration(seconds: 1), (t) {@@ -234,7 +238,7 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, Routinesvoid addSet(int exIdx) {final sets = session!.exercises[exIdx].sets;final last = sets.isNotEmpty ? sets.last : SessionSet(10, 20, false);- sets.add(SessionSet(last.reps, last.weight, false));+ sets.add(SessionSet(last.reps, last.weight, false, kind: last.kind));_persist();notifyListeners();}@@ -248,6 +252,47 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, RoutinessetSessionWeight(exIdx, setIdx, fromDisplayWeight(math.max(0, next)));}+ static const _warmupSpec = [(0.4, 10), (0.6, 5), (0.8, 3)];++ bool hasWarmup(int exIdx) {+ final s = session;+ if (s == null || exIdx >= s.exercises.length) return false;+ return s.exercises[exIdx].sets.any((st) => st.kind == SetKind.warmup);+ }++ void addWarmupSets(int exIdx) {+ final s = session;+ if (s == null || exIdx >= s.exercises.length) return;+ final sets = s.exercises[exIdx].sets;+ if (sets.isEmpty || hasWarmup(exIdx)) return;++ final target = sets.map((st) => st.weight).reduce(math.max);+ if (target <= 0) return;++ final warm = [+ for (final spec in _warmupSpec)+ SessionSet(+ spec.$2,+ fromDisplayWeight(_roundTo(toDisplayWeight(target * spec.$1), weightStep)),+ false,+ kind: SetKind.warmup,+ ),+ ];+ sets.insertAll(0, warm);+ _persist();+ notifyListeners();+ }++ void setSetKind(int exIdx, int setIdx, SetKind kind) {+ final s = session;+ if (s == null || exIdx >= s.exercises.length) return;+ final sets = s.exercises[exIdx].sets;+ if (setIdx >= sets.length) return;+ sets[setIdx].kind = kind;+ _persist();+ notifyListeners();+ }+void setSessionReps(int exIdx, int setIdx, int reps) {session!.exercises[exIdx].sets[setIdx].reps = reps.clamp(0, 999);_persist();@@ -280,20 +325,35 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, Routinesfinal s = session;final ex = exerciseById(id);if (s == null || ex == null || s.exercises.any((e) => e.id == id)) return;- final last = lastSetsFor(id);- s.exercises.add(SessionExercise(- ex.id,- ex.name,- ex.primary,- last.isNotEmpty- ? last.map((l) => SessionSet(l.reps, l.weight, false)).toList()- : [SessionSet(10, 20, false), SessionSet(10, 20, false), SessionSet(10, 20, false)],- ));+ s.exercises.add(SessionExercise(ex.id, ex.name, ex.primary, _openingSets(id)));s.currentIndex = s.exercises.length - 1;persistNow();notifyListeners();}+ /// Para añadir sobre la marcha: favoritos y usados hace poco, sin repetir.+ List<Exercise> sessionSuggestions() {+ final inSession = session?.exercises.map((e) => e.id).toSet() ?? <String>{};+ final ids = <String>[];+ for (final e in allExercises) {+ if (favorites[e.id] == true && !inSession.contains(e.id)) ids.add(e.id);+ }+ for (final s in sessions.reversed) {+ for (final e in s.exercises) {+ if (!inSession.contains(e.id) && !ids.contains(e.id)) ids.add(e.id);+ }+ if (ids.length >= 12) break;+ }+ final out = <Exercise>[];+ for (final id in ids.take(12)) {+ final ex = exerciseById(id);+ if (ex != null) out.add(ex);+ }+ return out;+ }++ bool inSession(String id) => session?.exercises.any((e) => e.id == id) ?? false;+void nextExercise() {final s = session!;s.currentIndex = math.min(s.currentIndex + 1, s.exercises.length - 1);@@ -314,13 +374,16 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, RoutinesRestAlarm.instance.cancel();final s = session!;final done = <SessionSet>[];+ final working = <SessionSet>[];for (final e in s.exercises) {for (final st in e.sets) {- if (st.done) done.add(st);+ if (!st.done) continue;+ done.add(st);+ if (st.counts) working.add(st);}}- s.summaryVolume = done.fold<double>(0, (sum, st) => sum + st.reps * st.weight).round();- s.summarySets = done.length;+ s.summaryVolume = working.fold<double>(0, (sum, st) => sum + st.reps * st.weight).round();+ s.summarySets = working.length;s.summaryDuration = sessionElapsed;s.complete = true;s.restRemaining = null;@@ -328,13 +391,18 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, Routinesif (done.isNotEmpty) {final logged = <LoggedExercise>[];for (final e in s.exercises) {- final doneSets = e.sets.where((st) => st.done).map((st) => LoggedSet(st.reps, st.weight)).toList();+ final doneSets = e.sets+ .where((st) => st.done)+ .map((st) => LoggedSet(st.reps, st.weight, kind: st.kind))+ .toList();if (doneSets.isNotEmpty) {logged.add(LoggedExercise(e.id, e.name, e.primary, doneSets));}}- sessions.add(LoggedSession(DateTime.now(), s.summaryDuration ?? 0, logged));- _computeSummaryHighlights(logged);+ final entry = LoggedSession(s.loggedAt ?? DateTime.now(), s.summaryDuration ?? 0, logged);+ sessions.add(entry);+ sessions.sort((a, b) => a.date.compareTo(b.date));+ _computeSummaryHighlights(entry);} else {summaryPrs = 0;summaryVsLast = null;@@ -349,11 +417,11 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, Routinesint summaryPrs = 0;double? summaryVsLast;- void _computeSummaryHighlights(List<LoggedExercise> justLogged) {+ void _computeSummaryHighlights(LoggedSession entry) {var prs = 0;- for (final e in justLogged) {+ for (final e in entry.exercises) {final previousBest = sessions- .where((s) => s != sessions.last)+ .where((s) => !identical(s, entry)).expand((s) => s.exercises).where((x) => x.id == e.id).fold(0.0, (m, x) => math.max(m, x.bestOneRm));@@ -361,9 +429,10 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, Routines}summaryPrs = prs;- final ids = justLogged.map((e) => e.id).toSet();+ final ids = entry.exercises.map((e) => e.id).toSet();LoggedSession? previous;- for (final s in sessions.reversed.skip(1)) {+ for (final s in sessions.reversed) {+ if (identical(s, entry)) continue;if (s.exercises.any((e) => ids.contains(e.id))) {previous = s;break;@@ -372,6 +441,27 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, RoutinessummaryVsLast = previous?.volume;}+ /// Reabre un entreno ya guardado para seguir donde se dejó.+ void resumeLoggedSession(LoggedSession ls) {+ if (session != null && !session!.complete) return;+ sessions.remove(ls);+ final s = WorkoutSession()+ ..loggedAt = ls.date+ ..exercises = ls.exercises+ .map((e) => SessionExercise(e.id, e.name, e.primary,+ e.sets.map((x) => SessionSet(x.reps, x.weight, true)).toList()))+ .toList();+ _restTimer?.cancel();+ _elapsedBefore = ls.durationSec;+ sessionPaused = false;+ _startTicking();+ session = s;+ resetRoute('session');+ persistNow();+ _refreshWidgets();+ notifyListeners();+ }+String get summaryDurationLabel {final d = session?.summaryDuration ?? 0;return '${d ~/ 60}:${(d % 60).toString().padLeft(2, '0')}';@@ -388,8 +478,7 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, StatsState, RoutinesselectedMuscles.clear();sessionPicks.clear();trainStep = 'select';- route = 'home';- prevRoute = 'home';+ resetRoute('home');persistNow();notifyListeners();}