renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "WIP: Title tags"

Browse Source
This commit is contained in:
Maurice Parker
2020-04-24 20:24:24 -05:00
committed by GitHub
parent 8b584d0000
commit 86fb98c17b
14 changed files with 20 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
iOS/MasterTimeline/Cell/MasterTimelineCellData.swift
View File

@@ -12,7 +12,6 @@ import Articles
struct MasterTimelineCellData {
let title: String
let attributedTitle: NSAttributedString
let summary: String
let dateString: String
let feedName: String
@@ -29,7 +28,6 @@ struct MasterTimelineCellData {
init(article: Article, showFeedName: ShowFeedName, feedName: String?, byline: String?, iconImage: IconImage?, showIcon: Bool, featuredImage: UIImage?, numberOfLines: Int, iconSize: IconSize) {
self.title = ArticleStringFormatter.truncatedTitle(article)
self.attributedTitle = ArticleStringFormatter.attributedTruncatedTitle(article)
self.summary = ArticleStringFormatter.truncatedSummary(article)
self.dateString = ArticleStringFormatter.dateString(article.logicalDatePublished)
@@ -62,7 +60,6 @@ struct MasterTimelineCellData {
init() { //Empty
self.title = ""
self.attributedTitle = NSAttributedString()
self.summary = ""
self.dateString = ""
self.feedName = ""

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

@@ -148,7 +148,7 @@ private extension MasterTimelineTableViewCell {
func updateTitleView() {
titleView.font = MasterTimelineDefaultCellLayout.titleFont
titleView.textColor = labelColor
updateTextFieldAttributedText(titleView, cellData?.attributedTitle)
updateTextFieldText(titleView, cellData?.title)
}
func updateSummaryView() {
@@ -170,19 +170,6 @@ private extension MasterTimelineTableViewCell {
setNeedsLayout()
}
}
func updateTextFieldAttributedText(_ label: UILabel, _ text: NSAttributedString?) {
var s = text ?? NSAttributedString(string: "")
if let fieldFont = label.font, let color = label.textColor {
s = s.adding(font: fieldFont, color: color)
}
if label.attributedText != s {
label.attributedText = s
setNeedsLayout()
}
}
func updateFeedNameView() {
switch cellData.showFeedName {