From 145fad6764196588360934d8c02263c46b3153b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20C=C3=A9sar?= Date: Mon, 14 Sep 2015 20:43:48 +0200 Subject: [PATCH 1/2] fix ios warnings fix ios 7 deprecate warnigns --- src/ios/CDVStatusBar.m | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/ios/CDVStatusBar.m b/src/ios/CDVStatusBar.m index 3fac9a0..009abdb 100644 --- a/src/ios/CDVStatusBar.m +++ b/src/ios/CDVStatusBar.m @@ -179,7 +179,7 @@ static const void *kStatusBarStyle = &kStatusBarStyle; - (CGRect) invertFrameIfNeeded:(CGRect)rect orientation:(UIInterfaceOrientation)orientation { // landscape is where (width > height). On iOS < 8, we need to invert since frames are // always in Portrait context - if (UIDeviceOrientationIsLandscape(orientation) && (rect.size.width < rect.size.height) ) { + if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]) && (rect.size.width < rect.size.height) && (rect.size.width < rect.size.height) ) { CGFloat temp = rect.size.width; rect.size.width = rect.size.height; rect.size.height = temp; @@ -201,7 +201,7 @@ static const void *kStatusBarStyle = &kStatusBarStyle; if (statusBarOverlaysWebView) { [_statusBarBackgroundView removeFromSuperview]; - if (UIDeviceOrientationIsLandscape(self.viewController.interfaceOrientation)) { + if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]) && (rect.size.width < rect.size.height)) { self.webView.frame = CGRectMake(0, 0, bounds.size.height, bounds.size.width); } else { self.webView.frame = bounds; @@ -291,12 +291,22 @@ static const void *kStatusBarStyle = &kStatusBarStyle; - (void) styleBlackTranslucent:(CDVInvokedUrlCommand*)command { - [self setStyleForStatusBar:UIStatusBarStyleBlackTranslucent]; + #if __IPHONE_OS_VERSION_MAX_ALLOWED < 70000 + # define TRANSLUCENT_STYLE UIStatusBarStyleBlackTranslucent + #else + # define TRANSLUCENT_STYLE UIStatusBarStyleLightContent + #endif + [self setStyleForStatusBar:TRANSLUCENT_STYLE]; } - (void) styleBlackOpaque:(CDVInvokedUrlCommand*)command { - [self setStyleForStatusBar:UIStatusBarStyleBlackOpaque]; + #if __IPHONE_OS_VERSION_MAX_ALLOWED < 70000 + # define OPAQUE_STYLE UIStatusBarStyleBlackOpaque + #else + # define OPAQUE_STYLE UIStatusBarStyleLightContent + #endif + [self setStyleForStatusBar:OPAQUE_STYLE]; } - (void) backgroundColorByName:(CDVInvokedUrlCommand*)command @@ -356,7 +366,6 @@ static const void *kStatusBarStyle = &kStatusBarStyle; if (!app.isStatusBarHidden) { - self.viewController.wantsFullScreenLayout = YES; CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame; [self hideStatusBar]; @@ -400,7 +409,6 @@ static const void *kStatusBarStyle = &kStatusBarStyle; if (app.isStatusBarHidden) { BOOL isIOS7 = (IsAtLeastiOSVersion(@"7.0")); - self.viewController.wantsFullScreenLayout = isIOS7; [self showStatusBar]; From 986516cf97b12e4c18de2a75fe119121a182cdfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20C=C3=A9sar?= Date: Mon, 14 Sep 2015 23:04:53 +0200 Subject: [PATCH 2/2] removed silly copy/paste mistakes removed silly copy/paste mistakes --- src/ios/CDVStatusBar.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ios/CDVStatusBar.m b/src/ios/CDVStatusBar.m index 009abdb..8578f29 100644 --- a/src/ios/CDVStatusBar.m +++ b/src/ios/CDVStatusBar.m @@ -179,7 +179,7 @@ static const void *kStatusBarStyle = &kStatusBarStyle; - (CGRect) invertFrameIfNeeded:(CGRect)rect orientation:(UIInterfaceOrientation)orientation { // landscape is where (width > height). On iOS < 8, we need to invert since frames are // always in Portrait context - if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]) && (rect.size.width < rect.size.height) && (rect.size.width < rect.size.height) ) { + if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]) && (rect.size.width < rect.size.height)) { CGFloat temp = rect.size.width; rect.size.width = rect.size.height; rect.size.height = temp; @@ -201,7 +201,7 @@ static const void *kStatusBarStyle = &kStatusBarStyle; if (statusBarOverlaysWebView) { [_statusBarBackgroundView removeFromSuperview]; - if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]) && (rect.size.width < rect.size.height)) { + if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation])) { self.webView.frame = CGRectMake(0, 0, bounds.size.height, bounds.size.width); } else { self.webView.frame = bounds;