Merge pull request #2189 from LoopKit/release-3.4

Release 3.4

Author: ps2

.github/workflows/inactive_issues.yml

@@ -0,0 +1,23 @@
+name: Close inactive issues
+on:
+  schedule:
+    - cron: "30 1 * * *"
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v5
+        with:
+          operations-per-run: 100
+          days-before-issue-stale: 30
+          days-before-issue-close: 14
+          stale-issue-label: "stale"
+          stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
+          close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -77,9 +77,12 @@ VersionOverride.xcconfig
 
 Loop/DerivedAssets.xcassets/*
 WatchApp/DerivedAssets.xcassets/*
+Loop\ Widget\ Extension/DerivedAssets.xcassets/*
 # ...except, keep Contents.json
 !Loop/DerivedAssets.xcassets/Contents.json
 !WatchApp/DerivedAssets.xcassets/Contents.json
+!Loop\ Widget\ Extension/DerivedAssets.xcassets/Contents.json
 
 Loop/DerivedAssetsOverride.xcassets
 WatchApp/DerivedAssetsOverride.xcassets
+Loop\ Widget\ Extension/DerivedAssetsOverride.xcassets

Common/Extensions/GlucoseRangeSchedule.swift

@@ -13,13 +13,7 @@ extension GlucoseRangeSchedule {
     func minQuantity(at date: Date) -> HKQuantity {
         return HKQuantity(unit: unit, doubleValue: value(at: date).minValue)
     }
-}
-
-
-extension ClosedRange where Bound == HKQuantity {
-    func averageValue(for unit: HKUnit) -> Double {
-        let minValue = lowerBound.doubleValue(for: unit)
-        let maxValue = upperBound.doubleValue(for: unit)
-        return (maxValue + minValue) / 2
+    func maxQuantity(at date: Date) -> HKQuantity {
+        return HKQuantity(unit: unit, doubleValue: value(at: date).maxValue)
     }
 }

Common/Extensions/NSBundle.swift

@@ -61,3 +61,4 @@ extension Bundle {
         return .days(localCacheDurationDays)
     }
 }
+

Common/FeatureFlags.swift

@@ -35,9 +35,10 @@ struct FeatureFlagConfiguration: Decodable {
     let siriEnabled: Bool
     let simpleBolusCalculatorEnabled: Bool
     let usePositiveMomentumAndRCForManualBoluses: Bool
-    let dynamicCarbAbsorptionEnabled: Bool
     let adultChildInsulinModelSelectionEnabled: Bool
     let profileExpirationSettingsViewEnabled: Bool
+    let missedMealNotifications: Bool
+    let allowAlgorithmExperiments: Bool
 
 
     fileprivate init() {
@@ -212,14 +213,25 @@ struct FeatureFlagConfiguration: Decodable {
         self.adultChildInsulinModelSelectionEnabled = false
         #endif
 
-        self.dynamicCarbAbsorptionEnabled = true
-
         // ProfileExpirationSettingsView is inverse, since the default state is enabled.
         #if PROFILE_EXPIRATION_SETTINGS_VIEW_DISABLED
         self.profileExpirationSettingsViewEnabled = false
         #else
         self.profileExpirationSettingsViewEnabled = true
         #endif
+
+        // Missed meal notifications compiler flag is inverse, since the default state is enabled.
+        #if MISSED_MEAL_NOTIFICATIONS_DISABLED
+        self.missedMealNotifications = false
+        #else
+        self.missedMealNotifications = true
+        #endif
+
+        #if ALLOW_ALGORITHM_EXPERIMENTS
+        self.allowAlgorithmExperiments = true
+        #else
+        self.allowAlgorithmExperiments = false
+        #endif
     }
 }
 
@@ -251,9 +263,11 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
             "* allowDebugFeatures: \(allowDebugFeatures)",
             "* simpleBolusCalculatorEnabled: \(simpleBolusCalculatorEnabled)",
             "* usePositiveMomentumAndRCForManualBoluses: \(usePositiveMomentumAndRCForManualBoluses)",
-            "* dynamicCarbAbsorptionEnabled: \(dynamicCarbAbsorptionEnabled)",
             "* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)",
-            "* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)"
+            "* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)",
+            "* missedMealNotifications: \(missedMealNotifications)",
+            "* allowAlgorithmExperiments: \(allowAlgorithmExperiments)",
+            "* allowExperimentalFeatures: \(allowExperimentalFeatures)"
         ].joined(separator: "\n")
     }
 }
@@ -277,6 +291,20 @@ extension FeatureFlagConfiguration {
         #endif
     }
 
+    var allowExperimentalFeatures: Bool {
+        #if EXPERIMENTAL_FEATURES_ENABLED
+        return true
+        #elseif EXPERIMENTAL_FEATURES_ENABLED_CONDITIONALLY
+        if debugEnabled {
+            return true
+        } else {
+            return UserDefaults.appGroup?.allowExperimentalFeatures ?? false
+        }
+        #else
+        return false
+        #endif
+    }
+    
     var allowSimulators: Bool {
         #if SIMULATORS_ENABLED
         return true

Common/Models/PumpManager.swift

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

Common/Models/StatusExtensionContext.swift

@@ -160,8 +160,8 @@ extension GlucoseDisplayableContext: RawRepresentable {
             trendType = nil
         }
 
-        if let trendRateUnit = rawValue["trendRateUnit"] as? String, let trendRateValue = rawValue["trendRateValue"] as? Double {
-            trendRate = HKQuantity(unit: HKUnit(from: trendRateUnit), doubleValue: trendRateValue)
+        if let trendRateValue = rawValue["trendRateValue"] as? Double {
+            trendRate = HKQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: trendRateValue)
         } else {
             trendRate = nil
         }
@@ -181,7 +181,6 @@ extension GlucoseDisplayableContext: RawRepresentable {
         ]
         raw["trendType"] = trendType?.rawValue
         if let trendRate = trendRate {
-            raw["trendRateUnit"] = HKUnit.milligramsPerDeciliterPerMinute.unitString
             raw["trendRateValue"] = trendRate.doubleValue(for: HKUnit.milligramsPerDeciliterPerMinute)
         }
         raw["glucoseRangeCategory"] = glucoseRangeCategory?.rawValue
@@ -298,6 +297,9 @@ struct StatusExtensionContext: RawRepresentable {
     var lastLoopCompleted: Date?
     var createdAt: Date?
     var isClosedLoop: Bool?
+    var preMealPresetAllowed: Bool?
+    var preMealPresetActive: Bool?
+    var customPresetActive: Bool?
     var netBasal: NetBasalContext?
     var batteryPercentage: Double?
     var reservoirCapacity: Double?
@@ -327,6 +329,9 @@ struct StatusExtensionContext: RawRepresentable {
         lastLoopCompleted = rawValue["lastLoopCompleted"] as? Date
         createdAt = rawValue["createdAt"] as? Date
         isClosedLoop = rawValue["isClosedLoop"] as? Bool
+        preMealPresetAllowed = rawValue["preMealPresetAllowed"] as? Bool
+        preMealPresetActive = rawValue["preMealPresetActive"] as? Bool
+        customPresetActive = rawValue["customPresetActive"] as? Bool
         batteryPercentage = rawValue["batteryPercentage"] as? Double
         reservoirCapacity = rawValue["reservoirCapacity"] as? Double
         carbsOnBoard = rawValue["carbsOnBoard"] as? Double
@@ -365,6 +370,9 @@ struct StatusExtensionContext: RawRepresentable {
         raw["lastLoopCompleted"] = lastLoopCompleted
         raw["createdAt"] = createdAt
         raw["isClosedLoop"] = isClosedLoop
+        raw["preMealPresetAllowed"] = preMealPresetAllowed
+        raw["preMealPresetActive"] = preMealPresetActive
+        raw["customPresetActive"] = customPresetActive
         raw["netBasal"] = netBasal?.rawValue
         raw["batteryPercentage"] = batteryPercentage
         raw["reservoirCapacity"] = reservoirCapacity

Common/Models/WatchContext.swift

@@ -75,8 +75,8 @@ final class WatchContext: RawRepresentable {
         if let rawGlucoseTrend = rawValue["gt"] as? GlucoseTrend.RawValue {
             glucoseTrend = GlucoseTrend(rawValue: rawGlucoseTrend)
         }
-        if let glucoseTrendRateUnitString = rawValue["gtru"] as? String, let glucoseTrendRateValue = rawValue["gtrv"] as? Double {
-            glucoseTrendRate = HKQuantity(unit: HKUnit(from: glucoseTrendRateUnitString), doubleValue: glucoseTrendRateValue)
+        if let glucoseTrendRateValue = rawValue["gtrv"] as? Double {
+            glucoseTrendRate = HKQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: glucoseTrendRateValue)
         }
         glucoseDate = rawValue["gd"] as? Date
         glucoseIsDisplayOnly = rawValue["gdo"] as? Bool

Common/de.lproj/Intents.strings

@@ -2,22 +2,22 @@
 "9KhaIS" = "Voreinstellung gesetzt";
 
 /* (No Comment) */
