Skip to content

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

Count a workout on the day it started

InlitX5526797c9702
diff --git a/lib/models/workout.dart b/lib/models/workout.dart
index d32a3bc..4356e66 100644
--- a/lib/models/workout.dart
+++ b/lib/models/workout.dart
@@ -110,6 +110,7 @@ class LoggedSession {
final String? routineId;
String? name;
+ DateTime get day => date.subtract(Duration(seconds: durationSec));
double get volume => exercises.fold(0.0, (s, e) => s + e.volume);
int get setCount => exercises.fold(0, (s, e) => s + e.workingSets.length);
diff --git a/lib/screens/sticker_screen.dart b/lib/screens/sticker_screen.dart
index b22ebdf..72a9536 100644
--- a/lib/screens/sticker_screen.dart
+++ b/lib/screens/sticker_screen.dart
@@ -572,7 +572,7 @@ class _Sticker extends StatelessWidget {
final start = fit.weekStartDate;
final trained = <int>{};
for (final s in fit.sessions) {
- final d = DateTime(s.date.year, s.date.month, s.date.day).difference(start).inDays;
+ final d = DateTime(s.day.year, s.day.month, s.day.day).difference(start).inDays;
if (d >= 0 && d < 7) trained.add(d);
}
final now = DateTime.now();
@@ -671,7 +671,7 @@ class _Sticker extends StatelessWidget {
_mark(size: 11),
if (showDate) ...[
const SizedBox(width: 10),
- Flexible(child: Text(t.longDate(session.date), maxLines: 1, overflow: TextOverflow.ellipsis,
+ Flexible(child: Text(t.longDate(session.day), maxLines: 1, overflow: TextOverflow.ellipsis,
style: _s(11, FontWeight.w600, alpha: 0.7))),
],
]),
diff --git a/lib/screens/strava_sheet.dart b/lib/screens/strava_sheet.dart
index d434f77..923c1c0 100644
--- a/lib/screens/strava_sheet.dart
+++ b/lib/screens/strava_sheet.dart
@@ -42,9 +42,9 @@ class _StravaSheetState extends State<_StravaSheet> {
super.initState();
final list = [...fit.sessions]..sort((a, b) => b.date.compareTo(a.date));
for (final s in list) {
- (_byDay[_key(s.date)] ??= []).add(s);
+ (_byDay[_key(s.day)] ??= []).add(s);
}
- _day = list.isEmpty ? null : _key(list.first.date);
+ _day = list.isEmpty ? null : _key(list.first.day);
final base = _day ?? DateTime.now();
_month = DateTime(base.year, base.month);
}
@@ -199,7 +199,7 @@ class _StravaSheetState extends State<_StravaSheet> {
child: Row(children: [
Expanded(
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
- Text(t.longDate(s.date),
+ Text(t.longDate(s.day),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: AppTheme.f(14.5, weight: FontWeight.w700, color: gc.text)),