Simplifying internal navigation logic

Kamaalio · Feb 28, 2024 · accaf40 · accaf40
1 parent b3f4645
commit accaf40
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 21 deletions.
diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
@@ -129,6 +129,16 @@
                ReferencedContainer = "container:..">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "KamaalCloudTests"
+               BuildableName = "KamaalCloudTests"
+               BlueprintName = "KamaalCloudTests"
+               ReferencedContainer = "container:..">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/Example/Example/Screens.swift b/Example/Example/Screens.swift
@@ -8,6 +8,8 @@
 import SwiftUI
 import KamaalNavigation
 
+typealias AppNavigator = Navigator<Screens>
+
 enum Screens: Hashable, Codable, CaseIterable, NavigatorStackValue {
     case home
     case other

diff --git a/Example/Example/Views/Screens/HomeScreen.swift b/Example/Example/Views/Screens/HomeScreen.swift
@@ -17,7 +17,7 @@ private let logger = KamaalLogger(from: HomeScreen.self)
 struct HomeScreen: View {
     @Environment(\.colorScheme) private var colorScheme
 
-    @EnvironmentObject private var navigator: Navigator<Screens>
+    @EnvironmentObject private var navigator: AppNavigator
 
     @StateObject private var popUpManager = KPopUpManager()
 

diff --git a/Sources/KamaalNavigation/Views/Supporting Views/StackNavigationBackButton.swift b/Sources/KamaalNavigation/Views/Supporting Views/StackNavigationBackButton.swift
@@ -8,24 +8,16 @@
 import SwiftUI
 
 public struct StackNavigationBackButton<Destination: NavigatorStackValue, Content: View>: View {
-    @Environment(\.presentationMode) private var presentationMode
-
     @EnvironmentObject private var navigator: Navigator<Destination>
 
     let content: () -> Content
 
-    public init(screenType _: Destination.Type, content: @escaping () -> Content) {
+    public init(screenType _: Destination.Type, @ViewBuilder content: @escaping () -> Content) {
         self.content = content
     }
 
     public var body: some View {
-        Button(action: {
-            #if os(macOS)
-            self.navigator.goBack()
-            #else
-            self.presentationMode.wrappedValue.dismiss()
-            #endif
-        }) {
+        Button(action: { self.navigator.goBack() }) {
             self.content()
         }
     }

diff --git a/Sources/KamaalNavigation/Views/Supporting Views/StackNavigationChangeStackButton.swift b/Sources/KamaalNavigation/Views/Supporting Views/StackNavigationChangeStackButton.swift
@@ -13,10 +13,7 @@ public struct StackNavigationChangeStackButton<Content: View, Destination: Navig
     let destination: Destination
     let content: () -> Content
 
-    public init(
-        destination: Destination,
-        @ViewBuilder content: @escaping () -> Content
-    ) {
+    public init(destination: Destination, @ViewBuilder content: @escaping () -> Content) {
         self.destination = destination
         self.content = content
     }

diff --git a/Sources/KamaalNavigation/Views/Supporting Views/StackNavigationLink.swift b/Sources/KamaalNavigation/Views/Supporting Views/StackNavigationLink.swift
@@ -19,15 +19,9 @@ public struct StackNavigationLink<Content: View, Destination: NavigatorStackValu
     }
 
     public var body: some View {
-        #if os(macOS)
         Button(action: { self.navigator.navigate(to: self.destination) }) {
             self.content()
         }
-        #else
-        NavigationLink(value: self.destination) {
-            self.content()
-        }
-        #endif
     }
 }