Merge branch 'work/9.0.1' of https://github.com/SwiftKickMobile/SwiftMessages

# Conflicts:
#	SwiftMessages.xcodeproj/project.pbxproj

Author: wtmoose

SwiftMessages.xcodeproj/project.pbxproj

@@ -56,6 +56,7 @@
 		2298C2051EE47DC900E2DDC1 /* Weak.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2298C2041EE47DC900E2DDC1 /* Weak.swift */; };
 		2298C2071EE480D000E2DDC1 /* Animator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2298C2061EE480D000E2DDC1 /* Animator.swift */; };
 		2298C2091EE486E300E2DDC1 /* EdgeAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2298C2081EE486E300E2DDC1 /* EdgeAnimation.swift */; };
+        229F778125FAB1E9008C2ACB /* UIWindow+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 229F778025FAB1E9008C2ACB /* UIWindow+Extensions.swift */; };
 		22DFC9161EFF30F6001B1CA1 /* CenteredView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22DFC9151EFF30F6001B1CA1 /* CenteredView.xib */; };
 		22DFC9181F00674E001B1CA1 /* PhysicsPanHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22DFC9171F00674E001B1CA1 /* PhysicsPanHandler.swift */; };
 		22E01F641E74EC8B00ACE19A /* MaskingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22E01F631E74EC8B00ACE19A /* MaskingView.swift */; };
@@ -144,6 +145,7 @@
 		2298C2041EE47DC900E2DDC1 /* Weak.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Weak.swift; sourceTree = "<group>"; };
 		2298C2061EE480D000E2DDC1 /* Animator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Animator.swift; sourceTree = "<group>"; };
 		2298C2081EE486E300E2DDC1 /* EdgeAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EdgeAnimation.swift; sourceTree = "<group>"; };
+		229F778025FAB1E9008C2ACB /* UIWindow+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIWindow+Extensions.swift"; sourceTree = "<group>"; };
 		22A2EA6E24EC6CFA00BB2540 /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
 		22DFC9151EFF30F6001B1CA1 /* CenteredView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CenteredView.xib; path = Resources/CenteredView.xib; sourceTree = "<group>"; };
 		22DFC9171F00674E001B1CA1 /* PhysicsPanHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhysicsPanHandler.swift; sourceTree = "<group>"; };
@@ -214,6 +216,7 @@
 				220655111FAF82B600F4E00F /* MarginAdjustable+Extensions.swift */,
 				22774B9F20B5EF2A00813732 /* UIEdgeInsets+Extensions.swift */,
 				2290958025D9D407002E8111 /* UILayoutPriority+Extensions.swift */,
+				229F778025FAB1E9008C2ACB /* UIWindow+Extensions.swift */,
 			);
 			name = Extensions;
 			sourceTree = "<group>";
@@ -553,6 +556,7 @@
 				86BBA9041D5E040600FE8F16 /* NSBundle+Extensions.swift in Sources */,
 				86BBA8FD1D5E03F800FE8F16 /* SwiftMessages.swift in Sources */,
 				86BBA9021D5E040600FE8F16 /* WindowViewController.swift in Sources */,
+				229F778125FAB1E9008C2ACB /* UIWindow+Extensions.swift in Sources */,
 				86BBA8FF1D5E040600FE8F16 /* Presenter.swift in Sources */,
 				86BBA9051D5E040C00FE8F16 /* Theme.swift in Sources */,
 				86BBA9081D5E040C00FE8F16 /* Error.swift in Sources */,

SwiftMessages/Presenter.swift

@@ -301,7 +301,7 @@ class Presenter: NSObject {
             #if SWIFTMESSAGES_APP_EXTENSIONS
             throw SwiftMessagesError.noRootViewController
             #else
-            if let rootViewController = UIApplication.shared.keyWindow?.rootViewController {
+            if let rootViewController = UIWindow.keyWindow?.rootViewController {
                 let viewController = rootViewController.sm_selectPresentationContextTopDown(config)
                 return .viewController(Weak(value: viewController))
             } else {

SwiftMessages/SwiftMessages.Config+Extensions.swift

@@ -25,7 +25,7 @@ extension SwiftMessages.Config {
             #if SWIFTMESSAGES_APP_EXTENSIONS
             return nil
             #else
-            return UIApplication.shared.keyWindow?.windowScene
+            return UIWindow.keyWindow?.windowScene
             #endif
         }
     }

SwiftMessages/UIWindow+Extensions.swift

@@ -0,0 +1,24 @@
+//
+//  UIWindow+Extensions.swift
+//  SwiftMessages
+//
+//  Created by Timothy Moose on 3/11/21.
+//  Copyright © 2021 SwiftKick Mobile. All rights reserved.
+//
+
+import UIKit
+
+extension UIWindow {
+    static var keyWindow: UIWindow? {
+        if #available(iOS 13.0, *) {
+            return UIApplication.shared.connectedScenes
+                .filter { $0.activationState == .foregroundActive }
+                .compactMap { $0 as? UIWindowScene }
+                .first?.windows
+                .filter { $0.isKeyWindow }
+                .first
+        } else {
+            return UIApplication.shared.keyWindow
+        }
+    }
+}

SwiftMessages/WindowViewController.swift

@@ -35,11 +35,9 @@ open class WindowViewController: UIViewController
     func install() {
         if #available(iOS 13, *) {
             window?.windowScene = config.windowScene
-            if config.shouldBecomeKeyWindow {
-                #if !SWIFTMESSAGES_APP_EXTENSIONS
-                previousKeyWindow = UIApplication.shared.keyWindow
-                #endif
-            }
+            #if !SWIFTMESSAGES_APP_EXTENSIONS
+            previousKeyWindow = UIWindow.keyWindow
+            #endif
             show(
                 becomeKey: config.shouldBecomeKeyWindow,
                 frame: config.windowScene?.coordinateSpace.bounds
@@ -60,12 +58,14 @@ open class WindowViewController: UIViewController
     }
 
     func uninstall() {
+        if window?.isKeyWindow == true {
+            previousKeyWindow?.makeKeyAndVisible()
+        }
         if #available(iOS 13, *) {
             window?.windowScene = nil
         }
         window?.isHidden = true
         window = nil
-        previousKeyWindow?.makeKeyAndVisible()
     }
 
     required public init?(coder aDecoder: NSCoder) {