Merge pull request #10 from erikdrobne/fix/example-app-view-hierarchy

Pass navigation controller to existing window instead of creating new…
erikdrobne · May 4, 2023 · 56a0651 · 56a0651
2 parents f406b99 + 77bc712
commit 56a0651
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/...le/SwiftUICoordinatorExample/SwiftUICoordinatorExample/SwiftUICoordinatorExampleApp.swift b/...le/SwiftUICoordinatorExample/SwiftUICoordinatorExample/SwiftUICoordinatorExampleApp.swift
@@ -20,16 +20,15 @@ struct SwiftUICoordinatorExampleApp: App {
 
 final class SceneDelegate: NSObject, UIWindowSceneDelegate {
 
- var window: UIWindow?
-
  func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
- guard let windowScene = (scene as? UIWindowScene) else { return }
+ guard let window = (scene as? UIWindowScene)?.windows.first else {
+ return
+ }
 
  let coordinator = ShapesCoordinator(startRoute: .shapes)
- window = UIWindow(windowScene: windowScene)
  /// Assign root coordinator's navigation controller
- window?.rootViewController = coordinator.navigationController
- window?.makeKeyAndVisible()
+ window.rootViewController = coordinator.navigationController
+ window.makeKeyAndVisible()
 
  try? coordinator.start()
  }

diff --git a/README.md b/README.md
@@ -248,15 +248,16 @@ final class SceneDelegate: NSObject, UIWindowSceneDelegate {
  var window: UIWindow?
 
  func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
- guard let windowScene = (scene as? UIWindowScene) else { return }
+ guard let window = (scene as? UIWindowScene)?.windows.first else {
+ return
+ }
 
  let coordinator = ShapesCoordinator(startRoute: .shapes)
- window = UIWindow(windowScene: windowScene)
  /// Assign root coordinator's navigation controller
- window?.rootViewController = coordinator.navigationController
- window?.makeKeyAndVisible()
+ window.rootViewController = coordinator.navigationController
+ window.makeKeyAndVisible()
 
- coordinator.start()
+ try? coordinator.start()
  }
 }