Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Author: overtake

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

@@ -15167,7 +15167,12 @@ Error: %8$@";
 "ScheduledMessages.Reminder.Delete" = "Delete Reminder";
 "ScheduledMessages.Reminder.DeleteMany" = "Delete Reminders";
 
-"Gift.Setup.NextDropIn" = "next drop in {m}:{s}";
+"Gift.Setup.PlaceBid" = "Place a Bid";
+"Gift.Setup.AuctionInfo" = "%@ are dropped to the top %@ by bid amount. [Learn more >]()";
+"Gift.Setup.AuctionInfo.Gifts_1" = "%@ gift";
+"Gift.Setup.AuctionInfo.Gifts_any" = "%@ gifts";
+"Gift.Setup.AuctionInfo.Bidders_1" = "%@ bidder";
+"Gift.Setup.AuctionInfo.Bidders_any" = "%@ bidders";
 
 "PrivacySettings.LoginEmailSetupInfo" = "Setup your email address for Telegram login codes.";
 
@@ -15223,6 +15228,11 @@ Error: %8$@";
 "Gift.AuctionBid.Top" = "TOP %@";
 "Gift.AuctionBid.Custom" = "Custom";
 
+"Gift.AuctionBid.CustomBid.Title" = "Place a Custom Bid";
+"Gift.AuctionBid.CustomBid.Text" = "If you fall below the top %@, your bid will roll over to the next drop.";
+"Gift.AuctionBid.CustomBid.Placeholder" = "Amount";
+"Gift.AuctionBid.CustomBid.Done" = "Place a Bid";
+
 "Gift.Auction.Context.About" = "About";
 "Gift.Auction.Context.CopyLink" = "Copy Link";
 "Gift.Auction.Context.Share" = "Share";
@@ -15269,11 +15279,6 @@ Error: %8$@";
 "ChatList.Auctions.Status.Many.OutbidAll" = "You've been outbid in all of them.";
 "ChatList.Auctions.View" = "View";
 
-"Gift.Auction.Ongoing.Title" = "One Auction at a Time";
-"Gift.Auction.Ongoing.Text" = "You’ve already bid in this gift auction for **%@**.";
-"Gift.Auction.Ongoing.TextYourself" = "You’ve already bid in this gift auction for yourself.";
-"Gift.Auction.Ongoing.View" = "View";
-
 "Gift.Auction.Info.Title" = "Auction";
 "Gift.Auction.Info.Description" = "Join the battle for exclusive gifts.";
 
@@ -15367,3 +15372,54 @@ Error: %8$@";
 "Stars.Transaction.LiveStreamPaidMessage_1" = "Fee for %@ Live Stream Message";
 "Stars.Transaction.LiveStreamPaidMessage_any" = "Fee for %@ Live Stream Messages";
 "Stars.Transaction.LiveStreamPaidMessage.Text" = "You receive **%@%** of the price that you charge for each incoming message.";
