From 456abc965f50299995faa046be00a84f29d29b48 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 28 Oct 2019 15:16:56 -0500 Subject: [PATCH] Change disclosure triangles to be gray instead of blue. Issue #1200 --- iOS/AppAssets.swift | 4 ++-- iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift | 9 ++++++--- iOS/MasterFeed/Cell/MasterFeedUnreadCountView.swift | 2 +- .../Contents.json | 0 4 files changed, 9 insertions(+), 6 deletions(-) rename iOS/Resources/Assets.xcassets/{unreadCountBackgroundColor.colorset => controlBackgroundColor.colorset}/Contents.json (100%) diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index 88d50df7a..527f0c95b 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -182,8 +182,8 @@ struct AppAssets { return UIColor(named: "vibrantTextColor")! }() - static var unreadCountBackgroundColor: UIColor = { - return UIColor(named: "unreadCountBackgroundColor")! + static var controlBackgroundColor: UIColor = { + return UIColor(named: "controlBackgroundColor")! }() static func image(for accountType: AccountType) -> UIImage? { diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift index 8de9f84c6..4a90d1e92 100644 --- a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift +++ b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift @@ -199,11 +199,14 @@ private extension MasterFeedTableViewCell { } func updateVibrancy(animated: Bool) { - let tintColor = isHighlighted || isSelected ? AppAssets.vibrantTextColor : AppAssets.secondaryAccentColor + let faviconTintColor = isHighlighted || isSelected ? AppAssets.vibrantTextColor : AppAssets.secondaryAccentColor + let disclosureTintColor = isHighlighted || isSelected ? AppAssets.vibrantTextColor : AppAssets.controlBackgroundColor + let duration = animated ? 0.6 : 0.0 + UIView.animate(withDuration: duration) { - self.disclosureButton?.tintColor = tintColor - self.faviconImageView.tintColor = tintColor + self.disclosureButton?.tintColor = disclosureTintColor + self.faviconImageView.tintColor = faviconTintColor } } diff --git a/iOS/MasterFeed/Cell/MasterFeedUnreadCountView.swift b/iOS/MasterFeed/Cell/MasterFeedUnreadCountView.swift index abe659095..e084036b9 100644 --- a/iOS/MasterFeed/Cell/MasterFeedUnreadCountView.swift +++ b/iOS/MasterFeed/Cell/MasterFeedUnreadCountView.swift @@ -15,7 +15,7 @@ class MasterFeedUnreadCountView : UIView { } let cornerRadius = 8.0 - let bgColor = AppAssets.unreadCountBackgroundColor + let bgColor = AppAssets.controlBackgroundColor var textColor: UIColor { return UIColor.white } diff --git a/iOS/Resources/Assets.xcassets/unreadCountBackgroundColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/controlBackgroundColor.colorset/Contents.json similarity index 100% rename from iOS/Resources/Assets.xcassets/unreadCountBackgroundColor.colorset/Contents.json rename to iOS/Resources/Assets.xcassets/controlBackgroundColor.colorset/Contents.json