Fixed warning about Unbalanced calls to begin/end appearance transitions for UIViewController

Geoff · Geoff · commit 86d6f9eaeb69 · 2015-09-03T08:45:30.000-06:00
diff --git a/PasscodeLock/PasscodeLockPresenter.swift b/PasscodeLock/PasscodeLockPresenter.swift
@@ -18,7 +18,6 @@ public class PasscodeLockPresenter {
         
         window.windowLevel = 0
         window.makeKeyAndVisible()
-        window.rootViewController = UIViewController()
         
         return window
     }()
@@ -29,7 +28,7 @@ public class PasscodeLockPresenter {
     public init(mainWindow window: UIWindow?, configuration: PasscodeLockConfigurationType) {
         
         mainWindow = window
-        mainWindow?.windowLevel = 1
+        mainWindow?.windowLevel = UIWindowLevelNormal
         passcodeConfiguration = configuration
     }
     
@@ -39,7 +38,7 @@ public class PasscodeLockPresenter {
         guard !isPasscodePresented else { return }
         
         isPasscodePresented = true
-        passcodeLockWindow.windowLevel = 2
+		passcodeLockWindow.windowLevel = UIWindowLevelAlert
         
         let passcodeLockVC = PasscodeLockViewController(state: .EnterPasscode, configuration: passcodeConfiguration)
         
@@ -48,7 +47,7 @@ public class PasscodeLockPresenter {
             self?.dismissPasscodeLock()
         }
         
-        passcodeLockWindow.rootViewController?.presentViewController(passcodeLockVC, animated: false, completion: nil)
+        passcodeLockWindow.rootViewController = passcodeLockVC
     }
     
     private func dismissPasscodeLock() {
@@ -57,7 +56,7 @@ public class PasscodeLockPresenter {
         
         passcodeLockWindow.windowLevel = 0
         
-        mainWindow?.windowLevel = 1
+        mainWindow?.windowLevel = UIWindowLevelNormal
         mainWindow?.makeKeyAndVisible()
     }
 }
diff --git a/PasscodeLock/PasscodeLockViewController.swift b/PasscodeLock/PasscodeLockViewController.swift
@@ -123,7 +123,8 @@ public class PasscodeLockViewController: UIViewController, PasscodeLockTypeDeleg
             
         } else {
         
-            dismissViewControllerAnimated(true, completion: dismissCompletionCallback)
+			dismissViewControllerAnimated( true, completion: nil )
+			dismissCompletionCallback?()
         }
         
     }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ public class PasscodeLockPresenter {`
`18`	`18`
`19`	`19`	`window.windowLevel = 0`
`20`	`20`	`window.makeKeyAndVisible()`
`21`		`- window.rootViewController = UIViewController()`
`22`	`21`
`23`	`22`	`return window`
`24`	`23`	`}()`
`@@ -29,7 +28,7 @@ public class PasscodeLockPresenter {`
`29`	`28`	`public init(mainWindow window: UIWindow?, configuration: PasscodeLockConfigurationType) {`
`30`	`29`
`31`	`30`	`mainWindow = window`
`32`		`- mainWindow?.windowLevel = 1`
	`31`	`+ mainWindow?.windowLevel = UIWindowLevelNormal`
`33`	`32`	`passcodeConfiguration = configuration`
`34`	`33`	`}`
`35`	`34`
`@@ -39,7 +38,7 @@ public class PasscodeLockPresenter {`
`39`	`38`	`guard !isPasscodePresented else { return }`
`40`	`39`
`41`	`40`	`isPasscodePresented = true`
`42`		`- passcodeLockWindow.windowLevel = 2`
	`41`	`+ passcodeLockWindow.windowLevel = UIWindowLevelAlert`
`43`	`42`
`44`	`43`	`let passcodeLockVC = PasscodeLockViewController(state: .EnterPasscode, configuration: passcodeConfiguration)`
`45`	`44`
`@@ -48,7 +47,7 @@ public class PasscodeLockPresenter {`
`48`	`47`	`self?.dismissPasscodeLock()`
`49`	`48`	`}`
`50`	`49`
`51`		`- passcodeLockWindow.rootViewController?.presentViewController(passcodeLockVC, animated: false, completion: nil)`
	`50`	`+ passcodeLockWindow.rootViewController = passcodeLockVC`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`private func dismissPasscodeLock() {`
`@@ -57,7 +56,7 @@ public class PasscodeLockPresenter {`
`57`	`56`
`58`	`57`	`passcodeLockWindow.windowLevel = 0`
`59`	`58`
`60`		`- mainWindow?.windowLevel = 1`
	`59`	`+ mainWindow?.windowLevel = UIWindowLevelNormal`
`61`	`60`	`mainWindow?.makeKeyAndVisible()`
`62`	`61`	`}`
`63`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,8 @@ public class PasscodeLockViewController: UIViewController, PasscodeLockTypeDeleg`
`123`	`123`
`124`	`124`	`} else {`
`125`	`125`
`126`		`- dismissViewControllerAnimated(true, completion: dismissCompletionCallback)`
	`126`	`+ dismissViewControllerAnimated( true, completion: nil )`
	`127`	`+ dismissCompletionCallback?()`
`127`	`128`	`}`
`128`	`129`
`129`	`130`	`}`