github/cordova-plugin-statusbar
github/cordova-plugin-statusbar
3
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-statusbar.git synced 2025-01-19 09:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-9250 - Fix iOS warnings in Statusbar plugin

Browse Source 
Closes PR #35

Merge branch 'CB-9250' of https://github.com/jcesarmobile/cordova-plugin-statusbar
This commit is contained in:
Simon MacDonald 2015-09-21 11:43:01 -04:00
commit 7fa66c0b61
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ios/CDVStatusBar.m
View File

@ -179,7 +179,7 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
- (CGRect) invertFrameIfNeeded:(CGRect)rect orientation:(UIInterfaceOrientation)orientation { - (CGRect) invertFrameIfNeeded:(CGRect)rect orientation:(UIInterfaceOrientation)orientation {
// landscape is where (width > height). On iOS < 8, we need to invert since frames are // landscape is where (width > height). On iOS < 8, we need to invert since frames are
// always in Portrait context // always in Portrait context
if (UIDeviceOrientationIsLandscape(orientation) && (rect.size.width < rect.size.height) ) { if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]) && (rect.size.width < rect.size.height)) {
CGFloat temp = rect.size.width; CGFloat temp = rect.size.width;
rect.size.width = rect.size.height; rect.size.width = rect.size.height;
rect.size.height = temp; rect.size.height = temp;
@ -201,7 +201,7 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
if (statusBarOverlaysWebView) { if (statusBarOverlaysWebView) {
[_statusBarBackgroundView removeFromSuperview]; [_statusBarBackgroundView removeFromSuperview];
if (UIDeviceOrientationIsLandscape(self.viewController.interfaceOrientation)) { if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation])) {
self.webView.frame = CGRectMake(0, 0, bounds.size.height, bounds.size.width); self.webView.frame = CGRectMake(0, 0, bounds.size.height, bounds.size.width);
} else { } else {
self.webView.frame = bounds; self.webView.frame = bounds;
@ -291,12 +291,22 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
- (void) styleBlackTranslucent:(CDVInvokedUrlCommand*)command - (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 - (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 - (void) backgroundColorByName:(CDVInvokedUrlCommand*)command
@ -356,7 +366,6 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
if (!app.isStatusBarHidden) if (!app.isStatusBarHidden)
{ {
self.viewController.wantsFullScreenLayout = YES;
CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame; CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame;
[self hideStatusBar]; [self hideStatusBar];
@ -400,7 +409,6 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
if (app.isStatusBarHidden) if (app.isStatusBarHidden)
{ {
BOOL isIOS7 = (IsAtLeastiOSVersion(@"7.0")); BOOL isIOS7 = (IsAtLeastiOSVersion(@"7.0"));
self.viewController.wantsFullScreenLayout = isIOS7;
[self showStatusBar]; [self showStatusBar];