rename variable to maxMealAbsorptionTime

fix typo in hint

FreeAPS/Resources/json/defaults/preferences.json

@@ -14,7 +14,7 @@
   "exercise_mode" : false,
   "half_basal_exercise_target" : 160,
   "maxCOB" : 120,
-  "maxAbsorptionTime" : 6,
+  "maxMealAbsorptionTime" : 6,
   "wide_bg_target_range" : false,
   "skip_neutral_temps" : false,
   "unsuspend_if_no_temp" : false,

FreeAPS/Sources/Models/DecimalPickerSettings.swift

@@ -77,7 +77,7 @@ struct DecimalPickerSettings {
         type: PickerSetting.PickerSettingType.glucose
     )
     var maxCOB = PickerSetting(value: 120, step: 5, min: 0, max: 300, type: PickerSetting.PickerSettingType.gram)
-    var maxAbsorptionTime = PickerSetting(value: 6, step: 1, min: 4, max: 10, type: PickerSetting.PickerSettingType.hour)
+    var maxMealAbsorptionTime = PickerSetting(value: 6, step: 1, min: 4, max: 10, type: PickerSetting.PickerSettingType.hour)
     var min5mCarbimpact = PickerSetting(value: 8, step: 1, min: 1, max: 20, type: PickerSetting.PickerSettingType.glucose)
     var remainingCarbsFraction = PickerSetting(
         value: 1.0,

FreeAPS/Sources/Models/Preferences.swift

@@ -16,7 +16,7 @@ struct Preferences: JSON, Equatable {
     var exerciseMode: Bool = false
     var halfBasalExerciseTarget: Decimal = 160
     var maxCOB: Decimal = 120
-    var maxAbsorptionTime: Decimal = 6
+    var maxMealAbsorptionTime: Decimal = 6
     var wideBGTargetRange: Bool = false
     var skipNeutralTemps: Bool = false
     var unsuspendIfNoTemp: Bool = false
@@ -73,7 +73,7 @@ extension Preferences {
         case exerciseMode = "exercise_mode"
         case halfBasalExerciseTarget = "half_basal_exercise_target"
         case maxCOB
-        case maxAbsorptionTime
+        case maxMealAbsorptionTime = "maxAbsorptionTime"
         case wideBGTargetRange = "wide_bg_target_range"
         case skipNeutralTemps = "skip_neutral_temps"
         case unsuspendIfNoTemp = "unsuspend_if_no_temp"
@@ -186,8 +186,8 @@ extension Preferences: Decodable {
             preferences.maxCOB = maxCOB
         }
 
-        if let maxAbsorptionTime = try? container.decode(Decimal.self, forKey: .maxAbsorptionTime) {
-            preferences.maxAbsorptionTime = maxAbsorptionTime
+        if let maxMealAbsorptionTime = try? container.decode(Decimal.self, forKey: .maxMealAbsorptionTime) {
+            preferences.maxMealAbsorptionTime = maxMealAbsorptionTime
         }
 
         if let wideBGTargetRange = try? container.decode(Bool.self, forKey: .wideBGTargetRange) {

FreeAPS/Sources/Modules/MealSettings/MealSettingsStateModel.swift

@@ -11,7 +11,7 @@ extension MealSettings {
         @Published var timeCap: Decimal = 8
         @Published var minuteInterval: Decimal = 30
         @Published var delay: Decimal = 60
-        @Published var maxAbsorptionTime: Decimal = 6
+        @Published var maxMealAbsorptionTime: Decimal = 6
 
         override func subscribe() {
             units = settingsManager.settings.units
@@ -27,7 +27,7 @@ extension MealSettings {
                 $0
             })
 
-            subscribePreferencesSetting(\.maxAbsorptionTime, on: $maxAbsorptionTime) { maxAbsorptionTime = $0 }
+            subscribePreferencesSetting(\.maxMealAbsorptionTime, on: $maxMealAbsorptionTime) { maxMealAbsorptionTime = $0 }
 
             subscribeSetting(\.minuteInterval, on: $minuteInterval.map(Int.init), initial: {
                 minuteInterval = Decimal($0)

FreeAPS/Sources/Modules/MealSettings/View/MealSettingsRootView.swift

@@ -183,7 +183,7 @@ extension MealSettings {
                 ).listRowBackground(Color.chart)
 
                 SettingInputSection(
-                    decimalValue: $state.maxAbsorptionTime,
+                    decimalValue: $state.maxMealAbsorptionTime,
                     booleanValue: $booleanPlaceholder,
                     shouldDisplayHint: $shouldDisplayHint,
                     selectedVerboseHint: Binding(
@@ -194,14 +194,14 @@ extension MealSettings {
                         }
                     ),
                     units: state.units,
-                    type: .decimal("maxAbsorptionTime"),
-                    label: "Maximum Meal Absorption Time",
-                    miniHint: "Set the maximum hours for which COB can be accumulated to define the maximum absorption time.",
+                    type: .decimal("maxMealAbsorptionTime"),
+                    label: "Max. Meal Absorption Time",
+                    miniHint: "Set the maximum hours for which COB can be accumulated to define the maximum meal absorption time.",
                     verboseHint:
                     VStack(alignment: .leading, spacing: 10) {
                         Text("Default: 6 hours").bold()
                         Text(
-                            "Handling of long lasting effects of heavy meals containing large cqantities of fat and protein might be improved by letting the system consider meal effects for longer than the default six hours."
+                            "Handling of long lasting effects of heavy meals containing large quantities of fat and protein might be improved by letting the system consider meal effects for longer than the default six hours."
                         )
                     }
                 )

FreeAPS/Sources/Views/SettingInputSection.swift

@@ -107,8 +107,8 @@ struct SettingInputSection<VerboseHint: View>: View {
             return pickerSettingsProvider.settings.hours
         case "maxCarbs":
             return pickerSettingsProvider.settings.maxCarbs
-        case "maxAbsorptionTime":
-            return pickerSettingsProvider.settings.maxAbsorptionTime
+        case "maxMealAbsorptionTime":
+            return pickerSettingsProvider.settings.maxMealAbsorptionTime
         case "maxFat":
             return pickerSettingsProvider.settings.maxFat
         case "maxProtein":