Updates for SwiftUI changes

rubilyn · Aug 3, 2019 · 4e5bb47 · 4e5bb47
1 parent 67871bc
commit 4e5bb47
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Client/Settings-SwiftUI/SettingsStore.swift b/Client/Settings-SwiftUI/SettingsStore.swift
@@ -10,7 +10,7 @@ import SwiftUI
 import Combine
 import UIKit
 
-class SettingsStore: BindableObject {
+class SettingsStore: ObservableObject {
     var didChange = PassthroughSubject<Void, Never>()
 
     private enum Keys {

diff --git a/Client/Settings-SwiftUI/SettingsView.swift b/Client/Settings-SwiftUI/SettingsView.swift
@@ -10,7 +10,7 @@ import SwiftUI
 
 struct SettingsView: View {
     @EnvironmentObject var settings: SettingsStore
-    @Environment(\.isPresented) private var isPresented: Binding<Bool>?
+    @Environment(\.presentationMode) private var presentationMode: Binding<PresentationMode>
 
     var body: some View {
         NavigationView {
@@ -35,7 +35,7 @@ struct SettingsView: View {
                 }
 
                 Section(header: Text("MORE")) {
-                    PresentationButton(destination: OnboardingViewControllerWrapper()) {
+                    NavigationLink(destination: OnboardingViewControllerWrapper()) {
                         Text("Show What's New")
                     }
                 }
@@ -44,7 +44,7 @@ struct SettingsView: View {
             .navigationBarItems(trailing:
                 Button(
                     action: {
-                        self.isPresented?.value = false
+                        self.presentationMode.value.dismiss()
                     },
                     label: {
                         Text("Close")