From 38c483c335e6b0c18e702b3bb92a248c5a072577 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Wed, 6 Oct 2021 00:06:33 +0400 Subject: [PATCH] Update default blue accent color --- .../ActivityIndicator/Sources/ActivityIndicator.swift | 2 +- submodules/Display/Source/NavigationBackButtonNode.swift | 2 +- submodules/Display/Source/NavigationButtonNode.swift | 4 ++-- submodules/GalleryUI/Sources/GalleryController.swift | 2 +- submodules/GraphUI/Sources/ChartStackSection.swift | 4 ++-- .../InstantPageUI/Sources/InstantPageControllerNode.swift | 2 +- .../Sources/InstantPageSettingsItemTheme.swift | 2 +- .../Sources/InstantPageSettingsThemeItemNode.swift | 2 +- submodules/InstantPageUI/Sources/InstantPageTheme.swift | 6 +++--- submodules/LegacyComponents/Sources/TGCheckButtonView.m | 2 +- submodules/LegacyComponents/Sources/TGColor.m | 2 +- .../Sources/Themes/ThemeSettingsAccentColorItem.swift | 2 +- .../Sources/ChatTextInputAudioRecordingOverlayButton.swift | 4 ++-- submodules/TelegramUI/Sources/LegacyDataImportSplash.swift | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/submodules/ActivityIndicator/Sources/ActivityIndicator.swift b/submodules/ActivityIndicator/Sources/ActivityIndicator.swift index 1298a33e3f..da9e973855 100644 --- a/submodules/ActivityIndicator/Sources/ActivityIndicator.swift +++ b/submodules/ActivityIndicator/Sources/ActivityIndicator.swift @@ -16,7 +16,7 @@ private func generateIndefiniteActivityIndicatorImage(color: UIColor, diameter: } private func convertIndicatorColor(_ color: UIColor) -> UIColor { - if color.isEqual(UIColor(rgb: 0x007ee5)) { + if color.isEqual(UIColor(rgb: 0x007aff)) { return .gray } else if color.isEqual(UIColor(rgb: 0x2ea6ff)) { return .white diff --git a/submodules/Display/Source/NavigationBackButtonNode.swift b/submodules/Display/Source/NavigationBackButtonNode.swift index 3a6e5176c4..d86b426509 100644 --- a/submodules/Display/Source/NavigationBackButtonNode.swift +++ b/submodules/Display/Source/NavigationBackButtonNode.swift @@ -31,7 +31,7 @@ public class NavigationBackButtonNode: ASControlNode { } } - public var color: UIColor = UIColor(rgb: 0x007ee5) { + public var color: UIColor = UIColor(rgb: 0x007aff) { didSet { self.label.attributedText = NSAttributedString(string: self._text, attributes: self.attributesForCurrentState()) } diff --git a/submodules/Display/Source/NavigationButtonNode.swift b/submodules/Display/Source/NavigationButtonNode.swift index 656774cc07..169b57ca03 100644 --- a/submodules/Display/Source/NavigationButtonNode.swift +++ b/submodules/Display/Source/NavigationButtonNode.swift @@ -104,7 +104,7 @@ private final class NavigationButtonItemNode: ImmediateTextNode { } } - public var color: UIColor = UIColor(rgb: 0x007ee5) { + public var color: UIColor = UIColor(rgb: 0x007aff) { didSet { if let text = self._text { self.attributedText = NSAttributedString(string: text, attributes: self.attributesForCurrentState()) @@ -332,7 +332,7 @@ public final class NavigationButtonNode: ASDisplayNode { public var pressed: (Int) -> () = { _ in } public var highlightChanged: (Int, Bool) -> () = { _, _ in } - public var color: UIColor = UIColor(rgb: 0x007ee5) { + public var color: UIColor = UIColor(rgb: 0x007aff) { didSet { if !self.color.isEqual(oldValue) { for node in self.nodes { diff --git a/submodules/GalleryUI/Sources/GalleryController.swift b/submodules/GalleryUI/Sources/GalleryController.swift index f1a039c794..e429632f09 100644 --- a/submodules/GalleryUI/Sources/GalleryController.swift +++ b/submodules/GalleryUI/Sources/GalleryController.swift @@ -323,7 +323,7 @@ public struct GalleryConfiguration { public class GalleryController: ViewController, StandalonePresentableController { public static let darkNavigationTheme = NavigationBarTheme(buttonColor: .white, disabledButtonColor: UIColor(rgb: 0x525252), primaryTextColor: .white, backgroundColor: UIColor(white: 0.0, alpha: 0.6), enableBackgroundBlur: false, separatorColor: UIColor(white: 0.0, alpha: 0.8), badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear) - public static let lightNavigationTheme = NavigationBarTheme(buttonColor: UIColor(rgb: 0x007ee5), disabledButtonColor: UIColor(rgb: 0xd0d0d0), primaryTextColor: .black, backgroundColor: UIColor(red: 0.968626451, green: 0.968626451, blue: 0.968626451, alpha: 1.0), enableBackgroundBlur: false, separatorColor: UIColor(red: 0.6953125, green: 0.6953125, blue: 0.6953125, alpha: 1.0), badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear) + public static let lightNavigationTheme = NavigationBarTheme(buttonColor: UIColor(rgb: 0x007aff), disabledButtonColor: UIColor(rgb: 0xd0d0d0), primaryTextColor: .black, backgroundColor: UIColor(red: 0.968626451, green: 0.968626451, blue: 0.968626451, alpha: 1.0), enableBackgroundBlur: false, separatorColor: UIColor(red: 0.6953125, green: 0.6953125, blue: 0.6953125, alpha: 1.0), badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear) private var galleryNode: GalleryControllerNode { return self.displayNode as! GalleryControllerNode diff --git a/submodules/GraphUI/Sources/ChartStackSection.swift b/submodules/GraphUI/Sources/ChartStackSection.swift index dd1e60dd6a..7f885a31f2 100644 --- a/submodules/GraphUI/Sources/ChartStackSection.swift +++ b/submodules/GraphUI/Sources/ChartStackSection.swift @@ -68,10 +68,10 @@ class ChartStackSection: UIView, ChartThemeContainer { backButton.addTarget(self, action: #selector(self.didTapBackButton), for: .touchUpInside) backButton.setTitle("Zoom Out", for: .normal) backButton.titleLabel?.font = UIFont.systemFont(ofSize: 14, weight: .regular) - backButton.setTitleColor(UIColor(rgb: 0x007ee5), for: .normal) + backButton.setTitleColor(UIColor(rgb: 0x007aff), for: .normal) backButton.setImage(UIImage(bundleImageName: "Chart/arrow_left"), for: .normal) backButton.imageEdgeInsets = UIEdgeInsets(top: 0.0, left: 6.0, bottom: 0.0, right: 3.0) - backButton.imageView?.tintColor = UIColor(rgb: 0x007ee5) + backButton.imageView?.tintColor = UIColor(rgb: 0x007aff) backButton.setVisible(false, animated: false) } diff --git a/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift b/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift index 50b71f819d..019cc6a8ac 100644 --- a/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift @@ -801,7 +801,7 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate { if let current = self.linkHighlightingNode { linkHighlightingNode = current } else { - let highlightColor = self.theme?.linkHighlightColor ?? UIColor(rgb: 0x007ee5).withAlphaComponent(0.4) + let highlightColor = self.theme?.linkHighlightColor ?? UIColor(rgb: 0x007aff).withAlphaComponent(0.4) linkHighlightingNode = LinkHighlightingNode(color: highlightColor) linkHighlightingNode.isUserInteractionEnabled = false self.linkHighlightingNode = linkHighlightingNode diff --git a/submodules/InstantPageUI/Sources/InstantPageSettingsItemTheme.swift b/submodules/InstantPageUI/Sources/InstantPageSettingsItemTheme.swift index 21205497d2..21c766bdd8 100644 --- a/submodules/InstantPageUI/Sources/InstantPageSettingsItemTheme.swift +++ b/submodules/InstantPageUI/Sources/InstantPageSettingsItemTheme.swift @@ -69,7 +69,7 @@ private let lightTheme = InstantPageSettingsItemTheme( separatorColor: UIColor(rgb: 0xc8c7cc), primaryColor: .black, secondaryColor: UIColor(rgb: 0xa8a8a8), - accentColor: UIColor(rgb: 0x007ee5) + accentColor: UIColor(rgb: 0x007aff) ) private let sepiaTheme = InstantPageSettingsItemTheme( diff --git a/submodules/InstantPageUI/Sources/InstantPageSettingsThemeItemNode.swift b/submodules/InstantPageUI/Sources/InstantPageSettingsThemeItemNode.swift index 3530f61cf1..b96c2126bd 100644 --- a/submodules/InstantPageUI/Sources/InstantPageSettingsThemeItemNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageSettingsThemeItemNode.swift @@ -101,7 +101,7 @@ final class InstantPageSettingsThemeItemNode: InstantPageSettingsItemNode { selectedIndex = 3 } - let selectionColor = UIColor(rgb: 0x007ee5) + let selectionColor = UIColor(rgb: 0x007aff) self.themeNodes = [ InstantPageSettingsThemeSelectorNode(color: .white, edgeColor: (selectedIndex == 1 || selectedIndex == 2) ? UIColor.lightGray : UIColor.white, selectionColor: selectionColor), InstantPageSettingsThemeSelectorNode(color: UIColor(rgb: 0xcbb98e), edgeColor: UIColor(rgb: 0xcbb98e), selectionColor: selectionColor), diff --git a/submodules/InstantPageUI/Sources/InstantPageTheme.swift b/submodules/InstantPageUI/Sources/InstantPageTheme.swift index 95680be3bf..70d3c600d7 100644 --- a/submodules/InstantPageUI/Sources/InstantPageTheme.swift +++ b/submodules/InstantPageUI/Sources/InstantPageTheme.swift @@ -153,15 +153,15 @@ private let lightTheme = InstantPageTheme( ), serif: false, codeBlockBackgroundColor: UIColor(rgb: 0xf5f8fc), - linkColor: UIColor(rgb: 0x007ee5), + linkColor: UIColor(rgb: 0x007aff), textHighlightColor: UIColor(rgb: 0, alpha: 0.12), - linkHighlightColor: UIColor(rgb: 0x007ee5, alpha: 0.07), + linkHighlightColor: UIColor(rgb: 0x007aff, alpha: 0.07), markerColor: UIColor(rgb: 0xfef3bc), panelBackgroundColor: UIColor(rgb: 0xf3f4f5), panelHighlightedBackgroundColor: UIColor(rgb: 0xe7e7e7), panelPrimaryColor: .black, panelSecondaryColor: UIColor(rgb: 0x79828b), - panelAccentColor: UIColor(rgb: 0x007ee5), + panelAccentColor: UIColor(rgb: 0x007aff), tableBorderColor: UIColor(rgb: 0xe2e2e2), tableHeaderColor: UIColor(rgb: 0xf4f4f4), controlColor: UIColor(rgb: 0xc7c7cd), diff --git a/submodules/LegacyComponents/Sources/TGCheckButtonView.m b/submodules/LegacyComponents/Sources/TGCheckButtonView.m index 01672a1a96..fbfd97208c 100644 --- a/submodules/LegacyComponents/Sources/TGCheckButtonView.m +++ b/submodules/LegacyComponents/Sources/TGCheckButtonView.m @@ -60,7 +60,7 @@ int32_t hex = 0x29c519; UIColor *greenColor = [[UIColor alloc] initWithRed:(((hex >> 16) & 0xff) / 255.0f) green:(((hex >> 8) & 0xff) / 255.0f) blue:(((hex) & 0xff) / 255.0f) alpha:1.0f]; - hex = 0x007ee5; + hex = 0x007aff; UIColor *blueColor = [[UIColor alloc] initWithRed:(((hex >> 16) & 0xff) / 255.0f) green:(((hex >> 8) & 0xff) / 255.0f) blue:(((hex) & 0xff) / 255.0f) alpha:1.0f]; hex = 0xcacacf; diff --git a/submodules/LegacyComponents/Sources/TGColor.m b/submodules/LegacyComponents/Sources/TGColor.m index 503078b23c..dd57eb0164 100644 --- a/submodules/LegacyComponents/Sources/TGColor.m +++ b/submodules/LegacyComponents/Sources/TGColor.m @@ -16,7 +16,7 @@ UIColor *TGAccentColor() static dispatch_once_t onceToken; dispatch_once(&onceToken, ^ { - color = TGColorWithHex(0x007ee5); + color = TGColorWithHex(0x007aff); }); return color; } diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift index 6a6bf55799..760dfb4f9d 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift @@ -385,7 +385,7 @@ private final class ThemeSettingsAccentColorIconItemNode : ListViewItemNode { topColor = bubbleColor bottomColor = bubbleColor } else { - fillColor = UIColor(rgb: 0x007ee5) + fillColor = UIColor(rgb: 0x007aff) strokeColor = fillColor topColor = UIColor(rgb: 0xe1ffc7) bottomColor = topColor diff --git a/submodules/TelegramUI/Sources/ChatTextInputAudioRecordingOverlayButton.swift b/submodules/TelegramUI/Sources/ChatTextInputAudioRecordingOverlayButton.swift index c527609339..9842645bc5 100644 --- a/submodules/TelegramUI/Sources/ChatTextInputAudioRecordingOverlayButton.swift +++ b/submodules/TelegramUI/Sources/ChatTextInputAudioRecordingOverlayButton.swift @@ -8,8 +8,8 @@ import ObjCRuntimeUtils private let innerCircleDiameter: CGFloat = 110.0 private let outerCircleDiameter = innerCircleDiameter + 50.0 private let outerCircleMinScale = innerCircleDiameter / outerCircleDiameter -private let innerCircleImage = generateFilledCircleImage(diameter: innerCircleDiameter, color: UIColor(rgb: 0x007ee5)) -private let outerCircleImage = generateFilledCircleImage(diameter: outerCircleDiameter, color: UIColor(rgb: 0x007ee5, alpha: 0.2)) +private let innerCircleImage = generateFilledCircleImage(diameter: innerCircleDiameter, color: UIColor(rgb: 0x007aff)) +private let outerCircleImage = generateFilledCircleImage(diameter: outerCircleDiameter, color: UIColor(rgb: 0x007aff, alpha: 0.2)) private let micIcon = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Text/IconMicrophone"), color: .white)! private final class ChatTextInputAudioRecordingOverlayDisplayLinkTarget: NSObject { diff --git a/submodules/TelegramUI/Sources/LegacyDataImportSplash.swift b/submodules/TelegramUI/Sources/LegacyDataImportSplash.swift index 2114f9fd5f..801702b540 100644 --- a/submodules/TelegramUI/Sources/LegacyDataImportSplash.swift +++ b/submodules/TelegramUI/Sources/LegacyDataImportSplash.swift @@ -34,7 +34,7 @@ private final class LegacyDataImportSplashImpl: WindowCoveringView, LegacyDataIm self.updateLayout(size) } } - self.progressNode.transitionToState(.progress(color: self.theme?.list.itemAccentColor ?? UIColor(rgb: 0x007ee5), lineWidth: 2.0, value: CGFloat(max(0.025, self.progress.1)), cancelEnabled: false, animateRotation: true), animated: false, completion: {}) + self.progressNode.transitionToState(.progress(color: self.theme?.list.itemAccentColor ?? UIColor(rgb: 0x007aff), lineWidth: 2.0, value: CGFloat(max(0.025, self.progress.1)), cancelEnabled: false, animateRotation: true), animated: false, completion: {}) } }