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

Various improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2024-04-06 16:38:31 +04:00
parent 59982fe019
commit 698a74b6b6
3 changed files with 88 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,8 +245,10 @@ final class MediaEditorScreenComponent: Component {
}
|> deliverOnMainQueue).start(next: { [weak self] playerState in
if let self {
self.playerState = playerState
self.updated()
if self.playerState != playerState {
self.playerState = playerState
self.updated()
}
}
})
@@ -4421,6 +4423,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
fileprivate var drawingScreen: DrawingScreen?
fileprivate var stickerScreen: StickerPickerScreen?
fileprivate weak var cutoutScreen: MediaCutoutScreen?
private var defaultToEmoji = false
private var previousDrawingData: Data?
@@ -4685,28 +4688,6 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
self.controller?.present(controller, in: .current)
self.animateOutToTool(tool: mode)
case .cutout, .cutoutErase, .cutoutRestore:
if self.isDisplayingTool != nil {
guard self.isDisplayingTool != mode else {
return
}
self.isDisplayingTool = mode
if let state = self.stickerMaskDrawingView?.appliedToolState {
switch mode {
case .cutoutErase:
self.stickerMaskDrawingView?.updateToolState(state.withUpdatedColor(DrawingColor(color: .black)))
case .cutoutRestore:
self.stickerMaskDrawingView?.updateToolState(state.withUpdatedColor(DrawingColor(color: .white)))
default:
break
}
}
self.requestUpdate(transition: .easeInOut(duration: 0.2))
return
}
guard let mediaEditor = self.mediaEditor, let stickerMaskDrawingView = self.stickerMaskDrawingView, let stickerBackgroundView = self.stickerBackgroundView else {
return
}
let cutoutMode: MediaCutoutScreen.Mode
switch mode {
case .cutout:
@@ -4718,6 +4699,19 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
default:
cutoutMode = .cutout
}
if self.isDisplayingTool != nil {
guard self.isDisplayingTool != mode else {
return
}
self.isDisplayingTool = mode
self.cutoutScreen?.mode = cutoutMode
self.requestUpdate(transition: .easeInOut(duration: 0.2))
return
}
guard let mediaEditor = self.mediaEditor, let stickerMaskDrawingView = self.stickerMaskDrawingView, let stickerBackgroundView = self.stickerBackgroundView else {
return
}
let cutoutController = MediaCutoutScreen(
context: self.context,
mode: cutoutMode,
@@ -4734,6 +4728,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
}
}
controller.present(cutoutController, in: .window(.root))
self.cutoutScreen = cutoutController
self.animateOutToTool(tool: mode, inPlace: true)
controller.hapticFeedback.impact(.medium)
@@ -4776,6 +4771,12 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
if let drawingImage = stickerMaskDrawingView.drawingImage {
mediaEditor.setSegmentationMask(drawingImage)
}
if self.isDisplayingTool == .cutoutRestore && !stickerMaskDrawingView.internalState.canUndo && !controller.node.isCutout {
self.cutoutScreen?.mode = .erase
self.isDisplayingTool = .cutoutErase
self.requestLayout(forceUpdate: true, transition: .easeInOut(duration: 0.25))
}
} else if controller.node.isCutout {
let action = {
let snapshotView = self.previewView.snapshotView(afterScreenUpdates: false)
@@ -4797,6 +4798,12 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
} else {
action()
}
if self.isDisplayingTool == .cutoutRestore {
self.cutoutScreen?.mode = .erase
self.isDisplayingTool = .cutoutErase
self.requestLayout(forceUpdate: true, transition: .easeInOut(duration: 0.25))
}
}
}
}