Merge commit '3778357baa5dab114c14f7dfe5fc9aaeb835cff5'

# Conflicts:
#	Telegram/Telegram-iOS/en.lproj/Localizable.strings

Author: Isaac

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -13300,6 +13300,19 @@ Sorry for the inconvenience.";
 
 "Notification.Gift" = "Gift";
 
+"WebBrowser.PassExistsError" = "This pass is already added to Wallet.";
+
+"Chat.VideoProcessingInfo" = "The video will be published once converted and optimized.";
+
+"Camera.CollageManagementTooltip" = "Tap a tile to delete or reorder it.";
+"Camera.CollageReorderingInfo" = "Hold and drag tiles to reorder them.";
+
+"MediaPicker.InvertCaptionTooltip" = "Tap here to move caption up.";
+"MediaPicker.InvertCaption.Updated.Up.Title" = "Caption moved up";
+"MediaPicker.InvertCaption.Updated.Up.Text" = "Text will be shown above the media.";
+"MediaPicker.InvertCaption.Updated.Down.Title" = "Caption moved down";
+"MediaPicker.InvertCaption.Updated.Down.Text" = "Text will be shown below the media.";
+
 "AffiliateSetup.AlertTerminate.Title" = "Warning";
 "AffiliateSetup.AlertTerminate.Text" = "If you end your affiliate program:\n\n• Any referral links already shared will be disabled in 24 hours.\n\n• All participating affiliates will be notified.\n\n• You will be able to start a new affiliate program only in 24 hours.";
 "AffiliateSetup.AlertTerminate.Action" = "End Anyway";

submodules/BrowserUI/Sources/BrowserWebContent.swift

