ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 22:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix gallery bar buttons order

Browse Source
This commit is contained in:
Ilya Laktyushin
2020-05-27 23:23:00 +03:00
parent b27cedd984
commit ad4797f244
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift
View File

@@ -167,7 +167,7 @@ final class ChatImageGalleryItemNode: ZoomableContentGalleryItemNode {
private var tilingNode: TilingNode? private var tilingNode: TilingNode?
fileprivate let _ready = Promise<Void>() fileprivate let _ready = Promise<Void>()
fileprivate let _title = Promise<String>() fileprivate let _title = Promise<String>()
fileprivate let _rightBarButtonItem = Promise<UIBarButtonItem?>(nil) fileprivate let _rightBarButtonItems = Promise<[UIBarButtonItem]?>(nil)
private let statusNodeContainer: HighlightableButtonNode private let statusNodeContainer: HighlightableButtonNode
private let statusNode: RadialStatusNode private let statusNode: RadialStatusNode
private let footerContentNode: ChatItemGalleryFooterContentNode private let footerContentNode: ChatItemGalleryFooterContentNode
@@ -262,7 +262,9 @@ final class ChatImageGalleryItemNode: ZoomableContentGalleryItemNode {
} }
if imageReference.media.flags.contains(.hasStickers) { if imageReference.media.flags.contains(.hasStickers) {
let rightBarButtonItem = UIBarButtonItem(image: UIImage(bundleImageName: "Media Gallery/Stickers"), style: .plain, target: self, action: #selector(self.openStickersButtonPressed)) let rightBarButtonItem = UIBarButtonItem(image: UIImage(bundleImageName: "Media Gallery/Stickers"), style: .plain, target: self, action: #selector(self.openStickersButtonPressed))
self._rightBarButtonItem.set(.single(rightBarButtonItem)) self._rightBarButtonItems.set(.single([rightBarButtonItem]))
} else {
self._rightBarButtonItems.set(.single([]))
} }
} }
self.contextAndMedia = (self.context, imageReference.abstract) self.contextAndMedia = (self.context, imageReference.abstract)
@@ -577,8 +579,8 @@ final class ChatImageGalleryItemNode: ZoomableContentGalleryItemNode {
return self._title.get() return self._title.get()
} }
override func rightBarButtonItem() -> Signal<UIBarButtonItem?, NoError> { override func rightBarButtonItems() -> Signal<[UIBarButtonItem]?, NoError> {
return self._rightBarButtonItem.get() return self._rightBarButtonItems.get()
} }
override func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> { override func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> {

8
submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift
View File

@@ -679,14 +679,14 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
self.zoomableContent = (videoSize, videoNode) self.zoomableContent = (videoSize, videoNode)
var barButtonItems: [UIBarButtonItem] = [] var barButtonItems: [UIBarButtonItem] = []
if !isAnimated && !disablePlayerControls && !disablePictureInPicture {
let rightBarButtonItem = UIBarButtonItem(image: pictureInPictureButtonImage, style: .plain, target: self, action: #selector(self.pictureInPictureButtonPressed))
barButtonItems.append(rightBarButtonItem)
}
if hasLinkedStickers { if hasLinkedStickers {
let rightBarButtonItem = UIBarButtonItem(image: UIImage(bundleImageName: "Media Gallery/Stickers"), style: .plain, target: self, action: #selector(self.openStickersButtonPressed)) let rightBarButtonItem = UIBarButtonItem(image: UIImage(bundleImageName: "Media Gallery/Stickers"), style: .plain, target: self, action: #selector(self.openStickersButtonPressed))
barButtonItems.append(rightBarButtonItem) barButtonItems.append(rightBarButtonItem)
} }
if !isAnimated && !disablePlayerControls && !disablePictureInPicture {
let rightBarButtonItem = UIBarButtonItem(image: pictureInPictureButtonImage, style: .plain, target: self, action: #selector(self.pictureInPictureButtonPressed))
barButtonItems.append(rightBarButtonItem)
}
self._rightBarButtonItems.set(.single(barButtonItems)) self._rightBarButtonItems.set(.single(barButtonItems))
videoNode.playbackCompleted = { [weak videoNode] in videoNode.playbackCompleted = { [weak videoNode] in