Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added ability to add min and max values to decimals in preferences page #232

Merged
merged 3 commits into from
Jun 8, 2024
Merged

Added ability to add min and max values to decimals in preferences page #232

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f97d4fd
Added ability to add min and max values to decimals in preferences page
May 22, 2024
bb66063
Removed min value for carbs cap until actual guardrails are decided l…
JeremyStorring May 26, 2024
d68b887
Addressed review comments and added the ability to add min and max va…
Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorDataFlow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ enum PreferencesEditor {

enum FieldType {
case boolean(keypath: WritableKeyPath<Preferences, Bool>)
case decimal(keypath: WritableKeyPath<Preferences, Decimal>)
case decimal(
keypath: WritableKeyPath<Preferences, Decimal>,
minVal: WritableKeyPath<Preferences, Decimal>? = nil,
maxVal: WritableKeyPath<Preferences, Decimal>? = nil
)
case insulinCurve(keypath: WritableKeyPath<Preferences, InsulinCurve>)
}

Expand All @@ -34,7 +38,7 @@ enum PreferencesEditor {
var decimalValue: Decimal {
get {
switch type {
case let .decimal(keypath):
case let .decimal(keypath, _, _):
return settable?.get(keypath) ?? 0
default: return 0
}
Expand All @@ -57,8 +61,18 @@ enum PreferencesEditor {
switch (type, value) {
case let (.boolean(keypath), value as Bool):
settable?.set(keypath, value: value)
case let (.decimal(keypath), value as Decimal):
settable?.set(keypath, value: value)
case let (.decimal(keypath, minVal, maxVal), value as Decimal):
let constrainedValue: Decimal
if let minValue = minVal, let minValueDecimal: Decimal = settable?.get(minValue), let maxValue = maxVal, let maxValueDecimal: Decimal = settable?.get(maxValue) {
constrainedValue = min(max(value, minValueDecimal), maxValueDecimal)
} else if let minValue = minVal, let minValueDecimal: Decimal = settable?.get(minValue) {
constrainedValue = max(value, minValueDecimal)
} else if let maxValue = maxVal, let maxValueDecimal: Decimal = settable?.get(maxValue) {
constrainedValue = min(value, maxValueDecimal)
} else {
constrainedValue = value
}
settable?.set(keypath, value: constrainedValue)
case let (.insulinCurve(keypath), value as InsulinCurve):
settable?.set(keypath, value: value)
default: break
Expand Down