Merge commit '3e88d177fdf5ab512f10f5e38b016b0fd8b7119d'

This commit is contained in:
Ali
2020-08-21 21:13:38 +01:00
103 changed files with 2097 additions and 601 deletions

View File

@@ -1024,8 +1024,10 @@ final class CallControllerNode: ViewControllerTracingNode, CallControllerNodePro
self.updateButtonsMode()
self.updateDimVisibility()
if self.incomingVideoViewRequested && self.outgoingVideoViewRequested {
self.displayedCameraTooltip = true
if self.incomingVideoViewRequested || self.outgoingVideoViewRequested {
if self.incomingVideoViewRequested && self.outgoingVideoViewRequested {
self.displayedCameraTooltip = true
}
self.displayedCameraConfirmation = true
}
if self.incomingVideoViewRequested && !self.outgoingVideoViewRequested && !self.displayedCameraTooltip && (self.toastContent?.isEmpty ?? true) {
@@ -1331,6 +1333,10 @@ final class CallControllerNode: ViewControllerTracingNode, CallControllerNodePro
isCompactLayout = false
}
if !self.hasVideoNodes {
self.isUIHidden = false
}
var isUIHidden = self.isUIHidden
switch self.callState?.state {
case .terminated, .terminating:
@@ -1639,9 +1645,9 @@ final class CallControllerNode: ViewControllerTracingNode, CallControllerNodePro
} else if let _ = self.keyPreviewNode {
self.backPressed()
} else {
if let expandedVideoNode = self.expandedVideoNode, let minimizedVideoNode = self.minimizedVideoNode {
if self.hasVideoNodes {
let point = recognizer.location(in: recognizer.view)
if minimizedVideoNode.frame.contains(point) {
if let expandedVideoNode = self.expandedVideoNode, let minimizedVideoNode = self.minimizedVideoNode, minimizedVideoNode.frame.contains(point) {
if !self.areUserActionsDisabledNow() {
let copyView = minimizedVideoNode.view.snapshotView(afterScreenUpdates: false)
copyView?.frame = minimizedVideoNode.frame