feat: Add OCKHealthKitPassthroughStore back to watchOS (#140)

Author: cbaker6

OCKSample.xcodeproj/project.pbxproj

@@ -1275,7 +1275,7 @@
 			repositoryURL = "https://github.com/netreconlab/CareKitEssentials";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = "1.0.0-alpha.44";
+				minimumVersion = "1.0.0-alpha.46";
 			};
 		};
 		70202EBF2807333900CF73FB /* XCRemoteSwiftPackageReference "CareKit" */ = {

OCKSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,6 +6,7 @@
 //  Copyright © 2020 Network Reconnaissance Lab. All rights reserved.
 
 import CareKit
+import CareKitEssentials
 import CareKitStore
 import CareKitUI
 import SwiftUI
@@ -44,18 +45,15 @@ struct MainView: View {
                 }
         }
         .environment(\.careStore, storeCoordinator)
-        .onReceive(loginViewModel.$isLoggedOut, perform: { isLoggedOut in
+		.onChange(of: appDelegate.storeCoordinator) { newStoreCoordinator in
+			storeCoordinator = newStoreCoordinator
+		}
+		.onReceive(loginViewModel.$isLoggedOut) { isLoggedOut in
             guard !isLoggedOut else {
                 updatePath([])
                 return
             }
             updatePath([.tabs])
-        })
-        .onReceive(appDelegate.$storeCoordinator) { newStoreCoordinator in
-            guard storeCoordinator !== newStoreCoordinator else {
-                return
-            }
-            storeCoordinator = newStoreCoordinator
         }
     }
 

OCKSample/Main/MainView.swift

@@ -27,7 +27,14 @@ class AppDelegate: NSObject, WKApplicationDelegate, ObservableObject {
             self.objectWillChange.send()
         }
     }
+	@Published private(set) var storeCoordinator: OCKStoreCoordinator = .init() {
+		willSet {
+			StoreCoordinatorKey.defaultValue = newValue
+			self.objectWillChange.send()
+		}
+	}
     private(set) var parseRemote: ParseRemote!
+	private(set) var healthKitStore: OCKHealthKitPassthroughStore!
 
     // MARK: Private read/write properties
 
@@ -96,13 +103,17 @@ class AppDelegate: NSObject, WKApplicationDelegate, ObservableObject {
                     WCSession.default.activate()
                     return
                 }
-                parseRemote = try await ParseRemote(uuid: uuid,
-                                                    auto: false,
-                                                    subscribeToRemoteUpdates: true,
-                                                    defaultACL: PCKUtility.getDefaultACL())
-                let store = OCKStore(name: Constants.watchOSParseCareStoreName,
-                                     type: .onDisk(),
-                                     remote: parseRemote)
+                parseRemote = try await ParseRemote(
+					uuid: uuid,
+					auto: false,
+					subscribeToRemoteUpdates: true,
+					defaultACL: PCKUtility.getDefaultACL()
+				)
+                let store = OCKStore(
+					name: Constants.watchOSParseCareStoreName,
+					type: .onDisk(),
+					remote: parseRemote
+				)
                 parseRemote?.parseRemoteDelegate = self
                 sessionDelegate.store = store
                 self.store = store
@@ -117,6 +128,12 @@ class AppDelegate: NSObject, WKApplicationDelegate, ObservableObject {
                 self.store = store
             }
             WCSession.default.activate()
+
+			healthKitStore = OCKHealthKitPassthroughStore(store: store)
+			let storeCoordinator = OCKStoreCoordinator()
+			storeCoordinator.attach(store: store)
+			storeCoordinator.attach(eventStore: healthKitStore)
+			self.storeCoordinator = storeCoordinator
         } catch {
             Logger.appDelegate.error("Error setting up remote: \(error)")
             throw error

OCKWatchSample Extension/AppDelegate.swift

@@ -29,10 +29,10 @@ struct CareView: View {
 
     var body: some View {
         ScrollView {
-            ForEach(orderedEvents) { event in
+			ForEach(orderedEvents) { event in
                 if event.result.task.id == TaskID.kegels {
                     SimpleTaskView(event: event)
-                } else {
+				} else {
                     InstructionsTaskView(event: event)
                 }
             }

OCKWatchSample Extension/Main/Care/CareView.swift

@@ -6,19 +6,17 @@
 //  Copyright © 2022 Network Reconnaissance Lab. All rights reserved.
 //
 
-import SwiftUI
+import CareKitEssentials
 import CareKitStore
 import CareKitUI
+import SwiftUI
 import os.log
 
 struct MainView: View {
     @EnvironmentObject private var appDelegate: AppDelegate
     @StateObject private var loginViewModel = LoginViewModel()
     @State private var path = [MainViewPath]()
-    @State private var store = OCKStore(
-        name: Constants.noCareStoreName,
-        type: .inMemory
-    )
+    @State private var storeCoordinator = OCKStoreCoordinator()
 
     var body: some View {
         NavigationStack(path: $path) {
@@ -43,8 +41,19 @@ struct MainView: View {
                     updatePath([.tabs])
                 }
         }
-        .environment(\.careStore, store)
-        .onReceive(loginViewModel.$isLoggedOut, perform: { isLoggedOut in
+        .environment(\.careStore, storeCoordinator)
+		.onChange(of: appDelegate.storeCoordinator) { newStoreCoordinator in
+			Task {
+				await loginViewModel.checkStatus()
+			}
+			storeCoordinator = newStoreCoordinator
+			guard isSyncingWithRemote else {
+				updatePath([.tabs])
+				return
+			}
+			updatePath([.tabs])
+		}
+        .onReceive(loginViewModel.$isLoggedOut) { isLoggedOut in
             guard isSyncingWithRemote else {
                 updatePath([.tabs])
                 return
@@ -54,21 +63,6 @@ struct MainView: View {
                 return
             }
             updatePath([.tabs])
-        })
-        .onReceive(appDelegate.$store) { newStore in
-            Task {
-                await loginViewModel.checkStatus()
-            }
-            guard let newStore = newStore,
-                  store !== newStore else {
-                return
-            }
-            store = newStore
-            guard isSyncingWithRemote else {
-                updatePath([.tabs])
-                return
-            }
-            updatePath([.tabs])
         }
     }