diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index 2dcfd5396..1904414f9 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -18,14 +18,6 @@ struct AppAssets { return UIColor(named: "barBackgroundColor")! }() - static var barTintColor: UIColor = { - return UIColor(named: "barTintColor")! - }() - - static var barTitleColor: UIColor = { - return UIColor(named: "barTitleColor")! - }() - static var circleClosedImage: UIImage = { return UIImage(systemName: "largecircle.fill.circle")! }() @@ -80,14 +72,14 @@ struct AppAssets { return UIImage(systemName: "ellipsis.circle")! }() - static var netNewsWireBlueColor: UIColor = { - return UIColor(named: "netNewsWireBlueColor")! - }() - static var openInSidebarImage: UIImage = { return UIImage(systemName: "arrow.turn.down.left")! }() + static var primaryAccentColor: UIColor = { + return UIColor(named: "primaryAccentColor")! + }() + static var safariImage: UIImage = { return UIImage(systemName: "safari")! }() @@ -96,6 +88,10 @@ struct AppAssets { return UIImage(named: "magnifyingglass")! }() + static var secondaryAccentColor: UIColor = { + return UIColor(named: "secondaryAccentColor")! + }() + static var shareImage: UIImage = { return UIImage(systemName: "square.and.arrow.up")! }() @@ -124,23 +120,11 @@ struct AppAssets { return UIColor(named: "tableViewCellHighlightedTextColor")! }() - static var tableViewCellIconColor: UIColor = { - return UIColor(named: "tableViewCellIconColor")! - }() - - static var tableViewCellSelectionColor: UIColor = { - return UIColor(named: "tableViewCellSelectionColor")! - }() - static var timelineStarImage: UIImage = { let image = UIImage(systemName: "star.fill")! return image.withTintColor(AppAssets.starColor, renderingMode: .alwaysOriginal) }() - static var timelineUnreadCircleColor: UIColor = { - return UIColor(named: "timelineUnreadCircleColor")! - }() - static var todayFeedImage: UIImage = { return UIImage(systemName: "sun.max.fill")! }() diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift index 737bbffc6..80c30cb82 100644 --- a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift +++ b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift @@ -113,14 +113,14 @@ class MasterFeedTableViewCell : NNWTableViewCell { override func setHighlighted(_ highlighted: Bool, animated: Bool) { super.setHighlighted(highlighted, animated: animated) - let tintColor = isHighlighted || isSelected ? AppAssets.tableViewCellHighlightedTextColor : AppAssets.tableViewCellIconColor + let tintColor = isHighlighted || isSelected ? AppAssets.tableViewCellHighlightedTextColor : AppAssets.secondaryAccentColor faviconImageView.tintColor = tintColor } override func setSelected(_ selected: Bool, animated: Bool) { super.setSelected(selected, animated: animated) - let tintColor = isHighlighted || isSelected ? AppAssets.tableViewCellHighlightedTextColor : AppAssets.tableViewCellIconColor + let tintColor = isHighlighted || isSelected ? AppAssets.tableViewCellHighlightedTextColor : AppAssets.secondaryAccentColor faviconImageView.tintColor = tintColor } diff --git a/iOS/MasterTimeline/Cell/MasterUnreadIndicatorView.swift b/iOS/MasterTimeline/Cell/MasterUnreadIndicatorView.swift index e2e1c3fed..b40dbe1f5 100644 --- a/iOS/MasterTimeline/Cell/MasterUnreadIndicatorView.swift +++ b/iOS/MasterTimeline/Cell/MasterUnreadIndicatorView.swift @@ -32,7 +32,7 @@ class MasterUnreadIndicatorView: UIView { }() override func draw(_ dirtyRect: CGRect) { - let color = isSelected ? AppAssets.tableViewCellHighlightedTextColor : AppAssets.timelineUnreadCircleColor + let color = isSelected ? AppAssets.tableViewCellHighlightedTextColor : AppAssets.primaryAccentColor color.setFill() MasterUnreadIndicatorView.bezierPath.fill() } diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift index 753def8a4..41483c1da 100644 --- a/iOS/MasterTimeline/MasterTimelineViewController.swift +++ b/iOS/MasterTimeline/MasterTimelineViewController.swift @@ -183,7 +183,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner } readAction.image = AppAssets.circleClosedImage - readAction.backgroundColor = AppAssets.netNewsWireBlueColor + readAction.backgroundColor = AppAssets.primaryAccentColor // Set up the star action let starTitle = article.status.starred ? diff --git a/iOS/Progress/NavigationProgressView.swift b/iOS/Progress/NavigationProgressView.swift index 0d0ac4e3f..e28562ba8 100644 --- a/iOS/Progress/NavigationProgressView.swift +++ b/iOS/Progress/NavigationProgressView.swift @@ -24,7 +24,7 @@ public final class NavigationProgressView: UIView { internal let bar = UIView() - @objc public dynamic var progressTintColor: UIColor? = AppAssets.barTintColor { + @objc public dynamic var progressTintColor: UIColor? = AppAssets.primaryAccentColor { didSet { bar.backgroundColor = progressTintColor } diff --git a/iOS/Resources/Assets.xcassets/barTitleColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/barTitleColor.colorset/Contents.json deleted file mode 100644 index 9eec8484e..000000000 --- a/iOS/Resources/Assets.xcassets/barTitleColor.colorset/Contents.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - }, - "colors" : [ - { - "idiom" : "universal", - "color" : { - "platform" : "ios", - "reference" : "labelColor" - } - } - ] -} \ No newline at end of file diff --git a/iOS/Resources/Assets.xcassets/netNewsWireBlueColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/netNewsWireBlueColor.colorset/Contents.json deleted file mode 100644 index bfb477048..000000000 --- a/iOS/Resources/Assets.xcassets/netNewsWireBlueColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - }, - "colors" : [ - { - "idiom" : "universal", - "color" : { - "color-space" : "srgb", - "components" : { - "red" : "0x08", - "alpha" : "1.000", - "blue" : "0xEE", - "green" : "0x6A" - } - } - }, - { - "idiom" : "universal", - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "red" : "0x44", - "alpha" : "1.000", - "blue" : "0xE2", - "green" : "0x90" - } - } - } - ] -} \ No newline at end of file diff --git a/iOS/Resources/Assets.xcassets/barTintColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/primaryAccentColor.colorset/Contents.json similarity index 88% rename from iOS/Resources/Assets.xcassets/barTintColor.colorset/Contents.json rename to iOS/Resources/Assets.xcassets/primaryAccentColor.colorset/Contents.json index bfb477048..805562f47 100644 --- a/iOS/Resources/Assets.xcassets/barTintColor.colorset/Contents.json +++ b/iOS/Resources/Assets.xcassets/primaryAccentColor.colorset/Contents.json @@ -27,10 +27,10 @@ "color" : { "color-space" : "srgb", "components" : { - "red" : "0x44", + "red" : "0x2D", "alpha" : "1.000", - "blue" : "0xE2", - "green" : "0x90" + "blue" : "0xF1", + "green" : "0x80" } } } diff --git a/iOS/Resources/Assets.xcassets/timelineUnreadCircleColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/secondaryAccentColor.colorset/Contents.json similarity index 76% rename from iOS/Resources/Assets.xcassets/timelineUnreadCircleColor.colorset/Contents.json rename to iOS/Resources/Assets.xcassets/secondaryAccentColor.colorset/Contents.json index deafe00a0..12a7cedb0 100644 --- a/iOS/Resources/Assets.xcassets/timelineUnreadCircleColor.colorset/Contents.json +++ b/iOS/Resources/Assets.xcassets/secondaryAccentColor.colorset/Contents.json @@ -9,10 +9,10 @@ "color" : { "color-space" : "srgb", "components" : { - "red" : "0x44", + "red" : "0x06", "alpha" : "1.000", - "blue" : "0xE2", - "green" : "0x90" + "blue" : "0xBE", + "green" : "0x55" } } }, @@ -27,10 +27,10 @@ "color" : { "color-space" : "srgb", "components" : { - "red" : "0x61", + "red" : "0x5E", "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xAD" + "blue" : "0xF4", + "green" : "0x9E" } } } diff --git a/iOS/Resources/Assets.xcassets/tableViewCellIconColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/tableViewCellIconColor.colorset/Contents.json deleted file mode 100644 index bc7a1213b..000000000 --- a/iOS/Resources/Assets.xcassets/tableViewCellIconColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - }, - "colors" : [ - { - "idiom" : "universal", - "color" : { - "color-space" : "srgb", - "components" : { - "red" : "68", - "alpha" : "1.000", - "blue" : "226", - "green" : "144" - } - } - }, - { - "idiom" : "universal", - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "red" : "0x61", - "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xAD" - } - } - } - ] -} \ No newline at end of file diff --git a/iOS/Resources/Assets.xcassets/tableViewCellSelectionColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/tableViewCellSelectionColor.colorset/Contents.json deleted file mode 100644 index e5ce37ea9..000000000 --- a/iOS/Resources/Assets.xcassets/tableViewCellSelectionColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - }, - "colors" : [ - { - "idiom" : "universal", - "color" : { - "color-space" : "srgb", - "components" : { - "red" : "0.031", - "alpha" : "1.000", - "blue" : "0.933", - "green" : "0.416" - } - } - }, - { - "idiom" : "universal", - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "red" : "0x44", - "alpha" : "1.000", - "blue" : "0xE2", - "green" : "0x90" - } - } - } - ] -} \ No newline at end of file diff --git a/iOS/Resources/styleSheet.css b/iOS/Resources/styleSheet.css index cbf668dd6..fd77f1cbd 100644 --- a/iOS/Resources/styleSheet.css +++ b/iOS/Resources/styleSheet.css @@ -34,10 +34,10 @@ a:hover { :root { color-scheme: light dark; - --link-color: hsla(215, 99%, 43%, 1); + --link-color: #0655BE; --header-table-border-color: rgba(0, 0, 0, 0.1); --header-color: rgba(0, 0, 0, 0.3); - --header-link-color: rgba(0, 0, 0, 0.3); + --header-link-color: #086AEE; --body-code-color: #666; --system-message-color: #cbcbcb; --feedlink-color: rgba(0, 0, 0, 0.6); @@ -45,10 +45,10 @@ a:hover { @media(prefers-color-scheme: dark) { :root { - --link-color: #61ADFF; + --link-color: #5E9EF4; --header-table-border-color: rgba(255, 255, 255, 0.1); --header-color: #d2d2d2; - --header-link-color: #4490e2; + --header-link-color: #2D80F1; --body-code-color: #b2b2b2; --system-message-color: #5f5f5f } diff --git a/iOS/SceneDelegate.swift b/iOS/SceneDelegate.swift index 319368ee2..73785f010 100644 --- a/iOS/SceneDelegate.swift +++ b/iOS/SceneDelegate.swift @@ -19,7 +19,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { window = UIWindow(windowScene: scene as! UIWindowScene) - window!.tintColor = AppAssets.netNewsWireBlueColor + window!.tintColor = AppAssets.primaryAccentColor window!.rootViewController = coordinator.start(for: window!.frame.size) if let shortcutItem = connectionOptions.shortcutItem { diff --git a/iOS/SwiftUI Extensions/VibrantButtonStyle.swift b/iOS/SwiftUI Extensions/VibrantButtonStyle.swift index b327dacf0..61ffd9517 100644 --- a/iOS/SwiftUI Extensions/VibrantButtonStyle.swift +++ b/iOS/SwiftUI Extensions/VibrantButtonStyle.swift @@ -18,8 +18,8 @@ struct VibrantButtonStyle: ButtonStyle { .frame(width: geometry.size.width, height: geometry.size.height, alignment: self.alignment) } .foregroundColor(configuration.isPressed ? Color(AppAssets.tableViewCellHighlightedTextColor) : .primary) - .listRowBackground(configuration.isPressed ? Color(AppAssets.tableViewCellSelectionColor) : Color(.secondarySystemGroupedBackground)) - .background(configuration.isPressed ? Color(AppAssets.tableViewCellSelectionColor) : Color(.secondarySystemGroupedBackground)) + .listRowBackground(configuration.isPressed ? Color(AppAssets.primaryAccentColor) : Color(.secondarySystemGroupedBackground)) + .background(configuration.isPressed ? Color(AppAssets.primaryAccentColor) : Color(.secondarySystemGroupedBackground)) } } diff --git a/iOS/SwiftUI Extensions/VibrantSelectAction.swift b/iOS/SwiftUI Extensions/VibrantSelectAction.swift index 50625f181..45471d5e1 100644 --- a/iOS/SwiftUI Extensions/VibrantSelectAction.swift +++ b/iOS/SwiftUI Extensions/VibrantSelectAction.swift @@ -18,10 +18,10 @@ struct VibrantSelectAction: ViewModifier { GeometryReader { geometry in content .frame(width: geometry.size.width, height: geometry.size.height, alignment: .leading) - .background(self.isLongPressed || self.isTapped ? Color(AppAssets.tableViewCellSelectionColor) : Color(.secondarySystemGroupedBackground)) + .background(self.isLongPressed || self.isTapped ? Color(AppAssets.primaryAccentColor) : Color(.secondarySystemGroupedBackground)) } .foregroundColor(isLongPressed || isTapped ? Color(AppAssets.tableViewCellHighlightedTextColor) : .primary) - .listRowBackground(isLongPressed || isTapped ? Color(AppAssets.tableViewCellSelectionColor) : nil) + .listRowBackground(isLongPressed || isTapped ? Color(AppAssets.primaryAccentColor) : nil) .gesture( LongPressGesture().onEnded( { _ in self.action() }) .updating($isLongPressed) { value, state, transcation in state = value } diff --git a/iOS/UIKit Extensions/NNWTableViewCell.swift b/iOS/UIKit Extensions/NNWTableViewCell.swift index 140706dad..1cea8c90c 100644 --- a/iOS/UIKit Extensions/NNWTableViewCell.swift +++ b/iOS/UIKit Extensions/NNWTableViewCell.swift @@ -26,7 +26,7 @@ class NNWTableViewCell: UITableViewCell { /// Subclass overrides should call super func applyThemeProperties() { let selectedBackgroundView = UIView(frame: .zero) - selectedBackgroundView.backgroundColor = AppAssets.tableViewCellSelectionColor + selectedBackgroundView.backgroundColor = AppAssets.primaryAccentColor self.selectedBackgroundView = selectedBackgroundView } } diff --git a/iOS/UIKit Extensions/ThemedNavigationController.swift b/iOS/UIKit Extensions/ThemedNavigationController.swift index 1ec5dfbbf..1214f9fe2 100644 --- a/iOS/UIKit Extensions/ThemedNavigationController.swift +++ b/iOS/UIKit Extensions/ThemedNavigationController.swift @@ -40,15 +40,15 @@ class ThemedNavigationController: UINavigationController { } else { let navigationAppearance = UINavigationBarAppearance() navigationAppearance.backgroundColor = AppAssets.barBackgroundColor - navigationAppearance.titleTextAttributes = [.foregroundColor: AppAssets.barTitleColor] - navigationAppearance.largeTitleTextAttributes = [.foregroundColor: AppAssets.barTitleColor] + navigationAppearance.titleTextAttributes = [.foregroundColor: UIColor.label] + navigationAppearance.largeTitleTextAttributes = [.foregroundColor: UIColor.label] navigationBar.standardAppearance = navigationAppearance - navigationBar.tintColor = AppAssets.barTintColor + navigationBar.tintColor = AppAssets.primaryAccentColor let toolbarAppearance = UIToolbarAppearance() toolbarAppearance.backgroundColor = UIColor.white toolbar.standardAppearance = toolbarAppearance - toolbar.tintColor = AppAssets.barTintColor + toolbar.tintColor = AppAssets.primaryAccentColor } }