[LOOP-5153] Remove HealthKit dependency from LoopAlgorithm (#726)

tidepool-org · Dec 4, 2024 · b723d23 · b723d23
1 parent 7c90bdd
commit b723d23
Show file tree

Hide file tree

Showing 112 changed files with 436 additions and 515 deletions.
diff --git a/Common/Extensions/GlucoseRangeSchedule.swift b/Common/Extensions/GlucoseRangeSchedule.swift
@@ -6,14 +6,14 @@
 //
 
 import LoopKit
-import HealthKit
+import LoopAlgorithm
 
 
 extension GlucoseRangeSchedule {
-    func minQuantity(at date: Date) -> HKQuantity {
-        return HKQuantity(unit: unit, doubleValue: value(at: date).minValue)
+    func minQuantity(at date: Date) -> LoopQuantity {
+        return LoopQuantity(unit: unit, doubleValue: value(at: date).minValue)
     }
-    func maxQuantity(at date: Date) -> HKQuantity {
-        return HKQuantity(unit: unit, doubleValue: value(at: date).maxValue)
+    func maxQuantity(at date: Date) -> LoopQuantity {
+        return LoopQuantity(unit: unit, doubleValue: value(at: date).maxValue)
     }
 }
diff --git a/Common/Extensions/HKUnit.swift b/Common/Extensions/HKUnit.swift
@@ -6,13 +6,13 @@
 //  Copyright © 2016 LoopKit Authors. All rights reserved.
 //
 
-import HealthKit
+import LoopAlgorithm
 import LoopCore
 
 // Code in this extension is duplicated from:
 //   https://github.com/LoopKit/LoopKit/blob/master/LoopKit/HKUnit.swift
 // to avoid pulling in the LoopKit extension since it's not extension-API safe.
-extension HKUnit {
+extension LoopUnit {
     // A formatting helper for determining the preferred decimal style for a given unit
     var preferredFractionDigits: Int {
         if self == .milligramsPerDeciliter {
@@ -22,20 +22,6 @@ extension HKUnit {
         }
     }
 
-    var localizedShortUnitString: String {
-        if self == HKUnit.millimolesPerLiter {
-            return NSLocalizedString("mmol/L", comment: "The short unit display string for millimoles of glucose per liter")
-        } else if self == .milligramsPerDeciliter {
-            return NSLocalizedString("mg/dL", comment: "The short unit display string for milligrams of glucose per decilter")
-        } else if self == .internationalUnit() {
-            return NSLocalizedString("U", comment: "The short unit display string for international units of insulin")
-        } else if self == .gram() {
-            return NSLocalizedString("g", comment: "The short unit display string for grams")
-        } else {
-            return String(describing: self)
-        }
-    }
-
     /// The smallest value expected to be visible on a chart
     var chartableIncrement: Double {
         if self == .milligramsPerDeciliter {

diff --git a/Common/Extensions/NumberFormatter.swift b/Common/Extensions/NumberFormatter.swift
@@ -7,11 +7,11 @@
 //
 
 import Foundation
-import HealthKit
+import LoopAlgorithm
 
 
 extension NumberFormatter {
-    static func glucoseFormatter(for unit: HKUnit) -> NumberFormatter {
+    static func glucoseFormatter(for unit: LoopUnit) -> NumberFormatter {
         let numberFormatter = NumberFormatter()
 
         numberFormatter.numberStyle = .decimal
@@ -24,11 +24,11 @@ extension NumberFormatter {
         return string(from: NSNumber(value: number))
     }
 
-    func string(from quantity: HKQuantity, unit: HKUnit) -> String? {
+    func string(from quantity: LoopQuantity, unit: LoopUnit) -> String? {
         return string(from: quantity.doubleValue(for: unit), unit: unit)
     }
 
-    func string(from number: Double, unit: HKUnit) -> String? {
+    func string(from number: Double, unit: LoopUnit) -> String? {
         return string(from: number, unit: unit.localizedShortUnitString)
     }
 

diff --git a/Common/Extensions/SampleValue.swift b/Common/Extensions/SampleValue.swift
@@ -5,15 +5,14 @@
 //  Copyright © 2018 LoopKit Authors. All rights reserved.
 //
 
-import HealthKit
 import LoopKit
 import LoopAlgorithm
 
 extension Collection where Element == SampleValue {
     /// O(n)
-    var quantityRange: ClosedRange<HKQuantity>? {
-        var lowest: HKQuantity?
-        var highest: HKQuantity?
+    var quantityRange: ClosedRange<LoopQuantity>? {
+        var lowest: LoopQuantity?
+        var highest: LoopQuantity?
 
         for sample in self {
             if let l = lowest {

diff --git a/Common/Models/StatusExtensionContext.swift b/Common/Models/StatusExtensionContext.swift
@@ -8,7 +8,7 @@
 //  This class allows Loop to pass context data to the Loop Status Extension.
 
 import Foundation
-import HealthKit
+import LoopAlgorithm
 import LoopKit
 import LoopKitUI
 import LoopAlgorithm
@@ -25,24 +25,24 @@ struct GlucoseDisplayableContext: GlucoseDisplayable {
     let isStateValid: Bool
     let stateDescription: String
     let trendType: GlucoseTrend?
-    let trendRate: HKQuantity?
+    let trendRate: LoopQuantity?
     let isLocal: Bool
     let glucoseRangeCategory: GlucoseRangeCategory?
 }
 
 struct GlucoseContext: GlucoseValue {
     let value: Double
-    let unit: HKUnit
+    let unit: LoopUnit
     let startDate: Date
 
-    var quantity: HKQuantity {
-        return HKQuantity(unit: unit, doubleValue: value)
+    var quantity: LoopQuantity {
+        return LoopQuantity(unit: unit, doubleValue: value)
     }
 }
 
 struct PredictedGlucoseContext {
     let values: [Double]
-    let unit: HKUnit
+    let unit: LoopUnit
     let startDate: Date
     let interval: TimeInterval
 
@@ -162,7 +162,7 @@ extension GlucoseDisplayableContext: RawRepresentable {
         }
 
         if let trendRateValue = rawValue["trendRateValue"] as? Double {
-            trendRate = HKQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: trendRateValue)
+            trendRate = LoopQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: trendRateValue)
         } else {
             trendRate = nil
         }
@@ -182,7 +182,7 @@ extension GlucoseDisplayableContext: RawRepresentable {
         ]
         raw["trendType"] = trendType?.rawValue
         if let trendRate = trendRate {
-            raw["trendRateValue"] = trendRate.doubleValue(for: HKUnit.milligramsPerDeciliterPerMinute)
+            raw["trendRateValue"] = trendRate.doubleValue(for: LoopUnit.milligramsPerDeciliterPerMinute)
         }
         raw["glucoseRangeCategory"] = glucoseRangeCategory?.rawValue
 
@@ -204,7 +204,7 @@ extension PredictedGlucoseContext: RawRepresentable {
         }
 
         self.values = values
-        self.unit = HKUnit(from: unitString)
+        self.unit = LoopUnit(from: unitString)
         self.startDate = startDate
         self.interval = interval
     }

diff --git a/Common/Models/WatchContext.swift b/Common/Models/WatchContext.swift
@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import HealthKit
 import LoopKit
 import LoopAlgorithm
 
@@ -19,19 +18,19 @@ final class WatchContext: RawRepresentable {
 
     var creationDate = Date()
 
-    var displayGlucoseUnit: HKUnit?
+    var displayGlucoseUnit: LoopUnit?
 
-    var glucose: HKQuantity?
+    var glucose: LoopQuantity?
     var glucoseCondition: GlucoseCondition?
     var glucoseTrend: GlucoseTrend?
-    var glucoseTrendRate: HKQuantity?
+    var glucoseTrendRate: LoopQuantity?
     var glucoseDate: Date?
     var glucoseIsDisplayOnly: Bool?
     var glucoseWasUserEntered: Bool?
     var glucoseSyncIdentifier: String?
 
     var predictedGlucose: WatchPredictedGlucose?
-    var eventualGlucose: HKQuantity? {
+    var eventualGlucose: LoopQuantity? {
         return predictedGlucose?.values.last?.quantity
     }
 
@@ -63,11 +62,11 @@ final class WatchContext: RawRepresentable {
         isClosedLoop = rawValue["cl"] as? Bool
 
         if let unitString = rawValue["gu"] as? String {
-            displayGlucoseUnit = HKUnit(from: unitString)
+            displayGlucoseUnit = LoopUnit(from: unitString)
         }
         let unit = displayGlucoseUnit ?? .milligramsPerDeciliter
         if let glucoseValue = rawValue["gv"] as? Double {
-            glucose = HKQuantity(unit: unit, doubleValue: glucoseValue)
+            glucose = LoopQuantity(unit: unit, doubleValue: glucoseValue)
         }
 
         if let rawGlucoseCondition = rawValue["gc"] as? GlucoseCondition.RawValue {
@@ -77,7 +76,7 @@ final class WatchContext: RawRepresentable {
             glucoseTrend = GlucoseTrend(rawValue: rawGlucoseTrend)
         }
         if let glucoseTrendRateValue = rawValue["gtrv"] as? Double {
-            glucoseTrendRate = HKQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: glucoseTrendRateValue)
+            glucoseTrendRate = LoopQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: glucoseTrendRateValue)
         }
         glucoseDate = rawValue["gd"] as? Date
         glucoseIsDisplayOnly = rawValue["gdo"] as? Bool
@@ -126,7 +125,7 @@ final class WatchContext: RawRepresentable {
         raw["gc"] = glucoseCondition?.rawValue
         raw["gt"] = glucoseTrend?.rawValue
         if let glucoseTrendRate = glucoseTrendRate {
-            let unitPerMinute = unit.unitDivided(by: .minute())
+            let unitPerMinute = unit.glucose(per: .minutes)
             raw["gtru"] = unitPerMinute.unitString
             raw["gtrv"] = glucoseTrendRate.doubleValue(for: unitPerMinute)
         }

diff --git a/Common/Models/WatchHistoricalGlucose.swift b/Common/Models/WatchHistoricalGlucose.swift
@@ -73,10 +73,10 @@ extension WatchHistoricalGlucose: RawRepresentable {
                                            syncIdentifier: syncIdentifiers[$0],
                                            syncVersion: syncVersions[$0],
                                            startDate: startDates[$0],
-                                           quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: quantities[$0]),
+                                           quantity: LoopQuantity(unit: .milligramsPerDeciliter, doubleValue: quantities[$0]),
                                            condition: conditions[$0],
                                            trend: trends[$0],
-                                           trendRate: trendRates[$0].flatMap { HKQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: $0) },
+                                           trendRate: trendRates[$0].flatMap { LoopQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: $0) },
                                            isDisplayOnly: isDisplayOnlys[$0],
                                            wasUserEntered: wasUserEntereds[$0],
                                            device: devices[$0].flatMap { try? HKDevice(from: $0) },

diff --git a/Common/Models/WatchPredictedGlucose.swift b/Common/Models/WatchPredictedGlucose.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 import LoopKit
-import HealthKit
 import LoopAlgorithm
 
 
@@ -47,7 +46,7 @@ extension WatchPredictedGlucose: RawRepresentable {
 
         self.values = values.enumerated().map { tuple in
             PredictedGlucoseValue(startDate: firstDate + Double(tuple.0) * interval,
-                                  quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: Double(tuple.1)))
+                                  quantity: LoopQuantity(unit: .milligramsPerDeciliter, doubleValue: Double(tuple.1)))
         }
     }
 }
diff --git a/Learn/Configuration/QuantityRangeEntry.swift b/Learn/Configuration/QuantityRangeEntry.swift
@@ -5,7 +5,6 @@
 //  Copyright © 2019 LoopKit Authors. All rights reserved.
 //
 
-import HealthKit
 import LoopKit
 import UIKit
 

diff --git a/Learn/Lessons/ModalDayLesson.swift b/Learn/Lessons/ModalDayLesson.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import HealthKit
 import LoopCore
 import LoopKit
 import os.log

diff --git a/Learn/Lessons/TimeInRangeLesson.swift b/Learn/Lessons/TimeInRangeLesson.swift
@@ -10,7 +10,6 @@ import LoopCore
 import LoopKit
 import LoopKitUI
 import LoopUI
-import HealthKit
 import os.log
 
 

diff --git a/Learn/Managers/DataManager.swift b/Learn/Managers/DataManager.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import HealthKit
 import LoopKit
 import LoopCore
 

diff --git a/Loop Widget Extension/Components/GlucoseView.swift b/Loop Widget Extension/Components/GlucoseView.swift
@@ -8,7 +8,6 @@
 
 import SwiftUI
 import LoopKit
-import HealthKit
 import LoopCore
 
 struct GlucoseView: View {

diff --git a/Loop Widget Extension/Timeline/StatusWidgetTimelimeEntry.swift b/Loop Widget Extension/Timeline/StatusWidgetTimelimeEntry.swift
@@ -6,7 +6,6 @@
 //  Copyright © 2023 LoopKit Authors. All rights reserved.
 //
 
-import HealthKit
 import LoopCore
 import LoopKit
 import WidgetKit
@@ -25,8 +24,8 @@ struct StatusWidgetTimelimeEntry: TimelineEntry {
 
     let currentGlucose: GlucoseValue?
     let glucoseFetchedAt: Date?
-    let delta: HKQuantity?
-    let unit: HKUnit?
+    let delta: LoopQuantity?
+    let unit: LoopUnit?
     let sensor: GlucoseDisplayableContext?
 
     let pumpHighlight: DeviceStatusHighlightContext?

diff --git a/Loop Widget Extension/Timeline/StatusWidgetTimelineProvider.swift b/Loop Widget Extension/Timeline/StatusWidgetTimelineProvider.swift
@@ -112,14 +112,15 @@ class StatusWidgetTimelineProvider: TimelineProvider {
 
             let finalGlucose = glucose
 
-            guard let defaults = self.defaults,
+            guard let hkUnit = await healthStore.cachedPreferredUnits(for: .bloodGlucose),
+                  let defaults = self.defaults,
                   let context = defaults.statusExtensionContext,
-                  let contextUpdatedAt = context.createdAt,
-                  let unit = await healthStore.cachedPreferredUnits(for: .bloodGlucose)
+                  let contextUpdatedAt = context.createdAt
             else {
                 return
             }
 
+            let unit = LoopUnit(from: hkUnit)
             let lastCompleted = context.lastLoopCompleted
 
             let closeLoop = context.isClosedLoop ?? false
@@ -137,15 +138,15 @@ class StatusWidgetTimelineProvider: TimelineProvider {
                 previousGlucose = finalGlucose[finalGlucose.count - 2]
             }
 
-            var delta: HKQuantity?
+            var delta: LoopQuantity?
 
             // Making sure that previous glucose is within 6 mins of last glucose to avoid large deltas on sensor changes, missed readings, etc.
             if let prevGlucose = previousGlucose,
                let currGlucose = currentGlucose,
                currGlucose.startDate.timeIntervalSince(prevGlucose.startDate).minutes < 6
             {
                 let deltaMGDL = currGlucose.quantity.doubleValue(for: .milligramsPerDeciliter) - prevGlucose.quantity.doubleValue(for: .milligramsPerDeciliter)
-                delta = HKQuantity(unit: .milligramsPerDeciliter, doubleValue: deltaMGDL)
+                delta = LoopQuantity(unit: .milligramsPerDeciliter, doubleValue: deltaMGDL)
             }
 
             let predictedGlucose = context.predictedGlucose?.samples

diff --git a/Loop/Extensions/CarbStore+SimulatedCoreData.swift b/Loop/Extensions/CarbStore+SimulatedCoreData.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import HealthKit
+import LoopAlgorithm
 import LoopKit
 
 // MARK: - Simulated Core Data
@@ -63,7 +63,7 @@ extension CarbStore {
 fileprivate extension NewCarbEntry {
     static func simulated(startDate: Date, grams: Double, absorptionTime: TimeInterval) -> NewCarbEntry {
         return NewCarbEntry(date: startDate,
-                            quantity: HKQuantity(unit: .gram(), doubleValue: grams),
+                            quantity: LoopQuantity(unit: .gram, doubleValue: grams),
                             startDate: startDate,
                             foodType: "Simulated",
                             absorptionTime: absorptionTime)

diff --git a/Loop/Extensions/DoseStore+SimulatedCoreData.swift b/Loop/Extensions/DoseStore+SimulatedCoreData.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import HealthKit
+import LoopAlgorithm
 import LoopKit
 
 // MARK: - Simulated Core Data
@@ -144,7 +144,7 @@ fileprivate extension PersistedPumpEvent {
                                          value: rate,
                                          unit: .unitsPerHour,
                                          deliveredUnits: rate * duration / .hours(1),
-                                         scheduledBasalRate: HKQuantity(unit: .internationalUnitsPerHour, doubleValue: scheduledRate)))
+                                         scheduledBasalRate: LoopQuantity(unit: .internationalUnitsPerHour, doubleValue: scheduledRate)))
     }
 
     private static func simulated(date: Date, type: PumpEventType, alarmType: PumpAlarmType? = nil) -> PersistedPumpEvent {