Преглед изворни кода

Revert "move temporary HBT Information for customized TT's"

This reverts commit 69726fd201300dba6cb7084d63115c3561cb3369.
Robert пре 1 година
родитељ
комит
d15cbc31d3

+ 9 - 7
FreeAPS/Sources/Modules/OverrideConfig/View/AddTempTargetForm.swift

@@ -161,14 +161,8 @@ struct AddTempTargetForm: View {
                 let computedHalfBasalTarget = Decimal(state.computeHalfBasalTarget())
 
                 if state.isAdjustSensEnabled() {
-                    let tempTargetPercentageFooter = tempTargetSensitivityAdjustmentType == .slider
-                        ? (percentageDescription(state.percentage) ?? Text("")) +
-                        Text(
-                            " Temporary adjusting Half Basal Exercise Target to \(formattedGlucose(glucose: computedHalfBasalTarget))."
-                        )
-                        : (percentageDescription(state.percentage) ?? Text(""))
                     Section(
-                        footer: tempTargetPercentageFooter,
+                        footer: percentageDescription(state.percentage),
                         content: {
                             Picker("Sensitivity Adjustment", selection: $tempTargetSensitivityAdjustmentType) {
                                 ForEach(TempTargetSensitivityAdjustmentType.allCases, id: \.self) { option in
@@ -203,6 +197,14 @@ struct AddTempTargetForm: View {
                                     state.halfBasalTarget = Decimal(state.computeHalfBasalTarget())
                                 }
                                 .listRowSeparator(.hidden, edges: .top)
+
+                                HStack {
+                                    Text(
+                                        "Half Basal Exercise Target:"
+                                    )
+                                    Spacer()
+                                    Text(formattedGlucose(glucose: computedHalfBasalTarget))
+                                }.foregroundStyle(.primary)
                             }
                         }
                     )

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

@@ -135,14 +135,8 @@ struct EditTempTargetForm: View {
                 )
 
                 if state.isAdjustSensEnabled(usingTarget: target) {
-                    let tempTargetPercentageFooter = tempTargetSensitivityAdjustmentType == .slider
-                        ? (percentageDescription(percentage) ?? Text("")) +
-                        Text(
-                            " Temporary adjusting Half Basal Exercise Target to \(formattedGlucose(glucose: computedHalfBasalTarget))."
-                        )
-                        : (percentageDescription(percentage) ?? Text(""))
                     Section(
-                        footer: tempTargetPercentageFooter,
+                        footer: percentageDescription(percentage),
                         content: {
                             Picker("Sensitivity Adjustment", selection: $tempTargetSensitivityAdjustmentType) {
                                 ForEach(TempTargetSensitivityAdjustmentType.allCases, id: \.self) { option in
@@ -193,6 +187,14 @@ struct EditTempTargetForm: View {
                                     Text("\(state.computeSliderHigh(usingTarget: target), specifier: "%.0f")%")
                                 }
                                 .listRowSeparator(.hidden, edges: .top)
+
+                                HStack {
+                                    Text(
+                                        "Half Basal Exercise Target:"
+                                    )
+                                    Spacer()
+                                    Text(formattedGlucose(glucose: computedHalfBasalTarget))
+                                }.foregroundStyle(.primary)
                             }
                         }
                     )