new patches

Author: bjorkert

1988/dev_1988.patch

@@ -1,4 +1,4 @@
-Submodule Loop fee85e0..0c84d6c:
+Submodule Loop fee85e0..68bca42:
 diff --git a/Loop/Loop.xcodeproj/project.pbxproj b/Loop/Loop.xcodeproj/project.pbxproj
 index 360db94c..f403686e 100644
 --- a/Loop/Loop.xcodeproj/project.pbxproj
@@ -276,7 +276,7 @@ index ffc66ee3..1b1bab1f 100644
                  "",
 diff --git a/Loop/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift b/Loop/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift
 new file mode 100644
-index 00000000..90d05d0c
+index 00000000..1e78c81e
 --- /dev/null
 +++ b/Loop/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift
 @@ -0,0 +1,55 @@
@@ -330,7 +330,7 @@ index 00000000..90d05d0c
 +    }
 +}
 +
-+struct EnhancedAutoBolusSelectionView_Previews: PreviewProvider {
++struct GlucoseBasedApplicationFactorSelectionView_Previews: PreviewProvider {
 +    static var previews: some View {
 +        GlucoseBasedApplicationFactorSelectionView(isGlucoseBasedApplicationFactorEnabled: .constant(true))
 +    }

1988/dev_1988_2008.patch

@@ -1,49 +1,39 @@
-Submodule Loop 5bb5ed9..7ac05ea:
+Submodule Loop 2ed8c7b..8959bf4:
 diff --git a/Loop/Loop.xcodeproj/project.pbxproj b/Loop/Loop.xcodeproj/project.pbxproj
-index a27a4503..ea632e72 100644
+index a27a4503..9c023c06 100644
 --- a/Loop/Loop.xcodeproj/project.pbxproj
 +++ b/Loop/Loop.xcodeproj/project.pbxproj
-@@ -519,6 +519,11 @@
+@@ -519,6 +519,10 @@
  		C1FB4290217922A100FAB378 /* PumpManagerUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1FB428E217921D600FAB378 /* PumpManagerUI.swift */; };
  		DD3DBD272A33AEC8000F8B5B /* SettingsView+algorithmExperimentsSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3DBD262A33AEC8000F8B5B /* SettingsView+algorithmExperimentsSection.swift */; };
  		DD3DBD292A33AFE9000F8B5B /* IntegralRetrospectiveCorrectionSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3DBD282A33AFE9000F8B5B /* IntegralRetrospectiveCorrectionSelectionView.swift */; };
 +		DDC389F62A2B61750066E2E8 /* ApplicationFactorStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC389F52A2B61750066E2E8 /* ApplicationFactorStrategy.swift */; };
 +		DDC389F82A2B620B0066E2E8 /* GlucoseBasedApplicationFactorStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC389F72A2B620B0066E2E8 /* GlucoseBasedApplicationFactorStrategy.swift */; };
 +		DDC389FA2A2B62470066E2E8 /* ConstantDosingStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC389F92A2B62470066E2E8 /* ConstantDosingStrategy.swift */; };
-+		DDC389FC2A2BC6670066E2E8 /* SettingsView+algorithmExperimentsSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC389FB2A2BC6670066E2E8 /* SettingsView+algorithmExperimentsSection.swift */; };
 +		DDC389FE2A2C4C830066E2E8 /* GlucoseBasedApplicationFactorSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC389FD2A2C4C830066E2E8 /* GlucoseBasedApplicationFactorSelectionView.swift */; };
  		E90909D124E34AC500F963D2 /* high_and_rising_with_cob_momentum_effect.json in Resources */ = {isa = PBXBuildFile; fileRef = E90909CC24E34AC500F963D2 /* high_and_rising_with_cob_momentum_effect.json */; };
  		E90909D224E34AC500F963D2 /* high_and_rising_with_cob_insulin_effect.json in Resources */ = {isa = PBXBuildFile; fileRef = E90909CD24E34AC500F963D2 /* high_and_rising_with_cob_insulin_effect.json */; };
  		E90909D324E34AC500F963D2 /* high_and_rising_with_cob_predicted_glucose.json in Resources */ = {isa = PBXBuildFile; fileRef = E90909CE24E34AC500F963D2 /* high_and_rising_with_cob_predicted_glucose.json */; };
