github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various fixes

Browse source
This commit is contained in:
Ilya Laktyushin 2026-02-27 15:24:38 +04:00
parent e3c84fce71
commit b9ba7336bb
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
submodules/AccountContext/Sources/AccountContext.swift
View file

@ -1008,6 +1008,7 @@ public protocol CameraScreen: ViewController {
}
public protocol MediaEditorScreen: ViewController {
var customNavigationController: UINavigationController? { get set }
}
public protocol MediaPickerScreen: ViewController {

1
submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift
View file

@ -743,6 +743,7 @@ final class ChatImageGalleryItemNode: ZoomableContentGalleryItemNode {
}
galleryController.willDismiss()
(navigationController.topViewController as? ViewController)?.present(controller, in: .window(.root))
(controller as? MediaEditorScreen)?.customNavigationController = navigationController
self.imageNode.isHidden = true
Queue.mainQueue().after(0.5, {
galleryController.dismiss()

14
submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
View file

@ -6742,6 +6742,16 @@ public final class MediaEditorScreenImpl: ViewController, MediaEditorScreen, UID
fileprivate let customTarget: EnginePeer.Id?
let forwardSource: (EnginePeer, EngineStoryItem)?
public weak var customNavigationController: UINavigationController?
var effectiveNavigationController: UINavigationController? {
if let navigationController = self.navigationController {
return navigationController
} else {
return self.customNavigationController
}
}
let initialCaption: NSAttributedString?
let initialPrivacy: EngineStoryPrivacy?
let initialMediaAreas: [MediaArea]?
@ -8145,7 +8155,7 @@ public final class MediaEditorScreenImpl: ViewController, MediaEditorScreen, UID
self?.stickerUploadDisposable.set(nil)
})
case let .complete(resource, _):
let navigationController = self.navigationController as? NavigationController
let navigationController = self.effectiveNavigationController as? NavigationController
let result: MediaEditorScreenImpl.Result
switch action {
@ -8174,7 +8184,7 @@ public final class MediaEditorScreenImpl: ViewController, MediaEditorScreen, UID
parentController.present(UndoOverlayController(presentationData: presentationData, content: .sticker(context: self.context, file: file, loop: true, title: nil, text: presentationData.strings.Conversation_StickerAddedToFavorites, undoText: nil, customAction: nil), elevatedLayout: false, action: { _ in return false }), in: .current)
}
case .addToStickerPack, .createStickerPack:
if let (packReference, packTitle) = packReferenceAndTitle, let navigationController = self.navigationController as? NavigationController {
if let (packReference, packTitle) = packReferenceAndTitle, let navigationController {
Queue.mainQueue().after(0.2) {
let controller = self.context.sharedContext.makeStickerPackScreen(context: self.context, updatedPresentationData: nil, mainStickerPack: packReference, stickerPacks: [packReference], loadedStickerPacks: [], actionTitle: nil, isEditing: false, expandIfNeeded: true, parentNavigationController: navigationController, sendSticker: self.sendSticker, actionPerformed: nil)
(navigationController.viewControllers.last as? ViewController)?.present(controller, in: .window(.root))