diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 538b73f49..7c7ea9e8f 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -672,23 +672,8 @@ typedef enum : NSUInteger { [self applyTheme]; [self.conversationViewModel viewDidLoad]; - // Loki: Set gradient background + [LKViewControllerUtilities setUpDefaultSessionStyleForVC:self withTitle:nil customBackButton:YES]; self.collectionView.backgroundColor = UIColor.clearColor; - LKGradient *gradient = LKGradients.defaultLokiBackground; - self.view.backgroundColor = UIColor.clearColor; - [self.view setGradient:gradient]; - - // Loki: Set navigation bar background color - UINavigationBar *navigationBar = self.navigationController.navigationBar; - [navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault]; - navigationBar.shadowImage = [UIImage new]; - [navigationBar setTranslucent:NO]; - navigationBar.barTintColor = LKColors.navigationBarBackground; - - // Loki: Set up navigation bar buttons - UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Back", "") style:UIBarButtonItemStylePlain target:nil action:nil]; - backButton.tintColor = LKColors.text; - self.navigationItem.backBarButtonItem = backButton; UIBarButtonItem *settingsButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"Gear"] style:UIBarButtonItemStylePlain target:self action:@selector(showConversationSettings)]; settingsButton.tintColor = LKColors.text; self.navigationItem.rightBarButtonItem = settingsButton; diff --git a/SignalMessaging/Loki/Redesign/Utilities/UIViewController+Utilities.swift b/SignalMessaging/Loki/Redesign/Utilities/UIViewController+Utilities.swift index 7fb93a775..644e0e833 100644 --- a/SignalMessaging/Loki/Redesign/Utilities/UIViewController+Utilities.swift +++ b/SignalMessaging/Loki/Redesign/Utilities/UIViewController+Utilities.swift @@ -5,7 +5,7 @@ public final class ViewControllerUtilities : NSObject { private override init() { } @objc(setUpDefaultSessionStyleForVC:withTitle:customBackButton:) - public static func setUpDefaultSessionStyle(for vc: UIViewController, title: String, hasCustomBackButton: Bool) { + public static func setUpDefaultSessionStyle(for vc: UIViewController, title: String?, hasCustomBackButton: Bool) { // Set gradient background vc.view.backgroundColor = .clear let gradient = Gradients.defaultLokiBackground @@ -18,11 +18,13 @@ public final class ViewControllerUtilities : NSObject { navigationBar.barTintColor = Colors.navigationBarBackground } // Customize title - let titleLabel = UILabel() - titleLabel.text = title - titleLabel.textColor = Colors.text - titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize) - vc.navigationItem.titleView = titleLabel + if let title = title { + let titleLabel = UILabel() + titleLabel.text = title + titleLabel.textColor = Colors.text + titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize) + vc.navigationItem.titleView = titleLabel + } // Set up back button if hasCustomBackButton { let backButton = UIBarButtonItem(title: "Back", style: .plain, target: nil, action: nil)