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

Author: laktyushin

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

@@ -15425,3 +15425,6 @@ Error: %8$@";
 "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/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/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemContentComponent.swift

@@ -943,21 +943,25 @@ final class StoryItemContentComponent: Component {
             }
 
             if let messageMedia, case .liveStream = messageMedia {
-                self.imageView.update(
-                    context: component.context,
-                    strings: component.strings,
-                    peer: component.peer,
-                    storyId: component.item.id,
-                    media: messageMedia,
-                    size: availableSize,
-                    isCaptureProtected: component.item.isForwardingDisabled,
-                    attemptSynchronous: synchronousLoad,
-                    transition: transition
-                )
-                if !self.contentLoaded || component.isVideoBuffering {
-                    self.imageView.isHidden = false
-                } else {
+                if component.isEmbeddedInCamera {
                     self.imageView.isHidden = true
+                } else {
+                    self.imageView.update(
+                        context: component.context,
+                        strings: component.strings,
+                        peer: component.peer,
+                        storyId: component.item.id,
+                        media: messageMedia,
+                        size: availableSize,
+                        isCaptureProtected: component.item.isForwardingDisabled,
+                        attemptSynchronous: synchronousLoad,
+                        transition: transition
+                    )
+                    if !self.contentLoaded || component.isVideoBuffering {
+                        self.imageView.isHidden = false
+                    } else {
+                        self.imageView.isHidden = true
+                    }
                 }
             }