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

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

@@ -9698,7 +9698,7 @@ Sorry for the inconvenience.";
 "Story.Privacy.CategoryContacts" = "Contacts";
 "Story.Privacy.CategoryCloseFriends" = "Close Friends";
 "Story.Privacy.CategorySelectedContacts" = "Selected Contacts";
-"Story.Privacy.ExcludedPeople" = "ExcludedPeople";
+"Story.Privacy.ExcludedPeople" = "Excluded People";
 
 "Story.Privacy.ExcludePeople" = "exclude people";
 "Story.Privacy.ExcludePeopleExceptNames" = "except %@";

submodules/ChatListUI/Sources/ChatListController.swift

@@ -2540,6 +2540,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
         return nil
     }
     
+    private weak var storyCameraTooltip: TooltipScreen?
     fileprivate func openStoryCamera(fromList: Bool) {
         var reachedCountLimit = false
         var premiumNeeded = false
@@ -2575,6 +2576,10 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
         }
         
         if reachedCountLimit || premiumNeeded || hasActiveCall || hasActiveGroupCall {
+            if let storyCameraTooltip = self.storyCameraTooltip {
+                self.storyCameraTooltip = nil
+                storyCameraTooltip.dismiss()
+            }
             if let componentView = self.chatListHeaderView() {
                 var sourceFrame: CGRect?
                 if fromList {
@@ -2626,6 +2631,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                             }
                         }
                     )
+                    self.storyCameraTooltip = tooltipController
                     self.present(tooltipController, in: .window(.root))
                 }
             }

submodules/Display/Source/TextNode.swift

