mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-22 22:25:57 +00:00
Attachment menu improvements
This commit is contained in:
Ilya Laktyushin
@@ -9,6 +9,13 @@ import SolidRoundedButtonNode
|
||||
import PresentationDataUtils
|
||||
|
||||
final class MediaPickerPlaceholderNode: ASDisplayNode {
|
||||
enum Content {
|
||||
case intro
|
||||
case bannedSendMedia(String)
|
||||
}
|
||||
|
||||
private let content: Content
|
||||
|
||||
private var animationNode: AnimatedStickerNode
|
||||
private let titleNode: ImmediateTextNode
|
||||
private let textNode: ImmediateTextNode
|
||||
@@ -22,9 +29,22 @@ final class MediaPickerPlaceholderNode: ASDisplayNode {
|
||||
var settingsPressed: () -> Void = {}
|
||||
var cameraPressed: () -> Void = {}
|
||||
|
||||
override init() {
|
||||
init(content: Content) {
|
||||
self.content = content
|
||||
|
||||
let name: String
|
||||
let playbackMode: AnimatedStickerPlaybackMode
|
||||
switch content {
|
||||
case .intro:
|
||||
name = "Photos"
|
||||
playbackMode = .loop
|
||||
case .bannedSendMedia:
|
||||
name = "Banned"
|
||||
playbackMode = .once
|
||||
}
|
||||
|
||||
self.animationNode = AnimatedStickerNode()
|
||||
self.animationNode.setup(source: AnimatedStickerNodeLocalFileSource(name: "Files"), width: 320, height: 320, playbackMode: .loop, mode: .direct(cachePathPrefix: nil))
|
||||
self.animationNode.setup(source: AnimatedStickerNodeLocalFileSource(name: name), width: 320, height: 320, playbackMode: playbackMode, mode: .direct(cachePathPrefix: nil))
|
||||
self.animationNode.visibility = true
|
||||
|
||||
self.titleNode = ImmediateTextNode()
|
||||
@@ -54,33 +74,36 @@ final class MediaPickerPlaceholderNode: ASDisplayNode {
|
||||
super.init()
|
||||
|
||||
self.addSubnode(self.animationNode)
|
||||
self.addSubnode(self.titleNode)
|
||||
self.addSubnode(self.textNode)
|
||||
self.addSubnode(self.buttonNode)
|
||||
|
||||
self.addSubnode(self.cameraButtonNode)
|
||||
self.cameraButtonNode.addSubnode(self.cameraTextNode)
|
||||
self.cameraButtonNode.addSubnode(self.cameraIconNode)
|
||||
|
||||
self.cameraButtonNode.highligthedChanged = { [weak self] highlighted in
|
||||
if let strongSelf = self {
|
||||
if highlighted {
|
||||
strongSelf.cameraTextNode.layer.removeAnimation(forKey: "opacity")
|
||||
strongSelf.cameraTextNode.alpha = 0.4
|
||||
strongSelf.cameraIconNode.layer.removeAnimation(forKey: "opacity")
|
||||
strongSelf.cameraIconNode.alpha = 0.4
|
||||
} else {
|
||||
strongSelf.cameraTextNode.alpha = 1.0
|
||||
strongSelf.cameraTextNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
|
||||
strongSelf.cameraIconNode.alpha = 1.0
|
||||
strongSelf.cameraIconNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
|
||||
if case .intro = self.content {
|
||||
self.addSubnode(self.titleNode)
|
||||
self.addSubnode(self.buttonNode)
|
||||
|
||||
self.addSubnode(self.cameraButtonNode)
|
||||
self.cameraButtonNode.addSubnode(self.cameraTextNode)
|
||||
self.cameraButtonNode.addSubnode(self.cameraIconNode)
|
||||
|
||||
self.cameraButtonNode.highligthedChanged = { [weak self] highlighted in
|
||||
if let strongSelf = self {
|
||||
if highlighted {
|
||||
strongSelf.cameraTextNode.layer.removeAnimation(forKey: "opacity")
|
||||
strongSelf.cameraTextNode.alpha = 0.4
|
||||
strongSelf.cameraIconNode.layer.removeAnimation(forKey: "opacity")
|
||||
strongSelf.cameraIconNode.alpha = 0.4
|
||||
} else {
|
||||
strongSelf.cameraTextNode.alpha = 1.0
|
||||
strongSelf.cameraTextNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
|
||||
strongSelf.cameraIconNode.alpha = 1.0
|
||||
strongSelf.cameraIconNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
self.cameraButtonNode.addTarget(self, action: #selector(self.cameraButtonPressed), forControlEvents: .touchUpInside)
|
||||
|
||||
self.buttonNode.pressed = { [weak self] in
|
||||
self?.settingsPressed()
|
||||
self.cameraButtonNode.addTarget(self, action: #selector(self.cameraButtonPressed), forControlEvents: .touchUpInside)
|
||||
|
||||
self.buttonNode.pressed = { [weak self] in
|
||||
self?.settingsPressed()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,20 +117,22 @@ final class MediaPickerPlaceholderNode: ASDisplayNode {
|
||||
let themeUpdated = self.theme != theme
|
||||
self.theme = theme
|
||||
|
||||
var imageSize = CGSize(width: 144.0, height: 144.0)
|
||||
var insets = layout.insets(options: [])
|
||||
insets.top += -160.0
|
||||
if layout.size.width == 460.0 {
|
||||
insets.top += -60.0
|
||||
imageSize = CGSize(width: 112.0, height: 112.0)
|
||||
} else {
|
||||
insets.top += -160.0
|
||||
}
|
||||
|
||||
let imageSpacing: CGFloat = 12.0
|
||||
let textSpacing: CGFloat = 16.0
|
||||
let textSpacing: CGFloat = 12.0
|
||||
let buttonSpacing: CGFloat = 15.0
|
||||
let cameraSpacing: CGFloat = 13.0
|
||||
|
||||
let imageSize = CGSize(width: 144.0, height: 144.0)
|
||||
let imageHeight = layout.size.width < layout.size.height ? imageSize.height + imageSpacing : 0.0
|
||||
|
||||
self.animationNode.frame = CGRect(origin: CGPoint(x: floor((layout.size.width - imageSize.width) / 2.0), y: -10.0), size: imageSize)
|
||||
self.animationNode.updateLayout(size: imageSize)
|
||||
|
||||
if themeUpdated {
|
||||
self.buttonNode.updateTheme(SolidRoundedButtonTheme(theme: theme))
|
||||
self.cameraIconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Chat/Attach Menu/OpenCamera"), color: theme.list.itemAccentColor)
|
||||
@@ -116,12 +141,23 @@ final class MediaPickerPlaceholderNode: ASDisplayNode {
|
||||
let buttonWidth: CGFloat = 248.0
|
||||
let buttonHeight = self.buttonNode.updateLayout(width: buttonWidth, transition: transition)
|
||||
|
||||
self.titleNode.attributedText = NSAttributedString(string: strings.Attachment_MediaAccessTitle, font: Font.medium(17.0), textColor: theme.list.itemPrimaryTextColor, paragraphAlignment: .center)
|
||||
self.textNode.attributedText = NSAttributedString(string: strings.Attachment_MediaAccessText, font: Font.regular(15.0), textColor: theme.list.freeTextColor, paragraphAlignment: .center)
|
||||
let title: String
|
||||
let text: String
|
||||
switch self.content {
|
||||
case .intro:
|
||||
title = strings.Attachment_MediaAccessTitle
|
||||
text = strings.Attachment_MediaAccessText
|
||||
case let .bannedSendMedia(banDescription):
|
||||
title = ""
|
||||
text = banDescription
|
||||
}
|
||||
|
||||
self.titleNode.attributedText = NSAttributedString(string: title, font: Font.medium(17.0), textColor: theme.list.itemPrimaryTextColor, paragraphAlignment: .center)
|
||||
self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(15.0), textColor: theme.list.freeTextColor, paragraphAlignment: .center)
|
||||
self.cameraTextNode.attributedText = NSAttributedString(string: strings.Attachment_OpenCamera, font: Font.regular(17.0), textColor: theme.list.itemAccentColor, paragraphAlignment: .center)
|
||||
|
||||
let titleSize = self.titleNode.updateLayout(CGSize(width: layout.size.width - layout.safeInsets.left - layout.safeInsets.right - 70.0, height: max(1.0, layout.size.height - insets.top - insets.bottom)))
|
||||
let textSize = self.textNode.updateLayout(CGSize(width: layout.size.width - layout.safeInsets.left - layout.safeInsets.right - 70.0, height: max(1.0, layout.size.height - insets.top - insets.bottom)))
|
||||
let titleSize = self.titleNode.updateLayout(CGSize(width: layout.size.width - layout.safeInsets.left - layout.safeInsets.right - 40.0, height: max(1.0, layout.size.height - insets.top - insets.bottom)))
|
||||
let textSize = self.textNode.updateLayout(CGSize(width: layout.size.width - layout.safeInsets.left - layout.safeInsets.right - 40.0, height: max(1.0, layout.size.height - insets.top - insets.bottom)))
|
||||
let cameraSize = self.cameraTextNode.updateLayout(CGSize(width: layout.size.width - layout.safeInsets.left - layout.safeInsets.right - 70.0, height: max(1.0, layout.size.height - insets.top - insets.bottom)))
|
||||
|
||||
let totalHeight = imageHeight + titleSize.height + textSpacing + textSize.height + buttonSpacing + buttonHeight + cameraSpacing + cameraSize.height
|
||||
@@ -129,6 +165,8 @@ final class MediaPickerPlaceholderNode: ASDisplayNode {
|
||||
|
||||
transition.updateAlpha(node: self.animationNode, alpha: imageHeight > 0.0 ? 1.0 : 0.0)
|
||||
transition.updateFrame(node: self.animationNode, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - imageSize.width) / 2.0), y: topOffset), size: imageSize))
|
||||
self.animationNode.updateLayout(size: imageSize)
|
||||
|
||||
transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: layout.safeInsets.left + floor((layout.size.width - titleSize.width - layout.safeInsets.left - layout.safeInsets.right) / 2.0), y: topOffset + imageHeight), size: titleSize))
|
||||
transition.updateFrame(node: self.textNode, frame: CGRect(origin: CGPoint(x: layout.safeInsets.left + floor((layout.size.width - textSize.width - layout.safeInsets.left - layout.safeInsets.right) / 2.0), y: self.titleNode.frame.maxY + textSpacing), size: textSize))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user