FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display "(No Text)" if there isn't a title or summary for the timeline. Fixes #2391

Browse Source
This commit is contained in:
Maurice Parker 2020-10-23 19:18:35 -05:00
parent d735ae91dc
commit 0a01a9f501
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Mac/MainWindow/Timeline/Cell/TimelineCellData.swift
View File

@ -11,6 +11,8 @@ import Articles
struct TimelineCellData { struct TimelineCellData {
private static let noText = NSLocalizedString("(No Text)", comment: "No Text")
let title: String let title: String
let attributedTitle: NSAttributedString let attributedTitle: NSAttributedString
let text: String let text: String
@ -28,7 +30,13 @@ struct TimelineCellData {
self.title = ArticleStringFormatter.truncatedTitle(article) self.title = ArticleStringFormatter.truncatedTitle(article)
self.attributedTitle = ArticleStringFormatter.attributedTruncatedTitle(article) self.attributedTitle = ArticleStringFormatter.attributedTruncatedTitle(article)
self.text = ArticleStringFormatter.truncatedSummary(article)
let truncatedSummary = ArticleStringFormatter.truncatedSummary(article)
if self.title.isEmpty && truncatedSummary.isEmpty {
self.text = Self.noText
} else {
self.text = truncatedSummary
}
self.dateString = ArticleStringFormatter.dateString(article.logicalDatePublished) self.dateString = ArticleStringFormatter.dateString(article.logicalDatePublished)

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

@ -11,6 +11,8 @@ import Articles
struct MasterTimelineCellData { struct MasterTimelineCellData {
private static let noText = NSLocalizedString("(No Text)", comment: "No Text")
let title: String let title: String
let attributedTitle: NSAttributedString let attributedTitle: NSAttributedString
let summary: String let summary: String
@ -30,7 +32,13 @@ struct MasterTimelineCellData {
self.title = ArticleStringFormatter.truncatedTitle(article) self.title = ArticleStringFormatter.truncatedTitle(article)
self.attributedTitle = ArticleStringFormatter.attributedTruncatedTitle(article) self.attributedTitle = ArticleStringFormatter.attributedTruncatedTitle(article)
self.summary = ArticleStringFormatter.truncatedSummary(article)
let truncatedSummary = ArticleStringFormatter.truncatedSummary(article)
if self.title.isEmpty && truncatedSummary.isEmpty {
self.summary = Self.noText
} else {
self.summary = truncatedSummary
}
self.dateString = ArticleStringFormatter.dateString(article.logicalDatePublished) self.dateString = ArticleStringFormatter.dateString(article.logicalDatePublished)