From 8c91a95ca416dbb3a3297199b61c99ac8e972539 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Tue, 4 Jan 2022 22:18:23 -0700 Subject: [PATCH] sadly remove live tv from playing and merge fixes --- .../Components/LandscapeItemElement.swift | 2 +- JellyfinPlayer/Components/PortraitItemView.swift | 6 +++--- .../Coordinators/LiveTVChannelsCoordinator.swift | 16 ++++++++++++++-- .../Coordinators/LiveTVProgramsCoordinator.swift | 5 +++-- Shared/Views/LiveTVChannelItemElement.swift | 2 +- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/JellyfinPlayer tvOS/Components/LandscapeItemElement.swift b/JellyfinPlayer tvOS/Components/LandscapeItemElement.swift index 8bc61cf5..d0c5caaa 100644 --- a/JellyfinPlayer tvOS/Components/LandscapeItemElement.swift +++ b/JellyfinPlayer tvOS/Components/LandscapeItemElement.swift @@ -80,7 +80,7 @@ struct LandscapeItemElement: View { .opacity(0.4) .frame(minWidth: 100, maxWidth: .infinity, minHeight: 12, maxHeight: 12) RoundedRectangle(cornerRadius: 6) - .fill(Color(red: 172/255, green: 92/255, blue: 195/255)) + .fill(Color.jellyfinPurple) .frame(width: CGFloat(item.userData?.playedPercentage ?? 0 * 4.45 - 0.16), height: 12) } }.padding(12) diff --git a/JellyfinPlayer/Components/PortraitItemView.swift b/JellyfinPlayer/Components/PortraitItemView.swift index 79ef3b79..c677a92f 100644 --- a/JellyfinPlayer/Components/PortraitItemView.swift +++ b/JellyfinPlayer/Components/PortraitItemView.swift @@ -22,9 +22,9 @@ struct PortraitItemView: View { .shadow(radius: 4, y: 2) .shadow(radius: 4, y: 2) .overlay(Rectangle() - .fill(Color(red: 172 / 255, green: 92 / 255, blue: 195 / 255)) - .frame(width: CGFloat(item.userData?.playedPercentage ?? 0), height: 7) - .padding(0), alignment: .bottomLeading) + .fill(Color.jellyfinPurple) + .frame(width: CGFloat(item.userData?.playedPercentage ?? 0), height: 7) + .padding(0), alignment: .bottomLeading) .overlay(ZStack { if item.userData?.isFavorite ?? false { Image(systemName: "circle.fill") diff --git a/Shared/Coordinators/LiveTVChannelsCoordinator.swift b/Shared/Coordinators/LiveTVChannelsCoordinator.swift index f2a6e482..4b521208 100644 --- a/Shared/Coordinators/LiveTVChannelsCoordinator.swift +++ b/Shared/Coordinators/LiveTVChannelsCoordinator.swift @@ -23,8 +23,9 @@ final class LiveTVChannelsCoordinator: NavigationCoordinatable { return NavigationViewCoordinator(ItemCoordinator(item: item)) } - func makeVideoPlayer(item: BaseItemDto) -> NavigationViewCoordinator { - NavigationViewCoordinator(VideoPlayerCoordinator(item: item)) + func makeVideoPlayer(item: BaseItemDto) -> NavigationViewCoordinator { +// NavigationViewCoordinator(VideoPlayerCoordinator(item: item)) + NavigationViewCoordinator(EmptyViewCoordinator()) } @ViewBuilder @@ -32,3 +33,14 @@ final class LiveTVChannelsCoordinator: NavigationCoordinatable { LiveTVChannelsView() } } + +final class EmptyViewCoordinator: NavigationCoordinatable { + let stack = NavigationStack(initial: \EmptyViewCoordinator.start) + + @Root var start = makeStart + + @ViewBuilder + func makeStart() -> some View { + Text("Empty") + } +} diff --git a/Shared/Coordinators/LiveTVProgramsCoordinator.swift b/Shared/Coordinators/LiveTVProgramsCoordinator.swift index 1dd26daf..a216dd46 100644 --- a/Shared/Coordinators/LiveTVProgramsCoordinator.swift +++ b/Shared/Coordinators/LiveTVProgramsCoordinator.swift @@ -19,8 +19,9 @@ final class LiveTVProgramsCoordinator: NavigationCoordinatable { @Root var start = makeStart @Route(.fullScreen) var videoPlayer = makeVideoPlayer - func makeVideoPlayer(item: BaseItemDto) -> NavigationViewCoordinator { - NavigationViewCoordinator(VideoPlayerCoordinator(item: item)) + func makeVideoPlayer(item: BaseItemDto) -> NavigationViewCoordinator { +// NavigationViewCoordinator(VideoPlayerCoordinator(item: item)) + NavigationViewCoordinator(EmptyViewCoordinator()) } @ViewBuilder diff --git a/Shared/Views/LiveTVChannelItemElement.swift b/Shared/Views/LiveTVChannelItemElement.swift index 2f4e2126..b6f50e81 100644 --- a/Shared/Views/LiveTVChannelItemElement.swift +++ b/Shared/Views/LiveTVChannelItemElement.swift @@ -61,7 +61,7 @@ struct LiveTVChannelItemElement: View { .opacity(0.4) .frame(minWidth: 100, maxWidth: .infinity, minHeight: 12, maxHeight: 12) RoundedRectangle(cornerRadius: 6) - .fill(Color(red: 172/255, green: 92/255, blue: 195/255)) + .fill(Color.jellyfinPurple) .frame(width: CGFloat(progressPercent * gp.size.width), height: 12) } }