From 7506ff3225a4e5b4a2e73c3c97f6b124201042c8 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Mon, 21 Dec 2020 17:46:18 -0500
Subject: [PATCH] Fix Preferences Done button not working

---
 Gemini-iOS/BrowserNavigationController.swift              | 2 +-
 Gemini-iOS/PreferencesView.swift                          | 8 ++++----
 Gemini-iOS/TableOfContentsView.swift                      | 2 +-
 .../xcschemes/xcschememanagement.plist                    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemini-iOS/BrowserNavigationController.swift b/Gemini-iOS/BrowserNavigationController.swift
index 62eaa00..881846e 100644
--- a/Gemini-iOS/BrowserNavigationController.swift
+++ b/Gemini-iOS/BrowserNavigationController.swift
@@ -309,7 +309,7 @@ class BrowserNavigationController: UIViewController {
     }
     
     private func showPreferences() {
-        let host = UIHostingController(rootView: PreferencesView())
+        let host = UIHostingController(rootView: PreferencesView(dismiss: { self.dismiss(animated: true) }))
         present(host, animated: true)
     }
 
diff --git a/Gemini-iOS/PreferencesView.swift b/Gemini-iOS/PreferencesView.swift
index c658822..89904aa 100644
--- a/Gemini-iOS/PreferencesView.swift
+++ b/Gemini-iOS/PreferencesView.swift
@@ -8,9 +8,9 @@
 import SwiftUI
 
 struct PreferencesView: View {
-    @ObservedObject var preferences: Preferences = .shared
+    let dismiss: () -> Void
     
-    @Environment(\.presentationMode) @Binding var presentationMode: PresentationMode
+    @ObservedObject var preferences: Preferences = .shared
     
     var body: some View {
         NavigationView {
@@ -31,7 +31,7 @@ struct PreferencesView: View {
     
     private var doneButton: some View {
         Button(action: {
-            presentationMode.dismiss()
+            dismiss()
         }, label: {
             Text("Done")
         })
@@ -73,6 +73,6 @@ struct PreferencesView_Previews: PreviewProvider {
     @State static var presented = true
     
     static var previews: some View {
-        PreferencesView()
+        PreferencesView(dismiss: {})
     }
 }
diff --git a/Gemini-iOS/TableOfContentsView.swift b/Gemini-iOS/TableOfContentsView.swift
index 32cedf9..a848afc 100644
--- a/Gemini-iOS/TableOfContentsView.swift
+++ b/Gemini-iOS/TableOfContentsView.swift
@@ -42,7 +42,7 @@ struct TableOfContentsView: View {
             }
             .listStyle(PlainListStyle())
             .navigationBarTitle("Table of Contents", displayMode: .inline)
-            .navigationBarItems(trailing: Button("Done", action: {
+            .navigationBarItems(leading: Button("Cancel", action: {
                 close(nil)
             }))
         }
diff --git a/Gemini.xcodeproj/xcuserdata/shadowfacts.xcuserdatad/xcschemes/xcschememanagement.plist b/Gemini.xcodeproj/xcuserdata/shadowfacts.xcuserdatad/xcschemes/xcschememanagement.plist
index 6f8d461..b8da17f 100644
--- a/Gemini.xcodeproj/xcuserdata/shadowfacts.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Gemini.xcodeproj/xcuserdata/shadowfacts.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>BrowserCore.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>3</integer>
 		</dict>
 		<key>Gemini-iOS.xcscheme_^#shared#^_</key>
 		<dict>
@@ -32,7 +32,7 @@
 		<key>GeminiRenderer.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>5</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>