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

Merge branch 'ios-candidate' of https://github.com/Ranchero-Software/NetNewsWire into ios-candidate

This commit is contained in:
Brent Simmons 2020-01-19 15:24:36 -08:00
parent 7e9215a587 fd1d84dff8
commit ed23d0ec15
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shared/Article Rendering/ArticleRenderer.swift
View File

@ -48,7 +48,7 @@ struct ArticleRenderer {
// MARK: - API // MARK: - API
static func articleHTML(article: Article, extractedArticle: ExtractedArticle? = nil, style: ArticleStyle, useImageIcon: Bool = false) -> Rendering { static func articleHTML(article: Article, extractedArticle: ExtractedArticle? = nil, style: ArticleStyle) -> Rendering {
let renderer = ArticleRenderer(article: article, extractedArticle: extractedArticle, style: style) let renderer = ArticleRenderer(article: article, extractedArticle: extractedArticle, style: style)
return (renderer.styleString(), renderer.articleHTML) return (renderer.styleString(), renderer.articleHTML)
} }

8
iOS/Article/WebViewController.swift
View File

@ -447,15 +447,15 @@ private extension WebViewController {
if let articleExtractor = articleExtractor, articleExtractor.state == .processing { if let articleExtractor = articleExtractor, articleExtractor.state == .processing {
rendering = ArticleRenderer.loadingHTML(style: style) rendering = ArticleRenderer.loadingHTML(style: style)
} else if let articleExtractor = articleExtractor, articleExtractor.state == .failedToParse, let article = article { } else if let articleExtractor = articleExtractor, articleExtractor.state == .failedToParse, let article = article {
rendering = ArticleRenderer.articleHTML(article: article, style: style, useImageIcon: true) rendering = ArticleRenderer.articleHTML(article: article, style: style)
} else if let article = article, let extractedArticle = extractedArticle { } else if let article = article, let extractedArticle = extractedArticle {
if isShowingExtractedArticle { if isShowingExtractedArticle {
rendering = ArticleRenderer.articleHTML(article: article, extractedArticle: extractedArticle, style: style, useImageIcon: true) rendering = ArticleRenderer.articleHTML(article: article, extractedArticle: extractedArticle, style: style)
} else { } else {
rendering = ArticleRenderer.articleHTML(article: article, style: style, useImageIcon: true) rendering = ArticleRenderer.articleHTML(article: article, style: style)
} }
} else if let article = article { } else if let article = article {
rendering = ArticleRenderer.articleHTML(article: article, style: style, useImageIcon: true) rendering = ArticleRenderer.articleHTML(article: article, style: style)
} else { } else {
rendering = ArticleRenderer.noSelectionHTML(style: style) rendering = ArticleRenderer.noSelectionHTML(style: style)
} }