Offline gym log for Android. No account, no ads, no internet.
Dart androidbodybuildingdartexercisesf-droidfitnessfluttergymgym-apphealthprivacyself-hostedworkoutworkout-appworkout-tracker
Add warm-up and cardio focus and save routine changes after a workout
InlitX6f7621495cc5
diff --git a/lib/models/live_session.dart b/lib/models/live_session.dartindex b120ef9..9ac360e 100644--- a/lib/models/live_session.dart+++ b/lib/models/live_session.dart@@ -71,6 +71,7 @@ class WorkoutSession {int currentIndex = 0;bool complete = false;bool manual = false;+ String? routineId;DateTime? loggedAt;DateTime? restEndsAt;int? restFrozen;@@ -97,6 +98,7 @@ class WorkoutSession {'i': currentIndex,'c': complete,if (manual) 'm': true,+ if (routineId != null) 'r': routineId,'at': loggedAt?.toIso8601String(),if (restEndsAt != null) 're': restEndsAt!.toIso8601String(),if (restFrozen != null) 'rf': restFrozen,@@ -111,6 +113,7 @@ class WorkoutSession {..currentIndex = (j['i'] as num?)?.toInt() ?? 0..complete = j['c'] as bool? ?? false..manual = j['m'] as bool? ?? false+ ..routineId = j['r'] as String?..loggedAt = DateTime.tryParse((j['at'] as String?) ?? '')..restEndsAt = DateTime.tryParse((j['re'] as String?) ?? '')..restFrozen = (j['rf'] as num?)?.toInt()diff --git a/lib/screens/places_screen.dart b/lib/screens/places_screen.dartindex 0ebb8d0..8ca2a96 100644--- a/lib/screens/places_screen.dart+++ b/lib/screens/places_screen.dart@@ -392,36 +392,13 @@ class PlacesScreen extends StatelessWidget {}Future<void> _rename(BuildContext context, GymPlace? place) async {- final gc = context.gc;- final controller = TextEditingController(text: place?.name ?? '');- final name = await showAppDialog<String>(- context: context,- builder: (dctx) => appDialog(- gc,- title: Text(place == null ? t.placeNew : t.editEntry,- style: AppTheme.d(18, weight: FontWeight.w700, color: gc.text)),- content: TextField(- controller: controller,- autofocus: true,- textCapitalization: TextCapitalization.sentences,- style: AppTheme.s(15, color: gc.text),- cursorColor: gc.accent,- decoration: InputDecoration(- hintText: t.placeNamePlaceholder,- hintStyle: AppTheme.s(15, color: gc.textTertiary),- enabledBorder: UnderlineInputBorder(borderSide: BorderSide(color: gc.border)),- focusedBorder: UnderlineInputBorder(borderSide: BorderSide(color: gc.accent)),- ),- onSubmitted: (v) => Navigator.of(dctx).pop(v),- ),- actions: [- dialogAction(t.cancel, gc.textSecondary, () => Navigator.of(dctx).pop(), strong: false),- dialogAction(t.save, gc.accent, () => Navigator.of(dctx).pop(controller.text)),- ],- ),+ final name = await askText(+ context,+ title: place == null ? t.placeNew : t.editEntry,+ initial: place?.name ?? '',+ hint: t.placeNamePlaceholder,);- controller.dispose();- if (name == null || name.trim().isEmpty) return;+ if (name == null) return;if (place == null) {fit.setActivePlace(fit.addPlace(name));} else {diff --git a/lib/screens/session_screen.dart b/lib/screens/session_screen.dartindex 7228f97..6733dca 100644--- a/lib/screens/session_screen.dart+++ b/lib/screens/session_screen.dart@@ -13,6 +13,7 @@ import '../widgets/celebration.dart';import '../widgets/dialogs.dart';import '../widgets/entrance.dart';import '../widgets/exercise_media.dart';+import '../widgets/exercise_preview.dart';import '../widgets/glass.dart';import '../widgets/liquid_notch.dart';import '../widgets/set_kind.dart';@@ -75,7 +76,13 @@ class SessionScreen extends StatelessWidget {const SizedBox(width: 14),SizedBox(width: 104,- child: _guard(locked, ExerciseMedia(ex: def, height: 104, radius: 18, live: true)),+ child: _guard(+ locked,+ GestureDetector(+ onTap: () => showExercisePreview(context, def),+ child: ExerciseMedia(ex: def, height: 104, radius: 18, live: true),+ ),+ ),),],)@@ -83,7 +90,13 @@ class SessionScreen extends StatelessWidget {_exerciseHeader(context, gc, ex),if (demo == 'large') ...[const SizedBox(height: 14),- _guard(locked, ExerciseMedia(ex: def, height: 170, live: true)),+ _guard(+ locked,+ GestureDetector(+ onTap: () => showExercisePreview(context, def),+ child: ExerciseMedia(ex: def, height: 170, live: true),+ ),+ ),],],),@@ -438,6 +451,8 @@ class SessionScreen extends StatelessWidget {Flexible(child: _lockedChip(gc))elseRow(children: [+ _stepOutButton(gc),+ const SizedBox(width: 10),Container(width: 8,height: 8,@@ -522,8 +537,16 @@ class SessionScreen extends StatelessWidget {Widget _lockedChip(GymColors gc) => _HoldToUnlock(onUnlock: () => _setLock(false));+ Widget _stepOutButton(GymColors gc) => RoundAction(+ label: t.stepOutOfWorkout,+ onTap: fit.stepOutOfSession,+ child: Icon(PhosphorIconsBold.caretDown, size: 15, color: gc.text),+ );+Widget _manualBar(GymColors gc, WorkoutSession s) {return Row(children: [+ _stepOutButton(gc),+ const SizedBox(width: 12),Icon(PhosphorIconsRegular.calendarPlus, size: 15, color: gc.brass),const SizedBox(width: 8),Expanded(@@ -1157,7 +1180,7 @@ class SessionScreen extends StatelessWidget {Rise(index: 3,child: Row(children: [- Expanded(child: PrimaryButton(label: t.saveAndExit, onTap: fit.saveAndExit)),+ Expanded(child: PrimaryButton(label: t.done, onTap: fit.saveAndExit)),const SizedBox(width: 10),Semantics(button: true,@@ -1194,25 +1217,90 @@ class SessionScreen extends StatelessWidget {),),],- const SizedBox(height: 10),- Rise(- index: 6,- child: GhostButton(- label: t.saveAsRoutine,- icon: PhosphorIconsRegular.listChecks,- onTap: () {- if (fit.saveSessionAsRoutine().isEmpty) return;- showNotchToast(context, t.savedAsRoutine,- icon: PhosphorIconsFill.listChecks, accent: gc.sage);- },+ if (fit.sessionRoutine == null || fit.sessionEditedRoutine) ...[+ const SizedBox(height: 10),+ Rise(+ index: 6,+ child: GhostButton(+ label: fit.sessionRoutine == null ? t.saveAsRoutine : t.saveToRoutine,+ icon: PhosphorIconsRegular.listChecks,+ onTap: () => _saveRoutine(context),+ ),),- ),+ ],],),),);}+ Future<void> _saveRoutine(BuildContext context) async {+ final accent = context.gc.sage;+ final routine = fit.sessionRoutine;+ if (routine != null) {+ if (!await _confirmRoutineChanges(context, routine) || !context.mounted) return;+ fit.saveSessionIntoRoutine();+ showNotchToast(context, t.routineUpdated, icon: PhosphorIconsFill.listChecks, accent: accent);+ return;+ }+ final name = await askText(context, title: t.routineName, initial: t.newRoutineName);+ if (name == null || !context.mounted || fit.saveSessionAsRoutine(name).isEmpty) return;+ showNotchToast(context, t.savedAsRoutine, icon: PhosphorIconsFill.listChecks, accent: accent);+ }++ Future<bool> _confirmRoutineChanges(BuildContext context, Routine routine) async {+ final gc = context.gc;+ final changes = fit.sessionRoutineChanges;+ Widget row(IconData icon, Color color, String text) => Padding(+ padding: const EdgeInsets.symmetric(vertical: 6),+ child: Row(children: [+ Container(+ width: 26,+ height: 26,+ decoration: BoxDecoration(color: color.withValues(alpha: 0.16), shape: BoxShape.circle),+ child: Icon(icon, size: 13, color: color),+ ),+ const SizedBox(width: 12),+ Expanded(+ child: Text(text,+ maxLines: 2,+ overflow: TextOverflow.ellipsis,+ style: AppTheme.f(14, weight: FontWeight.w600, color: gc.text)),+ ),+ ]),+ );+ final ok = await showAppDialog<bool>(+ context: context,+ builder: (dctx) => appDialog(+ gc,+ title: Text(t.saveChangesTitle(fit.routineTitle(routine)),+ style: AppTheme.f(19, weight: FontWeight.w800, color: gc.text)),+ content: ConstrainedBox(+ constraints: BoxConstraints(maxHeight: MediaQuery.sizeOf(dctx).height * 0.45),+ child: SingleChildScrollView(+ child: Column(+ mainAxisSize: MainAxisSize.min,+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ Text(t.saveChangesBody,+ style: AppTheme.f(13.5, weight: FontWeight.w500, color: gc.textSecondary, height: 1.45)),+ const SizedBox(height: 12),+ for (final e in changes.added) row(PhosphorIconsBold.plus, gc.sage, exerciseName(e)),+ for (final e in changes.removed) row(PhosphorIconsBold.minus, gc.danger, exerciseName(e)),+ if (changes.reordered) row(PhosphorIconsBold.arrowsDownUp, gc.brass, t.routineOrderChanged),+ ],+ ),+ ),+ ),+ actions: [+ dialogAction(t.cancel, gc.textSecondary, () => Navigator.of(dctx).pop(false), strong: false),+ dialogAction(t.save, gc.accent, () => Navigator.of(dctx).pop(true)),+ ],+ ),+ );+ return ok ?? false;+ }+Widget _countUp(double to, Widget Function(double v) builder) => TweenAnimationBuilder<double>(tween: Tween(begin: 0, end: to),duration: const Duration(milliseconds: 1100),@@ -1328,9 +1416,10 @@ class SessionScreen extends StatelessWidget {child: Column(crossAxisAlignment: CrossAxisAlignment.start,children: [- Text(label, style: AppTheme.f(10, weight: FontWeight.w600, color: gc.textSecondary, letterSpacing: 0.4)),+ FitText(label,+ style: AppTheme.f(10, weight: FontWeight.w600, color: gc.textSecondary, letterSpacing: 0.4)),const SizedBox(height: 4),- Text(value, style: AppTheme.f(18, weight: FontWeight.w700, color: gc.text)),+ FitText(value, style: AppTheme.f(18, weight: FontWeight.w700, color: gc.text)),],),);@@ -1400,7 +1489,7 @@ void showAddToSessionSheet(BuildContext context) {icon: PhosphorIconsRegular.plus,onTap: () {Navigator.pop(sheetCtx);- showCreateExerciseSheet(context, onCreated: fit.addExerciseToSession);+ showCreateExerciseSheet(context, initialName: q, onCreated: fit.addExerciseToSession);},),),@@ -1426,6 +1515,7 @@ Widget _addRow(BuildContext sheetCtx, GymColors gc, Exercise ex) {fit.addExerciseToSession(ex.id);Navigator.pop(sheetCtx);},+ onLongPress: () => showExercisePreview(sheetCtx, ex),child: Opacity(opacity: already ? 0.45 : 1,child: Container(@@ -1435,7 +1525,10 @@ Widget _addRow(BuildContext sheetCtx, GymColors gc, Exercise ex) {borderRadius: BorderRadius.circular(14),),child: Row(children: [- SizedBox(width: 44, child: ExerciseMedia(ex: ex, height: 44, radius: 10)),+ GestureDetector(+ onTap: () => showExercisePreview(sheetCtx, ex),+ child: SizedBox(width: 44, child: ExerciseMedia(ex: ex, height: 44, radius: 10)),+ ),const SizedBox(width: 12),Expanded(child: Column(diff --git a/lib/screens/start_sheet.dart b/lib/screens/start_sheet.dartindex e8b5c35..bd6c4d8 100644--- a/lib/screens/start_sheet.dart+++ b/lib/screens/start_sheet.dart@@ -26,11 +26,11 @@ class StartSheet extends StatelessWidget {@overrideWidget build(BuildContext context) {final gc = context.gc;- final planned = day == null ? fit.todayRoutine : fit.routineOn(day!);+ final planned = fit.routinesOn(day ?? DateTime.now()).where((r) => r.exerciseIds.isNotEmpty).toList();final others = [for (final group in fit.routineGroups) ...fit.routinesInGroup(group),...fit.routinesInGroup(''),- ].where((r) => r.id != planned?.id && r.exerciseIds.isNotEmpty).toList();+ ].where((r) => !planned.contains(r) && r.exerciseIds.isNotEmpty).toList();return Container(constraints: BoxConstraints(maxHeight: MediaQuery.sizeOf(context).height * 0.82),padding: sheetPad(context),@@ -60,8 +60,8 @@ class StartSheet extends StatelessWidget {child: Column(crossAxisAlignment: CrossAxisAlignment.stretch,children: [- if (planned != null && planned.exerciseIds.isNotEmpty) ...[- _plannedCard(context, gc, planned),+ for (final r in planned) ...[+ _plannedCard(context, gc, r),const SizedBox(height: 10),],if (others.isNotEmpty) ...[diff --git a/lib/screens/train_screen.dart b/lib/screens/train_screen.dartindex 81b46d6..63e76a8 100644--- a/lib/screens/train_screen.dart+++ b/lib/screens/train_screen.dart@@ -1,5 +1,4 @@import 'package:flutter/material.dart';-import 'package:flutter/services.dart';import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';import '../catalog/exercise_catalog.dart';@@ -10,7 +9,7 @@ import '../theme/app_colors.dart';import '../theme/app_theme.dart';import '../widgets/body_map.dart';import '../widgets/exercise_media.dart';-import '../widgets/liquid_notch.dart';+import '../widgets/exercise_preview.dart';import '../widgets/svg_icon.dart';import '../widgets/glass.dart';import '../widgets/ui_kit.dart';@@ -137,10 +136,45 @@ class _TrainScreenState extends State<TrainScreen> {fg: hasSel ? gc.onEmber : gc.textTertiary,onTap: fit.trainContinue,),+ const SizedBox(height: 26),+ Text(t.orStartWith.toUpperCase(),+ style: AppTheme.f(10.5, weight: FontWeight.w700, color: gc.textTertiary, letterSpacing: 1.5)),+ const SizedBox(height: 10),+ IntrinsicHeight(+ child: Row(crossAxisAlignment: CrossAxisAlignment.stretch, children: [+ Expanded(+ child: _kindCard(gc, 'warmup', PhosphorIconsRegular.fire, t.warmupFocus, t.warmupFocusHint),+ ),+ const SizedBox(width: 10),+ Expanded(+ child: _kindCard(gc, 'cardio', PhosphorIconsRegular.heartbeat, t.cardioFocus, t.cardioFocusHint),+ ),+ ]),+ ),],);}+ Widget _kindCard(GymColors gc, String kind, IconData icon, String title, String hint) => Pressable(+ onTap: () => fit.startKindWorkout(kind),+ child: Container(+ padding: const EdgeInsets.all(16),+ decoration: BoxDecoration(color: gc.bgRaised, borderRadius: BorderRadius.circular(20)),+ child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [+ Container(+ width: 36,+ height: 36,+ decoration: BoxDecoration(color: gc.accentSoft, borderRadius: BorderRadius.circular(12)),+ child: Icon(icon, size: 19, color: gc.accent),+ ),+ const SizedBox(height: 14),+ Text(title, style: AppTheme.f(15, weight: FontWeight.w700, color: gc.text)),+ const SizedBox(height: 3),+ Text(hint, style: AppTheme.f(12, weight: FontWeight.w500, color: gc.textSecondary, height: 1.3)),+ ]),+ ),+ );+Widget _chip(GymColors gc, String id) {return Container(padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),@@ -249,22 +283,6 @@ class _TrainScreenState extends State<TrainScreen> {),);- void _hideFromSuggestions(BuildContext context, Exercise ex) {- if (!fit.suggests(ex.id)) return;- HapticFeedback.mediumImpact();- fit.toggleSuggest(ex.id);- showNotchToast(- context,- t.noLongerSuggested,- subtitle: exerciseName(ex),- icon: PhosphorIconsFill.eyeSlash,- accent: context.gc.warn,- action: t.undo,- onTap: () => fit.toggleSuggest(ex.id),- duration: const Duration(milliseconds: 3200),- );- }-Widget _searchRow(BuildContext context, GymColors gc) {final hasQuery = _q.isNotEmpty;return Row(@@ -328,7 +346,7 @@ class _TrainScreenState extends State<TrainScreen> {),const SizedBox(width: 10),GestureDetector(- onTap: () => showCreateExerciseSheet(context, onCreated: (id) {+ onTap: () => showCreateExerciseSheet(context, initialName: _q, onCreated: (id) {fit.togglePick(id);_clearSearch();}),@@ -357,7 +375,7 @@ class _TrainScreenState extends State<TrainScreen> {const SizedBox(height: 10),GestureDetector(behavior: HitTestBehavior.opaque,- onTap: () => showCreateExerciseSheet(context, onCreated: (id) {+ onTap: () => showCreateExerciseSheet(context, initialName: _q, onCreated: (id) {fit.togglePick(id);_clearSearch();}),@@ -390,7 +408,7 @@ class _TrainScreenState extends State<TrainScreen> {return GestureDetector(behavior: HitTestBehavior.opaque,onTap: () => fit.togglePick(ex.id),- onLongPress: () => _hideFromSuggestions(context, ex),+ onLongPress: () => showExercisePreview(context, ex, suggestions: true),child: AnimatedContainer(duration: const Duration(milliseconds: 160),padding: const EdgeInsets.all(14),@@ -400,7 +418,10 @@ class _TrainScreenState extends State<TrainScreen> {borderRadius: BorderRadius.circular(16),),child: Row(children: [- SizedBox(width: 44, child: ExerciseMedia(ex: ex, height: 44, radius: 12)),+ GestureDetector(+ onTap: () => showExercisePreview(context, ex, suggestions: true),+ child: SizedBox(width: 44, child: ExerciseMedia(ex: ex, height: 44, radius: 12)),+ ),const SizedBox(width: 14),Expanded(child: Column(diff --git a/lib/state/workout_state.dart b/lib/state/workout_state.dartindex 36ae100..ce35a64 100644--- a/lib/state/workout_state.dart+++ b/lib/state/workout_state.dart@@ -5,6 +5,7 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStfinal Set<String> sessionPicks = {};final Set<String> pickSeed = {};String trainStep = 'select';+ String? trainKind;WorkoutSession? session;Timer? _sessionTimer;Timer? _restTimer;@@ -18,7 +19,9 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStint autoMoves = 0;void startWorkout([List<String>? initialMuscles, DateTime? on]) {+ if (_backToParked()) return;logDay = on;+ trainKind = null;selectedMuscles..clear()..addAll(initialMuscles ?? const []);@@ -29,7 +32,9 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStvoid startFocusWorkout() => startWorkout(suggestedFocus.muscles);void startPicking({DateTime? on}) {+ if (_backToParked()) return;logDay = on;+ trainKind = null;selectedMuscles.clear();sessionPicks.clear();pickSeed.clear();@@ -41,7 +46,7 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStif (sel.isEmpty) return const [];return allExercises.where((ex) => sel.contains(ex.primary) || ex.secondary.any(sel.contains))- .where(fitsHere)+ .where((ex) => fitsHere(ex) && !isArchived(ex.id)).toList();}@@ -56,6 +61,7 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStvoid trainContinue() {if (selectedMuscles.isEmpty) return;+ trainKind = null;trainStep = 'review';sessionPicks..clear()@@ -66,8 +72,31 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStnotifyListeners();}+ List<Exercise> _kindPool(String kind) => (kind == 'cardio'+ ? allExercises.where((e) => isCardio(e.id) || kCardioExtras.contains(e.id))+ : [for (final id in kWarmupIds) ?exerciseById(id)])+ .where((ex) => fitsHere(ex) && !isArchived(ex.id))+ .toList();++ void startKindWorkout(String kind) {+ trainKind = kind;+ trainStep = 'review';+ final pool = _kindPool(kind).where((e) => suggests(e.id));+ final picks = kind == 'cardio'+ ? pool.where((e) => exerciseHistory(e.id).isNotEmpty).take(1)+ : pool.take(_pickTarget);+ sessionPicks+ ..clear()+ ..addAll(picks.map((e) => e.id));+ pickSeed+ ..clear()+ ..addAll(sessionPicks);+ notifyListeners();+ }+List<Exercise> reviewExercises() {- final base = getFilteredExercises(selectedMuscles);+ final kind = trainKind;+ final base = kind == null ? getFilteredExercises(selectedMuscles) : _kindPool(kind);final baseIds = base.map((e) => e.id).toSet();final extras = allExercises.where((e) => sessionPicks.contains(e.id) && !baseIds.contains(e.id));final all = [...base, ...extras];@@ -90,7 +119,7 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStList<Exercise> trainSearchResults(String query) {if (query.trim().isEmpty) return const [];- return allExercises.where(exerciseSearch(query)).take(40).toList();+ return allExercises.where((e) => !isArchived(e.id)).where(exerciseSearch(query)).take(40).toList();}static const _pickTarget = 6;@@ -134,6 +163,8 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsSt}void resetDefaultPicks() {+ final kind = trainKind;+ if (kind != null) return startKindWorkout(kind);sessionPicks..clear()..addAll(_defaultPicks(selectedMuscles).map((e) => e.id));@@ -153,11 +184,13 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStvoid trainBack() {trainStep = 'select';+ trainKind = null;notifyListeners();}void closeTrain() {trainStep = 'select';+ trainKind = null;selectedMuscles.clear();sessionPicks.clear();pickSeed.clear();@@ -166,12 +199,14 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsSt}void startRoutine(Routine r, {DateTime? on}) {+ if (_backToParked()) return;final exs = routineExercises(r);if (exs.isEmpty) return;_beginSession(exs,plan: {for (final ex in exs) ex.id: routineSets(r, ex.id)},planned: {for (final ex in exs) if (hasPlan(r, ex.id)) ex.id: plannedSets(r, ex.id)},chained: {for (final ex in exs) if (chainsToNext(r, ex.id)) ex.id},+ routineId: r.id,on: on);}@@ -278,8 +313,9 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsSt{Map<String, int>? plan,Map<String, List<PlannedSet>> planned = const {},Set<String> chained = const {},+ String? routineId,DateTime? on}) {- final s = WorkoutSession();+ final s = WorkoutSession()..routineId = routineId;if (on != null) {s.loggedAt = DateTime(on.year, on.month, on.day, 12);s.manual = true;@@ -378,6 +414,29 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStnotifyListeners();}+ bool get todayPlanDone {+ final planned = routinesOn(DateTime.now()).length;+ return planned > 1 ? sessionsOn(DateTime.now()).length >= planned : isDayDone(todayIndex);+ }++ bool get sessionParked => session != null && !session!.complete && route != 'session';++ void stepOutOfSession() {+ if (!sessionPaused) toggleSessionPause();+ parkSession();+ }++ void stepBackIntoSession() {+ if (sessionPaused) toggleSessionPause();+ resumeSession();+ }++ bool _backToParked() {+ if (!sessionParked) return false;+ stepBackIntoSession();+ return true;+ }+String get elapsedLabel {final e = sessionElapsed;return '${(e ~/ 60).toString().padLeft(2, '0')}:${(e % 60).toString().padLeft(2, '0')}';@@ -817,7 +876,10 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStList<SessionSet> _warmupFor(List<SessionSet> sets) {if (sets.isEmpty) return const [];final target = sets.map((st) => st.weight).reduce(math.max);- if (target <= 0) return const [];+ if (target <= 0) {+ final reps = sets.map((st) => st.reps).reduce(math.max);+ return reps < 2 ? const [] : [SessionSet((reps / 2).ceil(), 0, false, kind: SetKind.warmup)];+ }return [for (final spec in _warmupSpec)SessionSet(@@ -937,7 +999,7 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStfinal out = <Exercise>[];for (final id in ids.take(12)) {final ex = exerciseById(id);- if (ex != null) out.add(ex);+ if (ex != null && !isArchived(id)) out.add(ex);}return out;}@@ -1007,31 +1069,82 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStnotifyListeners();}- String saveSessionAsRoutine() {- final s = session;- if (s == null || s.exercises.isEmpty) return '';- final id = createRoutine(t.newRoutineName);- for (final ex in s.exercises) {- if (exerciseById(ex.id) == null) continue;+ List<SessionExercise> get _savable =>+ [for (final e in session?.exercises ?? const <SessionExercise>[]) if (exerciseById(e.id) != null) e];++ void _planFromSession(String routineId, SessionExercise ex) {+ if (ex.sets.isEmpty) return;+ setPlannedSets(routineId, ex.id, [+ for (final st in ex.sets)+ PlannedSet(+ reps: modeOf(ex.id).isEmpty ? st.reps : null,+ weightKg: st.weight > 0 ? st.weight : null,+ kind: st.kind,+ sec: st.sec,+ km: st.km,+ ),+ ]);+ }++ Routine? get sessionRoutine {+ final id = session?.routineId;+ return id == null ? null : _routine(id);+ }++ bool get sessionEditedRoutine {+ final r = sessionRoutine;+ return r != null &&+ _savable.map((e) => e.id).join('|') != routineExercises(r).map((e) => e.id).join('|');+ }++ ({List<Exercise> added, List<Exercise> removed, bool reordered}) get sessionRoutineChanges {+ final r = sessionRoutine;+ final before = r == null ? const <Exercise>[] : routineExercises(r);+ final after = [for (final e in _savable) exerciseById(e.id)!];+ final was = {for (final e in before) e.id};+ final now = {for (final e in after) e.id};+ return (+ added: after.where((e) => !was.contains(e.id)).toList(),+ removed: before.where((e) => !now.contains(e.id)).toList(),+ reordered: was.where(now.contains).join('|') != now.where(was.contains).join('|'),+ );+ }++ String saveSessionAsRoutine(String name) {+ final exs = _savable;+ if (exs.isEmpty) return '';+ final id = createRoutine(name);+ for (final ex in exs) {toggleRoutineExercise(id, ex.id);if (ex.linkedNext) toggleChain(id, ex.id);- if (ex.sets.isEmpty) continue;- setPlannedSets(id, ex.id, [- for (final st in ex.sets)- PlannedSet(- reps: modeOf(ex.id).isEmpty ? st.reps : null,- weightKg: st.weight > 0 ? st.weight : null,- kind: st.kind,- sec: st.sec,- km: st.km,- ),- ]);+ _planFromSession(id, ex);}+ session!.routineId = id;persistNow();notifyListeners();return id;}+ void saveSessionIntoRoutine() {+ final r = sessionRoutine;+ if (r == null) return;+ final exs = _savable;+ final kept = {for (final e in exs) e.id};+ for (final id in [...r.exerciseIds]) {+ if (!kept.contains(id)) toggleRoutineExercise(r.id, id);+ }+ for (final ex in exs) {+ if (r.exerciseIds.contains(ex.id)) continue;+ toggleRoutineExercise(r.id, ex.id);+ _planFromSession(r.id, ex);+ }+ r.exerciseIds+ ..clear()+ ..addAll(kept);+ persistNow();+ notifyListeners();+ }+double get summaryVolumeKg => (session?.summaryVolume ?? 0).toDouble();int summaryPrs = 0;diff --git a/lib/wear/wear_shell.dart b/lib/wear/wear_shell.dartindex 39c8385..9a6810e 100644--- a/lib/wear/wear_shell.dart+++ b/lib/wear/wear_shell.dart@@ -353,7 +353,7 @@ class WearHome extends StatelessWidget {final planned = fit.todayRoutine;final canStart = planned != null && planned.exerciseIds.isNotEmpty;return WearPage(children: [- Center(child: _WeekRing(gc: gc, done: fit.sessionsThisWeek, goal: fit.weeklyTarget)),+ Center(child: _WeekRing(gc: gc, done: fit.daysDoneThisWeek, goal: fit.weeklyTarget)),const SizedBox(height: 8),Center(child: Row(mainAxisSize: MainAxisSize.min, children: [@@ -1144,7 +1144,7 @@ class WearSession extends StatelessWidget {_stat(gc, t.setsCaps, '${s.summarySets ?? 0}'),_stat(gc, t.volume, fit.volumeLabel(fit.summaryVolumeKg)),const SizedBox(height: 10),- WearButton(label: t.saveAndExit, icon: PhosphorIconsBold.check, filled: true, onTap: fit.saveAndExit),+ WearButton(label: t.done, icon: PhosphorIconsBold.check, filled: true, onTap: fit.saveAndExit),const SizedBox(height: 8),WearButton(label: t.keepTraining, icon: PhosphorIconsBold.arrowCounterClockwise, onTap: fit.continueSession),]);diff --git a/lib/widgets/dialogs.dart b/lib/widgets/dialogs.dartindex 848088d..2b0e93c 100644--- a/lib/widgets/dialogs.dart+++ b/lib/widgets/dialogs.dart@@ -63,6 +63,45 @@ Future<bool> askConfirm(return ok ?? false;}+Future<String?> askText(+ BuildContext context, {+ required String title,+ String initial = '',+ String hint = '',+}) async {+ final gc = context.gc;+ final controller = TextEditingController(text: initial)+ ..selection = TextSelection(baseOffset: 0, extentOffset: initial.length);+ final raw = await showAppDialog<String>(+ context: context,+ builder: (dctx) => appDialog(+ gc,+ title: Text(title, style: AppTheme.d(18, weight: FontWeight.w700, color: gc.text)),+ content: TextField(+ controller: controller,+ autofocus: true,+ textCapitalization: TextCapitalization.sentences,+ style: AppTheme.s(15, color: gc.text),+ cursorColor: gc.accent,+ decoration: InputDecoration(+ hintText: hint,+ hintStyle: AppTheme.s(15, color: gc.textTertiary),+ enabledBorder: UnderlineInputBorder(borderSide: BorderSide(color: gc.border)),+ focusedBorder: UnderlineInputBorder(borderSide: BorderSide(color: gc.accent)),+ ),+ onSubmitted: (v) => Navigator.of(dctx).pop(v),+ ),+ actions: [+ dialogAction(t.cancel, gc.textSecondary, () => Navigator.of(dctx).pop(), strong: false),+ dialogAction(t.save, gc.accent, () => Navigator.of(dctx).pop(controller.text)),+ ],+ ),+ );+ controller.dispose();+ final text = raw?.trim() ?? '';+ return text.isEmpty ? null : text;+}+Future<double?> askNumber(BuildContext context, {required String title,