signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Revise dark theme.

Browse Source
This commit is contained in:
Matthew Chen 2020-04-16 11:32:35 -03:00
parent 817780f201
commit 3bbbb1aae0
33 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Signal/src/ConversationSearch.swift
View File

@ -217,12 +217,12 @@ public class SearchResultsBar: UIView {
let upChevron = #imageLiteral(resourceName: "ic_chevron_up").withRenderingMode(.alwaysTemplate)
showLessRecentButton = UIBarButtonItem(image: upChevron, style: .plain, target: self, action: #selector(didTapShowLessRecent))
showLessRecentButton.imageInsets = UIEdgeInsets(top: 2, left: leftExteriorChevronMargin, bottom: 2, right: leftInteriorChevronMargin)
showLessRecentButton.tintColor = Theme.accentBlueColor
showLessRecentButton.tintColor = UIColor.ows_accentBlue
let downChevron = #imageLiteral(resourceName: "ic_chevron_down").withRenderingMode(.alwaysTemplate)
showMoreRecentButton = UIBarButtonItem(image: downChevron, style: .plain, target: self, action: #selector(didTapShowMoreRecent))
showMoreRecentButton.imageInsets = UIEdgeInsets(top: 2, left: leftInteriorChevronMargin, bottom: 2, right: leftExteriorChevronMargin)
showMoreRecentButton.tintColor = Theme.accentBlueColor
showMoreRecentButton.tintColor = UIColor.ows_accentBlue
let spacer1 = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
let spacer2 = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)

2
Signal/src/Experience Upgrades/Upgrade Views/IntroducingPINs.swift
View File

@ -132,7 +132,7 @@ class IntroducingPinsSplash: SplashViewController {
let primaryButton = OWSFlatButton.button(title: primaryButtonTitle(),
font: UIFont.ows_dynamicTypeBody.ows_semibold(),
titleColor: .white,
backgroundColor: Theme.accentBlueColor,
backgroundColor: .ows_accentBlue,
target: self,
selector: #selector(didTapPrimaryButton))
primaryButton.autoSetHeightUsingFont()

2
Signal/src/Experience Upgrades/Upgrade Views/MessageRequests.swift
View File

@ -77,7 +77,7 @@ class MessageRequestsSplash: SplashViewController {
let primaryButton = OWSFlatButton.button(title: primaryButtonTitle(),
font: UIFont.ows_dynamicTypeBody.ows_semibold(),
titleColor: .white,
backgroundColor: Theme.accentBlueColor,
backgroundColor: .ows_accentBlue,
target: self,
selector: #selector(didTapPrimaryButton))
primaryButton.autoSetHeightUsingFont()

2
Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m
View File

@ -205,7 +205,7 @@
: NSLocalizedString(@"SETTINGS_RELINK_BUTTON", @"Label for re-link button.")
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"reregister")
selector:@selector(reregisterUser)
color:Theme.accentBlueColor]];
color:UIColor.ows_accentBlueColor]];
[section addItem:[self destructiveButtonItemWithTitle:NSLocalizedString(@"SETTINGS_DELETE_DATA_BUTTON",
@"Label for 'delete data' button.")
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"delete_data")

2
Signal/src/ViewControllers/Attachment Keyboard/AttachmentKeyboard.swift
View File

@ -289,7 +289,7 @@ private class RecentPhotosErrorView: UIView {
stackView.addArrangedSubview(label)
let button = OWSFlatButton()
button.setBackgroundColors(upColor: Theme.accentBlueColor)
button.setBackgroundColors(upColor: .ows_accentBlue)
button.setTitle(title: CommonStrings.openSettingsButton, font: .ows_dynamicTypeBodyClamped, titleColor: .white)
button.useDefaultCornerRadius()
button.contentEdgeInsets = UIEdgeInsets(top: 3, leading: 8, bottom: 3, trailing: 8)

2
Signal/src/ViewControllers/Call/CallVideoHintView.swift
View File

@ -25,7 +25,7 @@ class CallVideoHintView: UIView {
let layerView = OWSLayerView()
let shapeLayer = CAShapeLayer()
shapeLayer.fillColor = Theme.accentBlueColor.cgColor
shapeLayer.fillColor = UIColor.ows_accentBlue.cgColor
layerView.layer.addSublayer(shapeLayer)
addSubview(layerView)
layerView.autoPinEdgesToSuperviewEdges()

4
Signal/src/ViewControllers/Call/CallViewController.swift
View File

@ -335,7 +335,7 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver,
comment: "Label for button that shows the privacy settings."),
font: OWSFlatButton.fontForHeight(buttonHeight),
titleColor: UIColor.white,
backgroundColor: Theme.accentBlueColor,
backgroundColor: UIColor.ows_accentBlue,
target: self,
selector: #selector(didPressShowCallSettings))
viewStack.addSubview(callSettingsButton)
@ -347,7 +347,7 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver,
comment: "Label for button that dismiss the call view's settings nag."),
font: OWSFlatButton.fontForHeight(buttonHeight),
titleColor: UIColor.white,
backgroundColor: Theme.accentBlueColor,
backgroundColor: UIColor.ows_accentBlue,
target: self,
selector: #selector(didPressDismissNag))
viewStack.addSubview(notNowButton)

2
Signal/src/ViewControllers/ConversationView/Cells/ReactionCountsView.swift
View File

@ -147,7 +147,7 @@ private class ReactionPillView: UIView {
private func configureColors(fromLocalUser: Bool) {
layer.borderColor = Theme.backgroundColor.cgColor
backgroundColor = fromLocalUser ? Theme.accentBlueColor : Theme.isDarkThemeEnabled ? UIColor.ows_gray75 : UIColor.ows_gray05
backgroundColor = fromLocalUser ? .ows_accentBlue : Theme.isDarkThemeEnabled ? UIColor.ows_gray75 : UIColor.ows_gray05
countLabel.textColor = fromLocalUser ? .ows_white : Theme.primaryTextColor
}
}

7
Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
View File

@ -233,7 +233,7 @@ const CGFloat kMaxIPadTextViewHeight = 142;
_sendButton = [[UIButton alloc] init];
self.sendButton.accessibilityLabel = MessageStrings.sendButton;
[self.sendButton addTarget:self action:@selector(sendButtonPressed) forControlEvents:UIControlEventTouchUpInside];
[self.sendButton setTemplateImageName:@"send-solid-24" tintColor:Theme.accentBlueColor];
[self.sendButton setTemplateImageName:@"send-solid-24" tintColor:UIColor.ows_accentBlueColor];
[self.sendButton autoSetDimensionsToSize:CGSizeMake(50, kMinToolbarItemHeight)];
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _sendButton);
@ -648,7 +648,8 @@ const CGFloat kMaxIPadTextViewHeight = 142;
ensureViewHiddenState(self.stickerButton, hideStickerButton);
if (!hideStickerButton) {
self.stickerButton.imageView.tintColor
= (self.desiredKeyboardType == KeyboardType_Sticker ? Theme.accentBlueColor : Theme.primaryIconColor);
= (self.desiredKeyboardType == KeyboardType_Sticker ? UIColor.ows_accentBlueColor
: Theme.primaryIconColor);
}
[self.attachmentButton setSelected:self.desiredKeyboardType == KeyboardType_Attachment animated:isAnimated];
@ -1026,7 +1027,7 @@ const CGFloat kMaxIPadTextViewHeight = 142;
[weakSelf.inputToolbarDelegate voiceMemoGestureDidComplete];
}];
[sendVoiceMemoButton setTitle:MessageStrings.sendButton forState:UIControlStateNormal];
[sendVoiceMemoButton setTitleColor:Theme.accentBlueColor forState:UIControlStateNormal];
[sendVoiceMemoButton setTitleColor:UIColor.ows_accentBlueColor forState:UIControlStateNormal];
sendVoiceMemoButton.alpha = 0;
[self.voiceMemoContentView addSubview:sendVoiceMemoButton];
[sendVoiceMemoButton autoPinEdgeToSuperviewMargin:ALEdgeRight withInset:10.f];

