Remove unused setting 'Skip Bolus After Carbs' from app

FreeAPS/Resources/json/defaults/freeaps/freeaps_settings.json

@@ -10,7 +10,6 @@
   "localGlucosePort" : 8080,
   "debugOptions" : false,
   "insulinReqPercentage" : 70,
-  "skipBolusScreenAfterCarbs" : false,
   "displayHR" : false,
   "cgm" : "none",
   "cgmManagerTypeByIdentifier":"",

FreeAPS/Sources/Models/FreeAPSSettings.swift

@@ -26,7 +26,6 @@ struct FreeAPSSettings: JSON, Equatable {
     var localGlucosePort: Int = 8080
     var debugOptions: Bool = false
     var insulinReqPercentage: Decimal = 70
-    var skipBolusScreenAfterCarbs: Bool = false
     var displayHR: Bool = false
     var cgm: CGMType = .none
     var cgmPluginIdentifier: String = ""
@@ -122,10 +121,6 @@ extension FreeAPSSettings: Decodable {
             settings.insulinReqPercentage = insulinReqPercentage
         }
 
-        if let skipBolusScreenAfterCarbs = try? container.decode(Bool.self, forKey: .skipBolusScreenAfterCarbs) {
-            settings.skipBolusScreenAfterCarbs = skipBolusScreenAfterCarbs
-        }
-
         if let displayHR = try? container.decode(Bool.self, forKey: .displayHR) {
             settings.displayHR = displayHR
             // compatibility if displayOnWatch is not available in json files

FreeAPS/Sources/Modules/Bolus/BolusStateModel.swift

@@ -87,7 +87,6 @@ extension Bolus {
 
         @Published var id_: String = ""
         @Published var summary: String = ""
-        @Published var skipBolus: Bool = false
 
         @Published var externalInsulin: Bool = false
         @Published var showInfo: Bool = false
@@ -126,7 +125,6 @@ extension Bolus {
             displayPresets = settings.settings.displayPresets
 
             maxCarbs = settings.settings.maxCarbs
-            skipBolus = settingsManager.settings.skipBolusScreenAfterCarbs
             useFPUconversion = settingsManager.settings.useFPUconversion
 
             if waitForSuggestionInitial {

FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorStateModel.swift

@@ -5,7 +5,6 @@ extension PreferencesEditor {
     final class StateModel: BaseStateModel<Provider>, PreferencesSettable { private(set) var preferences = Preferences()
         @Published var unitsIndex = 1
         @Published var allowAnnouncements = false
-        @Published var skipBolusScreenAfterCarbs = false
         @Published var sections: [FieldSection] = []
         @Published var useAlternativeBolusCalc: Bool = false
         @Published var units: GlucoseUnits = .mgdL

FreeAPS/Sources/Modules/StatConfig/StatConfigStateModel.swift

@@ -4,7 +4,6 @@ extension StatConfig {
     final class StateModel: BaseStateModel<Provider> {
         @Published var overrideHbA1cUnit = false
 
-        @Published var skipBolusScreenAfterCarbs: Bool = false
         @Published var useFPUconversion: Bool = true
         @Published var tins: Bool = false
         @Published var lockScreenView: LockScreenView = .simple
@@ -28,7 +27,6 @@ extension StatConfig {
             subscribeSetting(\.rulerMarks, on: $rulerMarks) { rulerMarks = $0 }
             subscribeSetting(\.useFPUconversion, on: $useFPUconversion) { useFPUconversion = $0 }
             subscribeSetting(\.tins, on: $tins) { tins = $0 }
-            subscribeSetting(\.skipBolusScreenAfterCarbs, on: $skipBolusScreenAfterCarbs) { skipBolusScreenAfterCarbs = $0 }
             subscribeSetting(\.oneDimensionalGraph, on: $oneDimensionalGraph) { oneDimensionalGraph = $0 }
             subscribeSetting(\.lockScreenView, on: $lockScreenView) { lockScreenView = $0 }
 

FreeAPS/Sources/Modules/StatConfig/View/StatConfigRootView.swift

@@ -76,7 +76,6 @@ extension StatConfig {
                 } header: { Text("Statistics settings ") }
 
                 Section {
-                    Toggle("Skip Bolus screen after carbs", isOn: $state.skipBolusScreenAfterCarbs)
                     Toggle("Display and allow Fat and Protein entries", isOn: $state.useFPUconversion)
                 } header: { Text("Add Meal View settings ") }
 

FreeAPS/Sources/Services/WatchManager/WatchManager.swift

@@ -242,7 +242,6 @@ final class BaseWatchManager: NSObject, WatchManager, Injectable {
                 state.bolusRecommended = apsManager
                     .roundBolus(amount: max(recommended, 0))
             }
-            state.bolusAfterCarbs = !settingsManager.settings.skipBolusScreenAfterCarbs
             state.displayOnWatch = settingsManager.settings.displayOnWatch
             state.displayFatAndProteinOnWatch = settingsManager.settings.displayFatAndProteinOnWatch
             state.confirmBolusFaster = settingsManager.settings.confirmBolusFaster
@@ -263,7 +262,6 @@ final class BaseWatchManager: NSObject, WatchManager, Injectable {
                         until: untilDate
                     )
                 }
-            state.bolusAfterCarbs = !settingsManager.settings.skipBolusScreenAfterCarbs
             state.displayOnWatch = settingsManager.settings.displayOnWatch
             state.displayFatAndProteinOnWatch = settingsManager.settings.displayFatAndProteinOnWatch
             state.confirmBolusFaster = settingsManager.settings.confirmBolusFaster
@@ -412,13 +410,8 @@ extension BaseWatchManager: WCSessionDelegate {
                     )]
                 )
 
-                if settingsManager.settings.skipBolusScreenAfterCarbs {
-                    let success = await apsManager.determineBasal()
-                    replyHandler(["confirmation": success])
-                } else {
                     _ = await apsManager.determineBasal()
                     replyHandler(["confirmation": true])
-                }
             }
             return
         }

FreeAPSWatch WatchKit Extension/DataFlow.swift

@@ -16,7 +16,6 @@ struct WatchState: Codable {
     var iob: Decimal?
     var cob: Decimal?
     var tempTargets: [TempTargetWatchPreset] = []
-    var bolusAfterCarbs: Bool?
     var eventualBG: String?
     var eventualBGRaw: String?
     var displayOnWatch: AwConfig?

FreeAPSWatch WatchKit Extension/WatchStateModel.swift

@@ -28,7 +28,6 @@ class WatchStateModel: NSObject, ObservableObject {
     @Published var iob: Decimal?
     @Published var cob: Decimal?
     @Published var tempTargets: [TempTargetWatchPreset] = []
-    @Published var bolusAfterCarbs = true
     @Published var isCarbsViewActive = false
     @Published var isTempTargetViewActive = false
     @Published var isBolusViewActive = false
@@ -77,7 +76,7 @@ class WatchStateModel: NSObject, ObservableObject {
         isCarbsViewActive = false
         session.sendMessage(["carbs": carbs, "fat": fat, "protein": protein], replyHandler: { reply in
             self.completionHandler(reply)
-            if let ok = reply["confirmation"] as? Bool, ok, self.bolusAfterCarbs {
+            if let ok = reply["confirmation"] as? Bool, ok {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                     self.isBolusViewActive = true
                 }
@@ -171,7 +170,6 @@ class WatchStateModel: NSObject, ObservableObject {
         iob = state.iob
         cob = state.cob
         tempTargets = state.tempTargets
-        bolusAfterCarbs = state.bolusAfterCarbs ?? true
         lastUpdate = Date()
         eventualBG = state.eventualBG ?? ""
         displayOnWatch = state.displayOnWatch ?? .BGTarget