Explorar el Código

fix VStacks in Override UI

Mike Plante hace 1 año
padre
commit
0fb17a2c80

+ 22 - 26
FreeAPS/Sources/Modules/OverrideConfig/View/AddOverrideForm.swift

@@ -136,9 +136,9 @@ struct AddOverrideForm: View {
                         Text("Change CR")
                     }
                 }
+            }
 
-                Divider()
-
+            VStack {
                 Toggle(isOn: $state.indefinite) {
                     Text("Enable Indefinitely")
                 }
@@ -149,9 +149,9 @@ struct AddOverrideForm: View {
                         Text("min").foregroundColor(.secondary)
                     }
                 }
+            }
 
-                Divider()
-
+            VStack {
                 Toggle(isOn: $state.shouldOverrideTarget) {
                     Text("Override Profile Target")
                 }
@@ -162,29 +162,25 @@ struct AddOverrideForm: View {
                         Text(state.units.rawValue).foregroundColor(.secondary)
                     }
                 }
+            }
 
-                Divider()
-
-                Toggle(isOn: $state.advancedSettings) {
-                    Text("More Options")
-                }
-                if state.advancedSettings {
-                    Divider()
-
-                    Toggle(isOn: Binding(
-                        get: { state.smbIsOff },
-                        set: { newValue in
-                            state.smbIsOff = newValue
-                            if newValue {
-                                state.smbIsScheduledOff = false
-                            }
+            Toggle(isOn: $state.advancedSettings) {
+                Text("More Options")
+            }
+            if state.advancedSettings {
+                Toggle(isOn: Binding(
+                    get: { state.smbIsOff },
+                    set: { newValue in
+                        state.smbIsOff = newValue
+                        if newValue {
+                            state.smbIsScheduledOff = false
                         }
-                    )) {
-                        Text("Disable SMBs")
                     }
+                )) {
+                    Text("Disable SMBs")
+                }
 
-                    Divider()
-
+                VStack {
                     Toggle(isOn: Binding(
                         get: { state.smbIsScheduledOff },
                         set: { newValue in
@@ -261,10 +257,10 @@ struct AddOverrideForm: View {
                         }
                         .padding(.vertical, 10)
                     }
+                }
 
-                    if !state.smbIsOff {
-                        Divider()
-
+                if !state.smbIsOff {
+                    VStack {
                         // SMB Minutes Picker
                         VStack {
                             HStack {

+ 13 - 15
FreeAPS/Sources/Modules/OverrideConfig/View/EditOverrideForm.swift

@@ -190,9 +190,9 @@ struct EditOverrideForm: View {
                         Text("Change CR")
                     }.onChange(of: cr) { _ in hasChanges = true }
                 }
+            }
 
-                Divider()
-
+            VStack {
                 Toggle(isOn: $indefinite) {
                     Text("Enable Indefinitely")
                 }.onChange(of: indefinite) { _ in hasChanges = true }
@@ -214,9 +214,9 @@ struct EditOverrideForm: View {
                         Text("min").foregroundColor(.secondary)
                     }
                 }
+            }
 
-                Divider()
-
+            VStack {
                 Toggle(isOn: $target_override) {
                     Text("Override Override Target")
                 }.onChange(of: target_override) { _ in
@@ -237,16 +237,14 @@ struct EditOverrideForm: View {
                         Text(state.units.rawValue).foregroundColor(.secondary)
                     }
                 }
+            }
 
-                Divider()
-
-                Toggle(isOn: $advancedSettings) {
-                    Text("More Options")
-                }.onChange(of: advancedSettings) { _ in hasChanges = true }
-
-                if advancedSettings {
-                    Divider()
+            Toggle(isOn: $advancedSettings) {
+                Text("More Options")
+            }.onChange(of: advancedSettings) { _ in hasChanges = true }
 
+            if advancedSettings {
+                VStack {
                     Toggle(
                         isOn: Binding(
                             get: { smbIsOff },
@@ -360,10 +358,10 @@ struct EditOverrideForm: View {
                         }
                         .padding(.top)
                     }
+                }
 
-                    if !smbIsOff {
-                        Divider()
-
+                if !smbIsOff {
+                    VStack {
                         // SMB Minutes Picker
                         VStack {
                             HStack {