ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-09 03:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-05-27 20:06:12 +04:00
parent b6af4cc99e
commit 0ef81e2928
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ final class MediaEditorScreenComponent: Component {
let context: AccountContext
let mediaEditor: MediaEditor?
let privacy: MediaEditorResultPrivacy
let selectedEntity: DrawingEntity?
let openDrawing: (DrawingScreenType) -> Void
let openTools: () -> Void
@ -46,12 +47,14 @@ final class MediaEditorScreenComponent: Component {
context: AccountContext,
mediaEditor: MediaEditor?,
privacy: MediaEditorResultPrivacy,
selectedEntity: DrawingEntity?,
openDrawing: @escaping (DrawingScreenType) -> Void,
openTools: @escaping () -> Void
) {
self.context = context
self.mediaEditor = mediaEditor
self.privacy = privacy
self.selectedEntity = selectedEntity
self.openDrawing = openDrawing
self.openTools = openTools
}
@ -63,6 +66,9 @@ final class MediaEditorScreenComponent: Component {
if lhs.privacy != rhs.privacy {
return false
}
if lhs.selectedEntity?.uuid != rhs.selectedEntity?.uuid {
return false
}
return true
}
@ -696,6 +702,8 @@ final class MediaEditorScreenComponent: Component {
containerSize: CGSize(width: availableSize.width, height: 200.0)
)
var isEditingTextEntity = false
var inputPanelAlpha: CGFloat = 1.0
var inputPanelOffset: CGFloat = 0.0
var inputPanelBottomInset: CGFloat = scrubberBottomInset
if environment.inputHeight > 0.0 {
@ -708,6 +716,12 @@ final class MediaEditorScreenComponent: Component {
self.addSubview(inputPanelView)
}
transition.setFrame(view: inputPanelView, frame: inputPanelFrame)
if inputPanelOffset > 0.0 && component.selectedEntity != nil {
isEditingTextEntity = true
inputPanelAlpha = 0.0
}
transition.setAlpha(view: inputPanelView, alpha: inputPanelAlpha)
}
let privacyText: String
@ -759,8 +773,8 @@ final class MediaEditorScreenComponent: Component {
}
transition.setPosition(view: privacyButtonView, position: privacyButtonFrame.center)
transition.setBounds(view: privacyButtonView, bounds: CGRect(origin: .zero, size: privacyButtonFrame.size))
transition.setScale(view: privacyButtonView, scale: self.inputPanelExternalState.isEditing ? 0.01 : 1.0)
transition.setAlpha(view: privacyButtonView, alpha: self.inputPanelExternalState.isEditing ? 0.0 : 1.0)
transition.setScale(view: privacyButtonView, scale: self.inputPanelExternalState.isEditing || isEditingTextEntity ? 0.01 : 1.0)
transition.setAlpha(view: privacyButtonView, alpha: self.inputPanelExternalState.isEditing || isEditingTextEntity ? 0.0 : 1.0)
}
let saveButtonSize = self.saveButton.update(
@ -803,8 +817,8 @@ final class MediaEditorScreenComponent: Component {
}
transition.setPosition(view: saveButtonView, position: saveButtonFrame.center)
transition.setBounds(view: saveButtonView, bounds: CGRect(origin: .zero, size: saveButtonFrame.size))
transition.setScale(view: saveButtonView, scale: self.inputPanelExternalState.isEditing ? 0.01 : 1.0)
transition.setAlpha(view: saveButtonView, alpha: self.inputPanelExternalState.isEditing ? 0.0 : 1.0)
transition.setScale(view: saveButtonView, scale: self.inputPanelExternalState.isEditing || isEditingTextEntity ? 0.01 : 1.0)
transition.setAlpha(view: saveButtonView, alpha: self.inputPanelExternalState.isEditing || isEditingTextEntity ? 0.0 : 1.0)
}
if let playerState = state.playerState, playerState.hasAudio {
@ -1161,6 +1175,7 @@ public final class MediaEditorScreen: ViewController {
self.previewContainerView.addGestureRecognizer(rotateGestureRecognizer)
let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.handleTap(_:)))
tapGestureRecognizer.delegate = self
self.previewContainerView.addGestureRecognizer(tapGestureRecognizer)
self.interaction = DrawingToolsInteraction(
@ -1523,6 +1538,7 @@ public final class MediaEditorScreen: ViewController {
context: self.context,
mediaEditor: self.mediaEditor,
privacy: controller.state.privacy,
selectedEntity: self.entitiesView.selectedEntityView?.entity,
openDrawing: { [weak self] mode in
if let self {
if self.entitiesView.hasSelection {
@ -1613,8 +1629,12 @@ public final class MediaEditorScreen: ViewController {
var bottomInputOffset: CGFloat = 0.0
if let inputHeight = layout.inputHeight, inputHeight > 0.0 {
if self.entitiesView.selectedEntityView != nil {
bottomInputOffset = inputHeight / 2.0
} else {
bottomInputOffset = inputHeight - topInset - 17.0
}
}
transition.setFrame(view: self.backgroundDimView, frame: CGRect(origin: .zero, size: layout.size))

2
submodules/TelegramUI/Sources/TelegramRootController.swift
View File

@ -436,7 +436,7 @@ public final class TelegramRootController: NavigationController, TelegramRootCon
let _ = enqueueMessagesToMultiplePeers(
account: self.context.account,
peerIds: peerIds, threadIds: [:],
messages: [.message(text: text.string, attributes: attributes, inlineStickers: [:], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil, bubbleUpEmojiOrStickersets: bubbleUpEmojiOrStickersets)]).start()
messages: [.message(text: text.string, attributes: attributes, inlineStickers: [:], mediaReference: .standalone(media: media), replyToMessageId: nil, replyToStoryId: nil, localGroupingKey: nil, correlationId: nil, bubbleUpEmojiOrStickersets: bubbleUpEmojiOrStickersets)]).start()
}
}
case let .video(content, _, values, duration, dimensions, caption):