FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do a full reload of the article when rearranging the UI to accommodate for split screen color changes.

Browse Source
This commit is contained in:
Maurice Parker 2019-11-20 18:16:54 -06:00
parent 7c947b935d
commit 56d43f8f2d
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mac/MainWindow/Detail/DetailWebViewController.swift
View File

@ -221,7 +221,7 @@ private extension DetailWebViewController {
var render = "error();" var render = "error();"
if let data = try? encoder.encode(templateData) { if let data = try? encoder.encode(templateData) {
let json = String(data: data, encoding: .utf8)! let json = String(data: data, encoding: .utf8)!
render = "render(\(json));" render = "render(\(json), 0);"
} }
webView.evaluateJavaScript(render) webView.evaluateJavaScript(render)

4
Shared/Article Rendering/main.js
View File

@ -30,11 +30,11 @@ function error() {
document.body.innerHTML = "error"; document.body.innerHTML = "error";
} }
function render(data) { function render(data, scrollY) {
document.getElementsByTagName("style")[0].innerHTML = data.style; document.getElementsByTagName("style")[0].innerHTML = data.style;
document.body.innerHTML = data.body; document.body.innerHTML = data.body;
window.scrollTo(0, 0); window.scrollTo(0, scrollY);
wrapFrames() wrapFrames()
stripStyles() stripStyles()

13
iOS/Article/ArticleViewController.swift
View File

@ -59,6 +59,8 @@ class ArticleViewController: UIViewController {
} }
} }
var restoreOffset = 0
var currentArticle: Article? { var currentArticle: Article? {
switch state { switch state {
case .article(let article): case .article(let article):
@ -190,9 +192,11 @@ class ArticleViewController: UIViewController {
var render = "error();" var render = "error();"
if let data = try? encoder.encode(templateData) { if let data = try? encoder.encode(templateData) {
let json = String(data: data, encoding: .utf8)! let json = String(data: data, encoding: .utf8)!
render = "render(\(json));" render = "render(\(json), \(restoreOffset));"
} }
restoreOffset = 0
ArticleViewControllerWebViewProvider.shared.articleIconSchemeHandler.currentArticle = currentArticle ArticleViewControllerWebViewProvider.shared.articleIconSchemeHandler.currentArticle = currentArticle
webView?.scrollView.setZoomScale(1.0, animated: false) webView?.scrollView.setZoomScale(1.0, animated: false)
webView?.evaluateJavaScript(render) webView?.evaluateJavaScript(render)
@ -319,6 +323,13 @@ class ArticleViewController: UIViewController {
webView?.evaluateJavaScript("showClickedImage();") webView?.evaluateJavaScript("showClickedImage();")
} }
func fullReload() {
if let offset = webView?.scrollView.contentOffset.y {
restoreOffset = Int(offset)
webView?.reload()
}
}
} }
// MARK: WKNavigationDelegate // MARK: WKNavigationDelegate

4
iOS/SceneCoordinator.swift
View File

@ -1572,6 +1572,10 @@ private extension SceneCoordinator {
rootSplitViewController.showDetailViewController(controller, sender: self) rootSplitViewController.showDetailViewController(controller, sender: self)
} }
// We have to do a full reload when installing an article controller. We may have changed color contexts
// and need to update the article colors. An example is in dark mode. Split screen doesn't use true black
// like darkmode usually does.
articleController.fullReload()
return articleController return articleController
} }