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

Change event used to stop web view activity (video and image zooming) so that it doesn't interfere with the image zooming transition.

Browse Source
This commit is contained in:
Maurice Parker 2020-02-18 11:08:38 -08:00
parent e3b32847f9
commit 8acd6a039a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
iOS/Article/ArticleViewController.swift
View File

@ -317,8 +317,11 @@ extension ArticleViewController: UIPageViewControllerDelegate {
func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) { func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) {
guard finished, completed else { return } guard finished, completed else { return }
guard let article = currentWebViewController?.article else { return } guard let article = currentWebViewController?.article else { return }
coordinator.selectArticle(article, animations: [.select, .scroll, .navigation]) coordinator.selectArticle(article, animations: [.select, .scroll, .navigation])
articleExtractorButton.buttonState = currentWebViewController?.articleExtractorButtonState ?? .off articleExtractorButton.buttonState = currentWebViewController?.articleExtractorButtonState ?? .off
previousViewControllers.compactMap({ $0 as? WebViewController }).forEach({ $0.stopWebViewActivity() })
} }
} }

15
iOS/Article/WebViewController.swift
View File

@ -92,14 +92,6 @@ class WebViewController: UIViewController {
} }
override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
if let webView = webView {
stopMediaPlayback(webView)
cancelImageLoad(webView)
}
}
// MARK: Notifications // MARK: Notifications
@objc func webFeedIconDidBecomeAvailable(_ note: Notification) { @objc func webFeedIconDidBecomeAvailable(_ note: Notification) {
@ -217,6 +209,13 @@ class WebViewController: UIViewController {
} }
} }
func stopWebViewActivity() {
if let webView = webView {
stopMediaPlayback(webView)
cancelImageLoad(webView)
}
}
func showActivityDialog(popOverBarButtonItem: UIBarButtonItem? = nil) { func showActivityDialog(popOverBarButtonItem: UIBarButtonItem? = nil) {
guard let preferredLink = article?.preferredLink, let url = URL(string: preferredLink) else { guard let preferredLink = article?.preferredLink, let url = URL(string: preferredLink) else {
return return