Offline gym log for Android. No account, no ads, no internet.
Dart androidbodybuildingdartexercisesf-droidfitnessfluttergymgym-apphealthprivacyself-hostedworkoutworkout-appworkout-tracker
Cache stats between redraws
InlitX9171bee4c860
diff --git a/lib/state/fit_core.dart b/lib/state/fit_core.dartindex 76d30c3..2bcdd7e 100644--- a/lib/state/fit_core.dart+++ b/lib/state/fit_core.dart@@ -121,13 +121,27 @@ abstract class FitCore extends ChangeNotifier {void refreshAwards({bool silent = false}) {}+ int _dataRev = 0;+ 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 hit = _memo[key];+ if (hit != null && hit.$1 == stamp) return hit.$2 as T;+ final value = build();+ _memo[key] = (stamp, value);+ return value;+ }+void _persist() {+ _dataRev++;if (_loading) return;_saveDebounce?.cancel();_saveDebounce = Timer(const Duration(milliseconds: 400), persistNow);}void persistNow() {+ _dataRev++;_saveDebounce?.cancel();_saveDebounce = null;if (_loading) return;diff --git a/lib/state/stats_state.dart b/lib/state/stats_state.dartindex 62ae7da..2f0f151 100644--- a/lib/state/stats_state.dart+++ b/lib/state/stats_state.dart@@ -59,22 +59,27 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineStDateTime get _weekStart => shiftDays(_dayKey(DateTime.now()), -todayIndex);+ Map<DateTime, List<LoggedSession>> get _byDay => _remember('byDay', () {+ final out = <DateTime, List<LoggedSession>>{};+ for (final s in sessions) {+ (out[_dayKey(s.day)] ??= []).add(s);+ }+ return out;+ });++ Map<DateTime, double> get _loadByDay => _remember('loadByDay', () => {+ for (final e in _byDay.entries) e.key: e.value.fold(0.0, (a, s) => a + s.volume),+ });+Iterable<LoggedSession> get _thisWeekSessions {final start = _weekStart;- final end = shiftDays(start, 7);- return sessions.where((s) {- final k = _dayKey(s.day);- return !k.isBefore(start) && k.isBefore(end);- });+ final byDay = _byDay;+ return [for (var i = 0; i < 7; i++) ...?byDay[shiftDays(start, i)]];}List<double> _dailyVolumes(int days) {final today = _dayKey(DateTime.now());- final byDay = <DateTime, double>{};- for (final s in sessions) {- final k = _dayKey(s.day);- byDay[k] = (byDay[k] ?? 0) + s.volume;- }+ final byDay = _loadByDay;return List.generate(days, (i) {final d = shiftDays(today, i - (days - 1));return byDay[d] ?? 0;@@ -188,14 +193,13 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineStList<int> get heatmapLevels => heatmapLevelsFor(kHeatmapDays);List<int> heatmapLevelsFor(int days) {- final active = <DateTime>{..._checkinDays};- final load = <DateTime, double>{};- for (final s in sessions) {- final k = _dayKey(s.day);- active.add(k);- load[k] = (load[k] ?? 0) + s.volume;- }final today = _dayKey(DateTime.now());+ return List.of(_remember(('heat', days), () => _heatLevels(days, today), today));+ }++ List<int> _heatLevels(int days, DateTime today) {+ final active = <DateTime>{..._checkinDays, ..._byDay.keys};+ final load = _loadByDay;final keys = List.generate(days, (i) => shiftDays(today, i - (days - 1)));final lifted = [for (final k in keys) if ((load[k] ?? 0) > 0) load[k]!]..sort();return [@@ -215,8 +219,7 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineStshiftDays(_dayKey(DateTime.now()), i - (kHeatmapDays - 1));List<LoggedSession> sessionsOn(DateTime day) {- final k = _dayKey(day);- return sessions.where((s) => _dayKey(s.day) == k).toList()+ return [...?_byDay[_dayKey(day)]]..sort((a, b) => b.date.compareTo(a.date));}@@ -292,7 +295,9 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineStreturn best;}- Map<LoggedSession, int> recordsBySession() {+ Map<LoggedSession, int> recordsBySession() => Map.of(_remember('recordsBySession', _recordsBySession));++ Map<LoggedSession, int> _recordsBySession() {final ordered = [...sessions]..sort((a, b) => a.date.compareTo(b.date));final best = <String, double>{};final out = <LoggedSession, int>{};@@ -560,7 +565,12 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineSt}int get currentStreak {- final days = {...sessions.map((s) => _dayKey(s.day)), ..._checkinDays};+ final today = _dayKey(DateTime.now());+ return _remember('streak', _streak, today);+ }++ int _streak() {+ final days = {..._byDay.keys, ..._checkinDays};if (days.isEmpty) return 0;final first = days.reduce((a, b) => a.isBefore(b) ? a : b);bool rest(DateTime d) => weeklyPlan.isNotEmpty && !weeklyPlan.containsKey(d.weekday);@@ -580,8 +590,8 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineStList<bool> get weekMask {final start = _weekStart;- final days = sessions.map((s) => _dayKey(s.day)).toSet();- return List.generate(7, (i) => days.contains(shiftDays(start, i)));+ final days = _byDay;+ return List.generate(7, (i) => days.containsKey(shiftDays(start, i)));}String _dayId(DateTime d) => '${d.year}-${d.month}-${d.day}';@@ -590,10 +600,7 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineStDateTime dateForWeekday(int i) => _dateForWeekday(i);- bool _hasSessionOn(DateTime day) {- final k = _dayKey(day);- return sessions.any((s) => _dayKey(s.day) == k);- }+ bool _hasSessionOn(DateTime day) => _byDay.containsKey(_dayKey(day));bool isDayDone(int i) {final d = _dateForWeekday(i);@@ -664,7 +671,9 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineStreturn (id: id, name: name, kind: kind, best: top(kind.score), oneRm: top((s) => s.oneRm));}- List<PersonalRecord> get personalRecords {+ List<PersonalRecord> get personalRecords => List.of(_remember('records', _personalRecords));++ List<PersonalRecord> _personalRecords() {final sets = <String, List<LoggedSet>>{};final names = <String, String>{};for (final s in sessions) {@@ -727,7 +736,9 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineSt? (isAssisted(r.id) ? t.assistedRecordHint : t.oneRmEst(weightLabel(r.oneRm))): t.prBestSet;- int get prsThisWeek {+ int get prsThisWeek => _remember('prsThisWeek', _prsThisWeek, _weekStart);++ int _prsThisWeek() {final kinds = {for (final r in personalRecords) r.id: r.kind};final bestScore = <String, double>{};final bestDate = <String, DateTime>{};@@ -967,14 +978,19 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineStreturn ids.take(3).toList();}- List<({DateTime date, LoggedExercise ex})> exerciseHistory(String id) {- final out = <({DateTime date, LoggedExercise ex})>[];+ List<({DateTime date, LoggedExercise ex})> exerciseHistory(String id) =>+ List.of(_remember('history', _historyIndex)[id] ?? const []);++ Map<String, List<({DateTime date, LoggedExercise ex})>> _historyIndex() {+ final out = <String, List<({DateTime date, LoggedExercise ex})>>{};for (final s in sessions) {for (final e in s.exercises) {- if (e.id == id) out.add((date: s.date, ex: e));+ (out[e.id] ??= []).add((date: s.date, ex: e));}}- out.sort((a, b) => b.date.compareTo(a.date));+ for (final list in out.values) {+ list.sort((a, b) => b.date.compareTo(a.date));+ }return out;}@@ -1118,8 +1134,7 @@ mixin StatsState on FitCore, ToolsState, LibraryState, SettingsState, TimelineStint get heatmapYearWeeks {DateTime? first;- for (final s in sessions) {- final d = _dayKey(s.day);+ for (final d in _byDay.keys) {if (first == null || d.isBefore(first)) first = d;}for (final d in _checkinDays) {