Various fixes

Author: laktyushin

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

@@ -14315,3 +14315,8 @@ Sorry for the inconvenience.";
 "Gift.Buy.Confirm.Text.Stars_any" = "**%@** Stars";
 "Gift.Buy.Confirm.BuyFor_1" = "Buy for %@ Star";
 "Gift.Buy.Confirm.BuyFor_any" = "Buy for %@ Stars";
+
+"Calls.HideCallsTab" = "Hide Calls Tab";
+
+"Story.Editor.TooltipSelection_1" = "Tap here to view your %@ story";
+"Story.Editor.TooltipSelection_any" = "Tap here to view your %@ stories";

submodules/CallListUI/Sources/CallListController.swift

@@ -16,6 +16,7 @@ import TelegramBaseController
 import InviteLinksUI
 import UndoUI
 import TelegramCallsUI
+import TelegramUIPreferences
 
 public enum CallListControllerMode {
     case tab
@@ -734,10 +735,22 @@ public final class CallListController: TelegramBaseController {
             return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/AddUser"), color: theme.contextMenu.primaryColor)
         }, action: { [weak self] c, f in
             c?.dismiss(completion: { [weak self] in
-                guard let strongSelf = self else {
+                guard let self else {
                     return
                 }
-                strongSelf.callPressed()
+                self.callPressed()
+            })
+        })))
+        items.append(.action(ContextMenuActionItem(text: self.presentationData.strings.Calls_HideCallsTab, icon: { theme in
+            return generateTintedImage(image: UIImage(bundleImageName: "Peer Info/HideIcon"), color: theme.contextMenu.primaryColor)
+        }, action: { [weak self] c, f in
+            c?.dismiss(completion: { [weak self] in
+                guard let self else {
+                    return
+                }
+                let _ = updateCallListSettingsInteractively(accountManager: self.context.sharedContext.accountManager, {
+                    $0.withUpdatedShowTab(false)
+                }).start()
             })
         })))
 

submodules/ChatListUI/Sources/ChatListControllerNode.swift

@@ -1015,7 +1015,7 @@ public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDele
                     }
                 }
 
