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

Author: laktyushin

.gitlab-ci.yml

@@ -23,6 +23,8 @@ internal:
     - export PATH=`gem environment gemdir`/bin:$PATH
     - python3 -u build-system/Make/Make.py remote-build --darwinContainers="$DARWIN_CONTAINERS" --darwinContainersHost="$DARWIN_CONTAINERS_HOST" --cacheHost="$TELEGRAM_BAZEL_CACHE_HOST" --configurationPath="build-system/appcenter-configuration.json" --gitCodesigningRepository="$TELEGRAM_GIT_CODESIGNING_REPOSITORY" --gitCodesigningType=adhoc --configuration=release_arm64
     - python3 -u build-system/Make/DeployToFirebase.py --configuration="$TELEGRAM_PRIVATE_DATA_PATH/firebase-configurations/firebase-internal.json" --ipa="build/artifacts/Telegram.ipa" --dsyms="build/artifacts/Telegram.DSYMs.zip"
+    - rm -rf build-input/configuration-repository-workdir
+    - rm -rf build-input/configuration-repository
     - python3 -u build-system/Make/Make.py remote-build --darwinContainers="$DARWIN_CONTAINERS" --darwinContainersHost="$DARWIN_CONTAINERS_HOST" --cacheHost="$TELEGRAM_BAZEL_CACHE_HOST" --configurationPath="$TELEGRAM_PRIVATE_DATA_PATH/build-configurations/enterprise-configuration.json" --gitCodesigningRepository="$TELEGRAM_GIT_CODESIGNING_REPOSITORY" --gitCodesigningType=enterprise --configuration=release_arm64
     - python3 -u build-system/Make/DeployToFirebase.py --configuration="$TELEGRAM_PRIVATE_DATA_PATH/firebase-configurations/firebase-enterprise.json" --ipa="build/artifacts/Telegram.ipa" --dsyms="build/artifacts/Telegram.DSYMs.zip"
   environment:

build-system/Make/BuildConfiguration.py

