Navigating without providing next view

Kamaalio · Feb 26, 2024 · fea0e65 · fea0e65
1 parent 19fbf56
commit fea0e65
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 35 deletions.
diff --git a/Example/Example/ContentView.swift b/Example/Example/ContentView.swift
@@ -12,7 +12,7 @@ struct ContentView: View {
     var body: some View {
         NavigationStackView(
             stack: [] as [Screens],
-            root: { screen in MainView(screen: screen) },
+            root: { screen in MainView(screen: screen, displayMode: .large) },
             subView: { screen in MainView(screen: screen, displayMode: .inline) },
             sidebar: { Sidebar() }
         )

diff --git a/Example/Example/Screens.swift b/Example/Example/Screens.swift
@@ -5,6 +5,7 @@
 //  Created by Kamaal M Farah on 23/04/2023.
 //
 
+import SwiftUI
 import KamaalNavigation
 
 enum Screens: Hashable, Codable, CaseIterable, NavigatorStackValue {
@@ -62,5 +63,9 @@ enum Screens: Hashable, Codable, CaseIterable, NavigatorStackValue {
         }
     }
 
+    func view(_ isSub: Bool) -> some View {
+        MainView(screen: self, displayMode: isSub ? .inline : .large)
+    }
+
     static let root: Screens = .home
 }
diff --git a/Example/Example/Views/Screens/CoreDataScreen.swift b/Example/Example/Views/Screens/CoreDataScreen.swift
@@ -22,10 +22,7 @@ struct CoreDataScreen: View {
                     EmptyItemsView(itemName: "items")
                 }
                 ForEach(self.items, id: \.id) { item in
-                    StackNavigationLink(
-                        destination: Screens.coreDataChild(parentID: item.id),
-                        nextView: { screen in MainView(screen: screen) }
-                    ) {
+                    StackNavigationLink(destination: Screens.coreDataChild(parentID: item.id)) {
                         TimestampView(time: item.timestamp)
                             .foregroundColor(.accentColor)
                     }

diff --git a/Example/Example/Views/Screens/HomeScreen.swift b/Example/Example/Views/Screens/HomeScreen.swift
@@ -49,16 +49,10 @@ struct HomeScreen: View {
             }) {
                 Text("Hud popup")
             }
-            StackNavigationLink(
-                destination: Screens.coreData,
-                nextView: { screen in MainView(screen: screen, displayMode: .inline) }
-            ) {
+            StackNavigationLink(destination: Screens.coreData) {
                 Text("Go to core data screen")
             }
-            StackNavigationLink(
-                destination: Screens.other,
-                nextView: { screen in MainView(screen: screen, displayMode: .inline) }
-            ) {
+            StackNavigationLink(destination: Screens.other) {
                 Text("Go to other screen")
             }
         }

diff --git a/Example/Example/Views/SupportingViews/MainView.swift b/Example/Example/Views/SupportingViews/MainView.swift
@@ -14,7 +14,7 @@ struct MainView: View {
     let screen: Screens
     let displayMode: DisplayMode
 
-    init(screen: Screens, displayMode: DisplayMode = .large) {
+    init(screen: Screens, displayMode: DisplayMode) {
         self.screen = screen
         self.displayMode = displayMode
     }
@@ -40,6 +40,6 @@ struct MainView: View {
 
 struct MainView_Previews: PreviewProvider {
     static var previews: some View {
-        MainView(screen: .home)
+        MainView(screen: .home, displayMode: .large)
     }
 }
diff --git a/Sources/KamaalNavigation/Protocols/NavigatorStackValue.swift b/Sources/KamaalNavigation/Protocols/NavigatorStackValue.swift
@@ -5,13 +5,20 @@
 //  Created by Kamaal M Farah on 04/01/2023.
 //
 
-import Foundation
+import SwiftUI
+import KamaalUI
 
 public protocol NavigatorStackValue: Codable, Hashable, CaseIterable {
+    associatedtype ScreenView: SwiftUI.View
+
     var isTabItem: Bool { get }
     var imageSystemName: String { get }
     var title: String { get }
 
+    @ViewBuilder
+    @MainActor
+    func view(_ isSub: Bool) -> Self.ScreenView
+
     static var root: Self { get }
 }
 
@@ -25,6 +32,15 @@ enum PreviewScreenType: NavigatorStackValue, Equatable {
     var imageSystemName: String { "person" }
     var title: String { "Screen" }
 
+    func view(_ isSub: Bool) -> some View {
+        KJustStack {
+            switch self {
+            case .screen: Text("Screen").navigationTitle(title: "Screen", displayMode: isSub ? .inline : .large)
+            case .sub: Text("Sub").navigationTitle(title: "Sub", displayMode: isSub ? .inline : .large)
+            }
+        }
+    }
+
     static let root: Self = .screen
 }
 #endif
diff --git a/Sources/KamaalNavigation/Views/Supporting Views/StackNavigationLink.swift b/Sources/KamaalNavigation/Views/Supporting Views/StackNavigationLink.swift
@@ -7,20 +7,14 @@
 
 import SwiftUI
 
-public struct StackNavigationLink<Content: View, NextView: View, Destination: NavigatorStackValue>: View {
+public struct StackNavigationLink<Content: View, Destination: NavigatorStackValue>: View {
     @EnvironmentObject private var navigator: Navigator<Destination>
 
     let destination: Destination
-    let nextView: (Destination) -> NextView
     let content: () -> Content
 
-    public init(
-        destination: Destination,
-        @ViewBuilder nextView: @escaping (Destination) -> NextView,
-        @ViewBuilder content: @escaping () -> Content
-    ) {
+    public init(destination: Destination, @ViewBuilder content: @escaping () -> Content) {
         self.destination = destination
-        self.nextView = nextView
         self.content = content
     }
 
@@ -30,7 +24,7 @@ public struct StackNavigationLink<Content: View, NextView: View, Destination: Na
             self.content()
         }
         #else
-        NavigationLink(destination: { self.nextView(self.destination) }) {
+        NavigationLink(destination: { self.destination.view(true) }) {
             self.content()
         }
         #endif
@@ -40,7 +34,7 @@ public struct StackNavigationLink<Content: View, NextView: View, Destination: Na
 #if DEBUG
 struct StackNavigationLink_Previews: PreviewProvider {
     static var previews: some View {
-        StackNavigationLink(destination: PreviewScreenType.screen, nextView: { _ in Text("s") }) {
+        StackNavigationLink(destination: PreviewScreenType.screen) {
             Text("Link")
         }
     }

diff --git a/Sources/KamaalSettings/Internal/Enumerations/ScreenSelection.swift b/Sources/KamaalSettings/Internal/Enumerations/ScreenSelection.swift
@@ -5,7 +5,7 @@
 //  Created by Kamaal M Farah on 25/12/2022.
 //
 
-import Foundation
+import SwiftUI
 import KamaalNavigation
 
 enum ScreenSelection: Codable, Hashable, CaseIterable, NavigatorStackValue {
@@ -47,6 +47,10 @@ enum ScreenSelection: Codable, Hashable, CaseIterable, NavigatorStackValue {
         }
     }
 
+    func view(_ isSub: Bool) -> some View {
+        MainView(screen: self).navigationTitle(title: self.title, displayMode: isSub ? .inline : .large)
+    }
+
     static var allCases: [ScreenSelection] {
         [
             .acknowledgements,

diff --git a/Sources/KamaalSettings/Internal/Views/SupportingViews/Rows/NavigationLinkRow.swift b/Sources/KamaalSettings/Internal/Views/SupportingViews/Rows/NavigationLinkRow.swift
@@ -23,14 +23,7 @@ struct NavigationLinkRow<Value: View>: View {
     }
 
     var body: some View {
-        StackNavigationLink(
-            destination: self.destination,
-            nextView: { screen in
-                MainView(screen: screen)
-                    .environment(\.settingsConfiguration, self.settingsConfiguration)
-                    .environmentObject(self.store)
-            }
-        ) {
+        StackNavigationLink(destination: self.destination) {
             self.valueView
         }
         .buttonStyle(.plain)