From 9105f3b8f06753f16f49454e4061e5efe723b0a8 Mon Sep 17 00:00:00 2001
From: Kenta Kubo <601636+kkk669@users.noreply.github.com>
Date: Fri, 16 Oct 2020 01:42:53 +0900
Subject: [PATCH] Add the feature to delete or reorder DNS servers

---
 DNSecure/DetailView.swift | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/DNSecure/DetailView.swift b/DNSecure/DetailView.swift
index 03d919b..2bc7189 100644
--- a/DNSecure/DetailView.swift
+++ b/DNSecure/DetailView.swift
@@ -28,7 +28,9 @@ extension DetailView: View {
             switch self.server.configuration {
             case var .dnsOverTLS(configuration):
                 Section(
-                    header: Text("Servers"),
+                    header: EditButton()
+                        .frame(maxWidth: .infinity, alignment: .trailing)
+                        .overlay(Text("Servers"), alignment: .leading),
                     footer: Text("The DNS server IP addresses.")
                 ) {
                     ForEach(0..<configuration.servers.count, id: \.self) { i in
@@ -47,6 +49,14 @@ extension DetailView: View {
                         .autocapitalization(.none)
                         .disableAutocorrection(true)
                     }
+                    .onDelete {
+                        configuration.servers.remove(atOffsets: $0)
+                        self.server.configuration = .dnsOverTLS(configuration)
+                    }
+                    .onMove {
+                        configuration.servers.move(fromOffsets: $0, toOffset: $1)
+                        self.server.configuration = .dnsOverTLS(configuration)
+                    }
                     Button("Add New Server") {
                         configuration.servers.append("")
                         self.server.configuration = .dnsOverTLS(configuration)
@@ -82,7 +92,9 @@ extension DetailView: View {
                 }
             case var .dnsOverHTTPS(configuration):
                 Section(
-                    header: Text("Servers"),
+                    header: EditButton()
+                        .frame(maxWidth: .infinity, alignment: .trailing)
+                        .overlay(Text("Servers"), alignment: .leading),
                     footer: Text("The DNS server IP addresses.")
                 ) {
                     ForEach(0..<configuration.servers.count, id: \.self) { i in
@@ -101,6 +113,14 @@ extension DetailView: View {
                         .autocapitalization(.none)
                         .disableAutocorrection(true)
                     }
+                    .onDelete {
+                        configuration.servers.remove(atOffsets: $0)
+                        self.server.configuration = .dnsOverHTTPS(configuration)
+                    }
+                    .onMove {
+                        configuration.servers.move(fromOffsets: $0, toOffset: $1)
+                        self.server.configuration = .dnsOverHTTPS(configuration)
+                    }
                     Button("Add New Server") {
                         configuration.servers.append("")
                         self.server.configuration = .dnsOverHTTPS(configuration)