From b2b95597cc7078f7e22ec831aa64f60445fe6be8 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 12 Jul 2018 18:43:31 -0400
Subject: [PATCH] Refine views.
---
.../OWSConversationSettingsViewController.m | 18 +++++++++---------
.../ThreadSettings/UpdateGroupViewController.m | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
index e36e62cef..ef5bfa332 100644
--- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
@@ -383,7 +383,7 @@ const CGFloat kIconViewLength = 24;
UILabel *rowLabel = [UILabel new];
rowLabel.text = NSLocalizedString(
@"DISAPPEARING_MESSAGES", @"table cell label in conversation settings");
- rowLabel.textColor = [UIColor blackColor];
+ rowLabel.textColor = [UIColor ows_themePrimaryColor];
rowLabel.font = [UIFont ows_dynamicTypeBodyFont];
rowLabel.lineBreakMode = NSLineBreakByTruncatingTail;
@@ -403,7 +403,7 @@ const CGFloat kIconViewLength = 24;
UILabel *subtitleLabel = [UILabel new];
subtitleLabel.text = NSLocalizedString(
@"DISAPPEARING_MESSAGES_DESCRIPTION", @"subheading in conversation settings");
- subtitleLabel.textColor = [UIColor blackColor];
+ subtitleLabel.textColor = [UIColor ows_themePrimaryColor];
subtitleLabel.font = [UIFont ows_dynamicTypeCaption1Font];
subtitleLabel.numberOfLines = 0;
subtitleLabel.lineBreakMode = NSLineBreakByWordWrapping;
@@ -433,7 +433,7 @@ const CGFloat kIconViewLength = 24;
UILabel *rowLabel = strongSelf.disappearingMessagesDurationLabel;
[strongSelf updateDisappearingMessagesDurationLabel];
- rowLabel.textColor = [UIColor blackColor];
+ rowLabel.textColor = [UIColor ows_themePrimaryColor];
rowLabel.font = [UIFont ows_dynamicTypeBodyFont];
// don't truncate useful duration info which is in the tail
rowLabel.lineBreakMode = NSLineBreakByTruncatingHead;
@@ -526,7 +526,7 @@ const CGFloat kIconViewLength = 24;
UILabel *rowLabel = [UILabel new];
rowLabel.text = NSLocalizedString(@"SETTINGS_ITEM_NOTIFICATION_SOUND",
@"Label for settings view that allows user to change the notification sound.");
- rowLabel.textColor = [UIColor blackColor];
+ rowLabel.textColor = [UIColor ows_themePrimaryColor];
rowLabel.font = [UIFont ows_dynamicTypeBodyFont];
rowLabel.lineBreakMode = NSLineBreakByTruncatingTail;
@@ -565,7 +565,7 @@ const CGFloat kIconViewLength = 24;
UILabel *rowLabel = [UILabel new];
rowLabel.text = NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_LABEL",
@"label for 'mute thread' cell in conversation settings");
- rowLabel.textColor = [UIColor blackColor];
+ rowLabel.textColor = [UIColor ows_themePrimaryColor];
rowLabel.font = [UIFont ows_dynamicTypeBodyFont];
rowLabel.lineBreakMode = NSLineBreakByTruncatingTail;
@@ -688,7 +688,7 @@ const CGFloat kIconViewLength = 24;
UILabel *rowLabel = [UILabel new];
rowLabel.text = name;
- rowLabel.textColor = [UIColor blackColor];
+ rowLabel.textColor = [UIColor ows_themePrimaryColor];
rowLabel.font = [UIFont ows_dynamicTypeBodyFont];
rowLabel.lineBreakMode = NSLineBreakByTruncatingTail;
@@ -744,7 +744,7 @@ const CGFloat kIconViewLength = 24;
UILabel *threadTitleLabel = [UILabel new];
threadTitleLabel.text = self.threadName;
- threadTitleLabel.textColor = [UIColor blackColor];
+ threadTitleLabel.textColor = [UIColor ows_themePrimaryColor];
threadTitleLabel.font = [UIFont ows_dynamicTypeTitle2Font];
threadTitleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
[threadNameView addSubview:threadTitleLabel];
@@ -757,7 +757,7 @@ const CGFloat kIconViewLength = 24;
const CGFloat kSubtitlePointSize = 12.f;
void (^addSubtitle)(NSAttributedString *) = ^(NSAttributedString *subtitle) {
UILabel *subtitleLabel = [UILabel new];
- subtitleLabel.textColor = [UIColor ows_darkGrayColor];
+ subtitleLabel.textColor = [UIColor ows_themeSecondaryColor];
subtitleLabel.font = [UIFont ows_regularFontWithSize:kSubtitlePointSize];
subtitleLabel.attributedText = subtitle;
subtitleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
@@ -835,7 +835,7 @@ const CGFloat kIconViewLength = 24;
OWSAssert(icon);
UIImageView *iconView = [UIImageView new];
iconView.image = [icon imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
- iconView.tintColor = [UIColor ows_darkIconColor];
+ iconView.tintColor = [UIColor ows_themeSecondaryColor];
iconView.contentMode = UIViewContentModeScaleAspectFit;
iconView.layer.minificationFilter = kCAFilterTrilinear;
iconView.layer.magnificationFilter = kCAFilterTrilinear;
diff --git a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m
index c76d00467..42445e297 100644
--- a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m
@@ -172,7 +172,7 @@ NS_ASSUME_NONNULL_BEGIN
firstSectionHeader.userInteractionEnabled = YES;
[firstSectionHeader
addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(headerWasTapped:)]];
- firstSectionHeader.backgroundColor = [UIColor whiteColor];
+ firstSectionHeader.backgroundColor = [UIColor ows_themeBackgroundColor];
UIView *threadInfoView = [UIView new];
[firstSectionHeader addSubview:threadInfoView];
[threadInfoView autoPinWidthToSuperviewWithMargin:16.f];
@@ -193,7 +193,7 @@ NS_ASSUME_NONNULL_BEGIN
UITextField *groupNameTextField = [UITextField new];
_groupNameTextField = groupNameTextField;
self.groupNameTextField.text = [self.thread.groupModel.groupName ows_stripped];
- groupNameTextField.textColor = [UIColor blackColor];
+ groupNameTextField.textColor = [UIColor ows_themePrimaryColor];
groupNameTextField.font = [UIFont ows_dynamicTypeTitle2Font];
groupNameTextField.placeholder
= NSLocalizedString(@"NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT", @"Placeholder text for group name field");