@@ -896,8 +896,7 @@ final class BrowserWebContent: UIView, BrowserContent, WKNavigationDelegate, WKU
                 if let data = try? Data(contentsOf: url), let pass = try? PKPass(data: data) {
                     let passLibrary = PKPassLibrary()
                     if passLibrary.containsPass(pass) {
-                        //TODO:localize
-                        let alertController = textAlertController(context: self.context, updatedPresentationData: nil, title: nil, text: "This pass is already added to Wallet.", actions: [TextAlertAction(type: .genericAction, title: self.presentationData.strings.Common_OK, action: {})])
+                        let alertController = textAlertController(context: self.context, updatedPresentationData: nil, title: nil, text: self.presentationData.strings.WebBrowser_PassExistsError, actions: [TextAlertAction(type: .genericAction, title: self.presentationData.strings.Common_OK, action: {})])
                         self.present(alertController, nil)
                     } else if let controller = PKAddPassesViewController(pass: pass) {
                         self.getNavigationController()?.view.window?.rootViewController?.present(controller, animated: true)

submodules/ContextUI/Sources/ContextActionsContainerNode.swift

@@ -438,21 +438,21 @@ final class InnerTextSelectionTipContainerNode: ASDisplayNode {
             icon = nil
             isUserInteractionEnabled = action != nil
         case let .starsReactions(topCount):
+            //TODO:localize
             self.action = nil
             self.text = "Send \(topCount) or more to highlight your profile"
             self.targetSelectionIndex = nil
             icon = nil
             isUserInteractionEnabled = action != nil
         case .videoProcessing:
             self.action = nil
-            self.text = "The video will be published once converted and optimized."
+            self.text = self.presentationData.strings.Chat_VideoProcessingInfo
             self.targetSelectionIndex = nil
             icon = nil
             isUserInteractionEnabled = action != nil
         case .collageReordering:
-            //TODO:localize
             self.action = nil
-            self.text = "Hold and drag tiles to reorder them."
+            self.text = self.presentationData.strings.Camera_CollageReorderingInfo
             self.targetSelectionIndex = nil
             icon = UIImage(bundleImageName: "Chat/Context Menu/Tip")
         }

submodules/TelegramNotices/Sources/Notices.swift

@@ -199,6 +199,7 @@ private enum ApplicationSpecificGlobalNotice: Int32 {
     case dismissedBusinessIntroBadge = 72
     case dismissedBusinessLinksBadge = 73
     case dismissedBusinessChatbotsBadge = 74
+    case captionAboveMediaTooltip = 75
 
     var key: ValueBoxKey {
         let v = ValueBoxKey(length: 4)
@@ -534,6 +535,10 @@ private struct ApplicationSpecificNoticeKeys {
     static func dismissedBusinessChatbotsBadge() -> NoticeEntryKey {
         return NoticeEntryKey(namespace: noticeNamespace(namespace: globalNamespace), key: ApplicationSpecificGlobalNotice.dismissedBusinessChatbotsBadge.key)
     }
+    
+    static func captionAboveMediaTooltip() -> NoticeEntryKey {
+        return NoticeEntryKey(namespace: noticeNamespace(namespace: globalNamespace), key: ApplicationSpecificGlobalNotice.captionAboveMediaTooltip.key)
+    }
 }
 
 public struct ApplicationSpecificNotice {
@@ -2246,4 +2251,31 @@ public struct ApplicationSpecificNotice {
         }
         |> take(1)
     }
+    
+    public static func getCaptionAboveMediaTooltip(accountManager: AccountManager<TelegramAccountManagerTypes>) -> Signal<Int32, NoError> {
+        return accountManager.transaction { transaction -> Int32 in
+            if let value = transaction.getNotice(ApplicationSpecificNoticeKeys.captionAboveMediaTooltip())?.get(ApplicationSpecificCounterNotice.self) {
+                return value.value
+            } else {
+                return 0
+            }
+        }
+    }
+    
+    public static func incrementCaptionAboveMediaTooltip(accountManager: AccountManager<TelegramAccountManagerTypes>, count: Int = 1) -> Signal<Int, NoError> {
+        return accountManager.transaction { transaction -> Int in
+            var currentValue: Int32 = 0
+            if let value = transaction.getNotice(ApplicationSpecificNoticeKeys.captionAboveMediaTooltip())?.get(ApplicationSpecificCounterNotice.self) {
+                currentValue = value.value
+            }
+            let previousValue = currentValue
+            currentValue += Int32(count)
+
+            if let entry = CodableEntry(ApplicationSpecificCounterNotice(value: currentValue)) {
+                transaction.setNotice(ApplicationSpecificNoticeKeys.captionAboveMediaTooltip(), entry)
+            }
+            
+            return Int(previousValue)
+        }
+    }
 }

submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift

@@ -568,19 +568,33 @@ private final class CameraScreenComponent: CombinedComponent {
         }
 
         func toggleCollageCamera() {
-            guard let controller = self.getController(), let _ = controller.camera else {
+            guard let controller = self.getController(), let camera = controller.camera else {
+                return
+            }
+            let currentTimestamp = CACurrentMediaTime()
+            if let lastDualCameraTimestamp = self.lastDualCameraTimestamp, currentTimestamp - lastDualCameraTimestamp < 1.5 {
                 return
             }
+            if let lastFlipTimestamp = self.lastFlipTimestamp, currentTimestamp - lastFlipTimestamp < 1.0 {
+                return
+            }
+            self.lastDualCameraTimestamp = currentTimestamp
 
             controller.node.dismissAllTooltips()
 
+            if controller.cameraState.isDualCameraEnabled {
+                camera.setDualCameraEnabled(false)
+            }
+            
             if controller.cameraState.isCollageEnabled {
                 self.displayingCollageSelection = !self.displayingCollageSelection
                 self.updated(transition: .spring(duration: 0.3))
             } else {
                 let isEnabled = !controller.cameraState.isCollageEnabled
                 self.displayingCollageSelection = isEnabled
-                controller.updateCameraState({ $0.updatedIsCollageEnabled(isEnabled).updatedCollageProgress(0.0) }, transition: .spring(duration: 0.3))
+                controller.updateCameraState({
+                    $0.updatedIsCollageEnabled(isEnabled).updatedCollageProgress(0.0).updatedIsDualCameraEnabled(false)
+                }, transition: .spring(duration: 0.3))
             }
             self.hapticFeedback.impact(.light)
         }
@@ -635,9 +649,8 @@ private final class CameraScreenComponent: CombinedComponent {
                 self.displayingCollageSelection = false
                 self.updated(transition: .spring(duration: 0.3))
 
-                //TODO:localize
                 let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
-                let tooltipController = UndoOverlayController(presentationData: presentationData, content: .info(title: nil, text: "Tap a tile to delete or reorder it.", timeout: 3.0, customUndoText: nil), elevatedLayout: false, action: { _ in
+                let tooltipController = UndoOverlayController(presentationData: presentationData, content: .info(title: nil, text: presentationData.strings.Camera_CollageManagementTooltip, timeout: 2.0, customUndoText: nil), elevatedLayout: false, action: { _ in
                     return true
                 })
                 controller.present(tooltipController, in: .current)
@@ -1279,68 +1292,66 @@ private final class CameraScreenComponent: CombinedComponent {
                             nextButtonX -= dualButton.size.width + 16.0
                         }
 
-                        if !component.cameraState.isDualCameraEnabled {
-                            let collageButton = collageButton.update(
-                                component: CameraButton(
-                                    content: AnyComponentWithIdentity(
-                                        id: "collage",
-                                        component: AnyComponent(
-                                            CollageIconComponent(
-                                                grid: component.cameraState.collageGrid,
-                                                crossed: false,
-                                                isSelected: component.cameraState.isCollageEnabled,
-                                                tintColor: controlsTintColor
-                                            )
+                        let collageButton = collageButton.update(
+                            component: CameraButton(
+                                content: AnyComponentWithIdentity(
+                                    id: "collage",
+                                    component: AnyComponent(
+                                        CollageIconComponent(
+                                            grid: component.cameraState.collageGrid,
+                                            crossed: false,
+                                            isSelected: component.cameraState.isCollageEnabled,
+                                            tintColor: controlsTintColor
                                         )
-                                    ),
-                                    action: { [weak state] in
-                                        if let state {
-                                            state.toggleCollageCamera()
-                                        }
+                                    )
+                                ),
+                                action: { [weak state] in
+                                    if let state {
+                                        state.toggleCollageCamera()
                                     }
-                                ).tagged(collageButtonTag),
-                                availableSize: CGSize(width: 40.0, height: 40.0),
+                                }
+                            ).tagged(collageButtonTag),
+                            availableSize: CGSize(width: 40.0, height: 40.0),
+                            transition: .immediate
+                        )
+                        var collageButtonX = nextButtonX
+                        if rightMostButtonWidth.isZero {
+                            collageButtonX = availableSize.width - topControlInset - collageButton.size.width / 2.0 - 5.0
+                        }
+                        context.add(collageButton
+                            .position(CGPoint(x: collageButtonX, y: max(environment.statusBarHeight + 5.0, environment.safeInsets.top + topControlInset) + collageButton.size.height / 2.0 + 2.0))
+                            .appear(.default(scale: true))
+                            .disappear(.default(scale: true))
+                            .shadow(Shadow(color: UIColor(white: 0.0, alpha: 0.25), radius: 3.0, offset: .zero))
+                        )
+                        nextButtonX -= collageButton.size.width
+                        
+                        if state.displayingCollageSelection {
+                            let collageCarousel = collageCarousel.update(
+                                component: CollageIconCarouselComponent(
+                                    grids: collageGrids.filter { $0 != component.cameraState.collageGrid },
+                                    selected: { [weak state] grid in
+                                        state?.updateCollageGrid(grid)
+                                    }
+                                ),
+                                availableSize: CGSize(width: nextButtonX + 4.0, height: 40.0),
                                 transition: .immediate
                             )
-                            var collageButtonX = nextButtonX
-                            if rightMostButtonWidth.isZero {
-                                collageButtonX = availableSize.width - topControlInset - collageButton.size.width / 2.0 - 5.0
-                            }
-                            context.add(collageButton
-                                .position(CGPoint(x: collageButtonX, y: max(environment.statusBarHeight + 5.0, environment.safeInsets.top + topControlInset) + collageButton.size.height / 2.0 + 2.0))
-                                .appear(.default(scale: true))
-                                .disappear(.default(scale: true))
-                                .shadow(Shadow(color: UIColor(white: 0.0, alpha: 0.25), radius: 3.0, offset: .zero))
+                            context.add(collageCarousel
+                                .position(CGPoint(x: collageCarousel.size.width / 2.0, y: max(environment.statusBarHeight + 5.0, environment.safeInsets.top + topControlInset) + collageCarousel.size.height / 2.0 + 2.0))
+                                .appear(ComponentTransition.Appear({ _, view, transition in
+                                    if let view = view as? CollageIconCarouselComponent.View, !transition.animation.isImmediate {
+                                        view.animateIn()
+                                    }
+                                }))
+                                .disappear(ComponentTransition.Disappear({ view, transition, completion in
+                                    if let view = view as? CollageIconCarouselComponent.View, !transition.animation.isImmediate {
+                                        view.animateOut(completion: completion)
+                                    } else {
+                                        completion()
+                                    }
+                                }))
                             )
-                            nextButtonX -= collageButton.size.width
-                            
-                            if state.displayingCollageSelection {
-                                let collageCarousel = collageCarousel.update(
-                                    component: CollageIconCarouselComponent(
-                                        grids: collageGrids.filter { $0 != component.cameraState.collageGrid },
-                                        selected: { [weak state] grid in
-                                            state?.updateCollageGrid(grid)
-                                        }
-                                    ),
-                                    availableSize: CGSize(width: nextButtonX + 4.0, height: 40.0),
-                                    transition: .immediate
-                                )
-                                context.add(collageCarousel
-                                    .position(CGPoint(x: collageCarousel.size.width / 2.0, y: max(environment.statusBarHeight + 5.0, environment.safeInsets.top + topControlInset) + collageCarousel.size.height / 2.0 + 2.0))
-                                    .appear(ComponentTransition.Appear({ _, view, transition in
-                                        if let view = view as? CollageIconCarouselComponent.View, !transition.animation.isImmediate {
-                                            view.animateIn()
-                                        }
-                                    }))
-                                    .disappear(ComponentTransition.Disappear({ view, transition, completion in
-                                        if let view = view as? CollageIconCarouselComponent.View, !transition.animation.isImmediate {
-                                            view.animateOut(completion: completion)
-                                        } else {
-                                            completion()
-                                        }
-                                    }))
-                                )
-                            }
                         }
                     }
                 }

submodules/TelegramUI/Components/CameraScreen/Sources/CameraVideoLayer.swift

@@ -299,7 +299,7 @@ final class CameraVideoLayer: MetalEngineSubjectLayer, MetalEngineSubject {
 
             encoder.setFragmentTexture(blurredTexture, index: 0)
 
-            var brightness: Float = 0.85
+            var brightness: Float = 0.95
             var saturation: Float = 1.3
             var overlay: SIMD4<Float> = SIMD4<Float>()
             encoder.setFragmentBytes(&brightness, length: 4, index: 0)

submodules/TelegramUI/Components/LegacyMessageInputPanel/BUILD

@@ -24,6 +24,7 @@ swift_library(
         "//submodules/UndoUI",
         "//submodules/TelegramUI/Components/MessageInputPanelComponent",
         "//submodules/TelegramUI/Components/LegacyMessageInputPanelInputView",
+        "//submodules/TelegramNotices",
     ],
     visibility = [
         "//visibility:public",