+
+"Notification.StarGift.Subtitle.NoConvert" = "Display this gift on your page and turn it into a collectible.";
+"Notification.StarGift.Subtitle.OtherNoConvert" = "Display this gift on your page and turn it into a collectible.";
+"Gift.View.NoConvertDescription" = "We will notify you once it becomes eligible for unique upgrades.";
+"Gift.View.OtherNoConvertDescription" = "We will notify %1$@ once it becomes eligible for unique upgrades.";
+
+"Gift.AuctionTransfer.Title" = "Change Recipient";
+"Gift.AuctionTransfer.Text" = "The current recipient of this gift is **%@**. Change to **%@**?";
+"Gift.AuctionTransfer.TextFromYourself" = "The current recipient of this gift is you. Change to **%@**?";
+"Gift.AuctionTransfer.TextToYourself" = "The current recipient of this gift is **%@**. Change to yourself?";
+"Gift.AuctionTransfer.Change" = "Change";
+
+"Story.LiveBadge" = "LIVE";
+"SendStarReactions.LiveStreamPerk1Title" = "pin in chat";
+"SendStarReactions.LiveStreamPerk2Title" = "characters";
+"SendStarReactions.LiveStreamPerk3Title" = "emoji";
+"SendStarReactions.LiveStreamMessageTitle" = "Highlight and Pin";
+"SendStarReactions.LiveStreamReactionText" = "Highlight and pin a message\nby adding Stars for **%@**";
+"SendStarReactions.LiveStreamMessageText" = "Highlight and pin a message\nby adding Stars for **%@**";
+"SendStarReactions.OwnLiveStreamCloseButton" = "Close";
+"SendStarReactions.OwnLiveStreamInfoText" = "You can't send star reactions to own story.";
+"SendStarReactions.LiveStreamActionButton" = "Add  # %@";
+
+"LiveStream.CommentsDisabledPlaceholder" = "Comments disabled";
+"LiveStream.LoadingStatus" = "loading...";
+"LiveStream.StoryViewerEmpty" = "no viewers";
+"LiveStream.StoryViewerCount_1" = "1 watching";
+"LiveStream.StoryViewerCount_any" = "%@ watching";
+
+"LiveStream.InputPlaceholder" = "Comment";
+
+"Story.ContextMenuPip" = "Minimize";
+"Story.ContextMenuLiveSettings" = "Live Settings";
+
+"LiveStream.InputContextMenuAddStars" = "Add Stars";
+"LiveStream.InputContextMenuEditStars" = "Edit Stars";
+"LiveStream.InputContextMenuRemoveStars" = "Remove Stars";
+
+"Reminders.DeleteRepeatingTitle" = "Delete Repeating Reminder";
+"Reminders.DeleteRepeatingText" = "Are you sure you want to delete this reminder? This is a repeating reminder.";
+"Reminders.DeleteRepeatingActionSingle" = "Delete This Reminder Only";
+"Reminders.DeleteRepeatingActionMultiple" = "Delete All Future Reminders";
+
+"ScheduledMessages.DeleteRepeatingTitle" = "Delete Repeating Message";
+"ScheduledMessages.DeleteRepeatingText" = "Are you sure you want to delete this scheduled message? This is a repeating message.";
+"ScheduledMessages.DeleteRepeatingActionSingle" = "Delete This Message Only";
+"ScheduledMessages.DeleteRepeatingActionMultiple" = "Delete All Future Messages";
+
+"ChatList.AlertResumeLiveStreamTitle" = "Resume Live Stream";
+"ChatList.AlertResumeLiveStreamText" = "Do you want to resume an existing Live Stream?";
+"ChatList.AlertResumeLiveStreamAction" = "Resume";

submodules/AccountContext/Sources/AccountContext.swift

@@ -1423,8 +1423,8 @@ public protocol SharedAccountContext: AnyObject {
     func makeGiftViewScreen(context: AccountContext, gift: StarGift.UniqueGift, shareStory: ((StarGift.UniqueGift) -> Void)?, openChatTheme: (() -> Void)?, dismissed: (() -> Void)?) -> ViewController
     func makeGiftWearPreviewScreen(context: AccountContext, gift: StarGift.UniqueGift) -> ViewController
     func makeGiftAuctionInfoScreen(context: AccountContext, auctionContext: GiftAuctionContext, completion: (() -> Void)?) -> ViewController
-    func makeGiftAuctionBidScreen(context: AccountContext, toPeerId: EnginePeer.Id, auctionContext: GiftAuctionContext) -> ViewController
-    func makeGiftAuctionViewScreen(context: AccountContext, toPeerId: EnginePeer.Id, auctionContext: GiftAuctionContext) -> ViewController
+    func makeGiftAuctionBidScreen(context: AccountContext, toPeerId: EnginePeer.Id, text: String?, entities: [MessageTextEntity]?, hideName: Bool, auctionContext: GiftAuctionContext) -> ViewController
+    func makeGiftAuctionViewScreen(context: AccountContext, auctionContext: GiftAuctionContext, completion: @escaping () -> Void) -> ViewController
     func makeGiftAuctionActiveBidsScreen(context: AccountContext) -> ViewController
 
     func makeStorySharingScreen(context: AccountContext, subject: StorySharingSubject, parentController: ViewController) -> ViewController

submodules/AttachmentTextInputPanelNode/Sources/AttachmentTextInputActionButtonsNode.swift

@@ -152,8 +152,10 @@ final class AttachmentTextInputActionButtonsNode: ASDisplayNode, ChatSendMessage
             }
             titleOffset -= 2.0
             buttonInset = 14.0
+            self.iconNode.isHidden = true
         } else {
             segments.append(.text(0, NSAttributedString(string: text, font: Font.semibold(17.0), textColor: interfaceState.theme.chat.inputPanel.actionControlForegroundColor)))
+            self.iconNode.isHidden = false
         }
         self.textNode.segments = segments
 

submodules/ChatListUI/Sources/ChatListController.swift

@@ -3057,6 +3057,19 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
         }
     }
 
