Various improvements

laktyushin · laktyushin · commit a42f04ba5091 · 2025-03-02T05:39:00.000+04:00
diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoCoverComponent/Sources/PeerInfoGiftsCoverComponent.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoCoverComponent/Sources/PeerInfoGiftsCoverComponent.swift
@@ -19,12 +19,13 @@ public final class PeerInfoGiftsCoverComponent: Component {
     public let giftsContext: ProfileGiftsContext
     public let hasBackground: Bool
     public let avatarCenter: CGPoint
+    public let defaultHeight: CGFloat
     public let avatarTransitionFraction: CGFloat
     public let statusBarHeight: CGFloat
     public let topLeftButtonsSize: CGSize
     public let topRightButtonsSize: CGSize
     public let titleWidth: CGFloat
-    public let hasButtons: Bool
+    public let bottomHeight: CGFloat
     public let action: (ProfileGiftsContext.State.StarGift) -> Void
     
     public init(
@@ -33,25 +34,27 @@ public final class PeerInfoGiftsCoverComponent: Component {
         giftsContext: ProfileGiftsContext,
         hasBackground: Bool,
         avatarCenter: CGPoint,
+        defaultHeight: CGFloat,
         avatarTransitionFraction: CGFloat,
         statusBarHeight: CGFloat,
         topLeftButtonsSize: CGSize,
         topRightButtonsSize: CGSize,
         titleWidth: CGFloat,
-        hasButtons: Bool,
+        bottomHeight: CGFloat,
         action: @escaping (ProfileGiftsContext.State.StarGift) -> Void
     ) {
         self.context = context
         self.peerId = peerId
         self.giftsContext = giftsContext
         self.hasBackground = hasBackground
         self.avatarCenter = avatarCenter
+        self.defaultHeight = defaultHeight
         self.avatarTransitionFraction = avatarTransitionFraction
         self.statusBarHeight = statusBarHeight
         self.topLeftButtonsSize = topLeftButtonsSize
         self.topRightButtonsSize = topRightButtonsSize
         self.titleWidth = titleWidth
-        self.hasButtons = hasButtons
+        self.bottomHeight = bottomHeight
         self.action = action
     }
     
@@ -68,6 +71,9 @@ public final class PeerInfoGiftsCoverComponent: Component {
         if lhs.avatarCenter != rhs.avatarCenter {
             return false
         }
+        if lhs.defaultHeight != rhs.defaultHeight {
+            return false
+        }
         if lhs.avatarTransitionFraction != rhs.avatarTransitionFraction {
             return false
         }
@@ -83,7 +89,7 @@ public final class PeerInfoGiftsCoverComponent: Component {
         if lhs.titleWidth != rhs.titleWidth {
             return false
         }
-        if lhs.hasButtons != rhs.hasButtons {
+        if lhs.bottomHeight != rhs.bottomHeight {
             return false
         }
         return true
@@ -196,20 +202,25 @@ public final class PeerInfoGiftsCoverComponent: Component {
             }
             
             if !giftIds.isEmpty && (self.iconPositions.isEmpty || previousCurrentSize?.width != availableSize.width || (previousComponent != nil && previousComponent?.hasBackground != component.hasBackground) || self.appliedGiftIds != giftIds) {
+                var avatarCenter = component.avatarCenter
+                if avatarCenter.y < 0.0 {
+                    avatarCenter.y = component.statusBarHeight + 75.0
+                }
+                
                 var excludeRects: [CGRect] = []
                 if component.statusBarHeight > 0.0 {
                     excludeRects.append(CGRect(origin: .zero, size: CGSize(width: availableSize.width, height: component.statusBarHeight + 4.0)))
                 }
                 excludeRects.append(CGRect(origin: CGPoint(x: 0.0, y: component.statusBarHeight), size: component.topLeftButtonsSize))
                 excludeRects.append(CGRect(origin: CGPoint(x: availableSize.width - component.topRightButtonsSize.width, y: component.statusBarHeight), size: component.topRightButtonsSize))
-                excludeRects.append(CGRect(origin: CGPoint(x: floor((availableSize.width - component.titleWidth) / 2.0), y: component.avatarCenter.y + 56.0), size: CGSize(width: component.titleWidth, height: 72.0)))
-                if component.hasButtons {
-                    excludeRects.append(CGRect(origin: CGPoint(x: 0.0, y: availableSize.height - 81.0), size: CGSize(width: availableSize.width, height: 81.0)))
+                excludeRects.append(CGRect(origin: CGPoint(x: floor((availableSize.width - component.titleWidth) / 2.0), y: avatarCenter.y + 56.0), size: CGSize(width: component.titleWidth, height: 72.0)))
+                if component.bottomHeight > 0.0 {
+                    excludeRects.append(CGRect(origin: CGPoint(x: 0.0, y: component.defaultHeight - component.bottomHeight), size: CGSize(width: availableSize.width, height: component.bottomHeight)))
                 }
-                                
+                                                
                 let positionGenerator = PositionGenerator(
-                    containerSize: availableSize,
-                    centerFrame: CGSize(width: 100, height: 100).centered(around: component.avatarCenter),
+                    containerSize: CGSize(width: availableSize.width, height: component.defaultHeight),
+                    centerFrame: CGSize(width: 100, height: 100).centered(around: avatarCenter),
                     exclusionZones: excludeRects,
                     minimumDistance: 42.0,
                     edgePadding: 5.0,
@@ -581,7 +592,7 @@ private class GiftIconLayer: SimpleLayer {
             let hoverDuration = TimeInterval.random(in: 3.5 ..< 4.5)
             
             let hoverAnimation = CABasicAnimation(keyPath: "transform.translation.y")
-            hoverAnimation.duration = duration
+            hoverAnimation.duration = hoverDuration
             hoverAnimation.fromValue = -upDistance
             hoverAnimation.toValue = downDistance
             hoverAnimation.autoreverses = true
diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoData.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoData.swift
@@ -954,7 +954,7 @@ func peerInfoScreenSettingsData(context: AccountContext, peerId: EnginePeer.Id,
     }
 }
 
-func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, isSettings: Bool, isMyProfile: Bool, hintGroupInCommon: PeerId?, existingRequestsContext: PeerInvitationImportersContext?, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?>, privacySettings: Signal<AccountPrivacySettings?, NoError>, forceHasGifts: Bool) -> Signal<PeerInfoScreenData, NoError> {
+func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, isSettings: Bool, isMyProfile: Bool, hintGroupInCommon: PeerId?, existingRequestsContext: PeerInvitationImportersContext?, existingProfileGiftsContext: ProfileGiftsContext?, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?>, privacySettings: Signal<AccountPrivacySettings?, NoError>, forceHasGifts: Bool) -> Signal<PeerInfoScreenData, NoError> {
     return peerInfoScreenInputData(context: context, peerId: peerId, isSettings: isSettings)
     |> mapToSignal { inputData -> Signal<PeerInfoScreenData, NoError> in
         let wasUpgradedGroup = Atomic<Bool?>(value: nil)
@@ -1021,7 +1021,7 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
             let profileGiftsContext: ProfileGiftsContext?
             if case .user = kind {
                 if isMyProfile || userPeerId != context.account.peerId {
-                    profileGiftsContext = ProfileGiftsContext(account: context.account, peerId: userPeerId)
+                    profileGiftsContext = existingProfileGiftsContext ?? ProfileGiftsContext(account: context.account, peerId: userPeerId)
                 } else {
                     profileGiftsContext = nil
                 }
diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoHeaderNode.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoHeaderNode.swift
@@ -2351,12 +2351,13 @@ final class PeerInfoHeaderNode: ASDisplayNode {
                     giftsContext: profileGiftsContext,
                     hasBackground: hasBackground,
                     avatarCenter: apparentAvatarFrame.center,
+                    defaultHeight: backgroundDefaultHeight,
                     avatarTransitionFraction: max(0.0, min(1.0, titleCollapseFraction + transitionFraction * 2.0)),
                     statusBarHeight: statusBarHeight,
                     topLeftButtonsSize: CGSize(width: (self.isSettings ? 57.0 : 47.0), height: 46.0),
                     topRightButtonsSize: CGSize(width: 76.0 + (self.isMyProfile ? 38.0 : 0.0), height: 46.0),
-                    titleWidth: titleFrame.width + 42.0,
-                    hasButtons: !buttonKeys.isEmpty,
+                    titleWidth: max(140.0, titleFrame.width) + 42.0,
+                    bottomHeight: !buttonKeys.isEmpty ? 81.0 : 30.0,
                     action: { [weak self] gift in
                         guard let self, case let .unique(gift) = gift.gift else {
                             return
diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift
@@ -2903,7 +2903,7 @@ final class PeerInfoScreenNode: ViewControllerTracingNode, PeerInfoScreenNodePro
     }
     private var didSetReady = false
     
-    init(controller: PeerInfoScreenImpl, context: AccountContext, peerId: PeerId, avatarInitiallyExpanded: Bool, isOpenedFromChat: Bool, nearbyPeerDistance: Int32?, reactionSourceMessageId: MessageId?, callMessages: [Message], isSettings: Bool, isMyProfile: Bool, hintGroupInCommon: PeerId?, requestsContext: PeerInvitationImportersContext?, starsContext: StarsContext?, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?>, initialPaneKey: PeerInfoPaneKey?) {
+    init(controller: PeerInfoScreenImpl, context: AccountContext, peerId: PeerId, avatarInitiallyExpanded: Bool, isOpenedFromChat: Bool, nearbyPeerDistance: Int32?, reactionSourceMessageId: MessageId?, callMessages: [Message], isSettings: Bool, isMyProfile: Bool, hintGroupInCommon: PeerId?, requestsContext: PeerInvitationImportersContext?, profileGiftsContext: ProfileGiftsContext?, starsContext: StarsContext?, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?>, initialPaneKey: PeerInfoPaneKey?) {
         self.controller = controller
         self.context = context
         self.peerId = peerId
@@ -4649,7 +4649,7 @@ final class PeerInfoScreenNode: ViewControllerTracingNode, PeerInfoScreenNodePro
                 self.privacySettings.set(.single(nil))
             }
             
-            screenData = peerInfoScreenData(context: context, peerId: peerId, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, isSettings: self.isSettings, isMyProfile: self.isMyProfile, hintGroupInCommon: hintGroupInCommon, existingRequestsContext: requestsContext, chatLocation: self.chatLocation, chatLocationContextHolder: self.chatLocationContextHolder, privacySettings: self.privacySettings.get(), forceHasGifts: initialPaneKey == .gifts)
+            screenData = peerInfoScreenData(context: context, peerId: peerId, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, isSettings: self.isSettings, isMyProfile: self.isMyProfile, hintGroupInCommon: hintGroupInCommon, existingRequestsContext: requestsContext, existingProfileGiftsContext: profileGiftsContext, chatLocation: self.chatLocation, chatLocationContextHolder: self.chatLocationContextHolder, privacySettings: self.privacySettings.get(), forceHasGifts: initialPaneKey == .gifts)
                        
             var previousTimestamp: Double?
             self.headerNode.displayPremiumIntro = { [weak self] sourceView, peerStatus, emojiStatusFileAndPack, white in
@@ -10183,7 +10183,8 @@ final class PeerInfoScreenNode: ViewControllerTracingNode, PeerInfoScreenNodePro
                 nearbyPeerDistance: nil,
                 reactionSourceMessageId: nil,
                 callMessages: [],
-                isMyProfile: true
+                isMyProfile: true,
+                profileGiftsContext: self.data?.profileGiftsContext
             ))
         case .stories:
             push(PeerInfoStoryGridScreen(context: self.context, peerId: self.context.account.peerId, scope: .saved))
@@ -12592,6 +12593,7 @@ public final class PeerInfoScreenImpl: ViewController, PeerInfoScreen, KeyShortc
     let isMyProfile: Bool
     private let hintGroupInCommon: PeerId?
     private weak var requestsContext: PeerInvitationImportersContext?
+    private weak var profileGiftsContext: ProfileGiftsContext?
     fileprivate let starsContext: StarsContext?
     private let switchToRecommendedChannels: Bool
     private let switchToGifts: Bool
@@ -12652,7 +12654,25 @@ public final class PeerInfoScreenImpl: ViewController, PeerInfoScreen, KeyShortc
     
     private var validLayout: (layout: ContainerViewLayout, navigationHeight: CGFloat)?
     
-    public init(context: AccountContext, updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)?, peerId: PeerId, avatarInitiallyExpanded: Bool, isOpenedFromChat: Bool, nearbyPeerDistance: Int32?, reactionSourceMessageId: MessageId?, callMessages: [Message], isSettings: Bool = false, isMyProfile: Bool = false, hintGroupInCommon: PeerId? = nil, requestsContext: PeerInvitationImportersContext? = nil, forumTopicThread: ChatReplyThreadMessage? = nil, switchToRecommendedChannels: Bool = false, switchToGifts: Bool = false, switchToGroupsInCommon: Bool = false) {
+    public init(
+        context: AccountContext,
+        updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)?,
+        peerId: PeerId,
+        avatarInitiallyExpanded: Bool,
+        isOpenedFromChat: Bool,
+        nearbyPeerDistance: Int32?,
+        reactionSourceMessageId: MessageId?,
+        callMessages: [Message],
+        isSettings: Bool = false,
+        isMyProfile: Bool = false,
+        hintGroupInCommon: PeerId? = nil,
+        requestsContext: PeerInvitationImportersContext? = nil,
+        profileGiftsContext: ProfileGiftsContext? = nil,
+        forumTopicThread: ChatReplyThreadMessage? = nil,
+        switchToRecommendedChannels: Bool = false,
+        switchToGifts: Bool = false,
+        switchToGroupsInCommon: Bool = false
+    ) {
         self.context = context
         self.updatedPresentationData = updatedPresentationData
         self.peerId = peerId
@@ -12665,6 +12685,7 @@ public final class PeerInfoScreenImpl: ViewController, PeerInfoScreen, KeyShortc
         self.isMyProfile = isMyProfile
         self.hintGroupInCommon = hintGroupInCommon
         self.requestsContext = requestsContext
+        self.profileGiftsContext = profileGiftsContext
         self.switchToRecommendedChannels = switchToRecommendedChannels
         self.switchToGifts = switchToGifts
         self.switchToGroupsInCommon = switchToGroupsInCommon
@@ -13016,7 +13037,7 @@ public final class PeerInfoScreenImpl: ViewController, PeerInfoScreen, KeyShortc
         } else if self.switchToGroupsInCommon {
             initialPaneKey = .groupsInCommon
         }
-        self.displayNode = PeerInfoScreenNode(controller: self, context: self.context, peerId: self.peerId, avatarInitiallyExpanded: self.avatarInitiallyExpanded, isOpenedFromChat: self.isOpenedFromChat, nearbyPeerDistance: self.nearbyPeerDistance, reactionSourceMessageId: self.reactionSourceMessageId, callMessages: self.callMessages, isSettings: self.isSettings, isMyProfile: self.isMyProfile, hintGroupInCommon: self.hintGroupInCommon, requestsContext: self.requestsContext, starsContext: self.starsContext, chatLocation: self.chatLocation, chatLocationContextHolder: self.chatLocationContextHolder, initialPaneKey: initialPaneKey)
+        self.displayNode = PeerInfoScreenNode(controller: self, context: self.context, peerId: self.peerId, avatarInitiallyExpanded: self.avatarInitiallyExpanded, isOpenedFromChat: self.isOpenedFromChat, nearbyPeerDistance: self.nearbyPeerDistance, reactionSourceMessageId: self.reactionSourceMessageId, callMessages: self.callMessages, isSettings: self.isSettings, isMyProfile: self.isMyProfile, hintGroupInCommon: self.hintGroupInCommon, requestsContext: self.requestsContext, profileGiftsContext: self.profileGiftsContext, starsContext: self.starsContext, chatLocation: self.chatLocation, chatLocationContextHolder: self.chatLocationContextHolder, initialPaneKey: initialPaneKey)
         self.controllerNode.accountsAndPeers.set(self.accountsAndPeers.get() |> map { $0.1 })
         self.controllerNode.activeSessionsContextAndCount.set(self.activeSessionsContextAndCount.get())
         self.cachedDataPromise.set(self.controllerNode.cachedDataPromise.get())

Original file line number	Diff line number	Diff line change
`@@ -954,7 +954,7 @@ func peerInfoScreenSettingsData(context: AccountContext, peerId: EnginePeer.Id,`
`954`	`954`	`}`
`955`	`955`	`}`
`956`	`956`
`957`		`-func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, isSettings: Bool, isMyProfile: Bool, hintGroupInCommon: PeerId?, existingRequestsContext: PeerInvitationImportersContext?, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?>, privacySettings: Signal<AccountPrivacySettings?, NoError>, forceHasGifts: Bool) -> Signal<PeerInfoScreenData, NoError> {`
	`957`	+func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, isSettings: Bool, isMyProfile: Bool, hintGroupInCommon: PeerId?, existingRequestsContext: PeerInvitationImportersContext?, existingProfileGiftsContext: ProfileGiftsContext?, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?>, privacySettings: Signal<AccountPrivacySettings?, NoError>, forceHasGifts: Bool) -> Signal<PeerInfoScreenData, NoError> {
`958`	`958`	`return peerInfoScreenInputData(context: context, peerId: peerId, isSettings: isSettings)`
`959`	`959`	`\|> mapToSignal { inputData -> Signal<PeerInfoScreenData, NoError> in`
`960`	`960`	`let wasUpgradedGroup = Atomic<Bool?>(value: nil)`
`@@ -1021,7 +1021,7 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen`
`1021`	`1021`	`let profileGiftsContext: ProfileGiftsContext?`
`1022`	`1022`	`if case .user = kind {`
`1023`	`1023`	`if isMyProfile \|\| userPeerId != context.account.peerId {`
`1024`		`- profileGiftsContext = ProfileGiftsContext(account: context.account, peerId: userPeerId)`
	`1024`	`+ profileGiftsContext = existingProfileGiftsContext ?? ProfileGiftsContext(account: context.account, peerId: userPeerId)`
`1025`	`1025`	`} else {`
`1026`	`1026`	`profileGiftsContext = nil`
`1027`	`1027`	`}`