Merge pull request #67 from SamBergeron/master

Add the ability to select Query options when looking up workout samples

Author: kvs-coder

ios/Classes/Extensions+SwiftHealthKitReporterPlugin.swift

@@ -7,6 +7,7 @@
 
 import Flutter
 import HealthKitReporter
+import HealthKit
 
 // MARK: - MethodCall
 extension SwiftHealthKitReporterPlugin {
@@ -112,7 +113,7 @@ extension SwiftHealthKitReporterPlugin {
                 result: result
             )
         case .workoutQuery:
-            guard let arguments = call.arguments as? [String: Double] else {
+            guard let arguments = call.arguments as? [String: Any] else {
                 throwNoArgumentsError(result: result)
                 return
             }
@@ -489,19 +490,34 @@ extension SwiftHealthKitReporterPlugin {
     }
     private func workoutQuery(
         reporter: HealthKitReporter,
-        arguments: [String: Double],
+        arguments: [String: Any],
         result: @escaping FlutterResult
     ) {
         guard
-            let startTimestamp = arguments["startTimestamp"],
-            let endTimestamp = arguments["endTimestamp"]
+            let startTimestamp = arguments["startTimestamp"] as? Double,
+            let endTimestamp = arguments["endTimestamp"] as? Double,
+            let option = arguments["singleQueryOption"] as? String?
         else {
             throwParsingArgumentsError(result: result, arguments: arguments)
             return
         }
+        lazy var hkOptions:HKQueryOptions = {
+            if (option != nil) {
+                if (option == "strictStartDate") {
+                    return [.strictStartDate]
+                } else if (option == "strictEndDate") {
+                    return [.strictEndDate]
+                } else if (option == "notStrict") {
+                    return []
+                }
+            }
+            // Default to both being strict
+            return [.strictStartDate, .strictEndDate]
+        }()
         let predicate = NSPredicate.samplesPredicate(
             startDate: Date.make(from: startTimestamp),
-            endDate: Date.make(from: endTimestamp)
+            endDate: Date.make(from: endTimestamp),
+            options: hkOptions
         )
         do {
             let query = try reporter.reader.workoutQuery(

lib/health_kit_reporter.dart

@@ -4,6 +4,7 @@ import 'dart:convert';
 
 import 'package:flutter/services.dart';
 
+import 'model/SampleQueryOptions.dart';
 import 'model/payload/activity_summary.dart';
 import 'model/payload/category.dart';
 import 'model/payload/characteristic/characteristic.dart';
@@ -389,10 +390,15 @@ class HealthKitReporter {
 
   /// Returns [Workout] samples for the provided
   /// time interval predicate [predicate].
-  ///
-  static Future<List<Workout>> workoutQuery(Predicate predicate) async {
-    final result =
-        await _methodChannel.invokeMethod('workoutQuery', predicate.map);
+  /// [queryOption] parameter represents the options passable to the native HealthKit sample query
+  static Future<List<Workout>> workoutQuery(Predicate predicate,
+      {SampleQueryOption? queryOption}) async {
+    var arguments = <String, dynamic>{};
+    arguments.addAll(predicate.map);
+    if (queryOption != null) {
+      arguments["singleQueryOption"] = queryOption.value;
+    }
+    final result = await _methodChannel.invokeMethod('workoutQuery', arguments);
     final List<dynamic> list = jsonDecode(result);
     final workouts = <Workout>[];
     for (final Map<String, dynamic> map in list) {

lib/model/SampleQueryOptions.dart

@@ -0,0 +1,19 @@
+import 'package:health_kit_reporter/health_kit_reporter.dart';
+
+/// The query options are used in HealthKit when querying samples
+/// The default query option is both [strictStartDate] and [strictEndDate]
+/// this allows you to choose either of the 3 other options
+enum SampleQueryOption { strictStartDate, strictEndDate, notStrict }
+
+extension Value on SampleQueryOption {
+  String get value {
+    switch (this) {
+      case SampleQueryOption.strictStartDate:
+        return "strictStartDate";
+      case SampleQueryOption.strictEndDate:
+        return "strictEndDate";
+      case SampleQueryOption.notStrict:
+        return "notStrict";
+    }
+  }
+}