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

Make Article icons/avatars match Timeline icons/avatars Issue #1274

Browse Source
This commit is contained in:
Maurice Parker
2019-11-07 14:29:16 -06:00
parent 5d2cac32e0
commit 4f294c4d20
8 changed files with 83 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
iOS/Article/ArticleViewController.swift
View File

@@ -166,9 +166,9 @@ class ArticleViewController: UIViewController {
case .loading:
rendering = ArticleRenderer.loadingHTML(style: style)
case .article(let article):
rendering = ArticleRenderer.articleHTML(article: article, style: style)
rendering = ArticleRenderer.articleHTML(article: article, style: style, useImageIcon: true)
case .extracted(let article, let extractedArticle):
rendering = ArticleRenderer.articleHTML(article: article, extractedArticle: extractedArticle, style: style)
rendering = ArticleRenderer.articleHTML(article: article, extractedArticle: extractedArticle, style: style, useImageIcon: true)
}
let templateData = TemplateData(style: rendering.style, body: rendering.html)
@@ -180,6 +180,7 @@ class ArticleViewController: UIViewController {
render = "render(\(json));"
}
ArticleViewControllerWebViewProvider.shared.articleIconSchemeHandler.currentArticle = currentArticle
webView?.scrollView.setZoomScale(1.0, animated: false)
webView?.evaluateJavaScript(render)