Merge pull request #201 from ddaddy/master

Fixed some iOS 13 deprecations

Author: rolandleth

LTHPasscodeViewController/LTHPasscodeViewController.m

@@ -12,7 +12,7 @@
 
 #define LTHiOS8 ([[[UIDevice currentDevice] systemVersion] compare:@"8.0" \
 options:NSNumericSearch] != NSOrderedAscending)
-#define LTHiPad (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+#define LTHiPad ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad)
 
 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000
 #define LTHFailedAttemptLabelHeight [_failedAttemptLabel.text sizeWithAttributes: @{NSFontAttributeName : _labelFont}].height
@@ -569,13 +569,13 @@ - (void)_dismissMe {
                 self.view.center = CGPointMake(self.view.center.x, self.view.center.y * 2.f);
             }
             else {
-                if ([UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeLeft) {
+                if ([LTHPasscodeViewController currentOrientation] == UIInterfaceOrientationLandscapeLeft) {
                     self.view.center = CGPointMake(self.view.center.x * -1.f, self.view.center.y);
                 }
-                else if ([UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeRight) {
+                else if ([LTHPasscodeViewController currentOrientation] == UIInterfaceOrientationLandscapeRight) {
                     self.view.center = CGPointMake(self.view.center.x * 2.f, self.view.center.y);
                 }
-                else if ([UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationPortrait) {
+                else if ([LTHPasscodeViewController currentOrientation] == UIInterfaceOrientationPortrait) {
                     self.view.center = CGPointMake(self.view.center.x, self.view.center.y * -1.f);
                 }
                 else {
@@ -1056,17 +1056,17 @@ - (void)showLockScreenOver:(UIView *)superview withAnimation:(BOOL)animated with
                                 superviewCenter.y + self.navigationController.navigationBar.frame.size.height / 2);
     }
     else {
-        if ([UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeLeft) {
+        if ([LTHPasscodeViewController currentOrientation] == UIInterfaceOrientationLandscapeLeft) {
             self.view.center = CGPointMake(self.view.center.x * -1.f, self.view.center.y);
             newCenter = CGPointMake(superviewCenter.x - self.navigationController.navigationBar.frame.size.height / 2,
                                     superviewCenter.y);
         }
-        else if ([UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeRight) {
+        else if ([LTHPasscodeViewController currentOrientation] == UIInterfaceOrientationLandscapeRight) {
             self.view.center = CGPointMake(self.view.center.x * 2.f, self.view.center.y);
             newCenter = CGPointMake(superviewCenter.x + self.navigationController.navigationBar.frame.size.height / 2,
                                     superviewCenter.y);
         }
-        else if ([UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationPortrait) {
+        else if ([LTHPasscodeViewController currentOrientation] == UIInterfaceOrientationPortrait) {
             self.view.center = CGPointMake(self.view.center.x, self.view.center.y * -1.f);
             newCenter = CGPointMake(superviewCenter.x,
                                     superviewCenter.y - self.navigationController.navigationBar.frame.size.height / 2);
@@ -1108,6 +1108,7 @@ - (void)_prepareNavigationControllerWithController:(UIViewController *)viewContr
     }
     UINavigationController *navController =
     [[UINavigationController alloc] initWithRootViewController:self];
+    navController.modalPresentationStyle = UIModalPresentationFullScreen;
 
     // Make sure nav bar for logout is off the screen
     [self.navBar removeFromSuperview];
@@ -1790,6 +1791,28 @@ - (void)_addObservers {
 
 
 #pragma mark - Handling rotation
+
+// Internal method for fetching the current orientation
++ (UIInterfaceOrientation)currentOrientation
+{
+    // statusBarOrientation is deprecated in iOS 13 and windowScene isn't available before iOS 13
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
+    if (@available(iOS 13.0, *))
+    {
+        return LTHMainWindow.windowScene.interfaceOrientation;
+    }
+    else
+    {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+        return [[UIApplication sharedApplication] statusBarOrientation];
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
+#pragma clang diagnostic pop
+    }
+#endif
+}
+
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     if (_displayedAsLockScreen)
         return LTHiOS8 ? UIInterfaceOrientationMaskPortrait : UIInterfaceOrientationMaskAll;
@@ -1814,7 +1837,7 @@ - (void)statusBarFrameOrOrientationChanged:(NSNotification *)notification {
         _animatingView.frame = self.view.bounds;
     }
     else {
-        if (UIInterfaceOrientationIsPortrait([UIApplication sharedApplication].statusBarOrientation)) {
+        if (UIInterfaceOrientationIsPortrait([LTHPasscodeViewController currentOrientation])) {
             _animatingView.frame = CGRectMake(0, 0, LTHMainWindow.frame.size.width, LTHMainWindow.frame.size.height);
         }
         else {
@@ -1829,8 +1852,7 @@ - (void)statusBarFrameOrOrientationChanged:(NSNotification *)notification {
 // then presenting it inside a modal in another orientation would display
 // the view in the first orientation.
 - (UIInterfaceOrientation)desiredOrientation {
-    UIInterfaceOrientation statusBarOrientation =
-    [[UIApplication sharedApplication] statusBarOrientation];
+    UIInterfaceOrientation statusBarOrientation = [LTHPasscodeViewController currentOrientation];
     UIInterfaceOrientationMask statusBarOrientationAsMask = UIInterfaceOrientationMaskFromOrientation(statusBarOrientation);
     if(self.supportedInterfaceOrientations & statusBarOrientationAsMask) {
         return statusBarOrientation;
@@ -1900,13 +1922,34 @@ - (void)enablePasscodeWhenApplicationEntersBackground {
 
 
 + (CGFloat)getStatusBarHeight {
-    UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
-    if (UIInterfaceOrientationIsLandscape(orientation)) {
-        return [UIApplication sharedApplication].statusBarFrame.size.width;
+    UIInterfaceOrientation orientation = [LTHPasscodeViewController currentOrientation];
+    
+    // statusBarFrame is deprecated in iOS 13 and windowScene isn't available before iOS 13
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
+    if (@available(iOS 13.0, *))
+    {
+        if (UIInterfaceOrientationIsLandscape(orientation)) {
+            return LTHMainWindow.windowScene.statusBarManager.statusBarFrame.size.width;
+        }
+        else {
+            return LTHMainWindow.windowScene.statusBarManager.statusBarFrame.size.height;
+        }
     }
-    else {
-        return [UIApplication sharedApplication].statusBarFrame.size.height;
+    else
+    {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+        if (UIInterfaceOrientationIsLandscape(orientation)) {
+            return [UIApplication sharedApplication].statusBarFrame.size.width;
+        }
+        else {
+            return [UIApplication sharedApplication].statusBarFrame.size.height;
+        }
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
+#pragma clang diagnostic pop
     }
+#endif
 }