From 6712ef279dc427b3daf3ae40cf32ee5faffc631a Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Tue, 28 Dec 2021 15:55:02 -0700 Subject: [PATCH] Cleanup and hide subtitle button if there is none --- .../NativePlayerViewController.swift | 8 -------- .../Overlays/VLCPlayerCompactOverlayView.swift | 18 +++++++++--------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/JellyfinPlayer/Views/VideoPlayer/NativePlayerViewController.swift b/JellyfinPlayer/Views/VideoPlayer/NativePlayerViewController.swift index 9692626d..75ca6056 100644 --- a/JellyfinPlayer/Views/VideoPlayer/NativePlayerViewController.swift +++ b/JellyfinPlayer/Views/VideoPlayer/NativePlayerViewController.swift @@ -29,14 +29,6 @@ class NativePlayerViewController: AVPlayerViewController { player.appliesMediaSelectionCriteriaAutomatically = false player.currentItem?.externalMetadata = createMetadata() - let chevron = UIImage(systemName: "chevron.right.circle.fill")! - let testAction = UIAction(title: "Next", image: chevron) { action in - print("next item selected") - } - - // tvos -// self.transportBarCustomMenuItems = [testAction] - let timeScale = CMTimeScale(NSEC_PER_SEC) let time = CMTime(seconds: 5, preferredTimescale: timeScale) diff --git a/JellyfinPlayer/Views/VideoPlayer/Overlays/VLCPlayerCompactOverlayView.swift b/JellyfinPlayer/Views/VideoPlayer/Overlays/VLCPlayerCompactOverlayView.swift index a8a91095..65495c6f 100644 --- a/JellyfinPlayer/Views/VideoPlayer/Overlays/VLCPlayerCompactOverlayView.swift +++ b/JellyfinPlayer/Views/VideoPlayer/Overlays/VLCPlayerCompactOverlayView.swift @@ -89,13 +89,15 @@ struct VLCPlayerCompactOverlayView: View, VideoPlayerOverlay { // } // } - Button { - viewModel.playerOverlayDelegate?.didSelectCaptions() - } label: { - if viewModel.subtitlesEnabled { - Image(systemName: "captions.bubble.fill") - } else { - Image(systemName: "captions.bubble") + if !viewModel.subtitleStreams.isEmpty { + Button { + viewModel.playerOverlayDelegate?.didSelectCaptions() + } label: { + if viewModel.subtitlesEnabled { + Image(systemName: "captions.bubble.fill") + } else { + Image(systemName: "captions.bubble") + } } } @@ -247,8 +249,6 @@ struct VLCPlayerCompactOverlayView: View, VideoPlayerOverlay { } .frame(maxWidth: 800, maxHeight: 50) } - .padding(.top) -// .padding(.horizontal) .ignoresSafeArea(edges: .top) .tint(Color.white) .foregroundColor(Color.white)