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

Store more article view controller state when destroying and recreating them. Issue #1729

Browse Source
This commit is contained in:
Maurice Parker
2020-01-29 11:30:52 -07:00
parent e9989d6f24
commit f96bb9c3e0
3 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
iOS/Article/WebViewController.swift
View File

@@ -14,7 +14,6 @@ import Articles
import SafariServices
protocol WebViewControllerDelegate: class {
func webViewController(_: WebViewController, restoreWindowScrollYDidUpdate: Int)
func webViewController(_: WebViewController, articleExtractorButtonStateDidUpdate: ArticleExtractorButtonState)
}
@@ -39,8 +38,12 @@ class WebViewController: UIViewController {
private var clickedImageCompletion: (() -> Void)?
private var articleExtractor: ArticleExtractor? = nil
private var extractedArticle: ExtractedArticle?
private var isShowingExtractedArticle = false {
var extractedArticle: ExtractedArticle? {
didSet {
windowScrollY = 0
}
}
var isShowingExtractedArticle = false {
didSet {
if isShowingExtractedArticle != oldValue {
reloadHTML()
@@ -64,18 +67,14 @@ class WebViewController: UIViewController {
startArticleExtractor()
}
if article != oldValue {
restoreWindowScrollY = 0
windowScrollY = 0
reloadHTML()
}
}
}
let scrollPositionQueue = CoalescingQueue(name: "Article Scroll Position", interval: 0.3, maxInterval: 1.0)
var restoreWindowScrollY = 0 {
didSet {
delegate?.webViewController(self, restoreWindowScrollYDidUpdate: restoreWindowScrollY)
}
}
var windowScrollY = 0
deinit {
if webView != nil {
@@ -247,6 +246,12 @@ class WebViewController: UIViewController {
}
func stopArticleExtractorIfProcessing() {
if articleExtractor?.state == .processing {
stopArticleExtractor()
}
}
func showActivityDialog(popOverBarButtonItem: UIBarButtonItem? = nil) {
guard let preferredLink = article?.preferredLink, let url = URL(string: preferredLink) else {
return
@@ -423,7 +428,7 @@ extension WebViewController: UIScrollViewDelegate {
@objc func scrollPositionDidChange() {
webView?.evaluateJavaScript("window.scrollY") { (scrollY, _) in
self.restoreWindowScrollY = scrollY as? Int ?? 0
self.windowScrollY = scrollY as? Int ?? 0
}
}
@@ -481,10 +486,10 @@ private extension WebViewController {
var render = "error();"
if let data = try? encoder.encode(templateData) {
let json = String(data: data, encoding: .utf8)!
render = "render(\(json), \(restoreWindowScrollY));"
render = "render(\(json), \(windowScrollY));"
}
restoreWindowScrollY = 0
windowScrollY = 0
webView.scrollView.setZoomScale(1.0, animated: false)
webView.evaluateJavaScript(render)