diff --git a/submodules/Display/Source/Navigation/NavigationModalContainer.swift b/submodules/Display/Source/Navigation/NavigationModalContainer.swift index 0b06f95718..a21bcd1991 100644 --- a/submodules/Display/Source/Navigation/NavigationModalContainer.swift +++ b/submodules/Display/Source/Navigation/NavigationModalContainer.swift @@ -189,12 +189,12 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes @objc func dimTapGesture(_ recognizer: UITapGestureRecognizer) { if case .ended = recognizer.state { if !self.isDismissed { - self.dismisWithAnimation() + self.dismissWithAnimation() } } } - private func dismisWithAnimation() { + private func dismissWithAnimation() { let scrollView = self.scrollNode.view let targetOffset: CGFloat let duration = 0.3 diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatController.swift index 243ea0d011..0249fd635b 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatController.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatController.swift @@ -1038,6 +1038,9 @@ public final class VoiceChatController: ViewController { override func didLoad() { super.didLoad() + self.view.disablesInteractiveTransitionGestureRecognizer = true + self.view.disablesInteractiveModalDismiss = true + self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) let longTapRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(self.actionButtonPressGesture(_:))) @@ -1049,17 +1052,6 @@ public final class VoiceChatController: ViewController { panRecognizer.delegate = self panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true -// panRecognizer.shouldBegin = { [weak self] point in -// guard let strongSelf = self else { -// return false -// } -// if strongSelf.topPanelNode.bounds.contains(strongSelf.view.convert(point, to: strongSelf.topPanelNode.view)) { -// if strongSelf.topPanelNode.frame.maxY <= strongSelf.listNode.frame.minY { -// return true -// } -// } -// return false -// } self.view.addGestureRecognizer(panRecognizer) }