Various fixes

submodules/TelegramNotices/Sources/Notices.swift

@@ -1480,6 +1480,50 @@ public struct ApplicationSpecificNotice {
         |> ignoreValues
     }
     
+    public static func incrementStoriesCameraTip(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.storiesCameraTooltip())?.get(ApplicationSpecificCounterNotice.self) {
+                currentValue = value.value
+            }
+            let previousValue = currentValue
+            currentValue += Int32(count)
+
+            if let entry = CodableEntry(ApplicationSpecificCounterNotice(value: currentValue)) {
+                transaction.setNotice(ApplicationSpecificNoticeKeys.storiesCameraTooltip(), entry)
+            }
+            
+            return Int(previousValue)
+        }
+    }
+    
+    public static func getStoriesDualCameraTip(accountManager: AccountManager<TelegramAccountManagerTypes>) -> Signal<Int32, NoError> {
+        return accountManager.transaction { transaction -> Int32 in
+            if let value = transaction.getNotice(ApplicationSpecificNoticeKeys.storiesDualCameraTooltip())?.get(ApplicationSpecificCounterNotice.self) {
+                return value.value
+            } else {
+                return 0
+            }
+        }
+    }
+    
+    public static func incrementStoriesDualCameraTip(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.storiesDualCameraTooltip())?.get(ApplicationSpecificCounterNotice.self) {
+                currentValue = value.value
+            }
+            let previousValue = currentValue
+            currentValue += Int32(count)
+
+            if let entry = CodableEntry(ApplicationSpecificCounterNotice(value: currentValue)) {
+                transaction.setNotice(ApplicationSpecificNoticeKeys.storiesDualCameraTooltip(), entry)
+            }
+            
+            return Int(previousValue)
+        }
+    }
+    
     public static func reset(accountManager: AccountManager<TelegramAccountManagerTypes>) -> Signal<Void, NoError> {
         return accountManager.transaction { transaction -> Void in
         }

submodules/TelegramUI/Components/CameraScreen/BUILD

@@ -75,7 +75,8 @@ swift_library(
         "//submodules/TelegramUI/Components/MediaEditor",
         "//submodules/Components/MetalImageView",
         "//submodules/TelegramUI/Components/CameraButtonComponent",
-        "//submodules/Utils/VolumeButtons"
+        "//submodules/Utils/VolumeButtons",
+        "//submodules/TelegramNotices",
     ],
     visibility = [
         "//visibility:public",

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

@@ -20,6 +20,7 @@ import MediaEditor
 import BundleIconComponent
 import CameraButtonComponent
 import VolumeButtons
+import TelegramNotices
 
 let videoRedColor = UIColor(rgb: 0xff3b30)
 
@@ -1634,9 +1635,13 @@ public class CameraScreen: ViewController {
             let absoluteFrame = sourceView.convert(sourceView.bounds, to: nil).offsetBy(dx: -parentFrame.minX, dy: 0.0)
             let location = CGRect(origin: CGPoint(x: absoluteFrame.midX, y: absoluteFrame.maxY + 3.0), size: CGSize())
             
+            let accountManager = self.context.sharedContext.accountManager
             let tooltipController = TooltipScreen(account: self.context.account, sharedContext: self.context.sharedContext, text: .plain(text: "Enable Dual Camera Mode"), location: .point(location, .top), displayDuration: .manual(false), inset: 16.0, shouldDismissOnTouch: { _ in
                 return .ignore
             })
+            tooltipController.becameDismissed = { _ in
+                let _ = ApplicationSpecificNotice.incrementStoriesDualCameraTip(accountManager: accountManager).start()
+            }
             self.controller?.present(tooltipController, in: .current)
         }
         
@@ -1647,7 +1652,7 @@ public class CameraScreen: ViewController {
             
             let parentFrame = self.view.convert(self.bounds, to: nil)
             let absoluteFrame = sourceView.convert(sourceView.bounds, to: nil).offsetBy(dx: -parentFrame.minX, dy: 0.0)
-            let location = CGRect(origin: CGPoint(x: absoluteFrame.midX, y: absoluteFrame.minY - 1.0), size: CGSize())
+            let location = CGRect(origin: CGPoint(x: absoluteFrame.midX, y: absoluteFrame.minY + 3.0), size: CGSize())
             
             let tooltipController = TooltipScreen(account: self.context.account, sharedContext: self.context.sharedContext, text: .plain(text: "Take photos or videos to share with all\nyour contacts or close friends at once."), textAlignment: .center, location: .point(location, .bottom), displayDuration: .custom(3.0), inset: 16.0, shouldDismissOnTouch: { _ in
                 return .ignore
@@ -1655,6 +1660,32 @@ public class CameraScreen: ViewController {
             self.controller?.present(tooltipController, in: .current)
         }
         
+        func maybePresentTooltips() {
+            guard let layout = self.validLayout, case .compact = layout.metrics.widthClass else {
+                return
+            }
+            let _ = (ApplicationSpecificNotice.incrementStoriesCameraTip(accountManager: self.context.sharedContext.accountManager)
+            |> deliverOnMainQueue).start(next: { [weak self] count in
+                guard let self else {
+                    return
+                }
+                if count > 1 {
+                    let _ = (ApplicationSpecificNotice.getStoriesDualCameraTip(accountManager: self.context.sharedContext.accountManager)
+                    |> deliverOnMainQueue).start(next: { [weak self] count in
+                        guard let self else {
+                            return
+                        }
+                        if count < 1 {
+                            self.presentDualCameraTooltip()
+                        }
+                    })
+                    return
+                } else {
+                    self.presentCameraTooltip()
+                }
+            })
+        }
+
         override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
             let result = super.hitTest(point, with: event)
             if result == self.componentHost.view {
@@ -1742,9 +1773,7 @@ public class CameraScreen: ViewController {
                 self.hasAppeared = hasAppeared
                 transition = transition.withUserData(CameraScreenTransition.finishedAnimateIn)
                 
-                
-//                self.presentCameraTooltip()
-//                self.presentDualCameraTooltip()
+                self.maybePresentTooltips()
             }
 
             let componentSize = self.componentHost.update(
@@ -2158,6 +2187,19 @@ public class CameraScreen: ViewController {
         transition.updateAlpha(layer: self.node.transitionDimView.layer, alpha: dimAlpha)
         transition.updateTransform(layer: self.node.transitionCornersView.layer, transform: CGAffineTransform(translationX: offsetX, y: 0.0))
         
+        let sublayerOffsetX = offsetX * 1.0 / scale * 0.5
+        self.window?.forEachController({ controller in
+            if let controller = controller as? TooltipScreen {
+                controller.view.layer.sublayerTransform = CATransform3DMakeTranslation(sublayerOffsetX, 0.0, 0.0)
+            }
+        })
+        self.forEachController({ controller in
+            if let controller = controller as? TooltipScreen {
+                controller.view.layer.sublayerTransform = CATransform3DMakeTranslation(sublayerOffsetX, 0.0, 0.0)
+            }
+            return true
+        })
+                
         if let navigationController = self.navigationController as? NavigationController {
             let offsetX = floorToScreenPixels(transitionFraction * self.node.frame.width)
             navigationController.updateRootContainerTransitionOffset(offsetX, transition: transition)

submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift

@@ -4003,7 +4003,7 @@ final class DoneButtonComponent: CombinedComponent {
             let backgroundHeight: CGFloat = 33.0
             var backgroundSize = CGSize(width: backgroundHeight, height: backgroundHeight)
             
-            let textSpacing: CGFloat = 7.0
+            let textSpacing: CGFloat = 8.0
             
             var title: _UpdatedChildComponent?
             if let titleText = context.component.title {