From 2c13d74ea8615c7f149503075299d32966fce689 Mon Sep 17 00:00:00 2001 From: Rafael Escaleira Date: Thu, 22 Aug 2024 15:08:07 -0400 Subject: [PATCH] Update RefdsApplication.swift --- .../Application/RefdsApplication.swift | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/Sources/RefdsShared/Application/RefdsApplication.swift b/Sources/RefdsShared/Application/RefdsApplication.swift index ee43e96..e23e7b5 100644 --- a/Sources/RefdsShared/Application/RefdsApplication.swift +++ b/Sources/RefdsShared/Application/RefdsApplication.swift @@ -7,22 +7,15 @@ import UIKit public final class RefdsApplication { public static let shared = RefdsApplication() -#if os(macOS) - public var rootViewController: NSViewController? { - if let window = NSApplication.shared.windows.first, - let rootViewController = window.contentViewController { - return rootViewController - } - return nil - } -#else - public var rootViewController: UIViewController? { - if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene, - let window = windowScene.windows.first, - let rootViewController = window.rootViewController { - return rootViewController - } - return nil + + public var rootViewController: RefdsViewController? { + #if os(macOS) + let window = NSApplication.shared.windows.first + return window?.contentViewController?.refdsViewController + #else + let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene + let window = windowScene?.windows.first + return window?.rootViewController?.refdsViewController + #endif } -#endif }