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

move temporary HBT Information for customized TT's

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

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

@@ -161,8 +161,14 @@ 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: percentageDescription(state.percentage),
+                        footer: tempTargetPercentageFooter,
                         content: {
                             Picker("Sensitivity Adjustment", selection: $tempTargetSensitivityAdjustmentType) {
                                 ForEach(TempTargetSensitivityAdjustmentType.allCases, id: \.self) { option in
@@ -197,14 +203,6 @@ 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)
                             }
                         }
                     )

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

@@ -135,8 +135,14 @@ 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: percentageDescription(percentage),
+                        footer: tempTargetPercentageFooter,
                         content: {
                             Picker("Sensitivity Adjustment", selection: $tempTargetSensitivityAdjustmentType) {
                                 ForEach(TempTargetSensitivityAdjustmentType.allCases, id: \.self) { option in
@@ -187,14 +193,6 @@ 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)
                             }
                         }
                     )