ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sadly remove live tv from playing and merge fixes

This commit is contained in:
Ethan Pippin 2022-01-04 22:18:23 -07:00
parent cd6f02d5f1
commit 8c91a95ca4
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
JellyfinPlayer tvOS/Components/LandscapeItemElement.swift
View File

@ -80,7 +80,7 @@ struct LandscapeItemElement: View {
.opacity(0.4) .opacity(0.4)
.frame(minWidth: 100, maxWidth: .infinity, minHeight: 12, maxHeight: 12) .frame(minWidth: 100, maxWidth: .infinity, minHeight: 12, maxHeight: 12)
RoundedRectangle(cornerRadius: 6) 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) .frame(width: CGFloat(item.userData?.playedPercentage ?? 0 * 4.45 - 0.16), height: 12)
} }
}.padding(12) }.padding(12)

6
JellyfinPlayer/Components/PortraitItemView.swift
View File

@ -22,9 +22,9 @@ struct PortraitItemView: View {
.shadow(radius: 4, y: 2) .shadow(radius: 4, y: 2)
.shadow(radius: 4, y: 2) .shadow(radius: 4, y: 2)
.overlay(Rectangle() .overlay(Rectangle()
.fill(Color(red: 172 / 255, green: 92 / 255, blue: 195 / 255)) .fill(Color.jellyfinPurple)
.frame(width: CGFloat(item.userData?.playedPercentage ?? 0), height: 7) .frame(width: CGFloat(item.userData?.playedPercentage ?? 0), height: 7)
.padding(0), alignment: .bottomLeading) .padding(0), alignment: .bottomLeading)
.overlay(ZStack { .overlay(ZStack {
if item.userData?.isFavorite ?? false { if item.userData?.isFavorite ?? false {
Image(systemName: "circle.fill") Image(systemName: "circle.fill")

16
Shared/Coordinators/LiveTVChannelsCoordinator.swift
View File

@ -23,8 +23,9 @@ final class LiveTVChannelsCoordinator: NavigationCoordinatable {
return NavigationViewCoordinator(ItemCoordinator(item: item)) return NavigationViewCoordinator(ItemCoordinator(item: item))
} }
func makeVideoPlayer(item: BaseItemDto) -> NavigationViewCoordinator<VideoPlayerCoordinator> { func makeVideoPlayer(item: BaseItemDto) -> NavigationViewCoordinator<EmptyViewCoordinator> {
NavigationViewCoordinator(VideoPlayerCoordinator(item: item)) // NavigationViewCoordinator(VideoPlayerCoordinator(item: item))
NavigationViewCoordinator(EmptyViewCoordinator())
} }
@ViewBuilder @ViewBuilder
@ -32,3 +33,14 @@ final class LiveTVChannelsCoordinator: NavigationCoordinatable {
LiveTVChannelsView() LiveTVChannelsView()
} }
} }
final class EmptyViewCoordinator: NavigationCoordinatable {
let stack = NavigationStack(initial: \EmptyViewCoordinator.start)
@Root var start = makeStart
@ViewBuilder
func makeStart() -> some View {
Text("Empty")
}
}

5
Shared/Coordinators/LiveTVProgramsCoordinator.swift
View File

@ -19,8 +19,9 @@ final class LiveTVProgramsCoordinator: NavigationCoordinatable {
@Root var start = makeStart @Root var start = makeStart
@Route(.fullScreen) var videoPlayer = makeVideoPlayer @Route(.fullScreen) var videoPlayer = makeVideoPlayer
func makeVideoPlayer(item: BaseItemDto) -> NavigationViewCoordinator<VideoPlayerCoordinator> { func makeVideoPlayer(item: BaseItemDto) -> NavigationViewCoordinator<EmptyViewCoordinator> {
NavigationViewCoordinator(VideoPlayerCoordinator(item: item)) // NavigationViewCoordinator(VideoPlayerCoordinator(item: item))
NavigationViewCoordinator(EmptyViewCoordinator())
} }
@ViewBuilder @ViewBuilder

2
Shared/Views/LiveTVChannelItemElement.swift
View File

@ -61,7 +61,7 @@ struct LiveTVChannelItemElement: View {
.opacity(0.4) .opacity(0.4)
.frame(minWidth: 100, maxWidth: .infinity, minHeight: 12, maxHeight: 12) .frame(minWidth: 100, maxWidth: .infinity, minHeight: 12, maxHeight: 12)
RoundedRectangle(cornerRadius: 6) 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) .frame(width: CGFloat(progressPercent * gp.size.width), height: 12)
} }
} }