diff --git a/SignalMessaging/Views/OWSNavigationBar.swift b/SignalMessaging/Views/OWSNavigationBar.swift index 24fe46f1d..fdc747df7 100644 --- a/SignalMessaging/Views/OWSNavigationBar.swift +++ b/SignalMessaging/Views/OWSNavigationBar.swift @@ -21,7 +21,7 @@ public class OWSNavigationBar: UINavigationBar { @objc public var callBannerHeight: CGFloat { - return OWSWindowManagerCallScreenHeight() + return OWSWindowManagerCallBannerHeight() } @objc diff --git a/SignalMessaging/utils/OWSWindowManager.h b/SignalMessaging/utils/OWSWindowManager.h index 4fee1784d..f8117d22c 100644 --- a/SignalMessaging/utils/OWSWindowManager.h +++ b/SignalMessaging/utils/OWSWindowManager.h @@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - extern NSString *const OWSWindowManagerCallDidChangeNotification; -const CGFloat OWSWindowManagerCallScreenHeight(void); +const CGFloat OWSWindowManagerCallBannerHeight(void); extern const UIWindowLevel UIWindowLevel_Background; diff --git a/SignalMessaging/utils/OWSWindowManager.m b/SignalMessaging/utils/OWSWindowManager.m index 82cf86f3e..f1a9fd6f8 100644 --- a/SignalMessaging/utils/OWSWindowManager.m +++ b/SignalMessaging/utils/OWSWindowManager.m @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN NSString *const OWSWindowManagerCallDidChangeNotification = @"OWSWindowManagerCallDidChangeNotification"; -const CGFloat OWSWindowManagerCallScreenHeight(void) +const CGFloat OWSWindowManagerCallBannerHeight(void) { if ([UIDevice currentDevice].isIPhoneX) { // On an iPhoneX, the system return-to-call banner has been replaced by a much subtler green @@ -175,7 +175,7 @@ const UIWindowLevel UIWindowLevel_MessageActions(void) - (void)didChangeStatusBarFrame:(NSNotification *)notification { CGRect newFrame = self.returnToCallWindow.frame; - newFrame.size.height = OWSWindowManagerCallScreenHeight(); + newFrame.size.height = OWSWindowManagerCallBannerHeight(); DDLogDebug(@"%@ StatusBar changed frames - updating returnToCallWindowFrame: %@", self.logTag, @@ -195,7 +195,7 @@ const UIWindowLevel UIWindowLevel_MessageActions(void) // "Return to call" should remain at the top of the screen. CGRect windowFrame = UIScreen.mainScreen.bounds; - windowFrame.size.height = OWSWindowManagerCallScreenHeight(); + windowFrame.size.height = OWSWindowManagerCallBannerHeight(); UIWindow *window = [[UIWindow alloc] initWithFrame:windowFrame]; window.hidden = YES; window.windowLevel = UIWindowLevel_ReturnToCall();