starred/Armchair
1
0
Fork 0
mirror of https://github.com/UrbanApps/Armchair.git synced 2026-07-06 12:55:19 +02:00
Code Issues 36 Packages Projects Releases 3 Wiki Activity

Fix issue when getRootViewController would return nil

Browse Source
This commit is contained in:
Martin Moizard
2017-09-01 09:56:47 +02:00
parent 2bdd30f9ed
commit eaebe860da
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Armchair.swift
+20 -10
View File
@@ -1240,7 +1240,7 @@ open class Manager : ArmchairManager {
// get the top most controller (= the StoreKit Controller) and dismiss it // get the top most controller (= the StoreKit Controller) and dismiss it
if let presentingController = UIApplication.shared.keyWindow?.rootViewController { if let presentingController = UIApplication.shared.keyWindow?.rootViewController {
if let topController = topMostViewController(presentingController) { if let topController = Manager.topMostViewController(presentingController) {
topController.present(alertView, animated: usesAnimation) { [weak self] _ in topController.present(alertView, animated: usesAnimation) { [weak self] _ in
if let closure = self?.didDisplayAlertClosure { if let closure = self?.didDisplayAlertClosure {
closure() closure()
@@ -1335,7 +1335,7 @@ open class Manager : ArmchairManager {
// get the top most controller (= the StoreKit Controller) and dismiss it // get the top most controller (= the StoreKit Controller) and dismiss it
if let presentingController = UIApplication.shared.keyWindow?.rootViewController { if let presentingController = UIApplication.shared.keyWindow?.rootViewController {
if let topController = topMostViewController(presentingController) { if let topController = Manager.topMostViewController(presentingController) {
topController.dismiss(animated: usesAnimation) { topController.dismiss(animated: usesAnimation) {
if let closure = self.didDismissModalViewClosure { if let closure = self.didDismissModalViewClosure {
closure(usedAnimation) closure(usedAnimation)
@@ -1422,7 +1422,7 @@ open class Manager : ArmchairManager {
} }
if let rootController = getRootViewController() { if let rootController = Manager.getRootViewController() {
rootController.present(storeViewController, animated: usesAnimation) { rootController.present(storeViewController, animated: usesAnimation) {
self.modalPanelOpen = true self.modalPanelOpen = true
@@ -1689,7 +1689,7 @@ open class Manager : ArmchairManager {
} }
#if os(iOS) #if os(iOS)
private func topMostViewController(_ controller: UIViewController?) -> UIViewController? { private static func topMostViewController(_ controller: UIViewController?) -> UIViewController? {
var isPresenting: Bool = false var isPresenting: Bool = false
var topController: UIViewController? = controller var topController: UIViewController? = controller
repeat { repeat {
@@ -1707,7 +1707,7 @@ open class Manager : ArmchairManager {
return topController return topController
} }
private func getRootViewController() -> UIViewController? { private static func getRootViewController() -> UIViewController? {
if var window = UIApplication.shared.keyWindow { if var window = UIApplication.shared.keyWindow {
if window.windowLevel != UIWindowLevelNormal { if window.windowLevel != UIWindowLevelNormal {
@@ -1722,18 +1722,28 @@ open class Manager : ArmchairManager {
} }
} }
for subView in window.subviews { return iterateSubViewsForViewController(window)
if let responder = subView.next { }
if responder.isKind(of: UIViewController.self) {
return topMostViewController(responder as? UIViewController)
}
return nil
}
private static func iterateSubViewsForViewController(_ parentView: UIView) -> UIViewController? {
for subView in parentView.subviews {
if let responder = subView.next {
if responder.isKind(of: UIViewController.self) {
return topMostViewController(responder as? UIViewController)
} }
} }
if let found = iterateSubViewsForViewController(subView) {
return found
}
} }
return nil return nil
} }
#endif #endif
private func hideRatingAlert() { private func hideRatingAlert() {