2
Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m
View File

@ -82,7 +82,7 @@ NS_ASSUME_NONNULL_BEGIN
UIColor *backgroundColor;
if (self.hasUnreadMessages) {
foregroundColor = UIColor.whiteColor;
backgroundColor = Theme.accentBlueColor;
backgroundColor = UIColor.ows_accentBlueColor;
} else {
foregroundColor = Theme.accentBlueColor;
backgroundColor = Theme.scrollButtonBackgroundColor;

2
Signal/src/ViewControllers/ConversationView/MessageSelectionView.swift
View File

@ -47,7 +47,7 @@ public class MessageSelectionView: UIView {
let image = #imageLiteral(resourceName: "check-circle-solid-24").withRenderingMode(.alwaysTemplate)
let imageView = UIImageView(image: image)
imageView.tintColor = Theme.accentBlueColor
imageView.tintColor = .ows_accentBlue
wrapper.addSubview(imageView)
imageView.autoPinEdgesToSuperviewEdges()

2
Signal/src/ViewControllers/HomeView/ConversationListCell.m
View File

@ -164,7 +164,7 @@ NS_ASSUME_NONNULL_BEGIN
[self.unreadLabel setCompressionResistanceHigh];
self.unreadBadge = [NeverClearView new];
self.unreadBadge.backgroundColor = Theme.accentBlueColor;
self.unreadBadge.backgroundColor = UIColor.ows_accentBlueColor;
[self.unreadBadge addSubview:self.unreadLabel];
[self.unreadLabel autoCenterInSuperview];
[self.unreadBadge setContentHuggingHigh];

2
Signal/src/ViewControllers/HomeView/ConversationListViewController.m
View File

@ -462,7 +462,7 @@ NSString *const kArchiveButtonPseudoGroup = @"kArchiveButtonPseudoGroup";
OWSLayerView *layerView = [OWSLayerView new];
layerView.layoutMargins = UIEdgeInsetsMake(11 + kTailHeight, 16, 11, 16);
CAShapeLayer *shapeLayer = [CAShapeLayer new];
shapeLayer.fillColor = Theme.accentBlueColor.CGColor;
shapeLayer.fillColor = UIColor.ows_accentBlueColor.CGColor;
[layerView.layer addSublayer:shapeLayer];
layerView.layoutCallback = ^(UIView *view) {
UIBezierPath *bezierPath = [UIBezierPath new];

4
Signal/src/ViewControllers/LocationPicker.swift
View File

@ -342,7 +342,7 @@ extension LocationPicker: MKMapViewDelegate {
if annotation is MKUserLocation { return nil }
let pin = MKPinAnnotationView(annotation: annotation, reuseIdentifier: "annotation")
pin.pinTintColor = Theme.accentBlueColor
pin.pinTintColor = .ows_accentBlue
pin.animatesDrop = annotation is MKPointAnnotation
pin.rightCalloutAccessoryView = sendLocationButton()
pin.canShowCallout = true
@ -464,7 +464,7 @@ public class Location: NSObject {
snapshot.image.draw(at: .zero)
let pinView = MKPinAnnotationView(annotation: nil, reuseIdentifier: nil)
pinView.pinTintColor = Theme.accentBlueColor
pinView.pinTintColor = .ows_accentBlue
let pinImage = pinView.image
var point = snapshot.point(for: self.coordinate)

2
Signal/src/ViewControllers/NewGroupView/BaseGroupMemberViewController.swift
View File

@ -523,7 +523,7 @@ extension BaseGroupMemberViewController: RecipientPickerDelegate {
if isPreExistingMember {
imageView.setTemplateImageName("check-circle-solid-24", tintColor: Theme.washColor)
} else if isCurrentMember {
imageView.setTemplateImageName("check-circle-solid-24", tintColor: Theme.accentBlueColor)
imageView.setTemplateImageName("check-circle-solid-24", tintColor: .ows_accentBlue)
} else if isBlocked {
// Use accessoryMessageForRecipient: to show blocked indicator.
return nil

2
Signal/src/ViewControllers/OWSPinReminderViewController.swift
View File

@ -157,7 +157,7 @@ public class PinReminderViewController: OWSViewController {
comment: "Label for the 'submit' button."),
font: font,
titleColor: .white,
backgroundColor: Theme.accentBlueColor,
backgroundColor: .ows_accentBlue,
target: self,
selector: #selector(submitPressed)
)

2
Signal/src/ViewControllers/OWSPinSetupViewController.swift
View File

@ -288,7 +288,7 @@ public class PinSetupViewController: OWSViewController {
let font = UIFont.systemFont(ofSize: 17, weight: .semibold)
let buttonHeight = OWSFlatButton.heightForFont(font)
nextButton.setTitle(title: CommonStrings.nextButton, font: font, titleColor: .white)
nextButton.setBackgroundColors(upColor: Theme.accentBlueColor)
nextButton.setBackgroundColors(upColor: .ows_accentBlue)
nextButton.addTarget(target: self, selector: #selector(nextPressed))
nextButton.autoSetDimension(.height, toSize: buttonHeight)
nextButton.accessibilityIdentifier = "pinCreation.nextButton"

2
Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift
View File

@ -848,7 +848,7 @@ private class DoneButton: UIView {
private lazy var badge: UIView = {
let badge = PillView()
badge.layoutMargins = UIEdgeInsets(top: 4, leading: 4, bottom: 4, trailing: 4)
badge.backgroundColor = Theme.accentBlueColor
badge.backgroundColor = .ows_accentBlue
badge.addSubview(badgeLabel)
badgeLabel.autoPinEdgesToSuperviewMargins()

9
Signal/src/ViewControllers/ProfileViewController.m
View File

@ -397,7 +397,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat
@"Button to save the profile view in the profile view.")
font:[OWSFlatButton fontForHeight:kButtonHeight]
titleColor:[UIColor whiteColor]
backgroundColor:Theme.accentBlueColor
backgroundColor:UIColor.ows_accentBlueColor
target:self
selector:@selector(saveButtonPressed)];
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, saveButton);
@ -506,11 +506,12 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat
if (self.hasUnsavedChanges || forceSaveButtonEnabled) {
self.saveButton.enabled = YES;
[self.saveButton setBackgroundColorsWithUpColor:Theme.accentBlueColor];
[self.saveButton setBackgroundColorsWithUpColor:UIColor.ows_accentBlueColor];
} else {
self.saveButton.enabled = NO;
[self.saveButton setBackgroundColorsWithUpColor:[Theme.accentBlueColor blendedWithColor:Theme.backgroundColor
alpha:0.5f]];
[self.saveButton
setBackgroundColorsWithUpColor:[UIColor.ows_accentBlueColor blendedWithColor:Theme.backgroundColor
alpha:0.5f]];
}
}

4
Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift
View File

@ -437,12 +437,12 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController
codeStateLink.setTitle(title: NSLocalizedString("ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK",
comment: "Label for link that can be used when the original code did not arrive."),
font: .ows_dynamicTypeBodyClamped,
titleColor: Theme.accentBlueColor)
titleColor: .ows_accentBlue)
case .resent:
codeStateLink.setTitle(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK",
comment: "Label for link that can be used when the resent code did not arrive."),
font: .ows_dynamicTypeBodyClamped,
titleColor: Theme.accentBlueColor)
titleColor: .ows_accentBlue)
}
}

2
Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
View File

@ -206,7 +206,7 @@ typedef void (^CustomLayoutBlock)(void);
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, verifyUnverifyButton);
UIView *verifyUnverifyPillbox = [UIView new];
verifyUnverifyPillbox.backgroundColor = Theme.accentBlueColor;
verifyUnverifyPillbox.backgroundColor = UIColor.ows_accentBlueColor;
verifyUnverifyPillbox.layer.cornerRadius = 3.f;
verifyUnverifyPillbox.clipsToBounds = YES;
[verifyUnverifyButton addSubview:verifyUnverifyPillbox];

