From ad4797f2443ea482e45f4e36e6399622cc9a18a3 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Wed, 27 May 2020 23:23:00 +0300 Subject: [PATCH] Fix gallery bar buttons order --- .../GalleryUI/Sources/Items/ChatImageGalleryItem.swift | 10 ++++++---- .../Sources/Items/UniversalVideoGalleryItem.swift | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift b/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift index b023095467..0854e75a42 100644 --- a/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift @@ -167,7 +167,7 @@ final class ChatImageGalleryItemNode: ZoomableContentGalleryItemNode { private var tilingNode: TilingNode? fileprivate let _ready = Promise() fileprivate let _title = Promise() - fileprivate let _rightBarButtonItem = Promise(nil) + fileprivate let _rightBarButtonItems = Promise<[UIBarButtonItem]?>(nil) private let statusNodeContainer: HighlightableButtonNode private let statusNode: RadialStatusNode private let footerContentNode: ChatItemGalleryFooterContentNode @@ -262,7 +262,9 @@ final class ChatImageGalleryItemNode: ZoomableContentGalleryItemNode { } if imageReference.media.flags.contains(.hasStickers) { 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) @@ -577,8 +579,8 @@ final class ChatImageGalleryItemNode: ZoomableContentGalleryItemNode { return self._title.get() } - override func rightBarButtonItem() -> Signal { - return self._rightBarButtonItem.get() + override func rightBarButtonItems() -> Signal<[UIBarButtonItem]?, NoError> { + return self._rightBarButtonItems.get() } override func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> { diff --git a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift index 761a34d3b6..7316e2f355 100644 --- a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift @@ -679,14 +679,14 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { self.zoomableContent = (videoSize, videoNode) 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 { let rightBarButtonItem = UIBarButtonItem(image: UIImage(bundleImageName: "Media Gallery/Stickers"), style: .plain, target: self, action: #selector(self.openStickersButtonPressed)) 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)) videoNode.playbackCompleted = { [weak videoNode] in