From caf33b9ce1e3252d87873d060790501a658855e1 Mon Sep 17 00:00:00 2001 From: Kenta Kubo <601636+kkebo@users.noreply.github.com> Date: Wed, 3 Sep 2025 00:29:20 +0900 Subject: [PATCH] fix: fix iOS 16 issue --- DNSecure/Views/ContentView.swift | 4 ++- DNSecure/Views/DetailView.swift | 47 -------------------------------- 2 files changed, 3 insertions(+), 48 deletions(-) diff --git a/DNSecure/Views/ContentView.swift b/DNSecure/Views/ContentView.swift index 904d5a7..c1fce01 100644 --- a/DNSecure/Views/ContentView.swift +++ b/DNSecure/Views/ContentView.swift @@ -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 { diff --git a/DNSecure/Views/DetailView.swift b/DNSecure/Views/DetailView.swift index 56782b3..29c4c5f 100644 --- a/DNSecure/Views/DetailView.swift +++ b/DNSecure/Views/DetailView.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)