@@ -1260,7 +1260,12 @@ open class TextNode: ASDisplayNode {
                     var effectiveLineRange = brokenLineRange
                     var additionalTrailingLine: (CTLine, Double)?
                     
-                    if lineRange.length == 0 || (CTLineGetTypographicBounds(originalLine, nil, nil, nil) - CTLineGetTrailingWhitespaceWidth(originalLine) + truncationTokenWidth) < Double(lineConstrainedSize.width) {
+                    var measureFitWidth = CTLineGetTypographicBounds(originalLine, nil, nil, nil) - CTLineGetTrailingWhitespaceWidth(originalLine)
+                    if customTruncationToken != nil {
+                        measureFitWidth += truncationTokenWidth
+                    }
+                    
+                    if lineRange.length == 0 || measureFitWidth < Double(lineConstrainedSize.width) {
                         if didClipLinebreak {
                             if lineRange.length == 0 {
                                 coreTextLine = CTLineCreateWithAttributedString(NSAttributedString())
@@ -1274,7 +1279,7 @@ open class TextNode: ASDisplayNode {
                             coreTextLine = originalLine
                         }
                     } else {
-                        coreTextLine = CTLineCreateTruncatedLine(originalLine, Double(lineConstrainedSize.width), truncationType, truncationToken) ?? truncationToken
+                        coreTextLine = CTLineCreateTruncatedLine(originalLine, max(1.0, Double(lineConstrainedSize.width) - truncationTokenWidth), truncationType, truncationToken) ?? truncationToken
                         let runs = (CTLineGetGlyphRuns(coreTextLine) as [AnyObject]) as! [CTRun]
                         for run in runs {
                             let runAttributes: NSDictionary = CTRunGetAttributes(run)

submodules/MediaPlayer/Sources/MediaPlayer.swift

@@ -1022,7 +1022,6 @@ private final class MediaPlayerContext {
             if isPaused && self.fadeTimer != nil {
                 playbackStatus = .paused
             } else if reportRate.isZero {
-                //playbackStatus = .buffering(initial: false, whilePlaying: true)
                 playbackStatus = .playing
                 statusTimestamp = 0.0
             } else {

submodules/TelegramUI/Components/PeerInfo/PeerInfoStoryGridScreen/Sources/PeerInfoStoryGridScreen.swift

@@ -53,7 +53,7 @@ final class PeerInfoStoryGridScreenComponent: Component {
         private weak var state: EmptyComponentState?
         private var environment: EnvironmentType?
         
-        private var paneNode: PeerInfoStoryPaneNode?
+        private(set) var paneNode: PeerInfoStoryPaneNode?
         private var paneStatusDisposable: Disposable?
         private(set) var paneStatusText: String?
         
@@ -171,74 +171,6 @@ final class PeerInfoStoryGridScreenComponent: Component {
                         self.environment?.controller()?.push(PeerInfoStoryGridScreen(context: component.context, peerId: component.peerId, scope: .archive))
                     })))
                 }
-                
-                /*if photoCount != 0 && videoCount != 0 {
-                 items.append(.separator)
-                 
-                 let showPhotos: Bool
-                 switch pane.contentType {
-                 case .photo, .photoOrVideo:
-                 showPhotos = true
-                 default:
-                 showPhotos = false
-                 }
-                 let showVideos: Bool
-                 switch pane.contentType {
-                 case .video, .photoOrVideo:
-                 showVideos = true
-                 default:
-                 showVideos = false
-                 }
-                 
-                 items.append(.action(ContextMenuActionItem(text: strings.SharedMedia_ShowPhotos, icon: { theme in
-                 if !showPhotos {
-                 return nil
-                 }
-                 return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Check"), color: theme.contextMenu.primaryColor)
-                 }, action: { [weak pane] _, a in
-                 a(.default)
-                 
-                 guard let pane = pane else {
-                 return
-                 }
-                 let updatedContentType: PeerInfoVisualMediaPaneNode.ContentType
-                 switch pane.contentType {
-                 case .photoOrVideo:
-                 updatedContentType = .video
-                 case .photo:
-                 updatedContentType = .photo
-                 case .video:
-                 updatedContentType = .photoOrVideo
-                 default:
-                 updatedContentType = pane.contentType
-                 }
-                 pane.updateContentType(contentType: updatedContentType)
-                 })))
-                 items.append(.action(ContextMenuActionItem(text: strings.SharedMedia_ShowVideos, icon: { theme in
-                 if !showVideos {
-                 return nil
-                 }
-                 return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Check"), color: theme.contextMenu.primaryColor)
-                 }, action: { [weak pane] _, a in
-                 a(.default)
-                 
-                 guard let pane = pane else {
-                 return
-                 }
-                 let updatedContentType: PeerInfoVisualMediaPaneNode.ContentType
-                 switch pane.contentType {
-                 case .photoOrVideo:
-                 updatedContentType = .photo
-                 case .photo:
-                 updatedContentType = .photoOrVideo
-                 case .video:
-                 updatedContentType = .video
-                 default:
-                 updatedContentType = pane.contentType
-                 }
-                 pane.updateContentType(contentType: updatedContentType)
-                 })))
-                 }*/
             }
 
             let contextController = ContextController(account: component.context.account, presentationData: presentationData, source: .reference(PeerInfoContextReferenceContentSource(controller: controller, sourceNode: source)), items: .single(ContextController.Items(content: .list(items))), gesture: nil)
@@ -554,8 +486,6 @@ public class PeerInfoStoryGridScreen: ViewControllerComponentContainer {
         }
         moreBarButton.addTarget(self, action: #selector(self.morePressed), forControlEvents: .touchUpInside)
         
-        self.navigationItem.setRightBarButton(moreBarButtonItem, animated: false)
-        
         self.titleView = ChatTitleView(
             context: context, theme:
                 presentationData.theme,
@@ -594,6 +524,8 @@ public class PeerInfoStoryGridScreen: ViewControllerComponentContainer {
                 title = nil
             }
             self.titleView?.titleContent = .custom(presentationData.strings.StoryList_TitleSaved, title, false)
+            
+            self.navigationItem.setRightBarButton(self.moreBarButtonItem, animated: false)
         case .archive:
             guard let componentView = self.node.hostView.componentView as? PeerInfoStoryGridScreenComponent.View else {
                 return
@@ -605,6 +537,19 @@ public class PeerInfoStoryGridScreen: ViewControllerComponentContainer {
                 title = presentationData.strings.StoryList_TitleArchive
             }
             self.titleView?.titleContent = .custom(title, nil, false)
+            
+            var hasMenu = false
+            if componentView.selectedCount != 0 {
+                hasMenu = true
+            } else if let paneNode = componentView.paneNode, !paneNode.isEmpty {
+                hasMenu = true
+            }
+            
+            if hasMenu {
+                self.navigationItem.setRightBarButton(self.moreBarButtonItem, animated: false)
+            } else {
+                self.navigationItem.setRightBarButton(nil, animated: false)
+            }
         }
     }
     

submodules/TelegramUI/Components/ShareWithPeersScreen/Sources/ShareWithPeersScreen.swift

@@ -1446,7 +1446,7 @@ final class ShareWithPeersScreenComponent: Component {
                 case .closeFriends:
                     title = environment.strings.Story_Privacy_CategoryCloseFriends
                 case .contacts:
-                    title = environment.strings.Story_Privacy_ExcludePeople
+                    title = environment.strings.Story_Privacy_ExcludedPeople
                 case .nobody:
                     title = environment.strings.Story_Privacy_CategorySelectedContacts
                 case .everyone:
@@ -2023,7 +2023,7 @@ public class ShareWithPeersScreen: ViewControllerComponentContainer {
                 id: .contacts,
                 title: presentationData.strings.Story_Privacy_CategoryContacts,
                 icon: "Chat List/Tabs/IconContacts",
-                iconColor: .yellow,
+                iconColor: .violet,
                 actionTitle: contactsSubtitle
             ))
             
@@ -2063,7 +2063,7 @@ public class ShareWithPeersScreen: ViewControllerComponentContainer {
                 id: .selectedContacts,
                 title: presentationData.strings.Story_Privacy_CategorySelectedContacts,
                 icon: "Chat List/Filters/Group",
-                iconColor: .violet,
+                iconColor: .yellow,
                 actionTitle: selectedContactsSubtitle
             ))
             

submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/OpenStories.swift

@@ -171,6 +171,13 @@ public extension StoryContainerScreen {
         |> take(1)
         |> mapToSignal { state -> Signal<StoryContentContextState, NoError> in
             if let slice = state.slice {
+                #if DEBUG && true
+                if "".isEmpty {
+                    return .single(state)
+                    |> delay(4.0, queue: .mainQueue())
+                }
+                #endif
+                
                 return waitUntilStoryMediaPreloaded(context: context, peerId: slice.peer.id, storyItem: slice.item.storyItem)
                 |> timeout(4.0, queue: .mainQueue(), alternate: .complete())
                 |> map { _ -> StoryContentContextState in

submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemContentComponent.swift

@@ -82,6 +82,8 @@ final class StoryItemContentComponent: Component {
         private var currentProgressTimerValue: Double = 0.0
         private var videoProgressDisposable: Disposable?
         
+        private var ignoreBufferingTimestamp: Double = 0.0
+        
         private var markedAsSeen: Bool = false
         private var contentLoaded: Bool = false
         
@@ -252,6 +254,7 @@ final class StoryItemContentComponent: Component {
         
         override func leaveAmbientMode() {
             if let videoNode = self.videoNode {
+                self.ignoreBufferingTimestamp = CFAbsoluteTimeGetCurrent()
                 videoNode.setSoundEnabled(true)
                 videoNode.continueWithOverridingAmbientMode(isAmbient: false)
             }
@@ -259,6 +262,7 @@ final class StoryItemContentComponent: Component {
         
         override func enterAmbientMode(ambient: Bool) {
             if let videoNode = self.videoNode {
+                self.ignoreBufferingTimestamp = CFAbsoluteTimeGetCurrent()
                 if ambient {
                     videoNode.continueWithOverridingAmbientMode(isAmbient: true)
                 } else {
@@ -369,6 +373,16 @@ final class StoryItemContentComponent: Component {
                 isBuffering = true
             }
             
+            if isBuffering {
+                if CFAbsoluteTimeGetCurrent() - self.ignoreBufferingTimestamp < 0.3 {
+                    isBuffering = false
+                } else {
+                    self.ignoreBufferingTimestamp = 0.0
+                }
+            } else {
+                self.ignoreBufferingTimestamp = 0.0
+            }
+            
             if case .buffering(true, _, _, _) = videoPlaybackStatus.status {
                 timestampAndDuration = (nil, effectiveDuration)
             } else if effectiveDuration > 0.0 {

submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift

@@ -2468,7 +2468,7 @@ public final class StoryItemSetContainerComponent: Component {
                     privacyIcon = ComponentView()
                     self.privacyIcon = privacyIcon
                 }
-                let closeFriendIconSize = privacyIcon.update(
+                let privacyIconSize = privacyIcon.update(
                     transition: privacyIconTransition,
                     component: AnyComponent(PlainButtonComponent(
                         content: AnyComponent(
@@ -2504,7 +2504,7 @@ public final class StoryItemSetContainerComponent: Component {
                             let tooltipScreen = TooltipScreen(
                                 account: component.context.account,
                                 sharedContext: component.context.sharedContext,
-                                text: .plain(text: tooltipText), style: .default, location: TooltipScreen.Location.point(closeFriendIconView.convert(closeFriendIconView.bounds, to: self).offsetBy(dx: 1.0, dy: 6.0), .top), displayDuration: .infinite, shouldDismissOnTouch: { _, _ in
+                                text: .plain(text: tooltipText), style: .default, location: TooltipScreen.Location.point(closeFriendIconView.convert(closeFriendIconView.bounds, to: nil).offsetBy(dx: 1.0, dy: 6.0), .top), displayDuration: .infinite, shouldDismissOnTouch: { _, _ in
                                     return .dismiss(consume: true)
                                 }
                             )
@@ -2524,7 +2524,7 @@ public final class StoryItemSetContainerComponent: Component {
                     environment: {},
                     containerSize: CGSize(width: 44.0, height: 44.0)
                 )
-                let closeFriendIconFrame = CGRect(origin: CGPoint(x: headerRightOffset - closeFriendIconSize.width - 8.0, y: 23.0), size: closeFriendIconSize)
+                let closeFriendIconFrame = CGRect(origin: CGPoint(x: headerRightOffset - privacyIconSize.width - 8.0, y: 22.0), size: privacyIconSize)
                 if let closeFriendIconView = privacyIcon.view {
                     if closeFriendIconView.superview == nil {
                         self.controlsContainerView.addSubview(closeFriendIconView)
@@ -3886,7 +3886,7 @@ public final class StoryItemSetContainerComponent: Component {
                 self.requestSave()
             })))
             
-            if component.slice.item.storyItem.isPublic && (component.slice.peer.addressName != nil || !component.slice.peer._asPeer().usernames.isEmpty) && component.slice.item.storyItem.expirationTimestamp > Int32(Date().timeIntervalSince1970) {
+            if component.slice.item.storyItem.isPublic && (component.slice.peer.addressName != nil || !component.slice.peer._asPeer().usernames.isEmpty) && (component.slice.item.storyItem.expirationTimestamp > Int32(Date().timeIntervalSince1970) || component.slice.item.storyItem.isPinned) {
                 items.append(.action(ContextMenuActionItem(text: component.strings.Story_Context_CopyLink, icon: { theme in
                     return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Link"), color: theme.contextMenu.primaryColor)
                 }, action: { [weak self] _, a in

submodules/TelegramUI/Components/Stories/StoryPeerListComponent/Sources/StoryPeerListComponent.swift

@@ -374,6 +374,7 @@ public final class StoryPeerListComponent: Component {
             
             self.scrollContainerView = UIView()
             self.scrollContainerView.clipsToBounds = true
+            self.scrollContainerView.isExclusiveTouch = true
             
             self.titleView = UIImageView()
             self.titleView.layer.anchorPoint = CGPoint(x: 0.0, y: 0.5)

submodules/TgVoipWebrtc/tgcalls

@@ -1 +1 @@
-Subproject commit ef358c48b05ccd59319a7ceded340b75baffa751
+Subproject commit ebc8452d3a0d0bc18822b4eb6ca61ec8fa7a70a5