Merge pull request #121 from kkebo/refine-ruleview

feat: refine `RuleView`

Author: kkebo

DNSecure.xcodeproj/project.pbxproj

@@ -188,7 +188,9 @@ extension ContentView: View {
             if self.selection == -1 {
                 HowToActivateView()
             } else if let i = self.selection {
-                self.detailView(at: i)
+                NavigationStack {
+                    self.detailView(at: i)
+                }
             } else if !self.isEnabled {
                 HowToActivateView()
             } else {

DNSecure/Views/ContentView.swift

@@ -0,0 +1,46 @@
+import NetworkExtension
+import SwiftUI
+
+struct DNSSearchDomainMatchView {
+    @Binding var rule: OnDemandRule
+}
+
+extension DNSSearchDomainMatchView: View {
+    var body: some View {
+        Form {
+            Section {
+                ForEach(0..<self.rule.dnsSearchDomainMatch.count, id: \.self) { i in
+                    LazyTextField(
+                        "Search Domain",
+                        // self.$rule.dnsSearchDomainMatch[i] causes crash on deletion
+                        text: .init(
+                            get: { self.rule.dnsSearchDomainMatch[i] },
+                            set: { self.rule.dnsSearchDomainMatch[i] = $0 }
+                        )
+                    )
+                }
+                .onDelete { self.rule.dnsSearchDomainMatch.remove(atOffsets: $0) }
+                .onMove { self.rule.dnsSearchDomainMatch.move(fromOffsets: $0, toOffset: $1) }
+                Button("Add DNS Search Domain") {
+                    self.rule.dnsSearchDomainMatch.append("")
+                }
+            } footer: {
+                Text(
+                    "If the current default search domain is equal to one of the strings in this array and all of the other conditions in the rule match, then the rule matches."
+                )
+            }
+        }
+        .navigationTitle("DNS Search Domain Match")
+        .toolbar {
+            EditButton()
+        }
+    }
+}
+
+@available(iOS 17, *)
+#Preview {
+    @Previewable @State var rule = OnDemandRule(name: "Preview Rule")
+    NavigationStack {
+        DNSSearchDomainMatchView(rule: $rule)
+    }
+}

DNSecure/Views/DNSSearchDomainMatchView.swift

@@ -0,0 +1,46 @@
+import NetworkExtension
+import SwiftUI
+
+struct DNSServerAddressMatchView {
+    @Binding var rule: OnDemandRule
+}
+
+extension DNSServerAddressMatchView: View {
+    var body: some View {
+        Form {
+            Section {
+                ForEach(0..<self.rule.dnsServerAddressMatch.count, id: \.self) { i in
+                    LazyTextField(
+                        "IP Address",
+                        // self.$rule.dnsServerAddressMatch[i] causes crash on deletion
+                        text: .init(
+                            get: { self.rule.dnsServerAddressMatch[i] },
+                            set: { self.rule.dnsServerAddressMatch[i] = $0 }
+                        )
+                    )
+                }
+                .onDelete { self.rule.dnsServerAddressMatch.remove(atOffsets: $0) }
+                .onMove { self.rule.dnsServerAddressMatch.move(fromOffsets: $0, toOffset: $1) }
+                Button("Add DNS Server Address") {
+                    self.rule.dnsServerAddressMatch.append("")
+                }
+            } footer: {
+                Text(
+                    "If each of the current default DNS servers is equal to one of the strings in this array and all of the other conditions in the rule match, then the rule matches."
+                )
+            }
+        }
+        .navigationTitle("DNS Server Address Match")
+        .toolbar {
+            EditButton()
+        }
+    }
+}
+
+@available(iOS 17, *)
+#Preview {
+    @Previewable @State var rule = OnDemandRule(name: "Preview Rule")
+    NavigationStack {
+        DNSServerAddressMatchView(rule: $rule)
+    }
+}

DNSecure/Views/DNSServerAddressMatchView.swift

