From 1edcf46c79f73c3dbb00f275e5388c1b703f0015 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Fri, 10 Jul 2020 23:13:16 +0300 Subject: [PATCH] Video avatar fixes --- .../Sources/PeerInfo/PeerInfoHeaderNode.swift | 5 ---- .../Sources/PeerInfo/PeerInfoScreen.swift | 24 ++++++------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift index 9a6326a6f8..4156b6d872 100644 --- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift +++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift @@ -1212,11 +1212,6 @@ final class PeerInfoAvatarTransformContainerNode: ASDisplayNode { let update = { videoNode.canAttachContent = !self.isExpanded && self.canAttachVideo if videoNode.canAttachContent { -// if let videoStartTimestamp = self.videoStartTimestamp { -// videoNode.seek(videoStartTimestamp) -// } else { -// videoNode.seek(0.0) -// } videoNode.play() } } diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift index 44e4e1bd1e..89772744d6 100644 --- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift +++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift @@ -4155,6 +4155,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD return } + var currentIsVideo = false + let item = self.headerNode.avatarListNode.listContainerNode.currentItemNode?.item + if let item = item, case let .image(image) = item { + currentIsVideo = !image.2.isEmpty + } + let peerId = self.peerId let _ = (self.context.account.postbox.transaction { transaction -> (Peer?, SearchBotsConfiguration) in return (transaction.getPeer(peerId), currentSearchBotsConfiguration(transaction: transaction)) @@ -4184,7 +4190,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD hasPhotos = true } - let mixin = TGMediaAvatarMenuMixin(context: legacyController.context, parentController: emptyController, hasSearchButton: true, hasDeleteButton: hasPhotos && hasRemove, hasViewButton: false, personalPhoto: strongSelf.isSettings, isVideo: false, saveEditedPhotos: false, saveCapturedMedia: false, signup: false)! + let mixin = TGMediaAvatarMenuMixin(context: legacyController.context, parentController: emptyController, hasSearchButton: true, hasDeleteButton: hasPhotos && hasRemove, hasViewButton: false, personalPhoto: strongSelf.isSettings, isVideo: currentIsVideo, saveEditedPhotos: false, saveCapturedMedia: false, signup: false)! let _ = strongSelf.currentAvatarMixin.swap(mixin) mixin.requestSearchController = { [weak self] assetsController in guard let strongSelf = self else { @@ -5803,23 +5809,7 @@ public final class PeerInfoScreen: ViewController { super.displayNodeDidLoad() } - - public override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - self.controllerNode.canAttachVideo = false - } - - override public func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(animated) - - self.controllerNode.canAttachVideo = true - - if let (layout, navigationHeight) = self.validLayout { - self.controllerNode.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate) - } - } - override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { super.containerLayoutUpdated(layout, transition: transition)