Merge pull request #262 from MobileOrg/project-settings

webframp · web-flow · commit 6630b76237c2 · 2020-05-14T23:59:07.000-04:00
Apply latest suggested project settings
diff --git a/Classes/Utilities/UIAlertController+MobileOrg.swift b/Classes/Utilities/UIAlertController+MobileOrg.swift
@@ -46,16 +46,12 @@ extension UIAlertController {
 
     private static var mo_presentingViewController: UIViewController? {
         let rootViewController = UIApplication.shared.delegate?.window??.rootViewController
-        switch type(of: rootViewController) {
-        case is UINavigationController.Type:
-            guard let controller = (rootViewController as? UINavigationController)?.topViewController else { fallthrough }
+        if let controller = (rootViewController as? UINavigationController)?.topViewController {
             return controller
-        case is UITableViewController.Type:
-            guard let controller = (rootViewController as? UITabBarController)?.selectedViewController else { fallthrough }
+        } else if let controller = (rootViewController as? UITabBarController)?.selectedViewController {
             return controller
-        default:
-            return rootViewController
         }
+        return rootViewController
     }
     
 }
diff --git a/MobileOrg.xcodeproj/project.pbxproj b/MobileOrg.xcodeproj/project.pbxproj
@@ -798,7 +798,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1140;
 				ORGANIZATIONNAME = "Sean Escriva";
 				TargetAttributes = {
 					1D6058900D05DD3D006BFB54 = {
diff --git a/MobileOrg.xcodeproj/xcshareddata/xcschemes/All Tests.xcscheme b/MobileOrg.xcodeproj/xcshareddata/xcschemes/All Tests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1140"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MobileOrg.xcodeproj/xcshareddata/xcschemes/MobileOrg.xcscheme b/MobileOrg.xcodeproj/xcshareddata/xcschemes/MobileOrg.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Original file line number	Diff line number	Diff line change
`@@ -46,16 +46,12 @@ extension UIAlertController {`
`46`	`46`
`47`	`47`	`private static var mo_presentingViewController: UIViewController? {`
`48`	`48`	`let rootViewController = UIApplication.shared.delegate?.window??.rootViewController`
`49`		`- switch type(of: rootViewController) {`
`50`		`- case is UINavigationController.Type:`
`51`		`- guard let controller = (rootViewController as? UINavigationController)?.topViewController else { fallthrough }`
	`49`	`+ if let controller = (rootViewController as? UINavigationController)?.topViewController {`
`52`	`50`	`return controller`
`53`		`- case is UITableViewController.Type:`
`54`		`- guard let controller = (rootViewController as? UITabBarController)?.selectedViewController else { fallthrough }`
	`51`	`+ } else if let controller = (rootViewController as? UITabBarController)?.selectedViewController {`
`55`	`52`	`return controller`
`56`		`- default:`
`57`		`- return rootViewController`
`58`	`53`	`}`
	`54`	`+ return rootViewController`
`59`	`55`	`}`
`60`	`56`
`61`	`57`	`}`