ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 22:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into glass

Browse Source 
# Conflicts:
#	submodules/AttachmentUI/Sources/AttachmentPanel.swift
#	submodules/ChatPresentationInterfaceState/Sources/ChatPanelInterfaceInteraction.swift
#	submodules/TelegramUI/BUILD
#	submodules/TelegramUI/Components/Chat/ChatRecentActionsController/Sources/ChatRecentActionsController.swift
#	submodules/TelegramUI/Components/Chat/ChatTextInputActionButtonsNode/Sources/ChatTextInputActionButtonsNode.swift
#	submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelNode.swift
#	submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift
#	submodules/TelegramUI/Components/PeerSelectionController/Sources/PeerSelectionControllerNode.swift
#	submodules/TelegramUI/Sources/Chat/ChatControllerLoadDisplayNode.swift
#	submodules/TelegramUI/Sources/ChatInterfaceStateInputPanels.swift
This commit is contained in:
Isaac
2025-09-02 19:55:51 +02:00
parent ad25a91a2f 871072ba95
commit 5de7e74180
45 changed files with 2469 additions and 2192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
submodules/AttachmentUI/Sources/AttachmentController.swift
View File

@@ -1374,7 +1374,7 @@ public class AttachmentController: ViewController, MinimizableController {
let inputNode: ASDisplayNode
let accessoryPanelNode: ASDisplayNode?
let menuButtonNode: ASDisplayNode
let menuButtonBackgroundNode: ASDisplayNode
let menuButtonBackgroundView: UIView
let menuIconNode: ASDisplayNode
let menuTextNode: ASDisplayNode
let prepareForDismiss: () -> Void
@@ -1383,7 +1383,7 @@ public class AttachmentController: ViewController, MinimizableController {
inputNode: ASDisplayNode,
accessoryPanelNode: ASDisplayNode?,
menuButtonNode: ASDisplayNode,
menuButtonBackgroundNode: ASDisplayNode,
menuButtonBackgroundView: UIView,
menuIconNode: ASDisplayNode,
menuTextNode: ASDisplayNode,
prepareForDismiss: @escaping () -> Void
@@ -1391,7 +1391,7 @@ public class AttachmentController: ViewController, MinimizableController {
self.inputNode = inputNode
self.accessoryPanelNode = accessoryPanelNode
self.menuButtonNode = menuButtonNode
self.menuButtonBackgroundNode = menuButtonBackgroundNode
self.menuButtonBackgroundView = menuButtonBackgroundView
self.menuIconNode = menuIconNode
self.menuTextNode = menuTextNode
self.prepareForDismiss = prepareForDismiss