Skip to content

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

Let past workouts take typed reps, weight and distance

InlitX1e81a484b506
diff --git a/lib/screens/progress_screen.dart b/lib/screens/progress_screen.dart
index 4719a2e..c997e5c 100644
--- a/lib/screens/progress_screen.dart
+++ b/lib/screens/progress_screen.dart
@@ -2774,7 +2774,9 @@ Widget _editSetRow(GymColors gc, LoggedSession s, LoggedExercise e, int i, bool
final set = e.sets[i];
final distance = fit.loggedDistance(e);
final timed = !distance && fit.loggedTimed(e);
- Widget cell(String label, String value, VoidCallback onDec, VoidCallback onInc, {double minWidth = 30}) => Expanded(
+ Widget cell(String label, String value, VoidCallback onDec, VoidCallback onInc,
+ {double minWidth = 30, Future<void> Function(BuildContext)? edit}) =>
+ Expanded(
child: Column(
children: [
FittedBox(
@@ -2784,14 +2786,17 @@ Widget _editSetRow(GymColors gc, LoggedSession s, LoggedExercise e, int i, bool
style: AppTheme.s(9.5, weight: FontWeight.w600, color: gc.textTertiary, letterSpacing: 1)),
),
const SizedBox(height: 2),
- StepperControl(
- value: value,
- onDec: onDec,
- onInc: onInc,
- minWidth: minWidth,
- btnSize: 26,
- gap: 8,
- fontSize: 14,
+ Builder(
+ builder: (ctx) => StepperControl(
+ value: value,
+ onDec: onDec,
+ onInc: onInc,
+ onEdit: edit == null ? null : () => edit(ctx),
+ minWidth: minWidth,
+ btnSize: 26,
+ gap: 8,
+ fontSize: 14,
+ ),
),
],
),
@@ -2811,7 +2816,13 @@ Widget _editSetRow(GymColors gc, LoggedSession s, LoggedExercise e, int i, bool
if (distance) ...[
cell(t.distanceCol(fit.distanceUnit).replaceAll(RegExp(r'\s*\(.*\)'), ''), fit.distanceValue(set.km ?? 0),
() => fit.bumpLoggedKm(e, i, -1), () => fit.bumpLoggedKm(e, i, 1),
- minWidth: 36),
+ minWidth: 36, edit: (ctx) async {
+ final v = await askNumber(ctx,
+ title: t.distanceCol(fit.distanceUnit).replaceAll(RegExp(r'\s*\(.*\)'), ''),
+ initial: fit.distanceValue(set.km ?? 0),
+ decimal: true);
+ if (v != null) fit.setLoggedKmShown(e, i, v);
+ }),
time,
] else ...[
if (timed)
@@ -2819,16 +2830,31 @@ Widget _editSetRow(GymColors gc, LoggedSession s, LoggedExercise e, int i, bool
else if (set.sided) ...[
cell(t.repsLeftCol, '${set.left}', () => fit.bumpLoggedSide(e, i, true, -1),
() => fit.bumpLoggedSide(e, i, true, 1),
- minWidth: 22),
+ minWidth: 22, edit: (ctx) async {
+ final v = await askNumber(ctx, title: t.repsLeftCol, initial: '${set.left}', decimal: false);
+ if (v != null) fit.setLoggedSide(e, i, true, v.round());
+ }),
cell(t.repsRightCol, '${set.right}', () => fit.bumpLoggedSide(e, i, false, -1),
() => fit.bumpLoggedSide(e, i, false, 1),
- minWidth: 22),
+ minWidth: 22, edit: (ctx) async {
+ final v = await askNumber(ctx, title: t.repsRightCol, initial: '${set.right}', decimal: false);
+ if (v != null) fit.setLoggedSide(e, i, false, v.round());
+ }),
] else
- cell(t.repsCol, '${set.reps}', () => fit.bumpLoggedReps(e, i, -1), () => fit.bumpLoggedReps(e, i, 1)),
+ cell(t.repsCol, '${set.reps}', () => fit.bumpLoggedReps(e, i, -1), () => fit.bumpLoggedReps(e, i, 1),
+ edit: (ctx) async {
+ final v = await askNumber(ctx, title: t.repsCol, initial: '${set.reps}', decimal: false);
+ if (v != null) fit.setLoggedReps(e, i, v.round());
+ }),
if (!repsOnly && (!timed || set.weight > 0))
cell(t.weightCol(fit.units.toUpperCase()), fit.weightValue(set.weight), () => fit.bumpLoggedWeight(e, i, -1),
() => fit.bumpLoggedWeight(e, i, 1),
- minWidth: 34),
+ minWidth: 34, edit: (ctx) async {
+ final shown = (fit.toDisplayWeight(set.weight) * 100).round() / 100;
+ final v = await askNumber(ctx,
+ title: t.weightCol(fit.units.toUpperCase()), initial: fmt(shown), decimal: true);
+ if (v != null) fit.setLoggedWeightShown(e, i, v);
+ }),
],
Semantics(
button: true,
diff --git a/lib/state/stats_state.dart b/lib/state/stats_state.dart
index 6c50a08..71c8b93 100644
--- a/lib/state/stats_state.dart
+++ b/lib/state/stats_state.dart
@@ -494,6 +494,17 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineSt
void setLoggedWeight(LoggedExercise e, int i, double kg) =>
_replaceLoggedSet(e, i, weight: _round3(kg.clamp(0, 1000)));
+ void setLoggedSide(LoggedExercise e, int i, bool leftSide, int reps) {
+ if (i < 0 || i >= e.sets.length || !e.sets[i].sided) return;
+ final v = reps.clamp(0, 999);
+ _replaceLoggedSet(e, i, left: leftSide ? v : null, right: leftSide ? null : v);
+ }
+
+ void setLoggedKmShown(LoggedExercise e, int i, double shown) {
+ if (i < 0 || i >= e.sets.length) return;
+ _replaceLoggedSet(e, i, km: _round3(fromDisplayKm(math.max(0.0, shown))));
+ }
+
void bumpLoggedSec(LoggedExercise e, int i, int d) {
if (i < 0 || i >= e.sets.length) return;
final now = e.sets[i].sec ?? 0;