Use NavigationStack instead of NavigationView

NavigationView is deprecated now. For these use-cases, Apple recommends switching to NavigationStack instead.
monal-im · Aug 20, 2024 · ba385ff · ba385ff
1 parent 3f20882
commit ba385ff
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/Monal/Classes/AddContactMenu.swift b/Monal/Classes/AddContactMenu.swift
@@ -326,7 +326,7 @@ struct AddContactMenu: View {
             }
         })
         .sheet(isPresented: $showQRCodeScanner) {
-            NavigationView {
+            NavigationStack {
                 MLQRCodeScanner(handleClose: {
                     self.showQRCodeScanner = false
                 })

diff --git a/Monal/Classes/DebugView.swift b/Monal/Classes/DebugView.swift
@@ -196,7 +196,7 @@ struct DebugView: View {
 }
 
 #Preview {
-    NavigationView {
+    NavigationStack {
         DebugView()
     }
 }
diff --git a/Monal/Classes/EditGroupSubject.swift b/Monal/Classes/EditGroupSubject.swift
@@ -23,7 +23,7 @@ struct EditGroupSubject: View {
     }
 
     var body: some View {
-        NavigationView {
+        NavigationStack {
             VStack {
                 Form {
                     Section(header: Text("Group Description (optional)")) {

diff --git a/Monal/Classes/RegisterAccount.swift b/Monal/Classes/RegisterAccount.swift
@@ -436,7 +436,7 @@ struct RegisterAccount: View {
                                 }
                                 .frame(maxWidth: .infinity)
                                 .sheet(isPresented: $showWebView) {
-                                    NavigationView {
+                                    NavigationStack {
                                         WebView(url: termsSiteForCurrentLanguage())
                                             .navigationBarTitle(Text("Terms of \(RegisterAccount.XMPPServer[$selectedServerIndex.wrappedValue]["XMPPServer"]!)"), displayMode: .inline)
                                             .toolbar(content: {

diff --git a/Monal/Classes/SwiftuiHelpers.swift b/Monal/Classes/SwiftuiHelpers.swift
@@ -508,7 +508,7 @@ struct LazyClosureView<Content: View>: View {
     }
 }
 
-// use this to wrap a view into NavigationView, if it should be the outermost swiftui view of a new view stack
+// use this to wrap a view into NavigationStack, if it should be the outermost swiftui view of a new view stack
 struct AddTopLevelNavigation<Content: View>: View {
     let build: () -> Content
     let delegate: SheetDismisserProtocol
@@ -517,7 +517,7 @@ struct AddTopLevelNavigation<Content: View>: View {
         self.delegate = delegate
     }
     var body: some View {
-        NavigationView {
+        NavigationStack {
             build()
             .navigationBarTitleDisplayMode(.automatic)
             .navigationBarBackButtonHidden(true) // will not be shown because swiftui does not know we navigated here from UIKit
@@ -527,7 +527,6 @@ struct AddTopLevelNavigation<Content: View>: View {
                 Image(systemName: "arrow.backward")
             }.keyboardShortcut(.escape, modifiers: []))
         }
-        .navigationViewStyle(.stack)
     }
 }
 
@@ -547,11 +546,10 @@ struct UIKitWorkaround<Content: View>: View {
 #if targetEnvironment(macCatalyst)
             build().navigationBarTitleDisplayMode(.inline)
 #else
-            NavigationView {
+            NavigationStack {
                 build()
                 .navigationBarTitleDisplayMode(.automatic)
             }
-            .navigationViewStyle(.stack)
 
 #endif
         }