mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-23 22:55:00 +00:00
Various Fixes
This commit is contained in:
@@ -763,6 +763,9 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
|
|||||||
})
|
})
|
||||||
})))
|
})))
|
||||||
|
|
||||||
|
if let peer = message.peers[message.id.peerId], peer.isCopyProtectionEnabled {
|
||||||
|
|
||||||
|
} else {
|
||||||
items.append(.action(ContextMenuActionItem(text: strings.Conversation_ContextMenuForward, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Forward"), color: theme.contextMenu.primaryColor) }, action: { c, f in
|
items.append(.action(ContextMenuActionItem(text: strings.Conversation_ContextMenuForward, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Forward"), color: theme.contextMenu.primaryColor) }, action: { c, f in
|
||||||
c.dismiss(completion: {
|
c.dismiss(completion: {
|
||||||
if let strongSelf = self {
|
if let strongSelf = self {
|
||||||
@@ -770,6 +773,7 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
})))
|
})))
|
||||||
|
}
|
||||||
|
|
||||||
items.append(.separator)
|
items.append(.separator)
|
||||||
items.append(.action(ContextMenuActionItem(text: strings.Conversation_ContextMenuSelect, icon: { theme in
|
items.append(.action(ContextMenuActionItem(text: strings.Conversation_ContextMenuSelect, icon: { theme in
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ final class ChatListSearchMessageSelectionPanelNode: ASDisplayNode {
|
|||||||
private let forwardMessages: () -> Void
|
private let forwardMessages: () -> Void
|
||||||
|
|
||||||
private let separatorNode: ASDisplayNode
|
private let separatorNode: ASDisplayNode
|
||||||
private let backgroundNode: ASDisplayNode
|
private let backgroundNode: NavigationBackgroundNode
|
||||||
private let deleteButton: HighlightableButtonNode
|
private let deleteButton: HighlightableButtonNode
|
||||||
private let forwardButton: HighlightableButtonNode
|
private let forwardButton: HighlightableButtonNode
|
||||||
private let shareButton: HighlightableButtonNode
|
private let shareButton: HighlightableButtonNode
|
||||||
@@ -72,11 +72,9 @@ final class ChatListSearchMessageSelectionPanelNode: ASDisplayNode {
|
|||||||
self.separatorNode = ASDisplayNode()
|
self.separatorNode = ASDisplayNode()
|
||||||
self.separatorNode.backgroundColor = presentationData.theme.chat.inputPanel.panelSeparatorColor
|
self.separatorNode.backgroundColor = presentationData.theme.chat.inputPanel.panelSeparatorColor
|
||||||
|
|
||||||
self.backgroundNode = ASDisplayNode()
|
self.backgroundNode = NavigationBackgroundNode(color: presentationData.theme.rootController.navigationBar.blurredBackgroundColor)
|
||||||
self.backgroundNode.backgroundColor = presentationData.theme.chat.inputPanel.panelBackgroundColor
|
|
||||||
|
|
||||||
self.deleteButton = HighlightableButtonNode(pointerStyle: .default)
|
self.deleteButton = HighlightableButtonNode(pointerStyle: .default)
|
||||||
self.deleteButton.isEnabled = false
|
|
||||||
self.deleteButton.isAccessibilityElement = true
|
self.deleteButton.isAccessibilityElement = true
|
||||||
self.deleteButton.accessibilityLabel = presentationData.strings.VoiceOver_MessageContextDelete
|
self.deleteButton.accessibilityLabel = presentationData.strings.VoiceOver_MessageContextDelete
|
||||||
|
|
||||||
@@ -85,7 +83,6 @@ final class ChatListSearchMessageSelectionPanelNode: ASDisplayNode {
|
|||||||
self.forwardButton.accessibilityLabel = presentationData.strings.VoiceOver_MessageContextForward
|
self.forwardButton.accessibilityLabel = presentationData.strings.VoiceOver_MessageContextForward
|
||||||
|
|
||||||
self.shareButton = HighlightableButtonNode(pointerStyle: .default)
|
self.shareButton = HighlightableButtonNode(pointerStyle: .default)
|
||||||
self.shareButton.isEnabled = false
|
|
||||||
self.shareButton.isAccessibilityElement = true
|
self.shareButton.isAccessibilityElement = true
|
||||||
self.shareButton.accessibilityLabel = presentationData.strings.VoiceOver_MessageContextShare
|
self.shareButton.accessibilityLabel = presentationData.strings.VoiceOver_MessageContextShare
|
||||||
|
|
||||||
@@ -104,7 +101,9 @@ final class ChatListSearchMessageSelectionPanelNode: ASDisplayNode {
|
|||||||
self.addSubnode(self.shareButton)
|
self.addSubnode(self.shareButton)
|
||||||
self.addSubnode(self.separatorNode)
|
self.addSubnode(self.separatorNode)
|
||||||
|
|
||||||
|
self.deleteButton.isEnabled = false
|
||||||
self.forwardButton.isEnabled = false
|
self.forwardButton.isEnabled = false
|
||||||
|
self.shareButton.isEnabled = false
|
||||||
|
|
||||||
self.deleteButton.addTarget(self, action: #selector(self.deleteButtonPressed), forControlEvents: .touchUpInside)
|
self.deleteButton.addTarget(self, action: #selector(self.deleteButtonPressed), forControlEvents: .touchUpInside)
|
||||||
self.forwardButton.addTarget(self, action: #selector(self.forwardButtonPressed), forControlEvents: .touchUpInside)
|
self.forwardButton.addTarget(self, action: #selector(self.forwardButtonPressed), forControlEvents: .touchUpInside)
|
||||||
@@ -120,7 +119,7 @@ final class ChatListSearchMessageSelectionPanelNode: ASDisplayNode {
|
|||||||
if presentationData.theme !== self.theme {
|
if presentationData.theme !== self.theme {
|
||||||
self.theme = presentationData.theme
|
self.theme = presentationData.theme
|
||||||
|
|
||||||
self.backgroundNode.backgroundColor = presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
|
self.backgroundNode.updateColor(color: presentationData.theme.rootController.navigationBar.blurredBackgroundColor, transition: .immediate)
|
||||||
self.separatorNode.backgroundColor = presentationData.theme.rootController.navigationBar.separatorColor
|
self.separatorNode.backgroundColor = presentationData.theme.rootController.navigationBar.separatorColor
|
||||||
|
|
||||||
self.deleteButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionTrash"), color: presentationData.theme.chat.inputPanel.panelControlAccentColor), for: [.normal])
|
self.deleteButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionTrash"), color: presentationData.theme.chat.inputPanel.panelControlAccentColor), for: [.normal])
|
||||||
@@ -150,11 +149,8 @@ final class ChatListSearchMessageSelectionPanelNode: ASDisplayNode {
|
|||||||
|
|
||||||
self.deleteButton.isEnabled = !actions.options.intersection([.deleteLocally, .deleteGlobally]).isEmpty
|
self.deleteButton.isEnabled = !actions.options.intersection([.deleteLocally, .deleteGlobally]).isEmpty
|
||||||
self.shareButton.isEnabled = !actions.options.intersection([.forward]).isEmpty
|
self.shareButton.isEnabled = !actions.options.intersection([.forward]).isEmpty
|
||||||
|
|
||||||
self.deleteButton.isHidden = !self.deleteButton.isEnabled
|
|
||||||
} else {
|
} else {
|
||||||
self.deleteButton.isEnabled = false
|
self.deleteButton.isEnabled = false
|
||||||
self.deleteButton.isHidden = true
|
|
||||||
self.forwardButton.isEnabled = false
|
self.forwardButton.isEnabled = false
|
||||||
self.shareButton.isEnabled = false
|
self.shareButton.isEnabled = false
|
||||||
}
|
}
|
||||||
@@ -166,6 +162,7 @@ final class ChatListSearchMessageSelectionPanelNode: ASDisplayNode {
|
|||||||
let panelHeightWithInset = panelHeight + layout.intrinsicInsets.bottom
|
let panelHeightWithInset = panelHeight + layout.intrinsicInsets.bottom
|
||||||
|
|
||||||
transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: panelHeightWithInset)))
|
transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: panelHeightWithInset)))
|
||||||
|
self.backgroundNode.update(size: self.backgroundNode.bounds.size, transition: transition)
|
||||||
transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: UIScreenPixel), size: CGSize(width: layout.size.width, height: UIScreenPixel)))
|
transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: UIScreenPixel), size: CGSize(width: layout.size.width, height: UIScreenPixel)))
|
||||||
|
|
||||||
return panelHeightWithInset
|
return panelHeightWithInset
|
||||||
|
|||||||
Reference in New Issue
Block a user