@@ -22,53 +22,6 @@ struct DetailView {
 @MainActor
 extension DetailView: View {
     var body: some View {
-        if #available(iOS 16, *) {
-            self.modernBody
-        } else {
-            self.legacyBody
-        }
-    }
-
-    @available(iOS 16, *)
-    private var modernBody: some View {
-        NavigationStack {
-            Form {
-                Section {
-                    Toggle("Use This Server", isOn: self.$isOn)
-                }
-                Section("Name") {
-                    LazyTextField("Name", text: self.$server.name)
-                }
-                self.serverConfigurationSections
-                Section {
-                    ForEach(self.server.onDemandRules) { rule in
-                        NavigationLink(rule.name, value: rule.id)
-                    }
-                    .onDelete { self.server.onDemandRules.remove(atOffsets: $0) }
-                    .onMove { self.server.onDemandRules.move(fromOffsets: $0, toOffset: $1) }
-                    Button("Add New Rule") {
-                        self.server.onDemandRules
-                            .append(OnDemandRule(name: "New Rule"))
-                    }
-                } header: {
-                    EditButton()
-                        .frame(maxWidth: .infinity, alignment: .trailing)
-                        .overlay(alignment: .leading) {
-                            Text("On Demand Rules")
-                        }
-                }
-            }
-            .navigationDestination(for: UUID.self) { id in
-                // When RuleView is opened and tap another server on the sidebar, the previous server's rule comes here.
-                if self.server.onDemandRules.map(\.id).contains(id) {
-                    RuleView(rule: self.binding(for: id))
-                }
-            }
-        }
-        .navigationTitle(self.server.name)
-    }
-
-    private var legacyBody: some View {
         Form {
             Section {
                 Toggle("Use This Server", isOn: self.$isOn)

DNSecure/Views/DetailView.swift

@@ -0,0 +1,35 @@
+import NetworkExtension
+import SwiftUI
+
+struct InterfaceTypeMatchView {
+    @Binding var rule: OnDemandRule
+}
+
+extension InterfaceTypeMatchView: View {
+    var body: some View {
+        Form {
+            Section {
+                Picker("Interface Type", selection: self.$rule.interfaceType) {
+                    ForEach(NEOnDemandRuleInterfaceType.allCases, id: \.self) {
+                        Text($0.description)
+                    }
+                }
+                .pickerStyle(.inline)
+                .labelsHidden()
+            } footer: {
+                Text(
+                    "If the current primary network interface is of this type and all of the other conditions in the rule match, then the rule matches."
+                )
+            }
+        }
+        .navigationTitle("Interface Type Match")
+    }
+}
+
+@available(iOS 17, *)
+#Preview {
+    @Previewable @State var rule = OnDemandRule(name: "Preview Rule")
+    NavigationStack {
+        InterfaceTypeMatchView(rule: $rule)
+    }
+}

DNSecure/Views/InterfaceTypeMatchView.swift

@@ -0,0 +1,36 @@
+import NetworkExtension
+import SwiftUI
+
+struct ProbeURLView {
+    @Binding var rule: OnDemandRule
+
+    private var probeURL: Binding<String> {
+        .init(
+            get: { self.rule.probeURL?.absoluteString ?? "" },
+            set: { self.rule.probeURL = URL(string: $0) }
+        )
+    }
+}
+
+extension ProbeURLView: View {
+    var body: some View {
+        Form {
+            Section {
+                LazyTextField("Probe URL", text: self.probeURL)
+            } footer: {
+                Text(
+                    "If a request sent to this URL results in a HTTP 200 OK response and all of the other conditions in the rule match, then the rule matches. If you don't want to use this rule, leave it empty."
+                )
+            }
+        }
+        .navigationTitle("Probe URL")
+    }
+}
+
+@available(iOS 17, *)
+#Preview {
+    @Previewable @State var rule = OnDemandRule(name: "Preview Rule")
+    NavigationStack {
+        ProbeURLView(rule: $rule)
+    }
+}