From 33eb4c38cd7ef629001bef15024c3c7c9ad02185 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 16 May 2018 21:51:34 -0400 Subject: [PATCH] Centralize translucency configuration // FREEBIE --- .../AppSettings/AppSettingsViewController.m | 1 - .../AppSettings/BlockListViewController.m | 6 ------ .../AppSettings/DomainFrontingCountryViewController.m | 1 - .../ConversationView/ConversationViewController.m | 5 ----- Signal/src/ViewControllers/HomeView/HomeViewController.m | 1 - .../src/ViewControllers/NewContactThreadViewController.m | 2 -- Signal/src/ViewControllers/NewGroupViewController.m | 7 ------- Signal/src/ViewControllers/ProfileViewController.m | 3 +-- .../ThreadSettings/ShowGroupMembersViewController.m | 5 ----- .../ThreadSettings/UpdateGroupViewController.m | 9 +-------- Signal/src/views/SignalNavigationBar.swift | 2 ++ SignalMessaging/ViewControllers/OWSTableViewController.m | 7 ------- SignalMessaging/contacts/CountryCodeViewController.m | 1 - SignalMessaging/contacts/SelectRecipientViewController.m | 1 - SignalMessaging/contacts/SelectThreadViewController.m | 6 ------ 15 files changed, 4 insertions(+), 53 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m index 241459a56..51de91328 100644 --- a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m @@ -80,7 +80,6 @@ OWSAssert([self.navigationController isKindOfClass:[OWSNavigationController class]]); - [self.navigationController.navigationBar setTranslucent:NO]; self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemStop target:self diff --git a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m index a0d30979d..e064028ac 100644 --- a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m +++ b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m @@ -47,12 +47,6 @@ NS_ASSUME_NONNULL_BEGIN [self updateTableContents]; } -- (void)viewDidLoad -{ - [super viewDidLoad]; - [self.navigationController.navigationBar setTranslucent:NO]; -} - #pragma mark - Table view data source - (void)updateTableContents diff --git a/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m b/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m index a5f2ccf8b..06028daf5 100644 --- a/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m +++ b/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m @@ -31,7 +31,6 @@ NS_ASSUME_NONNULL_BEGIN @"CENSORSHIP_CIRCUMVENTION_COUNTRY_VIEW_TITLE", @"Title for the 'censorship circumvention country' view."); self.view.backgroundColor = [UIColor whiteColor]; - [self.navigationController.navigationBar setTranslucent:NO]; [self createViews]; } diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 89e9d8e81..c954eae7b 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -500,11 +500,8 @@ typedef enum : NSUInteger { { [super viewDidLoad]; - // self.topLayoutGuide [self createContents]; - [self.navigationController.navigationBar setTranslucent:NO]; - [self registerCellClasses]; [self createConversationScrollButtons]; @@ -527,8 +524,6 @@ typedef enum : NSUInteger { { [super loadView]; - // extendedLayoutIncludesOpaqueBars - // self.extendedLayoutIncludesOpaqueBars = YES; self.view.backgroundColor = [UIColor ows_toolbarBackgroundColor]; } diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 9b3b6d81c..e68963b39 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -252,7 +252,6 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations - (void)viewDidLoad { [super viewDidLoad]; - [self.navigationController.navigationBar setTranslucent:NO]; self.editingDbConnection = OWSPrimaryStorage.sharedManager.newDatabaseConnection; diff --git a/Signal/src/ViewControllers/NewContactThreadViewController.m b/Signal/src/ViewControllers/NewContactThreadViewController.m index bf1c145c7..bc531085a 100644 --- a/Signal/src/ViewControllers/NewContactThreadViewController.m +++ b/Signal/src/ViewControllers/NewContactThreadViewController.m @@ -269,8 +269,6 @@ NS_ASSUME_NONNULL_BEGIN // a message. [self.contactsViewHelper.contactsManager requestSystemContactsOnce]; - [self.navigationController.navigationBar setTranslucent:NO]; - [self showContactAppropriateViews]; } diff --git a/Signal/src/ViewControllers/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupViewController.m index 3fac30bd9..2482f23ff 100644 --- a/Signal/src/ViewControllers/NewGroupViewController.m +++ b/Signal/src/ViewControllers/NewGroupViewController.m @@ -420,13 +420,6 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68; #pragma mark - Methods -- (void)viewDidLoad -{ - [super viewDidLoad]; - - [self.navigationController.navigationBar setTranslucent:NO]; -} - - (void)viewDidAppear:(BOOL)animated { [super viewDidAppear:animated]; diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index eeaf5881c..bc661c815 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -75,7 +75,6 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat { [super loadView]; - [self.navigationController.navigationBar setTranslucent:NO]; self.title = NSLocalizedString(@"PROFILE_VIEW_TITLE", @"Title for the profile view."); _avatarViewHelper = [AvatarViewHelper new]; @@ -94,7 +93,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat UIView *contentView = [UIView containerView]; contentView.backgroundColor = [UIColor whiteColor]; [self.view addSubview:contentView]; - [contentView autoPinEdgeToSuperviewEdge:ALEdgeTop]; + [contentView autoPinToTopLayoutGuideOfViewController:self withInset:0]; [contentView autoPinWidthToSuperview]; const CGFloat fontSizePoints = ScaleFromIPhone5To7Plus(16.f, 20.f); diff --git a/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m b/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m index f22e16e5b..757520e7f 100644 --- a/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m @@ -97,11 +97,6 @@ NS_ASSUME_NONNULL_BEGIN OWSAssert([self.navigationController isKindOfClass:[OWSNavigationController class]]); - // HACK otherwise CNContactViewController Navbar is shown as black. - // RADAR rdar://28433898 http://www.openradar.me/28433898 - // CNContactViewController incompatible with opaque navigation bar - [self.navigationController.navigationBar setTranslucent:YES]; - self.title = _thread.groupModel.groupName; [self updateTableContents]; diff --git a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m index a67d5e7ae..4b5a03c17 100644 --- a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m @@ -113,7 +113,7 @@ NS_ASSUME_NONNULL_BEGIN [self.view addSubview:firstSection]; [firstSection autoSetDimension:ALDimensionHeight toSize:100.f]; [firstSection autoPinWidthToSuperview]; - [firstSection autoPinEdgeToSuperviewEdge:ALEdgeTop]; + [firstSection autoPinToTopLayoutGuideOfViewController:self withInset:0]; _tableViewController = [OWSTableViewController new]; _tableViewController.delegate = self; @@ -125,13 +125,6 @@ NS_ASSUME_NONNULL_BEGIN [self updateTableContents]; } -- (void)viewDidLoad -{ - [super viewDidLoad]; - - [self.navigationController.navigationBar setTranslucent:NO]; -} - - (void)setHasUnsavedChanges:(BOOL)hasUnsavedChanges { _hasUnsavedChanges = hasUnsavedChanges; diff --git a/Signal/src/views/SignalNavigationBar.swift b/Signal/src/views/SignalNavigationBar.swift index 017178c39..43c75353e 100644 --- a/Signal/src/views/SignalNavigationBar.swift +++ b/Signal/src/views/SignalNavigationBar.swift @@ -16,6 +16,8 @@ class SignalNavigationBar: UINavigationBar { override init(frame: CGRect) { super.init(frame: frame) + self.isTranslucent = false + // TODO better place to observe? NotificationCenter.default.addObserver(forName: .OWSWindowManagerCallDidChange, object: nil, queue: nil) { _ in Logger.debug("\(self.logTag) in \(#function) OWSWindowManagerCallDidChange") diff --git a/SignalMessaging/ViewControllers/OWSTableViewController.m b/SignalMessaging/ViewControllers/OWSTableViewController.m index cce54fc89..21e273034 100644 --- a/SignalMessaging/ViewControllers/OWSTableViewController.m +++ b/SignalMessaging/ViewControllers/OWSTableViewController.m @@ -463,13 +463,6 @@ NSString *const kOWSTableCellIdentifier = @"kOWSTableCellIdentifier"; [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:kOWSTableCellIdentifier]; } -- (void)viewDidLoad -{ - [super viewDidLoad]; - - [self.navigationController.navigationBar setTranslucent:NO]; -} - - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; diff --git a/SignalMessaging/contacts/CountryCodeViewController.m b/SignalMessaging/contacts/CountryCodeViewController.m index 8b81bfacd..e5e488d7b 100644 --- a/SignalMessaging/contacts/CountryCodeViewController.m +++ b/SignalMessaging/contacts/CountryCodeViewController.m @@ -26,7 +26,6 @@ [super loadView]; self.view.backgroundColor = [UIColor whiteColor]; - [self.navigationController.navigationBar setTranslucent:NO]; self.title = NSLocalizedString(@"COUNTRYCODE_SELECT_TITLE", @""); self.countryCodes = [PhoneNumberUtil countryCodesForSearchTerm:nil]; diff --git a/SignalMessaging/contacts/SelectRecipientViewController.m b/SignalMessaging/contacts/SelectRecipientViewController.m index 1a681849c..84e7ebb88 100644 --- a/SignalMessaging/contacts/SelectRecipientViewController.m +++ b/SignalMessaging/contacts/SelectRecipientViewController.m @@ -55,7 +55,6 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien [super loadView]; self.view.backgroundColor = [UIColor whiteColor]; - [self.navigationController.navigationBar setTranslucent:NO]; _contactsViewHelper = [[ContactsViewHelper alloc] initWithDelegate:self]; diff --git a/SignalMessaging/contacts/SelectThreadViewController.m b/SignalMessaging/contacts/SelectThreadViewController.m index 18e84e81a..ae90b6cfe 100644 --- a/SignalMessaging/contacts/SelectThreadViewController.m +++ b/SignalMessaging/contacts/SelectThreadViewController.m @@ -81,12 +81,6 @@ NS_ASSUME_NONNULL_BEGIN [self updateTableContents]; } -- (void)viewDidLoad -{ - [super viewDidLoad]; - [self.navigationController.navigationBar setTranslucent:NO]; -} - - (void)createViews { OWSAssert(self.selectThreadViewDelegate);