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

Update emoji animations haptic

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-09-13 23:23:37 +03:00
parent b29e2aa5c6
commit fd1362bf42
2 changed files with 74 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
submodules/TelegramCore/Sources/State/PeerInputActivity.swift
View File

@ -26,6 +26,9 @@ public struct EmojiInteraction: Equatable {
guard let item = decodedData as? [String: Any] else { guard let item = decodedData as? [String: Any] else {
return nil return nil
} }
guard let version = item["v"] as? Int, version == 1 else {
return nil
}
guard let animationsArray = item["a"] as? [Any] else { guard let animationsArray = item["a"] as? [Any] else {
return nil return nil
} }

92
submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
View File

@ -1354,6 +1354,10 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
} }
func playEmojiInteraction(_ interaction: EmojiInteraction) { func playEmojiInteraction(_ interaction: EmojiInteraction) {
guard interaction.animations.count <= 7 else {
return
}
var hapticFeedback: HapticFeedback var hapticFeedback: HapticFeedback
if let current = self.hapticFeedback { if let current = self.hapticFeedback {
hapticFeedback = current hapticFeedback = current
@ -1366,21 +1370,31 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
if let existingHaptic = self.haptic, existingHaptic.active { if let existingHaptic = self.haptic, existingHaptic.active {
playHaptic = false playHaptic = false
} }
hapticFeedback.prepareTap() hapticFeedback.prepareImpact(.light)
hapticFeedback.prepareImpact(.medium)
var index = 0
for animation in interaction.animations { for animation in interaction.animations {
if animation.timeOffset > 0.0 { if animation.timeOffset > 0.0 {
Queue.mainQueue().after(Double(animation.timeOffset)) { Queue.mainQueue().after(Double(animation.timeOffset)) {
self.playAdditionalAnimation(index: animation.index) self.playAdditionalAnimation(index: animation.index)
if playHaptic { if playHaptic {
hapticFeedback.tap() let style: ImpactHapticFeedbackStyle
if index == 1 {
style = .medium
} else {
style = [.light, .medium].randomElement() ?? .medium
}
hapticFeedback.impact(style)
} }
index += 1
} }
} else { } else {
self.playAdditionalAnimation(index: animation.index) self.playAdditionalAnimation(index: animation.index)
if playHaptic { if playHaptic {
hapticFeedback.tap() hapticFeedback.impact(interaction.animations.count > 1 ? .light : .medium)
} }
index += 1
} }
} }
} }
@ -1556,8 +1570,32 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
firstScalar = UnicodeScalar(heart)! firstScalar = UnicodeScalar(heart)!
} }
return .optionalAction({ return .optionalAction({
var haptic: EmojiHaptic?
if let current = self.haptic {
haptic = current
} else {
if firstScalar.value == heart {
haptic = HeartbeatHaptic()
} else if firstScalar.value == coffin {
haptic = CoffinHaptic()
} else if firstScalar.value == peach {
haptic = PeachHaptic()
}
haptic?.enabled = true
self.haptic = haptic
}
if let animationItems = item.associatedData.additionalAnimatedEmojiStickers[originalTextEmoji] { if let animationItems = item.associatedData.additionalAnimatedEmojiStickers[originalTextEmoji] {
let syncAnimations = item.message.id.peerId.namespace == Namespaces.Peer.CloudUser let syncAnimations = item.message.id.peerId.namespace == Namespaces.Peer.CloudUser
let playHaptic = haptic == nil
var hapticFeedback: HapticFeedback
if let current = self.hapticFeedback {
hapticFeedback = current
} else {
hapticFeedback = HapticFeedback()
self.hapticFeedback = hapticFeedback
}
if syncAnimations { if syncAnimations {
self.startAdditionalAnimationsCommitTimer() self.startAdditionalAnimationsCommitTimer()
@ -1572,11 +1610,25 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
availableAnimations.removeValue(forKey: previousIndex) availableAnimations.removeValue(forKey: previousIndex)
} }
if let (_, previousTimestamp) = previousAnimation { if let (_, previousTimestamp) = previousAnimation {
delay = min(0.2, max(0.0, previousTimestamp + 0.2 - timestamp)) delay = min(0.15, max(0.0, previousTimestamp + 0.15 - timestamp))
} }
if let index = availableAnimations.randomElement()?.0 { if let index = availableAnimations.randomElement()?.0 {
if delay > 0.0 { if delay > 0.0 {
Queue.mainQueue().after(delay) { Queue.mainQueue().after(delay) {
if playHaptic {
if previousAnimation == nil {
hapticFeedback.impact(.light)
} else {
let style: ImpactHapticFeedbackStyle
if self.enqueuedAdditionalAnimations.count == 1 {
style = .medium
} else {
style = [.light, .medium].randomElement() ?? .medium
}
hapticFeedback.impact(style)
}
}
if syncAnimations { if syncAnimations {
self.enqueuedAdditionalAnimations.append((index, timestamp + delay)) self.enqueuedAdditionalAnimations.append((index, timestamp + delay))
} }
@ -1587,6 +1639,20 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
} }
} }
} else { } else {
if playHaptic {
if previousAnimation == nil {
hapticFeedback.impact(.light)
} else {
let style: ImpactHapticFeedbackStyle
if self.enqueuedAdditionalAnimations.count == 1 {
style = .medium
} else {
style = [.light, .medium].randomElement() ?? .medium
}
hapticFeedback.impact(style)
}
}
if syncAnimations { if syncAnimations {
self.enqueuedAdditionalAnimations.append((index, timestamp)) self.enqueuedAdditionalAnimations.append((index, timestamp))
} }
@ -1615,22 +1681,6 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
strongSelf.mediaStatusDisposable.set((mediaPlayer.status strongSelf.mediaStatusDisposable.set((mediaPlayer.status
|> deliverOnMainQueue).start(next: { [weak self, weak animationNode] status in |> deliverOnMainQueue).start(next: { [weak self, weak animationNode] status in
if let strongSelf = self { if let strongSelf = self {
var haptic: EmojiHaptic?
if let current = strongSelf.haptic {
haptic = current
} else {
if firstScalar.value == heart {
haptic = HeartbeatHaptic()
} else if firstScalar.value == coffin {
haptic = CoffinHaptic()
} else if firstScalar.value == peach {
haptic = PeachHaptic()
}
haptic?.enabled = true
strongSelf.haptic = haptic
}
if let haptic = haptic, !haptic.active { if let haptic = haptic, !haptic.active {
haptic.start(time: 0.0) haptic.start(time: 0.0)
} }