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
2023-06-24 02:06:32 +04:00
parent 9368d93053 9110d1912a
commit 4456d4eed8
47 changed files with 1008 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -603,11 +603,14 @@ final class MediaEditorScreenComponent: Component {
let environment = environment[ViewControllerComponentContainer.Environment.self].value
self.environment = environment
if self.component == nil {
if let controller = environment.controller() as? MediaEditorScreen {
var isEditingStory = false
if let controller = environment.controller() as? MediaEditorScreen {
isEditingStory = controller.isEditingStory
if self.component == nil {
self.inputPanelExternalState.initialText = controller.initialCaption
}
}
self.component = component
self.state = state
@@ -957,7 +960,7 @@ final class MediaEditorScreenComponent: Component {
self.state?.updated(transition: .immediate)
}
},
timeoutAction: { [weak self] view in
timeoutAction: isEditingStory ? nil : { [weak self] view in
guard let self, let controller = self.environment?.controller() as? MediaEditorScreen else {
return
}
@@ -985,7 +988,8 @@ final class MediaEditorScreenComponent: Component {
timeoutSelected: timeoutSelected,
displayGradient: false,
bottomInset: 0.0,
hideKeyboard: self.currentInputMode == .emoji
hideKeyboard: self.currentInputMode == .emoji,
disabledPlaceholder: nil
)),
environment: {},
containerSize: CGSize(width: inputPanelAvailableWidth, height: inputPanelAvailableHeight)
@@ -2861,6 +2865,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
public var cancelled: (Bool) -> Void = { _ in }
public var completion: (Int64, MediaEditorScreen.Result?, NSAttributedString, MediaEditorResultPrivacy , @escaping (@escaping () -> Void) -> Void) -> Void = { _, _, _, _, _ in }
public var dismissed: () -> Void = { }
public var willDismiss: () -> Void = { }
private let hapticFeedback = HapticFeedback()
@@ -3173,6 +3178,8 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
self.cancelled(saveDraft)
self.willDismiss()
self.node.animateOut(finished: false, saveDraft: saveDraft, completion: { [weak self] in
self?.dismiss()
self?.dismissed()