-"80eo5o" = "Kohlenhydrate hinzufügen";
+"80eo5o" = "KH-Eintrag hinzufügen";
 
 /* (No Comment) */
 "b085BW" = "Voreinstellung konnte nicht gesetzt werden.";
 
 /* (No Comment) */
-"I4OZy8" = "Enable Override Preset";
+"I4OZy8" = "Aktiviere Voreinstellung";
 
 /* (No Comment) */
 "lYMuWV" = "Voreinstellungs-Name";
 
 /* (No Comment) */
-"nDKAmn" = "Welche Voreinstellung möchten Sie aktivieren?";
+"nDKAmn" = "Welche Voreinstellung möchtest Du aktivieren?";
 
 /* (No Comment) */
-"OcNxIj" = "Kohlenhydrate hinzufügen";
+"OcNxIj" = "KH hinzufügen";
 
 /* (No Comment) */
 "oLQSsJ" = "Aktiviere '${overrideName}' Voreinstellung";

Common/he.lproj/Intents.strings

@@ -1,36 +1,36 @@
 /* (No Comment) */
-"9KhaIS" = "I've set the preset";
+"9KhaIS" = "ההגדרה נקבעה";
 
 /* (No Comment) */
-"80eo5o" = "Add Carb Entry";
+"80eo5o" = "הוסף שורת פחמימות";
 
 /* (No Comment) */
