From 41acb716bd93c4e0c0c944db1fa50283e6480fea Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 30 Mar 2020 15:42:42 -0500 Subject: [PATCH 1/2] Remove activity donation for next unread. Issue #1957 --- iOS/SceneCoordinator.swift | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index 0929f16c4..4408a5f30 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -927,7 +927,6 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider { } if selectNextUnreadArticleInTimeline() { - activityManager.selectingNextUnread() return } @@ -936,9 +935,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider { } selectNextUnreadFeed() { - if self.selectNextUnreadArticleInTimeline() { - self.activityManager.selectingNextUnread() - } + self.selectNextUnreadArticleInTimeline() } } From f0ec7c5e196c60284f2162a3a38d51f72ab5a3c6 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 6 Apr 2020 08:47:01 -0500 Subject: [PATCH 2/2] Fix problem where back swiping wouldn't work anymore for full screen. Issue #1970 --- .../InteractiveNavigationController.swift | 3 +- .../PoppableGestureRecognizerDelegate.swift | 28 ++++--------------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/iOS/UIKit Extensions/InteractiveNavigationController.swift b/iOS/UIKit Extensions/InteractiveNavigationController.swift index 6c5da6628..eb939fc3d 100644 --- a/iOS/UIKit Extensions/InteractiveNavigationController.swift +++ b/iOS/UIKit Extensions/InteractiveNavigationController.swift @@ -26,7 +26,6 @@ class InteractiveNavigationController: UINavigationController { override func viewDidLoad() { super.viewDidLoad() - poppableDelegate.originalDelegate = interactivePopGestureRecognizer?.delegate poppableDelegate.navigationController = self interactivePopGestureRecognizer?.delegate = poppableDelegate } @@ -38,7 +37,7 @@ class InteractiveNavigationController: UINavigationController { } } - } +} // MARK: Private diff --git a/iOS/UIKit Extensions/PoppableGestureRecognizerDelegate.swift b/iOS/UIKit Extensions/PoppableGestureRecognizerDelegate.swift index 7d32ce2b5..fa9cda81e 100644 --- a/iOS/UIKit Extensions/PoppableGestureRecognizerDelegate.swift +++ b/iOS/UIKit Extensions/PoppableGestureRecognizerDelegate.swift @@ -5,36 +5,20 @@ // Created by Maurice Parker on 11/18/19. // Copyright © 2019 Ranchero Software. All rights reserved. // -// https://stackoverflow.com/a/38042863 +// https://stackoverflow.com/a/41248703 import UIKit final class PoppableGestureRecognizerDelegate: NSObject, UIGestureRecognizerDelegate { weak var navigationController: UINavigationController? - weak var originalDelegate: UIGestureRecognizerDelegate? - override func responds(to aSelector: Selector!) -> Bool { - if aSelector == #selector(gestureRecognizer(_:shouldReceive:)) { - return true - } else if let responds = originalDelegate?.responds(to: aSelector) { - return responds - } else { - return false - } + func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool { + return navigationController?.viewControllers.count ?? 0 > 1 } - override func forwardingTarget(for aSelector: Selector!) -> Any? { - return originalDelegate - } - - func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool { - if let nav = navigationController, nav.isNavigationBarHidden, nav.viewControllers.count > 1 { - return true - } else if let result = originalDelegate?.gestureRecognizer?(gestureRecognizer, shouldReceive: touch) { - return result - } else { - return false - } + func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool { + return true } + }