@@ -131,7 +131,7 @@ def load_codesigning_data_from_git(working_dir, repo_url, temp_key_path, branch,
         original_working_dir = os.getcwd()
         os.chdir(encrypted_working_dir)
         if always_fetch:
-            check_run_system('GIT_SSH_COMMAND="{ssh_command}" git fetch'.format(ssh_command=ssh_command))
+            check_run_system('GIT_SSH_COMMAND="{ssh_command}" git fetch --all'.format(ssh_command=ssh_command))
         check_run_system('git checkout "{branch}"'.format(branch=branch))
         if always_fetch:
             check_run_system('GIT_SSH_COMMAND="{ssh_command}" git pull'.format(ssh_command=ssh_command))

submodules/AccountContext/Sources/AccountContext.swift

@@ -1186,7 +1186,7 @@ public protocol SharedAccountContext: AnyObject {
     func makeHashtagSearchController(context: AccountContext, peer: EnginePeer?, query: String, stories: Bool, forceDark: Bool) -> ViewController
     func makeStorySearchController(context: AccountContext, scope: StorySearchControllerScope, listContext: SearchStoryListContext?) -> ViewController
     func makeMyStoriesController(context: AccountContext, isArchive: Bool) -> ViewController
-    func makeStorySelectionController(context: AccountContext, peerId: EnginePeer.Id, completion: @escaping ([EngineStoryItem]) -> Void) -> ViewController
+    func makeStorySelectionController(context: AccountContext, peerId: EnginePeer.Id, excludeIds: [Int32], completion: @escaping ([EngineStoryItem]) -> Void) -> ViewController
     func makeArchiveSettingsController(context: AccountContext) -> ViewController
     func makeFilterSettingsController(context: AccountContext, modal: Bool, scrollToTags: Bool, dismissed: (() -> Void)?) -> ViewController
     func makeBusinessSetupScreen(context: AccountContext) -> ViewController

submodules/AccountContext/Sources/ChatController.swift

@@ -48,6 +48,7 @@ public final class ChatMessageItemAssociatedData: Equatable {
     public let availableMessageEffects: AvailableMessageEffects?
     public let savedMessageTags: SavedMessageTags?
     public let defaultReaction: MessageReaction.Reaction?
+    public let areStarReactionsEnabled: Bool
     public let isPremium: Bool
     public let forceInlineReactions: Bool
     public let alwaysDisplayTranscribeButton: DisplayTranscribeButton
@@ -83,6 +84,7 @@ public final class ChatMessageItemAssociatedData: Equatable {
         availableMessageEffects: AvailableMessageEffects?,
         savedMessageTags: SavedMessageTags?,
         defaultReaction: MessageReaction.Reaction?,
+        areStarReactionsEnabled: Bool,
         isPremium: Bool,
         accountPeer: EnginePeer?,
         forceInlineReactions: Bool = false,
@@ -117,6 +119,7 @@ public final class ChatMessageItemAssociatedData: Equatable {
         self.availableMessageEffects = availableMessageEffects
         self.savedMessageTags = savedMessageTags
         self.defaultReaction = defaultReaction
+        self.areStarReactionsEnabled = areStarReactionsEnabled
         self.isPremium = isPremium
         self.accountPeer = accountPeer
         self.forceInlineReactions = forceInlineReactions

submodules/Components/ReactionButtonListComponent/Sources/ReactionButtonListComponent.swift

@@ -842,11 +842,13 @@ public final class ReactionButtonAsyncNode: ContextControllerSourceView {
                 let compactString = countString(Int64(spec.component.count))
                 #endif
 
-                for character in compactString {
-                    counterComponents.append(String(character))
-                }
-                for character in "\(spec.component.count)" {
-                    extractedCounterComponents.append(String(character))
+                if spec.component.count != 0 {
+                    for character in compactString {
+                        counterComponents.append(String(character))
+                    }
+                    for character in "\(spec.component.count)" {
+                        extractedCounterComponents.append(String(character))
+                    }
                 }
             }
 

submodules/PremiumUI/Sources/BadgeLabelView.swift

@@ -7,6 +7,7 @@ private let labelWidth: CGFloat = 16.0
 private let labelHeight: CGFloat = 36.0
 private let labelSize = CGSize(width: labelWidth, height: labelHeight)
 private let font = Font.with(size: 24.0, design: .round, weight: .semibold, traits: [])
+private let suffixFont = Font.with(size: 22.0, design: .regular, weight: .regular, traits: [])
 
 final class BadgeLabelView: UIView {
     private class StackView: UIView {
@@ -76,7 +77,9 @@ final class BadgeLabelView: UIView {
     }
 
     private var itemViews: [Int: StackView] = [:]
-    private var staticLabel = UILabel()
+    private var staticLabel = ImmediateTextNode()
+    
+    private var params: (value: String, suffix: String?)?
 
     init() {
         super.init(frame: .zero)
@@ -91,31 +94,49 @@ final class BadgeLabelView: UIView {
 
     var color: UIColor = .white {
         didSet {
-            self.staticLabel.textColor = self.color
+            if let params {
+                self.staticLabel.attributedText = BadgeLabelView.makeText(value: params.value, suffix: params.suffix, color: self.color)
+                let _ = self.staticLabel.updateLayout(CGSize(width: 1000.0, height: 1000.0))
+            }
             for (_, view) in self.itemViews {
                 view.color = self.color
             }
         }
     }
 
-    func update(value: String, transition: ComponentTransition) -> CGSize {
-        if value.contains(" ") || value.contains(".") || value.contains(where: { !$0.isNumber }) {
+    static func makeText(value: String, suffix: String?, color: UIColor) -> NSAttributedString {
+        let string = NSMutableAttributedString()
+        string.append(NSAttributedString(string: value, font: font, textColor: color))
+        if let suffix {
+            string.append(NSAttributedString(string: suffix, font: suffixFont, textColor: color.withMultipliedAlpha(0.6)))
+        }
+        return string
+    }
+    
+    static func calculateSize(value: String, suffix: String?) -> CGSize {
+        let textView = ImmediateTextView()
+        textView.attributedText = BadgeLabelView.makeText(value: value, suffix: suffix, color: .black)
+        return textView.updateLayout(CGSize(width: 1000.0, height: 1000.0))
+    }
+    
+    func update(value: String, suffix: String?, transition: ComponentTransition) -> CGSize {
+        self.params = (value, suffix)
+        
+        if value.contains(" ") || value.contains(".") || value.contains(where: { !$0.isNumber }) || suffix != nil {
             for (_, view) in self.itemViews {
                 view.isHidden = true
             }
 
-            if self.staticLabel.superview == nil {
-                self.staticLabel.textColor = self.color
-                self.staticLabel.font = font
-                
-                self.addSubview(self.staticLabel)
+            if self.staticLabel.view.superview == nil {
+                self.addSubview(self.staticLabel.view)
             }
 
-            self.staticLabel.text = value
-            let size = self.staticLabel.sizeThatFits(CGSize(width: 100.0, height: 100.0))
-            self.staticLabel.frame = CGRect(origin: .zero, size: CGSize(width: size.width, height: labelHeight))
+            self.staticLabel.attributedText = BadgeLabelView.makeText(value: value, suffix: suffix, color: self.color)
+            
+            let size = self.staticLabel.updateLayout(CGSize(width: 1000.0, height: 1000.0))
+            self.staticLabel.frame = CGRect(origin: CGPoint(x: 0.0, y: 3.0), size: CGSize(width: size.width, height: labelHeight))
 
-            return CGSize(width: ceil(self.staticLabel.bounds.width), height: ceil(self.staticLabel.bounds.height))
+            return size
         }
 
         let string = value

submodules/PremiumUI/Sources/PremiumLimitScreen.swift

@@ -53,6 +53,7 @@ public class PremiumLimitDisplayComponent: Component {
     private let activeTitleColor: UIColor
     private let badgeIconName: String?
     private let badgeText: String?
+    private let badgeTextSuffix: String?
     private let badgePosition: CGFloat
     private let badgeGraphPosition: CGFloat
     private let invertProgress: Bool
@@ -69,6 +70,7 @@ public class PremiumLimitDisplayComponent: Component {
         activeTitleColor: UIColor,
         badgeIconName: String?,
         badgeText: String?,
+        badgeTextSuffix: String? = nil,
         badgePosition: CGFloat,
         badgeGraphPosition: CGFloat,
         invertProgress: Bool = false,
@@ -84,6 +86,7 @@ public class PremiumLimitDisplayComponent: Component {
         self.activeTitleColor = activeTitleColor
         self.badgeIconName = badgeIconName
         self.badgeText = badgeText
+        self.badgeTextSuffix = badgeTextSuffix
         self.badgePosition = badgePosition
         self.badgeGraphPosition = badgeGraphPosition
         self.invertProgress = invertProgress
@@ -121,6 +124,9 @@ public class PremiumLimitDisplayComponent: Component {
         if lhs.badgeText != rhs.badgeText {
             return false
         }
+        if lhs.badgeTextSuffix != rhs.badgeTextSuffix {
+            return false
+        }
         if lhs.badgePosition != rhs.badgePosition {
             return false
         }
@@ -197,7 +203,7 @@ public class PremiumLimitDisplayComponent: Component {
             self.badgeIcon.contentMode = .center
 
             self.badgeLabel = BadgeLabelView()
-            let _ = self.badgeLabel.update(value: "0", transition: .immediate)
+            let _ = self.badgeLabel.update(value: "0", suffix: nil, transition: .immediate)
             self.badgeLabel.mask = self.badgeLabelMaskView
 
             super.init(frame: frame)
@@ -312,7 +318,7 @@ public class PremiumLimitDisplayComponent: Component {
                 if from == nil {
                     frameTransition = frameTransition.withAnimation(.none)
                 }
-                let badgeLabelSize = self.badgeLabel.update(value: badgeText, transition: transition)
+                let badgeLabelSize = self.badgeLabel.update(value: badgeText, suffix: component.badgeTextSuffix, transition: transition)
                 frameTransition.setFrame(view: self.badgeLabel, frame: CGRect(origin: CGPoint(x: 14.0 + floorToScreenPixels((badgeFullSize.width - badgeLabelSize.width) / 2.0), y: 5.0), size: badgeLabelSize))
             }
         }
@@ -514,22 +520,7 @@ public class PremiumLimitDisplayComponent: Component {
 
             let countWidth: CGFloat
             if let badgeText = component.badgeText {
-                switch badgeText.count {
-                    case 1:
-                        countWidth = 20.0
-                    case 2:
-                        countWidth = 35.0
-                    case 3:
-                        countWidth = 51.0
-                    case 4:
-                        countWidth = 60.0
-                    case 5:
-                        countWidth = 74.0
-                    case 6:
-                        countWidth = 88.0
-                    default:
-                        countWidth = 51.0
-                }
+                countWidth = BadgeLabelView.calculateSize(value: badgeText, suffix: component.badgeTextSuffix).width + 4.0
             } else {
                 countWidth = 51.0
             }
@@ -603,15 +594,15 @@ public class PremiumLimitDisplayComponent: Component {
             }
 
             self.badgeIcon.frame = CGRect(x: 10.0, y: 9.0, width: 30.0, height: 30.0)
-            self.badgeLabelMaskView.frame = CGRect(x: 0.0, y: 0.0, width: 100.0, height: 36.0)
+            self.badgeLabelMaskView.frame = CGRect(x: 0.0, y: 0.0, width: 200.0, height: 36.0)
 
             if component.isPremiumDisabled {
                 if !self.didPlayAppearanceAnimation {
                     self.didPlayAppearanceAnimation = true
 
                     self.badgeView.alpha = 1.0
                     if let badgeText = component.badgeText {
-                        let badgeLabelSize = self.badgeLabel.update(value: badgeText, transition: .immediate)
+                        let badgeLabelSize = self.badgeLabel.update(value: badgeText, suffix: component.badgeTextSuffix, transition: .immediate)
                         transition.setFrame(view: self.badgeLabel, frame: CGRect(origin: CGPoint(x: 14.0 + floorToScreenPixels((badgeFullSize.width - badgeLabelSize.width) / 2.0), y: 5.0), size: badgeLabelSize))
                     }
                 }
@@ -621,7 +612,7 @@ public class PremiumLimitDisplayComponent: Component {
                     if component.badgePosition < 0.1 {
                         self.badgeView.alpha = 1.0
                         if let badgeText = component.badgeText {
-                            let badgeLabelSize = self.badgeLabel.update(value: badgeText, transition: .immediate)
+                            let badgeLabelSize = self.badgeLabel.update(value: badgeText, suffix: component.badgeTextSuffix, transition: .immediate)
                             transition.setFrame(view: self.badgeLabel, frame: CGRect(origin: CGPoint(x: 14.0 + floorToScreenPixels((badgeFullSize.width - badgeLabelSize.width) / 2.0), y: 5.0), size: badgeLabelSize))
                         }
                     } else {

submodules/TelegramCore/Sources/TelegramEngine/Messages/StoryListContext.swift

@@ -862,7 +862,7 @@ public final class PeerStoryListContext: StoryListContext {
 
                 #if DEBUG
                 if folderId != nil {
-                    signal = signal |> delay(2.0, queue: queue)
+                    //signal = signal |> delay(2.0, queue: queue)
                 }
                 #endif
 
@@ -1412,21 +1412,25 @@ public final class PeerStoryListContext: StoryListContext {
                     switch result {
                     case let .storyAlbum(_, albumId, _, _, _):
                         var state = self.stateValue
-                        state.availableFolders.insert(StoryListContextState.Folder(id: Int64(albumId), title: title), at: 0)
+                        state.availableFolders.append(StoryListContextState.Folder(id: Int64(albumId), title: title))
                         self.stateValue = state
 
                         let peerId = self.peerId
-                        let isArchived = self.isArchived
                         let items = state.items
                         let pinnedIds = state.pinnedIds
                         let totalCount = state.totalCount
-                        let folders = state.availableFolders
                         let _ = (self.account.postbox.transaction { transaction -> Void in
                             let key = ValueBoxKey(length: 8 + 1)
                             key.setInt64(0, value: peerId.toInt64())
-                            key.setInt8(8, value: isArchived ? 1 : 0)
-                            if let entry = CodableEntry(CachedPeerStoryListHead(items: items.prefix(100).map { .item($0.storyItem.asStoryItem()) }, pinnedIds: pinnedIds, totalCount: Int32(totalCount), folders: folders)) {
-                                transaction.putItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.cachedPeerStoryListHeads, key: key), entry: entry)
+                            key.setInt8(8, value: 0)
+                            
+                            if let cached = transaction.retrieveItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.cachedPeerStoryListHeads, key: key))?.get(CachedPeerStoryListHead.self) {
+                                var updatedFolders: [State.Folder] = []
+                                updatedFolders = cached.folders
+                                updatedFolders.append(StoryListContextState.Folder(id: Int64(albumId), title: title))
+                                if let entry = CodableEntry(CachedPeerStoryListHead(items: items.prefix(100).map { .item($0.storyItem.asStoryItem()) }, pinnedIds: pinnedIds, totalCount: Int32(totalCount), folders: updatedFolders)) {
+                                    transaction.putItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.cachedPeerStoryListHeads, key: key), entry: entry)
+                                }
                             }
 
                             let mappedItems = items.map { item in
@@ -1437,7 +1441,7 @@ public final class PeerStoryListContext: StoryListContext {
                             folderKey.setInt64(0, value: peerId.toInt64())
                             folderKey.setInt8(8, value: 0)
                             folderKey.setInt64(8 + 1, value: Int64(albumId))
-                            if let entry = CodableEntry(CachedPeerStoryListHead(items: [], pinnedIds: [], totalCount: Int32(mappedItems.count), folders: [])) {
+                            if let entry = CodableEntry(CachedPeerStoryListHead(items: mappedItems.map { .item($0) }, pinnedIds: [], totalCount: Int32(mappedItems.count), folders: [])) {
                                 transaction.putItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.cachedPeerStoryListHeads, key: folderKey), entry: entry)
                             }
                         } |> deliverOn(self.queue)).start(completed: {
@@ -2008,6 +2012,21 @@ public final class PeerStoryListContext: StoryListContext {
             return (peerReference, result)
         }
     }
+    
+    public static func cachedFolderState(peerId: EnginePeer.Id, account: Account, folderId: Int64) -> Signal<(count: Int, ids: [Int32])?, NoError> {
+        return account.postbox.transaction { transaction -> (count: Int, ids: [Int32])? in
+            let key = ValueBoxKey(length: 8 + 1 + 8)
+            key.setInt64(0, value: peerId.toInt64())
+            key.setInt8(8, value: 0)
+            key.setInt64(8 + 1, value: folderId)
+            
+            if let cached = transaction.retrieveItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.cachedPeerStoryListHeads, key: key))?.get(CachedPeerStoryListHead.self) {
+                return (Int(cached.totalCount), cached.items.map(\.id))
+            } else {
+                return nil
+            }
+        }
+    }
 }
 
 public final class SearchStoryListContext: StoryListContext {

submodules/TelegramUI/Components/BottomButtonPanelComponent/BUILD

@@ -15,7 +15,8 @@ swift_library(
         "//submodules/ComponentFlow",
         "//submodules/TelegramPresentationData",
         "//submodules/Components/ComponentDisplayAdapters",
-        "//submodules/Components/SolidRoundedButtonComponent",
+        "//submodules/Components/MultilineTextComponent",
+        "//submodules/TelegramUI/Components/ButtonComponent",
     ],
     visibility = [
         "//visibility:public",