-@@ -1689,6 +1694,11 @@
+@@ -1689,6 +1693,10 @@
  		C1FF3D4D29C786A900BDC1EC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/InfoPlist.strings; sourceTree = "<group>"; };
  		DD3DBD262A33AEC8000F8B5B /* SettingsView+algorithmExperimentsSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SettingsView+algorithmExperimentsSection.swift"; sourceTree = "<group>"; };
  		DD3DBD282A33AFE9000F8B5B /* IntegralRetrospectiveCorrectionSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegralRetrospectiveCorrectionSelectionView.swift; sourceTree = "<group>"; };
 +		DDC389F52A2B61750066E2E8 /* ApplicationFactorStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationFactorStrategy.swift; sourceTree = "<group>"; };
 +		DDC389F72A2B620B0066E2E8 /* GlucoseBasedApplicationFactorStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlucoseBasedApplicationFactorStrategy.swift; sourceTree = "<group>"; };
 +		DDC389F92A2B62470066E2E8 /* ConstantDosingStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstantDosingStrategy.swift; sourceTree = "<group>"; };
-+		DDC389FB2A2BC6670066E2E8 /* SettingsView+algorithmExperimentsSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SettingsView+algorithmExperimentsSection.swift"; sourceTree = "<group>"; };
 +		DDC389FD2A2C4C830066E2E8 /* GlucoseBasedApplicationFactorSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlucoseBasedApplicationFactorSelectionView.swift; sourceTree = "<group>"; };
  		E90909CC24E34AC500F963D2 /* high_and_rising_with_cob_momentum_effect.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = high_and_rising_with_cob_momentum_effect.json; sourceTree = "<group>"; };
  		E90909CD24E34AC500F963D2 /* high_and_rising_with_cob_insulin_effect.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = high_and_rising_with_cob_insulin_effect.json; sourceTree = "<group>"; };
  		E90909CE24E34AC500F963D2 /* high_and_rising_with_cob_predicted_glucose.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = high_and_rising_with_cob_predicted_glucose.json; sourceTree = "<group>"; };
-@@ -2316,6 +2326,7 @@
- 			isa = PBXGroup;
- 			children = (
- 				A98556842493F901000FD662 /* AlertStore+SimulatedCoreData.swift */,
-+				DDC389FB2A2BC6670066E2E8 /* SettingsView+algorithmExperimentsSection.swift */,
- 				C1D289B422F90A52003FFBD9 /* BasalDeliveryState.swift */,
- 				A9F703722489BC8500C98AD8 /* CarbStore+SimulatedCoreData.swift */,
- 				C17824991E1999FA00D9D25C /* CaseCountable.swift */,
-@@ -2404,6 +2415,7 @@
+@@ -2404,6 +2412,7 @@
  				4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift */,
  				C1AF062229426300002C1B19 /* ManualGlucoseEntryRow.swift */,
  				DD3DBD282A33AFE9000F8B5B /* IntegralRetrospectiveCorrectionSelectionView.swift */,
 +				DDC389FD2A2C4C830066E2E8 /* GlucoseBasedApplicationFactorSelectionView.swift */,
  			);
  			path = Views;
  			sourceTree = "<group>";
-@@ -2445,6 +2457,9 @@
+@@ -2445,6 +2454,9 @@
  				C1F2075B26D6F9B0007AB7EB /* ProfileExpirationAlerter.swift */,
  				A96DAC2B2838F31200D94E38 /* SharedLogging.swift */,
  				7E69CFFB2A16A77E00203CBD /* ResetLoopManager.swift */,
@@ -53,39 +43,31 @@ index a27a4503..ea632e72 100644
  			);
  			path = Managers;
  			sourceTree = "<group>";
-@@ -3876,6 +3891,7 @@
+@@ -3876,6 +3888,7 @@
  				C1201E2C23ECDBD0002DA84A /* WatchContextRequestUserInfo.swift in Sources */,
  				1D49795824E7289700948F05 /* ServicesViewModel.swift in Sources */,
  				1D4A3E2D2478628500FD601B /* StoredAlert+CoreDataClass.swift in Sources */,
 +				DDC389FA2A2B62470066E2E8 /* ConstantDosingStrategy.swift in Sources */,
  				892D7C5123B54A15008A9656 /* CarbEntryViewController.swift in Sources */,
  				B4E202302661063E009421B5 /* AutomaticDosingStatus.swift in Sources */,
  				C191D2A125B3ACAA00C26C0B /* DosingStrategySelectionView.swift in Sources */,
-@@ -3909,6 +3925,7 @@
+@@ -3909,6 +3922,7 @@
  				1DB619AC270BAD3D006C9D07 /* VersionUpdateViewModel.swift in Sources */,
  				A9C62D882331703100535612 /* Service.swift in Sources */,
  				89CAB36324C8FE96009EE3CE /* PredictedGlucoseChartView.swift in Sources */,
 +				DDC389F82A2B620B0066E2E8 /* GlucoseBasedApplicationFactorStrategy.swift in Sources */,
  				4F6663941E905FD2009E74FC /* ChartColorPalette+Loop.swift in Sources */,
  				A9F703732489BC8500C98AD8 /* CarbStore+SimulatedCoreData.swift in Sources */,
  				4328E0351CFC0AE100E199AA /* WatchDataManager.swift in Sources */,
