From a9db83d26a111dc2e7a1499467de6ab744b86a8a Mon Sep 17 00:00:00 2001 From: Julian Hays Date: Sat, 22 Apr 2023 11:00:38 -0500 Subject: [PATCH] Fix building and LiveTV item layout (#752) --- .../Components/LiveTVChannelItemElement.swift | 13 ++++---- Swiftfin tvOS/Views/LiveTVProgramsView.swift | 30 ++++++++----------- .../Views/LiveTVChannelItemWideElement.swift | 10 +++---- Swiftfin/Views/LiveTVProgramsView.swift | 30 ++++++++----------- 4 files changed, 34 insertions(+), 49 deletions(-) diff --git a/Swiftfin tvOS/Components/LiveTVChannelItemElement.swift b/Swiftfin tvOS/Components/LiveTVChannelItemElement.swift index e0f086cd..688e4d07 100644 --- a/Swiftfin tvOS/Components/LiveTVChannelItemElement.swift +++ b/Swiftfin tvOS/Components/LiveTVChannelItemElement.swift @@ -92,12 +92,11 @@ struct LiveTVChannelItemElement: View { programLabel( timeText: currentProgramText.timeDisplay, titleText: currentProgramText.title, - color: Color("TextHighlightColor"), + color: Color.primary, font: Font.system(size: 20, weight: .bold, design: .default) ) - if !nextProgramsText.isEmpty, - let nextItem = nextProgramsText[0] - { + if !nextProgramsText.isEmpty { + let nextItem = nextProgramsText[0] programLabel( timeText: nextItem.timeDisplay, titleText: nextItem.title, @@ -105,9 +104,8 @@ struct LiveTVChannelItemElement: View { font: Font.system(size: 20, design: .default) ) } - if nextProgramsText.count > 1, - let nextItem2 = nextProgramsText[1] - { + if nextProgramsText.count > 1 { + let nextItem2 = nextProgramsText[1] programLabel( timeText: nextItem2.timeDisplay, titleText: nextItem2.title, @@ -141,6 +139,7 @@ struct LiveTVChannelItemElement: View { } } } + .frame(minWidth: 400, minHeight: 400) .overlay( RoundedRectangle(cornerRadius: 20) .stroke(isFocused ? Color.blue : Color.clear, lineWidth: 4) diff --git a/Swiftfin tvOS/Views/LiveTVProgramsView.swift b/Swiftfin tvOS/Views/LiveTVProgramsView.swift index 6c16d724..c27eed22 100644 --- a/Swiftfin tvOS/Views/LiveTVProgramsView.swift +++ b/Swiftfin tvOS/Views/LiveTVProgramsView.swift @@ -21,9 +21,8 @@ struct LiveTVProgramsView: View { var body: some View { ScrollView { LazyVStack(alignment: .leading) { - if !viewModel.recommendedItems.isEmpty, - let items = viewModel.recommendedItems - { + if !viewModel.recommendedItems.isEmpty { + let items = viewModel.recommendedItems Text("On Now") .font(.headline) .fontWeight(.semibold) @@ -47,9 +46,8 @@ struct LiveTVProgramsView: View { } }.frame(height: 350) } - if !viewModel.seriesItems.isEmpty, - let items = viewModel.seriesItems - { + if !viewModel.seriesItems.isEmpty { + let items = viewModel.seriesItems Text("Shows") .font(.headline) .fontWeight(.semibold) @@ -73,9 +71,8 @@ struct LiveTVProgramsView: View { } }.frame(height: 350) } - if !viewModel.movieItems.isEmpty, - let items = viewModel.movieItems - { + if !viewModel.movieItems.isEmpty { + let items = viewModel.movieItems Text("Movies") .font(.headline) .fontWeight(.semibold) @@ -99,9 +96,8 @@ struct LiveTVProgramsView: View { } }.frame(height: 350) } - if !viewModel.sportsItems.isEmpty, - let items = viewModel.sportsItems - { + if !viewModel.sportsItems.isEmpty { + let items = viewModel.sportsItems Text("Sports") .font(.headline) .fontWeight(.semibold) @@ -125,9 +121,8 @@ struct LiveTVProgramsView: View { } }.frame(height: 350) } - if !viewModel.kidsItems.isEmpty, - let items = viewModel.kidsItems - { + if !viewModel.kidsItems.isEmpty { + let items = viewModel.kidsItems Text("Kids") .font(.headline) .fontWeight(.semibold) @@ -151,9 +146,8 @@ struct LiveTVProgramsView: View { } }.frame(height: 350) } - if !viewModel.newsItems.isEmpty, - let items = viewModel.newsItems - { + if !viewModel.newsItems.isEmpty { + let items = viewModel.newsItems Text("News") .font(.headline) .fontWeight(.semibold) diff --git a/Swiftfin/Views/LiveTVChannelItemWideElement.swift b/Swiftfin/Views/LiveTVChannelItemWideElement.swift index c5ebb032..ac19854f 100644 --- a/Swiftfin/Views/LiveTVChannelItemWideElement.swift +++ b/Swiftfin/Views/LiveTVChannelItemWideElement.swift @@ -105,14 +105,12 @@ struct LiveTVChannelItemWideElement: View { titleText: currentProgramText.title, color: Color("TextHighlightColor") ) - if !nextProgramsText.isEmpty, - let nextItem = nextProgramsText[0] - { + if !nextProgramsText.isEmpty { + let nextItem = nextProgramsText[0] programLabel(timeText: nextItem.timeDisplay, titleText: nextItem.title, color: Color.gray) } - if nextProgramsText.count > 1, - let nextItem2 = nextProgramsText[1] - { + if nextProgramsText.count > 1 { + let nextItem2 = nextProgramsText[1] programLabel(timeText: nextItem2.timeDisplay, titleText: nextItem2.title, color: Color.gray) } Spacer() diff --git a/Swiftfin/Views/LiveTVProgramsView.swift b/Swiftfin/Views/LiveTVProgramsView.swift index 101d0752..3f7756c2 100644 --- a/Swiftfin/Views/LiveTVProgramsView.swift +++ b/Swiftfin/Views/LiveTVProgramsView.swift @@ -19,9 +19,8 @@ struct LiveTVProgramsView: View { var body: some View { ScrollView { LazyVStack(alignment: .leading) { - if !viewModel.recommendedItems.isEmpty, - let items = viewModel.recommendedItems - { + if !viewModel.recommendedItems.isEmpty { + let items = viewModel.recommendedItems PosterHStack(title: "On Now", type: .portrait, items: items) // .onSelect { item in // if let chanId = item.channelId, @@ -33,9 +32,8 @@ struct LiveTVProgramsView: View { // } // } } - if !viewModel.seriesItems.isEmpty, - let items = viewModel.seriesItems - { + if !viewModel.seriesItems.isEmpty { + let items = viewModel.seriesItems PosterHStack(title: "Shows", type: .portrait, items: items) // .onSelect { item in // if let chanId = item.channelId, @@ -47,9 +45,8 @@ struct LiveTVProgramsView: View { // } // } } - if !viewModel.movieItems.isEmpty, - let items = viewModel.movieItems - { + if !viewModel.movieItems.isEmpty { + let items = viewModel.movieItems PosterHStack(title: "Movies", type: .portrait, items: items) // .onSelect { item in // if let chanId = item.channelId, @@ -61,9 +58,8 @@ struct LiveTVProgramsView: View { // } // } } - if !viewModel.sportsItems.isEmpty, - let items = viewModel.sportsItems - { + if !viewModel.sportsItems.isEmpty { + let items = viewModel.sportsItems PosterHStack(title: "Sports", type: .portrait, items: items) // .onSelect { item in // if let chanId = item.channelId, @@ -75,9 +71,8 @@ struct LiveTVProgramsView: View { // } // } } - if !viewModel.kidsItems.isEmpty, - let items = viewModel.kidsItems - { + if !viewModel.kidsItems.isEmpty { + let items = viewModel.kidsItems PosterHStack(title: "Kids", type: .portrait, items: items) // .onSelect { item in // if let chanId = item.channelId, @@ -89,9 +84,8 @@ struct LiveTVProgramsView: View { // } // } } - if !viewModel.newsItems.isEmpty, - let items = viewModel.newsItems - { + if !viewModel.newsItems.isEmpty { + let items = viewModel.newsItems PosterHStack(title: "News", type: .portrait, items: items) // .onSelect { item in // if let chanId = item.channelId,