bugfixes: fix incorrect streak display behavior and improve performance

Author: liamcharger

InfiniLink/BLE/DeviceManager.swift

@@ -154,11 +154,8 @@ class DeviceManager: ObservableObject {
         infineatWatchFace.showSideCover = settings.watchFaceInfineat.showSideCover
         device.watchFaceInfineat = infineatWatchFace
 
-        Task {
-            await persistenceController.save()
-            
-            getSettings()
-        }
+        persistenceController.save()
+        getSettings()
     }
 
     func updateName(name: String, for device: Device) {
@@ -167,9 +164,7 @@ class DeviceManager: ObservableObject {
 
         device.name = name
 
-        Task {
-            await persistenceController.save()
-        }
+        persistenceController.save()
     }
 
     func getName(for uuid: String) -> String {

InfiniLink/Core/Components/Charts/Steps/StepChartView.swift

@@ -37,7 +37,7 @@ struct StepChartView: View {
 
         var filledData: [StepChartDataPoint] = []
 
-        let rawPoints = chartManager.stepPoints().compactMap { record -> StepChartDataPoint? in
+        let rawPoints = chartManager.stepPoints(predicate: chartManager.weekPredicate).compactMap { record -> StepChartDataPoint? in
             guard let timestamp = record.timestamp else { return nil }
             // Return each step point as a chart point
             return StepChartDataPoint(date: calendar.startOfDay(for: timestamp), steps: Int(record.steps))
@@ -59,9 +59,8 @@ struct StepChartView: View {
     }
 
     var streak: Int {
-        return chartManager.stepPoints().reversed().prefix(7).filter({
-            return $0.steps >= deviceManager.settings.stepsGoal
-        }).count
+        let points = chartManager.stepPoints(predicate: chartManager.weekPredicate)
+        return points.filter { $0.steps >= deviceManager.settings.stepsGoal }.count
     }
     var earliestDate: Date {
         stepChartPoints().compactMap({ $0.date }).min() ?? Date()

InfiniLink/Core/Components/Charts/Steps/StepMonthlyChartView.swift

@@ -35,7 +35,7 @@ struct StepCalendarView: View {
                             .frame(maxWidth: .infinity)
                     }
                 }
-                // FIXME: poor performance
+                let stepPoints = chartManager.stepPoints(predicate: chartManager.allTimePredicate)
                 LazyVGrid(columns: Array(repeating: GridItem(.flexible()), count: weekdays.count), spacing: 14) {
                     ForEach(fetchDates(), id: \.id) { value in
                         ZStack {
@@ -47,7 +47,7 @@ struct StepCalendarView: View {
                                 .font(.system(size: 16).weight(.medium))
                                 .opacity(value.day == -1 ? 0 : 1)
                             if deviceManager.settings.stepsGoal > 0 && value.day != -1 {
-                                let progress = min(Double(chartManager.stepPoints().first(where: { Calendar.current.isDate(value.date, equalTo: $0.timestamp!, toGranularity: .day)})?.steps ?? 0) / Double(deviceManager.settings.stepsGoal), 1)
+                                let progress = min(Double(stepPoints.first(where: { Calendar.current.isDate(value.date, equalTo: $0.timestamp!, toGranularity: .day)})?.steps ?? 0) / Double(deviceManager.settings.stepsGoal), 1)
                                 PieSlice(progress: progress)
                                     .fill(Color.blue.opacity(0.8))
                                 label

InfiniLink/Core/DeviceView.swift

@@ -241,7 +241,6 @@ struct DeviceView: View {
                 notificationManager.setWaterRemindersPerDay()
                 remindersManager.requestAccess()
                 remindersManager.fetchAllItems()
-                downloadManager.updateAvailable = downloadManager.checkForUpdates(currentVersion: deviceManager.firmware)
             }
             .toolbar {
                 ToolbarItem(placement: .topBarLeading) {

InfiniLink/Core/StepsView.swift

@@ -20,10 +20,9 @@ struct StepsView: View {
     let exerciseCalculator = FitnessCalculator()
 
     func steps() -> Int {
-        for stepCount in chartManager.stepPoints() {
-            if Calendar.current.isDate(stepCount.timestamp!, inSameDayAs: Date()) {
-                return Int(stepCount.steps)
-            }
+        let stepCount = chartManager.stepsToday()
+        if let stepCount = stepCount {
+            return Int(stepCount.steps)
         }
         return 0
     }

InfiniLink/InfiniLinkApp.swift

@@ -11,6 +11,9 @@ import CoreData
 @main
 struct InfiniLink: App {
     let persistenceController = PersistenceController.shared
+    let downloadManager = DownloadManager.shared
+    let notificationManager = NotificationManager.shared
+    let deviceManager = DeviceManager.shared
 
     @AppStorage("colorScheme") var colorScheme = "system"
 
@@ -20,6 +23,8 @@ struct InfiniLink: App {
         NotificationCenter.default.addObserver(forName: .EKEventStoreChanged, object: nil, queue: .main) { _ in
             RemindersManager.shared.fetchAllItems()
         }
+        
+        downloadManager.updateAvailable = downloadManager.checkForUpdates(currentVersion: deviceManager.firmware)
     }
 
     var body: some Scene {

InfiniLink/Utils/ChartManager.swift

@@ -13,6 +13,27 @@ class ChartManager: ObservableObject {
     let persistenceController = PersistenceController.shared
     let bleManager = BLEManager.shared
 
+    private let predicateString = "deviceId == %@ AND timestamp >= %@"
+    private let calendar = Calendar.current
+    
+    var weekPredicate: NSPredicate {
+        let deviceId = bleManager.pairedDeviceID ?? ""
+        // Get the days of the current week, not just -7 days from now
+        let startOfWeek = calendar.date(from: calendar.dateComponents([.yearForWeekOfYear, .weekOfYear], from: Date()))!
+        
+        return NSPredicate(format: predicateString, deviceId, startOfWeek as NSDate)
+    }
+    var dayPredicate: NSPredicate {
+        let deviceId = bleManager.pairedDeviceID ?? ""
+        let startOfDay = calendar.startOfDay(for: Date())
+        
+        return NSPredicate(format: predicateString, deviceId, startOfDay as NSDate)
+    }
+    var allTimePredicate: NSPredicate {
+        let deviceId = bleManager.pairedDeviceID ?? ""
+        return NSPredicate(format: "deviceId == %@", deviceId)
+    }
+    
     @AppStorage("heartRateChartDataSelection") var heartRateChartDataSelection = 0
     @AppStorage("stepChartDataSelection") var stepChartDataSelection = 0
 
@@ -80,11 +101,13 @@ class ChartManager: ObservableObject {
         }
     }
 
-    func stepPoints() -> [StepCounts] {
-        guard let deviceId = bleManager.pairedDeviceID else { return [] }
-        
+    func stepsToday() -> StepCounts? {
+        return stepPoints().first
+    }
+    
+    func stepPoints(predicate: NSPredicate? = nil) -> [StepCounts] {
         let fetchRequest: NSFetchRequest<StepCounts> = StepCounts.fetchRequest()
-        fetchRequest.predicate = NSPredicate(format: "deviceId == %@", deviceId)
+        fetchRequest.predicate = predicate ?? dayPredicate
 
         do {
             return try persistenceController.container.viewContext.fetch(fetchRequest)

InfiniLink/Utils/PersistenceController.swift

@@ -25,13 +25,15 @@ struct PersistenceController {
         container.viewContext.automaticallyMergesChangesFromParent = true
     }
 
-    func save() async {
-        do {
-            try await container.viewContext.perform {
-                try container.viewContext.save()
+    func save() {
+        Task {
+            do {
+                try await container.viewContext.perform {
+                    try container.viewContext.save()
+                }
+            } catch {
+                log("Unresolved error saving context: \(error.localizedDescription)", caller: "PersistenceController")
             }
-        } catch {
-            log("Unresolved error saving context: \(error.localizedDescription)", caller: "PersistenceController")
         }
     }
 }

InfiniLink/Utils/StepCountManager.swift

@@ -23,10 +23,10 @@ class StepCountManager: ObservableObject {
 
     // The following two functions need to use the viewContext to save because the objects they're updating were fetched on that context
     func setStepCount(steps: Int32, isArbitrary: Bool, for date: Date) {
-        let existingCounts = chartManager.stepPoints()
+        let existing = chartManager.stepsToday()
 
-        if let existingCount = existingCounts.first(where: { Calendar.current.isDate($0.timestamp!, inSameDayAs: date) }) {
-            updateStepCount(existingCount, with: steps, isArbitrary: isArbitrary, for: date)
+        if let existing {
+            updateStepCount(existing, with: steps, isArbitrary: isArbitrary, for: date)
         } else {
             chartManager.addStepDataPoint(steps: steps, time: date)
         }
@@ -42,24 +42,20 @@ class StepCountManager: ObservableObject {
 
         stepCount.timestamp = date
 
-        Task {
-            await persistenceManager.save()
-        }
+        persistenceManager.save()
     }
 
     func clearCurrentDaySteps() {
-        let today = Date()
-        let existingCounts = chartManager.stepPoints()
+        let now = Date()
+        let existing = chartManager.stepsToday()
 
-        if let currentDayCount = existingCounts.first(where: { Calendar.current.isDate($0.timestamp!, inSameDayAs: today) }) {
-            currentDayCount.steps = 0
-            currentDayCount.timestamp = today
+        if let existing {
+            existing.steps = 0
+            existing.timestamp = now
         } else {
-            chartManager.addStepDataPoint(steps: 0, time: today)
+            chartManager.addStepDataPoint(steps: 0, time: now)
         }
 
-        Task {
-            await persistenceManager.save()
-        }
+        persistenceManager.save()
     }
 }