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

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-06-24 16:19:01 +02:00
parent c90748c8d4
commit 36e4eb858b
4 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
submodules/DrawingUI/Sources/DrawingScreen.swift
View File

@ -1003,11 +1003,11 @@ private final class DrawingScreenComponent: CombinedComponent {
self.updateEntitiesPlayback.invoke(false) self.updateEntitiesPlayback.invoke(false)
let controller = StickerPickerScreen(context: self.context, inputData: self.stickerPickerInputData.get()) let controller = StickerPickerScreen(context: self.context, inputData: self.stickerPickerInputData.get())
controller.completion = { [weak self] file in controller.completion = { [weak self] content in
self?.updateEntitiesPlayback.invoke(true) self?.updateEntitiesPlayback.invoke(true)
if let file = file { if let content {
let stickerEntity = DrawingStickerEntity(content: .file(file)) let stickerEntity = DrawingStickerEntity(content: content)
self?.insertEntity.invoke(stickerEntity) self?.insertEntity.invoke(stickerEntity)
} else { } else {
self?.updateCurrentMode(.drawing) self?.updateCurrentMode(.drawing)

35
submodules/DrawingUI/Sources/StickerPickerScreen.swift
View File

@ -16,6 +16,7 @@ import TelegramNotices
import ChatEntityKeyboardInputNode import ChatEntityKeyboardInputNode
import ContextUI import ContextUI
import ChatPresentationInterfaceState import ChatPresentationInterfaceState
import MediaEditor
public struct StickerPickerInputData: Equatable { public struct StickerPickerInputData: Equatable {
var emoji: EmojiPagerContentComponent var emoji: EmojiPagerContentComponent
@ -474,10 +475,34 @@ public class StickerPickerScreen: ViewController {
content.emoji.inputInteractionHolder.inputInteraction = EmojiPagerContentComponent.InputInteraction( content.emoji.inputInteractionHolder.inputInteraction = EmojiPagerContentComponent.InputInteraction(
performItemAction: { [weak self] _, item, _, _, _, _ in performItemAction: { [weak self] _, item, _, _, _, _ in
guard let strongSelf = self, let file = item.itemFile else { guard let strongSelf = self else {
return return
} }
strongSelf.controller?.completion(file) if let file = item.itemFile {
strongSelf.controller?.completion(.file(file))
} else if case let .staticEmoji(emoji) = item.content {
if let image = generateImage(CGSize(width: 256.0, height: 256.0), scale: 1.0, rotatedContext: { size, context in
context.clear(CGRect(origin: .zero, size: size))
let attributedString = NSAttributedString(string: emoji, attributes: [NSAttributedString.Key.font: Font.regular(200), NSAttributedString.Key.foregroundColor: UIColor.white])
let line = CTLineCreateWithAttributedString(attributedString)
let lineBounds = CTLineGetBoundsWithOptions(line, [.useOpticalBounds])
let lineOffset = CGPoint(x: 1.0 - UIScreenPixel, y: 0.0)
let lineOrigin = CGPoint(x: floorToScreenPixels(-lineBounds.origin.x + (size.width - lineBounds.size.width) / 2.0) + lineOffset.x, y: floorToScreenPixels(-lineBounds.origin.y + (size.height - lineBounds.size.height) / 2.0) + lineOffset.y)
context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
context.scaleBy(x: 1.0, y: -1.0)
context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
context.translateBy(x: lineOrigin.x, y: lineOrigin.y)
CTLineDraw(line, context)
context.translateBy(x: -lineOrigin.x, y: -lineOrigin.y)
}) {
strongSelf.controller?.completion(.image(image))
}
}
strongSelf.controller?.dismiss(animated: true) strongSelf.controller?.dismiss(animated: true)
}, },
deleteBackwards: nil, deleteBackwards: nil,
@ -810,7 +835,7 @@ public class StickerPickerScreen: ViewController {
guard let strongSelf = self, let file = item.itemFile else { guard let strongSelf = self, let file = item.itemFile else {
return return
} }
strongSelf.controller?.completion(file) strongSelf.controller?.completion(.file(file))
strongSelf.controller?.dismiss(animated: true) strongSelf.controller?.dismiss(animated: true)
}, },
deleteBackwards: nil, deleteBackwards: nil,
@ -901,7 +926,7 @@ public class StickerPickerScreen: ViewController {
guard let strongSelf = self, let file = item.itemFile else { guard let strongSelf = self, let file = item.itemFile else {
return return
} }
strongSelf.controller?.completion(file) strongSelf.controller?.completion(.file(file))
strongSelf.controller?.dismiss(animated: true) strongSelf.controller?.dismiss(animated: true)
}, },
deleteBackwards: nil, deleteBackwards: nil,
@ -1523,7 +1548,7 @@ public class StickerPickerScreen: ViewController {
public var pushController: (ViewController) -> Void = { _ in } public var pushController: (ViewController) -> Void = { _ in }
public var presentController: (ViewController) -> Void = { _ in } public var presentController: (ViewController) -> Void = { _ in }
public var completion: (TelegramMediaFile?) -> Void = { _ in } public var completion: (DrawingStickerEntity.Content?) -> Void = { _ in }
public init(context: AccountContext, inputData: Signal<StickerPickerInputData, NoError>) { public init(context: AccountContext, inputData: Signal<StickerPickerInputData, NoError>) {
self.context = context self.context = context

4
submodules/TelegramUI/Components/ChatEntityKeyboardInputNode/Sources/StickerPaneSearchContentNode.swift
View File

@ -265,7 +265,7 @@ final class StickerPaneSearchContentNode: ASDisplayNode, PaneSearchContentNode {
let context = strongSelf.context let context = strongSelf.context
var cancelImpl: (() -> Void)? var cancelImpl: (() -> Void)?
let progressSignal = Signal<Never, NoError> { subscriber in let progressSignal = Signal<Never, NoError> { subscriber in
let presentationData = context.sharedContext.currentPresentationData.with { $0 } let presentationData = context.sharedContext.currentPresentationData.with { $0 }.withUpdated(theme: theme)
let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
cancelImpl?() cancelImpl?()
})) }))
@ -305,7 +305,7 @@ final class StickerPaneSearchContentNode: ASDisplayNode, PaneSearchContentNode {
} }
} }
let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }.withUpdated(theme: theme)
strongSelf.interaction.getNavigationController()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).string, undo: false, info: info, topItem: items.first, context: strongSelf.context), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { _ in strongSelf.interaction.getNavigationController()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).string, undo: false, info: info, topItem: items.first, context: strongSelf.context), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { _ in
return true return true
})) }))

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

@ -2606,10 +2606,10 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
switch mode { switch mode {
case .sticker: case .sticker:
let controller = StickerPickerScreen(context: self.context, inputData: self.stickerPickerInputData.get()) let controller = StickerPickerScreen(context: self.context, inputData: self.stickerPickerInputData.get())
controller.completion = { [weak self] file in controller.completion = { [weak self] content in
if let self { if let self {
if let file { if let content {
let stickerEntity = DrawingStickerEntity(content: .file(file)) let stickerEntity = DrawingStickerEntity(content: content)
self.interaction?.insertEntity(stickerEntity) self.interaction?.insertEntity(stickerEntity)
self.hasAnyChanges = true self.hasAnyChanges = true