-                itemNode.listNode.isMainTab.set(self.availableFilters.firstIndex(where: { $0.id == id }) == 0 ? true : false)
+                itemNode.listNode.isMainTab.set(self.availableFilters.firstIndex(where: { $0.id == id }) == 0)
                 itemNode.updateLayout(size: layout.size, insets: insets, visualNavigationHeight: visualNavigationHeight, originalNavigationHeight: originalNavigationHeight, inlineNavigationLocation: inlineNavigationLocation, inlineNavigationTransitionFraction: itemInlineNavigationTransitionFraction, storiesInset: storiesInset, transition: nodeTransition)
                 if let scrollingOffset = self.scrollingOffset {
                     itemNode.updateScrollingOffset(navigationHeight: scrollingOffset.navigationHeight, offset: scrollingOffset.offset, transition: nodeTransition)

submodules/ChatListUI/Sources/Node/ChatListNode.swift

@@ -2092,8 +2092,6 @@ public final class ChatListNode: ListView {
                     return .single(.setupPhoto(accountPeer))
                 } else if suggestions.contains(.gracePremium) {
                     return .single(.premiumGrace)
-                } else if suggestions.contains(.setupBirthday) && birthday == nil {
-                    return .single(.setupBirthday)
                 } else if suggestions.contains(.xmasPremiumGift) {
                     return .single(.xmasPremiumGift)
                 } else if suggestions.contains(.annualPremium) || suggestions.contains(.upgradePremium) || suggestions.contains(.restorePremium), let inAppPurchaseManager = context.inAppPurchaseManager {
@@ -2149,6 +2147,8 @@ public final class ChatListNode: ListView {
                         }
                         return .birthdayPremiumGift(peers: todayBirthdayPeers, birthdays: birthdays)
                     }
+                } else if suggestions.contains(.setupBirthday) && birthday == nil {
+                    return .single(.setupBirthday)
                 } else if case let .link(id, url, title, subtitle) = suggestions.first(where: { if case .link = $0 { return true } else { return false} }) {
                     return .single(.link(id: id, url: url, title: title, subtitle: subtitle))
                 } else {

submodules/Components/ReactionButtonListComponent/Sources/ReactionButtonListComponent.swift

@@ -501,7 +501,7 @@ public final class ReactionButtonAsyncNode: ContextControllerSourceView {
                 animationFraction = max(0.0, min(1.0, (CACurrentMediaTime() - animationState.startTime) / animationState.duration))
                 animationFraction = animationState.curve.solve(at: animationFraction)
                 if animationState.fromExtracted != isExtracted {
-                    fixedTransitionDirection = isExtracted ? true : false
+                    fixedTransitionDirection = isExtracted
                 }
             } else {
                 animationFraction = 1.0

submodules/ContextUI/Sources/ContextController.swift

@@ -527,7 +527,12 @@ final class ContextControllerNode: ViewControllerTracingNode, ASScrollViewDelega
                 guard let strongSelf = self, let _ = gesture else {
                     return
                 }
-                let localPoint = strongSelf.view.convert(point, from: view)
+                let localPoint: CGPoint
+                if let layout = strongSelf.validLayout, layout.metrics.isTablet, layout.size.width > layout.size.height, let view {
+                    localPoint = view.convert(point, to: nil)
+                } else {
+                    localPoint = strongSelf.view.convert(point, from: view)
+                }
                 let initialPoint: CGPoint
                 if let current = strongSelf.initialContinueGesturePoint {
                     initialPoint = current

submodules/DrawingUI/Sources/ColorPickerScreen.swift

@@ -697,7 +697,7 @@ final class ColorGridComponent: Component {
                     bottomRightRadius = largeCornerRadius
                 }
 
-                let isLight = (selectedColor?.toUIColor().lightness ?? 1.0) < 0.5 ? true : false
+                let isLight = (selectedColor?.toUIColor().lightness ?? 1.0) < 0.5
 
                 var selectionKnobImage = ColorSelectionImage(size: CGSize(width: squareSize, height: squareSize), topLeftRadius: topLeftRadius, topRightRadius: topRightRadius, bottomLeftRadius: bottomLeftRadius, bottomRightRadius: bottomRightRadius, isLight: isLight)
                 if selectionKnobImage != self.selectionKnobImage {

submodules/TelegramNotices/Sources/Notices.swift

@@ -203,6 +203,7 @@ private enum ApplicationSpecificGlobalNotice: Int32 {
     case channelSendGiftTooltip = 76
     case starGiftWearTips = 77
     case channelSuggestTooltip = 78
+    case multipleStoriesTooltip = 79
 
     var key: ValueBoxKey {
         let v = ValueBoxKey(length: 4)
@@ -564,6 +565,10 @@ private struct ApplicationSpecificNoticeKeys {
     static func channelSuggestTooltip() -> NoticeEntryKey {
         return NoticeEntryKey(namespace: noticeNamespace(namespace: globalNamespace), key: ApplicationSpecificGlobalNotice.channelSuggestTooltip.key)
     }
+    
+    static func multipleStoriesTooltip() -> NoticeEntryKey {
+        return NoticeEntryKey(namespace: noticeNamespace(namespace: globalNamespace), key: ApplicationSpecificGlobalNotice.multipleStoriesTooltip.key)
+    }
 }
 
 public struct ApplicationSpecificNotice {
@@ -2426,4 +2431,31 @@ public struct ApplicationSpecificNotice {
             return Int(previousValue)
         }
     }
+    
+    public static func getMultipleStoriesTooltip(accountManager: AccountManager<TelegramAccountManagerTypes>) -> Signal<Int32, NoError> {
+        return accountManager.transaction { transaction -> Int32 in
+            if let value = transaction.getNotice(ApplicationSpecificNoticeKeys.multipleStoriesTooltip())?.get(ApplicationSpecificCounterNotice.self) {
+                return value.value
+            } else {
+                return 0
+            }
+        }
+    }
+    
+    public static func incrementMultipleStoriesTooltip(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.multipleStoriesTooltip())?.get(ApplicationSpecificCounterNotice.self) {
+                currentValue = value.value
+            }
+            let previousValue = currentValue
+            currentValue += Int32(count)
+
+            if let entry = CodableEntry(ApplicationSpecificCounterNotice(value: currentValue)) {
+                transaction.setNotice(ApplicationSpecificNoticeKeys.multipleStoriesTooltip(), entry)
+            }
+            
+            return Int(previousValue)
+        }
+    }
 }

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

@@ -3630,7 +3630,13 @@ public class CameraScreenImpl: ViewController, CameraScreen {
             self.node.resumeCameraCapture(fromGallery: true)
         }
 
-        var dismissControllerImpl: (() -> Void)?
+        class DismissArgs {
+            var resumeOnDismiss = true
+        }
+        
+        var dismissControllerImpl: ((Bool) -> Void)?
+        let dismissArgs = DismissArgs()
+        
         let controller: ViewController
         if let current = self.galleryController {
             controller = current
@@ -3686,7 +3692,7 @@ public class CameraScreenImpl: ViewController, CameraScreen {
                                 }
                             }
 
-                            dismissControllerImpl?()
+                            dismissControllerImpl?(true)
                         } else {
                             stopCameraCapture()
 
@@ -3759,17 +3765,19 @@ public class CameraScreenImpl: ViewController, CameraScreen {
                             self.node.collage?.addResults(signals: results)
                         }
                     } else {
+                        self.node.animateOutToEditor()
                         if let assets = results as? [PHAsset] {
                             self.completion(.single(.assets(assets)), nil, self.remainingStoryCount, {
-                                
                             })
                         }
                     }
                     self.galleryController = nil
 
-                    dismissControllerImpl?()
+                    dismissControllerImpl?(false)
                 }, dismissed: { [weak self] in
-                    resumeCameraCapture()
+                    if dismissArgs.resumeOnDismiss {
+                        resumeCameraCapture()
+                    }
                     if let self {
                         self.node.hasGallery = false
                         self.node.requestUpdateLayout(transition: .immediate)
@@ -3780,7 +3788,8 @@ public class CameraScreenImpl: ViewController, CameraScreen {
             )
             self.galleryController = controller
 
-            dismissControllerImpl = { [weak controller] in
+            dismissControllerImpl = { [weak controller] resume in
+                dismissArgs.resumeOnDismiss = resume
                 controller?.dismiss(animated: true)
             }
         }

submodules/TelegramUI/Components/Gifts/GiftOptionsScreen/Sources/GiftOptionsScreen.swift

@@ -235,6 +235,8 @@ final class GiftOptionsScreenComponent: Component {
 
         private var chevronImage: (UIImage, PresentationTheme)?
 
+        private var resaleConfiguration: StarsSubscriptionConfiguration?
+        
         override init(frame: CGRect) {
             self.scrollView = ScrollView()
             self.scrollView.showsVerticalScrollIndicator = true
@@ -408,9 +410,14 @@ final class GiftOptionsScreenComponent: Component {
                         switch gift {
                         case let .generic(gift):
                             if let availability = gift.availability, availability.remains == 0, let minResaleStars = availability.minResaleStars {
-                                subject = .starGift(gift: gift, price: "⭐️ \(minResaleStars)+")
+                                let priceString = presentationStringsFormattedNumber(Int32(minResaleStars), environment.dateTimeFormat.groupingSeparator)
+                                if let resaleConfiguration = self.resaleConfiguration, minResaleStars == resaleConfiguration.starGiftResaleMaxAmount || availability.resale == 1 {
+                                    subject = .starGift(gift: gift, price: "⭐️ \(priceString)")
+                                } else {
+                                    subject = .starGift(gift: gift, price: "⭐️ \(priceString)+")
+                                }
                             } else {
-                                subject = .starGift(gift: gift, price: "⭐️ \(gift.price)")
+                                subject = .starGift(gift: gift, price: "⭐️ \(presentationStringsFormattedNumber(Int32(gift.price), environment.dateTimeFormat.groupingSeparator))")
                             }
                         case let .unique(gift):
                             subject = .uniqueGift(gift: gift, price: nil)
@@ -773,6 +780,8 @@ final class GiftOptionsScreenComponent: Component {
                     self.optionsPromise.set(component.context.engine.payments.starsTopUpOptions()
                     |> map(Optional.init))
                 }
+                
+                self.resaleConfiguration = StarsSubscriptionConfiguration.with(appConfiguration: component.context.currentAppConfiguration.with { $0 })
             }
             self.component = component