Firebase Integration and Confidence Filtering

CoughSync/CoughDetection/CoughClass.swift

@@ -13,11 +13,15 @@
 
 import Foundation
 
-class Cough {
+class Cough: Identifiable, Codable {
     let timestamp: Date
+    let id: UUID
+    let confidence: Double
 
-    init(timestamp: Date = Date()) {
+    init(timestamp: Date = Date(), id: UUID = UUID(), confidence: Double = 0) {
         self.timestamp = timestamp
+        self.id = id
+        self.confidence = confidence
     }
 }
 

CoughSync/CoughDetection/CoughDetectionViewModel.swift

@@ -17,12 +17,17 @@
 import Foundation
 import Observation
 import SoundAnalysis
+import Spezi
+import SwiftUI
 
 @Observable
 @MainActor
 class CoughDetectionViewModel {
     @ObservationIgnored let coughAnalysisManager = CoughAnalysisManager.shared
 
+    // Environment property to access the standard
+    private let standard: CoughSyncStandard
+
     @ObservationIgnored var lastTime: Double = 0
 
     var detectionStarted = false
@@ -34,6 +39,11 @@
     var identifiedSound: (identifier: String, confidence: String)?
     private var detectionCancellable: AnyCancellable?
 
+    // Initialize with standard from environment
+    init(standard: CoughSyncStandard) {
+        self.standard = standard
+    }
+
     private func formattedDetectionResult(_ result: SNClassificationResult) -> (identifier: String, confidence: String)? {
         guard let classification = result.classifications.first else {
             return nil }
@@ -50,9 +60,14 @@
         let confidencePercentString = String(format: "%.2f%%", confidence * 100.0)
         print("\(displayName): \(confidencePercentString) confidence.\n")
 
-        if displayName == "Coughs" {
-            let cough = Cough(timestamp: Date())
+        if displayName == "Coughs" && confidence > 0.5 {
+            let cough = Cough(timestamp: Date(), confidence: confidence)
             coughCollection.addCough(cough)
+
+            // Store the cough in Firebase
+            Task {
+                await standard.add(cough: cough)
+            }
         }
 
         return (displayName, confidencePercentString)
@@ -80,4 +95,9 @@
         identifiedSound = nil
         coughAnalysisManager.stopCoughDetection()
     }
+
+    func syncCoughsToFirebase() async {
+        // This could be called when app goes to background or when stopping detection
+        // Implementation depends on how you want to track unsaved coughs
+    }
 }

CoughSync/CoughSyncStandard.swift

@@ -133,4 +133,35 @@
             await logger.error("Could not store consent form: \(error)")
         }
     }
+
+    func add(cough: Cough) async {
+        if FeatureFlags.disableFirebase {
+            logger.debug("Received new cough event: \(cough.timestamp)")
+            return
+        }
+
+        do {
+            try await configuration.userDocumentReference
+                .collection("CoughEvents") // Store all cough events in a /CoughEvents collection
+                .document(UUID().uuidString) // Generate a unique ID for each cough event
+                .setData([
+                    "timestamp": cough.timestamp,
+                    "confidence": cough.confidence
+                ])
+        } catch {
+            logger.error("Could not store cough event: \(error)")
+        }
+    }
+
+    // For batch saving multiple coughs at once (optional)
+    func add(coughs: [Cough]) async {
+        if FeatureFlags.disableFirebase {
+            logger.debug("Received batch of \(coughs.count) cough events")
+            return
+        }
+
+        for cough in coughs {
+            await add(cough: cough)
+        }
+    }
 }

CoughSync/CoughView/CoughModelView.swift

@@ -13,51 +13,63 @@
 //
 
 import SwiftUI
