showSafari(url:) (#24)

Co-authored-by: Nick <[email protected]>
SwiftfulThinking · Aug 25, 2023 · 23149ce · 23149ce
1 parent 2fd38d6
commit 23149ce
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/Sources/SwiftfulRouting/Core/AnyRouter.swift b/Sources/SwiftfulRouting/Core/AnyRouter.swift
@@ -96,4 +96,10 @@ public struct AnyRouter: Router {
     public func dismissModal() {
         object.dismissModal()
     }
+
+    /// Open URL in Safari app. To open url in in-app browser, use showSheet with a WebView.
+    public func showSafari(_ url: @escaping () -> URL) {
+        object.showSafari(url)
+    }
+
 }
diff --git a/Sources/SwiftfulRouting/Core/Router.swift b/Sources/SwiftfulRouting/Core/Router.swift
@@ -28,4 +28,6 @@ public protocol Router {
 
     func showModal<V:View>(transition: AnyTransition, animation: Animation, alignment: Alignment, backgroundColor: Color?, backgroundEffect: BackgroundEffect?, useDeviceBounds: Bool, @ViewBuilder destination: @escaping () -> V)
     func dismissModal()
+
+    func showSafari(_ url: @escaping () -> URL)
 }
diff --git a/Sources/SwiftfulRouting/Core/RouterView.swift b/Sources/SwiftfulRouting/Core/RouterView.swift
@@ -33,6 +33,8 @@ struct OnFirstAppearModifier: ViewModifier {
 public struct RouterView<T:View>: View, Router {
 
     @Environment(\.presentationMode) var presentationMode
+    @Environment(\.openURL) var openURL
+
     let addNavigationView: Bool
     let content: (AnyRouter) -> T
 
@@ -41,11 +43,7 @@ public struct RouterView<T:View>: View, Router {
     @State public var screens: [AnyDestination] = []
 
     // Binding to view stack from previous RouterViews
-    @Binding private var screenStack: [AnyDestination] {
-        didSet {
-            print("DID SET SCREEN STACK: \(screenStack.map({ $0.destination }))")
-        }
-    }
+    @Binding private var screenStack: [AnyDestination]
     @State private var screenStackCount: Int = 0
 
     // Configuration for resizable sheet on iOS 16+
@@ -205,6 +203,10 @@ public struct RouterView<T:View>: View, Router {
     public func dismissModal() {
         self.modal = nil
     }
+
+    public func showSafari(_ url: @escaping () -> URL) {
+        openURL(url())
+    }
 }
 
 struct RouterView_Previews: PreviewProvider {

diff --git a/Sources/SwiftfulRouting/Options/UrlOption.swift b/Sources/SwiftfulRouting/Options/UrlOption.swift
@@ -0,0 +1,13 @@
+//
+//  UrlOption.swift
+//  
+//
+//  Created by Nick Sarno on 8/24/23.
+//
+
+import Foundation
+
+public enum UrlOption: Equatable {
+    case inAppBrowser(segue: SegueOption)
+    case safari, urlSchema
+}