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

minor feedback cleanup

This commit is contained in:
jhays 2021-11-23 08:19:03 -06:00
parent c98f63c5e4
commit 1bafa774de
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
JellyfinPlayer tvOS/Views/LibraryListView.swift
View File

@ -32,8 +32,6 @@ struct LibraryListView: View {
} }
label: { label: {
ZStack { ZStack {
ImageView(src: library.getPrimaryImage(maxWidth: 500), bh: library.getPrimaryImageBlurHash())
.opacity(0.4)
HStack { HStack {
Spacer() Spacer()
VStack { VStack {
@ -44,7 +42,7 @@ struct LibraryListView: View {
} }
Spacer() Spacer()
}.padding(32) }.padding(32)
}.background(Color.black) }
.frame(minWidth: 100, maxWidth: .infinity) .frame(minWidth: 100, maxWidth: .infinity)
.frame(height: 100) .frame(height: 100)
} }

33
JellyfinPlayer tvOS/Views/LiveTVChannelsView.swift
View File

@ -36,7 +36,7 @@ struct LiveTVChannelsView: View {
VStack { VStack {
Text("No results.") Text("No results.")
Button { Button {
print("movieLibraries reload") viewModel.getChannels()
} label: { } label: {
Text("Reload") Text("Reload")
} }
@ -45,24 +45,21 @@ struct LiveTVChannelsView: View {
} }
@ViewBuilder func makeCellView(indexPath: IndexPath, cell: LiveTVChannelRowCell) -> some View { @ViewBuilder func makeCellView(indexPath: IndexPath, cell: LiveTVChannelRowCell) -> some View {
GeometryReader { _ in let item = cell.item
if let item = cell.item, let channel = item.channel
let channel = item.channel{ if channel.type != "Folder" {
if channel.type != "Folder" { Button {
Button { self.router.route(to: \.videoPlayer, channel)
self.router.route(to: \.videoPlayer, channel) } label: {
} label: { LiveTVChannelItemElement(
LiveTVChannelItemElement( channel: channel,
channel: channel, program: item.program,
program: item.program, startString: item.program?.getLiveStartTimeString(formatter: viewModel.timeFormatter) ?? " ",
startString: item.program?.getLiveStartTimeString(formatter: viewModel.timeFormatter) ?? " ", endString: item.program?.getLiveEndTimeString(formatter: viewModel.timeFormatter) ?? " ",
endString: item.program?.getLiveEndTimeString(formatter: viewModel.timeFormatter) ?? " ", progressPercent: item.program?.getLiveProgressPercentage() ?? 0
progressPercent: item.program?.getLiveProgressPercentage() ?? 0 )
)
}
.buttonStyle(PlainNavigationLinkButtonStyle())
}
} }
.buttonStyle(PlainNavigationLinkButtonStyle())
} }
} }

2
Shared/ViewModels/LiveTVChannelsViewModel.swift
View File

@ -66,7 +66,7 @@ final class LiveTVChannelsViewModel: ViewModel {
.store(in: &cancellables) .store(in: &cancellables)
} }
private func getChannels() { func getChannels() {
LiveTvAPI.getLiveTvChannels( LiveTvAPI.getLiveTvChannels(
userId: SessionManager.main.currentLogin.user.id, userId: SessionManager.main.currentLogin.user.id,
startIndex: 0, startIndex: 0,