FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-01-31 19:24:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Manually specify the font size to work around a WKWebView resizing bug. Issue #1878

Browse Source
This commit is contained in:
Maurice Parker 2020-03-12 18:07:40 -05:00
parent 47e42fab0a
commit 61a2e95d2b
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Shared/Article Rendering/ArticleRenderer.swift
View File

@ -7,6 +7,9 @@
//
import Foundation
#if os(iOS)
import UIKit
#endif
import RSCore
import Articles
import Account
@ -49,27 +52,27 @@ struct ArticleRenderer {
static func articleHTML(article: Article, extractedArticle: ExtractedArticle? = nil, style: ArticleStyle) -> Rendering {
let renderer = ArticleRenderer(article: article, extractedArticle: extractedArticle, style: style)
return (renderer.styleString(), renderer.articleHTML, renderer.title, renderer.baseURL ?? "")
return (renderer.articleCSS, renderer.articleHTML, renderer.title, renderer.baseURL ?? "")
}
static func multipleSelectionHTML(style: ArticleStyle) -> Rendering {
let renderer = ArticleRenderer(article: nil, extractedArticle: nil, style: style)
return (renderer.styleString(), renderer.multipleSelectionHTML, renderer.title, renderer.baseURL ?? "")
return (renderer.articleCSS, renderer.multipleSelectionHTML, renderer.title, renderer.baseURL ?? "")
}
static func loadingHTML(style: ArticleStyle) -> Rendering {
let renderer = ArticleRenderer(article: nil, extractedArticle: nil, style: style)
return (renderer.styleString(), renderer.loadingHTML, renderer.title, renderer.baseURL ?? "")
return (renderer.articleCSS, renderer.loadingHTML, renderer.title, renderer.baseURL ?? "")
}
static func noSelectionHTML(style: ArticleStyle) -> Rendering {
let renderer = ArticleRenderer(article: nil, extractedArticle: nil, style: style)
return (renderer.styleString(), renderer.noSelectionHTML, renderer.title, renderer.baseURL ?? "")
return (renderer.articleCSS, renderer.noSelectionHTML, renderer.title, renderer.baseURL ?? "")
}
static func noContentHTML(style: ArticleStyle) -> Rendering {
let renderer = ArticleRenderer(article: nil, extractedArticle: nil, style: style)
return (renderer.styleString(), renderer.noContentHTML, renderer.title, renderer.baseURL ?? "")
return (renderer.articleCSS, renderer.noContentHTML, renderer.title, renderer.baseURL ?? "")
}
}
@ -78,8 +81,7 @@ struct ArticleRenderer {
private extension ArticleRenderer {
private var articleHTML: String {
let body = try! MacroProcessor.renderedText(withTemplate: template(), substitutions: articleSubstitutions())
return body
return try! MacroProcessor.renderedText(withTemplate: template(), substitutions: articleSubstitutions())
}
private var multipleSelectionHTML: String {
@ -100,6 +102,15 @@ private extension ArticleRenderer {
private var noContentHTML: String {
return ""
}
private var articleCSS: String {
#if os(iOS)
let style = try! MacroProcessor.renderedText(withTemplate: styleString(), substitutions: styleSubstitutions())
return style
#else
return styleString()
#endif
}
static var defaultStyleSheet: String = {
let path = Bundle.main.path(forResource: "styleSheet", ofType: "css")!
@ -233,6 +244,14 @@ private extension ArticleRenderer {
dateFormatter.timeStyle = timeStyle
return dateFormatter.string(from: date)
}
#if os(iOS)
func styleSubstitutions() -> [String: String] {
var d = [String: String]()
d["font-size"] = String(describing: UIFontMetrics.default.scaledValue(for: UIFont.systemFontSize))
return d
}
#endif
}

4
iOS/Resources/styleSheet.css
View File

@ -1,5 +1,6 @@
:root {
font: -apple-system-body;
font-size: [[font-size]]pt;
}
body {
@ -75,7 +76,8 @@ body .headerTable {
border-bottom: 1px solid var(--header-table-border-color);
}
body .header {
font: -apple-system-body;
font: -apple-system-body;
font-size: [[font-size]]pt;
color: var(--header-color);
}
body .header a:link, body .header a:visited {