Reuse modifier for navigation stacks with close button (#861)

Refactored:

- iOS
  - VPNProviderServerView
- macOS
  - AboutView
  - ProfileSplitView
- Both
  - ProfileCoordinator
  - VPNProviderServerCoordinator

.github/workflows/release.yml

@@ -20,7 +20,7 @@ concurrency:
 jobs:
   run_tests:
     name: Run tests
-    runs-on: macos-14
+    runs-on: macos-15
     timeout-minutes: 15
     steps:
       - uses: passepartoutvpn/action-prepare-xcode-build@master
@@ -30,7 +30,7 @@ jobs:
           bundle exec fastlane test
   build_upload:
     name: Upload to ASC
-    runs-on: macos-14
+    runs-on: macos-15
     needs: run_tests
     strategy:
       fail-fast: true

.github/workflows/test.yml

@@ -17,7 +17,7 @@ concurrency:
 jobs:
   run_swift_tests:
     name: Run SwiftPM tests
-    runs-on: macos-14
+    runs-on: macos-15
     timeout-minutes: 10
     steps:
       - uses: passepartoutvpn/action-prepare-xcode-build@master

Passepartout/Library/Sources/AppUIMain/Views/About/iOS/AboutRouterView+iOS.swift

@@ -30,23 +30,13 @@ import SwiftUI
 
 extension AboutRouterView {
     var body: some View {
-        NavigationStack(path: $path) {
         AboutView(
             profileManager: profileManager,
             navigationRoute: $navigationRoute
         )
-            .toolbar {
-                ToolbarItem(placement: .cancellationAction) {
-                    Button {
-                        dismiss()
-                    } label: {
-                        ThemeImage(.close)
-                    }
-                }
-            }
         .navigationDestination(for: NavigationRoute.self, destination: pushDestination)
         .themeNavigationDetail()
-        }
+        .themeNavigationStack(closable: true, path: $path)
     }
 }
 

Passepartout/Library/Sources/AppUIMain/Views/About/macOS/AboutRouterView+macOS.swift

@@ -36,10 +36,9 @@ extension AboutRouterView {
                 navigationRoute: $navigationRoute
             )
         } detail: {
-            NavigationStack(path: $path) {
             pushDestination(for: navigationRoute)
                 .navigationDestination(for: NavigationRoute.self, destination: pushDestination)
-            }
+                .themeNavigationStack(closable: false, path: $path)
                 .toolbar {
                     ToolbarItem(placement: .confirmationAction) {
                         Button(Strings.Global.ok) {

Passepartout/Library/Sources/AppUIMain/Views/Profile/macOS/ProfileSplitView+macOS.swift

@@ -55,7 +55,7 @@ struct ProfileSplitView: View, Routable {
                 flow: flow
             )
         } detail: {
-            NavigationStack(path: $detailPath) {
+            Group {
                 switch selectedModuleId {
                 case ModuleListView.generalModuleId:
                     detailView(for: .general)
@@ -64,6 +64,7 @@ struct ProfileSplitView: View, Routable {
                     detailView(for: .module(id: selectedModuleId))
                 }
             }
+            .themeNavigationStack(path: $detailPath)
             .toolbar(content: toolbarContent)
             .environment(\.navigationPath, $detailPath)
         }

Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerCoordinator.swift

@@ -44,7 +44,6 @@ struct VPNProviderServerCoordinator<Configuration>: View where Configuration: Pr
     let onSelect: (VPNEntity<Configuration>) async throws -> Void
 
     var body: some View {
-        NavigationStack {
         VPNProviderServerView(
             moduleId: moduleId,
             providerId: providerId,
@@ -53,16 +52,7 @@ struct VPNProviderServerCoordinator<Configuration>: View where Configuration: Pr
             filtersWithSelection: false,
             onSelect: onSelect
         )
-            .toolbar {
-                ToolbarItem(placement: .cancellationAction) {
-                    Button {
-                        dismiss()
-                    } label: {
-                        ThemeCloseLabel()
-                    }
-                }
-            }
-        }
+        .themeNavigationStack(closable: true)
     }
 }
 

Passepartout/Library/Sources/AppUIMain/Views/Provider/iOS/VPNProviderServerView+iOS.swift

@@ -79,7 +79,7 @@ private extension VPNProviderServerView {
                             Button {
                                 isPresented = false
                             } label: {
-                                ThemeImage(.close)
+                                ThemeCloseLabel()
                             }
                         }
                     }

Passepartout/Library/Sources/AppUIMain/Views/Settings/SettingsView.swift

@@ -44,7 +44,7 @@ public struct SettingsView: View {
         .navigationTitle(Strings.Global.settings)
 #if os(iOS)
         .themeNavigationDetail()
-        .themeNavigationStack(if: true, closable: true, path: $path)
+        .themeNavigationStack(closable: true, path: $path)
 #endif
     }
 }

Passepartout/Library/Sources/UILibrary/Theme/UI/Theme+Modifiers.swift

@@ -75,8 +75,24 @@ extension View {
         ))
     }
 
-    public func themeNavigationStack(if condition: Bool, closable: Bool = false, path: Binding<NavigationPath>) -> some View {
-        modifier(ThemeNavigationStackModifier(condition: condition, closable: closable, path: path))
+    public func themeNavigationStack(
+        closable: Bool = false,
+        path: Binding<NavigationPath> = .constant(NavigationPath())
+    ) -> some View {
+        modifier(ThemeNavigationStackModifier(closable: closable, path: path))
+    }
+
+    @ViewBuilder
+    public func themeNavigationStack(
+        if condition: Bool,
+        closable: Bool = false,
+        path: Binding<NavigationPath> = .constant(NavigationPath())
+    ) -> some View {
+        if condition {
+            modifier(ThemeNavigationStackModifier(closable: closable, path: path))
+        } else {
+            self
+        }
     }
 
     public func themeForm() -> some View {
@@ -269,15 +285,12 @@ struct ThemeNavigationStackModifier: ViewModifier {
     @Environment(\.dismiss)
     private var dismiss
 
-    let condition: Bool
-
     let closable: Bool
 
     @Binding
     var path: NavigationPath
 
     func body(content: Content) -> some View {
-        if condition {
         NavigationStack(path: $path) {
             content
                 .toolbar {
@@ -292,9 +305,6 @@ struct ThemeNavigationStackModifier: ViewModifier {
                     }
                 }
         }
-        } else {
-            content
-        }
     }
 }