FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-02 20:16:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix timeline bug where vibrancy could be lost

Browse Source
This commit is contained in:
Maurice Parker 2019-11-03 16:34:57 -06:00
parent 21d5c321b4
commit 44533399e6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift
View File

@ -142,19 +142,19 @@ private extension MasterTimelineTableViewCell {
func updateTitleView() { func updateTitleView() {
titleView.font = MasterTimelineDefaultCellLayout.titleFont titleView.font = MasterTimelineDefaultCellLayout.titleFont
titleView.textColor = .label titleView.textColor = labelColor
updateTextFieldText(titleView, cellData?.title) updateTextFieldText(titleView, cellData?.title)
} }
func updateSummaryView() { func updateSummaryView() {
summaryView.font = MasterTimelineDefaultCellLayout.summaryFont summaryView.font = MasterTimelineDefaultCellLayout.summaryFont
summaryView.textColor = .label summaryView.textColor = labelColor
updateTextFieldText(summaryView, cellData?.summary) updateTextFieldText(summaryView, cellData?.summary)
} }
func updateDateView() { func updateDateView() {
dateView.font = MasterTimelineDefaultCellLayout.dateFont dateView.font = MasterTimelineDefaultCellLayout.dateFont
dateView.textColor = .secondaryLabel dateView.textColor = secondaryLabelColor
updateTextFieldText(dateView, cellData.dateString) updateTextFieldText(dateView, cellData.dateString)
} }
@ -171,7 +171,7 @@ private extension MasterTimelineTableViewCell {
if cellData.showFeedName { if cellData.showFeedName {
showView(feedNameView) showView(feedNameView)
feedNameView.font = MasterTimelineDefaultCellLayout.feedNameFont feedNameView.font = MasterTimelineDefaultCellLayout.feedNameFont
feedNameView.textColor = .secondaryLabel feedNameView.textColor = secondaryLabelColor
updateTextFieldText(feedNameView, cellData.feedName) updateTextFieldText(feedNameView, cellData.feedName)
} else { } else {
hideView(feedNameView) hideView(feedNameView)

4
iOS/UIKit Extensions/VibrantTableViewCell.swift
View File

@ -14,6 +14,10 @@ class VibrantTableViewCell: UITableViewCell {
return isHighlighted || isSelected ? AppAssets.vibrantTextColor : UIColor.label return isHighlighted || isSelected ? AppAssets.vibrantTextColor : UIColor.label
} }
var secondaryLabelColor: UIColor {
return isHighlighted || isSelected ? AppAssets.vibrantTextColor : UIColor.secondaryLabel
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier) super.init(style: style, reuseIdentifier: reuseIdentifier)
commonInit() commonInit()