2
Signal/src/views/DismissableTextField.swift
View File

@ -18,7 +18,7 @@ class DismissInputBar: UIToolbar {
let spacer = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
let dismissButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(didTapDone))
dismissButton.imageInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 40)
dismissButton.tintColor = Theme.accentBlueColor
dismissButton.tintColor = UIColor.ows_accentBlue
self.items = [spacer, dismissButton]
self.isTranslucent = false

2
Signal/src/views/PinEntryView.m
View File

@ -107,7 +107,7 @@ NS_ASSUME_NONNULL_BEGIN
@"Label for 'submit' button in the 2FA registration view.")
font:[OWSFlatButton fontForHeight:kSubmitButtonHeight]
titleColor:[UIColor whiteColor]
backgroundColor:Theme.accentBlueColor
backgroundColor:UIColor.ows_accentBlueColor
target:self
selector:@selector(submitButtonWasPressed)];
self.submitButton = submitButton;

2
SignalMessaging/ViewControllers/FindByPhoneNumberViewController.swift
View File

@ -127,7 +127,7 @@ public class FindByPhoneNumberViewController: OWSViewController {
button.useDefaultCornerRadius()
button.autoSetDimension(.height, toSize: buttonHeight)
button.setTitle(title: buttonTitle, font: OWSFlatButton.fontForHeight(buttonHeight), titleColor: .white)
button.setBackgroundColors(upColor: Theme.accentBlueColor)
button.setBackgroundColors(upColor: .ows_accentBlue)
button.addTarget(target: self, selector: #selector(tryToSelectPhoneNumber))
button.setEnabled(false)
button.accessibilityIdentifier =

2
SignalMessaging/ViewControllers/MediaMessageView.swift
View File

@ -323,7 +323,7 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate {
private var controlTintColor: UIColor {
switch mode {
case .small, .large:
return Theme.accentBlueColor
return UIColor.ows_accentBlue
case .attachmentApproval:
return UIColor.white
}

4
SignalMessaging/ViewControllers/OWSTableViewController.swift
View File

@ -152,7 +152,7 @@ public extension OWSTableItem {
innerIconSize: CGFloat = 24) -> UIView {
return buildIconInCircleView(icon: icon,
innerIconSize: innerIconSize,
iconTintColor: Theme.accentBlueColor)
iconTintColor: .ows_accentBlue)
}
static func buildIconInCircleView(icon: ThemeIcon,
@ -162,7 +162,7 @@ public extension OWSTableItem {
if let iconTintColor = iconTintColor {
iconView.tintColor = iconTintColor
} else {
iconView.tintColor = Theme.accentBlueColor
iconView.tintColor = .ows_accentBlue
}
let iconWrapper = UIView.container()
iconWrapper.addSubview(iconView)

2
SignalMessaging/ViewControllers/Stickers/ManageStickersViewController.swift
View File

@ -360,7 +360,7 @@ public class ManageStickersViewController: OWSTableViewController {
var authorViews = [UIView]()
if isDefaultStickerPack {
let builtInPackView = UIImageView()
builtInPackView.setTemplateImageName("check-circle-filled-16", tintColor: Theme.accentBlueColor)
builtInPackView.setTemplateImageName("check-circle-filled-16", tintColor: UIColor.ows_accentBlue)
builtInPackView.setCompressionResistanceHigh()
builtInPackView.setContentHuggingHigh()
authorViews.append(builtInPackView)

2
SignalMessaging/ViewControllers/Stickers/StickerPackViewController.swift
View File

@ -121,7 +121,7 @@ public class StickerPackViewController: OWSViewController {
authorLabel.font = UIFont.ows_dynamicTypeBody
defaultPackIconView.setTemplateImageName("check-circle-filled-16", tintColor: Theme.accentBlueColor)
defaultPackIconView.setTemplateImageName("check-circle-filled-16", tintColor: UIColor.ows_accentBlue)
defaultPackIconView.isHidden = true
shareButton.setTemplateImageName("forward-solid-24", tintColor: Theme.darkThemePrimaryColor)

2
SignalMessaging/Views/OWSButton.swift
View File

@ -65,7 +65,7 @@ public class OWSButton: UIButton {
button.layer.cornerRadius = buttonWidth / 2
button.autoSetDimensions(to: CGSize(square: buttonWidth))
button.backgroundColor = Theme.accentBlueColor
button.backgroundColor = .ows_accentBlue
return button
}

2
SignalMessaging/Views/Tooltips/StickerTooltip.swift
View File

@ -62,7 +62,7 @@ public class StickerTooltip: TooltipView {
public override var bubbleColor: UIColor {
return (Theme.isDarkThemeEnabled
? Theme.accentBlueColor
? UIColor.ows_accentBlue
: Theme.backgroundColor)
}

2
SignalMessaging/Views/Tooltips/TooltipView.swift
View File

@ -39,7 +39,7 @@ public class TooltipView: UIView {
public var bubbleColor: UIColor {
owsFailDebug("Not implemented.")
return Theme.accentBlueColor
return UIColor.ows_accentBlue
}
public var bubbleInsets: UIEdgeInsets {

2
SignalMessaging/Views/Tooltips/ViewOnceTooltip.swift
View File

@ -40,7 +40,7 @@ public class ViewOnceTooltip: TooltipView {
}
public override var bubbleColor: UIColor {
return Theme.accentBlueColor
return UIColor.ows_accentBlue
}
public override var bubbleInsets: UIEdgeInsets {

12
SignalMessaging/utils/ConversationStyle.swift
View File

@ -155,13 +155,13 @@ public class ConversationStyle: NSObject {
}
@objc
public let bubbleColorOutgoingFailed = Theme.accentBlueColor
public let bubbleColorOutgoingFailed = UIColor.ows_accentBlue
@objc
public let bubbleColorOutgoingSending = Theme.accentBlueColor
public let bubbleColorOutgoingSending = UIColor.ows_accentBlue
@objc
public let bubbleColorOutgoingSent = Theme.accentBlueColor
public let bubbleColorOutgoingSent = UIColor.ows_accentBlue
@objc
public let dateBreakTextColor = UIColor.ows_gray60
@ -249,7 +249,7 @@ public class ConversationStyle: NSObject {
if Theme.isDarkThemeEnabled {
return .ows_signalBlueDark
} else {
return UIColor.ows_accentBlueTint
return .ows_accentBlueTint
}
}
@ -257,12 +257,12 @@ public class ConversationStyle: NSObject {
public func quotedReplyStripeColor(isIncoming: Bool) -> UIColor {
if Theme.isDarkThemeEnabled {
if isIncoming {
return UIColor.ows_accentBlueTint
return .ows_accentBlueTint
} else {
return .ows_black
}
} else if isIncoming {
return Theme.accentBlueColor
return .ows_accentBlue
} else {
return .ows_white
}