Tidepool sync 2026-05-11

WatchApp Extension/Extensions/Comparable.swift → Common/Extensions/Comparable.swift

@@ -1,6 +1,6 @@
 //
 //  Comparable.swift
-//  WatchApp Extension
+//  Loop
 //
 //  Created by Michael Pangburn on 3/27/20.
 //  Copyright © 2020 LoopKit Authors. All rights reserved.

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)
     }
 }

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 {

Common/Extensions/NSBundle.swift

@@ -60,5 +60,27 @@ extension Bundle {
         }
         return .days(localCacheDurationDays)
     }
+
+    var hostIdentifier: String {
+        var identifier = bundleIdentifier ?? "com.loopkit.Loop"
+        let components = identifier.components(separatedBy: ".")
+        // DIY Loop has bundle identifiers like com.UY653SP37Q.loopkit.Loop
+        if components[2] == "loopkit" && components[3] == "Loop" {
+            identifier = "com.loopkit.Loop"
+        }
+        return identifier
+    }
+
+    var hostVersion: String {
+        var semanticVersion = shortVersionString
+
+        while semanticVersion.split(separator: ".").count < 3 {
+            semanticVersion += ".0"
+        }
+
+        semanticVersion += "+\(Bundle.main.version)"
+
+        return semanticVersion
+    }
 }
 

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)
     }
 

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 {

Common/Extensions/UserDefaults+LoopIntents.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import LoopCore
 
 extension UserDefaults {
 

Common/FeatureFlags.swift

@@ -11,42 +11,41 @@ import Foundation
 let FeatureFlags = FeatureFlagConfiguration()
 
 struct FeatureFlagConfiguration: Decodable {
-    let automaticBolusEnabled: Bool
+    let dosingStrategySelectionEnabled: Bool
     let cgmManagerCategorizeManualGlucoseRangeEnabled: Bool
     let criticalAlertsEnabled: Bool
     let entryDeletionEnabled: Bool
     let fiaspInsulinModelEnabled: Bool
     let lyumjevInsulinModelEnabled: Bool
     let afrezzaInsulinModelEnabled: Bool
+    let apidraInsulinModelEnabled: Bool
     let includeServicesInSettingsEnabled: Bool
     let manualDoseEntryEnabled: Bool
+    let doseDeletionEnabled: Bool
     let insulinDeliveryReservoirViewEnabled: Bool
     let mockTherapySettingsEnabled: Bool
-    let nonlinearCarbModelEnabled: Bool
     let observeHealthKitCarbSamplesFromOtherApps: Bool
     let observeHealthKitDoseSamplesFromOtherApps: Bool
     let observeHealthKitGlucoseSamplesFromOtherApps: Bool
     let remoteCommandsEnabled: Bool
     let predictedGlucoseChartClampEnabled: Bool
     let scenariosEnabled: Bool
-    let sensitivityOverridesEnabled: Bool
     let showEventualBloodGlucoseOnWatchEnabled: Bool
     let simulatedCoreDataEnabled: Bool
     let siriEnabled: Bool
     let simpleBolusCalculatorEnabled: Bool
     let usePositiveMomentumAndRCForManualBoluses: Bool
-    let adultChildInsulinModelSelectionEnabled: Bool
     let profileExpirationSettingsViewEnabled: Bool
     let missedMealNotifications: Bool
     let allowAlgorithmExperiments: Bool
-
+    let isInvestigationalDevice: Bool
 
     fileprivate init() {
         // Swift compiler config is inverse, since the default state is enabled.
-        #if AUTOMATIC_BOLUS_DISABLED
-        self.automaticBolusEnabled = false
+        #if DOSING_STRATEGY_SELECTION_DISABLED
+        self.dosingStrategySelectionEnabled = false
         #else
-        self.automaticBolusEnabled = true
+        self.dosingStrategySelectionEnabled = true
         #endif
 
         #if CGM_MANAGER_CATEGORIZE_GLUCOSE_RANGE_ENABLED
@@ -67,13 +66,6 @@ struct FeatureFlagConfiguration: Decodable {
         #else
         self.entryDeletionEnabled = true
         #endif
-
-        // Swift compiler config is inverse, since the default state is enabled.
-        #if FEATURE_OVERRIDES_DISABLED
-        self.sensitivityOverridesEnabled = false
-        #else
-        self.sensitivityOverridesEnabled = true
-        #endif
 
         // Swift compiler config is inverse, since the default state is enabled.
         #if FIASP_INSULIN_MODEL_DISABLED
@@ -82,6 +74,13 @@ struct FeatureFlagConfiguration: Decodable {
         self.fiaspInsulinModelEnabled = true
         #endif
 
+        // Swift compiler config is inverse, since the default state is enabled.
+        #if APIDRA_INSULIN_MODEL_DISABLED
+        self.apidraInsulinModelEnabled = false
+        #else
+        self.apidraInsulinModelEnabled = true
+        #endif
+
         // Swift compiler config is inverse, since the default state is enabled.
         #if LYUMJEV_INSULIN_MODEL_DISABLED
         self.lyumjevInsulinModelEnabled = false
@@ -110,6 +109,13 @@ struct FeatureFlagConfiguration: Decodable {
         self.manualDoseEntryEnabled = true
         #endif
 
+        // Swift compiler config is inverse, since the default state is enabled.
+        #if DOSE_DELETION_DISABLED
+        self.doseDeletionEnabled = false
+        #else
+        self.doseDeletionEnabled = true
+        #endif
+
         // Swift compiler config is inverse, since the default state is enabled.
         #if INSULIN_DELIVERY_RESERVOIR_VIEW_DISABLED
         self.insulinDeliveryReservoirViewEnabled = false
@@ -123,13 +129,6 @@ struct FeatureFlagConfiguration: Decodable {
         self.mockTherapySettingsEnabled = false
         #endif
 
-        // Swift compiler config is inverse, since the default state is enabled.
-        #if NONLINEAR_CARB_MODEL_DISABLED
-        self.nonlinearCarbModelEnabled = false
-        #else
-        self.nonlinearCarbModelEnabled = true
-        #endif
-
         #if OBSERVE_HEALTH_KIT_CARB_SAMPLES_FROM_OTHER_APPS_ENABLED
         self.observeHealthKitCarbSamplesFromOtherApps = true
         #else
@@ -207,12 +206,6 @@ struct FeatureFlagConfiguration: Decodable {
         self.usePositiveMomentumAndRCForManualBoluses = true
         #endif
 
-        #if ADULT_CHILD_INSULIN_MODEL_SELECTION_ENABLED
-        self.adultChildInsulinModelSelectionEnabled = true
-        #else
-        self.adultChildInsulinModelSelectionEnabled = false
-        #endif
-
         // ProfileExpirationSettingsView is inverse, since the default state is enabled.
         #if PROFILE_EXPIRATION_SETTINGS_VIEW_DISABLED
         self.profileExpirationSettingsViewEnabled = false
@@ -232,6 +225,12 @@ struct FeatureFlagConfiguration: Decodable {
         #else
         self.allowAlgorithmExperiments = false
         #endif
+
+        #if INVESTIGATIONAL_DEVICE
+        self.isInvestigationalDevice = true
+        #else
+        self.isInvestigationalDevice = false
+        #endif
     }
 }
 
@@ -245,29 +244,29 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
             "* fiaspInsulinModelEnabled: \(fiaspInsulinModelEnabled)",
             "* lyumjevInsulinModelEnabled: \(lyumjevInsulinModelEnabled)",
             "* afrezzaInsulinModelEnabled: \(afrezzaInsulinModelEnabled)",
+            "* apidraInsulinModelEnabled: \(apidraInsulinModelEnabled)",
             "* includeServicesInSettingsEnabled: \(includeServicesInSettingsEnabled)",
             "* mockTherapySettingsEnabled: \(mockTherapySettingsEnabled)",
-            "* nonlinearCarbModelEnabled: \(nonlinearCarbModelEnabled)",
             "* observeHealthKitCarbSamplesFromOtherApps: \(observeHealthKitCarbSamplesFromOtherApps)",
             "* observeHealthKitDoseSamplesFromOtherApps: \(observeHealthKitDoseSamplesFromOtherApps)",
             "* observeHealthKitGlucoseSamplesFromOtherApps: \(observeHealthKitGlucoseSamplesFromOtherApps)",
             "* predictedGlucoseChartClampEnabled: \(predictedGlucoseChartClampEnabled)",
             "* remoteCommandsEnabled: \(remoteCommandsEnabled)",
             "* scenariosEnabled: \(scenariosEnabled)",
-            "* sensitivityOverridesEnabled: \(sensitivityOverridesEnabled)",
             "* showEventualBloodGlucoseOnWatchEnabled: \(showEventualBloodGlucoseOnWatchEnabled)",
             "* simulatedCoreDataEnabled: \(simulatedCoreDataEnabled)",
             "* siriEnabled: \(siriEnabled)",
-            "* automaticBolusEnabled: \(automaticBolusEnabled)",
+            "* dosingStrategySelectionEnabled: \(dosingStrategySelectionEnabled)",
             "* manualDoseEntryEnabled: \(manualDoseEntryEnabled)",
+            "* doseDeletionEnabled: \(doseDeletionEnabled)",
             "* allowDebugFeatures: \(allowDebugFeatures)",
             "* simpleBolusCalculatorEnabled: \(simpleBolusCalculatorEnabled)",
             "* usePositiveMomentumAndRCForManualBoluses: \(usePositiveMomentumAndRCForManualBoluses)",
-            "* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)",
             "* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)",
             "* missedMealNotifications: \(missedMealNotifications)",
             "* allowAlgorithmExperiments: \(allowAlgorithmExperiments)",
-            "* allowExperimentalFeatures: \(allowExperimentalFeatures)"
+            "* allowExperimentalFeatures: \(allowExperimentalFeatures)",
+            "* isInvestigationalDevice: \(isInvestigationalDevice)"
         ].joined(separator: "\n")
     }
 }

Common/Models/PumpManager.swift

@@ -12,13 +12,13 @@ import MockKit
 import MockKitUI
 
 let staticPumpManagersByIdentifier: [String: PumpManagerUI.Type] = [
-    MockPumpManager.pluginIdentifier : MockPumpManager.self
+    MockPumpManager.managerIdentifier : MockPumpManager.self
 ]
 
 var availableStaticPumpManagers: [PumpManagerDescriptor] {
     if FeatureFlags.allowSimulators {
         return [
-            PumpManagerDescriptor(identifier: MockPumpManager.pluginIdentifier, localizedTitle: MockPumpManager.localizedTitle)
+            PumpManagerDescriptor(identifier: MockPumpManager.managerIdentifier, localizedTitle: MockPumpManager.localizedTitle)
         ]
     } else {
         return []

Common/Models/PumpManagerUI.swift

@@ -12,6 +12,7 @@ import LoopKitUI
 
 typealias PumpManagerHUDViewRawValue = [String: Any]
 
+@MainActor
 func PumpManagerHUDViewFromRawValue(_ rawValue: PumpManagerHUDViewRawValue, pluginManager: PluginManager) -> BaseHUDView? {
     guard
         let identifier = rawValue["managerIdentifier"] as? String,