-@@ -3938,6 +3955,7 @@
- 				E9B080B1253BDA6300BAD8F8 /* UserDefaults+LoopIntents.swift in Sources */,
- 				C1AF062329426300002C1B19 /* ManualGlucoseEntryRow.swift in Sources */,
- 				C148CEE724FD91BD00711B3B /* DeliveryUncertaintyAlertManager.swift in Sources */,
-+				DDC389FC2A2BC6670066E2E8 /* SettingsView+algorithmExperimentsSection.swift in Sources */,
- 				1D12D3B92548EFDD00B53E8B /* main.swift in Sources */,
- 				435400341C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */,
- 				A9DCF32A25B0FABF00C89088 /* LoopUIColorPalette+Default.swift in Sources */,
-@@ -3972,6 +3990,7 @@
+@@ -3972,6 +3986,7 @@
  				A97F250825E056D500F0EE19 /* OnboardingManager.swift in Sources */,
  				438D42F91D7C88BC003244B0 /* PredictionInputEffect.swift in Sources */,
  				892A5D692230C41D008961AB /* RangeReplaceableCollection.swift in Sources */,
 +				DDC389F62A2B61750066E2E8 /* ApplicationFactorStrategy.swift in Sources */,
  				4F70C2101DE8FAC5006380B7 /* ExtensionDataManager.swift in Sources */,
  				43DFB62320D4CAE7008A7BAE /* PumpManager.swift in Sources */,
  				A9FB75F1252BE320004C7D3F /* BolusDosingDecision.swift in Sources */,
-@@ -3979,6 +3998,7 @@
+@@ -3979,6 +3994,7 @@
  				431A8C401EC6E8AB00823B9C /* CircleMaskView.swift in Sources */,
  				1D05219D2469F1F5000EBBDE /* AlertStore.swift in Sources */,
  				439897371CD2F80600223065 /* AnalyticsServicesManager.swift in Sources */,
@@ -94,7 +76,7 @@ index a27a4503..ea632e72 100644
  				895FE0952201234000FCF18A /* OverrideSelectionViewController.swift in Sources */,
  				C1EF747228D6A44A00C8C083 /* CrashRecoveryManager.swift in Sources */,
 diff --git a/Loop/Loop/Extensions/SettingsView+algorithmExperimentsSection.swift b/Loop/Loop/Extensions/SettingsView+algorithmExperimentsSection.swift
-index b6f07ba1..f9eb8d47 100644
+index b6f07ba1..b3a5091e 100644
 --- a/Loop/Loop/Extensions/SettingsView+algorithmExperimentsSection.swift
 +++ b/Loop/Loop/Extensions/SettingsView+algorithmExperimentsSection.swift
 @@ -5,6 +5,7 @@
@@ -110,16 +92,24 @@ index b6f07ba1..f9eb8d47 100644
      internal var algorithmExperimentsSection: some View {
          Section(header: SectionHeader(label: NSLocalizedString("Algorithm Experiments ⚠️", comment: "The title of the Algorithm Experiments section in settings"))) {
 -
-+
 +            NavigationLink(destination: GlucoseBasedApplicationFactorSelectionView(isGlucoseBasedApplicationFactorEnabled: $isGlucoseBasedApplicationFactorEnabled)) {
 +                HStack {
 +                    Text("Glucose Based Partial Application")
 +                    Spacer()
 +                    Text(isGlucoseBasedApplicationFactorEnabled ? "On" : "Off")
-+
++                }
++            }
              NavigationLink(destination: IntegralRetrospectiveCorrectionSelectionView(isIntegralRetrospectiveCorrectionEnabled: $isIntegralRetrospectiveCorrectionEnabled)) {
                  HStack {
                      Text("Integral Retrospective Correction")
+@@ -20,6 +27,6 @@ extension SettingsView {
+                     Text(isIntegralRetrospectiveCorrectionEnabled ? "On" : "Off")
+                 }
+             }
+-        }
++        }
+     }
+ }
 diff --git a/Loop/Loop/Managers/ApplicationFactorStrategy.swift b/Loop/Loop/Managers/ApplicationFactorStrategy.swift
 new file mode 100644
 index 00000000..bf67935c
