@kingstinct/react-native-healthkit 8.3.0 → 8.5.0

package/README.md

@@ -131,13 +131,20 @@ Some imperative examples:
 ```
 
 ### HealthKit Anchors (breaking change in 6.0)
-In 6.0 you can use HealthKit anchors to get changes and deleted items which is very useful for syncing. This is a breaking change - but a very easy one to handle that TypeScript should help you with. Most queries now return an object containing samples which is what was returned as only an array before. In addition you also get deletedSamples and a newAnchor you can use for more advanced use cases, example:
+In 6.0 you can use HealthKit anchors to get changes and deleted items which is very useful for syncing. This is a breaking change - but a very easy one to handle that TypeScript should help you with. Most queries now return an object containing samples which is what was returned as only an array before. 
+
+```newAnchor``` is a base64-encoded string returned from HealthKit that contain sync information.  After each successful sync, store the anchor for the next time your anchor query is called to only return the values that have changed.
+
+```limit``` will indicate how many records to consider when sycning data, you can set this value to 0 indicate no limit.
+
+Example:
+
 ```TypeScript
-  const { newAnchor, samples, deletedSamples } = await queryQuantitySamples(HKQuantityTypeIdentifier.stepCount, {
+  const { newAnchor, samples, deletedSamples } = await queryQuantitySamplesWithAnchor(HKQuantityTypeIdentifier.stepCount, {
     limit: 2,
   })
 
-  const nextResult = await queryQuantitySamples(HKQuantityTypeIdentifier.stepCount, {
+  const nextResult = await queryQuantitySamplesWithAnchor(HKQuantityTypeIdentifier.stepCount, {
     limit: 2,
     anchor: newAnchor,
   })

package/ios/Constants.swift

@@ -23,6 +23,7 @@ let HKAudiogramTypeIdentifier = "HKAudiogramTypeIdentifier"
 let HKWorkoutTypeIdentifier = "HKWorkoutTypeIdentifier"
 let HKWorkoutRouteTypeIdentifier = "HKWorkoutRouteTypeIdentifier"
 let HKDataTypeIdentifierHeartbeatSeries = "HKDataTypeIdentifierHeartbeatSeries"
+let HKStateOfMindTypeIdentifier = "HKStateOfMindTypeIdentifier"
 
 let HKWorkoutActivityTypePropertyName = "activityType"
 let HKWorkoutSessionLocationTypePropertyName = "locationType"

package/ios/Helpers.swift

@@ -18,7 +18,8 @@ func limitOrNilIfZero(limit: Int) -> Int {
 
 func createPredicate(from: Date?, to: Date?) -> NSPredicate? {
     if from != nil || to != nil {
-        return HKQuery.predicateForSamples(withStart: from, end: to, options: [.strictEndDate, .strictStartDate])
+        return HKQuery.predicateForSamples(
+            withStart: from, end: to, options: [.strictEndDate, .strictStartDate])
     } else {
         return nil
     }
@@ -29,23 +30,23 @@ func getSortDescriptors(ascending: Bool) -> [NSSortDescriptor] {
 }
 
 func base64StringToHKQueryAnchor(base64String: String) -> HKQueryAnchor? {
-  // Step 1: Decode the base64 string to a Data object
-  guard let data = Data(base64Encoded: base64String) else {
-      print("Error: Invalid base64 string")
-      return nil
-  }
-
-  // Step 2: Use NSKeyedUnarchiver to unarchive the data and create an HKQueryAnchor object
-  do {
-      let unarchiver = try NSKeyedUnarchiver(forReadingFrom: data)
-      unarchiver.requiresSecureCoding = true
-      let anchor = try? NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(data)
-
-      return anchor as? HKQueryAnchor
-  } catch {
-      print("Error: Unable to unarchive HKQueryAnchor object: \(error)")
-      return nil
-  }
+    // Step 1: Decode the base64 string to a Data object
+    guard let data = Data(base64Encoded: base64String) else {
+        print("Error: Invalid base64 string")
+        return nil
+    }
+
+    // Step 2: Use NSKeyedUnarchiver to unarchive the data and create an HKQueryAnchor object
+    do {
+        let unarchiver = try NSKeyedUnarchiver(forReadingFrom: data)
+        unarchiver.requiresSecureCoding = true
+        let anchor = try? NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(data)
+
+        return anchor as? HKQueryAnchor
+    } catch {
+        print("Error: Unable to unarchive HKQueryAnchor object: \(error)")
+        return nil
+    }
 }
 
 func sampleTypeFromString(typeIdentifier: String) -> HKSampleType? {
@@ -102,7 +103,7 @@ func sampleTypesFromDictionary(typeIdentifiers: NSDictionary) -> Set<HKSampleTyp
         if item.value as! Bool {
             let sampleType = sampleTypeFromString(typeIdentifier: item.key as! String)
             if sampleType != nil {
-             share.insert(sampleType!)
+                share.insert(sampleType!)
             }
         }
     }
@@ -134,6 +135,14 @@ func objectTypeFromString(typeIdentifier: String) -> HKObjectType? {
         return HKObjectType.activitySummaryType()
     }
 
+    #if compiler(>=6)
+        if #available(iOS 18, *) {
+            if typeIdentifier == HKStateOfMindTypeIdentifier {
+                return HKObjectType.stateOfMindType()
+            }
+        }
+    #endif
+
     if #available(iOS 13, *) {
         if typeIdentifier == HKAudiogramTypeIdentifier {
             return HKObjectType.audiogramSampleType()
@@ -217,23 +226,24 @@ func serializeQuantityIfExists(unit: HKUnit, quantity: HKQuantity?) -> [String:
     return serializeQuantity(unit: unit, quantity: quantity)
 }
 
-func serializeStatisticIfExists(unit: HKUnit, quantity: HKQuantity?, stats: HKStatistics) -> [String: Any]? {
+func serializeStatisticIfExists(unit: HKUnit, quantity: HKQuantity?, stats: HKStatistics)
+    -> [String: Any]? {
     guard let quantity = quantity else { return nil }
     return serializeStatistic(unit: unit, quantity: quantity, stats: stats)
 }
 
 func parseWorkoutConfiguration(_ dict: NSDictionary) -> HKWorkoutConfiguration {
-  let configuration = HKWorkoutConfiguration()
+    let configuration = HKWorkoutConfiguration()
 
-  if let activityTypeRaw = dict[HKWorkoutActivityTypePropertyName] as? UInt,
-     let activityType = HKWorkoutActivityType(rawValue: activityTypeRaw) {
-    configuration.activityType = activityType
-  }
+    if let activityTypeRaw = dict[HKWorkoutActivityTypePropertyName] as? UInt,
+        let activityType = HKWorkoutActivityType(rawValue: activityTypeRaw) {
+        configuration.activityType = activityType
+    }
 
-  if let locationTypeRaw = dict[HKWorkoutSessionLocationTypePropertyName] as? Int,
-     let locationType = HKWorkoutSessionLocationType(rawValue: locationTypeRaw) {
-    configuration.locationType = locationType
-  }
+    if let locationTypeRaw = dict[HKWorkoutSessionLocationTypePropertyName] as? Int,
+        let locationType = HKWorkoutSessionLocationType(rawValue: locationTypeRaw) {
+        configuration.locationType = locationType
+    }
 
-  return configuration
+    return configuration
 }

package/ios/ReactNativeHealthkit.m

@@ -246,4 +246,11 @@ RCT_EXTERN_METHOD(startWatchAppWithWorkoutConfiguration:(NSDictionary)workoutCon
                   reject:(RCTPromiseRejectBlock)reject
 )
 
+RCT_EXTERN_METHOD(queryStateOfMindSamples:(NSDate)from
+                  to:(NSDate)to 
+                  limit:(NSInteger)limit
+                  ascending:(BOOL)ascending
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
 @end