Merge branch 'mkirk/white-status-for-calls'

Signal/Signal-Info.plist

@@ -127,6 +127,6 @@
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
+	<true/>
 </dict>
 </plist>

Signal/src/ViewControllers/CallViewController.swift

@@ -85,6 +85,10 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver,
         }
     }
 
+    override var preferredStatusBarStyle: UIStatusBarStyle {
+        return .lightContent
+    }
+
     // MARK: - Settings Nag Views
 
     var isShowingSettingsNag = false {

Signal/src/util/MainAppContext.m

@@ -141,11 +141,6 @@ NS_ASSUME_NONNULL_BEGIN
     return isRTL;
 }
 
-- (void)setStatusBarStyle:(UIStatusBarStyle)statusBarStyle
-{
-    [[UIApplication sharedApplication] setStatusBarStyle:statusBarStyle];
-}
-
 - (void)setStatusBarHidden:(BOOL)isHidden animated:(BOOL)isAnimated
 {
     [[UIApplication sharedApplication] setStatusBarHidden:isHidden animated:isAnimated];

SignalMessaging/ViewControllers/OWSNavigationController.m

@@ -107,12 +107,22 @@ NS_ASSUME_NONNULL_BEGIN
     }
 }
 
-
 #pragma mark - NavBarLayoutDelegate
 
 - (void)navBarCallLayoutDidChangeWithNavbar:(OWSNavigationBar *)navbar
 {
     [self updateLayoutForNavbar:navbar];
+    [self setNeedsStatusBarAppearanceUpdate];
+}
+
+- (UIStatusBarStyle)preferredStatusBarStyle
+{
+    if (OWSWindowManager.sharedManager.hasCall) {
+        // Status bar is overlaying the green "call banner"
+        return UIStatusBarStyleLightContent;
+    } else {
+        return super.preferredStatusBarStyle;
+    }
 }
 
 - (void)updateLayoutForNavbar:(OWSNavigationBar *)navbar

SignalMessaging/utils/UIUtil.m

@@ -32,9 +32,6 @@
     UIToolbar.appearance.tintColor = UIColor.ows_navbarIconColor;
 
     UIBarButtonItem.appearance.tintColor = UIColor.ows_navbarIconColor;
-    // Because our launch screen is blue, we specify the light content in our plist
-    // but once the app has loaded we want to switch to dark.
-    [CurrentAppContext() setStatusBarStyle:UIStatusBarStyleDefault];
 
     //    [[UIBarButtonItem appearanceWhenContainedIn:[UISearchBar class], nil] setTintColor:[UIColor
     //    ows_materialBlueColor]];

SignalServiceKit/src/Util/AppContext.h

@@ -74,7 +74,6 @@ NSString *NSStringForUIApplicationState(UIApplicationState value);
 // Should only be called if isMainApp is YES.
 - (void)setMainAppBadgeNumber:(NSInteger)value;
 
-- (void)setStatusBarStyle:(UIStatusBarStyle)statusBarStyle;
 - (void)setStatusBarHidden:(BOOL)isHidden animated:(BOOL)isAnimated;
 
 @property (nonatomic, readonly) CGFloat statusBarHeight;

SignalShareExtension/utils/ShareAppExtensionContext.m

@@ -135,11 +135,6 @@ NS_ASSUME_NONNULL_BEGIN
     return isRTL;
 }
 
-- (void)setStatusBarStyle:(UIStatusBarStyle)statusBarStyle
-{
-    DDLogInfo(@"Ignoring request to set status bar style since we're in an app extension");
-}
-
 - (void)setStatusBarHidden:(BOOL)isHidden animated:(BOOL)isAnimated
 {
     DDLogInfo(@"Ignoring request to show/hide status bar since we're in an app extension");