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

Video editor fixes

Browse Source
This commit is contained in:
Ilya Laktyushin
2020-05-27 18:34:33 +03:00
parent 81906381aa
commit 4c3eb63583
18 changed files with 1882 additions and 1240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
submodules/TelegramUI/Sources/DrawingStickersScreen.swift
View File

@@ -20,7 +20,7 @@ import SegmentedControlNode
private final class DrawingStickersScreenNode: ViewControllerTracingNode {
private let context: AccountContext
private var presentationData: PresentationData
private let selectSticker: ((FileMediaReference, ASDisplayNode, CGRect) -> Bool)?
fileprivate var selectSticker: ((FileMediaReference, ASDisplayNode, CGRect) -> Bool)?
private var searchItemContext = StickerPaneSearchGlobalItemContext()
private let themeAndStringsPromise: Promise<(PresentationTheme, PresentationStrings)>
@@ -384,7 +384,7 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
}
let panelEntries = chatMediaInputPanelEntries(view: view, savedStickers: savedStickers, recentStickers: recentStickers, peerSpecificPack: nil, canInstallPeerSpecificPack: .none, hasUnreadTrending: nil, theme: theme, hasGifs: false)
var gridEntries = chatMediaInputGridEntries(view: view, savedStickers: savedStickers, recentStickers: recentStickers, peerSpecificPack: nil, canInstallPeerSpecificPack: .none, hasSearch: false, strings: strings, theme: theme)
let gridEntries = chatMediaInputGridEntries(view: view, savedStickers: savedStickers, recentStickers: recentStickers, peerSpecificPack: nil, canInstallPeerSpecificPack: .none, hasSearch: false, strings: strings, theme: theme)
if view.higher == nil {
var hasTopSeparator = true
@@ -821,6 +821,10 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
func animateIn() {
self.layer.animatePosition(from: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), to: self.layer.position, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring)
}
func animateOut() {
self.layer.animatePosition(from: self.layer.position, to: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
}
func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationHeight: CGFloat, transition: ContainedViewLayoutTransition) {
self.validLayout = layout
@@ -834,7 +838,7 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
final class DrawingStickersScreen: ViewController {
private let context: AccountContext
private let selectSticker: ((FileMediaReference, ASDisplayNode, CGRect) -> Bool)?
var selectSticker: ((FileMediaReference, ASDisplayNode, CGRect) -> Bool)?
private var controllerNode: DrawingStickersScreenNode {
return self.displayNode as! DrawingStickersScreenNode
@@ -890,14 +894,11 @@ final class DrawingStickersScreen: ViewController {
override public func loadDisplayNode() {
self.displayNode = DrawingStickersScreenNode(
context: self.context,
selectSticker: self.selectSticker.flatMap { [weak self] selectSticker in
return { file, sourceNode, sourceRect in
if selectSticker(file, sourceNode, sourceRect) {
self?.dismiss()
return true
} else {
return false
}
selectSticker: { [weak self] file, sourceNode, sourceRect in
if let strongSelf = self, let selectSticker = strongSelf.selectSticker {
return selectSticker(file, sourceNode, sourceRect)
} else {
return false
}
}
)