Suppprt scenes based apps (#55)

lyft · Jun 12, 2024 · 52ef933 · 52ef933
1 parent a3352c6
commit 52ef933
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/Sources/Hammer/Utilties/UIKit+Extensions.swift b/Sources/Hammer/Utilties/UIKit+Extensions.swift
@@ -46,6 +46,10 @@ extension UIDevice {
 extension UIWindow {
     convenience init(wrapping viewController: UIViewController) {
         self.init(frame: UIScreen.main.bounds)
+        if #available(iOS 13.0, *), self.windowScene == nil {
+            self.windowScene = UIApplication.shared.connectedScenes
+                .compactMap { $0 as? UIWindowScene }.first
+        }
         self.rootViewController = viewController
     }
 }

diff --git a/TestHost/Info.plist b/TestHost/Info.plist
@@ -41,5 +41,22 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneDelegateClassName</key>
+					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
+					<key>UISceneConfigurationName</key>
+					<string>Default Configuration</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
 </dict>
 </plist>
diff --git a/TestHost/SceneDelegate.swift b/TestHost/SceneDelegate.swift
@@ -0,0 +1,8 @@
+import UIKit
+
+@available(iOS 13.0, *)
+final class SceneDelegate: UIResponder, UISceneDelegate {
+    var window: UIWindow?
+    func scene(_ scene: UIScene, willConnectTo session: UISceneSession,
+               options connectionOptions: UIScene.ConnectionOptions) {}
+}
diff --git a/Tests/HammerTests/KeyboardTests.swift b/Tests/HammerTests/KeyboardTests.swift
@@ -1,4 +1,4 @@
-import Hammer
+@testable import Hammer
 import UIKit
 import XCTest
 
@@ -187,8 +187,7 @@ final class KeyboardTests: XCTestCase {
             view.centerXAnchor.constraint(equalTo: viewController.view.centerXAnchor),
         ])
 
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = viewController
+        let window = UIWindow(wrapping: viewController)
         window.isHidden = false
 
         let eventGenerator = try EventGenerator(window: window)