Various fixes

laktyushin · laktyushin · commit c026f5af0b1c · 2025-02-27T03:20:51.000+04:00
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Payments/StarGifts.swift b/submodules/TelegramCore/Sources/TelegramEngine/Payments/StarGifts.swift
@@ -1150,9 +1150,33 @@ private final class ProfileGiftsContextImpl {
         self.actionDisposable.set(
             _internal_updateStarGiftAddedToProfile(account: self.account, reference: reference, added: added).startStrict()
         )
+        
         if let index = self.gifts.firstIndex(where: { $0.reference == reference }) {
-            self.gifts[index] = self.gifts[index].withSavedToProfile(added)
+            if !added && self.gifts[index].pinnedToTop {
+                let pinnedGifts = self.gifts.filter { $0.pinnedToTop && $0.reference != reference }
+                let existingGifts = Set(pinnedGifts.compactMap { $0.reference })
+                
+                var updatedGifts: [ProfileGiftsContext.State.StarGift] = []
+                for gift in self.gifts {
+                    if let reference = gift.reference, existingGifts.contains(reference) {
+                        continue
+                    }
+                    var gift = gift
+                    if gift.reference == reference {
+                        gift = gift.withPinnedToTop(false).withSavedToProfile(false)
+                    }
+                    updatedGifts.append(gift)
+                }
+                updatedGifts.sort { lhs, rhs in
+                    lhs.date > rhs.date
+                }
+                updatedGifts.insert(contentsOf: pinnedGifts, at: 0)
+                self.gifts = updatedGifts
+            } else {
+                self.gifts[index] = self.gifts[index].withSavedToProfile(added)
+            }
         }
+        
         if let index = self.filteredGifts.firstIndex(where: { $0.reference == reference }) {
             self.filteredGifts[index] = self.filteredGifts[index].withSavedToProfile(added)
             if !self.filter.contains(.hidden) && !added {
@@ -1164,9 +1188,14 @@ private final class ProfileGiftsContextImpl {
     
     func updateStarGiftPinnedToTop(reference: StarGiftReference, pinnedToTop: Bool) {
         var pinnedGifts = self.gifts.filter { $0.pinnedToTop }
+        var saveToProfile = false
         if var gift = self.gifts.first(where: { $0.reference == reference }) {
             gift = gift.withPinnedToTop(pinnedToTop)
             if pinnedToTop {
+                if !gift.savedToProfile {
+                    gift = gift.withSavedToProfile(true)
+                    saveToProfile = true
+                }
                 pinnedGifts.append(gift)
             } else {
                 pinnedGifts.removeAll(where: { $0.reference == reference })
@@ -1192,22 +1221,35 @@ private final class ProfileGiftsContextImpl {
         }
         self.pushState()
         
+        var signal = _internal_updateStarGiftsPinnedToTop(account: self.account, peerId: self.peerId, references: pinnedGifts.compactMap { $0.reference })
+        
+        if saveToProfile {
+            signal = _internal_updateStarGiftAddedToProfile(account: self.account, reference: reference, added: true)
+            |> then(signal)
+        }
+        
         self.actionDisposable.set(
-            _internal_updateStarGiftsPinnedToTop(account: self.account, peerId: self.peerId, references: pinnedGifts.compactMap { $0.reference }).startStrict(completed: { [weak self] in
+            (signal |> deliverOn(self.queue)).startStrict(completed: { [weak self] in
                 self?.reload()
             })
         )
     }
     
     public func updatePinnedToTopStarGifts(references: [StarGiftReference]) {
         let existingGifts = Set(references)
+        var saveSignals: [Signal<Never, NoError>] = []
         let currentPinnedGifts = self.gifts.filter { gift in
             if let reference = gift.reference {
                 return existingGifts.contains(reference)
             } else {
                 return false
             }
-        }.map { $0.withPinnedToTop(true) }
+        }.map { gift in
+            if !gift.savedToProfile, let reference = gift.reference {
+                saveSignals.append(_internal_updateStarGiftAddedToProfile(account: self.account, reference: reference, added: true))
+            }
+            return gift.withPinnedToTop(true).withSavedToProfile(true)
+        }
         
         var updatedGifts: [ProfileGiftsContext.State.StarGift] = []
         for gift in self.gifts {
@@ -1231,8 +1273,15 @@ private final class ProfileGiftsContextImpl {
         
         self.pushState()
         
+        var signal = _internal_updateStarGiftsPinnedToTop(account: self.account, peerId: self.peerId, references: pinnedGifts.compactMap { $0.reference })
+        if !saveSignals.isEmpty {
+            signal = combineLatest(saveSignals)
+            |> ignoreValues
+            |> then(signal)
+        }
+        
         self.actionDisposable.set(
-            _internal_updateStarGiftsPinnedToTop(account: self.account, peerId: self.peerId, references: pinnedGifts.compactMap { $0.reference }).startStrict(completed: { [weak self] in
+            (signal |> deliverOn(self.queue)).startStrict(completed: { [weak self] in
                 self?.reload()
             })
         )
diff --git a/submodules/TelegramUI/Components/Gifts/GiftItemComponent/Sources/GiftItemComponent.swift b/submodules/TelegramUI/Components/Gifts/GiftItemComponent/Sources/GiftItemComponent.swift
@@ -664,7 +664,7 @@ public final class GiftItemComponent: Component {
             
             var iconBackgroundSize: CGSize?
             if component.isEditing {
-                if !component.isPinned {
+                if !component.isPinned && backgroundColor != nil {
                     iconBackgroundSize = CGSize(width: 48.0, height: 48.0)
                 }
             } else {
@@ -710,7 +710,7 @@ public final class GiftItemComponent: Component {
                 iconBackground.layer.animateScale(from: 1.0, to: 0.01, duration: 0.2, removeOnCompletion: false)
             }
             
-            if component.isPinned || component.isEditing {
+            if component.isPinned || (component.isEditing && backgroundColor != nil) {
                 let pinnedIcon: UIImageView
                 if let currentIcon = self.pinnedIcon {
                     pinnedIcon = currentIcon
diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoPaneContainerNode.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoPaneContainerNode.swift
@@ -43,9 +43,11 @@ final class PeerInfoPaneTabsContainerPaneNode: ASDisplayNode {
     
     private let titleNode: ImmediateTextNode
     private let buttonNode: HighlightTrackingButtonNode
-    private var iconLayers: [InlineStickerItemLayer] = []
+    private var iconLayers: [AnyHashable: InlineStickerItemLayer] = [:]
     
     private var isSelected: Bool = false
+    private var icons: [ProfileGiftsContext.State.StarGift] = []
+    private var titleWidth: CGFloat?
     
     init(pressed: @escaping () -> Void) {
         self.pressed = pressed
@@ -67,27 +69,53 @@ final class PeerInfoPaneTabsContainerPaneNode: ASDisplayNode {
         self.pressed()
     }
     
-    func updateText(context: AccountContext, title: String, icons: [TelegramMediaFile] = [], isSelected: Bool, presentationData: PresentationData) {
+    func updateText(context: AccountContext, title: String, icons: [ProfileGiftsContext.State.StarGift] = [], isSelected: Bool, presentationData: PresentationData) {
         self.isSelected = isSelected
         self.titleNode.attributedText = NSAttributedString(string: title, font: Font.medium(14.0), textColor: isSelected ? presentationData.theme.list.itemAccentColor : presentationData.theme.list.itemSecondaryTextColor)
+        self.icons = icons
         
         if !icons.isEmpty {
-            if self.iconLayers.isEmpty {
-                for icon in icons {
-                    let iconSize = CGSize(width: 18.0, height: 18.0)
+            var validIds = Set<AnyHashable>()
+            var index = 0
+            for icon in icons {
+                let id: AnyHashable
+                if let reference = icon.reference {
+                    id = reference
+                } else {
+                    id = index
+                }
+                validIds.insert(id)
+                
+                let iconSize = CGSize(width: 18.0, height: 18.0)
+                if let _ = self.iconLayers[id] {
+                    
+                } else {
+                    var file: TelegramMediaFile?
+                    switch icon.gift {
+                    case let .generic(gift):
+                        file = gift.file
+                    case let .unique(gift):
+                        for attribute in gift.attributes {
+                            if case let .model(_, fileValue, _) = attribute {
+                                file = fileValue
+                            }
+                        }
+                    }
+                    guard let file else {
+                        continue
+                    }
                     
                     let emoji = ChatTextInputTextCustomEmojiAttribute(
                         interactivelySelectedFromPackId: nil,
-                        fileId: icon.fileId.id,
-                        file: icon
+                        fileId: file.fileId.id,
+                        file: file
                     )
-                    
                     let animationLayer = InlineStickerItemLayer(
                         context: .account(context),
                         userLocation: .other,
                         attemptSynchronousLoad: false,
                         emoji: emoji,
-                        file: icon,
+                        file: file,
                         cache: context.animationCache,
                         renderer: context.animationRenderer,
                         unique: true,
@@ -96,12 +124,30 @@ final class PeerInfoPaneTabsContainerPaneNode: ASDisplayNode {
                         loopCount: 1
                     )
                     animationLayer.isVisibleForAnimations = true
-                    self.iconLayers.append(animationLayer)
+                    self.iconLayers[id] = animationLayer
                     self.layer.addSublayer(animationLayer)
+                    
+                    animationLayer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                    animationLayer.animateScale(from: 0.01, to: 1.0, duration: 0.2)
+                }
+                index += 1
+            }
+            
+            var removeIds: [AnyHashable] = []
+            for (id, layer) in self.iconLayers {
+                if !validIds.contains(id) {
+                    removeIds.append(id)
+                    layer.animateScale(from: 1.0, to: 0.01, duration: 0.25, removeOnCompletion: false)
+                    layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.25, removeOnCompletion: false, completion: { _ in
+                        layer.removeFromSuperlayer()
+                    })
                 }
             }
+            for id in removeIds {
+                self.iconLayers.removeValue(forKey: id)
+            }
         } else {
-            for layer in self.iconLayers {
+            for (_, layer) in self.iconLayers {
                 layer.removeFromSuperlayer()
             }
             self.iconLayers.removeAll()
@@ -115,24 +161,54 @@ final class PeerInfoPaneTabsContainerPaneNode: ASDisplayNode {
     }
     
     func updateLayout(height: CGFloat) -> CGFloat {
-        var totalWidth: CGFloat = 0.0
         let titleSize = self.titleNode.updateLayout(CGSize(width: 200.0, height: .greatestFiniteMagnitude))
+        let iconSize = CGSize(width: 18.0, height: 18.0)
+        let spacing: CGFloat = 1.0
+        
         self.titleNode.frame = CGRect(origin: CGPoint(x: 0.0, y: floor((height - titleSize.height) / 2.0)), size: titleSize)
-        totalWidth = titleSize.width
+        self.titleWidth = titleSize.width
         
+        var totalWidth = titleSize.width
         if !self.iconLayers.isEmpty {
             totalWidth += 2.0
-            let iconSize = CGSize(width: 18.0, height: 18.0)
-            let spacing: CGFloat = 1.0
-            for iconlayer in self.iconLayers {
-                iconlayer.frame = CGRect(origin: CGPoint(x: totalWidth, y: 15.0), size: iconSize)
-                totalWidth += iconSize.width + spacing
-            }
+            totalWidth += (iconSize.width + spacing) * CGFloat(self.iconLayers.count)
             totalWidth -= spacing
         }
+
+        self.layoutIcons(transition: .animated(duration: 0.3, curve: .spring))
+
         return totalWidth
     }
     
+    func layoutIcons(transition: ContainedViewLayoutTransition) {
+        guard let titleWidth = self.titleWidth else {
+            return
+        }
+        let iconSize = CGSize(width: 18.0, height: 18.0)
+        let spacing: CGFloat = 1.0
+
+        var origin = CGPoint(x: titleWidth + 2.0, y: 15.0)
+        
+        var index = 0
+        for icon in self.icons {
+            let id: AnyHashable
+            if let reference = icon.reference {
+                id = reference
+            } else {
+                id = index
+            }
+            if let layer = self.iconLayers[id] {
+                var iconTransition = transition
+                if layer.frame.width.isZero {
+                    iconTransition = .immediate
+                }
+                iconTransition.updateFrame(layer: layer, frame: CGRect(origin: origin, size: iconSize))
+            }
+            origin.x += iconSize.width + spacing
+            index += 1
+        }
+    }
+    
     func updateArea(size: CGSize, sideInset: CGFloat) {
         self.buttonNode.frame = CGRect(origin: CGPoint(x: -sideInset, y: 0.0), size: CGSize(width: size.width + sideInset * 2.0, height: size.height))
     }
@@ -141,7 +217,7 @@ final class PeerInfoPaneTabsContainerPaneNode: ASDisplayNode {
 struct PeerInfoPaneSpecifier: Equatable {
     var key: PeerInfoPaneKey
     var title: String
-    var icons: [TelegramMediaFile]
+    var icons: [ProfileGiftsContext.State.StarGift]
 }
 
 private func interpolateFrame(from fromValue: CGRect, to toValue: CGRect, t: CGFloat) -> CGRect {
@@ -1189,7 +1265,7 @@ final class PeerInfoPaneContainerNode: ASDisplayNode, ASGestureRecognizerDelegat
 
         self.tabsContainerNode.update(size: CGSize(width: size.width - sideInset * 2.0, height: tabsHeight), presentationData: presentationData, paneList: availablePanes.map { key in
             let title: String
-            var icons: [TelegramMediaFile] = []
+            var icons: [ProfileGiftsContext.State.StarGift] = []
             switch key {
             case .stories:
                 title = presentationData.strings.PeerInfo_PaneStories
@@ -1223,19 +1299,9 @@ final class PeerInfoPaneContainerNode: ASDisplayNode, ASGestureRecognizerDelegat
                 title = presentationData.strings.PeerInfo_SavedMessagesTabTitle
             case .gifts:
                 title = presentationData.strings.PeerInfo_PaneGifts
-                icons = data?.profileGiftsContext?.currentState?.gifts.prefix(3).compactMap { gift in
-                    switch gift.gift {
-                    case let .generic(gift):
-                        return gift.file
-                    case let .unique(gift):
-                        for attribute in gift.attributes {
-                            if case let .model(_, file, _) = attribute {
-                                return file
-                            }
-                        }
-                        return nil
-                    }
-                } ?? []
+                if let gifts = data?.profileGiftsContext?.currentState?.gifts.prefix(3) {
+                    icons = Array(gifts)
+                }
             }
             return PeerInfoPaneSpecifier(key: key, title: title, icons: icons)
         }, selectedPane: self.currentPaneKey, disableSwitching: disableTabSwitching, transitionFraction: self.transitionFraction, transition: transition)
diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoGiftsPaneNode.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoGiftsPaneNode.swift
