Add support for targeting a window scene

Author: wtmoose

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changes
 
+* Add `SwiftMessages.PresentationContext.windowScene` option for targeting a specific window scene.
 * Changed the behavior of the default `presentationContext`, `.automatic`. Previously, if the root view controller was presenting, the message would only be displayed over the presented view controller if the `modalPresentationStyle` was `fullScreen` or `overFullScreen`. Now, messages are always displayed over presented view controllers.
 
 ## 7.0.1

SwiftMessages/Presenter.swift

@@ -14,6 +14,62 @@ protocol PresenterDelegate: AnimationDelegate {
 
 class Presenter: NSObject {
 
+    // MARK: - API
+
+    init(config: SwiftMessages.Config, view: UIView, delegate: PresenterDelegate) {
+        self.config = config
+        self.view = view
+        self.delegate = delegate
+        self.animator = Presenter.animator(forPresentationStyle: config.presentationStyle, delegate: delegate)
+        if let identifiable = view as? Identifiable {
+            id = identifiable.id
+        } else {
+            var mutableView = view
+            id = withUnsafePointer(to: &mutableView) { "\($0)" }
+        }
+
+        super.init()
+    }
+    
+    var id: String
+    var config: SwiftMessages.Config
+    let maskingView = MaskingView()
+    let animator: Animator
+    var isHiding = false
+    let view: UIView
+
+    var delayShow: TimeInterval? {
+        if case .indefinite(let opts) = config.duration { return opts.delay }
+        return nil
+    }
+
+    var showDate: CFTimeInterval?
+
+    /// Returns the required delay for hiding based on time shown
+    var delayHide: TimeInterval? {
+        if interactivelyHidden { return 0 }
+        if case .indefinite(let opts) = config.duration, let showDate = showDate {
+            let timeIntervalShown = CACurrentMediaTime() - showDate
+            return max(0, opts.minimum - timeIntervalShown)
+        }
+        return nil
+    }
+
+    var pauseDuration: TimeInterval? {
+        let duration: TimeInterval?
+        switch self.config.duration {
+        case .automatic:
+            duration = 2
+        case .seconds(let seconds):
+            duration = seconds
+        case .forever, .indefinite:
+            duration = nil
+        }
+        return duration
+    }
+
+    // MARK: - Constants
+
     enum PresentationContext {
         case viewController(_: Weak<UIViewController>)
         case view(_: Weak<UIView>)
@@ -36,29 +92,24 @@ class Presenter: NSObject {
             }
         }
     }
-    
-    var config: SwiftMessages.Config
-    let view: UIView
-    weak var delegate: PresenterDelegate?
-    let maskingView = MaskingView()
-    var presentationContext = PresentationContext.viewController(Weak<UIViewController>(value: nil))
-    let animator: Animator
 
-    init(config: SwiftMessages.Config, view: UIView, delegate: PresenterDelegate) {
-        self.config = config
-        self.view = view
-        self.delegate = delegate
-        self.animator = Presenter.animator(forPresentationStyle: config.presentationStyle, delegate: delegate)
-        if let identifiable = view as? Identifiable {
-            id = identifiable.id
-        } else {
-            var mutableView = view
-            id = withUnsafePointer(to: &mutableView) { "\($0)" }
-        }
+    // MARK: - Variables
 
-        super.init()
+    private weak var delegate: PresenterDelegate?
+    private var presentationContext = PresentationContext.viewController(Weak<UIViewController>(value: nil))
+
+    @available (iOS 13.0, *)
+    private var windowScene: UIWindowScene? {
+        switch config.presentationContext {
+        case .windowScene(let scene, _): return scene
+        default: return UIApplication.shared.keyWindow?.windowScene
+        }
     }
 
+    private var interactivelyHidden = false;
+
+    // MARK: - Showing and hiding
+
     private static func animator(forPresentationStyle style: SwiftMessages.PresentationStyle, delegate: AnimationDelegate) -> Animator {
         switch style {
         case .top:
@@ -73,44 +124,6 @@ class Presenter: NSObject {
         }
     }
 
-    var id: String
-    
-    var pauseDuration: TimeInterval? {
-        let duration: TimeInterval?
-        switch self.config.duration {
-        case .automatic:
-            duration = 2
-        case .seconds(let seconds):
-            duration = seconds
-        case .forever, .indefinite:
-            duration = nil
-        }
-        return duration
-    }
-
-    var showDate: CFTimeInterval?
-
-    private var interactivelyHidden = false;
-
-    var delayShow: TimeInterval? {
-        if case .indefinite(let opts) = config.duration { return opts.delay }
-        return nil
-    }
-
-    /// Returns the required delay for hiding based on time shown
-    var delayHide: TimeInterval? {
-        if interactivelyHidden { return 0 }
-        if case .indefinite(let opts) = config.duration, let showDate = showDate {
-            let timeIntervalShown = CACurrentMediaTime() - showDate
-            return max(0, opts.minimum - timeIntervalShown)
-        }
-        return nil
-    }
-
-    /*
-     MARK: - Showing and hiding
-     */
-
     func show(completion: @escaping AnimationCompletion) throws {
         try presentationContext = getPresentationContext()
         install()
@@ -174,8 +187,6 @@ class Presenter: NSObject {
         UIAccessibility.post(notification: UIAccessibility.Notification.layoutChanged, argument: focus)
     }
 
-    var isHiding = false
-
     func hide(animated: Bool, completion: @escaping AnimationCompletion) {
         isHiding = true
         self.config.eventListeners.forEach { $0(.willHide) }
@@ -308,6 +319,9 @@ class Presenter: NSObject {
         case .window(let level):
             let viewController = newWindowViewController(level)
             return .viewController(Weak(value: viewController))
+        case .windowScene(_, let level):
+            let viewController = newWindowViewController(level)
+            return .viewController(Weak(value: viewController))
         case .viewController(let viewController):
             let viewController = viewController.sm_selectPresentationContextBottomUp(config)
             return .viewController(Weak(value: viewController))
@@ -409,8 +423,7 @@ class Presenter: NSObject {
         guard let containerView = presentationContext.viewValue() else { return }
         if let windowViewController = presentationContext.viewControllerValue() as? WindowViewController {
             if #available(iOS 13, *) {
-                let scene = UIApplication.shared.keyWindow?.windowScene
-                windowViewController.install(becomeKey: becomeKeyWindow, scene: scene)
+                windowViewController.install(becomeKey: becomeKeyWindow, scene: windowScene)
             } else {
                 windowViewController.install(becomeKey: becomeKeyWindow)
             }

SwiftMessages/SwiftMessages.swift

@@ -70,7 +70,18 @@ open class SwiftMessages {
          to hide it.
         */
         case window(windowLevel: UIWindow.Level)
-        
+
+        /**
+         Displays the message in a new window, at the specified window level,
+         in the specified window scene. SwiftMessages automatically increases the top margins
+         of any message view that adopts the `MarginInsetting` protocol (as `MessageView` does)
+         to account for the status bar. As of iOS 13, windows can no longer cover the
+         status bar. The only alternative is to set `Config.prefersStatusBarHidden = true`
+         to hide it.
+        */
+        @available(iOS 13.0, *)
+        case windowScene(_: UIWindowScene, windowLevel: UIWindow.Level)
+
         /**
          Displays the message view under navigation bars and tab bars if an
          appropriate one is found using the given view controller as a starting
@@ -79,7 +90,7 @@ open class SwiftMessages {
          for targeted placement in a view controller heirarchy.
         */
         case viewController(_: UIViewController)
-        
+
         /**
          Displays the message view in the given container view.
          */