-"b085BW" = "I wasn't able to set the preset.";
+"b085BW" = "לא הצלחתי לקבוע את ההגדרה.";
 
 /* (No Comment) */
-"I4OZy8" = "Enable Override Preset";
+"I4OZy8" = "אפשר מעקף מוגדר";
 
 /* (No Comment) */
-"lYMuWV" = "Override Name";
+"lYMuWV" = "שם המעקף";
 
 /* (No Comment) */
-"nDKAmn" = "What's the name of the override you'd like to set?";
+"nDKAmn" = "מה שם המעקף שברצונך ליצור?";
 
 /* (No Comment) */
-"OcNxIj" = "Add Carb Entry";
+"OcNxIj" = "הוסף שורת פחמימות";
 
 /* (No Comment) */
-"oLQSsJ" = "Enable '${overrideName}' Override Preset";
+"oLQSsJ" = "אפשר מעקף ${overrideName} מוגדר";
 
 /* (No Comment) */
-"XNNmtH" = "Enable preset in Loop";
+"XNNmtH" = "אפשר את ההגדרה ב-Loop";
 
 /* (No Comment) */
-"yBzwCL" = "Override Selection";
+"yBzwCL" = "בחירת מעקף";
 
 /* (No Comment) */
-"yc02Yq" = "Add a carb entry to Loop";
+"yc02Yq" = "הוסף שורת פחמימות ל-Loop";
 
 /* (No Comment) */
-"ZZ3mtM" = "Enable an override preset in Loop";
+"ZZ3mtM" = "אפשר את המעקף ב-Loop";