From 44533399e66f7ff5c02959a577566e94e9ca26b2 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 3 Nov 2019 16:34:57 -0600 Subject: [PATCH] Fix timeline bug where vibrancy could be lost --- iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift | 8 ++++---- iOS/UIKit Extensions/VibrantTableViewCell.swift | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift b/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift index cbfc85061..926a009a2 100644 --- a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift +++ b/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift @@ -142,19 +142,19 @@ private extension MasterTimelineTableViewCell { func updateTitleView() { titleView.font = MasterTimelineDefaultCellLayout.titleFont - titleView.textColor = .label + titleView.textColor = labelColor updateTextFieldText(titleView, cellData?.title) } func updateSummaryView() { summaryView.font = MasterTimelineDefaultCellLayout.summaryFont - summaryView.textColor = .label + summaryView.textColor = labelColor updateTextFieldText(summaryView, cellData?.summary) } func updateDateView() { dateView.font = MasterTimelineDefaultCellLayout.dateFont - dateView.textColor = .secondaryLabel + dateView.textColor = secondaryLabelColor updateTextFieldText(dateView, cellData.dateString) } @@ -171,7 +171,7 @@ private extension MasterTimelineTableViewCell { if cellData.showFeedName { showView(feedNameView) feedNameView.font = MasterTimelineDefaultCellLayout.feedNameFont - feedNameView.textColor = .secondaryLabel + feedNameView.textColor = secondaryLabelColor updateTextFieldText(feedNameView, cellData.feedName) } else { hideView(feedNameView) diff --git a/iOS/UIKit Extensions/VibrantTableViewCell.swift b/iOS/UIKit Extensions/VibrantTableViewCell.swift index c49c1a5e1..04699b7d2 100644 --- a/iOS/UIKit Extensions/VibrantTableViewCell.swift +++ b/iOS/UIKit Extensions/VibrantTableViewCell.swift @@ -14,6 +14,10 @@ class VibrantTableViewCell: UITableViewCell { return isHighlighted || isSelected ? AppAssets.vibrantTextColor : UIColor.label } + var secondaryLabelColor: UIColor { + return isHighlighted || isSelected ? AppAssets.vibrantTextColor : UIColor.secondaryLabel + } + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { super.init(style: style, reuseIdentifier: reuseIdentifier) commonInit()