Squash of 63 commits spanning waves 46-93 (plus interspersed docs commits) of the gradual Postbox->TelegramEngine consumer-side migration. Scope: 139 files changed, 2123 insertions(+), 452 deletions(-). ## Themes by wave-block **Waves 46-58 — Peer field migrations + facade additions** Foundational EnginePeer convenience init additions (PeerReference, RenderedPeer, SelectivePrivacyPeer). Multiple `peer: Peer` field migrations across PeerInfo, ChatList, and SettingsUI components. **Waves 59-73 — peer field cascade + EnginePeer wrap drops** Series of single- to two-file peer-field migrations; consumer-side wrap removal (`EnginePeer(peer)` -> direct EnginePeer use); `as? TelegramUser` cast conversion to `case let .user(...)` enum match. Wave 64: RenderedPeer convenience init. Wave 68: SelectivePrivacyPeer convenience init. **Waves 74-83 — controller-Node bridge cleanup + small migrations** Wave-71 shadow-pattern cleanup at controller->Node bridges. Migrations of ChatRecentActionsController.peer (74), PeerInfoMember (75), MentionChatInputPanelItem (76), PassportUI SecureIdAuthController (77), AccountWithInfo + ShareController (78), peerInputActivitiesPromise (79), InactiveChannel (80), BlockedPeers (81), openHashtag resolveSignal (82), NotificationExceptionsList (83). **Waves 84-90 — TelegramEngine.Resources facade migrations** Per-method Shape-A/B sweeps converting `<ctx>.account.postbox.mediaBox.X(...)` to `<ctx>.engine.resources.X(...)`. Wave 90 was a single-commit big sweep: 40 fetchedMediaResource sites in 25 files migrated to engine.resources.fetch facade in one atomic pass with first-pass-clean build. Methods covered: storeResourceData, completedResourcePath, cancelInteractiveResourceFetch, resourceRangesStatus, resourceStatus, fetch (fetchedMediaResource). **Waves 91-92 — additional type migrations** Wave 91: ItemListWebsiteItem.peer + RecentSessionsController enum-case payload + openWebSession callback Peer? -> EnginePeer?. Wave 92: ChatListController StateHolder.EntryContext status type MediaResourceStatus -> EngineMediaResource.FetchStatus. **Wave 93 — speculative `import Postbox` drop sweep** Drop import from 7 wave-touched files where it became unused; restore in 5 files where bare PeerId/Message/MediaId/StoryId references escaped the pre-flight regex. Includes one MediaId(...) -> EngineMedia.Id(...) swap in InAppPurchaseManager to unlock its import drop. ## Build state Final state at squash: clean Telegram/Telegram build at debug_sim_arm64. ## Persistent-state notes - Pre-existing WIP unchanged across the squashed range: - build-system/bazel-rules/sourcekit-bazel-bsp submodule marker - Untracked: build-system/tulsi/, submodules/TgVoip/, third-party/libx264/ Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
187 lines
8.8 KiB
Swift
187 lines
8.8 KiB
Swift
import Foundation
|
|
import UIKit
|
|
import AsyncDisplayKit
|
|
import TelegramPresentationData
|
|
import AccountContext
|
|
import Display
|
|
import Postbox
|
|
import TelegramCore
|
|
import SwiftSignalKit
|
|
|
|
final class PeerInfoHeaderEditingContentNode: ASDisplayNode {
|
|
private let context: AccountContext
|
|
private let requestUpdateLayout: () -> Void
|
|
|
|
var requestEditing: (() -> Void)?
|
|
|
|
let avatarNode: PeerInfoEditingAvatarNode
|
|
let avatarTextNode: ImmediateTextNode
|
|
let avatarButtonNode: HighlightableButtonNode
|
|
|
|
var itemNodes: [PeerInfoHeaderTextFieldNodeKey: PeerInfoHeaderTextFieldNode] = [:]
|
|
|
|
init(context: AccountContext, requestUpdateLayout: @escaping () -> Void) {
|
|
self.context = context
|
|
self.requestUpdateLayout = requestUpdateLayout
|
|
|
|
self.avatarNode = PeerInfoEditingAvatarNode(context: context)
|
|
|
|
self.avatarTextNode = ImmediateTextNode()
|
|
self.avatarButtonNode = HighlightableButtonNode()
|
|
|
|
super.init()
|
|
|
|
self.addSubnode(self.avatarNode)
|
|
self.avatarButtonNode.addSubnode(self.avatarTextNode)
|
|
|
|
self.avatarButtonNode.addTarget(self, action: #selector(textPressed), forControlEvents: .touchUpInside)
|
|
}
|
|
|
|
@objc private func textPressed() {
|
|
self.requestEditing?()
|
|
}
|
|
|
|
func editingTextForKey(_ key: PeerInfoHeaderTextFieldNodeKey) -> String? {
|
|
return self.itemNodes[key]?.text
|
|
}
|
|
|
|
func shakeTextForKey(_ key: PeerInfoHeaderTextFieldNodeKey) {
|
|
self.itemNodes[key]?.layer.addShakeAnimation()
|
|
}
|
|
|
|
func update(width: CGFloat, safeInset: CGFloat, statusBarHeight: CGFloat, navigationHeight: CGFloat, isModalOverlay: Bool, peer: EnginePeer?, threadData: MessageHistoryThreadData?, chatLocation: ChatLocation, cachedData: CachedPeerData?, isContact: Bool, isSettings: Bool, presentationData: PresentationData, transition: ContainedViewLayoutTransition) -> CGFloat {
|
|
let avatarSize: CGFloat = isModalOverlay ? 200.0 : 100.0
|
|
let avatarFrame = CGRect(origin: CGPoint(x: floor((width - avatarSize) / 2.0), y: statusBarHeight + 22.0), size: CGSize(width: avatarSize, height: avatarSize))
|
|
transition.updateFrameAdditiveToCenter(node: self.avatarNode, frame: CGRect(origin: avatarFrame.center, size: CGSize()))
|
|
|
|
var contentHeight: CGFloat = statusBarHeight + 10.0 + avatarSize + 28.0
|
|
|
|
if canEditPeerInfo(context: self.context, peer: peer, chatLocation: chatLocation, threadData: threadData) {
|
|
if self.avatarButtonNode.supernode == nil {
|
|
self.addSubnode(self.avatarButtonNode)
|
|
}
|
|
self.avatarTextNode.attributedText = NSAttributedString(string: presentationData.strings.Settings_SetNewProfilePhotoOrVideo, font: Font.regular(17.0), textColor: presentationData.theme.list.itemAccentColor)
|
|
self.avatarButtonNode.accessibilityLabel = self.avatarTextNode.attributedText?.string
|
|
|
|
let avatarTextSize = self.avatarTextNode.updateLayout(CGSize(width: width, height: 32.0))
|
|
transition.updateFrame(node: self.avatarTextNode, frame: CGRect(origin: CGPoint(), size: avatarTextSize))
|
|
transition.updateFrame(node: self.avatarButtonNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((width - avatarTextSize.width) / 2.0), y: contentHeight - 5.0), size: avatarTextSize))
|
|
contentHeight += 32.0
|
|
}
|
|
|
|
var isEditableBot = false
|
|
if case let .user(user) = peer, let botInfo = user.botInfo, botInfo.flags.contains(.canEdit) {
|
|
isEditableBot = true
|
|
}
|
|
var fieldKeys: [PeerInfoHeaderTextFieldNodeKey] = []
|
|
if case let .user(user) = peer {
|
|
if !user.isDeleted {
|
|
fieldKeys.append(.firstName)
|
|
if isEditableBot {
|
|
fieldKeys.append(.description)
|
|
} else if user.botInfo == nil {
|
|
fieldKeys.append(.lastName)
|
|
}
|
|
}
|
|
} else if case .legacyGroup = peer {
|
|
fieldKeys.append(.title)
|
|
if canEditPeerInfo(context: self.context, peer: peer, chatLocation: chatLocation, threadData: threadData) {
|
|
fieldKeys.append(.description)
|
|
}
|
|
} else if case .channel = peer {
|
|
fieldKeys.append(.title)
|
|
if canEditPeerInfo(context: self.context, peer: peer, chatLocation: chatLocation, threadData: threadData) {
|
|
fieldKeys.append(.description)
|
|
}
|
|
}
|
|
var hasPrevious = false
|
|
for key in fieldKeys {
|
|
let itemNode: PeerInfoHeaderTextFieldNode
|
|
var updateText: String?
|
|
if let current = self.itemNodes[key] {
|
|
itemNode = current
|
|
} else {
|
|
var isMultiline = false
|
|
switch key {
|
|
case .firstName:
|
|
if case let .user(user) = peer {
|
|
if let editableBotInfo = (cachedData as? CachedUserData)?.editableBotInfo {
|
|
updateText = editableBotInfo.name
|
|
} else {
|
|
updateText = user.firstName ?? ""
|
|
}
|
|
}
|
|
case .lastName:
|
|
if case let .user(user) = peer {
|
|
updateText = user.lastName ?? ""
|
|
} else {
|
|
updateText = ""
|
|
}
|
|
case .title:
|
|
updateText = peer?.debugDisplayTitle ?? ""
|
|
case .description:
|
|
isMultiline = true
|
|
if let cachedData = cachedData as? CachedChannelData {
|
|
updateText = cachedData.about ?? ""
|
|
} else if let cachedData = cachedData as? CachedGroupData {
|
|
updateText = cachedData.about ?? ""
|
|
} else if let cachedData = cachedData as? CachedUserData {
|
|
if let editableBotInfo = cachedData.editableBotInfo {
|
|
updateText = editableBotInfo.about
|
|
} else {
|
|
updateText = cachedData.about ?? ""
|
|
}
|
|
} else {
|
|
updateText = ""
|
|
}
|
|
}
|
|
if isMultiline {
|
|
itemNode = PeerInfoHeaderMultiLineTextFieldNode(requestUpdateHeight: { [weak self] in
|
|
self?.requestUpdateLayout()
|
|
})
|
|
} else {
|
|
itemNode = PeerInfoHeaderSingleLineTextFieldNode()
|
|
}
|
|
self.itemNodes[key] = itemNode
|
|
self.addSubnode(itemNode)
|
|
}
|
|
let placeholder: String
|
|
var isEnabled = true
|
|
switch key {
|
|
case .firstName:
|
|
placeholder = isEditableBot ? presentationData.strings.UserInfo_BotNamePlaceholder : presentationData.strings.UserInfo_FirstNamePlaceholder
|
|
isEnabled = isContact || isSettings || isEditableBot
|
|
case .lastName:
|
|
placeholder = presentationData.strings.UserInfo_LastNamePlaceholder
|
|
isEnabled = isContact || isSettings
|
|
case .title:
|
|
if case let .channel(channel) = peer, case .broadcast = channel.info {
|
|
placeholder = presentationData.strings.GroupInfo_ChannelListNamePlaceholder
|
|
} else {
|
|
placeholder = presentationData.strings.GroupInfo_GroupNamePlaceholder
|
|
}
|
|
isEnabled = canEditPeerInfo(context: self.context, peer: peer, chatLocation: chatLocation, threadData: threadData)
|
|
case .description:
|
|
placeholder = presentationData.strings.Channel_Edit_AboutItem
|
|
isEnabled = canEditPeerInfo(context: self.context, peer: peer, chatLocation: chatLocation, threadData: threadData) || isEditableBot
|
|
}
|
|
let itemHeight = itemNode.update(width: width, safeInset: safeInset, isSettings: isSettings, hasPrevious: hasPrevious, hasNext: key != fieldKeys.last, placeholder: placeholder, isEnabled: isEnabled, presentationData: presentationData, updateText: updateText)
|
|
transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: CGSize(width: width, height: itemHeight)))
|
|
contentHeight += itemHeight
|
|
hasPrevious = true
|
|
}
|
|
var removeKeys: [PeerInfoHeaderTextFieldNodeKey] = []
|
|
for (key, _) in self.itemNodes {
|
|
if !fieldKeys.contains(key) {
|
|
removeKeys.append(key)
|
|
}
|
|
}
|
|
for key in removeKeys {
|
|
if let itemNode = self.itemNodes.removeValue(forKey: key) {
|
|
itemNode.removeFromSupernode()
|
|
}
|
|
}
|
|
|
|
return contentHeight
|
|
}
|
|
}
|