rename to avoid confusion

pull/1/head
Michael Kirk 7 years ago
parent 7b29822c36
commit 7a5f5476db

@ -21,7 +21,7 @@ public class OWSNavigationBar: UINavigationBar {
@objc @objc
public var callBannerHeight: CGFloat { public var callBannerHeight: CGFloat {
return OWSWindowManagerCallScreenHeight() return OWSWindowManagerCallBannerHeight()
} }
@objc @objc

@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
#pragma mark - #pragma mark -
extern NSString *const OWSWindowManagerCallDidChangeNotification; extern NSString *const OWSWindowManagerCallDidChangeNotification;
const CGFloat OWSWindowManagerCallScreenHeight(void); const CGFloat OWSWindowManagerCallBannerHeight(void);
extern const UIWindowLevel UIWindowLevel_Background; extern const UIWindowLevel UIWindowLevel_Background;

@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
NSString *const OWSWindowManagerCallDidChangeNotification = @"OWSWindowManagerCallDidChangeNotification"; NSString *const OWSWindowManagerCallDidChangeNotification = @"OWSWindowManagerCallDidChangeNotification";
const CGFloat OWSWindowManagerCallScreenHeight(void) const CGFloat OWSWindowManagerCallBannerHeight(void)
{ {
if ([UIDevice currentDevice].isIPhoneX) { if ([UIDevice currentDevice].isIPhoneX) {
// On an iPhoneX, the system return-to-call banner has been replaced by a much subtler green // 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 - (void)didChangeStatusBarFrame:(NSNotification *)notification
{ {
CGRect newFrame = self.returnToCallWindow.frame; CGRect newFrame = self.returnToCallWindow.frame;
newFrame.size.height = OWSWindowManagerCallScreenHeight(); newFrame.size.height = OWSWindowManagerCallBannerHeight();
DDLogDebug(@"%@ StatusBar changed frames - updating returnToCallWindowFrame: %@", DDLogDebug(@"%@ StatusBar changed frames - updating returnToCallWindowFrame: %@",
self.logTag, self.logTag,
@ -195,7 +195,7 @@ const UIWindowLevel UIWindowLevel_MessageActions(void)
// "Return to call" should remain at the top of the screen. // "Return to call" should remain at the top of the screen.
CGRect windowFrame = UIScreen.mainScreen.bounds; CGRect windowFrame = UIScreen.mainScreen.bounds;
windowFrame.size.height = OWSWindowManagerCallScreenHeight(); windowFrame.size.height = OWSWindowManagerCallBannerHeight();
UIWindow *window = [[UIWindow alloc] initWithFrame:windowFrame]; UIWindow *window = [[UIWindow alloc] initWithFrame:windowFrame];
window.hidden = YES; window.hidden = YES;
window.windowLevel = UIWindowLevel_ReturnToCall(); window.windowLevel = UIWindowLevel_ReturnToCall();

Loading…
Cancel
Save