Introduce Omron Device Pairing

.github/workflows/build-and-test.yml

@@ -37,7 +37,6 @@ jobs:
     with:
       artifactname: ENGAGEHF.xcresult
       runsonlabels: '["macOS", "self-hosted"]'
-      setupSimulators: true
       setupfirebaseemulator: true
       fastlanelane: test
       firebaseemulatorimport: ./firebase

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

@@ -1,5 +1,5 @@
 {
-  "originHash" : "4680bbbdca4179318420f5e90c76b7b5892a3fbaf02dc6668d80ce474e195a4d",
+  "originHash" : "bf5084f3a1640b549abaeb7502f3d1650efe31a71ce63ae49ff0fb7732a037e2",
   "pins" : [
     {
       "identity" : "abseil-cpp-binary",
@@ -105,8 +105,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/gtm-session-fetcher.git",
       "state" : {
-        "revision" : "0382ca27f22fb3494cf657d8dc356dc282cd1193",
-        "version" : "3.4.1"
+        "revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b",
+        "version" : "3.5.0"
       }
     },
     {
@@ -169,7 +169,7 @@
       "location" : "https://github.com/StanfordBDHG/ResearchKitOnFHIR",
       "state" : {
         "revision" : "dcd5f95522ed02a873b03c9638dbf397b99c74e0",
-        "version" : "1.4.0"
+        "version" : "2.0.0"
       }
     },
     {
@@ -204,8 +204,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/StanfordSpezi/SpeziBluetooth.git",
       "state" : {
-        "revision" : "f3b8cc8461f12268b15db17aa45cc66b889cd1d0",
-        "version" : "1.6.0"
+        "revision" : "6b88cae1ea9a18ec875dcc8fae80cbeb291133f0",
+        "version" : "2.0.1"
       }
     },
     {
@@ -217,6 +217,15 @@
         "version" : "1.0.0"
       }
     },
+    {
+      "identity" : "spezidevices",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/StanfordSpezi/SpeziDevices.git",
+      "state" : {
+        "revision" : "6b5e24f9983ae0ffccd57d078edb3981400af721",
+        "version" : "1.0.0"
+      }
+    },
     {
       "identity" : "spezifirebase",
       "kind" : "remoteSourceControl",
@@ -258,8 +267,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/StanfordSpezi/SpeziNetworking",
       "state" : {
-        "revision" : "71236efc911d5580fbf4d53748f38ad22ef00a2d",
-        "version" : "1.0.0"
+        "revision" : "b01333fbe46bc02445cc06a1d721bc490d77d95e",
+        "version" : "2.1.2"
       }
     },
     {
@@ -276,8 +285,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/StanfordSpezi/SpeziQuestionnaire.git",
       "state" : {
-        "revision" : "76732ebcb0b521fa94d41c38a5fe35e6e1a87173",
-        "version" : "1.2.1"
+        "revision" : "853585fbdd5d2d0af440c805d629a025ef5545d9",
+        "version" : "1.2.2"
       }
     },
     {
@@ -330,8 +339,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio.git",
       "state" : {
-        "revision" : "e5a216ba89deba84356bad9d4c2eab99071c745b",
-        "version" : "2.67.0"
+        "revision" : "fc79798d5a150d61361a27ce0c51169b889e23de",
+        "version" : "2.68.0"
       }
     },
     {
@@ -402,8 +411,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/StanfordBDHG/XCTestExtensions.git",
       "state" : {
-        "revision" : "1fe9b8e76aeb7a132af37bfa0892160c9b662dcc",
-        "version" : "0.4.10"
+        "revision" : "cc2705fde81978eacd5496e14c9caf58909e2322",
+        "version" : "0.4.12"
       }
     },
     {

ENGAGEHF.xcodeproj/xcshareddata/xcschemes/ENGAGEHF.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1540"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -83,23 +83,23 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--assumeOnboardingComplete"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--setupTestEnvironment"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--testMockDevices"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--skipOnboarding"
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--skipOnboarding"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--skipOnboarding"
@@ -114,6 +114,13 @@
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "IDEPreferLogStreaming"
+            value = "YES"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

ENGAGEHF/Dashboard/Dashboard.swift

@@ -6,14 +6,15 @@
 // SPDX-License-Identifier: MIT
 //
 
+@_spi(TestingSupport) import SpeziDevices
 import SwiftUI
 
 
 struct Dashboard: View {
     @Binding var presentingAccount: Bool
 
 #if DEBUG || TEST
-    @Environment(MeasurementManager.self) private var measurementManager
+    @Environment(HealthMeasurements.self) private var measurements
 #endif
 
 
@@ -29,26 +30,29 @@
                 }
                 .padding()
             }
-            .background(Color(.systemGroupedBackground))
-            .navigationTitle("Home")
-            .toolbar {
-                if AccountButton.shouldDisplay {
-                    AccountButton(isPresented: $presentingAccount)
+                .background(Color(.systemGroupedBackground))
+                .navigationTitle("Home")
+                .toolbar {
+                    if AccountButton.shouldDisplay {
+                        AccountButton(isPresented: $presentingAccount)
+                    }
                 }
-            }
 #if DEBUG || TEST
-            .toolbar {
-                if FeatureFlags.testMockDevices {
-                    ToolbarItemGroup(placement: .secondaryAction) {
-                        Button("Trigger Weight Measurement", systemImage: "scalemass.fill") {
-                            measurementManager.loadMockWeightMeasurement()
-                        }
-                        Button("Trigger Blood Pressure Measurement", systemImage: "drop.fill") {
-                            measurementManager.loadMockBloodPressureMeasurement()
+                .toolbar {
+                    if FeatureFlags.testMockDevices {
+                        ToolbarItemGroup(placement: .secondaryAction) {
+                            Button("Trigger Weight Measurement", systemImage: "scalemass.fill") {
+                                measurements.loadMockWeightMeasurement()
+                            }
+                            Button("Trigger Blood Pressure Measurement", systemImage: "drop.fill") {
+                                measurements.loadMockBloodPressureMeasurement()
+                            }
+                            Button("Show Measurements", systemImage: "heart.text.square") {
+                                measurements.shouldPresentMeasurements = true
+                            }
                         }
                     }
                 }
-            }
 #endif
         }
     }
@@ -60,7 +64,7 @@
     Dashboard(presentingAccount: .constant(false))
         .previewWith(standard: ENGAGEHFStandard()) {
             NotificationManager()
-            MeasurementManager()
+            HealthMeasurements(mock: [.weight(.mockWeighSample)])
             VitalsManager()
         }
 }

ENGAGEHF/Dashboard/Notifications/NotificationManager.swift

@@ -52,7 +52,7 @@
             if FeatureFlags.setupTestEnvironment, let user {
                 // Make sure to not load the mock notifications multiple times
                 if let notifications = self?.notifications, notifications.isEmpty {
-                    Task {
+                    Task { [weak self] in
                         try await self?.setupNotificationTests(user: user)
                     }
                 }
@@ -99,8 +99,8 @@
     ///
     /// Creates a snapshot listener to save new notifications to the manager as they are added to the user's directory in Firebase
     func registerSnapshotListener(user: User?) {
-        logger.info("Initializing notifiation snapshot listener...")
-        
+        logger.info("Initializing notification snapshot listener...")
+
         // Remove previous snapshot listener for the user before creating new one
         snapshotListener?.remove()
         guard let uid = user?.uid else {
@@ -139,12 +139,12 @@
             return
         }
 
-        logger.debug("Marking notitification complete with the following id: \(id)")
-        
+        logger.debug("Marking notification complete with the following id: \(id)")
+
         let firestore = Firestore.firestore()
 
         guard let user = Auth.auth().currentUser else {
-            logger.error("Unable to mark notitificaitons complete: \(FetchingError.userNotAuthenticated)")
+            logger.error("Unable to mark notifications complete: \(FetchingError.userNotAuthenticated)")
             return
         }
 

ENGAGEHF/Dashboard/Vitals/Views/RecentVitalsSection.swift

@@ -7,12 +7,14 @@
 //
 
 import HealthKit
+@_spi(TestingSupport) import SpeziDevices
 import SwiftUI
 
 
 struct RecentVitalsSection: View {
     @Environment(VitalsManager.self) private var vitalsManager
-
+    @Environment(HealthMeasurements.self) private var measurements
+
 
     private var massUnits: HKUnit {
         switch Locale.current.measurementSystem {
@@ -58,33 +60,38 @@
 
 
     var body: some View {
-        Section(
-            content: {
-                VStack {
-                    HStack {
-                        VitalsCard(
-                            type: "Weight",
-                            units: massUnits.unitString,
-                            measurement: weightMeasurement
-                        )
-                        VitalsCard(
-                            type: "Heart Rate",
-                            units: "BPM",
-                            measurement: heartRateMeasurement
-                        )
-                    }
+        Section {
+            VStack {
+                HStack {
+                    VitalsCard(
+                        type: "Weight",
+                        units: massUnits.unitString,
+                        measurement: weightMeasurement
+                    )
                     VitalsCard(
-                        type: "Blood Pressure",
-                        units: "mmHg",
-                        measurement: bloodPressureMeasurement
+                        type: "Heart Rate",
+                        units: "BPM",
+                        measurement: heartRateMeasurement
                     )
                 }
-            },
-            header: {
+                VitalsCard(
+                    type: "Blood Pressure",
+                    units: "mmHg",
+                    measurement: bloodPressureMeasurement
+                )
+            }
+        } header: {
+            HStack {
                 Text("Recent Vitals")
                     .studyApplicationHeaderStyle()
+                Spacer()
+                if !measurements.pendingMeasurements.isEmpty {
+                    Button("Review", systemImage: "heart.text.square") {
+                        measurements.shouldPresentMeasurements = true
+                    }
+                }
             }
-        )
+        }
     }
 
 
@@ -118,5 +125,6 @@
     RecentVitalsSection()
         .previewWith(standard: ENGAGEHFStandard()) {
             VitalsManager()
+            HealthMeasurements(mock: [.weight(.mockWeighSample)])
         }
 }