OLED profile card layout: action card, brighter labels, pane card

- Move header action buttons into first #1C1C1E card (48pt circles)
- Black hero keeps avatar + name + status only
- Brighter field labels (#AEAEB2) on info card rows
- Wrap tabs + pane content in unified #1C1C1E card with section inset
- Collapse id/dc/registered into dim footer line
- Page background #000 between cards in OLED profile mode

Co-authored-by: D3C0Y <decoder-dev@users.noreply.github.com>

Author: cursoragent

submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/ListItems/PeerInfoScreenActionButtonsItem.swift

@@ -0,0 +1,145 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import AccountContext
+import TelegramPresentationData
+import TelegramCore
+import PresentationDataUtils
+import ContextUI
+
+private let actionButtonDiameter: CGFloat = 48.0
+private let actionButtonSpacing: CGFloat = 20.0
+private let actionCardVerticalInset: CGFloat = 16.0
+
+final class PeerInfoScreenActionButtonsItem: PeerInfoScreenItem {
+    let id: AnyHashable = AnyHashable("oled_action_buttons")
+    let buttonKeys: [PeerInfoHeaderButtonKey]
+    let highlightedButton: PeerInfoHeaderButtonKey?
+    let peer: EnginePeer?
+    let peerNotificationSettings: TelegramPeerNotificationSettings?
+    let threadNotificationSettings: TelegramPeerNotificationSettings?
+    let globalNotificationSettings: EngineGlobalNotificationSettings?
+    let performAction: (PeerInfoHeaderButtonKey, PeerInfoHeaderButtonNode?, ContextGesture?) -> Void
+    
+    init(
+        buttonKeys: [PeerInfoHeaderButtonKey],
+        highlightedButton: PeerInfoHeaderButtonKey?,
+        peer: EnginePeer?,
+        peerNotificationSettings: TelegramPeerNotificationSettings?,
+        threadNotificationSettings: TelegramPeerNotificationSettings?,
+        globalNotificationSettings: EngineGlobalNotificationSettings?,
+        performAction: @escaping (PeerInfoHeaderButtonKey, PeerInfoHeaderButtonNode?, ContextGesture?) -> Void
+    ) {
+        self.buttonKeys = buttonKeys
+        self.highlightedButton = highlightedButton
+        self.peer = peer
+        self.peerNotificationSettings = peerNotificationSettings
+        self.threadNotificationSettings = threadNotificationSettings
+        self.globalNotificationSettings = globalNotificationSettings
+        self.performAction = performAction
+    }
+    
+    func node() -> PeerInfoScreenItemNode {
+        return PeerInfoScreenActionButtonsItemNode()
+    }
+}
+
+private final class PeerInfoScreenActionButtonsItemNode: PeerInfoScreenItemNode {
+    private let maskNode: ASImageNode
+    private var buttonNodes: [PeerInfoHeaderButtonKey: PeerInfoHeaderButtonNode] = [:]
+    private var item: PeerInfoScreenActionButtonsItem?
+    private var presentationData: PresentationData?
+    
+    override init() {
+        self.maskNode = ASImageNode()
+        self.maskNode.isUserInteractionEnabled = false
+        super.init()
+        self.addSubnode(self.maskNode)
+    }
+    
+    override func update(context: AccountContext, width: CGFloat, safeInsets: UIEdgeInsets, presentationData: PresentationData, item: PeerInfoScreenItem, topItem: PeerInfoScreenItem?, bottomItem: PeerInfoScreenItem?, hasCorners: Bool, transition: ContainedViewLayoutTransition) -> CGFloat {
+        guard let item = item as? PeerInfoScreenActionButtonsItem else {
+            return 0.0
+        }
+        self.item = item
+        self.presentationData = presentationData
+        
+        let height = actionCardVerticalInset * 2.0 + actionButtonDiameter
+        let totalButtonsWidth = CGFloat(item.buttonKeys.count) * actionButtonDiameter + CGFloat(max(0, item.buttonKeys.count - 1)) * actionButtonSpacing
+        var leftOrigin = floor((width - totalButtonsWidth) / 2.0)
+        let buttonY = actionCardVerticalInset
+        
+        for buttonKey in item.buttonKeys {
+            let buttonNode: PeerInfoHeaderButtonNode
+            var wasAdded = false
+            if let current = self.buttonNodes[buttonKey] {
+                buttonNode = current
+            } else {
+                wasAdded = true
+                buttonNode = PeerInfoHeaderButtonNode(key: buttonKey, action: { [weak self] buttonNode, gesture in
+                    self?.item?.performAction(buttonNode.key, buttonNode, gesture)
+                })
+                self.buttonNodes[buttonKey] = buttonNode
+                self.addSubnode(buttonNode)
+            }
+            
+            let buttonFrame = CGRect(origin: CGPoint(x: leftOrigin, y: buttonY), size: CGSize(width: actionButtonDiameter, height: actionButtonDiameter))
+            transition.updateFrame(node: buttonNode, frame: buttonFrame)
+            transition.updateFrame(view: buttonNode.backgroundContainerView, frame: buttonFrame)
+            
+            let content = peerInfoHeaderButtonContent(
+                key: buttonKey,
+                presentationData: presentationData,
+                peer: item.peer,
+                peerNotificationSettings: item.peerNotificationSettings,
+                threadNotificationSettings: item.threadNotificationSettings,
+                globalNotificationSettings: item.globalNotificationSettings
+            )
+            
+            var isActive = true
+            if let highlightedButton = item.highlightedButton {
+                isActive = buttonKey == highlightedButton
+            }
+            
+            buttonNode.update(
+                size: buttonFrame.size,
+                text: content.text,
+                icon: content.icon,
+                isActive: isActive,
+                presentationData: presentationData,
+                backgroundColor: peerInfoOledActionButtonBackgroundColor,
+                foregroundColor: .white,
+                fraction: 1.0,
+                circularStyle: true,
+                transition: wasAdded ? .immediate : transition
+            )
+            
+            if wasAdded {
+                buttonNode.alpha = 0.0
+                transition.updateAlpha(node: buttonNode, alpha: 1.0)
+            }
+            
+            leftOrigin += actionButtonDiameter + actionButtonSpacing
+        }
+        
+        for key in self.buttonNodes.keys {
+            if !item.buttonKeys.contains(key) {
+                if let buttonNode = self.buttonNodes.removeValue(forKey: key) {
+                    transition.updateAlpha(node: buttonNode, alpha: 0.0) { [weak buttonNode] _ in
+                        buttonNode?.backgroundContainerView.removeFromSuperview()
+                        buttonNode?.removeFromSupernode()
+                    }
+                }
+            }
+        }
+        
+        let hasRoundedCorners = hasCorners && (topItem == nil || bottomItem == nil)
+        let hasTopCorners = hasRoundedCorners && topItem == nil
+        let hasBottomCorners = hasRoundedCorners && bottomItem == nil
+        self.maskNode.image = hasRoundedCorners ? PresentationResourcesItemList.cornersImage(presentationData.theme, top: hasTopCorners, bottom: hasBottomCorners, glass: true) : nil
+        transition.updateFrame(node: self.maskNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: width, height: height)))
+        
+        return height
+    }
+}

submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/ListItems/PeerInfoScreenCommentItem.swift

@@ -23,14 +23,16 @@ final class PeerInfoScreenCommentItem: PeerInfoScreenItem {
     let text: String
     let attributedPrefix: NSAttributedString?
     let useAccentLinkColor: Bool
+    let isDimFooter: Bool
     let linkAction: ((LinkAction) -> Void)?
 
-    init(id: AnyHashable, icon: Icon? = nil, text: String, attributedPrefix: NSAttributedString? = nil, useAccentLinkColor: Bool = true, linkAction: ((LinkAction) -> Void)? = nil) {
+    init(id: AnyHashable, icon: Icon? = nil, text: String, attributedPrefix: NSAttributedString? = nil, useAccentLinkColor: Bool = true, isDimFooter: Bool = false, linkAction: ((LinkAction) -> Void)? = nil) {
         self.id = id
         self.icon = icon
         self.text = text
         self.attributedPrefix = attributedPrefix
         self.useAccentLinkColor = useAccentLinkColor
+        self.isDimFooter = isDimFooter
         self.linkAction = linkAction
     }
 
@@ -89,7 +91,7 @@ private final class PeerInfoScreenCommentItemNode: PeerInfoScreenItemNode {
         self.presentationData = presentationData
 
         let sideInset: CGFloat = 16.0 + safeInsets.left
-        let verticalInset: CGFloat = 7.0
+        let verticalInset: CGFloat = item.isDimFooter ? 10.0 : 7.0
 
         self.textNode.maximumNumberOfLines = 0
         self.textNode.arguments = TextNodeWithEntities.Arguments(
@@ -100,8 +102,8 @@ private final class PeerInfoScreenCommentItemNode: PeerInfoScreenItemNode {
             attemptSynchronous: false
         )
 
-        let textFont = Font.regular(presentationData.listsFontSize.itemListBaseHeaderFontSize)
-        let textColor = presentationData.theme.list.freeTextColor
+        let textFont = Font.regular(item.isDimFooter ? 12.0 : presentationData.listsFontSize.itemListBaseHeaderFontSize)
+        let textColor = item.isDimFooter ? peerInfoOledCardFooterColor : presentationData.theme.list.freeTextColor
 
         var text = item.text
         text = text.replacingOccurrences(of: " >]", with: "\u{00A0}>]")

submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/ListItems/PeerInfoScreenLabeledValueItem.swift

@@ -503,7 +503,7 @@ private final class PeerInfoScreenLabeledValueItemNode: PeerInfoScreenItemNode {
         self.expandNode.attributedText = NSAttributedString(string: presentationData.strings.PeerInfo_BioExpand, font: Font.regular(17.0), textColor: presentationData.theme.list.itemAccentColor)
         let expandSize = self.expandNode.updateLayout(CGSize(width: width, height: 100.0))
 
-        self.labelNode.attributedText = NSAttributedString(string: item.label, font: Font.regular(14.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
+        self.labelNode.attributedText = NSAttributedString(string: item.label, font: Font.regular(14.0), textColor: peerInfoUsesOledCardLayout(presentationData: presentationData, isSettings: false, isMyProfile: false) && !item.label.isEmpty ? peerInfoOledCardLabelColor : presentationData.theme.list.itemPrimaryTextColor)
 
         self.rightLabelNode.attributedText = NSAttributedString(string: item.rightLabel ?? "", font: Font.regular(14.0), textColor: presentationData.theme.list.itemSecondaryTextColor)
 

submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoHeaderNode.swift

@@ -548,6 +548,8 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         let buttonKeys: [PeerInfoHeaderButtonKey] = (self.isSettings || self.isMyProfile) ? [] : peerInfoHeaderButtons(peer: peer, cachedData: cachedData, isOpenedFromChat: self.isOpenedFromChat, isExpanded: true, videoCallsEnabled: width > 320.0 && self.videoCallsEnabled, isSecretChat: isSecretChat, isContact: isContact, threadInfo: threadData?.info)
 
         let useOledProfileStyle = presentationData.theme.overallDarkAppearance && !self.isSettings && !self.isMyProfile
+        let useOledCardLayout = useOledProfileStyle
+        let headerButtonKeys = useOledCardLayout ? [] : buttonKeys
 
         let backgroundCoverSubject: PeerInfoCoverComponent.Subject?
         var backgroundCoverAnimateIn = false
@@ -561,7 +563,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
                 }
                 self.didSetupBackgroundCover = true
             }
-            if !buttonKeys.isEmpty {
+            if !headerButtonKeys.isEmpty {
                 backgroundDefaultHeight = 327.0
                 if metrics.isTablet {
                     backgroundDefaultHeight += 60.0
@@ -2295,7 +2297,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         let buttonSpacing: CGFloat = 8.0
         let buttonSideInset = max(16.0, containerInset)
 
-        let useCircularHeaderButtons = useOledProfileStyle && !buttonKeys.isEmpty
+        let useCircularHeaderButtons = useOledProfileStyle && !headerButtonKeys.isEmpty
         let circularButtonDiameter: CGFloat = 52.0
         let circularButtonSpacing: CGFloat = 20.0
 
@@ -2355,7 +2357,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
             }
         }
 
-        let buttonWidth = useCircularHeaderButtons ? circularButtonDiameter : (width - buttonSideInset * 2.0 + buttonSpacing) / CGFloat(buttonKeys.count) - buttonSpacing
+        let buttonWidth = useCircularHeaderButtons ? circularButtonDiameter : (width - buttonSideInset * 2.0 + buttonSpacing) / CGFloat(max(1, headerButtonKeys.count)) - buttonSpacing
         let buttonSize = CGSize(width: buttonWidth, height: useCircularHeaderButtons ? circularButtonDiameter : 58.0)
         var buttonRightOrigin = CGPoint(x: width - buttonSideInset, y: backgroundHeight - bottomInset - 16.0 - buttonSize.height)
         if !actionButtonKeys.isEmpty {
@@ -2377,11 +2379,11 @@ final class PeerInfoHeaderNode: ASDisplayNode {
 
         var circularButtonLeftOrigin: CGFloat = 0.0
         if useCircularHeaderButtons {
-            let totalButtonsWidth = CGFloat(buttonKeys.count) * circularButtonDiameter + CGFloat(max(0, buttonKeys.count - 1)) * circularButtonSpacing
+            let totalButtonsWidth = CGFloat(headerButtonKeys.count) * circularButtonDiameter + CGFloat(max(0, headerButtonKeys.count - 1)) * circularButtonSpacing
             circularButtonLeftOrigin = floor((width - totalButtonsWidth) / 2.0)
         }
 
-        let orderedButtonKeys: [PeerInfoHeaderButtonKey] = useCircularHeaderButtons ? buttonKeys : buttonKeys.reversed()
+        let orderedButtonKeys: [PeerInfoHeaderButtonKey] = useCircularHeaderButtons ? headerButtonKeys : headerButtonKeys.reversed()
         for buttonKey in orderedButtonKeys {
             let buttonNode: PeerInfoHeaderButtonNode
             var wasAdded = false
@@ -2413,55 +2415,16 @@ final class PeerInfoHeaderNode: ASDisplayNode {
             }
             buttonTransition.updateFrame(view: buttonNode.backgroundContainerView, frame: buttonFrame.offsetBy(dx: 0.0, dy: -buttonFrame.minY))
 
-            let buttonText: String
-            let buttonIcon: PeerInfoHeaderButtonIcon
-            switch buttonKey {
-            case .message:
-                buttonText = presentationData.strings.PeerInfo_ButtonMessage
-                buttonIcon = .message
-            case .discussion:
-                buttonText = presentationData.strings.PeerInfo_ButtonDiscuss
-                buttonIcon = .message
-            case .call:
-                buttonText = presentationData.strings.PeerInfo_ButtonCall
-                buttonIcon = .call
-            case .videoCall:
-                buttonText = presentationData.strings.PeerInfo_ButtonVideoCall
-                buttonIcon = .videoCall
-            case .voiceChat:
-                if case let .channel(channel) = peer, case .broadcast = channel.info {
-                    buttonText = presentationData.strings.PeerInfo_ButtonLiveStream
-                } else {
-                    buttonText = presentationData.strings.PeerInfo_ButtonVoiceChat
-                }
-                buttonIcon = .voiceChat
-            case .mute:
-                let chatIsMuted = peerInfoIsChatMuted(peer: peer, peerNotificationSettings: peerNotificationSettings, threadNotificationSettings: threadNotificationSettings, globalNotificationSettings: globalNotificationSettings)
-                if chatIsMuted {
-                    buttonText = presentationData.strings.PeerInfo_ButtonUnmute
-                    buttonIcon = .unmute
-                } else {
-                    buttonText = presentationData.strings.PeerInfo_ButtonMute
-                    buttonIcon = .mute
-                }
-            case .more:
-                buttonText = presentationData.strings.PeerInfo_ButtonMore
-                buttonIcon = .more
-            case .addMember:
-                buttonText = presentationData.strings.PeerInfo_ButtonAddMember
-                buttonIcon = .addMember
-            case .search:
-                buttonText = presentationData.strings.PeerInfo_ButtonSearch
-                buttonIcon = .search
-            case .leave:
-                buttonText = presentationData.strings.PeerInfo_ButtonLeave
-                buttonIcon = .leave
-            case .stop:
-                buttonText = presentationData.strings.PeerInfo_ButtonStop
-                buttonIcon = .stop
-            case .addContact:
-                fatalError()
-            }
+            let buttonContent = peerInfoHeaderButtonContent(
+                key: buttonKey,
+                presentationData: presentationData,
+                peer: peer,
+                peerNotificationSettings: peerNotificationSettings,
+                threadNotificationSettings: threadNotificationSettings,
+                globalNotificationSettings: globalNotificationSettings
+            )
+            let buttonText = buttonContent.text
+            let buttonIcon = buttonContent.icon
 
             var isActive = true
             if let highlightedButton = state.highlightedButton {
@@ -2496,7 +2459,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         }
 
         for key in self.buttonNodes.keys {
-            if !buttonKeys.contains(key) {
+            if !headerButtonKeys.contains(key) {
                 if let buttonNode = self.buttonNodes[key] {
                     self.buttonNodes.removeValue(forKey: key)
                     transition.updateAlpha(layer: buttonNode.backgroundContainerView.layer, alpha: 0.0)
@@ -2553,7 +2516,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
                 avatarSize: apparentAvatarFrame.size,
                 avatarScale: avatarScale,
                 defaultHeight: backgroundDefaultHeight,
-                gradientCenter: CGPoint(x: 0.5, y: buttonKeys.isEmpty ? 0.5 : 0.45),
+                gradientCenter: CGPoint(x: 0.5, y: headerButtonKeys.isEmpty ? 0.5 : 0.45),
                 avatarTransitionFraction: max(0.0, min(1.0, titleCollapseFraction + transitionFraction * 2.0)),
                 patternTransitionFraction: buttonsTransitionFraction * backgroundTransitionFraction
             )),
@@ -2598,7 +2561,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
                     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: max(140.0, titleFrame.width) + 42.0,
-                    bottomHeight: !buttonKeys.isEmpty ? 81.0 : 30.0,
+                    bottomHeight: !headerButtonKeys.isEmpty ? 81.0 : 30.0,
                     action: { [weak self] gift in
                         guard let self, case let .unique(gift) = gift.gift else {
                             return

submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoInteraction.swift

@@ -6,6 +6,7 @@ import TelegramCore
 import SwiftSignalKit
 import AccountContext
 import StatisticsUI
+import ContextUI
 
 final class PeerInfoInteraction {
     let openChat: (EnginePeer.Id?) -> Void
@@ -87,6 +88,8 @@ final class PeerInfoInteraction {
     let editingOpenBusinessChatBots: () -> Void
     let getController: () -> ViewController?
 
+    var performHeaderButtonAction: ((PeerInfoHeaderButtonKey, PeerInfoHeaderButtonNode?, ContextGesture?) -> Void)?
+    
     init(
         openUsername: @escaping (String, Bool, Promise<Bool>?) -> Void,
         openPhone: @escaping (String, ASDisplayNode, ContextGesture?, Promise<Bool>?) -> Void,