From 7be92ee8afce415eae656839c47a5ecc13b849aa Mon Sep 17 00:00:00 2001
From: Kenta Kubo <601636+kkk669@users.noreply.github.com>
Date: Tue, 25 Apr 2023 02:37:12 +0900
Subject: [PATCH] Change alignment of TextFields from trailing to leading

---
 DNSecure/Views/DetailView.swift  | 16 +++-------
 DNSecure/Views/DoHSections.swift | 51 ++++++++++----------------------
 DNSecure/Views/DoTSections.swift | 48 ++++++++++--------------------
 DNSecure/Views/RuleView.swift    | 25 +++++++---------
 4 files changed, 46 insertions(+), 94 deletions(-)

diff --git a/DNSecure/Views/DetailView.swift b/DNSecure/Views/DetailView.swift
index 588adec..f9f37ea 100644
--- a/DNSecure/Views/DetailView.swift
+++ b/DNSecure/Views/DetailView.swift
@@ -35,12 +35,8 @@ extension DetailView: View {
                 Section {
                     Toggle("Use This Server", isOn: self.$isOn)
                 }
-                Section {
-                    HStack {
-                        Text("Name")
-                        TextField("Name", text: self.$server.name)
-                            .multilineTextAlignment(.trailing)
-                    }
+                Section("Name") {
+                    TextField("Name", text: self.$server.name)
                 }
                 self.serverConfigurationSections
                 Section {
@@ -76,12 +72,8 @@ extension DetailView: View {
             Section {
                 Toggle("Use This Server", isOn: self.$isOn)
             }
-            Section {
-                HStack {
-                    Text("Name")
-                    TextField("Name", text: self.$server.name)
-                        .multilineTextAlignment(.trailing)
-                }
+            Section("Name") {
+                TextField("Name", text: self.$server.name)
             }
             self.serverConfigurationSections
             Section {
diff --git a/DNSecure/Views/DoHSections.swift b/DNSecure/Views/DoHSections.swift
index 25bbc0f..8c2a7d8 100644
--- a/DNSecure/Views/DoHSections.swift
+++ b/DNSecure/Views/DoHSections.swift
@@ -15,20 +15,11 @@ extension DoHSections: View {
     var body: some View {
         Section {
             ForEach(0..<self.configuration.servers.count, id: \.self) { i in
-                TextField(
-                    "IP address",
-                    text: .init(
-                        get: { self.configuration.servers[i] },
-                        set: {
-                            self.configuration.servers[i] = $0
-                                .trimmingCharacters(in: .whitespacesAndNewlines)
-                        }
-                    )
-                )
-                .textContentType(.URL)
-                .keyboardType(.numbersAndPunctuation)
-                .textInputAutocapitalization(.never)
-                .autocorrectionDisabled()
+                TextField("IP address", text: self.$configuration.servers[i])
+                    .textContentType(.URL)
+                    .keyboardType(.numbersAndPunctuation)
+                    .textInputAutocapitalization(.never)
+                    .autocorrectionDisabled()
             }
             .onDelete { self.configuration.servers.remove(atOffsets: $0) }
             .onMove { self.configuration.servers.move(fromOffsets: $0, toOffset: $1) }
@@ -45,29 +36,19 @@ extension DoHSections: View {
             Text("The DNS server IP addresses.")
         }
         Section {
-            HStack {
-                Text("Server URL")
-                TextField(
-                    "Server URL",
-                    text: .init(
-                        get: {
-                            self.configuration.serverURL?.absoluteString ?? ""
-                        },
-                        set: {
-                            self.configuration.serverURL = URL(
-                                string: $0.trimmingCharacters(in: .whitespacesAndNewlines)
-                            )
-                        }
-                    )
+            TextField(
+                "Server URL",
+                text: .init(
+                    get: { self.configuration.serverURL?.absoluteString ?? "" },
+                    set: { self.configuration.serverURL = URL(string: $0) }
                 )
-                .multilineTextAlignment(.trailing)
-                .textContentType(.URL)
-                .keyboardType(.URL)
-                .textInputAutocapitalization(.never)
-                .autocorrectionDisabled()
-            }
+            )
+            .textContentType(.URL)
+            .keyboardType(.URL)
+            .textInputAutocapitalization(.never)
+            .autocorrectionDisabled()
         } header: {
-            Text("DNS-over-HTTPS Settings")
+            Text("Server URL")
         } footer: {
             Text("The URL of a DNS-over-HTTPS server.")
         }
diff --git a/DNSecure/Views/DoTSections.swift b/DNSecure/Views/DoTSections.swift
index ae1495b..cccf0c4 100644
--- a/DNSecure/Views/DoTSections.swift
+++ b/DNSecure/Views/DoTSections.swift
@@ -15,20 +15,11 @@ extension DoTSections: View {
     var body: some View {
         Section {
             ForEach(0..<self.configuration.servers.count, id: \.self) { i in
-                TextField(
-                    "IP address",
-                    text: .init(
-                        get: { self.configuration.servers[i] },
-                        set: {
-                            self.configuration.servers[i] = $0
-                                .trimmingCharacters(in: .whitespacesAndNewlines)
-                        }
-                    )
-                )
-                .textContentType(.URL)
-                .keyboardType(.numbersAndPunctuation)
-                .textInputAutocapitalization(.never)
-                .autocorrectionDisabled()
+                TextField("IP address", text: self.$configuration.servers[i])
+                    .textContentType(.URL)
+                    .keyboardType(.numbersAndPunctuation)
+                    .textInputAutocapitalization(.never)
+                    .autocorrectionDisabled()
             }
             .onDelete { self.configuration.servers.remove(atOffsets: $0) }
             .onMove { self.configuration.servers.move(fromOffsets: $0, toOffset: $1) }
@@ -45,26 +36,19 @@ extension DoTSections: View {
             Text("The DNS server IP addresses.")
         }
         Section {
-            HStack {
-                Text("Server Name")
-                TextField(
-                    "Server Name",
-                    text: .init(
-                        get: { self.configuration.serverName ?? "" },
-                        set: {
-                            self.configuration.serverName = $0
-                                .trimmingCharacters(in: .whitespacesAndNewlines)
-                        }
-                    )
+            TextField(
+                "Server Name",
+                text: .init(
+                    get: { self.configuration.serverName ?? "" },
+                    set: { self.configuration.serverName = $0 }
                 )
-                .multilineTextAlignment(.trailing)
-                .textContentType(.URL)
-                .keyboardType(.URL)
-                .textInputAutocapitalization(.never)
-                .autocorrectionDisabled()
-            }
+            )
+            .textContentType(.URL)
+            .keyboardType(.URL)
+            .textInputAutocapitalization(.never)
+            .autocorrectionDisabled()
         } header: {
-            Text("DNS-over-TLS Settings")
+            Text("Server Name")
         } footer: {
             Text("The TLS name of a DNS-over-TLS server.")
         }
diff --git a/DNSecure/Views/RuleView.swift b/DNSecure/Views/RuleView.swift
index acbec70..657c529 100644
--- a/DNSecure/Views/RuleView.swift
+++ b/DNSecure/Views/RuleView.swift
@@ -15,12 +15,11 @@ struct RuleView {
 extension RuleView: View {
     var body: some View {
         Form {
+            Section("Name") {
+                TextField("Name", text: self.$rule.name)
+            }
+
             Section {
-                HStack {
-                    Text("Name")
-                    TextField("Name", text: self.$rule.name)
-                        .multilineTextAlignment(.trailing)
-                }
                 Picker("Action", selection: self.$rule.action) {
                     ForEach(NEOnDemandRuleAction.allCases, id: \.self) {
                         Text($0.description)
@@ -123,17 +122,13 @@ extension RuleView: View {
             }
 
             Section {
-                HStack {
-                    Text("Probe URL")
-                    TextField(
-                        "URL",
-                        text: .init(
-                            get: { self.rule.probeURL?.absoluteString ?? "" },
-                            set: { self.rule.probeURL = URL(string: $0) }
-                        )
+                TextField(
+                    "Probe URL",
+                    text: .init(
+                        get: { self.rule.probeURL?.absoluteString ?? "" },
+                        set: { self.rule.probeURL = URL(string: $0) }
                     )
-                    .multilineTextAlignment(.trailing)
-                }
+                )
             } header: {
                 Text("Probe URL Match")
             } footer: {