Visualize Biopot measurements (#46)

# Visualize Biopot measurements ## ♻️ Current situation & Problem The biopot device integration is currently relatively limited. With #41 we introduced initial pairing functionality based on SpeziBluetooth and #45 introduced parsing the BLE layer. This PR does first steps to integrate the Biopot device into the existing device search infrastructure and aims to display live data from the device. ## ⚙️ Release Notes * Integrate Biopot devices into the nearby devices list. * Visualize live measurements from the currently connected Biopot. ## 📚 Documentation -- ## ✅ Testing _TBA_ ### Code of Conduct & Contributing Guidelines By submitting creating this pull request, you agree to follow our [Code of Conduct](https://github.com/StanfordBDHG/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/StanfordBDHG/.github/blob/main/CONTRIBUTING.md): - [x] I agree to follow the [Code of Conduct](https://github.com/StanfordBDHG/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/StanfordBDHG/.github/blob/main/CONTRIBUTING.md).
StanfordBDHG · Dec 5, 2023 · c448c04 · c448c04
1 parent ff0752a
commit c448c04
Show file tree

Hide file tree

Showing 61 changed files with 758 additions and 302 deletions.
diff --git a/NAMS.xcodeproj/project.pbxproj b/NAMS.xcodeproj/project.pbxproj
diff --git a/NAMS/BioPot/BiopotDevice.swift b/NAMS/BioPot/BiopotDevice.swift
diff --git a/NAMS/EEG/BatteryIcon.swift → NAMS/Devices/BatteryIcon.swift b/NAMS/EEG/BatteryIcon.swift → NAMS/Devices/BatteryIcon.swift
diff --git a/NAMS/BioPot/Biopot.swift → NAMS/Devices/BioPot/Biopot.swift b/NAMS/BioPot/Biopot.swift → NAMS/Devices/BioPot/Biopot.swift
@@ -6,6 +6,7 @@
 // SPDX-License-Identifier: MIT
 //
 
+import Spezi
 import SpeziBluetooth
 import SpeziViews
 import SwiftUI
@@ -18,47 +19,45 @@ struct Biopot: View {
     @State private var viewState: ViewState = .idle
 
     var body: some View {
-        List {
-            ListRow("Device") {
-                Text(biopot.bluetoothState.localizedStringResource)
+        ListRow("Device") {
+            Text(biopot.bluetoothState.localizedStringResource)
+        }
+            .viewStateAlert(state: $viewState)
+            .onChange(of: biopot.bluetoothState) {
+                if biopot.bluetoothState != .connected {
+                    biopot.deviceInfo = nil
+                }
             }
-            testingSupport
 
+        testingSupport
 
-            if let info = biopot.deviceInfo {
-                Section("Status") {
-                    ListRow("BATTERY") {
-                        BatteryIcon(percentage: Int(info.batteryLevel))
-                    }
-                    ListRow("Charging") {
-                        if info.batteryCharging {
-                            Text("Yes")
-                        } else {
-                            Text("No")
-                        }
-                    }
-                    ListRow("Temperature") {
-                        Text("\(info.temperatureValue) °C")
+
+        if let info = biopot.deviceInfo {
+            Section("Status") {
+                ListRow("BATTERY") {
+                    BatteryIcon(percentage: Int(info.batteryLevel))
+                }
+                ListRow("Charging") {
+                    if info.batteryCharging {
+                        Text("Yes")
+                    } else {
+                        Text("No")
                     }
                 }
-
-                actionButtons
-            } else if biopot.bluetoothState == .scanning {
-                Section {
-                    ProgressView()
-                        .listRowBackground(Color.clear)
-                        .listRowInsets(.init(top: 0, leading: 0, bottom: 0, trailing: 0))
-                        .frame(maxWidth: .infinity)
+                ListRow("Temperature") {
+                    Text("\(info.temperatureValue) °C")
                 }
             }
-        }
-            .viewStateAlert(state: $viewState)
-            .navigationTitle("BioPot 3")
-            .onChange(of: biopot.bluetoothState) {
-                if biopot.bluetoothState != .connected {
-                    biopot.deviceInfo = nil
-                }
+
+            actionButtons
+        } else if biopot.bluetoothState == .scanning {
+            Section {
+                ProgressView()
+                    .listRowBackground(Color.clear)
+                    .listRowInsets(.init(top: 0, leading: 0, bottom: 0, trailing: 0))
+                    .frame(maxWidth: .infinity)
             }
+        }
     }
 
     @MainActor @ViewBuilder private var testingSupport: some View {
@@ -104,7 +103,7 @@ extension BluetoothState: CustomLocalizedStringResourceConvertible {
         case .disconnected:
             return "Disconnected"
         case .scanning:
-            return "Scanning"
+            return "Scanning ..."
         case .poweredOff:
             return "Bluetooth Off"
         case .unauthorized:
@@ -115,19 +114,10 @@ extension BluetoothState: CustomLocalizedStringResourceConvertible {
 
 
 #if DEBUG
-import Spezi
-
 #Preview {
-    class PreviewDelegate: SpeziAppDelegate {
-        override var configuration: Configuration {
-            Configuration {
-                Bluetooth()
-                BiopotDevice()
-            }
-        }
+    List {
+        Biopot()
     }
-
-    return Biopot()
-        .spezi(PreviewDelegate())
+        .biopotPreviewSetup()
 }
 #endif