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-31 18:52:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-10047 fix iOS 8 deprecated warnings

Browse Source 
Removed all references to self.viewController.interfaceOrientation,
they weren’t really used on invertFrameIfNeeded and are deprecated on
iOS 8
Removed orientation param on invertFrameIfNeeded as it wasn’t being
used.

closes #26
This commit is contained in:
Julio César 2016-02-22 19:41:22 +01:00
parent 241577c3c8
commit 47f245462d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ios/CDVStatusBar.m
View File

@ -190,7 +190,7 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
statusBarFrame.origin.y = 0; statusBarFrame.origin.y = 0;
} }
statusBarFrame = [self invertFrameIfNeeded:statusBarFrame orientation:self.viewController.interfaceOrientation]; statusBarFrame = [self invertFrameIfNeeded:statusBarFrame];
_statusBarBackgroundView = [[UIView alloc] initWithFrame:statusBarFrame]; _statusBarBackgroundView = [[UIView alloc] initWithFrame:statusBarFrame];
_statusBarBackgroundView.backgroundColor = _statusBarBackgroundColor; _statusBarBackgroundView.backgroundColor = _statusBarBackgroundColor;
@ -198,7 +198,7 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
_statusBarBackgroundView.autoresizesSubviews = YES; _statusBarBackgroundView.autoresizesSubviews = YES;
} }
- (CGRect) invertFrameIfNeeded:(CGRect)rect orientation:(UIInterfaceOrientation)orientation { - (CGRect) invertFrameIfNeeded:(CGRect)rect {
// 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 (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]) && (rect.size.width < rect.size.height)) { if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]) && (rect.size.width < rect.size.height)) {
@ -422,7 +422,7 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
// from the current one. Therefore we need to expand the statusBarBackgroundView as well to the // from the current one. Therefore we need to expand the statusBarBackgroundView as well to the
// statusBar's current size // statusBar's current size
CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame; CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame;
statusBarFrame = [self invertFrameIfNeeded:statusBarFrame orientation:self.viewController.interfaceOrientation]; statusBarFrame = [self invertFrameIfNeeded:statusBarFrame];
CGRect sbBgFrame = _statusBarBackgroundView.frame; CGRect sbBgFrame = _statusBarBackgroundView.frame;
sbBgFrame.size = statusBarFrame.size; sbBgFrame.size = statusBarFrame.size;
_statusBarBackgroundView.frame = sbBgFrame; _statusBarBackgroundView.frame = sbBgFrame;
@ -444,7 +444,7 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
CGRect bounds = [[UIScreen mainScreen] bounds]; CGRect bounds = [[UIScreen mainScreen] bounds];
bounds = [self invertFrameIfNeeded:bounds orientation:self.viewController.interfaceOrientation]; bounds = [self invertFrameIfNeeded:bounds];
if (UIInterfaceOrientationIsPortrait([[UIApplication sharedApplication] statusBarOrientation])) { if (UIInterfaceOrientationIsPortrait([[UIApplication sharedApplication] statusBarOrientation])) {
self.viewController.view.frame = bounds; self.viewController.view.frame = bounds;
@ -455,7 +455,7 @@ static const void *kStatusBarStyle = &kStatusBarStyle;
if (!self.statusBarOverlaysWebView) { if (!self.statusBarOverlaysWebView) {
CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame; CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame;
statusBarFrame = [self invertFrameIfNeeded:statusBarFrame orientation:self.viewController.interfaceOrientation]; statusBarFrame = [self invertFrameIfNeeded:statusBarFrame];
CGRect frame = self.webView.frame; CGRect frame = self.webView.frame;
frame.origin.y = statusBarFrame.size.height; frame.origin.y = statusBarFrame.size.height;