Merge branch 'charlesmchen/navigationBarAppearance'

Signal/src/ViewControllers/MessagesViewController.m

@@ -1013,6 +1013,7 @@ typedef enum : NSUInteger {
                                            NSForegroundColorAttributeName : [UIColor colorWithWhite:0.9f alpha:1.f],
                                        }]];
     self.navigationBarSubtitleLabel.attributedText = subtitleText;
+    [self.navigationBarSubtitleLabel sizeToFit];
 }
 
 - (void)initializeToolbars

Signal/src/util/UIUtil.m

@@ -1,3 +1,7 @@
+//
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
+
 #import "UIUtil.h"
 
 #define CONTACT_PICTURE_VIEW_BORDER_WIDTH 0.5f
@@ -30,8 +34,9 @@
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault];
     [[UINavigationBar appearance] setBarStyle:UIBarStyleDefault];
     [[UIBarButtonItem appearance] setTintColor:[UIColor blackColor]];
-    NSDictionary *navbarTitleTextAttributes = @{ NSForegroundColorAttributeName : [UIColor blackColor] };
-    [[UINavigationBar appearance] setTitleTextAttributes:navbarTitleTextAttributes];
+    [[UINavigationBar appearance] setTitleTextAttributes:@{
+                                                           NSForegroundColorAttributeName : [UIColor blackColor],
+                                                           }];
 }
 
 + (void)applySignalAppearence
@@ -46,14 +51,10 @@
     [[UIToolbar appearance] setTintColor:[UIColor ows_materialBlueColor]];
     [[UIBarButtonItem appearance] setTintColor:[UIColor whiteColor]];
 
-    NSShadow *shadow = [NSShadow new];
-    [shadow setShadowColor:[UIColor clearColor]];
-
-    NSDictionary *navbarTitleTextAttributes = @{
-        NSForegroundColorAttributeName : [UIColor whiteColor],
-        NSShadowAttributeName : shadow,
-    };
-    [[UINavigationBar appearance] setTitleTextAttributes:navbarTitleTextAttributes];
+    // If we set NSShadowAttributeName, the NSForegroundColorAttributeName value is ignored.
+    [[UINavigationBar appearance] setTitleTextAttributes:@{
+                                                           NSForegroundColorAttributeName : [UIColor whiteColor],
+                                                           }];
 }
 
 @end