From fb100b8da1900c0474341fd04277fa27da389853 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Tue, 2 Apr 2024 23:10:22 -0600 Subject: [PATCH] iOS - Temporarily Disable LiveTV and Advanced Video Player Action (#1013) --- Shared/Objects/VideoPlayerActionButton.swift | 13 +++++++------ .../ViewModels/MediaViewModel/MediaViewModel.swift | 8 ++++++-- .../Overlays/Components/BarActionButtons.swift | 4 ++-- .../Overlays/Components/OverlayMenu.swift | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Shared/Objects/VideoPlayerActionButton.swift b/Shared/Objects/VideoPlayerActionButton.swift index 220a4313..97448e0c 100644 --- a/Shared/Objects/VideoPlayerActionButton.swift +++ b/Shared/Objects/VideoPlayerActionButton.swift @@ -9,9 +9,10 @@ import Defaults import Foundation +// TODO: atow, advanced was removed to be redesigned before being released enum VideoPlayerActionButton: String, CaseIterable, Defaults.Serializable, Displayable, Identifiable { - case advanced +// case advanced case aspectFill case audio case autoPlay @@ -23,8 +24,8 @@ enum VideoPlayerActionButton: String, CaseIterable, Defaults.Serializable, Displ var displayTitle: String { switch self { - case .advanced: - return "Advanced" +// case .advanced: +// return "Advanced" case .aspectFill: return "Aspect Fill" case .audio: @@ -50,8 +51,8 @@ enum VideoPlayerActionButton: String, CaseIterable, Defaults.Serializable, Displ var settingsSystemImage: String { switch self { - case .advanced: - return "gearshape.fill" +// case .advanced: +// return "gearshape.fill" case .aspectFill: return "arrow.up.left.and.arrow.down.right" case .audio: @@ -83,6 +84,6 @@ enum VideoPlayerActionButton: String, CaseIterable, Defaults.Serializable, Displ .subtitles, .playbackSpeed, .chapters, - .advanced, +// .advanced, ] } diff --git a/Shared/ViewModels/MediaViewModel/MediaViewModel.swift b/Shared/ViewModels/MediaViewModel/MediaViewModel.swift index 09ad56e1..edae7066 100644 --- a/Shared/ViewModels/MediaViewModel/MediaViewModel.swift +++ b/Shared/ViewModels/MediaViewModel/MediaViewModel.swift @@ -72,10 +72,14 @@ final class MediaViewModel: ViewModel, Stateful { mediaItems.removeAll() } + // TODO: atow, liveTV is removed because it wasn't fixed in time + // after a giant refactor and to push an update let media: [MediaType] = try await getUserViews() - .map { userView in + .compactMap { userView in if userView.collectionType == "livetv" { - return .liveTV(userView) +// return .liveTV(userView) + + return nil } return .collectionFolder(userView) diff --git a/Swiftfin/Views/VideoPlayer/Overlays/Components/BarActionButtons.swift b/Swiftfin/Views/VideoPlayer/Overlays/Components/BarActionButtons.swift index 6804a5c0..d3d44d35 100644 --- a/Swiftfin/Views/VideoPlayer/Overlays/Components/BarActionButtons.swift +++ b/Swiftfin/Views/VideoPlayer/Overlays/Components/BarActionButtons.swift @@ -139,8 +139,8 @@ extension VideoPlayer.Overlay { HStack(spacing: 0) { ForEach(barActionButtons) { actionButton in switch actionButton { - case .advanced: - advancedButton +// case .advanced: +// advancedButton case .aspectFill: aspectFillButton case .audio: diff --git a/Swiftfin/Views/VideoPlayer/Overlays/Components/OverlayMenu.swift b/Swiftfin/Views/VideoPlayer/Overlays/Components/OverlayMenu.swift index fe6e1da1..03faba09 100644 --- a/Swiftfin/Views/VideoPlayer/Overlays/Components/OverlayMenu.swift +++ b/Swiftfin/Views/VideoPlayer/Overlays/Components/OverlayMenu.swift @@ -151,8 +151,8 @@ extension VideoPlayer.Overlay { Menu { ForEach(menuActionButtons) { actionButton in switch actionButton { - case .advanced: - advancedButton +// case .advanced: +// advancedButton case .aspectFill: aspectFillButton case .audio: