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

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Browse Source
This commit is contained in:
Ilya Laktyushin
2022-12-05 17:05:49 +04:00
parent 1103706315 71e396f0b6
commit d4e55712e5
136 changed files with 19513 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
submodules/TelegramUI/Sources/ChatController.swift
View File

@@ -971,8 +971,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
transitionCompletion()
}, presentStickers: { [weak self] completion in
if let strongSelf = self {
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { fileReference, view, rect in
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { result in
if let (fileReference, view, rect) = result {
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
}
return true
})
strongSelf.present(controller, in: .window(.root))
@@ -3764,8 +3766,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
if let mediaReference = mediaReference, let peer = message.peers[message.id.peerId] {
legacyMediaEditor(context: strongSelf.context, peer: peer, threadTitle: strongSelf.threadInfo?.title, media: mediaReference, initialCaption: NSAttributedString(string: message.text), snapshots: [], transitionCompletion: nil, presentStickers: { [weak self] completion in
if let strongSelf = self {
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { fileReference, view, rect in
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { result in
if let (fileReference, view, rect) = result {
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
}
return true
})
strongSelf.present(controller, in: .window(.root))
@@ -11878,8 +11882,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
}, presentStickers: { [weak self] completion in
if let strongSelf = self {
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { fileReference, view, rect in
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { result in
if let (fileReference, view, rect) = result {
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
}
return true
})
strongSelf.present(controller, in: .window(.root))
@@ -12519,8 +12525,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
}, presentStickers: { [weak self] completion in
if let strongSelf = self {
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { fileReference, view, rect in
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { result in
if let (fileReference, view, rect) = result {
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
}
return true
})
strongSelf.present(controller, in: .window(.root))
@@ -12617,8 +12625,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
}, presentStickers: { [weak self] completion in
if let strongSelf = self {
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { fileReference, view, rect in
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { result in
if let (fileReference, view, rect) = result {
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
}
return true
})
strongSelf.present(controller, in: .window(.root))
@@ -12829,8 +12839,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
controller.presentStickers = { [weak self] completion in
if let strongSelf = self {
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { fileReference, view, rect in
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { result in
if let (fileReference, view, rect) = result {
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
}
return true
})
strongSelf.present(controller, in: .window(.root))
@@ -12926,8 +12938,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}))
controller.presentStickers = { [weak self] completion in
if let strongSelf = self {
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { fileReference, view, rect in
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { result in
if let (fileReference, view, rect) = result {
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
}
return true
})
strongSelf.present(controller, in: .window(.root))
@@ -12973,8 +12987,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
}, presentStickers: { [weak self] completion in
if let strongSelf = self {
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { fileReference, view, rect in
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { result in
if let (fileReference, view, rect) = result {
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
}
return true
})
strongSelf.present(controller, in: .window(.root))
@@ -13030,8 +13046,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}))
controller.presentStickers = { [weak self] completion in
if let strongSelf = self {
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { fileReference, view, rect in
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { result in
if let (fileReference, view, rect) = result {
completion(fileReference.media, fileReference.media.isAnimatedSticker || fileReference.media.isVideoSticker, view, rect)
}
return true
})
strongSelf.present(controller, in: .window(.root))
@@ -13937,8 +13955,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
|> deliverOnMainQueue).start(next: { [weak self] settings in
if let strongSelf = self, let peer = strongSelf.presentationInterfaceState.renderedPeer?.peer {
strongSelf.chatDisplayNode.dismissInput()
strongSelf.chatDisplayNode.dismissInput()
let controller = mediaPasteboardScreen(
context: strongSelf.context,
updatedPresentationData: strongSelf.updatedPresentationData,