+    func displayContinueLiveStream() {
+        self.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: self.presentationData), title: self.presentationData.strings.ChatList_AlertResumeLiveStreamTitle, text: self.presentationData.strings.ChatList_AlertResumeLiveStreamText, actions: [
+            TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {
+            }),
+            TextAlertAction(type: .defaultAction, title: presentationData.strings.ChatList_AlertResumeLiveStreamAction, action: { [weak self] in
+                guard let self else {
+                    return
+                }
+                self.openStoryCamera(fromList: false)
+            })
+        ]), in: .window(.root))
+    }
+    
     public func storyCameraTransitionOut() -> (Stories.PendingTarget?, Bool) -> StoryCameraTransitionOut? {
         return { [weak self] target, isArchived in
             guard let self, let target else {
@@ -7052,7 +7065,12 @@ private final class ChatListLocationContext {
                             guard let self, let parentController = self.parentController else {
                                 return
                             }
-                            parentController.openStoryCamera(fromList: false)
+                            
+                            if let componentView = parentController.chatListHeaderView(), let storyPeerListView = componentView.storyPeerListView(), storyPeerListView.isLiveStreaming {
+                                parentController.displayContinueLiveStream()
+                            } else {
+                                parentController.openStoryCamera(fromList: false)
+                            }
                         }
                     )))
                 } else {

submodules/ChatListUI/Sources/ChatListControllerNode.swift

@@ -592,8 +592,22 @@ public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDele
                     let coefficient: CGFloat = 0.4
                     return bandingStart + (1.0 - (1.0 / ((bandedOffset * coefficient / range) + 1.0))) * range
                 }
