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

Changed animated emoji insets

Browse Source
This commit is contained in:
Ilya Laktyushin 2019-07-31 14:25:05 +03:00
parent e90f49d5d5
commit 6ea5883b6e
3 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
submodules/TelegramUI/TelegramUI/AnimatedStickerNode.swift
View File

@ -470,10 +470,13 @@ final class AnimatedStickerNode: ASDisplayNode {
self.timer.swap(nil)?.invalidate() self.timer.swap(nil)?.invalidate()
} }
func playIfNeeded() { func playIfNeeded() -> Bool {
if !self.isPlaying { if !self.isPlaying {
self.isPlaying = true
self.play() self.play()
return true
} }
return false
} }
func updateLayout(size: CGSize) { func updateLayout(size: CGSize) {

50
submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift
View File

@ -306,11 +306,11 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
let displayLeftInset = params.leftInset + layoutConstants.bubble.edgeInset + avatarInset let displayLeftInset = params.leftInset + layoutConstants.bubble.edgeInset + avatarInset
let imageInset: CGFloat = 10.0 let imageInset: CGFloat = 10.0
let innerImageSize = imageSize var innerImageSize = imageSize
imageSize = CGSize(width: imageSize.width + imageInset * 2.0, height: imageSize.height + imageInset * 2.0) imageSize = CGSize(width: imageSize.width + imageInset * 2.0, height: imageSize.height + imageInset * 2.0)
var imageFrame = CGRect(origin: CGPoint(x: 0.0 + (incoming ? (params.leftInset + layoutConstants.bubble.edgeInset + avatarInset + layoutConstants.bubble.contentInsets.left) : (params.width - params.rightInset - imageSize.width - layoutConstants.bubble.edgeInset - layoutConstants.bubble.contentInsets.left - deliveryFailedInset)), y: 0.0), size: CGSize(width: imageSize.width, height: imageSize.height)) let imageFrame = CGRect(origin: CGPoint(x: 0.0 + (incoming ? (params.leftInset + layoutConstants.bubble.edgeInset + avatarInset + layoutConstants.bubble.contentInsets.left) : (params.width - params.rightInset - imageSize.width - layoutConstants.bubble.edgeInset - layoutConstants.bubble.contentInsets.left - deliveryFailedInset)), y: 0.0), size: CGSize(width: imageSize.width, height: imageSize.height))
if isEmoji { if isEmoji {
imageFrame = imageFrame.offsetBy(dx: incoming ? -imageInset : imageInset, dy: 0.0) innerImageSize = imageSize
} }
let arguments = TransformImageArguments(corners: ImageCorners(), imageSize: innerImageSize, boundingSize: innerImageSize, intrinsicInsets: UIEdgeInsets(top: imageInset, left: imageInset, bottom: imageInset, right: imageInset)) let arguments = TransformImageArguments(corners: ImageCorners(), imageSize: innerImageSize, boundingSize: innerImageSize, intrinsicInsets: UIEdgeInsets(top: imageInset, left: imageInset, bottom: imageInset, right: imageInset))
@ -455,10 +455,14 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
} }
let updatedImageFrame = imageFrame.offsetBy(dx: 0.0, dy: floor((contentHeight - imageSize.height) / 2.0)) let updatedImageFrame = imageFrame.offsetBy(dx: 0.0, dy: floor((contentHeight - imageSize.height) / 2.0))
var updatedContentFrame = updatedImageFrame
if isEmoji {
updatedContentFrame = updatedContentFrame.insetBy(dx: -imageInset, dy: -imageInset)
}
strongSelf.imageNode.frame = updatedImageFrame strongSelf.imageNode.frame = updatedContentFrame
strongSelf.animationNode.frame = updatedImageFrame.insetBy(dx: imageInset, dy: imageInset) strongSelf.animationNode.frame = updatedContentFrame.insetBy(dx: imageInset, dy: imageInset)
strongSelf.animationNode.updateLayout(size: updatedImageFrame.insetBy(dx: imageInset, dy: imageInset).size) strongSelf.animationNode.updateLayout(size: updatedContentFrame.insetBy(dx: imageInset, dy: imageInset).size)
imageApply() imageApply()
if let updatedShareButtonNode = updatedShareButtonNode { if let updatedShareButtonNode = updatedShareButtonNode {
@ -662,29 +666,29 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
let _ = item.controllerInteraction.openMessage(item.message, .default) let _ = item.controllerInteraction.openMessage(item.message, .default)
} else if let _ = self.emojiFile { } else if let _ = self.emojiFile {
if item.context.sharedContext.immediateExperimentalUISettings.playAnimatedEmojiOnce { if item.context.sharedContext.immediateExperimentalUISettings.playAnimatedEmojiOnce {
self.animationNode.playIfNeeded() if self.animationNode.playIfNeeded() {
} if self.item?.message.text == "❤️" {
let hapticFeedback: HapticFeedback
if self.item?.message.text == "❤️" { if let currentHapticFeedback = self.hapticFeedback {
let hapticFeedback: HapticFeedback hapticFeedback = currentHapticFeedback
if let currentHapticFeedback = self.hapticFeedback { } else {
hapticFeedback = currentHapticFeedback hapticFeedback = HapticFeedback()
} else { self.hapticFeedback = hapticFeedback
hapticFeedback = HapticFeedback() }
self.hapticFeedback = hapticFeedback hapticFeedback.prepareImpact()
} hapticFeedback.impact(.heavy)
hapticFeedback.prepareImpact()
hapticFeedback.impact(.heavy)
Queue.mainQueue().after(0.2) {
hapticFeedback.impact(.medium)
Queue.mainQueue().after(0.74) {
hapticFeedback.impact(.medium)
Queue.mainQueue().after(0.2) { Queue.mainQueue().after(0.2) {
hapticFeedback.impact(.medium) hapticFeedback.impact(.medium)
Queue.mainQueue().after(0.74) { Queue.mainQueue().after(0.74) {
hapticFeedback.impact(.medium) hapticFeedback.impact(.medium)
Queue.mainQueue().after(0.2) { Queue.mainQueue().after(0.2) {
hapticFeedback.impact(.medium) hapticFeedback.impact(.medium)
Queue.mainQueue().after(0.74) {
hapticFeedback.impact(.medium)
Queue.mainQueue().after(0.2) {
hapticFeedback.impact(.medium)
}
}
} }
} }
} }

2
submodules/TelegramUI/TelegramUI/EmojiUtils.swift
View File

@ -147,7 +147,7 @@ extension String {
} }
var trimmedEmoji: String { var trimmedEmoji: String {
if self.unicodeScalars.count > 1, self.unicodeScalars.first?.value == 0x2764 { if self.unicodeScalars.count > 1, self.unicodeScalars.first?.value == 0x2764, self.emojis.count == 1 {
return String(self.unicodeScalars.prefix(self.unicodeScalars.count - 1)) return String(self.unicodeScalars.prefix(self.unicodeScalars.count - 1))
} else { } else {
return self return self