From 61a2e95d2b3d16d5ccea199ad8818ef5cf0b8a7b Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Thu, 12 Mar 2020 18:07:40 -0500
Subject: [PATCH] Manually specify the font size to work around a WKWebView
 resizing bug.  Issue #1878

---
 .../Article Rendering/ArticleRenderer.swift   | 33 +++++++++++++++----
 iOS/Resources/styleSheet.css                  |  4 ++-
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/Shared/Article Rendering/ArticleRenderer.swift b/Shared/Article Rendering/ArticleRenderer.swift
index 92f0de19c..5b0192afe 100644
--- a/Shared/Article Rendering/ArticleRenderer.swift	
+++ b/Shared/Article Rendering/ArticleRenderer.swift	
@@ -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
 
 }
 
diff --git a/iOS/Resources/styleSheet.css b/iOS/Resources/styleSheet.css
index b2c5b1264..9bea3383f 100644
--- a/iOS/Resources/styleSheet.css
+++ b/iOS/Resources/styleSheet.css
@@ -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 {