Merge pull request #585 from tidepool-org/ps2/LOOP-4688/diy-sync

LOOP-4688 DIY Sync

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

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/FeatureFlags.swift

@@ -35,10 +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() {
@@ -213,8 +213,6 @@ 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
@@ -229,6 +227,11 @@ struct FeatureFlagConfiguration: Decodable {
         self.missedMealNotifications = true
         #endif
 
+        #if ALLOW_ALGORITHM_EXPERIMENTS
+        self.allowAlgorithmExperiments = true
+        #else
+        self.allowAlgorithmExperiments = false
+        #endif
     }
 }
 
@@ -260,10 +263,10 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
             "* allowDebugFeatures: \(allowDebugFeatures)",
             "* simpleBolusCalculatorEnabled: \(simpleBolusCalculatorEnabled)",
             "* usePositiveMomentumAndRCForManualBoluses: \(usePositiveMomentumAndRCForManualBoluses)",
-            "* dynamicCarbAbsorptionEnabled: \(dynamicCarbAbsorptionEnabled)",
             "* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)",
             "* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)",
-            "* missedMealNotifications: \(missedMealNotifications)"
+            "* missedMealNotifications: \(missedMealNotifications)",
+            "* allowAlgorithmExperiments: \(allowAlgorithmExperiments)"
         ].joined(separator: "\n")
     }
 }

Common/Models/StatusExtensionContext.swift

@@ -297,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?
@@ -326,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
@@ -364,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/de.lproj/Intents.strings

@@ -2,13 +2,13 @@
 "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";
@@ -17,7 +17,7 @@
 "nDKAmn" = "Welche Voreinstellung möchten Sie aktivieren?";
 
 /* (No Comment) */
-"OcNxIj" = "Kohlenhydrate hinzufügen";
+"OcNxIj" = "KH hinzufügen";
 
 /* (No Comment) */
 "oLQSsJ" = "Aktiviere '${overrideName}' Voreinstellung";

Common/pl.lproj/Intents.strings

@@ -1,5 +1,5 @@
 /* (No Comment) */
-"9KhaIS" = "Ustawiłem Cel Tymczas.";
+"9KhaIS" = "Ustawiłem Cel Tymczasowy";
 
 /* (No Comment) */
 "80eo5o" = "Wprowadź węglowodany";