Merge branch 'mkirk/fixup-navbar' into release/2.28.0

Signal/src/ViewControllers/NewGroupViewController.m

@@ -102,6 +102,8 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68;
 
     self.title = [MessageStrings newGroupDefaultTitle];
 
+    self.view.backgroundColor = UIColor.ows_themeBackgroundColor;
+
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc]
         initWithTitle:NSLocalizedString(@"NEW_GROUP_CREATE_BUTTON", @"The title for the 'create group' button.")
                 style:UIBarButtonItemStylePlain

Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m

@@ -102,6 +102,8 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert(self.thread.groupModel);
     OWSAssert(self.thread.groupModel.groupMemberIds);
 
+    self.view.backgroundColor = UIColor.ows_themeBackgroundColor;
+
     [self.memberRecipientIds addObjectsFromArray:self.thread.groupModel.groupMemberIds];
     self.previousMemberRecipientIds = [NSSet setWithArray:self.thread.groupModel.groupMemberIds];
 

SignalMessaging/Views/OWSNavigationBar.swift

@@ -40,6 +40,7 @@ public class OWSNavigationBar: UINavigationBar {
 
     @objc
     public static let backgroundBlurMutingFactor: CGFloat = 0.5
+    var blurEffectView: UIView?
 
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -53,6 +54,7 @@ public class OWSNavigationBar: UINavigationBar {
             let blurEffect = UIBlurEffect(style: .light)
             let blurEffectView = UIVisualEffectView(effect: blurEffect)
             blurEffectView.isUserInteractionEnabled = false
+            self.blurEffectView = blurEffectView
 
             // remove hairline below bar.
             self.shadowImage = UIImage()
@@ -71,6 +73,8 @@ public class OWSNavigationBar: UINavigationBar {
         NotificationCenter.default.addObserver(self, selector: #selector(didChangeStatusBarFrame), name: .UIApplicationDidChangeStatusBarFrame, object: nil)
     }
 
+    // MARK: Layout
+
     @objc
     public func callDidChange() {
         Logger.debug("\(self.logTag) in \(#function)")
@@ -125,4 +129,15 @@ public class OWSNavigationBar: UINavigationBar {
             }
         }
     }
+
+    // MARK: 
+
+    @objc
+    public func makeClear() {
+        self.backgroundColor = .clear
+        self.setBackgroundImage(UIImage(), for: .default)
+        self.shadowImage = UIImage()
+        self.clipsToBounds = true
+        self.blurEffectView?.isHidden = true
+    }
 }

SignalMessaging/attachments/AttachmentApprovalViewController.swift

@@ -67,11 +67,11 @@ public class AttachmentApprovalViewController: OWSViewController, CaptioningTool
         let vc = AttachmentApprovalViewController(attachment: attachment, delegate: delegate)
         let navController = OWSNavigationController(rootViewController: vc)
 
-        // Make navigationBar clear
-        navController.navigationBar.backgroundColor = .clear
-        navController.navigationBar.setBackgroundImage(UIImage(), for: .default)
-        navController.navigationBar.shadowImage = UIImage()
-        navController.navigationBar.clipsToBounds = true
+        guard let navigationBar = navController.navigationBar as? OWSNavigationBar else {
+            owsFail("\(self.logTag) in \(#function) navigationBar was nil or unexpected class")
+            return navController
+        }
+        navigationBar.makeClear()
 
         return navController
     }