patches

Author: bjorkert

1988/dev_1988.patch

@@ -1,5 +1,4 @@
-Submodule Loop contains modified content
-Submodule Loop fee85e0..667a5a9:
+Submodule Loop fee85e0..0c84d6c:
 diff --git a/Loop/Loop.xcodeproj/project.pbxproj b/Loop/Loop.xcodeproj/project.pbxproj
 index 360db94c..f403686e 100644
 --- a/Loop/Loop.xcodeproj/project.pbxproj
@@ -236,7 +235,7 @@ index ffc66ee3..1b1bab1f 100644
 @@ -1698,7 +1698,23 @@ extension LoopDataManager {
                      return self.delegate?.roundBolusVolume(units: units) ?? units
                  }
- 
+
 -                let maxAutomaticBolus = min(iobHeadroom, maxBolus! * LoopConstants.bolusPartialApplicationFactor)
 +                // Create dosing strategy based on user setting
 +                let applicationFactorStrategy: ApplicationFactorStrategy = UserDefaults.standard.bool(forKey: "applyExperimentalGlucoseBasedApplicationFactor")
@@ -255,7 +254,7 @@ index ffc66ee3..1b1bab1f 100644
 +
 +                // If a user customizes maxPartialApplicationFactor > 1; this respects maxBolus
 +                let maxAutomaticBolus = min(iobHeadroom, maxBolus! * min(effectiveBolusApplicationFactor, 1.0))
- 
+
                  dosingRecommendation = predictedGlucose.recommendedAutomaticDose(
                      to: glucoseTargetRange!,
 @@ -1708,7 +1724,7 @@ extension LoopDataManager {
@@ -337,19 +336,18 @@ index 00000000..90d05d0c
 +    }
 +}
 diff --git a/Loop/Loop/Views/SettingsView.swift b/Loop/Loop/Views/SettingsView.swift
-index dc3f6ec3..1b5f4de3 100644
+index dc3f6ec3..24032203 100644
 --- a/Loop/Loop/Views/SettingsView.swift
 +++ b/Loop/Loop/Views/SettingsView.swift
-@@ -30,6 +30,8 @@ public struct SettingsView: View {
+@@ -30,6 +30,7 @@ public struct SettingsView: View {
      @State private var therapySettingsIsPresented: Bool = false
      @State private var deletePumpDataAlertIsPresented = false
      @State private var deleteCGMDataAlertIsPresented = false
-+    @State internal var enhancedAutoBolusIsPresented: Bool = false
 +    @State internal var isGlucoseBasedApplicationFactorEnabled = UserDefaults.standard.bool(forKey: "applyExperimentalGlucoseBasedApplicationFactor")
- 
+
      var localizedAppNameAndVersion: String
- 
-@@ -50,6 +52,9 @@ public struct SettingsView: View {
+
+@@ -50,6 +51,9 @@ public struct SettingsView: View {
                      if FeatureFlags.automaticBolusEnabled {
                          dosingStrategySection
                      }
@@ -359,20 +357,3 @@ index dc3f6ec3..1b5f4de3 100644
                      alertManagementSection
                      if viewModel.pumpManagerSettingsViewModel.isSetUp() {
                          configurationSection
-diff --git a/Loop/StatusWidget/StatusWidget.swift b/Loop/StatusWidget/StatusWidget.swift
-index 8aa04472..32768a2e 100644
---- a/Loop/StatusWidget/StatusWidget.swift
-+++ b/Loop/StatusWidget/StatusWidget.swift
-@@ -136,10 +136,10 @@ class StatusWidgetProvider: TimelineProvider {
- 
-             var delta: HKQuantity?
- 
--            // Making sure that previous glucose is within 5 mins of last glucose to avoid large deltas on sensor changes, missed readings, etc.
-+            // 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,
--               abs((prevGlucose.startDate.addingTimeInterval(.minutes(5)) - currGlucose.startDate).minutes) > 1
-+               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)