Skip to content

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

Fix Android step totals for full-day Health Connect records

Alexander Petrovf97faed45d21
diff --git a/lib/services/health_steps.dart b/lib/services/health_steps.dart
index e42f5f1..f27cab1 100644
--- a/lib/services/health_steps.dart
+++ b/lib/services/health_steps.dart
@@ -1,6 +1,7 @@
import 'dart:io';
import 'dart:math' as math;
+import 'package:flutter/foundation.dart' show visibleForTesting;
import 'package:flutter/services.dart';
enum HealthAccess { unsupported, denied, granted }
@@ -63,11 +64,8 @@ class HealthSteps {
static Future<Map<DateTime, int>?> read(List<DateTime> days) async {
if (days.isEmpty || !(Platform.isAndroid || Platform.isIOS)) return null;
- final now = DateTime.now().millisecondsSinceEpoch;
- final ranges = [
- for (final day in days)
- [_start(day), math.max(_start(day) + 1, math.min(_start(DateTime(day.year, day.month, day.day + 1)), now))],
- ];
+ final cutoff = Platform.isIOS ? DateTime.now() : null;
+ final ranges = [for (final day in days) stepQueryRange(day, cutoff: cutoff)];
try {
final counts = await _channel.invokeListMethod<int>('readSteps', {'ranges': ranges});
if (counts == null || counts.length != days.length) return null;
@@ -79,5 +77,13 @@ class HealthSteps {
}
}
- static int _start(DateTime day) => DateTime(day.year, day.month, day.day).millisecondsSinceEpoch;
+ @visibleForTesting
+ static List<int> stepQueryRange(DateTime day, {DateTime? cutoff}) {
+ final start = DateTime(day.year, day.month, day.day).millisecondsSinceEpoch;
+ final end = DateTime(day.year, day.month, day.day + 1).millisecondsSinceEpoch;
+ return [
+ start,
+ if (cutoff == null) end else math.max(start + 1, math.min(end, cutoff.millisecondsSinceEpoch)),
+ ];
+ }
}
diff --git a/test/health_steps_test.dart b/test/health_steps_test.dart
new file mode 100644
index 0000000..08431aa
--- /dev/null
+++ b/test/health_steps_test.dart
@@ -0,0 +1,28 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:gymmane/services/health_steps.dart';
+
+void main() {
+ test('Android includes the entire calendar day for daily step records', () {
+ final day = DateTime(2026, 10, 31, 11, 30);
+
+ expect(HealthSteps.stepQueryRange(day), [
+ DateTime(2026, 10, 31).millisecondsSinceEpoch,
+ DateTime(2026, 11, 1).millisecondsSinceEpoch,
+ ]);
+ });
+
+ test('iOS caps the current day and keeps past days intact', () {
+ final now = DateTime(2026, 11, 1, 11, 30);
+ final previousDay = DateTime(2026, 10, 31);
+ final today = DateTime(2026, 11, 1);
+
+ expect(HealthSteps.stepQueryRange(today, cutoff: now), [
+ today.millisecondsSinceEpoch,
+ now.millisecondsSinceEpoch,
+ ]);
+ expect(HealthSteps.stepQueryRange(previousDay, cutoff: now), [
+ previousDay.millisecondsSinceEpoch,
+ today.millisecondsSinceEpoch,
+ ]);
+ });
+}