From 67c5db4d388763c755c4e5dae6c9c4283549b68f Mon Sep 17 00:00:00 2001 From: Mark Hingston Date: Tue, 10 Feb 2015 13:03:56 +1100 Subject: [PATCH 1/2] Fix iOS7 and Smoke notifications when call / hotspot bar displayed --- Library/JCNotificationBannerPresenterIOS7Style.m | 5 +++++ Library/JCNotificationBannerPresenterSmokeStyle.m | 5 +++++ Library/JCNotificationBannerPresenter_Private.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/Library/JCNotificationBannerPresenterIOS7Style.m b/Library/JCNotificationBannerPresenterIOS7Style.m index 8ed10a3..4d933fa 100644 --- a/Library/JCNotificationBannerPresenterIOS7Style.m +++ b/Library/JCNotificationBannerPresenterIOS7Style.m @@ -55,6 +55,11 @@ - (void) presentNotification:(JCNotificationBanner*)notification if (accountForStatusBarHeight) { y -= (MIN(statusBarSize.width, statusBarSize.height)); } + + CGFloat statusBarHeight = (MIN(statusBarSize.width, statusBarSize.height)); + if (statusBarHeight > kJCNotificationStandardStatusBarHeight + 1) { + y -= (statusBarHeight - kJCNotificationStandardStatusBarHeight); + } banner.frame = CGRectMake(x, y, bannerSize.width, bannerSize.height); diff --git a/Library/JCNotificationBannerPresenterSmokeStyle.m b/Library/JCNotificationBannerPresenterSmokeStyle.m index 967ac84..1cae796 100644 --- a/Library/JCNotificationBannerPresenterSmokeStyle.m +++ b/Library/JCNotificationBannerPresenterSmokeStyle.m @@ -56,6 +56,11 @@ - (void) presentNotification:(JCNotificationBanner*)notification if (accountForStatusBarHeight) { y -= (MIN(statusBarSize.width, statusBarSize.height)); } + + CGFloat statusBarHeight = (MIN(statusBarSize.width, statusBarSize.height)); + if (statusBarHeight > kJCNotificationStandardStatusBarHeight + 1) { + y -= (statusBarHeight - kJCNotificationStandardStatusBarHeight); + } banner.frame = CGRectMake(x, y, bannerSize.width, bannerSize.height); diff --git a/Library/JCNotificationBannerPresenter_Private.h b/Library/JCNotificationBannerPresenter_Private.h index d46f656..3d1d8ca 100644 --- a/Library/JCNotificationBannerPresenter_Private.h +++ b/Library/JCNotificationBannerPresenter_Private.h @@ -2,6 +2,8 @@ #import "JCNotificationBannerWindow.h" #import "JCNotificationBannerView.h" +const CGFloat kJCNotificationStandardStatusBarHeight = 20.0; + @interface JCNotificationBannerPresenter () { @private JCNotificationBannerWindow* bannerWindow; From 9bb9a9960092ea574389948c4f6f312fbb9ce3c4 Mon Sep 17 00:00:00 2001 From: Mark Hingston Date: Tue, 10 Feb 2015 13:26:29 +1100 Subject: [PATCH 2/2] Fix compile error --- Library/JCNotificationBannerPresenter_Private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/JCNotificationBannerPresenter_Private.h b/Library/JCNotificationBannerPresenter_Private.h index 3d1d8ca..b300ff2 100644 --- a/Library/JCNotificationBannerPresenter_Private.h +++ b/Library/JCNotificationBannerPresenter_Private.h @@ -2,7 +2,7 @@ #import "JCNotificationBannerWindow.h" #import "JCNotificationBannerView.h" -const CGFloat kJCNotificationStandardStatusBarHeight = 20.0; +static const CGFloat kJCNotificationStandardStatusBarHeight = 20.0; @interface JCNotificationBannerPresenter () { @private