FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show just one avatar in detail view. Make date a permalink, when available.

This commit is contained in:
Brent Simmons 2017-12-29 18:59:04 -08:00
parent 3b92c543fb
commit 65fcbf00bf
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Evergreen/MainWindow/Detail/ArticleRenderer.swift
View File

@ -167,20 +167,21 @@ class ArticleRenderer {
d["newsitem_description"] = body d["newsitem_description"] = body
d["avatars"] = "" d["avatars"] = ""
if let avatars = avatarsToShow() { if let avatar = avatarToUse() {
var avatarHTML = "" let avatarHTML = avatar.html(dimension: 64)
var ix = 0 d["avatars"] = avatarHTML
let ct = avatars.count // var ix = 0
for avatar in avatars { // let ct = avatars.count
avatarHTML += avatar.html(dimension: 64) // for avatar in avatars {
if ix < ct - 1 { // avatarHTML += avatar.html(dimension: 64)
avatarHTML += "&nbsp;" // if ix < ct - 1 {
} // avatarHTML += "&nbsp;"
ix += 1 // }
} // ix += 1
if !avatarHTML.isEmpty { // }
d["avatars"] = avatarHTML // if !avatarHTML.isEmpty {
} // d["avatars"] = avatarHTML
// }
} }
var feedLink = "" var feedLink = ""
@ -194,16 +195,21 @@ class ArticleRenderer {
d["feedlink_withfavicon"] = feedLink d["feedlink_withfavicon"] = feedLink
let longDate = longDateFormatter.string(from: article.logicalDatePublished) let longDate = longDateFormatter.string(from: article.logicalDatePublished)
d["date_long"] = longDate
let mediumDate = mediumDateFormatter.string(from: article.logicalDatePublished) let mediumDate = mediumDateFormatter.string(from: article.logicalDatePublished)
d["date_medium"] = mediumDate
let shortDate = shortDateFormatter.string(from: article.logicalDatePublished) let shortDate = shortDateFormatter.string(from: article.logicalDatePublished)
d["date_short"] = shortDate if let permalink = article.url {
d["date_long"] = linkWithText(longDate, permalink)
d["date_medium"] = linkWithText(mediumDate, permalink)
d["date_short"] = linkWithText(shortDate, permalink)
}
else {
d["date_long"] = longDate
d["date_medium"] = mediumDate
d["date_short"] = shortDate
}
d["byline"] = byline() d["byline"] = byline()
// d["author_avatar"] = authorAvatar() // d["author_avatar"] = authorAvatar()
return d return d
} }