ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve stickers

Browse Source
This commit is contained in:
Ali 2020-04-17 22:22:59 +04:00
parent e78a18a384
commit 17d3a1eb53
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,7 @@ final class StickerPaneSearchStickerItemNode: GridItemNode {
let animationNode = AnimatedStickerNode() let animationNode = AnimatedStickerNode()
animationNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.imageNodeTap(_:)))) animationNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.imageNodeTap(_:))))
self.animationNode = animationNode self.animationNode = animationNode
self.addSubnode(animationNode) self.insertSubnode(animationNode, belowSubnode: self.textNode)
} }
let dimensions = stickerItem.file.dimensions ?? PixelDimensions(width: 512, height: 512) let dimensions = stickerItem.file.dimensions ?? PixelDimensions(width: 512, height: 512)
let fittedDimensions = dimensions.cgSize.aspectFitted(CGSize(width: 160.0, height: 160.0)) let fittedDimensions = dimensions.cgSize.aspectFitted(CGSize(width: 160.0, height: 160.0))

15
submodules/TooltipUI/Sources/TooltipScreen.swift
View File

@ -32,6 +32,7 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
private let scrollingContainer: ASDisplayNode private let scrollingContainer: ASDisplayNode
private let containerNode: ASDisplayNode private let containerNode: ASDisplayNode
private let backgroundNode: ASImageNode private let backgroundNode: ASImageNode
private var effectView: UIView?
private let arrowNode: ASImageNode private let arrowNode: ASImageNode
private let arrowContainer: ASDisplayNode private let arrowContainer: ASDisplayNode
private let animatedStickerNode: AnimatedStickerNode private let animatedStickerNode: AnimatedStickerNode
@ -55,6 +56,11 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
self.backgroundNode = ASImageNode() self.backgroundNode = ASImageNode()
self.backgroundNode.image = generateAdjustedStretchableFilledCircleImage(diameter: 15.0, color: fillColor) self.backgroundNode.image = generateAdjustedStretchableFilledCircleImage(diameter: 15.0, color: fillColor)
if case .top = location {
self.effectView = UIVisualEffectView(effect: UIBlurEffect(style: .dark))
self.containerNode.clipsToBounds = true
self.containerNode.cornerRadius = 9.0
}
self.arrowNode = ASImageNode() self.arrowNode = ASImageNode()
let arrowSize = CGSize(width: 29.0, height: 10.0) let arrowSize = CGSize(width: 29.0, height: 10.0)
@ -94,7 +100,11 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
self.arrowContainer.addSubnode(self.arrowNode) self.arrowContainer.addSubnode(self.arrowNode)
self.backgroundNode.addSubnode(self.arrowContainer) self.backgroundNode.addSubnode(self.arrowContainer)
self.containerNode.addSubnode(self.backgroundNode) if let effectView = self.effectView {
self.containerNode.view.addSubview(effectView)
} else {
self.containerNode.addSubnode(self.backgroundNode)
}
self.containerNode.addSubnode(self.textNode) self.containerNode.addSubnode(self.textNode)
self.containerNode.addSubnode(self.animatedStickerNode) self.containerNode.addSubnode(self.animatedStickerNode)
self.scrollingContainer.addSubnode(self.containerNode) self.scrollingContainer.addSubnode(self.containerNode)
@ -211,6 +221,9 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
transition.updateFrame(node: self.containerNode, frame: backgroundFrame) transition.updateFrame(node: self.containerNode, frame: backgroundFrame)
transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: backgroundFrame.size)) transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: backgroundFrame.size))
if let effectView = self.effectView {
transition.updateFrame(view: effectView, frame: CGRect(origin: CGPoint(), size: backgroundFrame.size))
}
if let image = self.arrowNode.image, case let .point(rect) = self.location { if let image = self.arrowNode.image, case let .point(rect) = self.location {
let arrowSize = image.size let arrowSize = image.size
let arrowCenterX = rect.midX let arrowCenterX = rect.midX