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 commit '2749d3a2feb6518a0bcfaa3ab3a52059729de8f3'

Browse Source
This commit is contained in:
Ali
2023-05-19 18:10:23 +04:00
parent 862cb0b366 2749d3a2fe
commit 200523f50e
6 changed files with 55 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
View File

@@ -1534,7 +1534,7 @@ public final class MediaEditorScreen: ViewController {
duration = 5.0
}
}
self.completion(.video(video: videoResult, coverImage: nil, values: mediaEditor.values, duration: duration, dimensions: PixelDimensions(width: 1080, height: 1920), caption: caption), { [weak self] in
self.completion(.video(video: videoResult, coverImage: nil, values: mediaEditor.values, duration: duration, dimensions: PixelDimensions(width: 720, height: 1280), caption: caption), { [weak self] in
self?.node.animateOut(finished: true, completion: { [weak self] in
self?.dismiss()
})

13
submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaToolsScreen.swift
View File

@@ -351,7 +351,7 @@ private final class MediaToolsScreenComponent: Component {
guard let controller = environment.controller() as? MediaToolsScreen else {
return
}
controller.requestDismiss(animated: true)
controller.requestDismiss(reset: true, animated: true)
}
)),
environment: {},
@@ -379,7 +379,7 @@ private final class MediaToolsScreenComponent: Component {
guard let controller = environment.controller() as? MediaToolsScreen else {
return
}
controller.requestDismiss(animated: true)
controller.requestDismiss(reset: false, animated: true)
}
)),
environment: {},
@@ -954,10 +954,13 @@ public final class MediaToolsScreen: ViewController {
fileprivate let mediaEditor: MediaEditor
public var dismissed: () -> Void = {}
private var initialValues: MediaEditorValues
public init(context: AccountContext, mediaEditor: MediaEditor) {
self.context = context
self.mediaEditor = mediaEditor
self.initialValues = mediaEditor.values.makeCopy()
super.init(navigationBarPresentationData: nil)
self.navigationPresentation = .flatModal
@@ -977,7 +980,11 @@ public final class MediaToolsScreen: ViewController {
super.displayNodeDidLoad()
}
func requestDismiss(animated: Bool) {
func requestDismiss(reset: Bool, animated: Bool) {
if reset {
self.mediaEditor.values = self.initialValues
}
self.dismissed()
self.node.animateOutToEditor(completion: {