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

80
Swiftfin tvOS/Views/LibraryListView.swift
View File

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

14
Swiftfin/Views/LibraryListView.swift
View File

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

47
Swiftfin/Views/LiveTVChannelsView.swift
View File

@ -21,34 +21,31 @@ struct LiveTVChannelsView: View {
var viewModel = LiveTVChannelsViewModel()
@State
private var isPortrait = false
private var columns: Int {
if UIDevice.current.userInterfaceIdiom == .pad {
return 2
} else {
if isPortrait {
return 1
} else {
return 2
}
}
}
private var columns: Int {
if UIDevice.current.userInterfaceIdiom == .pad {
return 2
} else {
if isPortrait {
return 1
} else {
return 2
}
}
}
var body: some View {
if viewModel.isLoading == true {
ProgressView()
} else if !viewModel.channelPrograms.isEmpty {
ASCollectionView(data: viewModel.channelPrograms, dataID: \.self)
{ channelProgram, _ in
makeCellView(channelProgram)
}
.layout
{
.grid(
layoutMode: .fixedNumberOfColumns(columns),
itemSpacing: 16,
lineSpacing: 4,
itemSize: .absolute(144))
}
ASCollectionView(data: viewModel.channelPrograms, dataID: \.self) { channelProgram, _ in
makeCellView(channelProgram)
}
.layout {
.grid(layoutMode: .fixedNumberOfColumns(columns),
itemSpacing: 16,
lineSpacing: 4,
itemSize: .absolute(144))
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
.ignoresSafeArea()
.onAppear {
@ -75,7 +72,7 @@ struct LiveTVChannelsView: View {
@ViewBuilder
func makeCellView(_ channelProgram: LiveTVChannelProgram) -> some View {
let channel = channelProgram.channel
let channel = channelProgram.channel
let currentProgramDisplayText = channelProgram.currentProgram?
.programDisplayText(timeFormatter: viewModel.timeFormatter) ?? LiveTVChannelViewProgram(timeDisplay: "", title: "")
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,
let items = viewModel.recommendedItems
{
PortraitImageHStackView(items: items,
horizontalAlignment: .leading) {
Text("On Now")
.font(.headline)
.fontWeight(.semibold)
.padding(.leading, 90)
} selectedAction: { item in
if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId)
{
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel)
}
}
}
PortraitImageHStackView(items: items,
horizontalAlignment: .leading) {
Text("On Now")
.font(.headline)
.fontWeight(.semibold)
.padding(.leading, 90)
} selectedAction: { item in
if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId)
{
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel)
}
}
}
}
if !viewModel.seriesItems.isEmpty,
let items = viewModel.seriesItems
{
PortraitImageHStackView(items: items,
horizontalAlignment: .leading) {
Text("Shows")
.font(.headline)
.fontWeight(.semibold)
.padding(.leading, 90)
} selectedAction: { item in
if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId)
{
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel)
}
}
}
PortraitImageHStackView(items: items,
horizontalAlignment: .leading) {
Text("Shows")
.font(.headline)
.fontWeight(.semibold)
.padding(.leading, 90)
} selectedAction: { item in
if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId)
{
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel)
}
}
}
}
if !viewModel.movieItems.isEmpty,
let items = viewModel.movieItems
{
PortraitImageHStackView(items: items,
horizontalAlignment: .leading) {
Text("Movies")
.font(.headline)
.fontWeight(.semibold)
.padding(.leading, 90)
} selectedAction: { item in
if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId)
{
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel)
}
}
}
PortraitImageHStackView(items: items,
horizontalAlignment: .leading) {
Text("Movies")
.font(.headline)
.fontWeight(.semibold)
.padding(.leading, 90)
} selectedAction: { item in
if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId)
{
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel)
}
}
}
}
if !viewModel.sportsItems.isEmpty,
let items = viewModel.sportsItems
{
PortraitImageHStackView(items: items,
horizontalAlignment: .leading) {
Text("Sports")
.font(.headline)
.fontWeight(.semibold)
.padding(.leading, 90)
} selectedAction: { item in
if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId)
{
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel)
}
}
}
PortraitImageHStackView(items: items,
horizontalAlignment: .leading) {
Text("Sports")
.font(.headline)
.fontWeight(.semibold)
.padding(.leading, 90)
} selectedAction: { item in
if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId)
{
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel)
}
}
}
}
if !viewModel.kidsItems.isEmpty,
let items = viewModel.kidsItems
{
PortraitImageHStackView(items: items,
horizontalAlignment: .leading) {
Text("Kids")
.font(.headline)
.fontWeight(.semibold)
.padding(.leading, 90)
} selectedAction: { item in
if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId)
{
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel)
}
}
}
PortraitImageHStackView(items: items,
horizontalAlignment: .leading) {
Text("Kids")
.font(.headline)
.fontWeight(.semibold)
.padding(.leading, 90)
} selectedAction: { item in
if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId)
{
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel)
}
}
}
}
if !viewModel.newsItems.isEmpty,
let items = viewModel.newsItems
{
PortraitImageHStackView(items: items,
horizontalAlignment: .leading) {
Text("News")
.font(.headline)
.fontWeight(.semibold)
.padding(.leading, 90)
} selectedAction: { item in
if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId)
{
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel)
}
}
}
PortraitImageHStackView(items: items,
horizontalAlignment: .leading) {
Text("News")
.font(.headline)
.fontWeight(.semibold)
.padding(.leading, 90)
} selectedAction: { item in
if let chanId = item.channelId,
let chan = viewModel.findChannel(id: chanId)
{
self.viewModel.fetchVideoPlayerViewModel(item: chan) { playerViewModel in
self.programsRouter.route(to: \.videoPlayer, playerViewModel)
}
}
}
}
}
}