fixup white nav

pull/1/head
Michael Kirk 7 years ago
parent 767f06b09f
commit ee898829a1

@ -1320,11 +1320,11 @@ typedef enum : NSUInteger {
if (OWSWindowManager.sharedManager.hasCall) { if (OWSWindowManager.sharedManager.hasCall) {
callButton.enabled = NO; callButton.enabled = NO;
callButton.userInteractionEnabled = NO; callButton.userInteractionEnabled = NO;
callButton.tintColor = UIColor.lightGrayColor; callButton.tintColor = [UIColor.ows_navbarForegroundColor colorWithAlphaComponent:0.7];
} else { } else {
callButton.enabled = YES; callButton.enabled = YES;
callButton.userInteractionEnabled = YES; callButton.userInteractionEnabled = YES;
callButton.tintColor = UIColor.whiteColor; callButton.tintColor = UIColor.ows_navbarForegroundColor;
} }
UIEdgeInsets imageEdgeInsets = UIEdgeInsetsZero; UIEdgeInsets imageEdgeInsets = UIEdgeInsetsZero;
@ -1352,7 +1352,7 @@ typedef enum : NSUInteger {
DisappearingTimerConfigurationView *timerView = [[DisappearingTimerConfigurationView alloc] DisappearingTimerConfigurationView *timerView = [[DisappearingTimerConfigurationView alloc]
initWithDurationSeconds:self.disappearingMessagesConfiguration.durationSeconds]; initWithDurationSeconds:self.disappearingMessagesConfiguration.durationSeconds];
timerView.delegate = self; timerView.delegate = self;
timerView.tintColor = UIColor.whiteColor; timerView.tintColor = UIColor.ows_navbarForegroundColor;
// As of iOS11, we can size barButton item custom views with autoLayout. // As of iOS11, we can size barButton item custom views with autoLayout.
// Before that, though we can still use autoLayout *within* the customView, // Before that, though we can still use autoLayout *within* the customView,

@ -275,6 +275,8 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
[self.view addSubview:self.tableView]; [self.view addSubview:self.tableView];
[self.tableView autoPinWidthToSuperview]; [self.tableView autoPinWidthToSuperview];
[self.tableView autoPinEdgeToSuperviewEdge:ALEdgeBottom]; [self.tableView autoPinEdgeToSuperviewEdge:ALEdgeBottom];
// TODO - have content scroll behind navbar will require changing this.
[self.tableView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:reminderStackView]; [self.tableView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:reminderStackView];
self.tableView.rowHeight = UITableViewAutomaticDimension; self.tableView.rowHeight = UITableViewAutomaticDimension;
self.tableView.estimatedRowHeight = 60; self.tableView.estimatedRowHeight = 60;

@ -457,9 +457,7 @@ NSString *const kOWSTableCellIdentifier = @"kOWSTableCellIdentifier";
[self.tableView applyScrollViewInsetsFix]; [self.tableView applyScrollViewInsetsFix];
[self.view addSubview:self.tableView]; [self.view addSubview:self.tableView];
[self.tableView autoPinWidthToSuperview]; [self.tableView autoPinEdgesToSuperviewEdges];
[self.tableView autoPinToTopLayoutGuideOfViewController:self withInset:0];
[self.tableView autoPinEdgeToSuperviewEdge:ALEdgeBottom];
[self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:kOWSTableCellIdentifier]; [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:kOWSTableCellIdentifier];
} }

Loading…
Cancel
Save