diff --git a/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode.h index f74e585372..3119c01976 100644 --- a/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode.h +++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode.h @@ -995,4 +995,71 @@ typedef NS_ENUM(NSInteger, ASLayoutEngineType) { @property (nullable, weak) ASDisplayNode *asyncdisplaykit_node; @end +@protocol ASGestureRecognizerDelegate + +@optional +// called when a gesture recognizer attempts to transition out of UIGestureRecognizerStatePossible. returning NO causes it to transition to UIGestureRecognizerStateFailed +- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer; + +// called when the recognition of one of gestureRecognizer or otherGestureRecognizer would be blocked by the other +// return YES to allow both to recognize simultaneously. the default implementation returns NO (by default no two gestures can be recognized simultaneously) +// +// note: returning YES is guaranteed to allow simultaneous recognition. returning NO is not guaranteed to prevent simultaneous recognition, as the other gesture's delegate may return YES +- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer; + +// called once per attempt to recognize, so failure requirements can be determined lazily and may be set up between recognizers across view hierarchies +// return YES to set up a dynamic failure requirement between gestureRecognizer and otherGestureRecognizer +// +// note: returning YES is guaranteed to set up the failure requirement. returning NO does not guarantee that there will not be a failure requirement as the other gesture's counterpart delegate or subclass methods may return YES +- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRequireFailureOfGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer API_AVAILABLE(ios(7.0)); +- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldBeRequiredToFailByGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer API_AVAILABLE(ios(7.0)); + +// called before touchesBegan:withEvent: is called on the gesture recognizer for a new touch. return NO to prevent the gesture recognizer from seeing this touch +- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch; + +// called before pressesBegan:withEvent: is called on the gesture recognizer for a new press. return NO to prevent the gesture recognizer from seeing this press +- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceivePress:(UIPress *)press; + +// called once before either -gestureRecognizer:shouldReceiveTouch: or -gestureRecognizer:shouldReceivePress: +// return NO to prevent the gesture recognizer from seeing this event +- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveEvent:(UIEvent *)event API_AVAILABLE(ios(13.4), tvos(13.4)) API_UNAVAILABLE(watchos); + +@end + +@protocol ASScrollViewDelegate +@optional + +- (void)scrollViewDidScroll:(UIScrollView *)scrollView; // any offset changes +- (void)scrollViewDidZoom:(UIScrollView *)scrollView API_AVAILABLE(ios(3.2)); // any zoom scale changes + +// called on start of dragging (may require some time and or distance to move) +- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView; +// called on finger up if the user dragged. velocity is in points/millisecond. targetContentOffset may be changed to adjust where the scroll view comes to rest +- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset API_AVAILABLE(ios(5.0)); +// called on finger up if the user dragged. decelerate is true if it will continue moving afterwards +- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate; + +- (void)scrollViewWillBeginDecelerating:(UIScrollView *)scrollView; // called on finger up as we are moving +- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView; // called when scroll view grinds to a halt + +- (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView; // called when setContentOffset/scrollRectVisible:animated: finishes. not called if not animating + +- (nullable UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView; // return a view that will be scaled. if delegate returns nil, nothing happens +- (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(nullable UIView *)view API_AVAILABLE(ios(3.2)); // called before the scroll view begins zooming its content +- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable UIView *)view atScale:(CGFloat)scale; // scale between minimum and maximum. called after any 'bounce' animations + +- (BOOL)scrollViewShouldScrollToTop:(UIScrollView *)scrollView; // return a yes if you want to scroll to the top. if not defined, assumes YES +- (void)scrollViewDidScrollToTop:(UIScrollView *)scrollView; // called when scrolling animation finished. may be called immediately if already at top + +/* Also see -[UIScrollView adjustedContentInsetDidChange] + */ +- (void)scrollViewDidChangeAdjustedContentInset:(UIScrollView *)scrollView API_AVAILABLE(ios(11.0), tvos(11.0)); + +- (nullable NSString *)accessibilityScrollStatusForScrollView:(UIScrollView *)scrollView; + +// If an object adopting this protocol responds to this method, the system will try sending it before sending its non-attributed version. +- (nullable NSAttributedString *)accessibilityAttributedScrollStatusForScrollView:(UIScrollView *)scrollView API_AVAILABLE(ios(11.0), tvos(11.0)); + +@end + NS_ASSUME_NONNULL_END diff --git a/submodules/AttachmentUI/Sources/AttachmentContainer.swift b/submodules/AttachmentUI/Sources/AttachmentContainer.swift index 7b934c28b3..9f2c472512 100644 --- a/submodules/AttachmentUI/Sources/AttachmentContainer.swift +++ b/submodules/AttachmentUI/Sources/AttachmentContainer.swift @@ -25,7 +25,7 @@ public func attachmentDefaultTopInset(layout: ContainerViewLayout?) -> CGFloat { } } -final class AttachmentContainer: ASDisplayNode, UIGestureRecognizerDelegate { +final class AttachmentContainer: ASDisplayNode, ASGestureRecognizerDelegate { let wrappingNode: ASDisplayNode let clipNode: ASDisplayNode let container: NavigationContainer @@ -112,7 +112,7 @@ final class AttachmentContainer: ASDisplayNode, UIGestureRecognizerDelegate { super.didLoad() let panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.panGestureRecognizer = panRecognizer diff --git a/submodules/AttachmentUI/Sources/AttachmentPanel.swift b/submodules/AttachmentUI/Sources/AttachmentPanel.swift index 255e9c3e53..092ea90dba 100644 --- a/submodules/AttachmentUI/Sources/AttachmentPanel.swift +++ b/submodules/AttachmentUI/Sources/AttachmentPanel.swift @@ -680,7 +680,7 @@ private final class MainButtonNode: HighlightTrackingButtonNode { } } -final class AttachmentPanel: ASDisplayNode, UIScrollViewDelegate { +final class AttachmentPanel: ASDisplayNode, ASScrollViewDelegate { private let context: AccountContext private let isScheduledMessages: Bool private var presentationData: PresentationData @@ -1026,7 +1026,7 @@ final class AttachmentPanel: ASDisplayNode, UIScrollViewDelegate { self.containerNode.layer.cornerCurve = .continuous } - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.scrollNode.view.showsHorizontalScrollIndicator = false self.scrollNode.view.showsVerticalScrollIndicator = false diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutInfoControllerNode.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutInfoControllerNode.swift index 2ae9a23786..353b1adfbf 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutInfoControllerNode.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutInfoControllerNode.swift @@ -92,7 +92,7 @@ enum BotCheckoutInfoControllerStatus { case verifying } -final class BotCheckoutInfoControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +final class BotCheckoutInfoControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private weak var navigationBar: NavigationBar? private let invoice: BotPaymentInvoice @@ -244,7 +244,7 @@ final class BotCheckoutInfoControllerNode: ViewControllerTracingNode, UIScrollVi self.scrollNode.view.alwaysBounceVertical = true self.scrollNode.view.showsVerticalScrollIndicator = false self.scrollNode.view.showsHorizontalScrollIndicator = false - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.scrollNode) diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryControllerNode.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryControllerNode.swift index 9f497c90b9..e50e9d8d2a 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryControllerNode.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryControllerNode.swift @@ -41,7 +41,7 @@ private final class BotCheckoutNativeCardEntryScrollerNode: ASDisplayNode { } } -final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private weak var navigationBar: NavigationBar? private let provider: BotCheckoutNativeCardEntryController.Provider @@ -183,7 +183,7 @@ final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode, self.scrollNode.view.alwaysBounceVertical = true self.scrollNode.view.showsVerticalScrollIndicator = false self.scrollNode.view.showsHorizontalScrollIndicator = false - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.scrollNode) diff --git a/submodules/BrowserUI/Sources/BrowserStackContainerNode.swift b/submodules/BrowserUI/Sources/BrowserStackContainerNode.swift index 2e5c58f3ee..17b244e331 100644 --- a/submodules/BrowserUI/Sources/BrowserStackContainerNode.swift +++ b/submodules/BrowserUI/Sources/BrowserStackContainerNode.swift @@ -191,7 +191,7 @@ class StackItemContainerNode: ASDisplayNode { } } -public class StackContainerNode: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { +public class StackContainerNode: ASDisplayNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { private let scrollNode: ASScrollNode private var nodes: [StackItemContainerNode] @@ -222,11 +222,11 @@ public class StackContainerNode: ASDisplayNode, UIScrollViewDelegate, UIGestureR self.scrollNode.view.contentInsetAdjustmentBehavior = .never } - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.scrollNode.view.alwaysBounceVertical = true let deleteGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(didPanToDelete(gestureRecognizer:))) - deleteGestureRecognizer.delegate = self + deleteGestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate deleteGestureRecognizer.delaysTouchesBegan = true self.scrollNode.view.addGestureRecognizer(deleteGestureRecognizer) self.deleteGestureRecognizer = deleteGestureRecognizer diff --git a/submodules/CalendarMessageScreen/Sources/CalendarMessageScreen.swift b/submodules/CalendarMessageScreen/Sources/CalendarMessageScreen.swift index 58f1bc1884..078503777c 100644 --- a/submodules/CalendarMessageScreen/Sources/CalendarMessageScreen.swift +++ b/submodules/CalendarMessageScreen/Sources/CalendarMessageScreen.swift @@ -975,7 +975,7 @@ private func monthMetadata(calendar: Calendar, for baseDate: Date, currentYear: } public final class CalendarMessageScreen: ViewController { - private final class Node: ViewControllerTracingNode, UIScrollViewDelegate { + private final class Node: ViewControllerTracingNode, ASScrollViewDelegate { struct SelectionState { var dayRange: ClosedRange? } @@ -1173,7 +1173,7 @@ public final class CalendarMessageScreen: ViewController { self.backgroundColor = self.presentationData.theme.list.plainBackgroundColor - self.scrollView.delegate = self + self.scrollView.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.contextGestureContainerNode) self.contextGestureContainerNode.view.addSubview(self.scrollView) diff --git a/submodules/ChatListUI/Sources/ChatListControllerNode.swift b/submodules/ChatListUI/Sources/ChatListControllerNode.swift index 7ab58a8099..b1b1ab0bc1 100644 --- a/submodules/ChatListUI/Sources/ChatListControllerNode.swift +++ b/submodules/ChatListUI/Sources/ChatListControllerNode.swift @@ -44,7 +44,7 @@ public enum ChatListContainerNodeFilter: Equatable { } } -public final class ChatListContainerNode: ASDisplayNode, UIGestureRecognizerDelegate { +public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDelegate { private let context: AccountContext private weak var controller: ChatListControllerImpl? let location: ChatListControllerLocation @@ -481,7 +481,7 @@ public final class ChatListContainerNode: ASDisplayNode, UIGestureRecognizerDele return [.rightEdge] } }, edgeWidth: .widthMultiplier(factor: 1.0 / 6.0, min: 22.0, max: 80.0)) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.panRecognizer = panRecognizer @@ -1009,7 +1009,7 @@ public final class ChatListContainerNode: ASDisplayNode, UIGestureRecognizerDele } } -final class ChatListControllerNode: ASDisplayNode, UIGestureRecognizerDelegate { +final class ChatListControllerNode: ASDisplayNode, ASGestureRecognizerDelegate { private let context: AccountContext private let location: ChatListControllerLocation private var presentationData: PresentationData @@ -1199,7 +1199,7 @@ final class ChatListControllerNode: ASDisplayNode, UIGestureRecognizerDelegate { let directions: InteractiveTransitionGestureRecognizerDirections = [.rightCenter] return directions }, edgeWidth: .widthMultiplier(factor: 1.0 / 6.0, min: 22.0, max: 80.0)) - inlineContentPanRecognizer.delegate = self + inlineContentPanRecognizer.delegate = self.wrappedGestureRecognizerDelegate inlineContentPanRecognizer.delaysTouchesBegan = false inlineContentPanRecognizer.cancelsTouchesInView = true self.inlineContentPanRecognizer = inlineContentPanRecognizer diff --git a/submodules/ChatListUI/Sources/ChatListSearchMediaNode.swift b/submodules/ChatListUI/Sources/ChatListSearchMediaNode.swift index 89a88281c9..7c02fe7f39 100644 --- a/submodules/ChatListUI/Sources/ChatListSearchMediaNode.swift +++ b/submodules/ChatListUI/Sources/ChatListSearchMediaNode.swift @@ -594,7 +594,7 @@ private enum ItemsLayout { } } -final class ChatListSearchMediaNode: ASDisplayNode, UIScrollViewDelegate { +final class ChatListSearchMediaNode: ASDisplayNode, ASScrollViewDelegate { enum ContentType { case photoOrVideo case gifs @@ -664,7 +664,7 @@ final class ChatListSearchMediaNode: ASDisplayNode, UIScrollViewDelegate { self.scrollNode.view.contentInsetAdjustmentBehavior = .never } self.scrollNode.view.scrollsToTop = false - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.scrollNode) self.addSubnode(self.floatingHeaderNode) diff --git a/submodules/ChatListUI/Sources/ChatListSearchPaneContainerNode.swift b/submodules/ChatListUI/Sources/ChatListSearchPaneContainerNode.swift index f3747fb993..831898d52d 100644 --- a/submodules/ChatListUI/Sources/ChatListSearchPaneContainerNode.swift +++ b/submodules/ChatListUI/Sources/ChatListSearchPaneContainerNode.swift @@ -142,7 +142,7 @@ private final class ChatListSearchPendingPane { } } -final class ChatListSearchPaneContainerNode: ASDisplayNode, UIGestureRecognizerDelegate { +final class ChatListSearchPaneContainerNode: ASDisplayNode, ASGestureRecognizerDelegate { private let context: AccountContext private let animationCache: AnimationCache private let animationRenderer: MultiAnimationRenderer @@ -234,7 +234,7 @@ final class ChatListSearchPaneContainerNode: ASDisplayNode, UIGestureRecognizerD } return [.left, .right] }) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.view.addGestureRecognizer(panRecognizer) diff --git a/submodules/ChatListUI/Sources/Node/ChatListArchiveInfoItem.swift b/submodules/ChatListUI/Sources/Node/ChatListArchiveInfoItem.swift index 0582c8859b..4dda5fe57c 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListArchiveInfoItem.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListArchiveInfoItem.swift @@ -156,7 +156,7 @@ private final class InfoPageNode: ASDisplayNode { } } -class ChatListArchiveInfoItemNode: ListViewItemNode, UIScrollViewDelegate { +class ChatListArchiveInfoItemNode: ListViewItemNode, ASScrollViewDelegate { private var item: ChatListArchiveInfoItem? private let scrollNode: ASScrollNode @@ -187,7 +187,7 @@ class ChatListArchiveInfoItemNode: ListViewItemNode, UIScrollViewDelegate { self.scrollNode.view.showsHorizontalScrollIndicator = false self.scrollNode.view.isPagingEnabled = true - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.pageControlNode.setPage(0.0) } diff --git a/submodules/ChatSendMessageActionUI/Sources/ChatSendMessageActionSheetControllerNode.swift b/submodules/ChatSendMessageActionUI/Sources/ChatSendMessageActionSheetControllerNode.swift index 93563c76f3..397c6657fd 100644 --- a/submodules/ChatSendMessageActionUI/Sources/ChatSendMessageActionSheetControllerNode.swift +++ b/submodules/ChatSendMessageActionUI/Sources/ChatSendMessageActionSheetControllerNode.swift @@ -155,7 +155,7 @@ private final class ActionSheetItemNode: ASDisplayNode { } } -final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private var presentationData: PresentationData private let sourceSendButton: ASDisplayNode @@ -382,7 +382,7 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, self.scrollNode.view.showsVerticalScrollIndicator = false self.scrollNode.view.delaysContentTouches = false - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.scrollNode.view.alwaysBounceVertical = true if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.scrollNode.view.contentInsetAdjustmentBehavior = .never diff --git a/submodules/Components/ReactionListContextMenuContent/Sources/ReactionListContextMenuContent.swift b/submodules/Components/ReactionListContextMenuContent/Sources/ReactionListContextMenuContent.swift index 1b70a3a8b6..d623afc580 100644 --- a/submodules/Components/ReactionListContextMenuContent/Sources/ReactionListContextMenuContent.swift +++ b/submodules/Components/ReactionListContextMenuContent/Sources/ReactionListContextMenuContent.swift @@ -387,7 +387,7 @@ public final class ReactionListContextMenuContent: ContextControllerItemsContent private static let readIconImage: UIImage? = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/MenuReadIcon"), color: .white)?.withRenderingMode(.alwaysTemplate) private static let reactionIconImage: UIImage? = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/MenuReactionIcon"), color: .white)?.withRenderingMode(.alwaysTemplate) - private final class ReactionsTabNode: ASDisplayNode, UIScrollViewDelegate { + private final class ReactionsTabNode: ASDisplayNode, ASScrollViewDelegate { private final class ItemNode: HighlightTrackingButtonNode { let context: AccountContext let displayReadTimestamps: Bool @@ -868,7 +868,7 @@ public final class ReactionListContextMenuContent: ContextControllerItemsContent super.init() self.addSubnode(self.scrollNode) - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.clipsToBounds = true @@ -1101,7 +1101,7 @@ public final class ReactionListContextMenuContent: ContextControllerItemsContent } } - final class ItemsNode: ASDisplayNode, ContextControllerItemsNode, UIGestureRecognizerDelegate { + final class ItemsNode: ASDisplayNode, ContextControllerItemsNode, ASGestureRecognizerDelegate { private let context: AccountContext private let displayReadTimestamps: Bool private let availableReactions: AvailableReactions? @@ -1266,7 +1266,7 @@ public final class ReactionListContextMenuContent: ContextControllerItemsContent } return [.left, .right] }) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.view.addGestureRecognizer(panRecognizer) } diff --git a/submodules/ContactListUI/Sources/ContactsControllerNode.swift b/submodules/ContactListUI/Sources/ContactsControllerNode.swift index b72c8501fb..a56ad6c048 100644 --- a/submodules/ContactListUI/Sources/ContactsControllerNode.swift +++ b/submodules/ContactListUI/Sources/ContactsControllerNode.swift @@ -44,7 +44,7 @@ private final class ContextControllerContentSourceImpl: ContextControllerContent } } -final class ContactsControllerNode: ASDisplayNode, UIGestureRecognizerDelegate { +final class ContactsControllerNode: ASDisplayNode, ASGestureRecognizerDelegate { let contactListNode: ContactListNode private let context: AccountContext diff --git a/submodules/ContextUI/Sources/ContextController.swift b/submodules/ContextUI/Sources/ContextController.swift index ba800ab20b..6917289507 100644 --- a/submodules/ContextUI/Sources/ContextController.swift +++ b/submodules/ContextUI/Sources/ContextController.swift @@ -247,7 +247,7 @@ func convertFrame(_ frame: CGRect, from fromView: UIView, to toView: UIView) -> return targetWindowFrame } -final class ContextControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +final class ContextControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private weak var controller: ContextController? private var presentationData: PresentationData @@ -408,7 +408,7 @@ final class ContextControllerNode: ViewControllerTracingNode, UIScrollViewDelega self?.updateLayout() } - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate if blurBackground { self.view.addSubview(self.effectView) diff --git a/submodules/ContextUI/Sources/ContextControllerActionsStackNode.swift b/submodules/ContextUI/Sources/ContextControllerActionsStackNode.swift index 2e6c0cece5..ea8a437b13 100644 --- a/submodules/ContextUI/Sources/ContextControllerActionsStackNode.swift +++ b/submodules/ContextUI/Sources/ContextControllerActionsStackNode.swift @@ -1101,7 +1101,7 @@ final class ContextControllerActionsStackNode: ASDisplayNode { case additional } - final class NavigationContainer: ASDisplayNode, UIGestureRecognizerDelegate { + final class NavigationContainer: ASDisplayNode, ASGestureRecognizerDelegate { let backgroundNode: NavigationBackgroundNode let parentShadowNode: ASImageNode @@ -1136,7 +1136,7 @@ final class ContextControllerActionsStackNode: ASDisplayNode { let _ = strongSelf return [.right] }) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.view.addGestureRecognizer(panRecognizer) self.panRecognizer = panRecognizer } diff --git a/submodules/ContextUI/Sources/ContextControllerExtractedPresentationNode.swift b/submodules/ContextUI/Sources/ContextControllerExtractedPresentationNode.swift index ef5b52afd9..20539c1359 100644 --- a/submodules/ContextUI/Sources/ContextControllerExtractedPresentationNode.swift +++ b/submodules/ContextUI/Sources/ContextControllerExtractedPresentationNode.swift @@ -110,7 +110,7 @@ private extension ContextControllerTakeViewInfo.ContainingItem { } } -final class ContextControllerExtractedPresentationNode: ASDisplayNode, ContextControllerPresentationNode, UIScrollViewDelegate { +final class ContextControllerExtractedPresentationNode: ASDisplayNode, ContextControllerPresentationNode, ASScrollViewDelegate { enum ContentSource { case location(ContextLocationContentSource) case reference(ContextReferenceContentSource) @@ -339,7 +339,7 @@ final class ContextControllerExtractedPresentationNode: ASDisplayNode, ContextCo //self.addSubnode(self.contentRectDebugNode) #endif - self.scroller.delegate = self + self.scroller.delegate = self.wrappedScrollViewDelegate self.dismissTapNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dismissTapGesture(_:)))) diff --git a/submodules/ContextUI/Sources/PinchController.swift b/submodules/ContextUI/Sources/PinchController.swift index 9543ec328e..17082739c1 100644 --- a/submodules/ContextUI/Sources/PinchController.swift +++ b/submodules/ContextUI/Sources/PinchController.swift @@ -133,7 +133,7 @@ private func cancelContextGestures(view: UIView) { } } -public final class PinchSourceContainerNode: ASDisplayNode, UIGestureRecognizerDelegate { +public final class PinchSourceContainerNode: ASDisplayNode, ASGestureRecognizerDelegate { public let contentNode: ASDisplayNode public var contentRect: CGRect = CGRect() private(set) var naturalContentFrame: CGRect? diff --git a/submodules/Display/Source/ActionSheetControllerNode.swift b/submodules/Display/Source/ActionSheetControllerNode.swift index 80d94f3ddd..c27cc399f8 100644 --- a/submodules/Display/Source/ActionSheetControllerNode.swift +++ b/submodules/Display/Source/ActionSheetControllerNode.swift @@ -4,7 +4,7 @@ import SwiftSignalKit private let containerInsets = UIEdgeInsets(top: 10.0, left: 10.0, bottom: 10.0, right: 10.0) -final class ActionSheetControllerNode: ASDisplayNode, UIScrollViewDelegate { +final class ActionSheetControllerNode: ASDisplayNode, ASScrollViewDelegate { var theme: ActionSheetControllerTheme { didSet { self.itemGroupsContainerNode.theme = self.theme @@ -64,7 +64,7 @@ final class ActionSheetControllerNode: ASDisplayNode, UIScrollViewDelegate { super.init() - self.scrollView.delegate = self + self.scrollView.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.scrollNode) diff --git a/submodules/Display/Source/ActionSheetItemGroupNode.swift b/submodules/Display/Source/ActionSheetItemGroupNode.swift index 46a8f81fc7..cee228963b 100644 --- a/submodules/Display/Source/ActionSheetItemGroupNode.swift +++ b/submodules/Display/Source/ActionSheetItemGroupNode.swift @@ -1,7 +1,7 @@ import UIKit import AsyncDisplayKit -final class ActionSheetItemGroupNode: ASDisplayNode, UIScrollViewDelegate { +final class ActionSheetItemGroupNode: ASDisplayNode, ASScrollViewDelegate { private let theme: ActionSheetControllerTheme private let centerDimView: UIImageView @@ -60,7 +60,7 @@ final class ActionSheetItemGroupNode: ASDisplayNode, UIScrollViewDelegate { self.view.addSubview(self.bottomDimView) self.view.addSubview(self.trailingDimView) - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.clippingNode.view.addSubview(self.backgroundEffectView) self.clippingNode.addSubnode(self.scrollNode) diff --git a/submodules/Display/Source/GestureRecognizerDelegate.swift b/submodules/Display/Source/GestureRecognizerDelegate.swift new file mode 100644 index 0000000000..93505d1711 --- /dev/null +++ b/submodules/Display/Source/GestureRecognizerDelegate.swift @@ -0,0 +1,213 @@ +import Foundation +import UIKit +import ObjectiveC +import AsyncDisplayKit + +private var ASGestureRecognizerDelegateKey: Int? +private var ASScrollViewDelegateKey: Int? + +private final class WrappedGestureRecognizerDelegate: NSObject, UIGestureRecognizerDelegate { + private weak var target: ASGestureRecognizerDelegate? + + init(target: ASGestureRecognizerDelegate) { + self.target = target + + super.init() + } + + func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool { + guard let target = self.target else { + return true + } + return target.gestureRecognizerShouldBegin?(gestureRecognizer) ?? true + } + + func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool { + guard let target = self.target else { + return false + } + return target.gestureRecognizer?(gestureRecognizer, shouldRecognizeSimultaneouslyWith: otherGestureRecognizer) ?? false + } + + func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRequireFailureOf otherGestureRecognizer: UIGestureRecognizer) -> Bool { + guard let target = self.target else { + return false + } + return target.gestureRecognizer?(gestureRecognizer, shouldRequireFailureOf: otherGestureRecognizer) ?? false + } + + func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer) -> Bool { + guard let target = self.target else { + return false + } + return target.gestureRecognizer?(gestureRecognizer, shouldBeRequiredToFailBy: otherGestureRecognizer) ?? false + } + + func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool { + guard let target = self.target else { + return true + } + return target.gestureRecognizer?(gestureRecognizer, shouldReceive: touch) ?? true + } + + func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive press: UIPress) -> Bool { + guard let target = self.target else { + return true + } + return target.gestureRecognizer?(gestureRecognizer, shouldReceive: press) ?? true + } + + @available(iOS 13.4, *) + func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive event: UIEvent) -> Bool { + guard let target = self.target else { + return true + } + return target.gestureRecognizer?(gestureRecognizer, shouldReceive: event) ?? true + } +} + +public extension ASGestureRecognizerDelegate { + var wrappedGestureRecognizerDelegate: UIGestureRecognizerDelegate { + if let delegate = objc_getAssociatedObject(self, &ASGestureRecognizerDelegateKey) as? WrappedGestureRecognizerDelegate { + return delegate + } else { + let delegate = WrappedGestureRecognizerDelegate(target: self) + objc_setAssociatedObject(self, &ASGestureRecognizerDelegateKey, delegate, .OBJC_ASSOCIATION_RETAIN_NONATOMIC) + return delegate + } + } +} + +private final class WrappedScrollViewDelegate: NSObject, UIScrollViewDelegate, UIScrollViewAccessibilityDelegate { + private weak var target: ASScrollViewDelegate? + + init(target: ASScrollViewDelegate) { + self.target = target + + super.init() + } + + func scrollViewDidScroll(_ scrollView: UIScrollView) { + guard let target = self.target else { + return + } + target.scrollViewDidScroll?(scrollView) + } + + func scrollViewDidZoom(_ scrollView: UIScrollView) { + guard let target = self.target else { + return + } + target.scrollViewDidZoom?(scrollView) + } + + func scrollViewWillBeginDragging(_ scrollView: UIScrollView) { + guard let target = self.target else { + return + } + target.scrollViewWillBeginDragging?(scrollView) + } + + func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer) { + guard let target = self.target else { + return + } + target.scrollViewWillEndDragging?(scrollView, withVelocity: velocity, targetContentOffset: targetContentOffset) + } + + func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) { + guard let target = self.target else { + return + } + target.scrollViewDidEndDragging?(scrollView, willDecelerate: decelerate) + } + + func scrollViewWillBeginDecelerating(_ scrollView: UIScrollView) { + guard let target = self.target else { + return + } + target.scrollViewWillBeginDecelerating?(scrollView) + } + + func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) { + guard let target = self.target else { + return + } + target.scrollViewDidEndDecelerating?(scrollView) + } + + func scrollViewDidEndScrollingAnimation(_ scrollView: UIScrollView) { + guard let target = self.target else { + return + } + target.scrollViewDidEndScrollingAnimation?(scrollView) + } + + func viewForZooming(in scrollView: UIScrollView) -> UIView? { + guard let target = self.target else { + return nil + } + return target.viewForZooming?(in: scrollView) + } + + func scrollViewWillBeginZooming(_ scrollView: UIScrollView, with view: UIView?) { + guard let target = self.target else { + return + } + target.scrollViewWillBeginZooming?(scrollView, with: view) + } + + func scrollViewDidEndZooming(_ scrollView: UIScrollView, with view: UIView?, atScale scale: CGFloat) { + guard let target = self.target else { + return + } + target.scrollViewDidEndZooming?(scrollView, with: view, atScale: scale) + } + + func scrollViewShouldScrollToTop(_ scrollView: UIScrollView) -> Bool { + guard let target = self.target else { + return true + } + return target.scrollViewShouldScroll?(toTop: scrollView) ?? true + } + + func scrollViewDidScrollToTop(_ scrollView: UIScrollView) { + guard let target = self.target else { + return + } + target.scrollViewDidScroll?(toTop: scrollView) + } + + func scrollViewDidChangeAdjustedContentInset(_ scrollView: UIScrollView) { + guard let target = self.target else { + return + } + target.scrollViewDidChangeAdjustedContentInset?(scrollView) + } + + func accessibilityScrollStatus(for scrollView: UIScrollView) -> String? { + guard let target = self.target else { + return nil + } + return target.accessibilityScrollStatus?(for: scrollView) + } + + func accessibilityAttributedScrollStatus(for scrollView: UIScrollView) -> NSAttributedString? { + guard let target = self.target else { + return nil + } + return target.accessibilityAttributedScrollStatus?(for: scrollView) + } +} + +public extension ASScrollViewDelegate { + var wrappedScrollViewDelegate: UIScrollViewDelegate & UIScrollViewAccessibilityDelegate { + if let delegate = objc_getAssociatedObject(self, &ASScrollViewDelegateKey) as? WrappedScrollViewDelegate { + return delegate + } else { + let delegate = WrappedScrollViewDelegate(target: self) + objc_setAssociatedObject(self, &ASScrollViewDelegateKey, delegate, .OBJC_ASSOCIATION_RETAIN_NONATOMIC) + return delegate + } + } +} diff --git a/submodules/Display/Source/GridNode.swift b/submodules/Display/Source/GridNode.swift index 6235e8d5b1..568bfb5257 100644 --- a/submodules/Display/Source/GridNode.swift +++ b/submodules/Display/Source/GridNode.swift @@ -207,7 +207,7 @@ private struct WrappedGridItemNode: Hashable { } } -open class GridNode: GridNodeScroller, UIScrollViewDelegate { +open class GridNode: GridNodeScroller, ASScrollViewDelegate { public private(set) var gridLayout = GridNodeLayout(size: CGSize(), insets: UIEdgeInsets(), preloadSize: 0.0, type: .fixed(itemSize: CGSize(), fillWidth: nil, lineSpacing: 0.0, itemSpacing: nil)) private var firstIndexInSectionOffset: Int = 0 public private(set) var items: [GridItem] = [] @@ -257,7 +257,7 @@ open class GridNode: GridNodeScroller, UIScrollViewDelegate { self.scrollView.showsVerticalScrollIndicator = false self.scrollView.showsHorizontalScrollIndicator = false self.scrollView.scrollsToTop = false - self.scrollView.delegate = self + self.scrollView.delegate = self.wrappedScrollViewDelegate } required public init?(coder aDecoder: NSCoder) { diff --git a/submodules/Display/Source/GridNodeScroller.swift b/submodules/Display/Source/GridNodeScroller.swift index dc884cf79c..de5496720a 100644 --- a/submodules/Display/Source/GridNodeScroller.swift +++ b/submodules/Display/Source/GridNodeScroller.swift @@ -32,7 +32,7 @@ public class GridNodeScrollerView: UIScrollView { } } -open class GridNodeScroller: ASDisplayNode, UIGestureRecognizerDelegate { +open class GridNodeScroller: ASDisplayNode, ASGestureRecognizerDelegate { public var scrollView: UIScrollView { return self.view as! UIScrollView } diff --git a/submodules/Display/Source/ListView.swift b/submodules/Display/Source/ListView.swift index 515e7966d1..facaad0685 100644 --- a/submodules/Display/Source/ListView.swift +++ b/submodules/Display/Source/ListView.swift @@ -149,7 +149,7 @@ private func cancelContextGestures(view: UIView) { } } -open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGestureRecognizerDelegate { +open class ListView: ASDisplayNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { public struct ScrollingIndicatorState { public struct Item { public var index: Int @@ -494,13 +494,13 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture self.scroller.alwaysBounceVertical = true self.scroller.contentSize = CGSize(width: 0.0, height: infiniteScrollSize * 2.0) self.scroller.isHidden = true - self.scroller.delegate = self + self.scroller.delegate = self.wrappedScrollViewDelegate self.view.addSubview(self.scroller) self.scroller.panGestureRecognizer.cancelsTouchesInView = true self.view.addGestureRecognizer(self.scroller.panGestureRecognizer) let trackingRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.trackingGesture(_:))) - trackingRecognizer.delegate = self + trackingRecognizer.delegate = self.wrappedGestureRecognizerDelegate trackingRecognizer.cancelsTouchesInView = false self.view.addGestureRecognizer(trackingRecognizer) @@ -534,7 +534,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))) tapGestureRecognizer.isEnabled = false - tapGestureRecognizer.delegate = self + tapGestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.view.addGestureRecognizer(tapGestureRecognizer) self.tapGestureRecognizer = tapGestureRecognizer diff --git a/submodules/Display/Source/Navigation/NavigationContainer.swift b/submodules/Display/Source/Navigation/NavigationContainer.swift index 516639626d..c07d352f34 100644 --- a/submodules/Display/Source/Navigation/NavigationContainer.swift +++ b/submodules/Display/Source/Navigation/NavigationContainer.swift @@ -3,7 +3,7 @@ import UIKit import AsyncDisplayKit import SwiftSignalKit -public final class NavigationContainer: ASDisplayNode, UIGestureRecognizerDelegate { +public final class NavigationContainer: ASDisplayNode, ASGestureRecognizerDelegate { private final class Child { let value: ViewController var layout: ContainerViewLayout @@ -151,7 +151,7 @@ public final class NavigationContainer: ASDisplayNode, UIGestureRecognizerDelega if #available(iOS 13.4, *) { panRecognizer.allowedScrollTypesMask = .continuous } - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.panRecognizer = panRecognizer diff --git a/submodules/Display/Source/Navigation/NavigationModalContainer.swift b/submodules/Display/Source/Navigation/NavigationModalContainer.swift index 59be617288..1e7603dcbf 100644 --- a/submodules/Display/Source/Navigation/NavigationModalContainer.swift +++ b/submodules/Display/Source/Navigation/NavigationModalContainer.swift @@ -4,7 +4,7 @@ import AsyncDisplayKit import SwiftSignalKit import UIKitRuntimeUtils -final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { +final class NavigationModalContainer: ASDisplayNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { private var theme: NavigationControllerTheme let isFlat: Bool @@ -89,7 +89,7 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes } self.scrollNode.view.delaysContentTouches = false self.scrollNode.view.clipsToBounds = false - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate let panRecognizer = InteractiveTransitionGestureRecognizer(target: self, action: #selector(self.panGesture(_:)), allowedDirections: { [weak self] _ in guard let strongSelf = self, !strongSelf.isDismissed else { @@ -109,7 +109,7 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes panRecognizer.isEnabled = false } } - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true if !self.isFlat { @@ -312,7 +312,7 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) { } - func scrollViewShouldScrollToTop(_ scrollView: UIScrollView) -> Bool { + func scrollViewShouldScroll(toTop scrollView: UIScrollView) -> Bool { return false } diff --git a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift index 5b625117ac..fbd9c66ac3 100644 --- a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift +++ b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift @@ -123,7 +123,7 @@ class CaptionScrollWrapperNode: ASDisplayNode { -final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScrollViewDelegate { +final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, ASScrollViewDelegate { private let context: AccountContext private var presentationData: PresentationData private var theme: PresentationTheme @@ -638,7 +638,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll override func didLoad() { super.didLoad() - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.scrollNode.view.showsVerticalScrollIndicator = false let backwardLongPressGestureRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(self.seekBackwardLongPress(_:))) diff --git a/submodules/GalleryUI/Sources/GalleryControllerNode.swift b/submodules/GalleryUI/Sources/GalleryControllerNode.swift index e943566b24..48ca1b5f83 100644 --- a/submodules/GalleryUI/Sources/GalleryControllerNode.swift +++ b/submodules/GalleryUI/Sources/GalleryControllerNode.swift @@ -6,7 +6,7 @@ import Postbox import SwipeToDismissGesture import AccountContext -open class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { +open class GalleryControllerNode: ASDisplayNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { public var statusBar: StatusBar? public var navigationBar: NavigationBar? { didSet { @@ -143,7 +143,7 @@ open class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGesture self.scrollView.alwaysBounceHorizontal = false self.scrollView.alwaysBounceVertical = false self.scrollView.clipsToBounds = false - self.scrollView.delegate = self + self.scrollView.delegate = self.wrappedScrollViewDelegate self.scrollView.scrollsToTop = false self.view.addSubview(self.scrollView) diff --git a/submodules/GalleryUI/Sources/GalleryPagerNode.swift b/submodules/GalleryUI/Sources/GalleryPagerNode.swift index aafe2f0409..1ee1b3af55 100644 --- a/submodules/GalleryUI/Sources/GalleryPagerNode.swift +++ b/submodules/GalleryUI/Sources/GalleryPagerNode.swift @@ -76,7 +76,7 @@ public struct GalleryPagerTransaction { } } -public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { +public final class GalleryPagerNode: ASDisplayNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { private let pageGap: CGFloat private let disableTapNavigation: Bool @@ -142,7 +142,7 @@ public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate, UIGest self.scrollView.alwaysBounceHorizontal = !pageGap.isZero self.scrollView.bounces = !pageGap.isZero self.scrollView.isPagingEnabled = true - self.scrollView.delegate = self + self.scrollView.delegate = self.wrappedScrollViewDelegate self.scrollView.clipsToBounds = false self.scrollView.scrollsToTop = false self.scrollView.delaysContentTouches = false @@ -167,7 +167,7 @@ public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate, UIGest super.didLoad() let recognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.tapLongTapOrDoubleTapGesture(_:))) - recognizer.delegate = self + recognizer.delegate = self.wrappedGestureRecognizerDelegate self.tapRecognizer = recognizer recognizer.tapActionAtPoint = { [weak self] point in guard let strongSelf = self, strongSelf.pagingEnabled else { diff --git a/submodules/GalleryUI/Sources/GalleryThumbnailContainerNode.swift b/submodules/GalleryUI/Sources/GalleryThumbnailContainerNode.swift index a381a3c3a5..fa8806d70b 100644 --- a/submodules/GalleryUI/Sources/GalleryThumbnailContainerNode.swift +++ b/submodules/GalleryUI/Sources/GalleryThumbnailContainerNode.swift @@ -48,7 +48,7 @@ private final class GalleryThumbnailItemNode: ASDisplayNode { } } -public final class GalleryThumbnailContainerNode: ASDisplayNode, UIScrollViewDelegate { +public final class GalleryThumbnailContainerNode: ASDisplayNode, ASScrollViewDelegate { public let groupId: Int64 private let scrollNode: ASScrollNode @@ -69,7 +69,7 @@ public final class GalleryThumbnailContainerNode: ASDisplayNode, UIScrollViewDel super.init() - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.scrollNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:)))) self.scrollNode.view.showsHorizontalScrollIndicator = false self.scrollNode.view.showsVerticalScrollIndicator = false diff --git a/submodules/GalleryUI/Sources/ZoomableContentGalleryItemNode.swift b/submodules/GalleryUI/Sources/ZoomableContentGalleryItemNode.swift index 7d42ddcf65..fbcf016de4 100644 --- a/submodules/GalleryUI/Sources/ZoomableContentGalleryItemNode.swift +++ b/submodules/GalleryUI/Sources/ZoomableContentGalleryItemNode.swift @@ -3,7 +3,7 @@ import UIKit import Display import AsyncDisplayKit -open class ZoomableContentGalleryItemNode: GalleryItemNode, UIScrollViewDelegate { +open class ZoomableContentGalleryItemNode: GalleryItemNode, ASScrollViewDelegate { public let scrollNode: ASScrollNode private var containerLayout: ContainerViewLayout? @@ -34,7 +34,7 @@ open class ZoomableContentGalleryItemNode: GalleryItemNode, UIScrollViewDelegate super.init() - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.scrollNode.view.showsVerticalScrollIndicator = false self.scrollNode.view.showsHorizontalScrollIndicator = false self.scrollNode.view.clipsToBounds = false diff --git a/submodules/ImportStickerPackUI/Sources/ImportStickerPackControllerNode.swift b/submodules/ImportStickerPackUI/Sources/ImportStickerPackControllerNode.swift index 2e0fb376bd..0d5d6c1957 100644 --- a/submodules/ImportStickerPackUI/Sources/ImportStickerPackControllerNode.swift +++ b/submodules/ImportStickerPackUI/Sources/ImportStickerPackControllerNode.swift @@ -48,7 +48,7 @@ private struct StickerPackPreviewGridTransaction { } } -final class ImportStickerPackControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +final class ImportStickerPackControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private var presentationData: PresentationData private var stickerPack: ImportStickerPack? @@ -194,7 +194,7 @@ final class ImportStickerPackControllerNode: ViewControllerTracingNode, UIScroll self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.wrappingScrollNode.addSubnode(self.cancelButtonNode) diff --git a/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift b/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift index 407c45656f..f27a0b7f07 100644 --- a/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift @@ -18,7 +18,7 @@ import UndoUI import ContextUI import TranslateUI -final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate { +final class InstantPageControllerNode: ASDisplayNode, ASScrollViewDelegate { private weak var controller: InstantPageController? private let context: AccountContext private var settings: InstantPagePresentationSettings? @@ -137,7 +137,7 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate { self.scrollNode.addSubnode(self.scrollNodeFooter) self.addSubnode(self.navigationBar) self.scrollNode.view.delaysContentTouches = false - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.navigationBar.back = navigateBack self.navigationBar.share = { [weak self] in diff --git a/submodules/InstantPageUI/Sources/InstantPageReferenceControllerNode.swift b/submodules/InstantPageUI/Sources/InstantPageReferenceControllerNode.swift index 4f284bfcd5..9ef8a460f5 100644 --- a/submodules/InstantPageUI/Sources/InstantPageReferenceControllerNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageReferenceControllerNode.swift @@ -10,7 +10,7 @@ import ShareController import OpenInExternalAppUI import TelegramUIPreferences -class InstantPageReferenceControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +class InstantPageReferenceControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private let sourceLocation: InstantPageSourceLocation private let theme: InstantPageTheme @@ -84,7 +84,7 @@ class InstantPageReferenceControllerNode: ViewControllerTracingNode, UIScrollVie self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.wrappingScrollNode.addSubnode(self.contentBackgroundNode) diff --git a/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift b/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift index b584d5b1b6..5551d7343b 100644 --- a/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift @@ -63,7 +63,7 @@ private final class InstantPageSlideshowItemNode: ASDisplayNode { } } -private final class InstantPageSlideshowPagerNode: ASDisplayNode, UIScrollViewDelegate { +private final class InstantPageSlideshowPagerNode: ASDisplayNode, ASScrollViewDelegate { private let context: AccountContext private let sourceLocation: InstantPageSourceLocation private let theme: InstantPageTheme @@ -123,7 +123,7 @@ private final class InstantPageSlideshowPagerNode: ASDisplayNode, UIScrollViewDe self.scrollView.alwaysBounceHorizontal = !pageGap.isZero self.scrollView.bounces = !pageGap.isZero self.scrollView.isPagingEnabled = true - self.scrollView.delegate = self + self.scrollView.delegate = self.wrappedScrollViewDelegate self.scrollView.clipsToBounds = false self.scrollView.scrollsToTop = false self.view.addSubview(self.scrollView) diff --git a/submodules/InviteLinksUI/Sources/InviteLinkInviteController.swift b/submodules/InviteLinksUI/Sources/InviteLinkInviteController.swift index 0f3c3b8d08..9c5b0ae132 100644 --- a/submodules/InviteLinksUI/Sources/InviteLinkInviteController.swift +++ b/submodules/InviteLinksUI/Sources/InviteLinkInviteController.swift @@ -247,7 +247,7 @@ public final class InviteLinkInviteController: ViewController { self.controllerNode.containerLayoutUpdated(layout, transition: transition) } - class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate { + class Node: ViewControllerTracingNode, ASGestureRecognizerDelegate { private weak var controller: InviteLinkInviteController? private let context: AccountContext @@ -574,7 +574,7 @@ public final class InviteLinkInviteController: ViewController { self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) let panRecognizer = DirectionalPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.view.addGestureRecognizer(panRecognizer) diff --git a/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift b/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift index dcbe0ca9dc..f69aaf3115 100644 --- a/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift +++ b/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift @@ -380,7 +380,7 @@ public final class InviteLinkViewController: ViewController { self.controllerNode.containerLayoutUpdated(layout, transition: transition) } - class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate { + class Node: ViewControllerTracingNode, ASGestureRecognizerDelegate { private weak var controller: InviteLinkViewController? private let context: AccountContext @@ -855,7 +855,7 @@ public final class InviteLinkViewController: ViewController { self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) let panRecognizer = DirectionalPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.view.addGestureRecognizer(panRecognizer) diff --git a/submodules/ItemListUI/Sources/Items/ItemListEditableItem.swift b/submodules/ItemListUI/Sources/Items/ItemListEditableItem.swift index f0811c1e3c..3ba05e2b4c 100644 --- a/submodules/ItemListUI/Sources/Items/ItemListEditableItem.swift +++ b/submodules/ItemListUI/Sources/Items/ItemListEditableItem.swift @@ -58,7 +58,7 @@ public final class ItemListRevealOptionsGestureRecognizer: UIPanGestureRecognize } } -open class ItemListRevealOptionsItemNode: ListViewItemNode, UIGestureRecognizerDelegate { +open class ItemListRevealOptionsItemNode: ListViewItemNode, ASGestureRecognizerDelegate { private var validLayout: (CGSize, CGFloat, CGFloat)? private var leftRevealNode: ItemListRevealOptionsNode? @@ -96,13 +96,13 @@ open class ItemListRevealOptionsItemNode: ListViewItemNode, UIGestureRecognizerD let recognizer = ItemListRevealOptionsGestureRecognizer(target: self, action: #selector(self.revealGesture(_:))) self.recognizer = recognizer - recognizer.delegate = self + recognizer.delegate = self.wrappedGestureRecognizerDelegate recognizer.allowAnyDirection = self.allowAnyDirection self.view.addGestureRecognizer(recognizer) let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.revealTapGesture(_:))) self.tapRecognizer = tapRecognizer - tapRecognizer.delegate = self + tapRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.view.addGestureRecognizer(tapRecognizer) self.view.disablesInteractiveTransitionGestureRecognizer = self.allowAnyDirection diff --git a/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewControllerNode.swift b/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewControllerNode.swift index ab465684b6..072a48a65d 100644 --- a/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewControllerNode.swift +++ b/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewControllerNode.swift @@ -34,7 +34,7 @@ struct JoinLinkPreviewData { let isJoined: Bool } -final class JoinLinkPreviewControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +final class JoinLinkPreviewControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private var presentationData: PresentationData @@ -110,7 +110,7 @@ final class JoinLinkPreviewControllerNode: ViewControllerTracingNode, UIScrollVi self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.cancelButton.addTarget(self, action: #selector(self.cancelButtonPressed), forControlEvents: .touchUpInside) diff --git a/submodules/LanguageLinkPreviewUI/Sources/LanguageLinkPreviewControllerNode.swift b/submodules/LanguageLinkPreviewUI/Sources/LanguageLinkPreviewControllerNode.swift index eabbb8e37a..95fd3d3982 100644 --- a/submodules/LanguageLinkPreviewUI/Sources/LanguageLinkPreviewControllerNode.swift +++ b/submodules/LanguageLinkPreviewUI/Sources/LanguageLinkPreviewControllerNode.swift @@ -9,7 +9,7 @@ import ActivityIndicator import AccountContext import ShareController -final class LanguageLinkPreviewControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +final class LanguageLinkPreviewControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private var presentationData: PresentationData @@ -121,7 +121,7 @@ final class LanguageLinkPreviewControllerNode: ViewControllerTracingNode, UIScro self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.cancelButtonNode.setTitle(self.presentationData.strings.Common_Cancel, with: Font.medium(20.0), with: self.presentationData.theme.actionSheet.standardActionTextColor, for: .normal) diff --git a/submodules/LocationUI/Sources/LocationDistancePickerScreen.swift b/submodules/LocationUI/Sources/LocationDistancePickerScreen.swift index 6403ddf26b..29dac3d2cb 100644 --- a/submodules/LocationUI/Sources/LocationDistancePickerScreen.swift +++ b/submodules/LocationUI/Sources/LocationDistancePickerScreen.swift @@ -169,7 +169,7 @@ private var smallUnitValues: [Int32] = { return values }() -class LocationDistancePickerScreenNode: ViewControllerTracingNode, UIScrollViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate { +class LocationDistancePickerScreenNode: ViewControllerTracingNode, ASScrollViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate { private let context: AccountContext private let controllerStyle: LocationDistancePickerScreenStyle private var presentationData: PresentationData @@ -277,7 +277,7 @@ class LocationDistancePickerScreenNode: ViewControllerTracingNode, UIScrollViewD self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.wrappingScrollNode.addSubnode(self.backgroundNode) diff --git a/submodules/MediaPickerUI/Sources/MediaGroupsContextMenuContent.swift b/submodules/MediaPickerUI/Sources/MediaGroupsContextMenuContent.swift index 25838debc9..741427fc78 100644 --- a/submodules/MediaPickerUI/Sources/MediaGroupsContextMenuContent.swift +++ b/submodules/MediaPickerUI/Sources/MediaGroupsContextMenuContent.swift @@ -14,7 +14,7 @@ struct MediaGroupItem { } final class MediaGroupsContextMenuContent: ContextControllerItemsContent { - private final class GroupsListNode: ASDisplayNode, UIScrollViewDelegate { + private final class GroupsListNode: ASDisplayNode, ASScrollViewDelegate { private final class ItemNode: HighlightTrackingButtonNode { let context: AccountContext let highlightBackgroundNode: ASDisplayNode @@ -170,7 +170,7 @@ final class MediaGroupsContextMenuContent: ContextControllerItemsContent { super.init() self.addSubnode(self.scrollNode) - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.clipsToBounds = true } diff --git a/submodules/MediaPickerUI/Sources/MediaPickerScreen.swift b/submodules/MediaPickerUI/Sources/MediaPickerScreen.swift index fe07fa0fc0..76a89b99b0 100644 --- a/submodules/MediaPickerUI/Sources/MediaPickerScreen.swift +++ b/submodules/MediaPickerUI/Sources/MediaPickerScreen.swift @@ -210,7 +210,7 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable { var dismissAll: () -> Void = { } - private class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate { + private class Node: ViewControllerTracingNode, ASGestureRecognizerDelegate { enum DisplayMode { case all case selected @@ -440,7 +440,7 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable { } else { let selectionGesture = MediaPickerGridSelectionGesture() - selectionGesture.delegate = self + selectionGesture.delegate = self.wrappedGestureRecognizerDelegate selectionGesture.began = { [weak self] in self?.controller?.cancelPanGesture() } diff --git a/submodules/MediaPickerUI/Sources/MediaPickerSelectedListNode.swift b/submodules/MediaPickerUI/Sources/MediaPickerSelectedListNode.swift index a1c87d391d..1353609243 100644 --- a/submodules/MediaPickerUI/Sources/MediaPickerSelectedListNode.swift +++ b/submodules/MediaPickerUI/Sources/MediaPickerSelectedListNode.swift @@ -496,7 +496,7 @@ private class MessageBackgroundNode: ASDisplayNode { } } -final class MediaPickerSelectedListNode: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { +final class MediaPickerSelectedListNode: ASDisplayNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { private let context: AccountContext private let persistentItems: Bool @@ -539,7 +539,7 @@ final class MediaPickerSelectedListNode: ASDisplayNode, UIScrollViewDelegate, UI self.scrollNode.view.contentInsetAdjustmentBehavior = .never } - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.scrollNode.view.panGestureRecognizer.cancelsTouchesInView = true self.scrollNode.view.showsVerticalScrollIndicator = false diff --git a/submodules/MediaPlayer/Sources/MediaPlayerScrubbingNode.swift b/submodules/MediaPlayer/Sources/MediaPlayerScrubbingNode.swift index 025c093993..ff460a79ff 100644 --- a/submodules/MediaPlayer/Sources/MediaPlayerScrubbingNode.swift +++ b/submodules/MediaPlayer/Sources/MediaPlayerScrubbingNode.swift @@ -63,7 +63,7 @@ public func parseMediaPlayerChapters(_ string: NSAttributedString) -> [MediaPlay return chapters } -private final class MediaPlayerScrubbingNodeButton: ASDisplayNode, UIGestureRecognizerDelegate { +private final class MediaPlayerScrubbingNodeButton: ASDisplayNode, ASGestureRecognizerDelegate { var beginScrubbing: (() -> Void)? var endScrubbing: ((Bool) -> Void)? var updateScrubbing: ((CGFloat, Double) -> Void)? @@ -83,7 +83,7 @@ private final class MediaPlayerScrubbingNodeButton: ASDisplayNode, UIGestureReco self.view.disablesInteractiveTransitionGestureRecognizer = true let gestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - gestureRecognizer.delegate = self + gestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.view.addGestureRecognizer(gestureRecognizer) } diff --git a/submodules/PassportUI/Sources/Form/FormControllerNode.swift b/submodules/PassportUI/Sources/Form/FormControllerNode.swift index cd76c108eb..d1d991c909 100644 --- a/submodules/PassportUI/Sources/Form/FormControllerNode.swift +++ b/submodules/PassportUI/Sources/Form/FormControllerNode.swift @@ -105,7 +105,7 @@ private enum FilteredItemNeighbor { case item(FormControllerItem) } -public class FormControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +public class FormControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private typealias InternalState = FormControllerInternalState typealias State = FormControllerState typealias Entry = InnerState.Entry @@ -142,7 +142,7 @@ public class FormControllerNode: ASDisplayNode, FormControllerItemNode, FormBlockItemNodeProto, UIGestureRecognizerDelegate { +class FormEditableBlockItemNode: ASDisplayNode, FormControllerItemNode, FormBlockItemNodeProto, ASGestureRecognizerDelegate { private let topSeparatorInset: FormBlockItemInset private let highlightedBackgroundNode: ASDisplayNode diff --git a/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift b/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift index 9ace2cac26..9dbb573c81 100644 --- a/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift +++ b/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift @@ -1268,7 +1268,7 @@ private final class TwoFactorDataInputTextNode: ASDisplayNode, UITextFieldDelega } } -private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIScrollViewDelegate { +private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, ASScrollViewDelegate { private var presentationData: PresentationData private let mode: TwoFactorDataInputMode private let action: () -> Void @@ -1818,7 +1818,7 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.scrollNode.view.contentInsetAdjustmentBehavior = .never } - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate } func scrollViewDidScroll(_ scrollView: UIScrollView) { diff --git a/submodules/PremiumUI/Sources/PremiumBoostLevelsScreen.swift b/submodules/PremiumUI/Sources/PremiumBoostLevelsScreen.swift index fa6b73cd81..f41ee7c974 100644 --- a/submodules/PremiumUI/Sources/PremiumBoostLevelsScreen.swift +++ b/submodules/PremiumUI/Sources/PremiumBoostLevelsScreen.swift @@ -1596,7 +1596,7 @@ public class PremiumBoostLevelsScreen: ViewController { case features } - final class Node: ViewControllerTracingNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { + final class Node: ViewControllerTracingNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { private var presentationData: PresentationData private weak var controller: PremiumBoostLevelsScreen? @@ -1727,7 +1727,7 @@ public class PremiumBoostLevelsScreen: ViewController { super.didLoad() let panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.panGestureRecognizer = panRecognizer diff --git a/submodules/PremiumUI/Sources/PremiumLimitsListScreen.swift b/submodules/PremiumUI/Sources/PremiumLimitsListScreen.swift index fda838bf36..3c5ae8f075 100644 --- a/submodules/PremiumUI/Sources/PremiumLimitsListScreen.swift +++ b/submodules/PremiumUI/Sources/PremiumLimitsListScreen.swift @@ -18,7 +18,7 @@ import SolidRoundedButtonNode import BlurredBackgroundComponent public class PremiumLimitsListScreen: ViewController { - final class Node: ViewControllerTracingNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { + final class Node: ViewControllerTracingNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { private var presentationData: PresentationData private weak var controller: PremiumLimitsListScreen? @@ -188,7 +188,7 @@ public class PremiumLimitsListScreen: ViewController { super.didLoad() let panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.panGestureRecognizer = panRecognizer diff --git a/submodules/PremiumUI/Sources/ReplaceBoostScreen.swift b/submodules/PremiumUI/Sources/ReplaceBoostScreen.swift index 3f596f9ca9..fdf4c6fb87 100644 --- a/submodules/PremiumUI/Sources/ReplaceBoostScreen.swift +++ b/submodules/PremiumUI/Sources/ReplaceBoostScreen.swift @@ -294,7 +294,7 @@ private final class ReplaceBoostScreenComponent: CombinedComponent { } public class ReplaceBoostScreen: ViewController { - final class Node: ViewControllerTracingNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { + final class Node: ViewControllerTracingNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { private var presentationData: PresentationData private weak var controller: ReplaceBoostScreen? @@ -345,7 +345,7 @@ public class ReplaceBoostScreen: ViewController { super.init() - self.scrollView.delegate = self + self.scrollView.delegate = self.wrappedScrollViewDelegate self.scrollView.showsVerticalScrollIndicator = false self.containerView.clipsToBounds = true @@ -373,7 +373,7 @@ public class ReplaceBoostScreen: ViewController { super.didLoad() let panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.panGestureRecognizer = panRecognizer diff --git a/submodules/PremiumUI/Sources/StickersCarouselComponent.swift b/submodules/PremiumUI/Sources/StickersCarouselComponent.swift index bedd056e90..45dfae0797 100644 --- a/submodules/PremiumUI/Sources/StickersCarouselComponent.swift +++ b/submodules/PremiumUI/Sources/StickersCarouselComponent.swift @@ -279,7 +279,7 @@ private class StickerNode: ASDisplayNode { } } -private class StickersCarouselNode: ASDisplayNode, UIScrollViewDelegate { +private class StickersCarouselNode: ASDisplayNode, ASScrollViewDelegate { private let context: AccountContext private let stickers: [TelegramMediaFile] private let tapAction: () -> Void @@ -331,7 +331,7 @@ private class StickersCarouselNode: ASDisplayNode, UIScrollViewDelegate { override func didLoad() { super.didLoad() - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.scrollNode.view.showsHorizontalScrollIndicator = false self.scrollNode.view.showsVerticalScrollIndicator = false self.scrollNode.view.canCancelContentTouches = true diff --git a/submodules/QrCodeUI/Sources/QrCodeScanScreen.swift b/submodules/QrCodeUI/Sources/QrCodeScanScreen.swift index 2df200944e..124ad220c3 100644 --- a/submodules/QrCodeUI/Sources/QrCodeScanScreen.swift +++ b/submodules/QrCodeUI/Sources/QrCodeScanScreen.swift @@ -387,7 +387,7 @@ private final class FrameNode: ASDisplayNode { } } -private final class QrCodeScanScreenNode: ViewControllerTracingNode, UIScrollViewDelegate { +private final class QrCodeScanScreenNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private var presentationData: PresentationData private weak var controller: QrCodeScanScreen? diff --git a/submodules/QrCodeUI/Sources/QrCodeScreen.swift b/submodules/QrCodeUI/Sources/QrCodeScreen.swift index ef4567a4a5..d4568f4d8b 100644 --- a/submodules/QrCodeUI/Sources/QrCodeScreen.swift +++ b/submodules/QrCodeUI/Sources/QrCodeScreen.swift @@ -182,7 +182,7 @@ public final class QrCodeScreen: ViewController { self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition) } - class Node: ViewControllerTracingNode, UIScrollViewDelegate { + class Node: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private let subject: QrCodeScreen.Subject private var presentationData: PresentationData @@ -279,7 +279,7 @@ public final class QrCodeScreen: ViewController { self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.wrappingScrollNode.addSubnode(self.backgroundNode) diff --git a/submodules/ReactionSelectionNode/Sources/ReactionContextNode.swift b/submodules/ReactionSelectionNode/Sources/ReactionContextNode.swift index 8fe2c49ac1..f58c6ef9b8 100644 --- a/submodules/ReactionSelectionNode/Sources/ReactionContextNode.swift +++ b/submodules/ReactionSelectionNode/Sources/ReactionContextNode.swift @@ -241,7 +241,7 @@ private final class TitleLabelView: UIView { } } -public final class ReactionContextNode: ASDisplayNode, UIScrollViewDelegate { +public final class ReactionContextNode: ASDisplayNode, ASScrollViewDelegate { private struct ItemLayout { var itemSize: CGFloat var visibleItemCount: Int @@ -590,7 +590,7 @@ public final class ReactionContextNode: ASDisplayNode, UIScrollViewDelegate { self.addSubnode(self.backgroundNode) - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.contentContainer) self.addSubnode(self.previewingItemContainer) diff --git a/submodules/SegmentedControlNode/Sources/SegmentedControlNode.swift b/submodules/SegmentedControlNode/Sources/SegmentedControlNode.swift index bf42171425..646addf3a6 100644 --- a/submodules/SegmentedControlNode/Sources/SegmentedControlNode.swift +++ b/submodules/SegmentedControlNode/Sources/SegmentedControlNode.swift @@ -83,7 +83,7 @@ private class SegmentedControlItemNode: HighlightTrackingButtonNode { } } -public final class SegmentedControlNode: ASDisplayNode, UIGestureRecognizerDelegate { +public final class SegmentedControlNode: ASDisplayNode, ASGestureRecognizerDelegate { private var theme: SegmentedControlTheme private var _items: [SegmentedControlItem] private var _selectedIndex: Int = 0 @@ -224,7 +224,7 @@ public final class SegmentedControlNode: ASDisplayNode, UIGestureRecognizerDeleg self.view.disablesInteractiveTransitionGestureRecognizer = true let gestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - gestureRecognizer.delegate = self + gestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.view.addGestureRecognizer(gestureRecognizer) self.gestureRecognizer = gestureRecognizer } diff --git a/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift b/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift index 6c2a35621b..5a19bd9b4a 100644 --- a/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift +++ b/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift @@ -29,7 +29,7 @@ private func generateMaskImage(color: UIColor) -> UIImage? { }) } -private final class BubbleSettingsControllerNode: ASDisplayNode, UIScrollViewDelegate { +private final class BubbleSettingsControllerNode: ASDisplayNode, ASScrollViewDelegate { private let context: AccountContext private var presentationThemeSettings: PresentationThemeSettings private var presentationData: PresentationData @@ -132,7 +132,7 @@ private final class BubbleSettingsControllerNode: ASDisplayNode, UIScrollViewDel self.scrollNode.view.disablesInteractiveTransitionGestureRecognizer = true self.scrollNode.view.showsHorizontalScrollIndicator = false self.scrollNode.view.isPagingEnabled = true - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.scrollNode.view.alwaysBounceHorizontal = false } diff --git a/submodules/SettingsUI/Sources/Privacy and Security/RecentSessionScreen.swift b/submodules/SettingsUI/Sources/Privacy and Security/RecentSessionScreen.swift index 53754a8eac..81a65b4cea 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/RecentSessionScreen.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/RecentSessionScreen.swift @@ -153,7 +153,7 @@ final class RecentSessionScreen: ViewController { } } -private class RecentSessionScreenNode: ViewControllerTracingNode, UIScrollViewDelegate { +private class RecentSessionScreenNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private var presentationData: PresentationData private weak var controller: RecentSessionScreen? @@ -459,7 +459,7 @@ private class RecentSessionScreenNode: ViewControllerTracingNode, UIScrollViewDe self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.wrappingScrollNode.addSubnode(self.backgroundNode) diff --git a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift index 3d74e47806..c324b45db0 100644 --- a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift +++ b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift @@ -31,7 +31,7 @@ private func generateMaskImage(color: UIColor) -> UIImage? { }) } -private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollViewDelegate { +private final class TextSizeSelectionControllerNode: ASDisplayNode, ASScrollViewDelegate { private let context: AccountContext private var presentationThemeSettings: PresentationThemeSettings private var presentationData: PresentationData @@ -173,7 +173,7 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView self.scrollNode.view.disablesInteractiveTransitionGestureRecognizer = true self.scrollNode.view.showsHorizontalScrollIndicator = false self.scrollNode.view.isPagingEnabled = true - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.pageControlNode.setPage(0.0) } diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift index 63976f42a8..7469514140 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift @@ -31,7 +31,7 @@ private func generateMaskImage(color: UIColor) -> UIImage? { }) } -final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { +final class ThemePreviewControllerNode: ASDisplayNode, ASScrollViewDelegate { private let context: AccountContext private var previewTheme: PresentationTheme private var presentationData: PresentationData @@ -318,7 +318,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { self.scrollNode.view.disablesInteractiveTransitionGestureRecognizer = true self.scrollNode.view.showsHorizontalScrollIndicator = false self.scrollNode.view.isPagingEnabled = true - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.pageControlNode.setPage(0.0) } diff --git a/submodules/ShareController/Sources/ShareControllerNode.swift b/submodules/ShareController/Sources/ShareControllerNode.swift index c0d555f11a..693baadba3 100644 --- a/submodules/ShareController/Sources/ShareControllerNode.swift +++ b/submodules/ShareController/Sources/ShareControllerNode.swift @@ -296,7 +296,7 @@ private final class ShareContentInfoView: UIView { } } -final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +final class ShareControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private weak var controller: ShareController? private let environment: ShareControllerEnvironment private var context: ShareControllerAccountContext? @@ -624,7 +624,7 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.cancelButtonNode.setTitle(self.presentationData.strings.Common_Cancel, with: Font.medium(20.0), with: self.presentationData.theme.actionSheet.standardActionTextColor, for: .normal) diff --git a/submodules/SparseItemGrid/Sources/SparseItemGrid.swift b/submodules/SparseItemGrid/Sources/SparseItemGrid.swift index ef208b69f4..ca308f94ff 100644 --- a/submodules/SparseItemGrid/Sources/SparseItemGrid.swift +++ b/submodules/SparseItemGrid/Sources/SparseItemGrid.swift @@ -338,7 +338,7 @@ public final class SparseItemGrid: ASDisplayNode { } } - private final class Viewport: ASDisplayNode, UIScrollViewDelegate { + private final class Viewport: ASDisplayNode, ASScrollViewDelegate { final class VisibleItem: SparseItemGridDisplayItem { let layer: SparseItemGridLayer? let view: SparseItemGridView? @@ -527,7 +527,7 @@ public final class SparseItemGrid: ASDisplayNode { self.anchorPoint = CGPoint() - self.scrollView.delegate = self + self.scrollView.delegate = self.wrappedScrollViewDelegate self.view.addSubview(self.scrollView) } diff --git a/submodules/StickerPackPreviewUI/Sources/StickerPackPreviewControllerNode.swift b/submodules/StickerPackPreviewUI/Sources/StickerPackPreviewControllerNode.swift index 2771c40622..f9f5a76427 100644 --- a/submodules/StickerPackPreviewUI/Sources/StickerPackPreviewControllerNode.swift +++ b/submodules/StickerPackPreviewUI/Sources/StickerPackPreviewControllerNode.swift @@ -46,7 +46,7 @@ private struct StickerPackPreviewGridTransaction { } } -final class StickerPackPreviewControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +final class StickerPackPreviewControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private let openShare: (() -> Void)? private var presentationData: PresentationData @@ -152,7 +152,7 @@ final class StickerPackPreviewControllerNode: ViewControllerTracingNode, UIScrol self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.wrappingScrollNode.addSubnode(self.cancelButtonNode) diff --git a/submodules/StickerPackPreviewUI/Sources/StickerPreviewControllerNode.swift b/submodules/StickerPackPreviewUI/Sources/StickerPreviewControllerNode.swift index 66850c8f93..ff1ee5e255 100644 --- a/submodules/StickerPackPreviewUI/Sources/StickerPreviewControllerNode.swift +++ b/submodules/StickerPackPreviewUI/Sources/StickerPreviewControllerNode.swift @@ -9,7 +9,7 @@ import TelegramPresentationData import AccountContext import StickerResources -final class StickerPreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { +final class StickerPreviewControllerNode: ASDisplayNode, ASScrollViewDelegate { private let context: AccountContext private let presentationData: PresentationData diff --git a/submodules/TabBarUI/Sources/TabBarNode.swift b/submodules/TabBarUI/Sources/TabBarNode.swift index 473a7f42aa..b5d14b5460 100644 --- a/submodules/TabBarUI/Sources/TabBarNode.swift +++ b/submodules/TabBarUI/Sources/TabBarNode.swift @@ -316,7 +316,7 @@ final class TabBarNodeItem { } } -class TabBarNode: ASDisplayNode, UIGestureRecognizerDelegate { +class TabBarNode: ASDisplayNode, ASGestureRecognizerDelegate { var tabBarItems: [TabBarNodeItem] = [] { didSet { self.reloadTabBarItems() @@ -389,7 +389,7 @@ class TabBarNode: ASDisplayNode, UIGestureRecognizerDelegate { super.didLoad() let recognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.tapLongTapOrDoubleTapGesture(_:))) - recognizer.delegate = self + recognizer.delegate = self.wrappedGestureRecognizerDelegate recognizer.tapActionAtPoint = { _ in return .keepWithSingleTap } diff --git a/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryContainerNode.swift b/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryContainerNode.swift index 4db832cc97..2ac69b494d 100644 --- a/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryContainerNode.swift +++ b/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryContainerNode.swift @@ -6,7 +6,7 @@ import TelegramCore import TelegramPresentationData import AccountContext -public final class MediaNavigationAccessoryContainerNode: ASDisplayNode, UIGestureRecognizerDelegate { +public final class MediaNavigationAccessoryContainerNode: ASDisplayNode, ASGestureRecognizerDelegate { private let displayBackground: Bool public let backgroundNode: ASDisplayNode diff --git a/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryHeaderNode.swift b/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryHeaderNode.swift index 5052903899..fc1b19ed9d 100644 --- a/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryHeaderNode.swift +++ b/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryHeaderNode.swift @@ -140,7 +140,7 @@ private func generateMaskImage(color: UIColor) -> UIImage? { }) } -public final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollViewDelegate { +public final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, ASScrollViewDelegate { public static let minimizedHeight: CGFloat = 37.0 private let context: AccountContext @@ -345,7 +345,7 @@ public final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollVi self.view.disablesInteractiveTransitionGestureRecognizer = true self.scrollNode.view.alwaysBounceHorizontal = true - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.scrollNode.view.isPagingEnabled = true self.scrollNode.view.showsHorizontalScrollIndicator = false self.scrollNode.view.showsVerticalScrollIndicator = false diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatCameraPreviewController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatCameraPreviewController.swift index bdbf531757..959bf6cc82 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatCameraPreviewController.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatCameraPreviewController.swift @@ -112,7 +112,7 @@ final class VoiceChatCameraPreviewController: ViewController { } } -private class VoiceChatCameraPreviewControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +private class VoiceChatCameraPreviewControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private weak var controller: VoiceChatCameraPreviewController? private let sharedContext: SharedAccountContext private var presentationData: PresentationData @@ -223,7 +223,7 @@ private class VoiceChatCameraPreviewControllerNode: ViewControllerTracingNode, U self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.wrappingScrollNode.addSubnode(self.backgroundNode) @@ -510,7 +510,7 @@ private class VoiceChatCameraPreviewControllerNode: ViewControllerTracingNode, U private let textFont = Font.with(size: 14.0, design: .camera, weight: .regular) private let selectedTextFont = Font.with(size: 14.0, design: .camera, weight: .semibold) -private class WheelControlNode: ASDisplayNode, UIGestureRecognizerDelegate { +private class WheelControlNode: ASDisplayNode, ASGestureRecognizerDelegate { struct Item: Equatable { public let title: String diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatController.swift index 298f3d103f..49ef374575 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatController.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatController.swift @@ -254,7 +254,7 @@ public final class VoiceChatControllerImpl: ViewController, VoiceChatController case fullscreen(controlsHidden: Bool) } - fileprivate final class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate { + fileprivate final class Node: ViewControllerTracingNode, ASGestureRecognizerDelegate { private struct ListTransition { let deletions: [ListViewDeleteItem] let insertions: [ListViewInsertItem] @@ -3022,11 +3022,11 @@ public final class VoiceChatControllerImpl: ViewController, VoiceChatController let longTapRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(self.actionButtonPressGesture(_:))) longTapRecognizer.minimumPressDuration = 0.001 - longTapRecognizer.delegate = self + longTapRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.actionButton.view.addGestureRecognizer(longTapRecognizer) let panRecognizer = DirectionalPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.view.addGestureRecognizer(panRecognizer) @@ -6747,7 +6747,7 @@ public final class VoiceChatControllerImpl: ViewController, VoiceChatController self.updateDecorationsLayout(transition: transition) } } - if false, let (peerId, _) = minimalVisiblePeerid { + if !"".isEmpty, let (peerId, _) = minimalVisiblePeerid { var index = 0 for item in self.currentEntries { if case let .peer(entry, _) = item, entry.peer.id == peerId { diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatJoinScreen.swift b/submodules/TelegramCallsUI/Sources/VoiceChatJoinScreen.swift index 186d35e138..25280946e0 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatJoinScreen.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatJoinScreen.swift @@ -176,7 +176,7 @@ public final class VoiceChatJoinScreen: ViewController { self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition) } - class Node: ViewControllerTracingNode, UIScrollViewDelegate { + class Node: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private var presentationData: PresentationData private let asSpeaker: Bool @@ -285,7 +285,7 @@ public final class VoiceChatJoinScreen: ViewController { self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.cancelButtonNode.setTitle(self.presentationData.strings.Common_Cancel, with: Font.medium(20.0), with: self.presentationData.theme.actionSheet.standardActionTextColor, for: .normal) diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatOverlayController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatOverlayController.swift index 7e724bd582..0f1b2e5ed4 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatOverlayController.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatOverlayController.swift @@ -17,7 +17,7 @@ import TooltipUI private let slideOffset: CGFloat = 80.0 + 44.0 public final class VoiceChatOverlayController: ViewController { - private final class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate { + private final class Node: ViewControllerTracingNode, ASGestureRecognizerDelegate { private weak var controller: VoiceChatOverlayController? private var validLayout: ContainerViewLayout? diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatRecordingSetupController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatRecordingSetupController.swift index f03d96ef09..40c399006a 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatRecordingSetupController.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatRecordingSetupController.swift @@ -90,7 +90,7 @@ final class VoiceChatRecordingSetupController: ViewController { } } -private class VoiceChatRecordingSetupControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +private class VoiceChatRecordingSetupControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { enum MediaMode { case videoAndAudio case audioOnly @@ -263,7 +263,7 @@ private class VoiceChatRecordingSetupControllerNode: ViewControllerTracingNode, self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.wrappingScrollNode.addSubnode(self.backgroundNode) diff --git a/submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift b/submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift index 529f22e001..d94ec661bf 100644 --- a/submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift +++ b/submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift @@ -1389,7 +1389,7 @@ public class CameraScreen: ViewController { } } - fileprivate final class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate { + fileprivate final class Node: ViewControllerTracingNode, ASGestureRecognizerDelegate { private weak var controller: CameraScreen? private let context: AccountContext fileprivate var camera: Camera? @@ -1700,7 +1700,7 @@ public class CameraScreen: ViewController { self.previewContainerView.addGestureRecognizer(pinchGestureRecognizer) let panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.handlePan(_:))) - panGestureRecognizer.delegate = self + panGestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate panGestureRecognizer.maximumNumberOfTouches = 1 self.panGestureRecognizer = panGestureRecognizer self.previewContainerView.addGestureRecognizer(panGestureRecognizer) @@ -1713,7 +1713,7 @@ public class CameraScreen: ViewController { self.previewContainerView.addGestureRecognizer(doubleGestureRecognizer) let pipPanGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.handlePipPan(_:))) - pipPanGestureRecognizer.delegate = self + pipPanGestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.previewContainerView.addGestureRecognizer(pipPanGestureRecognizer) self.pipPanGestureRecognizer = pipPanGestureRecognizer } diff --git a/submodules/TelegramUI/Components/Chat/ChatEmptyNode/Sources/ChatEmptyNode.swift b/submodules/TelegramUI/Components/Chat/ChatEmptyNode/Sources/ChatEmptyNode.swift index 8b42ed869f..218ca14ac6 100644 --- a/submodules/TelegramUI/Components/Chat/ChatEmptyNode/Sources/ChatEmptyNode.swift +++ b/submodules/TelegramUI/Components/Chat/ChatEmptyNode/Sources/ChatEmptyNode.swift @@ -86,7 +86,7 @@ public protocol ChatEmptyNodeStickerContentNode: ASDisplayNode { var stickerNode: ChatMediaInputStickerGridItemNode { get } } -public final class ChatEmptyNodeGreetingChatContent: ASDisplayNode, ChatEmptyNodeStickerContentNode, ChatEmptyNodeContent, UIGestureRecognizerDelegate { +public final class ChatEmptyNodeGreetingChatContent: ASDisplayNode, ChatEmptyNodeStickerContentNode, ChatEmptyNodeContent, ASGestureRecognizerDelegate { private let context: AccountContext private let interaction: ChatPanelInterfaceInteraction? @@ -134,7 +134,7 @@ public final class ChatEmptyNodeGreetingChatContent: ASDisplayNode, ChatEmptyNod super.didLoad() let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.stickerTapGesture(_:))) - tapRecognizer.delegate = self + tapRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.stickerNode.view.addGestureRecognizer(tapRecognizer) } @@ -295,7 +295,7 @@ public final class ChatEmptyNodeGreetingChatContent: ASDisplayNode, ChatEmptyNod } } -public final class ChatEmptyNodeNearbyChatContent: ASDisplayNode, ChatEmptyNodeStickerContentNode, ChatEmptyNodeContent, UIGestureRecognizerDelegate { +public final class ChatEmptyNodeNearbyChatContent: ASDisplayNode, ChatEmptyNodeStickerContentNode, ChatEmptyNodeContent, ASGestureRecognizerDelegate { private let context: AccountContext private let interaction: ChatPanelInterfaceInteraction? @@ -342,7 +342,7 @@ public final class ChatEmptyNodeNearbyChatContent: ASDisplayNode, ChatEmptyNodeS super.didLoad() let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.stickerTapGesture(_:))) - tapRecognizer.delegate = self + tapRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.stickerNode.view.addGestureRecognizer(tapRecognizer) } @@ -1082,7 +1082,7 @@ private final class ChatEmptyNodeCloudChatContent: ASDisplayNode, ChatEmptyNodeC } } -public final class ChatEmptyNodeTopicChatContent: ASDisplayNode, ChatEmptyNodeContent, UIGestureRecognizerDelegate { +public final class ChatEmptyNodeTopicChatContent: ASDisplayNode, ChatEmptyNodeContent, ASGestureRecognizerDelegate { private let context: AccountContext private let titleNode: ImmediateTextNode diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageGiveawayBubbleContentNode/Sources/ChatMessageGiveawayBubbleContentNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageGiveawayBubbleContentNode/Sources/ChatMessageGiveawayBubbleContentNode.swift index aa150aa342..2951dc6069 100644 --- a/submodules/TelegramUI/Components/Chat/ChatMessageGiveawayBubbleContentNode/Sources/ChatMessageGiveawayBubbleContentNode.swift +++ b/submodules/TelegramUI/Components/Chat/ChatMessageGiveawayBubbleContentNode/Sources/ChatMessageGiveawayBubbleContentNode.swift @@ -24,7 +24,7 @@ private let titleFont = Font.medium(15.0) private let textFont = Font.regular(13.0) private let boldTextFont = Font.semibold(13.0) -public class ChatMessageGiveawayBubbleContentNode: ChatMessageBubbleContentNode, UIGestureRecognizerDelegate { +public class ChatMessageGiveawayBubbleContentNode: ChatMessageBubbleContentNode, ASGestureRecognizerDelegate { private let dateAndStatusNode: ChatMessageDateAndStatusNode private let placeholderNode: StickerShimmerEffectNode @@ -170,7 +170,7 @@ public class ChatMessageGiveawayBubbleContentNode: ChatMessageBubbleContentNode, super.didLoad() let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.bubbleTap(_:))) - tapRecognizer.delegate = self + tapRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.view.addGestureRecognizer(tapRecognizer) } diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageInstantVideoItemNode/Sources/ChatMessageInstantVideoItemNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageInstantVideoItemNode/Sources/ChatMessageInstantVideoItemNode.swift index e982d5f985..6874321c3c 100644 --- a/submodules/TelegramUI/Components/Chat/ChatMessageInstantVideoItemNode/Sources/ChatMessageInstantVideoItemNode.swift +++ b/submodules/TelegramUI/Components/Chat/ChatMessageInstantVideoItemNode/Sources/ChatMessageInstantVideoItemNode.swift @@ -34,7 +34,7 @@ private let nameFont = Font.medium(14.0) private let inlineBotPrefixFont = Font.regular(14.0) private let inlineBotNameFont = nameFont -public class ChatMessageInstantVideoItemNode: ChatMessageItemView, UIGestureRecognizerDelegate { +public class ChatMessageInstantVideoItemNode: ChatMessageItemView, ASGestureRecognizerDelegate { public let contextSourceNode: ContextExtractedContentContainingNode public let containerNode: ContextControllerSourceNode public let interactiveVideoNode: ChatMessageInteractiveInstantVideoNode diff --git a/submodules/TelegramUI/Components/Chat/ChatQrCodeScreen/Sources/ChatQrCodeScreen.swift b/submodules/TelegramUI/Components/Chat/ChatQrCodeScreen/Sources/ChatQrCodeScreen.swift index deba00c493..0ce5e17bc6 100644 --- a/submodules/TelegramUI/Components/Chat/ChatQrCodeScreen/Sources/ChatQrCodeScreen.swift +++ b/submodules/TelegramUI/Components/Chat/ChatQrCodeScreen/Sources/ChatQrCodeScreen.swift @@ -751,7 +751,7 @@ private func generateShadowImage() -> UIImage? { })?.stretchableImage(withLeftCapWidth: 20, topCapHeight: 0) } -private class ChatQrCodeScreenNode: ViewControllerTracingNode, UIScrollViewDelegate { +private class ChatQrCodeScreenNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private var presentationData: PresentationData private weak var controller: ChatQrCodeScreen? @@ -1285,7 +1285,7 @@ private class ChatQrCodeScreenNode: ViewControllerTracingNode, UIScrollViewDeleg override public func didLoad() { super.didLoad() - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.wrappingScrollNode.view.contentInsetAdjustmentBehavior = .never } diff --git a/submodules/TelegramUI/Components/Chat/InstantVideoRadialStatusNode/Sources/InstantVideoRadialStatusNode.swift b/submodules/TelegramUI/Components/Chat/InstantVideoRadialStatusNode/Sources/InstantVideoRadialStatusNode.swift index bd7e982c5d..b81129edf4 100644 --- a/submodules/TelegramUI/Components/Chat/InstantVideoRadialStatusNode/Sources/InstantVideoRadialStatusNode.swift +++ b/submodules/TelegramUI/Components/Chat/InstantVideoRadialStatusNode/Sources/InstantVideoRadialStatusNode.swift @@ -62,7 +62,7 @@ private extension CGPoint { } } -public final class InstantVideoRadialStatusNode: ASDisplayNode, UIGestureRecognizerDelegate { +public final class InstantVideoRadialStatusNode: ASDisplayNode, ASGestureRecognizerDelegate { private let color: UIColor private let hasSeek: Bool private let sparks: Bool @@ -177,11 +177,11 @@ public final class InstantVideoRadialStatusNode: ASDisplayNode, UIGestureRecogni } let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))) - tapGestureRecognizer.delegate = self + tapGestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.view.addGestureRecognizer(tapGestureRecognizer) let panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - panGestureRecognizer.delegate = self + panGestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.view.addGestureRecognizer(panGestureRecognizer) } diff --git a/submodules/TelegramUI/Components/ChatScheduleTimeController/Sources/ChatScheduleTimeControllerNode.swift b/submodules/TelegramUI/Components/ChatScheduleTimeController/Sources/ChatScheduleTimeControllerNode.swift index 0a7936716d..3ddddcd8ba 100644 --- a/submodules/TelegramUI/Components/ChatScheduleTimeController/Sources/ChatScheduleTimeControllerNode.swift +++ b/submodules/TelegramUI/Components/ChatScheduleTimeController/Sources/ChatScheduleTimeControllerNode.swift @@ -11,7 +11,7 @@ import SolidRoundedButtonNode import PresentationDataUtils import UIKitRuntimeUtils -class ChatScheduleTimeControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +class ChatScheduleTimeControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private let mode: ChatScheduleTimeControllerMode private let controllerStyle: ChatScheduleTimeControllerStyle @@ -128,7 +128,7 @@ class ChatScheduleTimeControllerNode: ViewControllerTracingNode, UIScrollViewDel self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.wrappingScrollNode.addSubnode(self.backgroundNode) diff --git a/submodules/TelegramUI/Components/ChatTimerScreen/Sources/ChatTimerScreen.swift b/submodules/TelegramUI/Components/ChatTimerScreen/Sources/ChatTimerScreen.swift index dfebbb77ff..94cc90f6ff 100644 --- a/submodules/TelegramUI/Components/ChatTimerScreen/Sources/ChatTimerScreen.swift +++ b/submodules/TelegramUI/Components/ChatTimerScreen/Sources/ChatTimerScreen.swift @@ -259,7 +259,7 @@ private var timerValues: [Int32] = { return values }() -class ChatTimerScreenNode: ViewControllerTracingNode, UIScrollViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate { +class ChatTimerScreenNode: ViewControllerTracingNode, ASScrollViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate { private let context: AccountContext private let controllerStyle: ChatTimerScreenStyle private var presentationData: PresentationData @@ -400,7 +400,7 @@ class ChatTimerScreenNode: ViewControllerTracingNode, UIScrollViewDelegate, UIPi self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.wrappingScrollNode.addSubnode(self.backgroundNode) diff --git a/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntitySearchContentComponent.swift b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntitySearchContentComponent.swift index 351b10e121..5068066d1c 100644 --- a/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntitySearchContentComponent.swift +++ b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EntitySearchContentComponent.swift @@ -48,7 +48,7 @@ public final class EntitySearchContainerController: ViewController { self.node.containerLayoutUpdated(layout, transition: transition) } - private class Node: ViewControllerTracingNode, UIScrollViewDelegate { + private class Node: ViewControllerTracingNode, ASScrollViewDelegate { private weak var controller: EntitySearchContainerController? private let containerNode: EntitySearchContainerNode diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaCutoutScreen.swift b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaCutoutScreen.swift index ef3a279155..fe959363d5 100644 --- a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaCutoutScreen.swift +++ b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaCutoutScreen.swift @@ -288,7 +288,7 @@ private final class MediaCutoutScreenComponent: Component { } public final class MediaCutoutScreen: ViewController { - fileprivate final class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate { + fileprivate final class Node: ViewControllerTracingNode, ASGestureRecognizerDelegate { private weak var controller: MediaCutoutScreen? private let context: AccountContext diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift index 20088635e5..01cf56c725 100644 --- a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift +++ b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift @@ -2121,7 +2121,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate } } - final class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate { + final class Node: ViewControllerTracingNode, ASGestureRecognizerDelegate { private weak var controller: MediaEditorScreen? private let context: AccountContext fileprivate var interaction: DrawingToolsInteraction? @@ -2750,28 +2750,28 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate self.view.disablesInteractiveKeyboardGestureRecognizer = true let dismissPanGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.handleDismissPan(_:))) - dismissPanGestureRecognizer.delegate = self + dismissPanGestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate dismissPanGestureRecognizer.maximumNumberOfTouches = 1 self.previewContainerView.addGestureRecognizer(dismissPanGestureRecognizer) self.dismissPanGestureRecognizer = dismissPanGestureRecognizer let panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.handlePan(_:))) - panGestureRecognizer.delegate = self + panGestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate panGestureRecognizer.minimumNumberOfTouches = 1 panGestureRecognizer.maximumNumberOfTouches = 2 self.view.addGestureRecognizer(panGestureRecognizer) self.panGestureRecognizer = panGestureRecognizer let pinchGestureRecognizer = UIPinchGestureRecognizer(target: self, action: #selector(self.handlePinch(_:))) - pinchGestureRecognizer.delegate = self + pinchGestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.previewContainerView.addGestureRecognizer(pinchGestureRecognizer) let rotateGestureRecognizer = UIRotationGestureRecognizer(target: self, action: #selector(self.handleRotate(_:))) - rotateGestureRecognizer.delegate = self + rotateGestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.previewContainerView.addGestureRecognizer(rotateGestureRecognizer) let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.handleTap(_:))) - tapGestureRecognizer.delegate = self + tapGestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.previewContainerView.addGestureRecognizer(tapGestureRecognizer) self.interaction = DrawingToolsInteraction( diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaToolsScreen.swift b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaToolsScreen.swift index 4401869e98..2336fce88b 100644 --- a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaToolsScreen.swift +++ b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaToolsScreen.swift @@ -954,7 +954,7 @@ private final class MediaToolsScreenComponent: Component { } public final class MediaToolsScreen: ViewController { - fileprivate final class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate { + fileprivate final class Node: ViewControllerTracingNode, ASGestureRecognizerDelegate { private weak var controller: MediaToolsScreen? private let context: AccountContext diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/SaveProgressScreen.swift b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/SaveProgressScreen.swift index d16c858c64..123591de92 100644 --- a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/SaveProgressScreen.swift +++ b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/SaveProgressScreen.swift @@ -384,7 +384,7 @@ public final class SaveProgressScreenComponent: Component { } public final class SaveProgressScreen: ViewController { - fileprivate final class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate { + fileprivate final class Node: ViewControllerTracingNode, ASGestureRecognizerDelegate { private weak var controller: SaveProgressScreen? private let context: AccountContext diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/StickerPackListContextItem.swift b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/StickerPackListContextItem.swift index 7b01557735..05f167e9f5 100644 --- a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/StickerPackListContextItem.swift +++ b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/StickerPackListContextItem.swift @@ -26,7 +26,7 @@ final class StickerPackListContextItem: ContextMenuCustomItem { } } -private final class StickerPackListContextItemNode: ASDisplayNode, ContextMenuCustomNode, ContextActionNodeProtocol, UIScrollViewDelegate { +private final class StickerPackListContextItemNode: ASDisplayNode, ContextMenuCustomNode, ContextActionNodeProtocol, ASScrollViewDelegate { private let item: StickerPackListContextItem private let presentationData: PresentationData private let getController: () -> ContextControllerProtocol? @@ -105,7 +105,7 @@ private final class StickerPackListContextItemNode: ASDisplayNode, ContextMenuCu override func didLoad() { super.didLoad() - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.scrollNode.view.alwaysBounceVertical = false self.scrollNode.view.showsHorizontalScrollIndicator = false self.scrollNode.view.scrollIndicatorInsets = UIEdgeInsets(top: 0.0, left: 0.0, bottom: 5.0, right: 0.0) diff --git a/submodules/TelegramUI/Components/MultiplexedVideoNode/Sources/MultiplexedVideoNode.swift b/submodules/TelegramUI/Components/MultiplexedVideoNode/Sources/MultiplexedVideoNode.swift index aec600797c..6e58886501 100644 --- a/submodules/TelegramUI/Components/MultiplexedVideoNode/Sources/MultiplexedVideoNode.swift +++ b/submodules/TelegramUI/Components/MultiplexedVideoNode/Sources/MultiplexedVideoNode.swift @@ -100,7 +100,7 @@ public final class MultiplexedVideoNodeFiles { } } -public final class MultiplexedVideoNode: ASDisplayNode, UIScrollViewDelegate { +public final class MultiplexedVideoNode: ASDisplayNode, ASScrollViewDelegate { private let account: Account private var theme: PresentationTheme private var strings: PresentationStrings @@ -236,7 +236,7 @@ public final class MultiplexedVideoNode: ASDisplayNode, UIScrollViewDelegate { } } - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate let recognizer = UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))) self.view.addGestureRecognizer(recognizer) diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoChatListPaneNode/Sources/PeerInfoChatListPaneNode.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoChatListPaneNode/Sources/PeerInfoChatListPaneNode.swift index a830414f1b..0c44d4b0d3 100644 --- a/submodules/TelegramUI/Components/PeerInfo/PeerInfoChatListPaneNode/Sources/PeerInfoChatListPaneNode.swift +++ b/submodules/TelegramUI/Components/PeerInfo/PeerInfoChatListPaneNode/Sources/PeerInfoChatListPaneNode.swift @@ -94,7 +94,7 @@ private final class SearchNavigationContentNode: ASDisplayNode, PeerInfoPanelNod } } -public final class PeerInfoChatListPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { +public final class PeerInfoChatListPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { private let context: AccountContext private let navigationController: () -> NavigationController? diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoChatPaneNode/Sources/PeerInfoChatPaneNode.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoChatPaneNode/Sources/PeerInfoChatPaneNode.swift index 2acf7e0072..c8d05f4e09 100644 --- a/submodules/TelegramUI/Components/PeerInfo/PeerInfoChatPaneNode/Sources/PeerInfoChatPaneNode.swift +++ b/submodules/TelegramUI/Components/PeerInfo/PeerInfoChatPaneNode/Sources/PeerInfoChatPaneNode.swift @@ -89,7 +89,7 @@ private final class SearchNavigationContentNode: ASDisplayNode, PeerInfoPanelNod } } -public final class PeerInfoChatPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { +public final class PeerInfoChatPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { private let context: AccountContext private let peerId: EnginePeer.Id private let navigationController: () -> NavigationController? diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/Panes/PeerInfoGifPaneNode.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/Panes/PeerInfoGifPaneNode.swift index 054cfeba82..a360848d8a 100644 --- a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/Panes/PeerInfoGifPaneNode.swift +++ b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/Panes/PeerInfoGifPaneNode.swift @@ -761,7 +761,7 @@ private enum ItemsLayout { } } -final class PeerInfoGifPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScrollViewDelegate { +final class PeerInfoGifPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScrollViewDelegate { enum ContentType { case photoOrVideo case gifs @@ -853,7 +853,7 @@ final class PeerInfoGifPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScrollViewDe self.scrollNode.view.contentInsetAdjustmentBehavior = .never } self.scrollNode.view.scrollsToTop = false - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.scrollNode) self.addSubnode(self.floatingHeaderNode) diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoPaneContainerNode.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoPaneContainerNode.swift index 638cfeaffd..173d3f0824 100644 --- a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoPaneContainerNode.swift +++ b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoPaneContainerNode.swift @@ -446,7 +446,7 @@ private final class PeerInfoPendingPane { } } -final class PeerInfoPaneContainerNode: ASDisplayNode, UIGestureRecognizerDelegate { +final class PeerInfoPaneContainerNode: ASDisplayNode, ASGestureRecognizerDelegate { private let context: AccountContext private let peerId: PeerId private let chatLocation: ChatLocation @@ -602,7 +602,7 @@ final class PeerInfoPaneContainerNode: ASDisplayNode, UIGestureRecognizerDelegat } return [.left, .right] }) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.view.addGestureRecognizer(panRecognizer) diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift index 5f2504db5d..69a9adc75c 100644 --- a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift +++ b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift @@ -2371,7 +2371,7 @@ private func editingItems(data: PeerInfoScreenData?, state: PeerInfoState, chatL return result } -final class PeerInfoScreenNode: ViewControllerTracingNode, PeerInfoScreenNodeProtocol, UIScrollViewDelegate { +final class PeerInfoScreenNode: ViewControllerTracingNode, PeerInfoScreenNodeProtocol, ASScrollViewDelegate { private weak var controller: PeerInfoScreenImpl? private let context: AccountContext @@ -3311,7 +3311,7 @@ final class PeerInfoScreenNode: ViewControllerTracingNode, PeerInfoScreenNodePro } self.scrollNode.view.alwaysBounceVertical = true self.scrollNode.view.scrollsToTop = false - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.scrollNode) self.scrollNode.addSubnode(self.paneContainerNode) diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoStoryPaneNode.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoStoryPaneNode.swift index ae84f5dc46..bb434fed1a 100644 --- a/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoStoryPaneNode.swift +++ b/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoStoryPaneNode.swift @@ -1047,7 +1047,7 @@ private final class SparseItemGridBindingImpl: SparseItemGridBinding { } } -public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { +public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { public enum ContentType { case photoOrVideo case photo @@ -2157,7 +2157,7 @@ public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScr if isSelecting { if self.gridSelectionGesture == nil { let selectionGesture = MediaPickerGridSelectionGesture() - selectionGesture.delegate = self + selectionGesture.delegate = self.wrappedGestureRecognizerDelegate selectionGesture.sideInset = 44.0 selectionGesture.updateIsScrollEnabled = { [weak self] isEnabled in self?.itemGrid.isScrollEnabled = isEnabled diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoVisualMediaPaneNode.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoVisualMediaPaneNode.swift index 5de4a34aaa..a9be603144 100644 --- a/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoVisualMediaPaneNode.swift +++ b/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoVisualMediaPaneNode.swift @@ -1051,7 +1051,7 @@ public protocol PeerInfoScreenNodeProtocol: AnyObject { func displaySharedMediaFastScrollingTooltip() } -public final class PeerInfoVisualMediaPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { +public final class PeerInfoVisualMediaPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { public enum ContentType { case photoOrVideo case photo @@ -2067,7 +2067,7 @@ public final class PeerInfoVisualMediaPaneNode: ASDisplayNode, PeerInfoPaneNode, if isSelecting { if self.gridSelectionGesture == nil { let selectionGesture = MediaPickerGridSelectionGesture() - selectionGesture.delegate = self + selectionGesture.delegate = self.wrappedGestureRecognizerDelegate selectionGesture.sideInset = 44.0 selectionGesture.updateIsScrollEnabled = { [weak self] isEnabled in self?.itemGrid.isScrollEnabled = isEnabled diff --git a/submodules/TelegramUI/Components/Settings/ThemeAccentColorScreen/Sources/ThemeAccentColorControllerNode.swift b/submodules/TelegramUI/Components/Settings/ThemeAccentColorScreen/Sources/ThemeAccentColorControllerNode.swift index 4d5ee92144..21a8986798 100644 --- a/submodules/TelegramUI/Components/Settings/ThemeAccentColorScreen/Sources/ThemeAccentColorControllerNode.swift +++ b/submodules/TelegramUI/Components/Settings/ThemeAccentColorScreen/Sources/ThemeAccentColorControllerNode.swift @@ -149,7 +149,7 @@ private func calcPatternColors(for state: ThemeColorState) -> [UIColor] { } } -final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate { +final class ThemeAccentColorControllerNode: ASDisplayNode, ASScrollViewDelegate { private let context: AccountContext private var theme: PresentationTheme private let mode: ThemeAccentColorControllerMode @@ -625,7 +625,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate self.scrollNode.view.disablesInteractiveTransitionGestureRecognizer = true self.scrollNode.view.showsHorizontalScrollIndicator = false self.scrollNode.view.isPagingEnabled = true - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.pageControlNode.setPage(0.0) self.colorPanelNode.view.disablesInteractiveTransitionGestureRecognizer = true self.patternPanelNode.view.disablesInteractiveTransitionGestureRecognizer = true diff --git a/submodules/TelegramUI/Components/Settings/WallpaperGalleryScreen/Sources/WallpaperCropNode.swift b/submodules/TelegramUI/Components/Settings/WallpaperGalleryScreen/Sources/WallpaperCropNode.swift index 00dbe5b327..ca30053e7f 100644 --- a/submodules/TelegramUI/Components/Settings/WallpaperGalleryScreen/Sources/WallpaperCropNode.swift +++ b/submodules/TelegramUI/Components/Settings/WallpaperGalleryScreen/Sources/WallpaperCropNode.swift @@ -3,7 +3,7 @@ import UIKit import Display import AsyncDisplayKit -final class WallpaperCropNode: ASDisplayNode, UIScrollViewDelegate { +final class WallpaperCropNode: ASDisplayNode, ASScrollViewDelegate { let scrollNode: ASScrollNode private var ignoreZoom = false @@ -34,7 +34,7 @@ final class WallpaperCropNode: ASDisplayNode, UIScrollViewDelegate { super.init() - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.scrollNode.view.showsVerticalScrollIndicator = false self.scrollNode.view.showsHorizontalScrollIndicator = false self.scrollNode.view.clipsToBounds = false diff --git a/submodules/TelegramUI/Components/SliderContextItem/Sources/SliderContextItem.swift b/submodules/TelegramUI/Components/SliderContextItem/Sources/SliderContextItem.swift index 5272830366..a96132f715 100644 --- a/submodules/TelegramUI/Components/SliderContextItem/Sources/SliderContextItem.swift +++ b/submodules/TelegramUI/Components/SliderContextItem/Sources/SliderContextItem.swift @@ -27,7 +27,7 @@ public final class SliderContextItem: ContextMenuCustomItem { private let textFont = Font.with(size: 17.0, design: .regular, traits: .monospacedNumbers) -private final class SliderContextItemNode: ASDisplayNode, ContextMenuCustomNode, UIGestureRecognizerDelegate { +private final class SliderContextItemNode: ASDisplayNode, ContextMenuCustomNode, ASGestureRecognizerDelegate { private var presentationData: PresentationData private(set) var vibrancyEffectView: UIVisualEffectView? @@ -134,7 +134,7 @@ private final class SliderContextItemNode: ASDisplayNode, ContextMenuCustomNode, } let panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - panGestureRecognizer.delegate = self + panGestureRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.view.addGestureRecognizer(panGestureRecognizer) let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))) diff --git a/submodules/TelegramUI/Components/StickerPickerScreen/Sources/StickerPickerScreen.swift b/submodules/TelegramUI/Components/StickerPickerScreen/Sources/StickerPickerScreen.swift index d5446679df..c5828da772 100644 --- a/submodules/TelegramUI/Components/StickerPickerScreen/Sources/StickerPickerScreen.swift +++ b/submodules/TelegramUI/Components/StickerPickerScreen/Sources/StickerPickerScreen.swift @@ -430,7 +430,7 @@ private final class StickerSelectionComponent: Component { } public class StickerPickerScreen: ViewController { - final class Node: ViewControllerTracingNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { + final class Node: ViewControllerTracingNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { private var presentationData: PresentationData private weak var controller: StickerPickerScreen? private let theme: PresentationTheme @@ -1549,7 +1549,7 @@ public class StickerPickerScreen: ViewController { super.didLoad() let panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.panGestureRecognizer = panRecognizer diff --git a/submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/VideoMessageCameraScreen.swift b/submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/VideoMessageCameraScreen.swift index 79f6fd787b..70892cf4c4 100644 --- a/submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/VideoMessageCameraScreen.swift +++ b/submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/VideoMessageCameraScreen.swift @@ -539,7 +539,7 @@ public class VideoMessageCameraScreen: ViewController { case video(Video) } - fileprivate final class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate { + fileprivate final class Node: ViewControllerTracingNode, ASGestureRecognizerDelegate { private weak var controller: VideoMessageCameraScreen? private let context: AccountContext fileprivate var camera: Camera? diff --git a/submodules/TelegramUI/Sources/ChatControllerNode.swift b/submodules/TelegramUI/Sources/ChatControllerNode.swift index dd932f2c61..95c149e8c9 100644 --- a/submodules/TelegramUI/Sources/ChatControllerNode.swift +++ b/submodules/TelegramUI/Sources/ChatControllerNode.swift @@ -106,7 +106,7 @@ class HistoryNodeContainer: ASDisplayNode { } } -class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { +class ChatControllerNode: ASDisplayNode, ASScrollViewDelegate { let context: AccountContext let chatLocation: ChatLocation let controllerInteraction: ChatControllerInteraction @@ -1163,7 +1163,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { if self.scrollContainerNode == nil { let scrollContainerNode = ScrollContainerNode() scrollContainerNode.view.delaysContentTouches = false - scrollContainerNode.view.delegate = self + scrollContainerNode.view.delegate = self.wrappedScrollViewDelegate scrollContainerNode.view.alwaysBounceVertical = true if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { scrollContainerNode.view.contentInsetAdjustmentBehavior = .never diff --git a/submodules/TelegramUI/Sources/ChatSearchResultsContollerNode.swift b/submodules/TelegramUI/Sources/ChatSearchResultsContollerNode.swift index 709a548cf5..aaab82ea21 100644 --- a/submodules/TelegramUI/Sources/ChatSearchResultsContollerNode.swift +++ b/submodules/TelegramUI/Sources/ChatSearchResultsContollerNode.swift @@ -148,7 +148,7 @@ private func chatListSearchContainerPreparedTransition(from fromEntries: [ChatLi return ChatListSearchContainerTransition(deletions: deletions, insertions: insertions, updates: updates) } -class ChatSearchResultsControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { +class ChatSearchResultsControllerNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private var presentationData: PresentationData private let animationCache: AnimationCache diff --git a/submodules/TelegramUI/Sources/ChatSearchTitleAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/ChatSearchTitleAccessoryPanelNode.swift index dde6928282..acbcf0c576 100644 --- a/submodules/TelegramUI/Sources/ChatSearchTitleAccessoryPanelNode.swift +++ b/submodules/TelegramUI/Sources/ChatSearchTitleAccessoryPanelNode.swift @@ -26,7 +26,7 @@ private let backgroundTagImage: UIImage? = { } }() -final class ChatSearchTitleAccessoryPanelNode: ChatTitleAccessoryPanelNode, ChatControllerCustomNavigationPanelNode, UIScrollViewDelegate { +final class ChatSearchTitleAccessoryPanelNode: ChatTitleAccessoryPanelNode, ChatControllerCustomNavigationPanelNode, ASScrollViewDelegate { private struct Params: Equatable { var width: CGFloat var leftInset: CGFloat @@ -466,7 +466,7 @@ final class ChatSearchTitleAccessoryPanelNode: ChatTitleAccessoryPanelNode, Chat self.scrollView.alwaysBounceHorizontal = false self.scrollView.alwaysBounceVertical = false self.scrollView.scrollsToTop = false - self.scrollView.delegate = self + self.scrollView.delegate = self.wrappedScrollViewDelegate self.view.addSubview(self.scrollView) diff --git a/submodules/TelegramUI/Sources/ChatSendAsPeerListContextItem.swift b/submodules/TelegramUI/Sources/ChatSendAsPeerListContextItem.swift index ba3e4481ad..0dc33acc28 100644 --- a/submodules/TelegramUI/Sources/ChatSendAsPeerListContextItem.swift +++ b/submodules/TelegramUI/Sources/ChatSendAsPeerListContextItem.swift @@ -35,7 +35,7 @@ final class ChatSendAsPeerListContextItem: ContextMenuCustomItem { } } -private final class ChatSendAsPeerListContextItemNode: ASDisplayNode, ContextMenuCustomNode, ContextActionNodeProtocol, UIScrollViewDelegate { +private final class ChatSendAsPeerListContextItemNode: ASDisplayNode, ContextMenuCustomNode, ContextActionNodeProtocol, ASScrollViewDelegate { private let item: ChatSendAsPeerListContextItem private let presentationData: PresentationData private let getController: () -> ContextControllerProtocol? @@ -146,7 +146,7 @@ private final class ChatSendAsPeerListContextItemNode: ASDisplayNode, ContextMen override func didLoad() { super.didLoad() - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.scrollNode.view.alwaysBounceVertical = false self.scrollNode.view.showsHorizontalScrollIndicator = false self.scrollNode.view.scrollIndicatorInsets = UIEdgeInsets(top: 0.0, left: 0.0, bottom: 5.0, right: 0.0) diff --git a/submodules/TelegramUI/Sources/ChatThemeScreen.swift b/submodules/TelegramUI/Sources/ChatThemeScreen.swift index 8b2e570ad4..454a84050f 100644 --- a/submodules/TelegramUI/Sources/ChatThemeScreen.swift +++ b/submodules/TelegramUI/Sources/ChatThemeScreen.swift @@ -711,7 +711,7 @@ private func interpolateColors(from: [String: UIColor], to: [String: UIColor], f return colors } -private class ChatThemeScreenNode: ViewControllerTracingNode, UIScrollViewDelegate { +private class ChatThemeScreenNode: ViewControllerTracingNode, ASScrollViewDelegate { private let context: AccountContext private var presentationData: PresentationData private weak var controller: ChatThemeScreen? @@ -842,7 +842,7 @@ private class ChatThemeScreenNode: ViewControllerTracingNode, UIScrollViewDelega self.addSubnode(self.dimNode) - self.wrappingScrollNode.view.delegate = self + self.wrappingScrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.wrappingScrollNode) self.wrappingScrollNode.addSubnode(self.backgroundNode) diff --git a/submodules/TelegramUI/Sources/ChatTranslationPanelNode.swift b/submodules/TelegramUI/Sources/ChatTranslationPanelNode.swift index c6ac0b2fe6..5ca9802b74 100644 --- a/submodules/TelegramUI/Sources/ChatTranslationPanelNode.swift +++ b/submodules/TelegramUI/Sources/ChatTranslationPanelNode.swift @@ -452,7 +452,7 @@ private final class TranslationLanguagesContextMenuContent: ContextControllerIte } } - private final class LanguagesListNode: ASDisplayNode, UIScrollViewDelegate { + private final class LanguagesListNode: ASDisplayNode, ASScrollViewDelegate { private final class ItemNode: HighlightTrackingButtonNode { let context: AccountContext let highlightBackgroundNode: ASDisplayNode @@ -586,7 +586,7 @@ private final class TranslationLanguagesContextMenuContent: ContextControllerIte super.init() self.addSubnode(self.scrollNode) - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.clipsToBounds = true } diff --git a/submodules/TelegramUI/Sources/InlineReactionSearchPanel.swift b/submodules/TelegramUI/Sources/InlineReactionSearchPanel.swift index 4ace9c8922..8ca90a5755 100644 --- a/submodules/TelegramUI/Sources/InlineReactionSearchPanel.swift +++ b/submodules/TelegramUI/Sources/InlineReactionSearchPanel.swift @@ -17,7 +17,7 @@ import UndoUI import ChatControllerInteraction import ChatInputContextPanelNode -private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollViewDelegate { +private final class InlineReactionSearchStickersNode: ASDisplayNode, ASScrollViewDelegate { private final class DisplayItem { let file: TelegramMediaFile let frame: CGRect @@ -78,7 +78,7 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie self.scrollNode.view.alwaysBounceVertical = true self.scrollNode.view.showsVerticalScrollIndicator = false self.scrollNode.view.showsHorizontalScrollIndicator = false - self.scrollNode.view.delegate = self + self.scrollNode.view.delegate = self.wrappedScrollViewDelegate self.addSubnode(self.scrollNode) } diff --git a/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift b/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift index 4335325b8a..b6382e7396 100644 --- a/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift +++ b/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift @@ -12,7 +12,7 @@ import DirectionalPanGesture import ChatPresentationInterfaceState import ChatControllerInteraction -final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestureRecognizerDelegate { +final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, ASGestureRecognizerDelegate { let ready = Promise() private let context: AccountContext @@ -336,7 +336,7 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestu self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) let panRecognizer = DirectionalPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true panRecognizer.shouldBegin = { [weak self] point in diff --git a/submodules/TelegramUI/Sources/OverlayMediaControllerNode.swift b/submodules/TelegramUI/Sources/OverlayMediaControllerNode.swift index dc9ae6a5a8..0e2cc2d901 100644 --- a/submodules/TelegramUI/Sources/OverlayMediaControllerNode.swift +++ b/submodules/TelegramUI/Sources/OverlayMediaControllerNode.swift @@ -30,7 +30,7 @@ private final class OverlayMediaVideoNodeData { -final class OverlayMediaControllerNode: ASDisplayNode, UIGestureRecognizerDelegate { +final class OverlayMediaControllerNode: ASDisplayNode, ASGestureRecognizerDelegate { private let updatePossibleEmbeddingItem: (OverlayMediaControllerEmbeddingItem?) -> Void private let embedPossibleEmbeddingItem: (OverlayMediaControllerEmbeddingItem) -> Bool @@ -61,12 +61,12 @@ final class OverlayMediaControllerNode: ASDisplayNode, UIGestureRecognizerDelega let panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) panRecognizer.cancelsTouchesInView = false - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.view.addGestureRecognizer(panRecognizer) let pinchRecognizer = UIPinchGestureRecognizer(target: self, action: #selector(self.pinchGesture(_:))) pinchRecognizer.cancelsTouchesInView = false - pinchRecognizer.delegate = self + pinchRecognizer.delegate = self.wrappedGestureRecognizerDelegate self.view.addGestureRecognizer(pinchRecognizer) } diff --git a/submodules/TranslateUI/Sources/TranslateScreen.swift b/submodules/TranslateUI/Sources/TranslateScreen.swift index 94f61b42ae..477f9d4014 100644 --- a/submodules/TranslateUI/Sources/TranslateScreen.swift +++ b/submodules/TranslateUI/Sources/TranslateScreen.swift @@ -506,7 +506,7 @@ private final class TranslateScreenComponent: CombinedComponent { } public class TranslateScreen: ViewController { - final class Node: ViewControllerTracingNode, UIScrollViewDelegate, UIGestureRecognizerDelegate { + final class Node: ViewControllerTracingNode, ASScrollViewDelegate, ASGestureRecognizerDelegate { private var presentationData: PresentationData private weak var controller: TranslateScreen? @@ -549,7 +549,7 @@ public class TranslateScreen: ViewController { super.init() - self.scrollView.delegate = self + self.scrollView.delegate = self.wrappedScrollViewDelegate self.scrollView.showsVerticalScrollIndicator = false self.containerView.clipsToBounds = true @@ -567,7 +567,7 @@ public class TranslateScreen: ViewController { super.didLoad() let panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))) - panRecognizer.delegate = self + panRecognizer.delegate = self.wrappedGestureRecognizerDelegate panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.panGestureRecognizer = panRecognizer diff --git a/submodules/WebUI/Sources/WebAppController.swift b/submodules/WebUI/Sources/WebAppController.swift index e44c6412ab..24b963a7ba 100644 --- a/submodules/WebUI/Sources/WebAppController.swift +++ b/submodules/WebUI/Sources/WebAppController.swift @@ -263,7 +263,7 @@ public final class WebAppController: ViewController, AttachmentContainable { public var isContainerPanning: () -> Bool = { return false } public var isContainerExpanded: () -> Bool = { return false } - fileprivate class Node: ViewControllerTracingNode, WKNavigationDelegate, WKUIDelegate, UIScrollViewDelegate { + fileprivate class Node: ViewControllerTracingNode, WKNavigationDelegate, WKUIDelegate, ASScrollViewDelegate { private weak var controller: WebAppController? private let backgroundNode: ASDisplayNode @@ -321,7 +321,7 @@ public final class WebAppController: ViewController, AttachmentContainable { webView.alpha = 0.0 webView.navigationDelegate = self webView.uiDelegate = self - webView.scrollView.delegate = self + webView.scrollView.delegate = self.wrappedScrollViewDelegate webView.addObserver(self, forKeyPath: #keyPath(WKWebView.estimatedProgress), options: [], context: nil) webView.tintColor = self.presentationData.theme.rootController.tabBar.iconColor webView.handleScriptMessage = { [weak self] message in diff --git a/submodules/WebUI/Sources/WebAppTermsAlertController.swift b/submodules/WebUI/Sources/WebAppTermsAlertController.swift index 2151785cc6..88f3a71776 100644 --- a/submodules/WebUI/Sources/WebAppTermsAlertController.swift +++ b/submodules/WebUI/Sources/WebAppTermsAlertController.swift @@ -21,7 +21,7 @@ private func formattedText(_ text: String, fontSize: CGFloat, color: UIColor, li return parseMarkdownIntoAttributedString(text, attributes: MarkdownAttributes(body: MarkdownAttributeSet(font: Font.regular(fontSize), textColor: color), bold: MarkdownAttributeSet(font: Font.semibold(fontSize), textColor: color), link: MarkdownAttributeSet(font: Font.regular(fontSize), textColor: linkColor), linkAttribute: { _ in return (TelegramTextAttributes.URL, "") }), textAlignment: textAlignment) } -private final class WebAppTermsAlertContentNode: AlertContentNode, UIGestureRecognizerDelegate { +private final class WebAppTermsAlertContentNode: AlertContentNode, ASGestureRecognizerDelegate { private let strings: PresentationStrings private let title: String private let text: String @@ -144,7 +144,7 @@ private final class WebAppTermsAlertContentNode: AlertContentNode, UIGestureReco super.didLoad() let tapGesture = UITapGestureRecognizer(target: self, action: #selector(self.acceptTap(_:))) - tapGesture.delegate = self + tapGesture.delegate = self.wrappedGestureRecognizerDelegate self.view.addGestureRecognizer(tapGesture) if let firstAction = self.actionNodes.first {