ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-06 06:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-08-28 17:51:15 +04:00
parent a280d5841d
commit 73464c9098
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift
View File

@ -1422,6 +1422,7 @@ public class CameraScreen: ViewController {
self.authorizationStatusDisposables.dispose() self.authorizationStatusDisposables.dispose()
} }
private var panGestureRecognizer: UIPanGestureRecognizer?
private var pipPanGestureRecognizer: UIPanGestureRecognizer? private var pipPanGestureRecognizer: UIPanGestureRecognizer?
override func didLoad() { override func didLoad() {
super.didLoad() super.didLoad()
@ -1435,6 +1436,7 @@ public class CameraScreen: ViewController {
let panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.handlePan(_:))) let panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.handlePan(_:)))
panGestureRecognizer.delegate = self panGestureRecognizer.delegate = self
panGestureRecognizer.maximumNumberOfTouches = 1 panGestureRecognizer.maximumNumberOfTouches = 1
self.panGestureRecognizer = panGestureRecognizer
self.previewContainerView.addGestureRecognizer(panGestureRecognizer) self.previewContainerView.addGestureRecognizer(panGestureRecognizer)
let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.handleTap(_:))) let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.handleTap(_:)))
@ -1598,6 +1600,8 @@ public class CameraScreen: ViewController {
return false return false
} }
return self.additionalPreviewContainerView.frame.contains(location) return self.additionalPreviewContainerView.frame.contains(location)
} else if gestureRecognizer === self.panGestureRecognizer {
return true
} }
return self.hasAppeared return self.hasAppeared
} }
@ -1628,7 +1632,7 @@ public class CameraScreen: ViewController {
case .changed: case .changed:
if case .none = self.cameraState.recording { if case .none = self.cameraState.recording {
if case .compact = layout.metrics.widthClass { if case .compact = layout.metrics.widthClass {
if translation.x < -10.0 || self.isDismissing { if (translation.x < -10.0 || self.isDismissing) && self.hasAppeared {
self.isDismissing = true self.isDismissing = true
let transitionFraction = 1.0 - max(0.0, translation.x * -1.0) / self.frame.width let transitionFraction = 1.0 - max(0.0, translation.x * -1.0) / self.frame.width
controller.updateTransitionProgress(transitionFraction, transition: .immediate) controller.updateTransitionProgress(transitionFraction, transition: .immediate)
@ -1640,11 +1644,13 @@ public class CameraScreen: ViewController {
} }
} }
case .ended, .cancelled: case .ended, .cancelled:
if self.isDismissing {
let velocity = gestureRecognizer.velocity(in: self.view) let velocity = gestureRecognizer.velocity(in: self.view)
let transitionFraction = 1.0 - max(0.0, translation.x * -1.0) / self.frame.width let transitionFraction = 1.0 - max(0.0, translation.x * -1.0) / self.frame.width
controller.completeWithTransitionProgress(transitionFraction, velocity: abs(velocity.x), dismissing: true) controller.completeWithTransitionProgress(transitionFraction, velocity: abs(velocity.x), dismissing: true)
self.isDismissing = false self.isDismissing = false
}
default: default:
break break
} }