Explorar o código

match TT percentage description to OR's, ...

and replace `Customized` with `Custom`
Mike Plante hai 1 ano
pai
achega
626368e3c4

+ 1 - 1
FreeAPS/Sources/Modules/OverrideConfig/OverrideStateModel.swift

@@ -973,7 +973,7 @@ extension PickerSettingsProvider {
 
 enum TempTargetSensitivityAdjustmentType: String, CaseIterable {
     case standard = "Standard"
-    case slider = "Customized"
+    case slider = "Custom"
 }
 
 enum IsfAndOrCrOptions: String, CaseIterable {

+ 8 - 11
FreeAPS/Sources/Modules/OverrideConfig/View/AddTempTargetForm.swift

@@ -203,14 +203,10 @@ struct AddTempTargetForm: View {
 
             if state.tempTargetTarget != state.normalTarget {
                 let computedHalfBasalTarget = Decimal(state.computeHalfBasalTarget())
-                let sensHint = state.tempTargetTarget > state.normalTarget ?
-                    "Reducing all delivered insulin to \(formattedPercentage(state.percentage))%." :
-                    "Increasing all delivered insulin by \(formattedPercentage(state.percentage - 100))%."
+
                 if state.isAdjustSensEnabled() {
                     Section(
-                        header: Text(sensHint)
-                            .textCase(.none)
-                            .foregroundStyle(colorScheme == .dark ? Color.orange : Color.accentColor),
+                        footer: percentageDescription(state.percentage),
                         content: {
                             Picker("Sensitivity Adjustment", selection: $tempTargetSensitivityAdjustmentType) {
                                 ForEach(TempTargetSensitivityAdjustmentType.allCases, id: \.self) { option in
@@ -225,12 +221,13 @@ struct AddTempTargetForm: View {
                                 }
                             }
 
+                            Text("\(formattedPercentage(state.percentage)) % Insulin")
+                                .foregroundColor(isUsingSlider ? .orange : Color.tabBar)
+                                .font(.title3)
+                                .fontWeight(.bold)
+                                .frame(maxWidth: .infinity, alignment: .center)
+
                             if tempTargetSensitivityAdjustmentType == .slider {
-                                Text("\(formattedPercentage(state.percentage)) % Insulin")
-                                    .foregroundColor(isUsingSlider ? .orange : Color.tabBar)
-                                    .font(.title3)
-                                    .fontWeight(.bold)
-                                    .frame(maxWidth: .infinity, alignment: .center)
                                 Slider(
                                     value: $state.percentage,
                                     in: state.computeSliderLow() ... state.computeSliderHigh(),

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

@@ -199,15 +199,10 @@ struct EditTempTargetForm: View {
                     state
                         .computeHalfBasalTarget(usingTarget: target, usingPercentage: percentage)
                 )
-                let sensHint = target > state.normalTarget ?
-                    "Reducing all delivered insulin to \(formattedPercentage(percentage))%." :
-                    "Increasing all delivered insulin by \(formattedPercentage(percentage - 100))%."
 
                 if state.isAdjustSensEnabled(usingTarget: target) {
                     Section(
-                        header: Text(sensHint)
-                            .textCase(.none)
-                            .foregroundStyle(colorScheme == .dark ? Color.orange : Color.accentColor),
+                        footer: percentageDescription(percentage),
                         content: {
                             Picker("Sensitivity Adjustment", selection: $tempTargetSensitivityAdjustmentType) {
                                 ForEach(TempTargetSensitivityAdjustmentType.allCases, id: \.self) { option in
@@ -226,12 +221,13 @@ struct EditTempTargetForm: View {
                                 }
                             }
 
+                            Text("\(formattedPercentage(percentage)) % Insulin")
+                                .foregroundColor(isUsingSlider ? .orange : Color.tabBar)
+                                .font(.title3)
+                                .fontWeight(.bold)
+                                .frame(maxWidth: .infinity, alignment: .center)
+
                             if tempTargetSensitivityAdjustmentType == .slider {
-                                Text("\(formattedPercentage(percentage)) % Insulin")
-                                    .foregroundColor(isUsingSlider ? .orange : Color.tabBar)
-                                    .font(.title3)
-                                    .fontWeight(.bold)
-                                    .frame(maxWidth: .infinity, alignment: .center)
                                 Slider(
                                     value: Binding(
                                         get: {