mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-23 06:35:51 +00:00
Various improvements
This commit is contained in:
@@ -1510,12 +1510,10 @@ public class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
|
|||||||
if let replyBackgroundNode = strongSelf.replyBackgroundNode, let replyBackgroundFrame {
|
if let replyBackgroundNode = strongSelf.replyBackgroundNode, let replyBackgroundFrame {
|
||||||
replyBackgroundNode.frame = replyBackgroundFrame
|
replyBackgroundNode.frame = replyBackgroundFrame
|
||||||
|
|
||||||
let cornerRadius = replyBackgroundNode.frame.height <= 22.0 ? replyBackgroundNode.frame.height / 2.0 : 8.0
|
let cornerRadius = 4.0
|
||||||
replyBackgroundNode.update(size: replyBackgroundNode.bounds.size, cornerRadius: cornerRadius, transition: .immediate)
|
replyBackgroundNode.update(size: replyBackgroundNode.bounds.size, cornerRadius: cornerRadius, transition: .immediate)
|
||||||
|
|
||||||
if let backgroundContent = strongSelf.replyBackgroundContent {
|
if let backgroundContent = strongSelf.replyBackgroundContent {
|
||||||
let cornerRadius = replyBackgroundNode.frame.height <= 22.0 ? replyBackgroundNode.frame.height / 2.0 : 8.0
|
|
||||||
|
|
||||||
replyBackgroundNode.isHidden = true
|
replyBackgroundNode.isHidden = true
|
||||||
backgroundContent.cornerRadius = cornerRadius
|
backgroundContent.cornerRadius = cornerRadius
|
||||||
backgroundContent.frame = replyBackgroundNode.frame
|
backgroundContent.frame = replyBackgroundNode.frame
|
||||||
|
|||||||
@@ -782,7 +782,7 @@ public class ChatMessageInstantVideoItemNode: ChatMessageItemView, UIGestureReco
|
|||||||
if let replyBackgroundNode = strongSelf.replyBackgroundNode, let replyBackgroundFrame {
|
if let replyBackgroundNode = strongSelf.replyBackgroundNode, let replyBackgroundFrame {
|
||||||
replyBackgroundNode.frame = replyBackgroundFrame
|
replyBackgroundNode.frame = replyBackgroundFrame
|
||||||
|
|
||||||
let cornerRadius = replyBackgroundNode.frame.height <= 22.0 ? replyBackgroundNode.frame.height / 2.0 : 8.0
|
let cornerRadius = 4.0
|
||||||
replyBackgroundNode.update(size: replyBackgroundNode.bounds.size, cornerRadius: cornerRadius, transition: .immediate)
|
replyBackgroundNode.update(size: replyBackgroundNode.bounds.size, cornerRadius: cornerRadius, transition: .immediate)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1090,12 +1090,10 @@ public class ChatMessageStickerItemNode: ChatMessageItemView {
|
|||||||
if let replyBackgroundNode = strongSelf.replyBackgroundNode, let replyBackgroundFrame {
|
if let replyBackgroundNode = strongSelf.replyBackgroundNode, let replyBackgroundFrame {
|
||||||
replyBackgroundNode.frame = replyBackgroundFrame
|
replyBackgroundNode.frame = replyBackgroundFrame
|
||||||
|
|
||||||
let cornerRadius = replyBackgroundNode.frame.height <= 22.0 ? replyBackgroundNode.frame.height / 2.0 : 8.0
|
let cornerRadius = 4.0
|
||||||
replyBackgroundNode.update(size: replyBackgroundNode.bounds.size, cornerRadius: cornerRadius, transition: .immediate)
|
replyBackgroundNode.update(size: replyBackgroundNode.bounds.size, cornerRadius: cornerRadius, transition: .immediate)
|
||||||
|
|
||||||
if let backgroundContent = strongSelf.replyBackgroundContent {
|
if let backgroundContent = strongSelf.replyBackgroundContent {
|
||||||
let cornerRadius = replyBackgroundNode.frame.height <= 22.0 ? replyBackgroundNode.frame.height / 2.0 : 8.0
|
|
||||||
|
|
||||||
replyBackgroundNode.isHidden = true
|
replyBackgroundNode.isHidden = true
|
||||||
backgroundContent.cornerRadius = cornerRadius
|
backgroundContent.cornerRadius = cornerRadius
|
||||||
backgroundContent.frame = replyBackgroundNode.frame
|
backgroundContent.frame = replyBackgroundNode.frame
|
||||||
|
|||||||
@@ -2016,7 +2016,29 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
|
|||||||
}, openMessageContextActions: { message, node, rect, gesture in
|
}, openMessageContextActions: { message, node, rect, gesture in
|
||||||
gesture?.cancel()
|
gesture?.cancel()
|
||||||
}, navigateToMessage: { [weak self] fromId, id, params in
|
}, navigateToMessage: { [weak self] fromId, id, params in
|
||||||
self?.navigateToMessage(from: fromId, to: .id(id, params), forceInCurrentChat: fromId.peerId == id.peerId)
|
guard let self else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if params.quote != nil {
|
||||||
|
if let message = self.chatDisplayNode.historyNode.messageInCurrentHistoryView(fromId), let toPeer = message.peers[id.peerId] {
|
||||||
|
switch toPeer {
|
||||||
|
case let channel as TelegramChannel:
|
||||||
|
if channel.username == nil && channel.usernames.isEmpty {
|
||||||
|
switch channel.participationStatus {
|
||||||
|
case .kicked, .left:
|
||||||
|
self.controllerInteraction?.attemptedNavigationToPrivateQuote(toPeer)
|
||||||
|
return
|
||||||
|
case .member:
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
self.navigateToMessage(from: fromId, to: .id(id, params), forceInCurrentChat: fromId.peerId == id.peerId)
|
||||||
}, navigateToMessageStandalone: { [weak self] id in
|
}, navigateToMessageStandalone: { [weak self] id in
|
||||||
self?.navigateToMessage(from: nil, to: .id(id, NavigateToMessageParams(timestamp: nil, quote: nil)), forceInCurrentChat: false)
|
self?.navigateToMessage(from: nil, to: .id(id, NavigateToMessageParams(timestamp: nil, quote: nil)), forceInCurrentChat: false)
|
||||||
}, navigateToThreadMessage: { [weak self] peerId, threadId, messageId in
|
}, navigateToThreadMessage: { [weak self] peerId, threadId, messageId in
|
||||||
|
|||||||
Reference in New Issue
Block a user