+import Spezi
+
 struct CoughModelView: View {
-    @State var viewModel = CoughDetectionViewModel()
+    @Environment(CoughSyncStandard.self) private var standard
+    @State private var viewModel: CoughDetectionViewModel?
 
     var body: some View {
         VStack {
-            Spacer()
-            detectionStatusView()
-            Spacer()
-            microphoneButton()
+            if let viewModel = viewModel {
+                Spacer()
+                detectionStatusView()
+                Spacer()
+                microphoneButton()
+                .padding()
+            } else {
+                // Show a loading indicator
+                ProgressView("Loading...")
+            }
+        }
+        .onAppear {
+            // Initialize viewModel here when environment is available
+            viewModel = CoughDetectionViewModel(standard: standard)
         }
-        .padding()
     }
 
     private var microphoneImage: some View {
-        Image(systemName: viewModel.detectionStarted ? "stop.fill" : "mic.fill")
+        Image(systemName: viewModel?.detectionStarted == true ? "stop.fill" : "mic.fill")
             .font(.system(size: 50))
             .padding(30)
-            .background(viewModel.detectionStarted ? .gray.opacity(0.7) : .blue)
+            .background(viewModel?.detectionStarted == true ? .gray.opacity(0.7) : .blue)
             .foregroundStyle(.white)
             .clipShape(Circle())
             .shadow(color: .gray, radius: 5)
             .contentTransition(.symbolEffect(.replace))
-            .accessibilityLabel(viewModel.detectionStarted ? "Stop sound detection" : "Start sound detection")
+            .accessibilityLabel(viewModel?.detectionStarted == true ? "Stop sound detection" : "Start sound detection")
     }
 
     @ViewBuilder
     private func detectionStatusView() -> some View {
-        if !viewModel.detectionStarted {
+        if viewModel?.detectionStarted == false {
             VStack(spacing: 10) {
                 ContentUnavailableView(
                     "No Sound Detected",
                     systemImage: "waveform.badge.magnifyingglass",
                     description: Text("Tap the microphone to start detecting")
                 )
-                Text("Cough Count: \(viewModel.coughCount)")
+                Text("Cough Count: \(viewModel?.coughCount ?? 0)")
                     .font(.title2)
                     .foregroundColor(.secondary)
             }
-        } else if let predictedSound = viewModel.identifiedSound {
+        } else if let predictedSound = viewModel?.identifiedSound {
             VStack(spacing: 10) {
                 Text(predictedSound.0)
                     .font(.system(size: 26))
-                Text("Cough Count: \(viewModel.coughCount)")
-                Text("Coughs Today: \(viewModel.coughCollection.coughsToday())")
-                Text("Cough Difference: \(viewModel.coughCollection.coughDiffDay())")
+                Text("Cough Count: \(viewModel?.coughCount ?? 0)")
+                Text("Coughs Today: \(viewModel?.coughCollection.coughsToday() ?? 0)")
+                Text("Cough Difference: \(viewModel?.coughCollection.coughDiffDay() ?? 0)")
             }
             .multilineTextAlignment(.center)
             .padding()
@@ -78,12 +90,12 @@
 
     private func toggleListening() {
         withAnimation {
-            viewModel.detectionStarted.toggle()
+            viewModel?.detectionStarted.toggle()
         }
-        if viewModel.detectionStarted {
-            viewModel.startListening()
+        if viewModel?.detectionStarted == true {
+            viewModel?.startListening()
         } else {
-            viewModel.stopListening()
+            viewModel?.stopListening()
         }
     }
 }

CoughSync/Dashboard/Dashboard.swift

@@ -20,23 +20,33 @@
 import SpeziViews
 import SwiftUI
 
-
 struct Dashboard: View {
     @Environment(Account.self) private var account: Account?
+    @Environment(CoughSyncStandard.self) private var standard
     @Binding var presentingAccount: Bool
 
-    @State private var viewModel = CoughDetectionViewModel()
+    // Don't initialize viewModel right away
+    @State private var viewModel: CoughDetectionViewModel?
     @State private var previousCoughCount: Int = 0
 
+    init(presentingAccount: Binding<Bool>) {
+        self._presentingAccount = presentingAccount
+    }
+
     var body: some View {
         NavigationStack {
             ScrollView {
-                VStack(spacing: 20) {
-                    coughSummaryCard()
-                    coughStats()
-                    Divider()
+                if let viewModel = viewModel {
+                    VStack(spacing: 20) {
+                        coughSummaryCard()
+                        coughStats()
+                        Divider()
+                    }
+                    .padding()
+                } else {
+                    // Show a loading indicator or placeholder
+                    ProgressView("Loading...")
                 }
-                .padding()
             }
             .navigationTitle("Summary")
             .toolbar {
@@ -45,10 +55,14 @@
                 }
             }
             .onAppear {
-                previousCoughCount = viewModel.coughCount
+                // Initialize viewModel here when environment is available
+                viewModel = CoughDetectionViewModel(standard: standard)
+            }
+            .onAppear {
+                previousCoughCount = viewModel?.coughCount ?? 0
             }
-            .onChange(of: viewModel.coughCount) { oldValue, _ in
-                previousCoughCount = oldValue
+            .onChange(of: viewModel?.coughCount) { oldValue, _ in
+                previousCoughCount = oldValue ?? 0
             }
         }
     }
@@ -61,7 +75,7 @@
                     Text("Today")
                         .font(.headline)
                         .foregroundColor(.primary)
-                    Text("\(viewModel.coughCount) ")
+                    Text("\(viewModel?.coughCount ?? 0) ")
                         .font(.largeTitle)
                         .bold()
                         .foregroundColor(.blue)
@@ -112,7 +126,7 @@
 
     @ViewBuilder
     private func statusCircle() -> some View {
-        let change = viewModel.coughCount - previousCoughCount
+        let change = viewModel?.coughCount ?? 0 - previousCoughCount
         let color: Color = change > 0 ? .red : (change < 0 ? .green : .blue)
         let trendSymbol = change > 0 ? "↑" : (change < 0 ? "↓" : "–")
 

CoughSync/Resources/Localizable.xcstrings

@@ -337,6 +337,9 @@
           }
         }
       }
+    },
+    "Loading..." : {
+
     },
     "Next" : {
       "localizations" : {