TouchInstinct
/
TLYShyNavBar
313
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If the viewController is within a popover or other modal view, it should not be placed a status bar height below the top of that view. This fixes the use of shyNavBars in those settings.

This commit is contained in:
Evan D. Schoenberg, M.D 2015-08-08 18:19:57 -04:00
parent 3f5707ebc5
commit e32543c31b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
TLYShyNavBar/TLYShyNavBarManager.m
View File

@ -20,12 +20,16 @@
// Thanks to SO user, MattDiPasquale
// http://stackoverflow.com/questions/12991935/how-to-programmatically-get-ios-status-bar-height/16598350#16598350
static inline CGFloat AACStatusBarHeight()
static inline CGFloat AACStatusBarHeight(UIViewController *viewController)
{
if ([UIApplication sharedApplication].statusBarHidden)
{
return 0.f;
}
if (viewController.presentingViewController != nil)
{
return 0.f;
}
CGSize statusBarSize = [UIApplication sharedApplication].statusBarFrame.size;
return MIN(MIN(statusBarSize.width, statusBarSize.height), 20.0f);
@ -96,10 +100,12 @@ static void * const kTLYShyNavBarManagerKVOContext = (void*)&kTLYShyNavBarManage
self.navBarController = [[TLYShyViewController alloc] init];
self.navBarController.hidesSubviews = YES;
__weak __typeof(self) weakSelf = self;
self.navBarController.expandedCenter = ^(UIView *view)
{
return CGPointMake(CGRectGetMidX(view.bounds),
CGRectGetMidY(view.bounds) + AACStatusBarHeight());
CGRectGetMidY(view.bounds) + AACStatusBarHeight(weakSelf.viewController));
};
self.navBarController.contractionAmount = ^(UIView *view)
@ -119,7 +125,6 @@ static void * const kTLYShyNavBarManagerKVOContext = (void*)&kTLYShyNavBarManage
return CGRectGetHeight(view.bounds);
};
__weak __typeof(self) weakSelf = self;
self.extensionController.expandedCenter = ^(UIView *view)
{
return CGPointMake(CGRectGetMidX(view.bounds),
@ -290,7 +295,7 @@ static void * const kTLYShyNavBarManagerKVOContext = (void*)&kTLYShyNavBarManage
deltaY = MIN(0, availableResistance + deltaY);
}
else if (self.scrollView.contentOffset.y > -AACStatusBarHeight())
else if (self.scrollView.contentOffset.y > -AACStatusBarHeight(self.viewController))
{
CGFloat availableResistance = self.expansionResistance - self.resistanceConsumed;
self.resistanceConsumed = MIN(self.expansionResistance, self.resistanceConsumed + deltaY);