Przeglądaj źródła

enumerated SensAdjustmentTypes

Robert 1 rok temu
rodzic
commit
863311fbb8

+ 5 - 0
FreeAPS/Sources/Modules/OverrideConfig/OverrideStateModel.swift

@@ -999,6 +999,11 @@ extension PickerSettingsProvider {
     }
     }
 }
 }
 
 
+enum TempTargetSensitivityAdjustmentType: String, CaseIterable {
+    case standard = "Standard"
+    case slider = "Customized"
+}
+
 enum IsfAndOrCrOptions: String, CaseIterable {
 enum IsfAndOrCrOptions: String, CaseIterable {
     case isfAndCr = "ISF/CR"
     case isfAndCr = "ISF/CR"
     case isf = "ISF"
     case isf = "ISF"

+ 5 - 10
FreeAPS/Sources/Modules/OverrideConfig/View/AddTempTargetForm.swift

@@ -8,7 +8,7 @@ struct AddTempTargetForm: View {
     @Environment(\.dismiss) var dismiss
     @Environment(\.dismiss) var dismiss
     @State private var displayPickerDuration: Bool = false
     @State private var displayPickerDuration: Bool = false
     @State private var displayPickerTarget: Bool = false
     @State private var displayPickerTarget: Bool = false
-    @State private var selectedAdjustSens: enabledAdjustSens = .standard
+    @State private var tempTargetSensitivityAdjustmentType: TempTargetSensitivityAdjustmentType = .standard
     @State private var durationHours = 0
     @State private var durationHours = 0
     @State private var durationMinutes = 0
     @State private var durationMinutes = 0
     @State private var targetStep: Decimal = 5
     @State private var targetStep: Decimal = 5
@@ -185,12 +185,12 @@ struct AddTempTargetForm: View {
                             .foregroundStyle(colorScheme == .dark ? Color.orange : Color.accentColor),
                             .foregroundStyle(colorScheme == .dark ? Color.orange : Color.accentColor),
                         content: {
                         content: {
                             VStack {
                             VStack {
-                                Picker("Sensitivity Adjustment", selection: $selectedAdjustSens) {
-                                    ForEach(enabledAdjustSens.allCases, id: \.self) { option in
+                                Picker("Sensitivity Adjustment", selection: $tempTargetSensitivityAdjustmentType) {
+                                    ForEach(TempTargetSensitivityAdjustmentType.allCases, id: \.self) { option in
                                         Text(option.rawValue).tag(option)
                                         Text(option.rawValue).tag(option)
                                     }
                                     }
                                     .pickerStyle(MenuPickerStyle())
                                     .pickerStyle(MenuPickerStyle())
-                                    .onChange(of: selectedAdjustSens) { newValue in
+                                    .onChange(of: tempTargetSensitivityAdjustmentType) { newValue in
                                         if newValue == .standard {
                                         if newValue == .standard {
                                             state.halfBasalTarget = state.settingHalfBasalTarget
                                             state.halfBasalTarget = state.settingHalfBasalTarget
                                             state.percentage = Double(state.computeAdjustedPercentage() * 100)
                                             state.percentage = Double(state.computeAdjustedPercentage() * 100)
@@ -198,7 +198,7 @@ struct AddTempTargetForm: View {
                                     }
                                     }
                                 }
                                 }
 
 
-                                if selectedAdjustSens == .slider {
+                                if tempTargetSensitivityAdjustmentType == .slider {
                                     Text("\(formattedPercentage(state.percentage)) % Insulin")
                                     Text("\(formattedPercentage(state.percentage)) % Insulin")
                                         .foregroundColor(isUsingSlider ? .orange : Color.tabBar)
                                         .foregroundColor(isUsingSlider ? .orange : Color.tabBar)
                                         .font(.title3)
                                         .font(.title3)
@@ -307,11 +307,6 @@ struct AddTempTargetForm: View {
         }
         }
     }
     }
 
 
-    enum enabledAdjustSens: String, CaseIterable {
-        case standard = "default"
-        case slider = "customized"
-    }
-
     private func totalDurationInMinutes() -> Int {
     private func totalDurationInMinutes() -> Int {
         let durationTotal = (durationHours * 60) + durationMinutes
         let durationTotal = (durationHours * 60) + durationMinutes
         return max(0, durationTotal)
         return max(0, durationTotal)

+ 6 - 11
FreeAPS/Sources/Modules/OverrideConfig/View/EditTempTargetForm.swift

@@ -8,7 +8,7 @@ struct EditTempTargetForm: View {
     @StateObject var state: OverrideConfig.StateModel
     @StateObject var state: OverrideConfig.StateModel
     @State private var displayPickerDuration: Bool = false
     @State private var displayPickerDuration: Bool = false
     @State private var displayPickerTarget: Bool = false
     @State private var displayPickerTarget: Bool = false
-    @State private var selectedAdjustSens: enabledAdjustSens = .standard
+    @State private var tempTargetSensitivityAdjustmentType: TempTargetSensitivityAdjustmentType = .standard
     @State private var durationHours = 0
     @State private var durationHours = 0
     @State private var durationMinutes = 0
     @State private var durationMinutes = 0
     @State private var targetStep: Decimal = 5
     @State private var targetStep: Decimal = 5
@@ -44,11 +44,6 @@ struct EditTempTargetForm: View {
         } else { _percentage = State(initialValue: Decimal(100)) }
         } else { _percentage = State(initialValue: Decimal(100)) }
     }
     }
 
 
-    enum enabledAdjustSens: String, CaseIterable {
-        case standard = "default"
-        case slider = "customized"
-    }
-
     var color: LinearGradient {
     var color: LinearGradient {
         colorScheme == .dark ? LinearGradient(
         colorScheme == .dark ? LinearGradient(
             gradient: Gradient(colors: [
             gradient: Gradient(colors: [
@@ -107,7 +102,7 @@ struct EditTempTargetForm: View {
                 }
                 }
             }
             }
             .onAppear {
             .onAppear {
-                if halfBasalTarget != state.settingHalfBasalTarget { selectedAdjustSens = .slider }
+                if halfBasalTarget != state.settingHalfBasalTarget { tempTargetSensitivityAdjustmentType = .slider }
             }
             }
         }
         }
     }
     }
@@ -237,12 +232,12 @@ struct EditTempTargetForm: View {
                             .foregroundStyle(colorScheme == .dark ? Color.orange : Color.accentColor),
                             .foregroundStyle(colorScheme == .dark ? Color.orange : Color.accentColor),
                         content: {
                         content: {
                             VStack {
                             VStack {
-                                Picker("Sensitivity Adjustment", selection: $selectedAdjustSens) {
-                                    ForEach(enabledAdjustSens.allCases, id: \.self) { option in
+                                Picker("Sensitivity Adjustment", selection: $tempTargetSensitivityAdjustmentType) {
+                                    ForEach(TempTargetSensitivityAdjustmentType.allCases, id: \.self) { option in
                                         Text(option.rawValue).tag(option)
                                         Text(option.rawValue).tag(option)
                                     }
                                     }
                                     .pickerStyle(MenuPickerStyle())
                                     .pickerStyle(MenuPickerStyle())
-                                    .onChange(of: selectedAdjustSens) { newValue in
+                                    .onChange(of: tempTargetSensitivityAdjustmentType) { newValue in
                                         if newValue == .standard {
                                         if newValue == .standard {
                                             halfBasalTarget = state.settingHalfBasalTarget
                                             halfBasalTarget = state.settingHalfBasalTarget
                                             percentage = (
                                             percentage = (
@@ -254,7 +249,7 @@ struct EditTempTargetForm: View {
                                     }
                                     }
                                 }
                                 }
 
 
-                                if selectedAdjustSens == .slider {
+                                if tempTargetSensitivityAdjustmentType == .slider {
                                     Text("\(formattedPercentage(Double(percentage))) % Insulin")
                                     Text("\(formattedPercentage(Double(percentage))) % Insulin")
                                         .foregroundColor(isUsingSlider ? .orange : Color.tabBar)
                                         .foregroundColor(isUsingSlider ? .orange : Color.tabBar)
                                         .font(.title3)
                                         .font(.title3)