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

Merge pull request #21 from PangMo5/PangMo5/parallax-header 

Apply parallax header in SeasonItemView
This commit is contained in:
aiden 2021-05-28 18:39:38 -04:00 committed by GitHub
parent 58a39eb11f 3c6d9c6d11
commit 34fd2b19e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 290 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

526
JellyfinPlayer/SeasonItemView.swift
View File

@ -5,39 +5,46 @@
// Created by Aiden Vigue on 5/13/21. // Created by Aiden Vigue on 5/13/21.
// //
import SwiftUI
import SwiftyRequest
import SwiftyJSON
import SDWebImageSwiftUI import SDWebImageSwiftUI
import SwiftUI
import SwiftyJSON
import SwiftyRequest
struct SeasonItemView: View { struct SeasonItemView: View {
@EnvironmentObject var globalData: GlobalData @EnvironmentObject
@EnvironmentObject var orientationInfo: OrientationInfo var globalData: GlobalData
@State private var isLoading: Bool = true; @EnvironmentObject
var item: ResumeItem; var orientationInfo: OrientationInfo
var fullItem: DetailItem; @State
@State var episodes: [DetailItem] = []; private var isLoading: Bool = true
@State private var progressString: String = ""; var item: ResumeItem
@State private var hasAppearedOnce: Bool = false; var fullItem: DetailItem
@State
var episodes: [DetailItem] = []
@State
private var progressString: String = ""
@State
private var hasAppearedOnce: Bool = false
init(item: ResumeItem) { init(item: ResumeItem) {
self.item = item; self.item = item
fullItem = DetailItem(); self.fullItem = DetailItem()
} }
func loadData() { func loadData() {
if(hasAppearedOnce) { if hasAppearedOnce {
return; return
} }
let url = "/Users/\(globalData.user?.user_id ?? "")/Items/\(item.Id)" let url = "/Users/\(globalData.user?.user_id ?? "")/Items/\(item.Id)"
let request = RestRequest(method: .get, url: (globalData.server?.baseURI ?? "") + url) let request = RestRequest(method: .get, url: (globalData.server?.baseURI ?? "") + url)
request.headerParameters["X-Emby-Authorization"] = globalData.authHeader request.headerParameters["X-Emby-Authorization"] = globalData.authHeader
request.contentType = "application/json" request.contentType = "application/json"
request.acceptType = "application/json" request.acceptType = "application/json"
request.responseData() { (result: Result<RestResponse<Data>, RestError>) in request.responseData { (result: Result<RestResponse<Data>, RestError>) in
switch result { switch result {
case .success(let response): case let .success(response):
let body = response.body let body = response.body
do { do {
let json = try JSON(data: body) let json = try JSON(data: body)
@ -55,43 +62,46 @@ struct SeasonItemView: View {
fullItem.Tagline = json["Taglines"][0].string ?? "" fullItem.Tagline = json["Taglines"][0].string ?? ""
fullItem.SeriesName = json["SeriesName"].string ?? nil fullItem.SeriesName = json["SeriesName"].string ?? nil
fullItem.ParentId = json["ParentId"].string ?? "" fullItem.ParentId = json["ParentId"].string ?? ""
//People // People
fullItem.Directors = [] fullItem.Directors = []
fullItem.Studios = [] fullItem.Studios = []
fullItem.Writers = [] fullItem.Writers = []
fullItem.Cast = [] fullItem.Cast = []
fullItem.Genres = [] fullItem.Genres = []
for (_,person):(String, JSON) in json["People"] { for (_, person): (String, JSON) in json["People"] {
if(person["Type"].stringValue == "Director") { if person["Type"].stringValue == "Director" {
fullItem.Directors.append(person["Name"].string ?? ""); fullItem.Directors.append(person["Name"].string ?? "")
} else if(person["Type"].stringValue == "Writer") { } else if person["Type"].stringValue == "Writer" {
fullItem.Writers.append(person["Name"].string ?? ""); fullItem.Writers.append(person["Name"].string ?? "")
} else if(person["Type"].stringValue == "Actor") { } else if person["Type"].stringValue == "Actor" {
let cast = CastMember(); let cast = CastMember()
cast.Name = person["Name"].string ?? ""; cast.Name = person["Name"].string ?? ""
cast.Id = person["Id"].string ?? ""; cast.Id = person["Id"].string ?? ""
let imageTag = person["PrimaryImageTag"].string ?? ""; let imageTag = person["PrimaryImageTag"].string ?? ""
cast.ImageBlurHash = person["ImageBlurHashes"]["Primary"][imageTag].string ?? ""; cast.ImageBlurHash = person["ImageBlurHashes"]["Primary"][imageTag].string ?? ""
cast.Role = person["Role"].string ?? ""; cast.Role = person["Role"].string ?? ""
cast.Image = URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(cast.Id)/Images/Primary?maxWidth=2000&quality=90&tag=\(imageTag)")! cast
fullItem.Cast.append(cast); .Image =
URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(cast.Id)/Images/Primary?maxWidth=2000&quality=90&tag=\(imageTag)")!
fullItem.Cast.append(cast)
} }
} }
let url2 = "/Shows/\(fullItem.SeriesId ?? "")/Episodes?SeasonId=\(item.Id)&UserId=\(globalData.user?.user_id ?? "")&Fields=ItemCounts%2CPrimaryImageAspectRatio%2CBasicSyncInfo%2CCanDelete%2CMediaSourceCount%2COverview" let url2 =
"/Shows/\(fullItem.SeriesId ?? "")/Episodes?SeasonId=\(item.Id)&UserId=\(globalData.user?.user_id ?? "")&Fields=ItemCounts%2CPrimaryImageAspectRatio%2CBasicSyncInfo%2CCanDelete%2CMediaSourceCount%2COverview"
let request2 = RestRequest(method: .get, url: (globalData.server?.baseURI ?? "") + url2) let request2 = RestRequest(method: .get, url: (globalData.server?.baseURI ?? "") + url2)
request2.headerParameters["X-Emby-Authorization"] = globalData.authHeader request2.headerParameters["X-Emby-Authorization"] = globalData.authHeader
request2.contentType = "application/json" request2.contentType = "application/json"
request2.acceptType = "application/json" request2.acceptType = "application/json"
request2.responseData() { (result: Result<RestResponse<Data>, RestError>) in request2.responseData { (result: Result<RestResponse<Data>, RestError>) in
switch result { switch result {
case .success(let response): case let .success(response):
let body = response.body let body = response.body
do { do {
let jsonroot = try JSON(data: body) let jsonroot = try JSON(data: body)
for (_,json):(String, JSON) in jsonroot["Items"] { for (_, json): (String, JSON) in jsonroot["Items"] {
let episode = DetailItem() let episode = DetailItem()
episode.ProductionYear = json["ProductionYear"].int ?? 0 episode.ProductionYear = json["ProductionYear"].int ?? 0
episode.Poster = json["ImageTags"]["Primary"].string ?? "" episode.Poster = json["ImageTags"]["Primary"].string ?? ""
@ -109,216 +119,248 @@ struct SeasonItemView: View {
episode.SeriesName = json["SeriesName"].string ?? nil episode.SeriesName = json["SeriesName"].string ?? nil
episode.Progress = Double(json["UserData"]["PlaybackPositionTicks"].int ?? 0) episode.Progress = Double(json["UserData"]["PlaybackPositionTicks"].int ?? 0)
episode.OfficialRating = json["OfficialRating"].string ?? "PG-13" episode.OfficialRating = json["OfficialRating"].string ?? "PG-13"
episode.Watched = json["UserData"]["Played"].bool ?? false; episode.Watched = json["UserData"]["Played"].bool ?? false
episode.ParentId = episode.SeasonId ?? ""; episode.ParentId = episode.SeasonId ?? ""
episode.CommunityRating = String(json["CommunityRating"].float ?? 0.0) episode.CommunityRating = String(json["CommunityRating"].float ?? 0.0)
let rI = ResumeItem() let rI = ResumeItem()
rI.Name = episode.Name; rI.Name = episode.Name
rI.Id = episode.Id; rI.Id = episode.Id
rI.IndexNumber = episode.IndexNumber; rI.IndexNumber = episode.IndexNumber
rI.ParentIndexNumber = episode.ParentIndexNumber; rI.ParentIndexNumber = episode.ParentIndexNumber
rI.Image = episode.Poster; rI.Image = episode.Poster
rI.ImageType = "Primary"; rI.ImageType = "Primary"
rI.BlurHash = episode.PosterBlurHash; rI.BlurHash = episode.PosterBlurHash
rI.Type = "Episode"; rI.Type = "Episode"
rI.SeasonId = episode.SeasonId; rI.SeasonId = episode.SeasonId
rI.SeriesId = episode.SeriesId; rI.SeriesId = episode.SeriesId
rI.SeriesName = episode.SeriesName; rI.SeriesName = episode.SeriesName
rI.ProductionYear = episode.ProductionYear; rI.ProductionYear = episode.ProductionYear
episode.ResumeItem = rI; episode.ResumeItem = rI
let seconds: Int = ((json["RunTimeTicks"].int ?? 0)/10000000) let seconds: Int = ((json["RunTimeTicks"].int ?? 0) / 10_000_000)
episode.RuntimeTicks = json["RunTimeTicks"].int ?? 0; episode.RuntimeTicks = json["RunTimeTicks"].int ?? 0
let hours = (seconds/3600) let hours = (seconds / 3600)
let minutes = ((seconds - (hours * 3600))/60) let minutes = ((seconds - (hours * 3600)) / 60)
if(hours != 0) { if hours != 0 {
episode.Runtime = "\(hours):\(String(minutes).leftPad(toWidth: 2, withString: "0"))" episode.Runtime = "\(hours):\(String(minutes).leftPad(toWidth: 2, withString: "0"))"
} else { } else {
episode.Runtime = "\(String(minutes).leftPad(toWidth: 2, withString: "0"))m" episode.Runtime = "\(String(minutes).leftPad(toWidth: 2, withString: "0"))m"
} }
if(episode.Progress != 0) { if episode.Progress != 0 {
let remainingSecs = (Double(json["RunTimeTicks"].int ?? 0) - episode.Progress)/10000000 let remainingSecs = (Double(json["RunTimeTicks"].int ?? 0) - episode.Progress) / 10_000_000
let proghours = Int(remainingSecs/3600) let proghours = Int(remainingSecs / 3600)
let progminutes = Int((Int(remainingSecs) - (proghours * 3600))/60) let progminutes = Int((Int(remainingSecs) - (proghours * 3600)) / 60)
if(proghours != 0) { if proghours != 0 {
episode.ProgressStr = "\(proghours):\(String(progminutes).leftPad(toWidth: 2, withString: "0"))" episode.ProgressStr = "\(proghours):\(String(progminutes).leftPad(toWidth: 2, withString: "0"))"
} else { } else {
episode.ProgressStr = "\(String(progminutes).leftPad(toWidth: 2, withString: "0"))m" episode.ProgressStr = "\(String(progminutes).leftPad(toWidth: 2, withString: "0"))m"
} }
} }
_episodes.wrappedValue.append(episode) _episodes.wrappedValue.append(episode)
} }
_isLoading.wrappedValue = false; _isLoading.wrappedValue = false
_hasAppearedOnce.wrappedValue = true; _hasAppearedOnce.wrappedValue = true
} catch { } catch {}
case let .failure(error):
}
break
case .failure(let error):
debugPrint(error) debugPrint(error)
break
} }
} }
} catch { } catch {}
case let .failure(error):
}
break
case .failure(let error):
debugPrint(error) debugPrint(error)
break
} }
} }
} }
@Environment(\.verticalSizeClass) var verticalSizeClass: UserInterfaceSizeClass? @Environment(\.verticalSizeClass)
@Environment(\.horizontalSizeClass) var horizontalSizeClass: UserInterfaceSizeClass? var verticalSizeClass: UserInterfaceSizeClass?
@Environment(\.horizontalSizeClass)
var horizontalSizeClass: UserInterfaceSizeClass?
var isPortrait: Bool { var isPortrait: Bool {
let result = verticalSizeClass == .regular && horizontalSizeClass == .compact let result = verticalSizeClass == .regular && horizontalSizeClass == .compact
return result return result
} }
func portraitHeaderView(proxy: GeometryProxy) -> some View {
let yOffset = proxy.frame(in: .global).minY > 0 ? -proxy.frame(in: .global).minY : 0
return WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.SeriesId ?? "")/Images/Backdrop?maxWidth=750&quality=80&tag=\(item.SeasonImage ?? "")")!)
.resizable() // Resizable like SwiftUI.Image, you must use this modifier or the view will use the image bitmap size
.placeholder {
Image(uiImage: UIImage(blurHash: item
.SeasonImageBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item
.SeasonImageBlurHash ?? "",
size: CGSize(width: 32, height: 32))!)
.resizable()
.frame(width: proxy.size.width, height: proxy.size.height - yOffset)
}
.opacity(0.4)
.aspectRatio(contentMode: .fill)
.frame(width: proxy.size.width, height: proxy.size.height - yOffset)
.shadow(radius: 5)
.overlay(HStack(alignment: .bottom, spacing: 12) {
WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)")!)
.resizable() // Resizable like SwiftUI.Image, you must use this modifier or the view will use the image bitmap size
.placeholder {
Image(uiImage: UIImage(blurHash: fullItem
.PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem
.PosterBlurHash,
size: CGSize(width: 32, height: 32))!)
.resizable()
.frame(width: 120, height: 180)
.cornerRadius(10)
}.aspectRatio(contentMode: .fill)
.frame(width: 120, height: 180)
.cornerRadius(10)
VStack(alignment: .leading) {
// Text(fullItem.SeriesName ?? "")
// .font(.largeTitle)
// .fontWeight(.bold)
// .foregroundColor(.primary)
// .padding(.bottom, 8)
Text(fullItem.Name).font(.headline)
.fontWeight(.semibold)
.foregroundColor(.primary)
.fixedSize(horizontal: false, vertical: true)
.offset(y: -4)
if fullItem.ProductionYear != 0 {
Text(String(fullItem.ProductionYear)).font(.subheadline)
.fontWeight(.medium)
.foregroundColor(.secondary)
.lineLimit(1)
}
}
}.padding(.horizontal, 16)
.padding(.bottom, -22),
alignment: .bottomLeading)
.offset(y: yOffset)
}
var body: some View { var body: some View {
LoadingView(isShowing: $isLoading) { VStack(alignment: .leading) {
VStack(alignment:.leading) { LoadingView(isShowing: $isLoading) {
if(!isLoading) { VStack(alignment: .leading) {
if(orientationInfo.orientation == .portrait) { if orientationInfo.orientation == .portrait {
GeometryReader { geometry in ScrollView {
VStack() { GeometryReader { proxy in
WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.SeriesId ?? "")/Images/Backdrop?maxWidth=750&quality=80&tag=\(item.SeasonImage ?? "")")!) portraitHeaderView(proxy: proxy)
.resizable() // Resizable like SwiftUI.Image, you must use this modifier or the view will use the image bitmap size }
.placeholder { .frame(height: UIScreen.main.bounds.width * 0.5625)
Image(uiImage: UIImage(blurHash: (item.SeasonImageBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.SeasonImageBlurHash ?? ""), size: CGSize(width: 32, height: 32))!) VStack(alignment: .leading) {
.resizable() if fullItem.Tagline != "" {
.frame(width: geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing, height: (geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing) * 0.5625) Text(fullItem.Tagline).font(.body).italic().padding(.top, 7)
} .fixedSize(horizontal: false, vertical: true).padding(.leading, 16)
.padding(.trailing, 16)
.opacity(0.4) }
.aspectRatio(contentMode: .fill) Text(fullItem.Overview).font(.footnote).padding(.top, 3)
.frame(width: geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing, height: (geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing) * 0.5625) .fixedSize(horizontal: false, vertical: true).padding(.bottom, 3).padding(.leading, 16)
.shadow(radius: 5) .padding(.trailing, 16)
.overlay( ForEach(episodes, id: \.Id) { episode in
HStack() { NavigationLink(destination: ItemView(item: episode.ResumeItem ?? ResumeItem())) {
WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)")!) HStack {
WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(episode.Id)/Images/Primary?maxWidth=300&quality=90&tag=\(episode.Poster)")!)
.resizable() // Resizable like SwiftUI.Image, you must use this modifier or the view will use the image bitmap size .resizable() // Resizable like SwiftUI.Image, you must use this modifier or the view will use the image bitmap size
.placeholder { .placeholder {
Image(uiImage: UIImage(blurHash: (fullItem.PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem.PosterBlurHash), size: CGSize(width: 32, height: 32))!) Image(uiImage: UIImage(blurHash: episode
.PosterBlurHash == "" ?
"W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem
.PosterBlurHash,
size: CGSize(width: 32, height: 32))!)
.resizable() .resizable()
.frame(width: 120, height: 180) .frame(width: 150, height: 90)
.cornerRadius(10) .cornerRadius(10)
}.aspectRatio(contentMode: .fill) }.aspectRatio(contentMode: .fill)
.frame(width: 120, height: 180) .shadow(radius: 5)
.frame(width: 150, height: 90)
.cornerRadius(10) .cornerRadius(10)
.overlay(RoundedRectangle(cornerRadius: 10, style: .circular)
.fill(Color(red: 172 / 255, green: 92 / 255, blue: 195 / 255)
.opacity(0.4))
.frame(width: CGFloat((episode.Progress / Double(episode.RuntimeTicks)) *
150),
height: 90)
.padding(0), alignment: .bottomLeading)
VStack(alignment: .leading) { VStack(alignment: .leading) {
Text(fullItem.Name).font(.headline) HStack {
.fontWeight(.semibold) Text(episode.Name).font(.subheadline)
.foregroundColor(.primary) .fontWeight(.semibold)
.fixedSize(horizontal: false, vertical: true) .foregroundColor(.primary)
.offset(y: -4) .fixedSize(horizontal: false, vertical: true)
if(fullItem.ProductionYear != 0) { .lineLimit(1)
Text(String(fullItem.ProductionYear)).font(.subheadline) Spacer()
Text(episode.Runtime).font(.subheadline)
.fontWeight(.medium) .fontWeight(.medium)
.foregroundColor(.secondary) .foregroundColor(.secondary)
.lineLimit(1) .lineLimit(1)
} }
}.offset(x: 0, y: 45) Spacer()
}.offset(x: 16, y: 22) Text(episode.Overview).font(.footnote).foregroundColor(.secondary)
, alignment: .bottomLeading) .fixedSize(horizontal: false, vertical: true).lineLimit(4)
VStack(alignment: .leading) { Spacer()
ScrollView() { }.padding(.trailing, 20).offset(y: 2)
VStack(alignment: .leading) { }.offset(x: 12, y: 0)
if(fullItem.Tagline != "") {
Text(fullItem.Tagline).font(.body).italic().padding(.top, 7).fixedSize(horizontal: false, vertical: true).padding(.leading, 16).padding(.trailing,16)
}
Text(fullItem.Overview).font(.footnote).padding(.top, 3).fixedSize(horizontal: false, vertical: true).padding(.bottom, 3).padding(.leading, 16).padding(.trailing,16)
ForEach(episodes, id: \.Id) { episode in
NavigationLink(destination: ItemView(item: episode.ResumeItem ?? ResumeItem())) {
HStack() {
WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(episode.Id)/Images/Primary?maxWidth=300&quality=90&tag=\(episode.Poster)")!)
.resizable() // Resizable like SwiftUI.Image, you must use this modifier or the view will use the image bitmap size
.placeholder {
Image(uiImage: UIImage(blurHash: (episode.PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem.PosterBlurHash), size: CGSize(width: 32, height: 32))!)
.resizable()
.frame(width: 150, height: 90)
.cornerRadius(10)
}.aspectRatio(contentMode: .fill)
.shadow(radius: 5)
.frame(width: 150, height: 90)
.cornerRadius(10)
.overlay(
RoundedRectangle(cornerRadius: 10, style: .circular)
.fill(Color(red: 172/255, green: 92/255, blue: 195/255).opacity(0.4))
.frame(width: CGFloat((episode.Progress/Double(episode.RuntimeTicks))*150), height: 90)
.padding(0), alignment: .bottomLeading
)
VStack(alignment: .leading) {
HStack() {
Text(episode.Name).font(.subheadline)
.fontWeight(.semibold)
.foregroundColor(.primary)
.fixedSize(horizontal: false, vertical: true)
.lineLimit(1)
Spacer()
Text(episode.Runtime).font(.subheadline)
.fontWeight(.medium)
.foregroundColor(.secondary)
.lineLimit(1)
}
Spacer()
Text(episode.Overview).font(.footnote).foregroundColor(.secondary).fixedSize(horizontal: false, vertical: true).lineLimit(4)
Spacer()
}.padding(.trailing, 20).offset(y: 2)
}.offset(x: 12, y: 0)
}
}
if(fullItem.Directors.count != 0) {
HStack() {
Text("Directors:").font(.callout).fontWeight(.semibold)
Text(fullItem.Directors.joined(separator: ", ")).font(.footnote).lineLimit(1).foregroundColor(Color.secondary)
}.padding(.leading, 16).padding(.trailing,16)
}
if(fullItem.Writers.count != 0) {
HStack() {
Text("Writers:").font(.callout).fontWeight(.semibold)
Text(fullItem.Writers.joined(separator: ", ")).font(.footnote).lineLimit(1).foregroundColor(Color.secondary)
}.padding(.leading, 16).padding(.trailing,16)
}
if(fullItem.Studios.count != 0) {
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: 3)
}
} }
}.padding(EdgeInsets(top: 24, leading: 0, bottom: 0, trailing: 0)) }
if !fullItem.Directors.isEmpty {
HStack {
Text("Directors:").font(.callout).fontWeight(.semibold)
Text(fullItem.Directors.joined(separator: ", ")).font(.footnote).lineLimit(1)
.foregroundColor(Color.secondary)
}.padding(.leading, 16).padding(.trailing, 16)
}
if !fullItem.Writers.isEmpty {
HStack {
Text("Writers:").font(.callout).fontWeight(.semibold)
Text(fullItem.Writers.joined(separator: ", ")).font(.footnote).lineLimit(1)
.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: 3)
} }
} }
} else { } else {
GeometryReader { geometry in GeometryReader { geometry in
ZStack() { ZStack {
WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.SeriesId ?? "")/Images/Backdrop?maxWidth=750&quality=80&tag=\(item.SeasonImage ?? "")")!) WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.SeriesId ?? "")/Images/Backdrop?maxWidth=750&quality=80&tag=\(item.SeasonImage ?? "")")!)
.resizable() // Resizable like SwiftUI.Image, you must use this modifier or the view will use the image bitmap size .resizable() // Resizable like SwiftUI.Image, you must use this modifier or the view will use the image bitmap size
.placeholder { .placeholder {
Image(uiImage: UIImage(blurHash: (item.SeasonImageBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.SeasonImageBlurHash ?? ""), size: CGSize(width: 32, height: 32))!) Image(uiImage: UIImage(blurHash: item
.SeasonImageBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item
.SeasonImageBlurHash ?? "",
size: CGSize(width: 32, height: 32))!)
.resizable() .resizable()
.frame(width: geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing, height: geometry.size.height + geometry.safeAreaInsets.top + geometry.safeAreaInsets.bottom) .frame(width: geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets
.trailing,
height: geometry.size.height + geometry.safeAreaInsets.top + geometry.safeAreaInsets
.bottom)
} }
.opacity(0.4) .opacity(0.4)
.aspectRatio(contentMode: .fill) .aspectRatio(contentMode: .fill)
.frame(width: geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing, height: geometry.size.height + geometry.safeAreaInsets.top + geometry.safeAreaInsets.bottom) .frame(width: geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing,
height: geometry.size.height + geometry.safeAreaInsets.top + geometry.safeAreaInsets.bottom)
.edgesIgnoringSafeArea(.all) .edgesIgnoringSafeArea(.all)
HStack() { HStack {
VStack(alignment: .leading) { VStack(alignment: .leading) {
WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)")!) WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)")!)
.resizable() // Resizable like SwiftUI.Image, you must use this modifier or the view will use the image bitmap size .resizable() // Resizable like SwiftUI.Image, you must use this modifier or the view will use the image bitmap size
.placeholder { .placeholder {
Image(uiImage: UIImage(blurHash: (fullItem.PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem.PosterBlurHash), size: CGSize(width: 32, height: 32))!) Image(uiImage: UIImage(blurHash: fullItem
.PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" :
fullItem.PosterBlurHash,
size: CGSize(width: 32, height: 32))!)
.resizable() .resizable()
.frame(width: 120, height: 180) .frame(width: 120, height: 180)
.cornerRadius(10) .cornerRadius(10)
@ -326,26 +368,34 @@ 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 fullItem.ProductionYear != 0 {
Text(String(fullItem.ProductionYear)).font(.subheadline) Text(String(fullItem.ProductionYear)).font(.subheadline)
.fontWeight(.medium) .fontWeight(.medium)
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
Spacer() Spacer()
} }
ScrollView() { ScrollView {
VStack(alignment: .leading) { VStack(alignment: .leading) {
if(fullItem.Tagline != "") { if fullItem.Tagline != "" {
Text(fullItem.Tagline).font(.body).italic().padding(.top, 3).fixedSize(horizontal: false, vertical: true).padding(.leading, 16).padding(.trailing,16) Text(fullItem.Tagline).font(.body).italic().padding(.top, 3)
.fixedSize(horizontal: false, vertical: true).padding(.leading, 16)
.padding(.trailing, 16)
} }
Text(fullItem.Overview).font(.footnote).padding(.top, 3).fixedSize(horizontal: false, vertical: true).padding(.bottom, 3).padding(.leading, 16).padding(.trailing,16) Text(fullItem.Overview).font(.footnote).padding(.top, 3)
.fixedSize(horizontal: false, vertical: true).padding(.bottom, 3).padding(.leading, 16)
.padding(.trailing, 16)
ForEach(episodes, id: \.Id) { episode in ForEach(episodes, id: \.Id) { episode in
NavigationLink(destination: ItemView(item: episode.ResumeItem ?? ResumeItem())) { NavigationLink(destination: ItemView(item: episode.ResumeItem ?? ResumeItem())) {
HStack() { HStack {
WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(episode.Id)/Images/Primary?maxWidth=300&quality=90&tag=\(episode.Poster)")!) WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(episode.Id)/Images/Primary?maxWidth=300&quality=90&tag=\(episode.Poster)")!)
.resizable() // Resizable like SwiftUI.Image, you must use this modifier or the view will use the image bitmap size .resizable() // Resizable like SwiftUI.Image, you must use this modifier or the view will use the image bitmap size
.placeholder { .placeholder {
Image(uiImage: UIImage(blurHash: (episode.PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem.PosterBlurHash), size: CGSize(width: 32, height: 32))!) Image(uiImage: UIImage(blurHash: episode
.PosterBlurHash == "" ?
"W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem
.PosterBlurHash,
size: CGSize(width: 32, height: 32))!)
.resizable() .resizable()
.frame(width: 150, height: 90) .frame(width: 150, height: 90)
.cornerRadius(10) .cornerRadius(10)
@ -353,14 +403,15 @@ struct SeasonItemView: View {
.shadow(radius: 5) .shadow(radius: 5)
.frame(width: 150, height: 90) .frame(width: 150, height: 90)
.cornerRadius(10) .cornerRadius(10)
.overlay( .overlay(RoundedRectangle(cornerRadius: 10, style: .circular)
RoundedRectangle(cornerRadius: 10, style: .circular) .fill(Color(red: 172 / 255, green: 92 / 255, blue: 195 / 255)
.fill(Color(red: 172/255, green: 92/255, blue: 195/255).opacity(0.4)) .opacity(0.4))
.frame(width: CGFloat((episode.Progress/Double(episode.RuntimeTicks))*150), height: 90) .frame(width: CGFloat((episode.Progress / Double(episode.RuntimeTicks)) *
.padding(0), alignment: .bottomLeading 150),
) height: 90)
.padding(0), alignment: .bottomLeading)
VStack(alignment: .leading) { VStack(alignment: .leading) {
HStack() { HStack {
Text(episode.Name).font(.subheadline) Text(episode.Name).font(.subheadline)
.fontWeight(.semibold) .fontWeight(.semibold)
.foregroundColor(.primary) .foregroundColor(.primary)
@ -370,19 +421,17 @@ struct SeasonItemView: View {
.fontWeight(.medium) .fontWeight(.medium)
.foregroundColor(.secondary) .foregroundColor(.secondary)
.lineLimit(1) .lineLimit(1)
if(episode.OfficialRating != "") { if episode.OfficialRating != "" {
Text(episode.OfficialRating).font(.subheadline) Text(episode.OfficialRating).font(.subheadline)
.fontWeight(.medium) .fontWeight(.medium)
.foregroundColor(.secondary) .foregroundColor(.secondary)
.lineLimit(1) .lineLimit(1)
.padding(EdgeInsets(top: 1, leading: 4, bottom: 1, trailing: 4)) .padding(EdgeInsets(top: 1, leading: 4, bottom: 1, trailing: 4))
.overlay( .overlay(RoundedRectangle(cornerRadius: 2)
RoundedRectangle(cornerRadius: 2) .stroke(Color.secondary, lineWidth: 1))
.stroke(Color.secondary, lineWidth: 1)
)
} }
if(episode.CommunityRating != "") { if episode.CommunityRating != "" {
HStack() { HStack {
Image(systemName: "star").foregroundColor(.secondary) Image(systemName: "star").foregroundColor(.secondary)
Text(episode.CommunityRating).font(.subheadline) Text(episode.CommunityRating).font(.subheadline)
.fontWeight(.semibold) .fontWeight(.semibold)
@ -394,31 +443,35 @@ struct SeasonItemView: View {
Spacer() Spacer()
} }
Spacer() Spacer()
Text(episode.Overview).font(.footnote).foregroundColor(.secondary).fixedSize(horizontal: false, vertical: true).lineLimit(4) Text(episode.Overview).font(.footnote).foregroundColor(.secondary)
.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.count != 0) { if !fullItem.Directors.isEmpty {
HStack() { HStack {
Text("Directors:").font(.callout).fontWeight(.semibold) Text("Directors:").font(.callout).fontWeight(.semibold)
Text(fullItem.Directors.joined(separator: ", ")).font(.footnote).lineLimit(1).foregroundColor(Color.secondary) Text(fullItem.Directors.joined(separator: ", ")).font(.footnote).lineLimit(1)
}.padding(.leading, 16).padding(.trailing,16) .foregroundColor(Color.secondary)
}.padding(.leading, 16).padding(.trailing, 16)
} }
if(fullItem.Writers.count != 0) { if !fullItem.Writers.isEmpty {
HStack() { HStack {
Text("Writers:").font(.callout).fontWeight(.semibold) Text("Writers:").font(.callout).fontWeight(.semibold)
Text(fullItem.Writers.joined(separator: ", ")).font(.footnote).lineLimit(1).foregroundColor(Color.secondary) Text(fullItem.Writers.joined(separator: ", ")).font(.footnote).lineLimit(1)
}.padding(.leading, 16).padding(.trailing,16) .foregroundColor(Color.secondary)
}.padding(.leading, 16).padding(.trailing, 16)
} }
if(fullItem.Studios.count != 0) { if !fullItem.Studios.isEmpty {
HStack() { HStack {
Text("Studios:").font(.callout).fontWeight(.semibold) Text("Studios:").font(.callout).fontWeight(.semibold)
Text(fullItem.Studios.joined(separator: ", ")).font(.footnote).lineLimit(1).foregroundColor(Color.secondary) Text(fullItem.Studios.joined(separator: ", ")).font(.footnote).lineLimit(1)
}.padding(.leading, 16).padding(.trailing,16) .foregroundColor(Color.secondary)
}.padding(.leading, 16).padding(.trailing, 16)
} }
Spacer().frame(height: 125); Spacer().frame(height: 125)
}.frame(maxHeight: .infinity) }.frame(maxHeight: .infinity)
}.padding(.trailing, UIDevice.current.userInterfaceIdiom == .pad ? 16 : 55).padding(.top, -16) }.padding(.trailing, UIDevice.current.userInterfaceIdiom == .pad ? 16 : 55).padding(.top, -16)
}.padding(.top, 16).padding(.leading, UIDevice.current.userInterfaceIdiom == .pad ? 16 : 0) }.padding(.top, 16).padding(.leading, UIDevice.current.userInterfaceIdiom == .pad ? 16 : 0)
@ -427,8 +480,9 @@ struct SeasonItemView: View {
} }
} }
} }
.navigationBarTitleDisplayMode(.inline) }
.navigationTitle("\(item.Name) - \(item.SeriesName ?? "")") .onAppear(perform: loadData)
}.onAppear(perform: loadData) .navigationBarTitleDisplayMode(.inline)
.navigationTitle("\(item.Name) - \(item.SeriesName ?? "")")
} }
} }