refactor finding specific view controllers

urmxrainbow · Oct 18, 2024 · 809aeca · 809aeca
1 parent d581461
commit 809aeca
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 45 deletions.
diff --git a/HabitRPG/AppDelegate-Notifications.swift → HabitRPG/AppDelegate+Notifications.swift b/HabitRPG/AppDelegate-Notifications.swift → HabitRPG/AppDelegate+Notifications.swift
diff --git a/HabitRPG/AppDelegate.swift b/HabitRPG/AppDelegate.swift
@@ -37,7 +37,7 @@ class HabiticaAppDelegate: UIResponder, MessagingDelegate, UIApplicationDelegate
     private let contentRepository = ContentRepository()
     let taskRepository = TaskRepository()
     private let socialRepository = SocialRepository()
-    private let configRepository = ConfigRepository.shared
+    internal let configRepository = ConfigRepository.shared
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
         Measurements.start(identifier: "didFinishLaunchingWithOptions")
@@ -431,42 +431,3 @@ class HabiticaAppDelegate: UIResponder, MessagingDelegate, UIApplicationDelegate
     }
 }
 
-// Maintenance
-extension HabiticaAppDelegate {
-    func handleMaintenanceScreen() -> Bool {
-        let maintenanceData = configRepository.dictionary(variable: .maintenanceData)
-        if let title = maintenanceData["title"] as? String, let descriptionString = maintenanceData["description"] as? String {
-            displayMaintenanceScreen(title: title, descriptionString: descriptionString)
-            return true
-        } else {
-            hideMaintenanceScreen()
-        }
-        return false
-    }
-
-    func displayMaintenanceScreen(title: String, descriptionString: String) {
-        if findMaintenanceScreen() == nil {
-            let maintenanceController = MaintenanceViewController()
-            maintenanceController.configure(title: title, descriptionString: descriptionString, showAppstoreButton: false)
-            maintenanceController.modalPresentationStyle = .fullScreen
-            maintenanceController.modalTransitionStyle = .crossDissolve
-            UIApplication.topViewController()?.present(maintenanceController, animated: true, completion: nil)
-        }
-    }
-
-    func hideMaintenanceScreen() {
-        findMaintenanceScreen()?.dismiss(animated: true, completion: nil)
-    }
-
-    private func findMaintenanceScreen() -> MaintenanceViewController? {
-        var viewController: UIViewController? = UIApplication.shared.findKeyWindow()?.rootViewController
-        while viewController != nil {
-            if let maintenanceController = viewController as? MaintenanceViewController {
-                return maintenanceController
-            } else {
-                viewController = viewController?.presentedViewController
-            }
-        }
-        return nil
-    }
-}
diff --git a/HabitRPG/AppDelege+Maintenance.swift b/HabitRPG/AppDelege+Maintenance.swift
@@ -0,0 +1,41 @@
+//
+//  AppDelege+Maintenance.swift
+//  Habitica
+//
+//  Created by Phillip Thelen on 18.10.24.
+//  Copyright © 2024 HabitRPG Inc. All rights reserved.
+//
+
+import UIKit
+
+// Maintenance
+extension HabiticaAppDelegate {
+    func handleMaintenanceScreen() -> Bool {
+        let maintenanceData = configRepository.dictionary(variable: .maintenanceData)
+        if let title = maintenanceData["title"] as? String, let descriptionString = maintenanceData["description"] as? String {
+            displayMaintenanceScreen(title: title, descriptionString: descriptionString)
+            return true
+        } else {
+            hideMaintenanceScreen()
+        }
+        return false
+    }
+
+    func displayMaintenanceScreen(title: String, descriptionString: String) {
+        if findMaintenanceScreen() == nil {
+            let maintenanceController = MaintenanceViewController()
+            maintenanceController.configure(title: title, descriptionString: descriptionString, showAppstoreButton: false)
+            maintenanceController.modalPresentationStyle = .fullScreen
+            maintenanceController.modalTransitionStyle = .crossDissolve
+            UIApplication.topViewController()?.present(maintenanceController, animated: true, completion: nil)
+        }
+    }
+
+    func hideMaintenanceScreen() {
+        findMaintenanceScreen()?.dismiss(animated: true, completion: nil)
+    }
+
+    private func findMaintenanceScreen() -> MaintenanceViewController? {
+        return UIWindow.findViewController()
+    }
+}
diff --git a/HabitRPG/Utilities/RouterHandler.swift b/HabitRPG/Utilities/RouterHandler.swift
@@ -397,11 +397,7 @@ class RouterHandler {
     }
 
     private var tabbarController: MainTabBarController? {
-        var viewController = UIApplication.shared.findKeyWindow()?.rootViewController
-        while viewController != nil && viewController as? MainTabBarController == nil {
-            viewController = viewController?.presentedViewController
-        }
-        return viewController as? MainTabBarController
+        return UIWindow.findViewController()
     }
 
     private var selectedNavigationController: UINavigationController? {

diff --git a/HabitRPG/Utilities/UIWindow+VisibleController.swift b/HabitRPG/Utilities/UIWindow+VisibleController.swift
@@ -26,4 +26,17 @@ extension UIWindow {
             }
         }
     }
+
+    static func findViewController<VC: UIViewController>(from rootViewController: UIViewController? = nil) -> VC? {
+        var viewController: UIViewController? = rootViewController ?? UIApplication.shared.findKeyWindow()?.rootViewController
+        while viewController != nil {
+            if let vc = viewController as? VC {
+                return vc
+            } else {
+                viewController = viewController?.presentedViewController
+            }
+        }
+        return nil
+    }
 }
+