Skip to content

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

Units per exercise in the core state

InlitX6fcb7b87882c
diff --git a/lib/state/fit_core.dart b/lib/state/fit_core.dart
index 69584c7..d27615b 100644
--- a/lib/state/fit_core.dart
+++ b/lib/state/fit_core.dart
@@ -63,6 +63,7 @@ abstract class FitCore extends ChangeNotifier {
final Map<String, String> exerciseMedia = {};
final Map<String, int> exerciseRest = {};
+ final Map<String, String> exerciseUnits = {};
final Map<String, double> progressStep = {};
@@ -130,7 +131,14 @@ abstract class FitCore extends ChangeNotifier {
final Map<Object, (Object?, Object?)> _memo = {};
T _remember<T>(Object key, T Function() build, [Object? extra]) {
- final stamp = (_dataRev, sessions.length, checkins.length, extra);
+ final stamp = (
+ _dataRev,
+ sessions.length,
+ sessions.isEmpty ? 0 : identityHashCode(sessions.first),
+ sessions.isEmpty ? 0 : identityHashCode(sessions.last),
+ checkins.length,
+ extra,
+ );
final hit = _memo[key];
if (hit != null && hit.$1 == stamp) return hit.$2 as T;
final value = build();
@@ -138,6 +146,16 @@ abstract class FitCore extends ChangeNotifier {
return value;
}
+ Map<DateTime, List<LoggedSession>> get _sessionDays => _remember('sessionDays', () {
+ final out = <DateTime, List<LoggedSession>>{};
+ for (final s in sessions) {
+ (out[_dayKey(s.day)] ??= []).add(s);
+ }
+ return out;
+ });
+
+ List<LoggedSession> _sessionsOnDay(DateTime day) => _sessionDays[_dayKey(day)] ?? const [];
+
void _persist() {
_dataRev++;
if (_loading) return;
@@ -150,7 +168,44 @@ abstract class FitCore extends ChangeNotifier {
_saveDebounce?.cancel();
_saveDebounce = null;
if (_loading) return;
- Store.instance.save(toJson());
+ _storing = {};
+ try {
+ final data = toJson();
+ Store.instance.save(data, raw: _storing!);
+ } finally {
+ _storing = null;
+ }
+ }
+
+ Map<String, String>? _storing;
+ final _sessionText = Expando<(List<Object?>, String)>();
+ final _itemText = Expando<String>();
+
+ Object _stored<T extends Object>(String tag, List<T> items, Map<String, dynamic> Function(T) json,
+ {List<Object?> Function(T)? parts}) {
+ final raw = _storing;
+ if (raw == null) return [for (final i in items) json(i)];
+ final out = StringBuffer('[');
+ for (var i = 0; i < items.length; i++) {
+ if (i > 0) out.write(',');
+ out.write(parts == null ? _textOf(items[i], json) : _textByParts(items[i], json, parts));
+ }
+ out.write(']');
+ raw[tag] = out.toString();
+ return Store.rawMark(tag);
+ }
+
+ String _textOf<T extends Object>(T item, Map<String, dynamic> Function(T) json) =>
+ _itemText[item] ??= Store.encode(json(item));
+
+ String _textByParts<T extends Object>(
+ T item, Map<String, dynamic> Function(T) json, List<Object?> Function(T) parts) {
+ final now = parts(item);
+ final hit = _sessionText[item];
+ if (hit != null && listEquals(hit.$1, now)) return hit.$2;
+ final text = Store.encode(json(item));
+ _sessionText[item] = (now, text);
+ return text;
}
void goHome() => _setRoute('home', reset: true);
@@ -220,6 +275,26 @@ abstract class FitCore extends ChangeNotifier {
double get rulerStep => isLb ? (stepLb == 2.5 ? 0.5 : 1) : (stepKg == 1.25 ? 0.25 : 0.5);
double get plateStep => isLb ? 5 : 2.5;
+
+ String unitsFor(String id) => exerciseUnits[id] ?? units;
+
+ bool isLbFor(String id) => unitsFor(id) == 'lb';
+
+ double toShownFor(String id, double kg) => isLbFor(id) ? kg * _lbPerKg : kg;
+
+ double fromShownFor(String id, double shown) => isLbFor(id) ? shown / _lbPerKg : shown;
+
+ String weightValueFor(String id, double kg) => fmt(_roundWeight(toShownFor(id, kg)));
+
+ double weightStepFor(String id) => isLbFor(id) ? stepLb : stepKg;
+
+ double rulerStepFor(String id) => isLbFor(id) ? (stepLb == 2.5 ? 0.5 : 1) : (stepKg == 1.25 ? 0.25 : 0.5);
+
+ void setExerciseUnits(String id, String unit) {
+ unit == units ? exerciseUnits.remove(id) : exerciseUnits[id] = unit;
+ _persist();
+ notifyListeners();
+ }
String get volumeUnit => isLb ? 'k lb' : 't';
String volumeValue(double kg) => fmt(_round1(toDisplayWeight(kg) / 1000));