Various improvements

This commit is contained in:
Ilya Laktyushin 2022-07-10 00:29:02 +02:00
parent 72ab414a74
commit c55a66eba0
10 changed files with 82 additions and 16 deletions

View File

@ -1197,7 +1197,7 @@ public final class MediaStreamComponentController: ViewControllerComponentContai
self.view.layer.cornerCurve = .continuous self.view.layer.cornerCurve = .continuous
} }
self.view.layer.animatePosition(from: CGPoint(x: 353.0, y: 117.0), to: self.view.center, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, completion: { [weak self] _ in self.view.layer.animatePosition(from: CGPoint(x: self.view.frame.width * 0.9, y: 117.0), to: self.view.center, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, completion: { [weak self] _ in
self?.view.layer.cornerRadius = 0.0 self?.view.layer.cornerRadius = 0.0
}) })
self.view.layer.animateScale(from: 0.001, to: 1.0, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring) self.view.layer.animateScale(from: 0.001, to: 1.0, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
@ -1247,7 +1247,7 @@ public final class MediaStreamComponentController: ViewControllerComponentContai
self.view.layer.cornerCurve = .continuous self.view.layer.cornerCurve = .continuous
} }
self.view.layer.animatePosition(from: self.view.center, to: CGPoint(x: 353.0, y: 117.0), duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, completion: { _ in self.view.layer.animatePosition(from: self.view.center, to: CGPoint(x: self.view.frame.width * 0.9, y: 117.0), duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, completion: { _ in
}) })
self.view.layer.animateScale(from: 1.0, to: 0.001, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring) self.view.layer.animateScale(from: 1.0, to: 0.001, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
} }

View File