@@ -271,7 +261,7 @@ index 15c593e7..8133aa84 100644
                  "",
 diff --git a/Loop/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift b/Loop/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift
 new file mode 100644
-index 00000000..90d05d0c
+index 00000000..1e78c81e
 --- /dev/null
 +++ b/Loop/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift
 @@ -0,0 +1,55 @@
@@ -325,19 +315,20 @@ index 00000000..90d05d0c
 +    }
 +}
 +
-+struct EnhancedAutoBolusSelectionView_Previews: PreviewProvider {
++struct GlucoseBasedApplicationFactorSelectionView_Previews: PreviewProvider {
 +    static var previews: some View {
 +        GlucoseBasedApplicationFactorSelectionView(isGlucoseBasedApplicationFactorEnabled: .constant(true))
 +    }
 +}
 diff --git a/Loop/Loop/Views/SettingsView.swift b/Loop/Loop/Views/SettingsView.swift
-index 2615596c..baedff6e 100644
+index 2615596c..12255a62 100644
 --- a/Loop/Loop/Views/SettingsView.swift
 +++ b/Loop/Loop/Views/SettingsView.swift
-@@ -32,6 +32,8 @@ public struct SettingsView: View {
+@@ -31,7 +31,8 @@ public struct SettingsView: View {
+     @State private var deletePumpDataAlertIsPresented = false
      @State private var deleteCGMDataAlertIsPresented = false
      @State internal var isIntegralRetrospectiveCorrectionEnabled = UserDefaults.standard.bool(forKey: "isExperimentalIntegralRetrospectiveCorrectionEnabled")
-
+-
 +    @State internal var isGlucoseBasedApplicationFactorEnabled = UserDefaults.standard.bool(forKey: "applyExperimentalGlucoseBasedApplicationFactor")
 +
      var localizedAppNameAndVersion: String

1988/dev_1988_cto.patch

@@ -1,5 +1,5 @@
 Submodule Loop contains modified content
-Submodule Loop ca4cba7..6425fe1:
+Submodule Loop 6e822fd..6c13724:
 diff --git a/Loop/Loop.xcodeproj/project.pbxproj b/Loop/Loop.xcodeproj/project.pbxproj
 index 9c95453a..5f46c3d4 100644
 --- a/Loop/Loop.xcodeproj/project.pbxproj
@@ -330,7 +330,7 @@ index 085b2420..1b1bab1f 100644
                  "",
 diff --git a/Loop/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift b/Loop/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift
 new file mode 100644
-index 00000000..90d05d0c
+index 00000000..1e78c81e
 --- /dev/null
 +++ b/Loop/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift
 @@ -0,0 +1,55 @@
@@ -384,7 +384,7 @@ index 00000000..90d05d0c
 +    }
 +}
 +
-+struct EnhancedAutoBolusSelectionView_Previews: PreviewProvider {
++struct GlucoseBasedApplicationFactorSelectionView_Previews: PreviewProvider {
 +    static var previews: some View {
 +        GlucoseBasedApplicationFactorSelectionView(isGlucoseBasedApplicationFactorEnabled: .constant(true))
 +    }

2008/dev_2008.patch

@@ -1,4 +1,4 @@
-Submodule Loop fee85e0..5bb5ed9:
+Submodule Loop fee85e0..2ed8c7b:
 diff --git a/Loop/Common/Extensions/GlucoseRangeSchedule.swift b/Loop/Common/Extensions/GlucoseRangeSchedule.swift
 index c8ef74fe..ccc75b0b 100644
 --- a/Loop/Common/Extensions/GlucoseRangeSchedule.swift
@@ -453,7 +453,7 @@ index 10ed414a..a0eea761 100644
          cell.subtitleLabel?.text = subtitleText
 diff --git a/Loop/Loop/Views/IntegralRetrospectiveCorrectionSelectionView.swift b/Loop/Loop/Views/IntegralRetrospectiveCorrectionSelectionView.swift
 new file mode 100644
-index 00000000..b38cba6b
+index 00000000..d7940e28
 --- /dev/null
 +++ b/Loop/Loop/Views/IntegralRetrospectiveCorrectionSelectionView.swift
 @@ -0,0 +1,54 @@
@@ -506,7 +506,7 @@ index 00000000..b38cba6b
 +    }
 +}
 +
-+struct EnhancedAutoBolusSelectionView_Previews: PreviewProvider {
++struct IntegralRetrospectiveCorrectionSelectionView_Previews: PreviewProvider {
 +    static var previews: some View {
 +        IntegralRetrospectiveCorrectionSelectionView(isIntegralRetrospectiveCorrectionEnabled: .constant(true))
 +    }