+                
+                var hasLiveStream = false
+                if let componentView = self.controller?.chatListHeaderView(), let storyPeerListView = componentView.storyPeerListView(), storyPeerListView.isLiveStreaming {
+                    hasLiveStream = true
+                }
 
                 if case .compact = layout.metrics.widthClass, self.controller?.isStoryPostingAvailable == true && !(self.context.sharedContext.callManager?.hasActiveCall ?? false) {
+                    if hasLiveStream {
+                        if translation.x >= 30.0 {
+                            self.panRecognizer?.cancel()
+                            
+                            self.controller?.displayContinueLiveStream()
+                        }
+                        return
+                    }
+                    
                     let cameraIsAlreadyOpened = self.controller?.hasStoryCameraTransition ?? false
                     if selectedIndex <= 0 && translation.x > 0.0 {
                         transitionFraction = 0.0

submodules/ChatListUI/Sources/Node/ChatListItem.swift

@@ -1809,8 +1809,7 @@ public class ChatListItemNode: ItemListRevealOptionsItemNode {
                 self.avatarNode.view.addSubview(avatarLiveBadge.outline)
                 self.avatarNode.view.addSubview(avatarLiveBadge.foreground)
 
-                //TODO:localize
-                let liveString = NSAttributedString(string: "LIVE", font: Font.semibold(10.0), textColor: .white)
+                let liveString = NSAttributedString(string: item.presentationData.strings.Story_LiveBadge, font: Font.semibold(10.0), textColor: .white)
                 let liveStringBounds = liveString.boundingRect(with: CGSize(width: 100.0, height: 100.0), options: .usesLineFragmentOrigin, context: nil)
                 let liveBadgeSize = CGSize(width: ceil(liveStringBounds.width) + 4.0 * 2.0, height: ceil(liveStringBounds.height) + 2.0 * 2.0)
                 avatarLiveBadge.foreground.image = generateImage(liveBadgeSize, rotatedContext: { size, context in
@@ -4125,6 +4124,17 @@ public class ChatListItemNode: ItemListRevealOptionsItemNode {
                         let liveBadgeFrame = CGRect(origin: CGPoint(x: floor((avatarFrame.width - iconImage.size.width) * 0.5), y: avatarFrame.height + 5.0 - iconImage.size.height), size: iconImage.size)
                         transition.updateFrame(view: avatarLiveBadge.foreground, frame: liveBadgeFrame)
                         transition.updateFrame(view: avatarLiveBadge.outline, frame: liveBadgeFrame.insetBy(dx: -outlineInset, dy: -outlineInset))
+                        
+                        let effectiveBackgroundColor: UIColor
+                        if item.isPinned {
+                            effectiveBackgroundColor = item.presentationData.theme.chatList.pinnedItemBackgroundColor
+                        } else {
+                            effectiveBackgroundColor = item.presentationData.theme.chatList.itemBackgroundColor
+                        }
+                        
+                        let highlightAlpha = strongSelf.highlightedBackgroundNode.supernode == nil ? 0.0 : strongSelf.highlightedBackgroundNode.alpha
+                        let outlineColor = item.presentationData.theme.chatList.itemHighlightedBackgroundColor.mixedWith(effectiveBackgroundColor, alpha: 1.0 - highlightAlpha)
+                        transition.updateTintColor(view: avatarLiveBadge.outline, color: outlineColor)
                     }
 
                     let onlineInlineNavigationFraction: CGFloat = item.interaction.inlineNavigationLocation?.progress ?? 0.0

submodules/ComponentFlow/Source/Components/Button.swift

@@ -4,6 +4,7 @@ import UIKit
 public final class Button: Component {
     public let content: AnyComponent<Empty>
     public let minSize: CGSize?
+    public let hitTestEdgeInsets: UIEdgeInsets?
     public let tag: AnyObject?
     public let automaticHighlight: Bool
     public let isEnabled: Bool
@@ -22,6 +23,7 @@ public final class Button: Component {
         self.init(
             content: content,
             minSize: nil,
+            hitTestEdgeInsets: nil,
             tag: nil,
             automaticHighlight: automaticHighlight,
             isEnabled: isEnabled,
@@ -34,6 +36,7 @@ public final class Button: Component {
     private init(
         content: AnyComponent<Empty>,
         minSize: CGSize? = nil,
+        hitTestEdgeInsets: UIEdgeInsets? = nil,
         tag: AnyObject? = nil,
         automaticHighlight: Bool = true,
         isEnabled: Bool = true,
@@ -44,6 +47,7 @@ public final class Button: Component {
     ) {
         self.content = content
         self.minSize = minSize
+        self.hitTestEdgeInsets = hitTestEdgeInsets
         self.tag = tag
         self.automaticHighlight = automaticHighlight
         self.isEnabled = isEnabled
@@ -57,6 +61,22 @@ public final class Button: Component {
         return Button(
             content: self.content,
             minSize: minSize,
+            hitTestEdgeInsets: self.hitTestEdgeInsets,
+            tag: self.tag,
+            automaticHighlight: self.automaticHighlight,
+            isEnabled: self.isEnabled,
+            isExclusive: self.isExclusive,
+            action: self.action,
+            holdAction: self.holdAction,
+            highlightedAction: self.highlightedAction
+        )
+    }
+    
+    public func withHitTestEdgeInsets(_ hitTestEdgeInsets: UIEdgeInsets?) -> Button {
+        return Button(
+            content: self.content,
+            minSize: self.minSize,
+            hitTestEdgeInsets: hitTestEdgeInsets,
             tag: self.tag,
             automaticHighlight: self.automaticHighlight,
             isEnabled: self.isEnabled,
@@ -71,6 +91,7 @@ public final class Button: Component {
         return Button(
             content: self.content,
             minSize: self.minSize,
+            hitTestEdgeInsets: self.hitTestEdgeInsets,
             tag: self.tag,
             automaticHighlight: self.automaticHighlight,
             isEnabled: self.isEnabled,
@@ -86,6 +107,7 @@ public final class Button: Component {
         return Button(
             content: self.content,
             minSize: self.minSize,
+            hitTestEdgeInsets: self.hitTestEdgeInsets,
             tag: self.tag,
             automaticHighlight: self.automaticHighlight,
             isEnabled: self.isEnabled,
@@ -100,6 +122,7 @@ public final class Button: Component {
         return Button(
             content: self.content,
             minSize: self.minSize,
+            hitTestEdgeInsets: self.hitTestEdgeInsets,
             tag: tag,
             automaticHighlight: self.automaticHighlight,
             isEnabled: self.isEnabled,
@@ -117,6 +140,9 @@ public final class Button: Component {
         if lhs.minSize != rhs.minSize {
             return false
         }
+        if lhs.hitTestEdgeInsets != rhs.hitTestEdgeInsets {
+            return false
+        }
         if lhs.tag !== rhs.tag {
             return false
         }
@@ -174,6 +200,14 @@ public final class Button: Component {
         private var holdActionTriggerred: Bool = false
         private var holdActionTimer: Timer?
 
+        public override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
+            var bounds = self.bounds
+            if let hitTestEdgeInsets = self.component?.hitTestEdgeInsets {
+                bounds = bounds.insetBy(dx: hitTestEdgeInsets.left, dy: hitTestEdgeInsets.top)
+            }
+            return bounds.contains(point)
+        }
+        
         override init(frame: CGRect) {
             self.contentView = ComponentHostView<Empty>()
             self.contentView.isUserInteractionEnabled = false