Просмотр исходного кода

Autodecimal maxAbsorption stash before rebase of "maxAbsorptionTime"

Robert 1 год назад
Родитель
Сommit
a13861d985

+ 1 - 0
FreeAPS/Resources/json/defaults/preferences.json

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

+ 2 - 2
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: Int = 6
+    var maxAbsorptionTime: Decimal = 6
     var wideBGTargetRange: Bool = false
     var skipNeutralTemps: Bool = false
     var unsuspendIfNoTemp: Bool = false
@@ -186,7 +186,7 @@ extension Preferences: Decodable {
             preferences.maxCOB = maxCOB
         }
 
-        if let maxAbsorptionTime = try? container.decode(Int.self, forKey: .maxAbsorptionTime) {
+        if let maxAbsorptionTime = try? container.decode(Decimal.self, forKey: .maxAbsorptionTime) {
             preferences.maxAbsorptionTime = maxAbsorptionTime
         }
 

+ 1 - 5
FreeAPS/Sources/Modules/MealSettings/MealSettingsStateModel.swift

@@ -27,11 +27,7 @@ extension MealSettings {
                 $0
             })
 
-            subscribePreferencesSetting(\.maxAbsorptionTime, on: $maxAbsorptionTime.map(Int.init), initial: {
-                maxAbsorptionTime = Decimal($0)
-            }, map: {
-                $0
-            })
+            subscribePreferencesSetting(\.maxAbsorptionTime, on: $maxAbsorptionTime) { maxAbsorptionTime = $0 }
 
             subscribeSetting(\.minuteInterval, on: $minuteInterval.map(Int.init), initial: {
                 minuteInterval = Decimal($0)

+ 1 - 1
FreeAPS/Sources/Modules/MealSettings/View/MealSettingsRootView.swift

@@ -194,7 +194,7 @@ extension MealSettings {
                         }
                     ),
                     units: state.units,
-                    type: .decimal("timeCap"),
+                    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.",
                     verboseHint: