Merge commit '02181ead9e59984f4d348003a96e6dee63126c50'

Author: Isaac

submodules/Camera/Sources/CameraUtils.swift

@@ -188,16 +188,26 @@ extension CameraPreviewView.Rotation {
     }
 }
 
-func exifOrientationForDeviceOrientation(_ deviceOrientation: UIDeviceOrientation) -> CGImagePropertyOrientation {
-    switch deviceOrientation {
-    case .portraitUpsideDown:
-        return .rightMirrored
-    case .landscapeLeft:
-        return .downMirrored
-    case .landscapeRight:
-        return .upMirrored
-    default:
-        return .leftMirrored
+func exifOrientation(for orientation: AVCaptureVideoOrientation, mirror: Bool) -> Int32 {
+    switch (orientation, mirror) {
+    case (.portrait, false):
+        return 6
+    case (.portrait, true):
+        return 5
+    case (.portraitUpsideDown, false):
+        return 8
+    case (.portraitUpsideDown, true):
+        return 7
+    case (.landscapeLeft, false):
+        return 3
+    case (.landscapeLeft, true):
+        return 2
+    case (.landscapeRight, false):
+        return 1
+    case (.landscapeRight, true):
+        return 4
+    @unknown default:
+        return 6
     }
 }
 

submodules/Camera/Sources/PhotoCaptureContext.swift

@@ -58,36 +58,16 @@ final class PhotoCaptureContext: NSObject, AVCapturePhotoCaptureDelegate {
                 print("Error occurred while capturing photo: Missing pixel buffer (\(String(describing: error)))")
                 return
             }
-            
-            var photoFormatDescription: CMFormatDescription?
-            CMVideoFormatDescriptionCreateForImageBuffer(allocator: kCFAllocatorDefault, imageBuffer: photoPixelBuffer, formatDescriptionOut: &photoFormatDescription)
-            
-            var orientation: UIImage.Orientation = .right
-            if self.orientation == .landscapeLeft {
-                orientation = .down
-            } else if self.orientation == .landscapeRight {
-                orientation = .up
-            } else if self.orientation == .portraitUpsideDown {
-                orientation = .left
-            }
-            
-            let finalPixelBuffer = photoPixelBuffer
-            let renderedCIImage = CIImage(cvImageBuffer: finalPixelBuffer)
-            if let cgImage = self.ciContext.createCGImage(renderedCIImage, from: renderedCIImage.extent)  {
-                var image = UIImage(cgImage: cgImage, scale: 1.0, orientation: orientation)
-                if image.imageOrientation != .up {
-                    UIGraphicsBeginImageContextWithOptions(image.size, true, image.scale)
-                    if self.mirror, let context = UIGraphicsGetCurrentContext() {
-                        context.translateBy(x: image.size.width / 2.0, y: image.size.height / 2.0)
-                        context.scaleBy(x: -1.0, y: 1.0)
-                        context.translateBy(x: -image.size.width / 2.0, y: -image.size.height / 2.0)
-                    }
-                    image.draw(in: CGRect(origin: .zero, size: image.size))
-                    if let currentImage = UIGraphicsGetImageFromCurrentImageContext() {
-                        image = currentImage
-                    }
-                    UIGraphicsEndImageContext()
-                }
+                        
+            //if let value = photo.metadata[kCGImagePropertyOrientation as String] as? NSNumber {
+            //    orientation = value.int32Value
+            //} else {
+            let orientation = exifOrientation(for: self.orientation, mirror: self.mirror)
+            //}
+
+            let ci = CIImage(cvImageBuffer: photoPixelBuffer).oriented(forExifOrientation: orientation)
+            if let cgImage = self.ciContext.createCGImage(ci, from: ci.extent) {
+                let image = UIImage(cgImage: cgImage, scale: 1.0, orientation: .up)
                 self.pipe.putNext(.finished(image, nil, CACurrentMediaTime()))
             } else {
                 self.pipe.putNext(.failed)

submodules/TelegramCallsUI/Sources/CallStatusBarNode.swift

@@ -268,7 +268,8 @@ public class CallStatusBarNodeImpl: CallStatusBarNode {
         self.update()
     }
 
-    private let textFont = Font.with(size: 13.0, design: .regular, weight: .regular, traits: [.monospacedNumbers])
+    private let callTextFont = Font.with(size: 13.0, design: .regular, weight: .regular, traits: [.monospacedNumbers])
+    private let groupCallTextFont = Font.with(size: 13.0, design: .regular, weight: .regular, traits: [])
 
     private func update() {
         guard let size = self.currentSize, let content = self.currentContent else {
@@ -277,12 +278,15 @@ public class CallStatusBarNodeImpl: CallStatusBarNode {
 
         let wasEmpty = (self.titleNode.attributedText?.string ?? "").isEmpty
 
+        let textFont: UIFont
         let setupDataForCall: AnyObject?
         switch content {
         case let .call(_, _, call):
             setupDataForCall = call
+            textFont = callTextFont
         case let .groupCall(_, _, call):
             setupDataForCall = call
+            textFont = groupCallTextFont
         }
 
         if self.didSetupDataForCall !== setupDataForCall {
@@ -540,7 +544,11 @@ public class CallStatusBarNodeImpl: CallStatusBarNode {
         let subtitleSize = self.subtitleNode.updateLayout(size: CGSize(width: 150.0, height: size.height), animated: true)
         let speakerSize = self.speakerNode.updateLayout(CGSize(width: 150.0, height: size.height))
 
-        let totalWidth = titleSize.width + spacing + subtitleSize.width
+        var totalWidth = titleSize.width
+        if totalWidth > 0.0 {
+            totalWidth += spacing
+        }
+        totalWidth += subtitleSize.width
         let horizontalOrigin: CGFloat = floor((size.width - totalWidth) / 2.0)
 
         let contentHeight: CGFloat = 24.0
@@ -553,7 +561,8 @@ public class CallStatusBarNodeImpl: CallStatusBarNode {
         transition.updateFrame(node: self.subtitleNode, frame: CGRect(origin: CGPoint(x: horizontalOrigin + titleSize.width + spacing, y: verticalOrigin + floor((contentHeight - subtitleSize.height) / 2.0)), size: subtitleSize))
 
         if displaySpeakerSubtitle {
-            self.speakerNode.frame = CGRect(origin: CGPoint(x: horizontalOrigin + titleSize.width + spacing, y: verticalOrigin + floor((contentHeight - speakerSize.height) / 2.0)), size: speakerSize)
+            let speakerOriginX: CGFloat = title.isEmpty ? floor((size.width - speakerSize.width) / 2.0) : horizontalOrigin + titleSize.width + spacing
+            self.speakerNode.frame = CGRect(origin: CGPoint(x: speakerOriginX, y: verticalOrigin + floor((contentHeight - speakerSize.height) / 2.0)), size: speakerSize)
         }
 
         let state: CallStatusBarBackgroundNode.State

submodules/TelegramCallsUI/Sources/Components/MessageItemComponent.swift

@@ -91,6 +91,7 @@ final class MessageItemComponent: Component {
             self.background = GlassBackgroundView()
 
             self.avatarNode = AvatarNode(font: avatarPlaceholderFont(size: 12.0))
+            self.avatarNode.hitTestSlop = UIEdgeInsets(top: -5.0, left: -5.0, bottom: -5.0, right: -8.0)
 
             self.icon = ComponentView()
             self.text = ComponentView()
@@ -156,19 +157,7 @@ final class MessageItemComponent: Component {
             transition.animateAlpha(view: self.avatarNode.view, from: 0.0, to: 1.0)
             transition.animateScale(view: self.avatarNode.view, from: 0.01, to: 1.0)
         }
-        
-        override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
-            if !self.avatarNode.isHidden, self.avatarNode.frame.contains(point) {
-                return true
-            }
-            if let textView = self.text.view as? MultilineTextWithEntitiesComponent.View, let (_, attributes) = textView.attributes(at: self.convert(point, to: textView)) {
-                if let _ = attributes[NSAttributedString.Key(rawValue: TelegramTextAttributes.Spoiler)], textView.isSpoilerConcealed {
-                    return true
-                }
-            }
-            return false
-        }
-        
+                
         func update(component: MessageItemComponent, availableSize: CGSize, state: EmptyComponentState, environment: Environment<Empty>, transition: ComponentTransition) -> CGSize {
             let isFirstTime = self.component == nil
             var transition = transition
@@ -207,6 +196,7 @@ final class MessageItemComponent: Component {
 
             let text = component.text
             var entities = component.entities
+            
             if let cachedEntities = self.cachedEntities {
                 entities = cachedEntities
             } else if let availableReactions = component.availableReactions, text.count == 1 {
@@ -223,6 +213,21 @@ final class MessageItemComponent: Component {
                     entities.insert(MessageTextEntity(range: 0 ..< (text as NSString).length, type: .CustomEmoji(stickerPack: nil, fileId: item.file.fileId.id)), at: 0)
                     self.cachedEntities = entities
                 }
+            } else {
+                entities = entities.filter { entity in
+                    switch entity.type {
+                    case .Bold, .Italic, .Strikethrough, .Underline, .Spoiler:
+                        return true
+                    case .CustomEmoji:
+                        if case let .peer(peer) = component.icon, peer.isPremium {
+                            return true
+                        }
+                        return false
+                    default:
+                        return false
+                    }
+                }
+                self.cachedEntities = entities
             }
 
             let attributedText: NSAttributedString
@@ -263,7 +268,7 @@ final class MessageItemComponent: Component {
                     placeholderColor: UIColor(rgb: 0xffffff, alpha: 0.3),
                     text: .plain(attributedText),
                     maximumNumberOfLines: 0,
-                    lineSpacing: 0.0,
+                    lineSpacing: 0.1,
                     spoilerColor: .white,
                     handleSpoilers: true
                 )),

submodules/TelegramCallsUI/Sources/VideoChatScreen.swift

@@ -482,6 +482,19 @@ final class VideoChatScreenComponent: Component {
             return result
         }
 
+        override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+            if let gestureRecognizer = gestureRecognizer as? UIPanGestureRecognizer {
+                let location = gestureRecognizer.location(in: self)
+                if let inputPanelView = self.inputPanel.view {
+                    let mappedLocation = self.convert(location, to: inputPanelView)
+                    if inputPanelView.bounds.contains(mappedLocation) {
+                        return false
+                    }
+                }
+            }
+            return true
+        }
+        
         @objc func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRequireFailureOf otherGestureRecognizer: UIGestureRecognizer) -> Bool {
             if gestureRecognizer is UITapGestureRecognizer {
                 if otherGestureRecognizer is UIPanGestureRecognizer {
@@ -751,7 +764,7 @@ final class VideoChatScreenComponent: Component {
                             switch result {
                             case .linkCopied:
                                 let presentationData = groupCall.accountContext.sharedContext.currentPresentationData.with { $0 }
-                                self.presentToast(icon: .icon("anim_linkcopied"), text: presentationData.strings.CallList_ToastCallLinkCopied_Text, duration: 3)
+                                self.presentToast(icon: .animation("anim_linkcopied"), text: presentationData.strings.CallList_ToastCallLinkCopied_Text, duration: 3)
                             case .openCall:
                                 break
                             }
@@ -838,15 +851,15 @@ final class VideoChatScreenComponent: Component {
                             } else {
                                 text = ""
                             }
-                            self.presentToast(icon: .icon(isSavedMessages ? "anim_savedmessages" : "anim_forward"), text: text, duration: 3)
+                            self.presentToast(icon: .animation(isSavedMessages ? "anim_savedmessages" : "anim_forward"), text: text, duration: 3)
                         })
                     }
                     shareController.actionCompleted = { [weak self] in
                         guard let self, let environment = self.environment, case let .group(groupCall) = self.currentCall else {
                             return
                         }
                         let presentationData = groupCall.accountContext.sharedContext.currentPresentationData.with({ $0 }).withUpdated(theme: environment.theme)
-                        self.presentToast(icon: .icon("anim_linkcopied"), text: presentationData.strings.VoiceChat_InviteLinkCopiedText, duration: 3)
+                        self.presentToast(icon: .animation("anim_linkcopied"), text: presentationData.strings.VoiceChat_InviteLinkCopiedText, duration: 3)
                     }
                     environment.controller()?.present(shareController, in: .window(.root))
                 })
@@ -889,15 +902,15 @@ final class VideoChatScreenComponent: Component {
                         } else {
                             text = ""
                         }
-                        self.presentToast(icon: .icon(isSavedMessages ? "anim_savedmessages" : "anim_forward"), text: text, duration: 3)
+                        self.presentToast(icon: .animation(isSavedMessages ? "anim_savedmessages" : "anim_forward"), text: text, duration: 3)
                     })
                 }
                 shareController.actionCompleted = { [weak self] in
                     guard let self, let environment = self.environment, case let .group(groupCall) = self.currentCall else {
                         return
                     }
                     let presentationData = groupCall.accountContext.sharedContext.currentPresentationData.with({ $0 }).withUpdated(theme: environment.theme)
-                    self.presentToast(icon: .icon("anim_linkcopied"), text: presentationData.strings.VoiceChat_InviteLinkCopiedText, duration: 3)
+                    self.presentToast(icon: .animation("anim_linkcopied"), text: presentationData.strings.VoiceChat_InviteLinkCopiedText, duration: 3)
                 }
                 environment.controller()?.present(shareController, in: .window(.root))
             }
@@ -2472,10 +2485,17 @@ final class VideoChatScreenComponent: Component {
                 areButtonsCollapsed = true
                 areButtonsActuallyCollapsed = false
 
-                mainColumnWidth = min(isLandscape ? 356.0 : 320.0, availableSize.width - leftInset - rightInset - 340.0)
+                let landscapeColumnWidth: CGFloat
+                if environment.metrics.isTablet {
+                    landscapeColumnWidth = 356.0
+                } else {
+                    landscapeColumnWidth = 340.0
+                }
+                
+                mainColumnWidth = min(isLandscape ? landscapeColumnWidth : 320.0, availableSize.width - leftInset - rightInset - 340.0)
                 mainColumnSideInset = 0.0
             } else {
-                areButtonsCollapsed = true //self.expandedParticipantsVideoState != nil
+                areButtonsCollapsed = true
                 areButtonsActuallyCollapsed = self.expandedParticipantsVideoState != nil
 
                 if availableSize.width > maxSingleColumnWidth {
@@ -2692,7 +2712,7 @@ final class VideoChatScreenComponent: Component {
             if buttonsOnTheSide {
                 collapsedParticipantsClippingY = availableSize.height
             } else {
-                collapsedParticipantsClippingY = collapsedMicrophoneButtonFrame.minY - 16.0
+                collapsedParticipantsClippingY = expandedMicrophoneButtonFrame.minY - 70.0
             }
 
             let expandedParticipantsClippingY: CGFloat
@@ -2703,7 +2723,7 @@ final class VideoChatScreenComponent: Component {
                     expandedParticipantsClippingY = availableSize.height - max(14.0, environment.safeInsets.bottom)
                 }
             } else {
-                expandedParticipantsClippingY = expandedMicrophoneButtonFrame.minY - 24.0
+                expandedParticipantsClippingY = expandedMicrophoneButtonFrame.minY - 28.0
             }
 
 
@@ -3429,7 +3449,7 @@ final class VideoChatScreenComponent: Component {
                     )
 
                     let availableInputMediaWidth = availableSize.width
-                    let heightAndOverflow = inputMediaNode.updateLayout(width: availableInputMediaWidth, leftInset: 0.0, rightInset: 0.0, bottomInset: environment.safeInsets.bottom, standardInputHeight: environment.deviceMetrics.standardInputHeight(inLandscape: false), inputHeight: environment.inputHeight, maximumHeight: availableSize.height, inputPanelHeight: 0.0, transition: .immediate, interfaceState: presentationInterfaceState, layoutMetrics: environment.metrics, deviceMetrics: environment.deviceMetrics, isVisible: true, isExpanded: false)
+                    let heightAndOverflow = inputMediaNode.updateLayout(width: availableInputMediaWidth, leftInset: environment.safeInsets.left, rightInset: environment.safeInsets.right, bottomInset: environment.safeInsets.bottom, standardInputHeight: environment.deviceMetrics.standardInputHeight(inLandscape: false), inputHeight: environment.inputHeight, maximumHeight: availableSize.height, inputPanelHeight: 0.0, transition: .immediate, interfaceState: presentationInterfaceState, layoutMetrics: environment.metrics, deviceMetrics: environment.deviceMetrics, isVisible: true, isExpanded: false)
                     let inputNodeHeight = heightAndOverflow.0
                     let inputNodeFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((availableSize.width - availableInputMediaWidth) / 2.0), y: availableSize.height - inputNodeHeight), size: CGSize(width: availableInputMediaWidth, height: inputNodeHeight))
                     transition.setFrame(layer: inputMediaNode.layer, frame: inputNodeFrame)
@@ -3499,7 +3519,7 @@ final class VideoChatScreenComponent: Component {
                         placeholder: .plain(environment.strings.VoiceChat_MessagePlaceholder),
                         sendPaidMessageStars: nil,
                         maxLength: characterLimit,
-                        queryTypes: [.mention, .hashtag],
+                        queryTypes: [],
                         alwaysDarkWhenHasText: false,
                         useGrayBackground: false,
                         resetInputContents: nil,
@@ -3609,6 +3629,7 @@ final class VideoChatScreenComponent: Component {
                 }
                 let inputPanelFrame = CGRect(origin: CGPoint(x: inputPanelOriginX, y: availableSize.height - inputPanelBottomInset - inputPanelSize.height - 3.0), size: inputPanelSize)
                 if let inputPanelView = self.inputPanel.view {
+                    inputPanelView.disablesInteractiveKeyboardGestureRecognizer = true
                     if inputPanelView.superview == nil {
                         self.containerView.addSubview(inputPanelView)
                     }