diff --git a/DNSecure/Views/ContentView.swift b/DNSecure/Views/ContentView.swift index 07a508d..55c5c9a 100644 --- a/DNSecure/Views/ContentView.swift +++ b/DNSecure/Views/ContentView.swift @@ -186,11 +186,11 @@ extension ContentView: View { } } detail: { if self.selection == -1 { - HowToActivateView(isSheet: false) + HowToActivateView() } else if let i = self.selection { self.detailView(at: i) } else if !self.isEnabled { - HowToActivateView(isSheet: false) + HowToActivateView() } else { Text("Select a server on the sidebar") .navigationBarHidden(true) @@ -223,7 +223,7 @@ extension ContentView: View { tag: -1, selection: self.$selection ) { - HowToActivateView(isSheet: false) + HowToActivateView() } } else { // Workaround for iOS 15 @@ -263,11 +263,11 @@ extension ContentView: View { } if self.selection == -1 { - HowToActivateView(isSheet: false) + HowToActivateView() } else if let i = self.selection { self.detailView(at: i) } else if !self.isEnabled { - HowToActivateView(isSheet: false) + HowToActivateView() } else { Text("Select a server on the sidebar") .navigationBarHidden(true) @@ -326,7 +326,21 @@ extension ContentView: View { self.guideIsPresented = true } .sheet(isPresented: self.$guideIsPresented) { - HowToActivateView(isSheet: true) + NavigationView { + HowToActivateView() + .safeAreaInset(edge: .bottom) { + Button("Dismiss") { + self.guideIsPresented = false + } + .buttonStyle(.borderedProminent) + .controlSize(.large) + .hoverEffect() + .padding() + .frame(maxWidth: .infinity) + .background(Color(.systemBackground)) + } + } + .navigationViewStyle(.stack) } } } diff --git a/DNSecure/Views/HowToActivateView.swift b/DNSecure/Views/HowToActivateView.swift index 1abd506..e8a918f 100644 --- a/DNSecure/Views/HowToActivateView.swift +++ b/DNSecure/Views/HowToActivateView.swift @@ -13,20 +13,13 @@ private enum MacOSVersion { } struct HowToActivateView { - @Environment(\.dismiss) private var dismiss @State private var macOSVersion: MacOSVersion = .venturaOrLater - let isSheet: Bool } extension HowToActivateView: View { var body: some View { - VStack { - if self.isSheet { - Text("How to Activate") - .font(.title) - Spacer() - } - ScrollView { + ScrollView { + VStack { #if targetEnvironment(macCatalyst) Picker("", selection: self.$macOSVersion) { Text("macOS 13 or later").tag(MacOSVersion.venturaOrLater) @@ -160,21 +153,12 @@ extension HowToActivateView: View { #endif } } - if self.isSheet { - Spacer() - Button("Dismiss") { - self.dismiss() - } - .buttonStyle(.borderedProminent) - .controlSize(.large) - .hoverEffect() - } + .padding() } - .padding() .navigationTitle("How to Activate") } } #Preview { - HowToActivateView(isSheet: true) + HowToActivateView() }