Browse Source

remove unused formatter and refactor totalDurationInMinutes

Mike Plante 1 year ago
parent
commit
c0b5bb5d96

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

@@ -763,6 +763,11 @@ func formatHrMin(_ durationInMinutes: Int) -> String {
     }
 }
 
+ func convertToMinutes(_ hours: Int, _ minutes: Int) -> Decimal {
+    let totalMinutes = (hours * 60) + minutes
+    return Decimal(max(0, totalMinutes))
+}
+
 struct RadioButton: View {
     var isSelected: Bool
     var label: String

+ 2 - 14
FreeAPS/Sources/Modules/OverrideConfig/View/AddOverrideForm.swift

@@ -37,13 +37,6 @@ struct AddOverrideForm: View {
             )
     }
 
-    private var formatter: NumberFormatter {
-        let formatter = NumberFormatter()
-        formatter.numberStyle = .decimal
-        formatter.maximumFractionDigits = 0
-        return formatter
-    }
-
     var body: some View {
         NavigationView {
             List {
@@ -135,7 +128,7 @@ struct AddOverrideForm: View {
                             .pickerStyle(WheelPickerStyle())
                             .frame(maxWidth: .infinity)
                             .onChange(of: durationHours) {
-                                state.overrideDuration = Decimal(totalDurationInMinutes())
+                                state.overrideDuration = convertToMinutes(durationHours, durationMinutes)
                             }
 
                             Picker("Minutes", selection: $durationMinutes) {
@@ -146,7 +139,7 @@ struct AddOverrideForm: View {
                             .pickerStyle(WheelPickerStyle())
                             .frame(maxWidth: .infinity)
                             .onChange(of: durationMinutes) {
-                                state.overrideDuration = Decimal(totalDurationInMinutes())
+                                state.overrideDuration = convertToMinutes(durationHours, durationMinutes)
                             }
                         }
                         .listRowSeparator(.hidden, edges: .top)
@@ -508,11 +501,6 @@ struct AddOverrideForm: View {
         return !toggle
     }
 
-    private func totalDurationInMinutes() -> Int {
-        let durationTotal = (durationHours * 60) + durationMinutes
-        return max(0, durationTotal)
-    }
-
     private func isOverrideInvalid() -> (Bool, String?) {
         let noDurationSpecified = !state.indefinite && state.overrideDuration == 0
         let targetZeroWithOverride = state.shouldOverrideTarget && state.target == 0

+ 0 - 7
FreeAPS/Sources/Modules/OverrideConfig/View/EditOverrideForm.swift

@@ -82,13 +82,6 @@ struct EditOverrideForm: View {
             )
     }
 
-    private var formatter: NumberFormatter {
-        let formatter = NumberFormatter()
-        formatter.numberStyle = .decimal
-        formatter.maximumFractionDigits = 0
-        return formatter
-    }
-
     private var percentageSelection: Binding<Double> {
         Binding<Double>(
             get: {