From 83ef36095345260eafc822058fd9e733a0f4968b Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sun, 24 Aug 2025 03:32:27 +0400 Subject: [PATCH] Various fixes --- submodules/ContextUI/Sources/ContextController.swift | 5 +++++ .../ContextControllerExtractedPresentationNode.swift | 3 ++- .../Sources/OverlayAudioPlayerControllerNode.swift | 6 ++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/submodules/ContextUI/Sources/ContextController.swift b/submodules/ContextUI/Sources/ContextController.swift index 06082cb5c4..a1344158eb 100644 --- a/submodules/ContextUI/Sources/ContextController.swift +++ b/submodules/ContextUI/Sources/ContextController.swift @@ -2213,6 +2213,7 @@ public protocol ContextExtractedContentSource: AnyObject { var keepDefaultContentTouches: Bool { get } var blurBackground: Bool { get } var shouldBeDismissed: Signal { get } + var additionalInsets: UIEdgeInsets { get } var actionsHorizontalAlignment: ContextActionsHorizontalAlignment { get } @@ -2237,6 +2238,10 @@ public extension ContextExtractedContentSource { return false } + var additionalInsets: UIEdgeInsets { + return .zero + } + var actionsHorizontalAlignment: ContextActionsHorizontalAlignment { return .default } diff --git a/submodules/ContextUI/Sources/ContextControllerExtractedPresentationNode.swift b/submodules/ContextUI/Sources/ContextControllerExtractedPresentationNode.swift index 3c1bfa50b9..e4bb7bc615 100644 --- a/submodules/ContextUI/Sources/ContextControllerExtractedPresentationNode.swift +++ b/submodules/ContextUI/Sources/ContextControllerExtractedPresentationNode.swift @@ -586,7 +586,7 @@ final class ContextControllerExtractedPresentationNode: ASDisplayNode, ContextCo let actionsEdgeInset: CGFloat let actionsSideInset: CGFloat let topInset: CGFloat = layout.insets(options: .statusBar).top + 8.0 - let bottomInset: CGFloat = 10.0 + var bottomInset: CGFloat = 10.0 let itemContentNode: ItemContentNode? let controllerContentNode: ControllerContentNode? @@ -903,6 +903,7 @@ final class ContextControllerExtractedPresentationNode: ASDisplayNode, ContextCo case let .extracted(source): keepInPlace = source.keepInPlace actionsHorizontalAlignment = source.actionsHorizontalAlignment + bottomInset += source.additionalInsets.bottom case .controller: //TODO: keepInPlace = false diff --git a/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift b/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift index 3c2d7833dd..e6de4482cc 100644 --- a/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift +++ b/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift @@ -536,10 +536,7 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, ASGestu } private func updateMusicSaved(file: FileMediaReference, isSaved: Bool) { - guard let playlistLocation = self.playlistLocation as? PeerMessagesPlaylistLocation, case let .savedMusic(savedMusicContext, _, _) = playlistLocation else { - return - } - if savedMusicContext.peerId == self.context.account.peerId { + if let playlistLocation = self.playlistLocation as? PeerMessagesPlaylistLocation, case let .savedMusic(savedMusicContext, _, _) = playlistLocation, savedMusicContext.peerId == self.context.account.peerId { if isSaved { let _ = savedMusicContext.addMusic(file: file).start() } else { @@ -1226,6 +1223,7 @@ private final class OverlayAudioPlayerContextExtractedContentSource: ContextExtr let keepInPlace: Bool = false let ignoreContentTouches: Bool = false let blurBackground: Bool = true + let additionalInsets = UIEdgeInsets(top: 0.0, left: 0.0, bottom: 80.0, right: 0.0) private let contentNode: ContextExtractedContentContainingNode