@ -3139,15 +3139,17 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
self?.displayPsa(type: type, sourceNode: sourceNode, isAutomatic: false) self?.displayPsa(type: type, sourceNode: sourceNode, isAutomatic: false)
}, displayDiceTooltip: { [weak self] dice in }, displayDiceTooltip: { [weak self] dice in
self?.displayDiceTooltip(dice: dice) self?.displayDiceTooltip(dice: dice)
}, animateDiceSuccess: { [weak self] onlyHaptic in }, animateDiceSuccess: { [weak self] haptic, confetti in
guard let strongSelf = self else { guard let strongSelf = self else {
return return
} }
if strongSelf.selectPollOptionFeedback == nil { if strongSelf.selectPollOptionFeedback == nil {
strongSelf.selectPollOptionFeedback = HapticFeedback() strongSelf.selectPollOptionFeedback = HapticFeedback()
} }
if haptic {
strongSelf.selectPollOptionFeedback?.success() strongSelf.selectPollOptionFeedback?.success()
if !onlyHaptic { }
if confetti {
strongSelf.chatDisplayNode.animateQuizCorrectOptionSelected() strongSelf.chatDisplayNode.animateQuizCorrectOptionSelected()
} }
}, displayPremiumStickerTooltip: { [weak self] file, message in }, displayPremiumStickerTooltip: { [weak self] file, message in

View File

@ -122,7 +122,7 @@ public final class ChatControllerInteraction {
let displayPollSolution: (TelegramMediaPollResults.Solution, ASDisplayNode) -> Void let displayPollSolution: (TelegramMediaPollResults.Solution, ASDisplayNode) -> Void
let displayPsa: (String, ASDisplayNode) -> Void let displayPsa: (String, ASDisplayNode) -> Void
let displayDiceTooltip: (TelegramMediaDice) -> Void let displayDiceTooltip: (TelegramMediaDice) -> Void
let animateDiceSuccess: (Bool) -> Void let animateDiceSuccess: (Bool, Bool) -> Void
let displayPremiumStickerTooltip: (TelegramMediaFile, Message) -> Void let displayPremiumStickerTooltip: (TelegramMediaFile, Message) -> Void
let openPeerContextMenu: (Peer, MessageId?, ASDisplayNode, CGRect, ContextGesture?) -> Void let openPeerContextMenu: (Peer, MessageId?, ASDisplayNode, CGRect, ContextGesture?) -> Void
let openMessageReplies: (MessageId, Bool, Bool) -> Void let openMessageReplies: (MessageId, Bool, Bool) -> Void
@ -225,7 +225,7 @@ public final class ChatControllerInteraction {
displayPollSolution: @escaping (TelegramMediaPollResults.Solution, ASDisplayNode) -> Void, displayPollSolution: @escaping (TelegramMediaPollResults.Solution, ASDisplayNode) -> Void,
displayPsa: @escaping (String, ASDisplayNode) -> Void, displayPsa: @escaping (String, ASDisplayNode) -> Void,
displayDiceTooltip: @escaping (TelegramMediaDice) -> Void, displayDiceTooltip: @escaping (TelegramMediaDice) -> Void,
animateDiceSuccess: @escaping (Bool) -> Void, animateDiceSuccess: @escaping (Bool, Bool) -> Void,
displayPremiumStickerTooltip: @escaping (TelegramMediaFile, Message) -> Void, displayPremiumStickerTooltip: @escaping (TelegramMediaFile, Message) -> Void,
openPeerContextMenu: @escaping (Peer, MessageId?, ASDisplayNode, CGRect, ContextGesture?) -> Void, openPeerContextMenu: @escaping (Peer, MessageId?, ASDisplayNode, CGRect, ContextGesture?) -> Void,
openMessageReplies: @escaping (MessageId, Bool, Bool) -> Void, openMessageReplies: @escaping (MessageId, Bool, Bool) -> Void,

View File

@ -423,7 +423,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
if !item.message.effectivelyIncoming(item.context.account.peerId) { if !item.message.effectivelyIncoming(item.context.account.peerId) {
animationNode.success = { [weak self] onlyHaptic in animationNode.success = { [weak self] onlyHaptic in
if let strongSelf = self, let item = strongSelf.item { if let strongSelf = self, let item = strongSelf.item {
item.controllerInteraction.animateDiceSuccess(onlyHaptic) item.controllerInteraction.animateDiceSuccess(true, !onlyHaptic)
} }
} }
} }
@ -433,7 +433,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
if !item.message.effectivelyIncoming(item.context.account.peerId) { if !item.message.effectivelyIncoming(item.context.account.peerId) {
animationNode.success = { [weak self] in animationNode.success = { [weak self] in
if let strongSelf = self, let item = strongSelf.item { if let strongSelf = self, let item = strongSelf.item {
item.controllerInteraction.animateDiceSuccess(false) item.controllerInteraction.animateDiceSuccess(true, true)
} }
} }
} }

View File

@ -40,6 +40,29 @@ class ChatMessageGiftBubbleContentNode: ChatMessageBubbleContentNode {
private var cachedMaskBackgroundImage: (CGPoint, UIImage, [CGRect])? private var cachedMaskBackgroundImage: (CGPoint, UIImage, [CGRect])?
private var absoluteRect: (CGRect, CGSize)? private var absoluteRect: (CGRect, CGSize)?
private var isPlaying: Bool = false
private var wasPending: Bool = false
private var didChangeFromPendingToSent: Bool = false
override var visibility: ListViewItemNodeVisibility {
didSet {
let wasVisible = oldValue != .none
let isVisible = self.visibility != .none
if wasVisible != isVisible {
self.visibilityStatus = isVisible
}
}
}
private var visibilityStatus: Bool? {
didSet {
if self.visibilityStatus != oldValue {
self.updateVisibility()
}
}
}
required init() { required init() {
self.labelNode = TextNode() self.labelNode = TextNode()
self.labelNode.isUserInteractionEnabled = false self.labelNode.isUserInteractionEnabled = false
@ -200,11 +223,19 @@ class ChatMessageGiftBubbleContentNode: ChatMessageBubbleContentNode {
return (backgroundSize, { [weak self] animation, synchronousLoads, _ in return (backgroundSize, { [weak self] animation, synchronousLoads, _ in
if let strongSelf = self { if let strongSelf = self {
if strongSelf.item == nil { if strongSelf.item == nil {
strongSelf.animationNode.setup(source: AnimatedStickerNodeLocalFileSource(name: animationName), width: 384, height: 384, playbackMode: .once, mode: .direct(cachePathPrefix: nil)) strongSelf.animationNode.autoplay = true
strongSelf.animationNode.visibility = true strongSelf.animationNode.setup(source: AnimatedStickerNodeLocalFileSource(name: animationName), width: 384, height: 384, playbackMode: .still(.end), mode: .direct(cachePathPrefix: nil))
} }
strongSelf.item = item strongSelf.item = item
if item.message.id.namespace == Namespaces.Message.Local || item.message.id.namespace == Namespaces.Message.ScheduledLocal {
strongSelf.wasPending = true
}
if strongSelf.wasPending && (item.message.id.namespace != Namespaces.Message.Local && item.message.id.namespace != Namespaces.Message.ScheduledLocal) {
strongSelf.didChangeFromPendingToSent = true
}
strongSelf.updateVisibility()
strongSelf.backgroundColorNode.backgroundColor = selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) strongSelf.backgroundColorNode.backgroundColor = selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper)
let imageFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((backgroundSize.width - giftSize.width) / 2.0), y: labelLayout.size.height + 16.0), size: giftSize) let imageFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((backgroundSize.width - giftSize.width) / 2.0), y: labelLayout.size.height + 16.0), size: giftSize)
@ -384,4 +415,37 @@ class ChatMessageGiftBubbleContentNode: ChatMessageBubbleContentNode {
return .none return .none
} }
} }
private func updateVisibility() {
guard let item = self.item else {
return
}
let isPlaying = self.visibilityStatus == true
if self.isPlaying != isPlaying {
self.isPlaying = isPlaying
self.animationNode.visibility = isPlaying
}
if isPlaying {
var alreadySeen = true
if let unreadRange = item.controllerInteraction.unreadMessageRange[UnreadMessageRangeKey(peerId: item.message.id.peerId, namespace: item.message.id.namespace)] {
if unreadRange.contains(item.message.id.id) {
if !item.controllerInteraction.seenOneTimeAnimatedMedia.contains(item.message.id) {
alreadySeen = false
}
}
}
if !item.controllerInteraction.seenOneTimeAnimatedMedia.contains(item.message.id) {
item.controllerInteraction.seenOneTimeAnimatedMedia.insert(item.message.id)
self.animationNode.playOnce()
}
if !alreadySeen {
item.controllerInteraction.animateDiceSuccess(false, true)
}
}
}
} }

View File

@ -517,7 +517,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
}, displayPollSolution: { _, _ in }, displayPollSolution: { _, _ in
}, displayPsa: { _, _ in }, displayPsa: { _, _ in
}, displayDiceTooltip: { _ in }, displayDiceTooltip: { _ in
}, animateDiceSuccess: { _ in }, animateDiceSuccess: { _, _ in
}, displayPremiumStickerTooltip: { _, _ in }, displayPremiumStickerTooltip: { _, _ in
}, openPeerContextMenu: { _, _, _, _, _ in }, openPeerContextMenu: { _, _, _, _, _ in
}, openMessageReplies: { _, _, _ in }, openMessageReplies: { _, _, _ in

View File

@ -143,7 +143,7 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
}, displayPollSolution: { _, _ in }, displayPollSolution: { _, _ in
}, displayPsa: { _, _ in }, displayPsa: { _, _ in
}, displayDiceTooltip: { _ in }, displayDiceTooltip: { _ in
}, animateDiceSuccess: { _ in }, animateDiceSuccess: { _, _ in
}, displayPremiumStickerTooltip: { _, _ in }, displayPremiumStickerTooltip: { _, _ in
}, openPeerContextMenu: { _, _, _, _, _ in }, openPeerContextMenu: { _, _, _, _, _ in
}, openMessageReplies: { _, _, _ in }, openMessageReplies: { _, _, _ in

View File

@ -135,7 +135,7 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestu
}, displayPollSolution: { _, _ in }, displayPollSolution: { _, _ in
}, displayPsa: { _, _ in }, displayPsa: { _, _ in
}, displayDiceTooltip: { _ in }, displayDiceTooltip: { _ in
}, animateDiceSuccess: { _ in }, animateDiceSuccess: { _, _ in
}, displayPremiumStickerTooltip: { _, _ in }, displayPremiumStickerTooltip: { _, _ in
}, openPeerContextMenu: { _, _, _, _, _ in }, openPeerContextMenu: { _, _, _, _, _ in
}, openMessageReplies: { _, _, _ in }, openMessageReplies: { _, _, _ in

View File

@ -2336,7 +2336,7 @@ final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewDelegate
}, displayPollSolution: { _, _ in }, displayPollSolution: { _, _ in
}, displayPsa: { _, _ in }, displayPsa: { _, _ in
}, displayDiceTooltip: { _ in }, displayDiceTooltip: { _ in
}, animateDiceSuccess: { _ in }, animateDiceSuccess: { _, _ in
}, displayPremiumStickerTooltip: { _, _ in }, displayPremiumStickerTooltip: { _, _ in
}, openPeerContextMenu: { _, _, _, _, _ in }, openPeerContextMenu: { _, _, _, _, _ in
}, openMessageReplies: { _, _, _ in }, openMessageReplies: { _, _, _ in

View File

@ -1313,7 +1313,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
}, displayPollSolution: { _, _ in }, displayPollSolution: { _, _ in
}, displayPsa: { _, _ in }, displayPsa: { _, _ in
}, displayDiceTooltip: { _ in }, displayDiceTooltip: { _ in
}, animateDiceSuccess: { _ in }, animateDiceSuccess: { _, _ in
}, displayPremiumStickerTooltip: { _, _ in }, displayPremiumStickerTooltip: { _, _ in
}, openPeerContextMenu: { _, _, _, _, _ in }, openPeerContextMenu: { _, _, _, _, _ in
}, openMessageReplies: { _, _, _ in }, openMessageReplies: { _, _, _ in