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

add seasonitemview

This commit is contained in:
Aiden Vigue 2021-06-08 23:21:08 -07:00
parent 93ef16a46d
commit a535a11de4
5 changed files with 107 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
JellyfinPlayer/ItemView.swift
View File

@ -36,20 +36,16 @@ struct ItemView: View {
return return
} }
if(item.type == "Movie" || item.type == "Episode") { isLoading = true;
isLoading = true; UserLibraryAPI.getItem(userId: globalData.user.user_id!, itemId: item.id!)
UserLibraryAPI.getItem(userId: globalData.user.user_id!, itemId: item.id!) .sink(receiveCompletion: { completion in
.sink(receiveCompletion: { completion in HandleAPIRequestCompletion(globalData: globalData, completion: completion)
HandleAPIRequestCompletion(globalData: globalData, completion: completion) }, receiveValue: { response in
}, receiveValue: { response in isLoading = false
isLoading = false viewDidLoad = true
viewDidLoad = true fullItem = response
fullItem = response })
}) .store(in: &globalData.pendingAPIRequests)
.store(in: &globalData.pendingAPIRequests)
} else {
viewDidLoad = true
}
} }
var body: some View { var body: some View {
@ -70,14 +66,13 @@ struct ItemView: View {
ProgressView() ProgressView()
} else { } else {
VStack { VStack {
if(item.type == "Movie") { if(fullItem.type == "Movie") {
MovieItemView(item: fullItem) MovieItemView(item: fullItem)
} else if(item.type == "Season") { } else if(fullItem.type == "Season") {
EmptyView() SeasonItemView(item: fullItem)
SeasonItemView(item: item) } else if(fullItem.type == "Series") {
} else if(item.type == "Series") { SeriesItemView(item: fullItem)
SeriesItemView(item: item) } else if(fullItem.type == "Episode") {
} else if(item.type == "Episode") {
EmptyView() EmptyView()
//EpisodeItemView(item: fullItem) //EpisodeItemView(item: fullItem)
} else { } else {

2
JellyfinPlayer/MovieItemView.swift
View File

@ -265,7 +265,7 @@ struct MovieItemView: View {
.frame(width: geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing, .frame(width: geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing,
height: geometry.size.height + geometry.safeAreaInsets.top + geometry.safeAreaInsets.bottom) height: geometry.size.height + geometry.safeAreaInsets.top + geometry.safeAreaInsets.bottom)
.edgesIgnoringSafeArea(.all) .edgesIgnoringSafeArea(.all)
.blur(radius: 2) .blur(radius: 4)
HStack { HStack {
VStack { VStack {
LazyImage(source: item.getPrimaryImage(baseURL: globalData.server.baseURI!, maxWidth: 120)) LazyImage(source: item.getPrimaryImage(baseURL: globalData.server.baseURI!, maxWidth: 120))

164
JellyfinPlayer/SeasonItemView.swift
View File

@ -13,18 +13,24 @@ struct SeasonItemView: View {
@EnvironmentObject var globalData: GlobalData @EnvironmentObject var globalData: GlobalData
@EnvironmentObject var orientationInfo: OrientationInfo @EnvironmentObject var orientationInfo: OrientationInfo
var item: BaseItemDto var item: BaseItemDto = BaseItemDto()
@State private var episodes: [BaseItemDto] = [] @State private var episodes: [BaseItemDto] = []
@State private var isLoading: Bool = true @State private var isLoading: Bool = true
@State private var viewDidLoad: Bool = false @State private var viewDidLoad: Bool = false
init(item: BaseItemDto) {
self.item = item
}
func onAppear() { func onAppear() {
if(viewDidLoad) { if(viewDidLoad) {
return return
} }
TvShowsAPI.getEpisodes(seriesId: item.seriesId!, fields: [.primaryImageAspectRatio], seasonId: item.id!) dump(item)
TvShowsAPI.getEpisodes(seriesId: item.seriesId!, userId: globalData.user.user_id!, fields: [.primaryImageAspectRatio, .seasonUserData, .itemCounts, .overview], seasonId: item.id!)
.sink(receiveCompletion: { completion in .sink(receiveCompletion: { completion in
HandleAPIRequestCompletion(globalData: globalData, completion: completion) HandleAPIRequestCompletion(globalData: globalData, completion: completion)
isLoading = false isLoading = false
@ -40,9 +46,9 @@ struct SeasonItemView: View {
if isLoading { if isLoading {
EmptyView() EmptyView()
} else { } else {
LazyImage(source: item.getBackdropImage(baseURL: globalData.server.baseURI!, maxWidth: 1500)) LazyImage(source: item.getSeriesBackdropImage(baseURL: globalData.server.baseURI!, maxWidth: 1500))
.placeholderAndFailure { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: item.getBackdropImageBlurHash(), Image(uiImage: UIImage(blurHash: item.getSeriesBackdropImageBlurHash(),
size: CGSize(width: 32, height: 32))!) size: CGSize(width: 32, height: 32))!)
.resizable() .resizable()
} }
@ -71,7 +77,7 @@ struct SeasonItemView: View {
.foregroundColor(.primary) .foregroundColor(.primary)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.offset(y: -4) .offset(y: -4)
if item.productionYear != 0 { if item.productionYear != nil {
Text(String(item.productionYear!)).font(.subheadline) Text(String(item.productionYear!)).font(.subheadline)
.fontWeight(.medium) .fontWeight(.medium)
.foregroundColor(.secondary) .foregroundColor(.secondary)
@ -98,12 +104,12 @@ struct SeasonItemView: View {
Text(item.overview ?? "").font(.footnote).padding(.top, 3) Text(item.overview ?? "").font(.footnote).padding(.top, 3)
.fixedSize(horizontal: false, vertical: true).padding(.bottom, 3).padding(.leading, 16) .fixedSize(horizontal: false, vertical: true).padding(.bottom, 3).padding(.leading, 16)
.padding(.trailing, 16) .padding(.trailing, 16)
ForEach(episodes, id: \.Id) { episode in ForEach(episodes, id: \.id) { episode in
NavigationLink(destination: ItemView(item: episode)) { NavigationLink(destination: ItemView(item: episode)) {
HStack { HStack {
LazyImage(source: episode.getPrimaryImage(baseURL: globalData.server.baseURI!, maxWidth: 150)) LazyImage(source: episode.getPrimaryImage(baseURL: globalData.server.baseURI!, maxWidth: 150))
.placeholderAndFailure { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: episode.getPrimaryImageBlurHash())) Image(uiImage: UIImage(blurHash: episode.getPrimaryImageBlurHash(),
size: CGSize(width: 32, height: 32))!) size: CGSize(width: 32, height: 32))!)
.resizable() .resizable()
.frame(width: 150, height: 90) .frame(width: 150, height: 90)
@ -117,67 +123,60 @@ struct SeasonItemView: View {
Rectangle() Rectangle()
.fill(Color(red: 172/255, green: 92/255, blue: 195/255)) .fill(Color(red: 172/255, green: 92/255, blue: 195/255))
.mask(ProgressBar()) .mask(ProgressBar())
.frame(width: CGFloat((episode.Progress / Double(episode.RuntimeTicks)) * 150), height: 7) .frame(width: CGFloat(episode.userData!.playedPercentage ?? 0 * 1.5), height: 7)
.padding(0), alignment: .bottomLeading .padding(0), alignment: .bottomLeading
) )
VStack(alignment: .leading) { VStack(alignment: .leading) {
HStack { HStack {
Text("S\(String(episode.ParentIndexNumber ?? 0)):E\(String(episode.IndexNumber ?? 0))").font(.subheadline) Text("S\(String(episode.parentIndexNumber ?? 0)):E\(String(episode.indexNumber ?? 0))").font(.subheadline)
.fontWeight(.medium) .fontWeight(.medium)
.foregroundColor(.secondary) .foregroundColor(.secondary)
.lineLimit(1) .lineLimit(1)
Spacer() Spacer()
Text(episode.Name).font(.subheadline) Text(episode.name ?? "").font(.subheadline)
.fontWeight(.semibold) .fontWeight(.semibold)
.foregroundColor(.primary) .foregroundColor(.primary)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.lineLimit(1) .lineLimit(1)
Spacer() Spacer()
Text(episode.Runtime).font(.subheadline) Text(episode.getItemRuntime()).font(.subheadline)
.fontWeight(.medium) .fontWeight(.medium)
.foregroundColor(.secondary) .foregroundColor(.secondary)
.lineLimit(1) .lineLimit(1)
} }
Spacer() Spacer()
Text(episode.Overview).font(.footnote).foregroundColor(.secondary) Text(episode.overview ?? "").font(.footnote).foregroundColor(.secondary)
.fixedSize(horizontal: false, vertical: true).lineLimit(4) .fixedSize(horizontal: false, vertical: true).lineLimit(4)
Spacer() Spacer()
}.padding(.trailing, 20).offset(y: 2) }.padding(.trailing, 20).offset(y: 2)
}.offset(x: 12, y: 0) }.offset(x: 12, y: 0)
} }
} }
if !fullItem.Directors.isEmpty { if !(item.studios ?? []).isEmpty {
HStack { ScrollView(.horizontal, showsIndicators: false) {
Text("Directors:").font(.callout).fontWeight(.semibold) HStack {
Text(fullItem.Directors.joined(separator: ", ")).font(.footnote).lineLimit(1) Text("Studios:").font(.callout).fontWeight(.semibold)
.foregroundColor(Color.secondary) ForEach(item.studios!, id: \.id) { studio in
}.padding(.leading, 16).padding(.trailing, 16) NavigationLink(destination: LazyView {
LibraryView(withStudio: studio)
}) {
Text(studio.name ?? "").font(.footnote)
}
}
}.padding(.leading, 16).padding(.trailing, 16)
}
} }
if !fullItem.Writers.isEmpty { Spacer().frame(height: 10)
HStack { }
Text("Writers:").font(.callout).fontWeight(.semibold) .padding(.leading, 2)
Text(fullItem.Writers.joined(separator: ", ")).font(.footnote).lineLimit(1) .padding(.top, 20)
.foregroundColor(Color.secondary)
}.padding(.leading, 16).padding(.trailing, 16)
}
if !fullItem.Studios.isEmpty {
HStack {
Text("Studios:").font(.callout).fontWeight(.semibold)
Text(fullItem.Studios.joined(separator: ", ")).font(.footnote).lineLimit(1)
.foregroundColor(Color.secondary)
}.padding(.leading, 16).padding(.trailing, 16)
}
Spacer().frame(height: 6)
}.padding(.leading, 2)
} }
} else { } else {
GeometryReader { geometry in GeometryReader { geometry in
ZStack { ZStack {
LazyImage(source: URL(string: "\(globalData.server.baseURI ?? "")/Items/\(fullItem.SeriesId ?? "")/Images/Backdrop?maxWidth=\(String(Int(geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing)))&quality=80&tag=\(item.SeasonImage ?? "")")) LazyImage(source: item.getSeriesBackdropImage(baseURL: globalData.server.baseURI!, maxWidth: Int(geometry.size.width)))
.placeholderAndFailure { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: item Image(uiImage: UIImage(blurHash: item.getSeriesBackdropImageBlurHash(),
.SeasonImageBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item
.SeasonImageBlurHash ?? "",
size: CGSize(width: 32, height: 32))!) size: CGSize(width: 32, height: 32))!)
.resizable() .resizable()
.frame(width: geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets .frame(width: geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets
@ -191,15 +190,13 @@ struct SeasonItemView: View {
.frame(width: geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing, .frame(width: geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing,
height: geometry.size.height + geometry.safeAreaInsets.top + geometry.safeAreaInsets.bottom) height: geometry.size.height + geometry.safeAreaInsets.top + geometry.safeAreaInsets.bottom)
.edgesIgnoringSafeArea(.all) .edgesIgnoringSafeArea(.all)
.blur(radius: 2) .blur(radius: 4)
HStack { HStack {
VStack(alignment: .leading) { VStack(alignment: .leading) {
Spacer().frame(height: 16) Spacer().frame(height: 16)
LazyImage(source: URL(string: "\(globalData.server.baseURI ?? "")/Items/\(fullItem.Id)/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)")) LazyImage(source: item.getPrimaryImage(baseURL: globalData.server.baseURI!, maxWidth: 120))
.placeholderAndFailure { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: fullItem Image(uiImage: UIImage(blurHash: item.getPrimaryImageBlurHash(),
.PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" :
fullItem.PosterBlurHash,
size: CGSize(width: 32, height: 32))!) size: CGSize(width: 32, height: 32))!)
.resizable() .resizable()
.frame(width: 120, height: 180) .frame(width: 120, height: 180)
@ -209,8 +206,8 @@ struct SeasonItemView: View {
.frame(width: 120, height: 180) .frame(width: 120, height: 180)
.cornerRadius(10) .cornerRadius(10)
Spacer().frame(height: 4) Spacer().frame(height: 4)
if fullItem.ProductionYear != 0 { if item.productionYear != nil {
Text(String(fullItem.ProductionYear)).font(.subheadline) Text(String(item.productionYear!)).font(.subheadline)
.fontWeight(.medium) .fontWeight(.medium)
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
@ -219,25 +216,20 @@ struct SeasonItemView: View {
ScrollView { ScrollView {
Spacer().frame(height: 16) Spacer().frame(height: 16)
LazyVStack(alignment: .leading) { LazyVStack(alignment: .leading) {
if fullItem.Tagline != "" { if !(item.taglines ?? []).isEmpty {
Text(fullItem.Tagline).font(.body).italic().padding(.top, 3) Text(item.taglines!.first!).font(.body).italic().padding(.top, 7)
.fixedSize(horizontal: false, vertical: true).padding(.leading, 16) .fixedSize(horizontal: false, vertical: true).padding(.leading, 16)
.padding(.trailing, 16) .padding(.trailing, 16)
} }
if fullItem.Overview != "" { Text(item.overview ?? "").font(.footnote).padding(.top, 3)
Text(fullItem.Overview).font(.footnote).padding(.top, 3) .fixedSize(horizontal: false, vertical: true).padding(.bottom, 3).padding(.leading, 16)
.fixedSize(horizontal: false, vertical: true).padding(.bottom, 3).padding(.leading, 16) .padding(.trailing, 16)
.padding(.trailing, 16) ForEach(episodes, id: \.id) { episode in
} NavigationLink(destination: ItemView(item: episode)) {
ForEach(episodes, id: \.Id) { episode in
NavigationLink(destination: ItemView(item: episode.ResumeItem ?? ResumeItem())) {
HStack { HStack {
LazyImage(source: URL(string: "\(globalData.server.baseURI ?? "")/Items/\(episode.Id)/Images/Primary?maxWidth=300&quality=90&tag=\(episode.Poster)")) LazyImage(source: episode.getPrimaryImage(baseURL: globalData.server.baseURI!, maxWidth: 150))
.placeholderAndFailure { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: episode Image(uiImage: UIImage(blurHash: episode.getPrimaryImageBlurHash(),
.PosterBlurHash == "" ?
"W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem
.PosterBlurHash,
size: CGSize(width: 32, height: 32))!) size: CGSize(width: 32, height: 32))!)
.resizable() .resizable()
.frame(width: 150, height: 90) .frame(width: 150, height: 90)
@ -251,64 +243,48 @@ struct SeasonItemView: View {
Rectangle() Rectangle()
.fill(Color(red: 172/255, green: 92/255, blue: 195/255)) .fill(Color(red: 172/255, green: 92/255, blue: 195/255))
.mask(ProgressBar()) .mask(ProgressBar())
.frame(width: CGFloat((episode.Progress / Double(episode.RuntimeTicks)) * 150), height: 7) .frame(width: CGFloat(episode.userData!.playedPercentage ?? 0 * 1.5), height: 7)
.padding(0), alignment: .bottomLeading .padding(0), alignment: .bottomLeading
) )
VStack(alignment: .leading) { VStack(alignment: .leading) {
HStack { HStack {
Text("S\(String(episode.ParentIndexNumber ?? 0)):E\(String(episode.IndexNumber ?? 0))").font(.subheadline) Text("S\(String(episode.parentIndexNumber ?? 0)):E\(String(episode.indexNumber ?? 0))").font(.subheadline)
.fontWeight(.medium) .fontWeight(.medium)
.foregroundColor(.secondary) .foregroundColor(.secondary)
.lineLimit(1) .lineLimit(1)
if episode.OfficialRating != "" {
Text(episode.OfficialRating).font(.subheadline)
.fontWeight(.medium)
.foregroundColor(.secondary)
.lineLimit(1)
.padding(EdgeInsets(top: 1, leading: 4, bottom: 1, trailing: 4))
.overlay(RoundedRectangle(cornerRadius: 2)
.stroke(Color.secondary, lineWidth: 1))
}
Spacer() Spacer()
Text(episode.Name).font(.subheadline) Text(episode.name ?? "").font(.subheadline)
.fontWeight(.semibold) .fontWeight(.semibold)
.foregroundColor(.primary) .foregroundColor(.primary)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.lineLimit(1) .lineLimit(1)
Spacer() Spacer()
Text(episode.Runtime).font(.subheadline) Text(episode.getItemRuntime()).font(.subheadline)
.fontWeight(.medium) .fontWeight(.medium)
.foregroundColor(.secondary) .foregroundColor(.secondary)
.lineLimit(1) .lineLimit(1)
} }
Spacer() Spacer()
Text(episode.Overview).font(.footnote).foregroundColor(.secondary) Text(episode.overview ?? "").font(.footnote).foregroundColor(.secondary)
.fixedSize(horizontal: false, vertical: true).lineLimit(4) .fixedSize(horizontal: false, vertical: true).lineLimit(4)
Spacer() Spacer()
}.padding(.trailing, 20).offset(y: 2) }.padding(.trailing, 20).offset(y: 2)
}.offset(x: 12, y: 0) }.offset(x: 12, y: 0)
} }
} }
if !fullItem.Directors.isEmpty { if !(item.studios ?? []).isEmpty {
HStack { ScrollView(.horizontal, showsIndicators: false) {
Text("Directors:").font(.callout).fontWeight(.semibold) HStack {
Text(fullItem.Directors.joined(separator: ", ")).font(.footnote).lineLimit(1) Text("Studios:").font(.callout).fontWeight(.semibold)
.foregroundColor(Color.secondary) ForEach(item.studios!, id: \.id) { studio in
}.padding(.leading, 16).padding(.trailing, 16) NavigationLink(destination: LazyView {
} LibraryView(withStudio: studio)
if !fullItem.Writers.isEmpty { }) {
HStack { Text(studio.name ?? "").font(.footnote)
Text("Writers:").font(.callout).fontWeight(.semibold) }
Text(fullItem.Writers.joined(separator: ", ")).font(.footnote).lineLimit(1) }
.foregroundColor(Color.secondary) }.padding(.leading, 16).padding(.trailing, 16)
}.padding(.leading, 16).padding(.trailing, 16) }
}
if !fullItem.Studios.isEmpty {
HStack {
Text("Studios:").font(.callout).fontWeight(.semibold)
Text(fullItem.Studios.joined(separator: ", ")).font(.footnote).lineLimit(1)
.foregroundColor(Color.secondary)
}.padding(.leading, 16).padding(.trailing, 16)
} }
Spacer().frame(height: 95) Spacer().frame(height: 95)
}.frame(maxHeight: .infinity) }.frame(maxHeight: .infinity)
@ -325,6 +301,6 @@ struct SeasonItemView: View {
} }
.onAppear(perform: onAppear) .onAppear(perform: onAppear)
.navigationBarTitleDisplayMode(.inline) .navigationBarTitleDisplayMode(.inline)
.navigationTitle("\(item.Name) - \(item.SeriesName ?? "")") .navigationTitle("\(item.name ?? "") - \(item.seriesName ?? "")")
} }
} }

2
JellyfinPlayer/SeriesItemView.swift
View File

@ -54,7 +54,7 @@ struct SeriesItemView: View {
Spacer().frame(height: 16) Spacer().frame(height: 16)
LazyVGrid(columns: tracks) { LazyVGrid(columns: tracks) {
ForEach(seasons, id: \.id) { season in ForEach(seasons, id: \.id) { season in
NavigationLink(destination: ItemView(item: season )) { NavigationLink(destination: ItemView(item: season)) {
VStack(alignment: .leading) { VStack(alignment: .leading) {
LazyImage(source: season.getPrimaryImage(baseURL: globalData.server.baseURI!, maxWidth: 100)) LazyImage(source: season.getPrimaryImage(baseURL: globalData.server.baseURI!, maxWidth: 100))
.placeholderAndFailure { .placeholderAndFailure {

19
Shared/Extensions/APIExtensions.swift
View File

@ -14,6 +14,13 @@ import UIKit
extension BaseItemDto { extension BaseItemDto {
//MARK: Images //MARK: Images
func getSeriesBackdropImageBlurHash() -> String {
let rawImgURL = self.getSeriesBackdropImage(baseURL: "", maxWidth: 1).absoluteString;
let imgTag = rawImgURL.components(separatedBy: "&tag=")[1];
return self.imageBlurHashes?.backdrop?[imgTag] ?? "001fC^";
}
func getSeriesPrimaryImageBlurHash() -> String { func getSeriesPrimaryImageBlurHash() -> String {
let rawImgURL = self.getSeriesPrimaryImage(baseURL: "", maxWidth: 1).absoluteString; let rawImgURL = self.getSeriesPrimaryImage(baseURL: "", maxWidth: 1).absoluteString;
let imgTag = rawImgURL.components(separatedBy: "&tag=")[1]; let imgTag = rawImgURL.components(separatedBy: "&tag=")[1];
@ -60,6 +67,18 @@ extension BaseItemDto {
return URL(string: urlString)! return URL(string: urlString)!
} }
func getSeriesBackdropImage(baseURL: String, maxWidth: Int) -> URL {
let imageType = "Backdrop";
let imageTag = (self.parentBackdropImageTags ?? [])[0];
print(imageType)
print(imageTag)
let x = UIScreen.main.nativeScale * CGFloat(maxWidth)
let urlString = "\(baseURL)/Items/\(self.parentBackdropItemId ?? "")/Images/\(imageType)?maxWidth=\(String(Int(x)))&quality=85&tag=\(imageTag)"
return URL(string: urlString)!
}
func getSeriesPrimaryImage(baseURL: String, maxWidth: Int) -> URL { func getSeriesPrimaryImage(baseURL: String, maxWidth: Int) -> URL {
let imageType = "Primary"; let imageType = "Primary";
let imageTag = self.seriesPrimaryImageTag ?? "" let imageTag = self.seriesPrimaryImageTag ?? ""