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

Swiftformat

This commit is contained in:
jhays 2022-06-06 15:25:06 -05:00
parent aba2e48072
commit f2920363ec
5 changed files with 176 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Shared/Extensions/JellyfinAPIExtensions/BaseItemDtoExtensions.swift
View File

@ -236,7 +236,7 @@ public extension BaseItemDto {
case boxset = "BoxSet" case boxset = "BoxSet"
case collectionFolder = "CollectionFolder" case collectionFolder = "CollectionFolder"
case folder = "Folder" case folder = "Folder"
case liveTV = "LiveTV" case liveTV = "LiveTV"
case unknown case unknown
@ -248,21 +248,21 @@ public extension BaseItemDto {
return true return true
} }
} }
public init?(rawValue: String) { public init?(rawValue: String) {
let lowerCase = rawValue.lowercased() let lowerCase = rawValue.lowercased()
switch lowerCase { switch lowerCase {
case "movie": self = .movie case "movie": self = .movie
case "season": self = .season case "season": self = .season
case "episode": self = .episode case "episode": self = .episode
case "series": self = .series case "series": self = .series
case "boxset": self = .boxset case "boxset": self = .boxset
case "collectionfolder": self = .collectionFolder case "collectionfolder": self = .collectionFolder
case "folder": self = .folder case "folder": self = .folder
case "livetv": self = .liveTV case "livetv": self = .liveTV
default: self = .unknown default: self = .unknown
} }
} }
} }
var itemType: ItemType { var itemType: ItemType {
@ -274,7 +274,7 @@ public extension BaseItemDto {
func portraitHeaderViewURL(maxWidth: Int) -> URL { func portraitHeaderViewURL(maxWidth: Int) -> URL {
switch itemType { switch itemType {
case .movie, .season, .series, .boxset, .collectionFolder, .folder, .liveTV: case .movie, .season, .series, .boxset, .collectionFolder, .folder, .liveTV:
return getPrimaryImage(maxWidth: maxWidth) return getPrimaryImage(maxWidth: maxWidth)
case .episode: case .episode:
return getSeriesPrimaryImage(maxWidth: maxWidth) return getSeriesPrimaryImage(maxWidth: maxWidth)

80
Swiftfin tvOS/Views/LibraryListView.swift
View File

@ -8,9 +8,9 @@
import Defaults import Defaults
import Foundation import Foundation
import JellyfinAPI
import Stinsen import Stinsen
import SwiftUI import SwiftUI
import JellyfinAPI
struct LibraryListView: View { struct LibraryListView: View {
@EnvironmentObject @EnvironmentObject
@ -22,14 +22,14 @@ struct LibraryListView: View {
@Default(.Experimental.liveTVAlphaEnabled) @Default(.Experimental.liveTVAlphaEnabled)
var liveTVAlphaEnabled var liveTVAlphaEnabled
var supportedCollectionTypes: [BaseItemDto.ItemType] { var supportedCollectionTypes: [BaseItemDto.ItemType] {
if liveTVAlphaEnabled { if liveTVAlphaEnabled {
return [.movie, .season, .series, .liveTV, .boxset, .unknown] return [.movie, .season, .series, .liveTV, .boxset, .unknown]
} else { } else {
return [.movie, .season, .series, .boxset, .unknown] return [.movie, .season, .series, .boxset, .unknown]
} }
} }
var body: some View { var body: some View {
ScrollView { ScrollView {
@ -37,39 +37,39 @@ struct LibraryListView: View {
if !viewModel.isLoading { if !viewModel.isLoading {
ForEach(viewModel.libraries.filter { [self] library in ForEach(viewModel.libraries.filter { [self] library in
let collectionType = library.collectionType ?? "other" let collectionType = library.collectionType ?? "other"
let itemType = BaseItemDto.ItemType(rawValue: collectionType) ?? .unknown let itemType = BaseItemDto.ItemType(rawValue: collectionType) ?? .unknown
return self.supportedCollectionTypes.contains(itemType) return self.supportedCollectionTypes.contains(itemType)
}, id: \.id) { library in }, id: \.id) { library in
Button { Button {
let itemType = BaseItemDto.ItemType(rawValue: library.collectionType ?? "other") ?? .unknown let itemType = BaseItemDto.ItemType(rawValue: library.collectionType ?? "other") ?? .unknown
if itemType == .liveTV { if itemType == .liveTV {
self.mainCoordinator.root(\.liveTV) self.mainCoordinator.root(\.liveTV)
} else { } else {
self.libraryListRouter.route(to: \.library, self.libraryListRouter.route(to: \.library,
(viewModel: LibraryViewModel(parentID: library.id), title: library.name ?? "")) (viewModel: LibraryViewModel(parentID: library.id), title: library.name ?? ""))
} }
} }
label: { label: {
ZStack { ZStack {
HStack { HStack {
Spacer() Spacer()
VStack { VStack {
Text(library.name ?? "") Text(library.name ?? "")
.foregroundColor(.white) .foregroundColor(.white)
.font(.title2) .font(.title2)
.fontWeight(.semibold) .fontWeight(.semibold)
} }
Spacer() Spacer()
}.padding(32) }.padding(32)
} }
.frame(minWidth: 100, maxWidth: .infinity) .frame(minWidth: 100, maxWidth: .infinity)
.frame(height: 100) .frame(height: 100)
} }
.cornerRadius(10) .cornerRadius(10)
.shadow(radius: 5) .shadow(radius: 5)
.padding(.bottom, 5) .padding(.bottom, 5)
} }
} else { } else {
ProgressView() ProgressView()
} }

14
Swiftfin/Views/LibraryListView.swift
View File

@ -8,9 +8,9 @@
import Defaults import Defaults
import Foundation import Foundation
import JellyfinAPI
import Stinsen import Stinsen
import SwiftUI import SwiftUI
import JellyfinAPI
struct LibraryListView: View { struct LibraryListView: View {
@EnvironmentObject @EnvironmentObject
@ -21,9 +21,9 @@ struct LibraryListView: View {
@Default(.Experimental.liveTVAlphaEnabled) @Default(.Experimental.liveTVAlphaEnabled)
var liveTVAlphaEnabled var liveTVAlphaEnabled
var supportedCollectionTypes: [BaseItemDto.ItemType] { var supportedCollectionTypes: [BaseItemDto.ItemType] {
if liveTVAlphaEnabled { if liveTVAlphaEnabled {
return [.movie, .season, .series, .liveTV, .boxset, .unknown] return [.movie, .season, .series, .liveTV, .boxset, .unknown]
} else { } else {
return [.movie, .season, .series, .boxset, .unknown] return [.movie, .season, .series, .boxset, .unknown]
} }
@ -57,12 +57,12 @@ struct LibraryListView: View {
if !viewModel.isLoading { if !viewModel.isLoading {
ForEach(viewModel.libraries.filter { [self] library in ForEach(viewModel.libraries.filter { [self] library in
let collectionType = library.collectionType ?? "other" let collectionType = library.collectionType ?? "other"
let itemType = BaseItemDto.ItemType(rawValue: collectionType) ?? .unknown let itemType = BaseItemDto.ItemType(rawValue: collectionType) ?? .unknown
return self.supportedCollectionTypes.contains(itemType) return self.supportedCollectionTypes.contains(itemType)
}, id: \.id) { library in }, id: \.id) { library in
Button { Button {
let itemType = BaseItemDto.ItemType(rawValue: library.collectionType ?? "other") ?? .unknown let itemType = BaseItemDto.ItemType(rawValue: library.collectionType ?? "other") ?? .unknown
if itemType == .liveTV { if itemType == .liveTV {
libraryListRouter.route(to: \.liveTV) libraryListRouter.route(to: \.liveTV)
} else { } else {
libraryListRouter.route(to: \.library, libraryListRouter.route(to: \.library,

47
Swiftfin/Views/LiveTVChannelsView.swift
View File

@ -21,34 +21,31 @@ struct LiveTVChannelsView: View {
var viewModel = LiveTVChannelsViewModel() var viewModel = LiveTVChannelsViewModel()
@State @State
private var isPortrait = false private var isPortrait = false
private var columns: Int { private var columns: Int {
if UIDevice.current.userInterfaceIdiom == .pad { if UIDevice.current.userInterfaceIdiom == .pad {
return 2 return 2
} else { } else {
if isPortrait { if isPortrait {
return 1 return 1
} else { } else {
return 2 return 2
} }
} }
} }
var body: some View { var body: some View {
if viewModel.isLoading == true { if viewModel.isLoading == true {
ProgressView() ProgressView()
} else if !viewModel.channelPrograms.isEmpty { } else if !viewModel.channelPrograms.isEmpty {
ASCollectionView(data: viewModel.channelPrograms, dataID: \.self) ASCollectionView(data: viewModel.channelPrograms, dataID: \.self) { channelProgram, _ in
{ channelProgram, _ in makeCellView(channelProgram)
makeCellView(channelProgram) }
} .layout {
.layout .grid(layoutMode: .fixedNumberOfColumns(columns),
{ itemSpacing: 16,
.grid( lineSpacing: 4,
layoutMode: .fixedNumberOfColumns(columns), itemSize: .absolute(144))
itemSpacing: 16, }
lineSpacing: 4,
itemSize: .absolute(144))
}
.frame(maxWidth: .infinity, maxHeight: .infinity) .frame(maxWidth: .infinity, maxHeight: .infinity)
.ignoresSafeArea() .ignoresSafeArea()
.onAppear { .onAppear {
@ -75,7 +72,7 @@ struct LiveTVChannelsView: View {
@ViewBuilder @ViewBuilder
func makeCellView(_ channelProgram: LiveTVChannelProgram) -> some View { func makeCellView(_ channelProgram: LiveTVChannelProgram) -> some View {
let channel = channelProgram.channel let channel = channelProgram.channel
let currentProgramDisplayText = channelProgram.currentProgram? let currentProgramDisplayText = channelProgram.currentProgram?
.programDisplayText(timeFormatter: viewModel.timeFormatter) ?? LiveTVChannelViewProgram(timeDisplay: "", title: "") .programDisplayText(timeFormatter: viewModel.timeFormatter) ?? LiveTVChannelViewProgram(timeDisplay: "", title: "")
let nextItems = channelProgram.programs.filter { program in let nextItems = channelProgram.programs.filter { program in

180
Swiftfin/Views/LiveTVProgramsView.swift
View File

@ -21,116 +21,116 @@ struct LiveTVProgramsView: View {
if !viewModel.recommendedItems.isEmpty, if !viewModel.recommendedItems.isEmpty,
let items = viewModel.recommendedItems let items = viewModel.recommendedItems
{ {
PortraitImageHStackView(items: items, PortraitImageHStackView(items: items,
horizontalAlignment: .leading) { horizontalAlignment: .leading) {
Text("On Now") Text("On Now")
.font(.headline) .font(.headline)
.fontWeight(.semibold) .fontWeight(.semibold)
.padding(.leading, 90) .padding(.leading, 90)
} selectedAction: { item in } selectedAction: { item in
if let chanId = item.channelId, if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId) let chan = viewModel.findChannel(id: chanId)
{ {
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel) self.programsRouter.route(to: \.videoPlayer, playerViewModel)
} }
} }
} }
} }
if !viewModel.seriesItems.isEmpty, if !viewModel.seriesItems.isEmpty,
let items = viewModel.seriesItems let items = viewModel.seriesItems
{ {
PortraitImageHStackView(items: items, PortraitImageHStackView(items: items,
horizontalAlignment: .leading) { horizontalAlignment: .leading) {
Text("Shows") Text("Shows")
.font(.headline) .font(.headline)
.fontWeight(.semibold) .fontWeight(.semibold)
.padding(.leading, 90) .padding(.leading, 90)
} selectedAction: { item in } selectedAction: { item in
if let chanId = item.channelId, if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId) let chan = viewModel.findChannel(id: chanId)
{ {
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel) self.programsRouter.route(to: \.videoPlayer, playerViewModel)
} }
} }
} }
} }
if !viewModel.movieItems.isEmpty, if !viewModel.movieItems.isEmpty,
let items = viewModel.movieItems let items = viewModel.movieItems
{ {
PortraitImageHStackView(items: items, PortraitImageHStackView(items: items,
horizontalAlignment: .leading) { horizontalAlignment: .leading) {
Text("Movies") Text("Movies")
.font(.headline) .font(.headline)
.fontWeight(.semibold) .fontWeight(.semibold)
.padding(.leading, 90) .padding(.leading, 90)
} selectedAction: { item in } selectedAction: { item in
if let chanId = item.channelId, if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId) let chan = viewModel.findChannel(id: chanId)
{ {
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel) self.programsRouter.route(to: \.videoPlayer, playerViewModel)
} }
} }
} }
} }
if !viewModel.sportsItems.isEmpty, if !viewModel.sportsItems.isEmpty,
let items = viewModel.sportsItems let items = viewModel.sportsItems
{ {
PortraitImageHStackView(items: items, PortraitImageHStackView(items: items,
horizontalAlignment: .leading) { horizontalAlignment: .leading) {
Text("Sports") Text("Sports")
.font(.headline) .font(.headline)
.fontWeight(.semibold) .fontWeight(.semibold)
.padding(.leading, 90) .padding(.leading, 90)
} selectedAction: { item in } selectedAction: { item in
if let chanId = item.channelId, if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId) let chan = viewModel.findChannel(id: chanId)
{ {
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel) self.programsRouter.route(to: \.videoPlayer, playerViewModel)
} }
} }
} }
} }
if !viewModel.kidsItems.isEmpty, if !viewModel.kidsItems.isEmpty,
let items = viewModel.kidsItems let items = viewModel.kidsItems
{ {
PortraitImageHStackView(items: items, PortraitImageHStackView(items: items,
horizontalAlignment: .leading) { horizontalAlignment: .leading) {
Text("Kids") Text("Kids")
.font(.headline) .font(.headline)
.fontWeight(.semibold) .fontWeight(.semibold)
.padding(.leading, 90) .padding(.leading, 90)
} selectedAction: { item in } selectedAction: { item in
if let chanId = item.channelId, if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId) let chan = viewModel.findChannel(id: chanId)
{ {
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel) self.programsRouter.route(to: \.videoPlayer, playerViewModel)
} }
} }
} }
} }
if !viewModel.newsItems.isEmpty, if !viewModel.newsItems.isEmpty,
let items = viewModel.newsItems let items = viewModel.newsItems
{ {
PortraitImageHStackView(items: items, PortraitImageHStackView(items: items,
horizontalAlignment: .leading) { horizontalAlignment: .leading) {
Text("News") Text("News")
.font(.headline) .font(.headline)
.fontWeight(.semibold) .fontWeight(.semibold)
.padding(.leading, 90) .padding(.leading, 90)
} selectedAction: { item in } selectedAction: { item in
if let chanId = item.channelId, if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId) let chan = viewModel.findChannel(id: chanId)
{ {
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel) self.programsRouter.route(to: \.videoPlayer, playerViewModel)
} }
} }
} }
} }
} }
} }