diff --git a/Signal/src/ConversationSearch.swift b/Signal/src/ConversationSearch.swift index c73270e106..69611f4bb8 100644 --- a/Signal/src/ConversationSearch.swift +++ b/Signal/src/ConversationSearch.swift @@ -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) diff --git a/Signal/src/Experience Upgrades/Upgrade Views/IntroducingPINs.swift b/Signal/src/Experience Upgrades/Upgrade Views/IntroducingPINs.swift index 1a8f677fd5..0b5768e995 100644 --- a/Signal/src/Experience Upgrades/Upgrade Views/IntroducingPINs.swift +++ b/Signal/src/Experience Upgrades/Upgrade Views/IntroducingPINs.swift @@ -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() diff --git a/Signal/src/Experience Upgrades/Upgrade Views/MessageRequests.swift b/Signal/src/Experience Upgrades/Upgrade Views/MessageRequests.swift index 37423e169a..d605b2c758 100644 --- a/Signal/src/Experience Upgrades/Upgrade Views/MessageRequests.swift +++ b/Signal/src/Experience Upgrades/Upgrade Views/MessageRequests.swift @@ -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() diff --git a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m index 044861977d..56cca909e6 100644 --- a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m @@ -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") diff --git a/Signal/src/ViewControllers/Attachment Keyboard/AttachmentKeyboard.swift b/Signal/src/ViewControllers/Attachment Keyboard/AttachmentKeyboard.swift index 8859685e77..8b344c5f1f 100644 --- a/Signal/src/ViewControllers/Attachment Keyboard/AttachmentKeyboard.swift +++ b/Signal/src/ViewControllers/Attachment Keyboard/AttachmentKeyboard.swift @@ -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) diff --git a/Signal/src/ViewControllers/Call/CallVideoHintView.swift b/Signal/src/ViewControllers/Call/CallVideoHintView.swift index bacab971fa..88dbbe653b 100644 --- a/Signal/src/ViewControllers/Call/CallVideoHintView.swift +++ b/Signal/src/ViewControllers/Call/CallVideoHintView.swift @@ -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() diff --git a/Signal/src/ViewControllers/Call/CallViewController.swift b/Signal/src/ViewControllers/Call/CallViewController.swift index cfec75e8e1..77680899f8 100644 --- a/Signal/src/ViewControllers/Call/CallViewController.swift +++ b/Signal/src/ViewControllers/Call/CallViewController.swift @@ -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) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/ReactionCountsView.swift b/Signal/src/ViewControllers/ConversationView/Cells/ReactionCountsView.swift index 1f1f81d41b..8dde45ff1e 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/ReactionCountsView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/ReactionCountsView.swift @@ -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 } } diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index cc9a9baede..f9481096aa 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -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]; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m b/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m index 0b70e6d0cc..e42ebdc9c4 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m @@ -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; diff --git a/Signal/src/ViewControllers/ConversationView/MessageSelectionView.swift b/Signal/src/ViewControllers/ConversationView/MessageSelectionView.swift index dead4ca2d5..75d3ca2451 100644 --- a/Signal/src/ViewControllers/ConversationView/MessageSelectionView.swift +++ b/Signal/src/ViewControllers/ConversationView/MessageSelectionView.swift @@ -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() diff --git a/Signal/src/ViewControllers/HomeView/ConversationListCell.m b/Signal/src/ViewControllers/HomeView/ConversationListCell.m index 58f7c0f845..1f763ecab6 100644 --- a/Signal/src/ViewControllers/HomeView/ConversationListCell.m +++ b/Signal/src/ViewControllers/HomeView/ConversationListCell.m @@ -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]; diff --git a/Signal/src/ViewControllers/HomeView/ConversationListViewController.m b/Signal/src/ViewControllers/HomeView/ConversationListViewController.m index 95f74e1644..6100de466e 100644 --- a/Signal/src/ViewControllers/HomeView/ConversationListViewController.m +++ b/Signal/src/ViewControllers/HomeView/ConversationListViewController.m @@ -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]; diff --git a/Signal/src/ViewControllers/LocationPicker.swift b/Signal/src/ViewControllers/LocationPicker.swift index 52374eab20..518882b093 100644 --- a/Signal/src/ViewControllers/LocationPicker.swift +++ b/Signal/src/ViewControllers/LocationPicker.swift @@ -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) diff --git a/Signal/src/ViewControllers/NewGroupView/BaseGroupMemberViewController.swift b/Signal/src/ViewControllers/NewGroupView/BaseGroupMemberViewController.swift index 4421c35eef..8d6c8066cb 100644 --- a/Signal/src/ViewControllers/NewGroupView/BaseGroupMemberViewController.swift +++ b/Signal/src/ViewControllers/NewGroupView/BaseGroupMemberViewController.swift @@ -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 diff --git a/Signal/src/ViewControllers/OWSPinReminderViewController.swift b/Signal/src/ViewControllers/OWSPinReminderViewController.swift index e8e13f1614..3427bc4b3f 100644 --- a/Signal/src/ViewControllers/OWSPinReminderViewController.swift +++ b/Signal/src/ViewControllers/OWSPinReminderViewController.swift @@ -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) ) diff --git a/Signal/src/ViewControllers/OWSPinSetupViewController.swift b/Signal/src/ViewControllers/OWSPinSetupViewController.swift index a765247794..da0bcf9c51 100644 --- a/Signal/src/ViewControllers/OWSPinSetupViewController.swift +++ b/Signal/src/ViewControllers/OWSPinSetupViewController.swift @@ -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" diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index 1a3683e36c..085e7c26bb 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -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() diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index 9c2a64d46c..ec83b023ba 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -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]]; } } diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index dfcd8e2752..577bfae1e8 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -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) } } diff --git a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m index 8472126976..29e7cbb0a1 100644 --- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m @@ -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]; diff --git a/Signal/src/views/DismissableTextField.swift b/Signal/src/views/DismissableTextField.swift index 343313b6e7..24da5a7b0c 100644 --- a/Signal/src/views/DismissableTextField.swift +++ b/Signal/src/views/DismissableTextField.swift @@ -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 diff --git a/Signal/src/views/PinEntryView.m b/Signal/src/views/PinEntryView.m index e456854716..79ca6e026d 100644 --- a/Signal/src/views/PinEntryView.m +++ b/Signal/src/views/PinEntryView.m @@ -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; diff --git a/SignalMessaging/ViewControllers/FindByPhoneNumberViewController.swift b/SignalMessaging/ViewControllers/FindByPhoneNumberViewController.swift index b52d34b5e0..b8ae65f793 100644 --- a/SignalMessaging/ViewControllers/FindByPhoneNumberViewController.swift +++ b/SignalMessaging/ViewControllers/FindByPhoneNumberViewController.swift @@ -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 = diff --git a/SignalMessaging/ViewControllers/MediaMessageView.swift b/SignalMessaging/ViewControllers/MediaMessageView.swift index d7c98a2cc9..33e60c8bc0 100644 --- a/SignalMessaging/ViewControllers/MediaMessageView.swift +++ b/SignalMessaging/ViewControllers/MediaMessageView.swift @@ -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 } diff --git a/SignalMessaging/ViewControllers/OWSTableViewController.swift b/SignalMessaging/ViewControllers/OWSTableViewController.swift index e18d33b8d1..f703eb47ee 100644 --- a/SignalMessaging/ViewControllers/OWSTableViewController.swift +++ b/SignalMessaging/ViewControllers/OWSTableViewController.swift @@ -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) diff --git a/SignalMessaging/ViewControllers/Stickers/ManageStickersViewController.swift b/SignalMessaging/ViewControllers/Stickers/ManageStickersViewController.swift index 046e24677a..4447f40c03 100644 --- a/SignalMessaging/ViewControllers/Stickers/ManageStickersViewController.swift +++ b/SignalMessaging/ViewControllers/Stickers/ManageStickersViewController.swift @@ -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) diff --git a/SignalMessaging/ViewControllers/Stickers/StickerPackViewController.swift b/SignalMessaging/ViewControllers/Stickers/StickerPackViewController.swift index e2194fb9a8..54f73f1f93 100644 --- a/SignalMessaging/ViewControllers/Stickers/StickerPackViewController.swift +++ b/SignalMessaging/ViewControllers/Stickers/StickerPackViewController.swift @@ -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) diff --git a/SignalMessaging/Views/OWSButton.swift b/SignalMessaging/Views/OWSButton.swift index 329c077802..2af40733db 100644 --- a/SignalMessaging/Views/OWSButton.swift +++ b/SignalMessaging/Views/OWSButton.swift @@ -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 } diff --git a/SignalMessaging/Views/Tooltips/StickerTooltip.swift b/SignalMessaging/Views/Tooltips/StickerTooltip.swift index b7f40bfa44..519d610cdd 100644 --- a/SignalMessaging/Views/Tooltips/StickerTooltip.swift +++ b/SignalMessaging/Views/Tooltips/StickerTooltip.swift @@ -62,7 +62,7 @@ public class StickerTooltip: TooltipView { public override var bubbleColor: UIColor { return (Theme.isDarkThemeEnabled - ? Theme.accentBlueColor + ? UIColor.ows_accentBlue : Theme.backgroundColor) } diff --git a/SignalMessaging/Views/Tooltips/TooltipView.swift b/SignalMessaging/Views/Tooltips/TooltipView.swift index 131a69df70..41fd44e91d 100644 --- a/SignalMessaging/Views/Tooltips/TooltipView.swift +++ b/SignalMessaging/Views/Tooltips/TooltipView.swift @@ -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 { diff --git a/SignalMessaging/Views/Tooltips/ViewOnceTooltip.swift b/SignalMessaging/Views/Tooltips/ViewOnceTooltip.swift index f35ed1e03a..65bb9838d6 100644 --- a/SignalMessaging/Views/Tooltips/ViewOnceTooltip.swift +++ b/SignalMessaging/Views/Tooltips/ViewOnceTooltip.swift @@ -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 { diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift index 8c8000f3a1..d7e7dbfbc9 100644 --- a/SignalMessaging/utils/ConversationStyle.swift +++ b/SignalMessaging/utils/ConversationStyle.swift @@ -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 }