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

Merge pull request #311 from LePips/thumb-images-and-fallback-imageview

This commit is contained in:
aiden 3 2022-01-18 09:56:18 -05:00 committed by GitHub
parent 9e9baed0ff 0dedf2a6b6
commit 37c91af038
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 105 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,6 +92,16 @@ public extension BaseItemDto {
return URL(string: urlString)!
}
func getThumbImage(maxWidth: Int) -> URL {
let x = UIScreen.main.nativeScale * CGFloat(maxWidth)
let urlString = ImageAPI.getItemImageWithRequestBuilder(itemId: id ?? "",
imageType: .thumb,
maxWidth: Int(x),
quality: 96).URLString
return URL(string: urlString)!
}
func getEpisodeLocator() -> String? {
if let seasonNo = parentIndexNumber, let episodeNo = indexNumber {
return L10n.seasonAndEpisode(String(seasonNo), String(episodeNo))
@ -119,6 +129,16 @@ public extension BaseItemDto {
return URL(string: urlString)!
}
func getSeriesThumbImage(maxWidth: Int) -> URL {
let x = UIScreen.main.nativeScale * CGFloat(maxWidth)
let urlString = ImageAPI.getItemImageWithRequestBuilder(itemId: seriesId ?? "",
imageType: .thumb,
maxWidth: Int(x),
quality: 96,
tag: seriesPrimaryImageTag).URLString
return URL(string: urlString)!
}
func getPrimaryImage(maxWidth: Int) -> URL {
let imageType = ImageType.primary
var imageTag = imageTags?[ImageType.primary.rawValue] ?? ""

75
Shared/Views/ImageView.swift
View File

@ -10,44 +10,35 @@ import NukeUI
import SwiftUI
struct ImageView: View {
private let source: URL
@State
private var sources: [URL]
private var currentURL: URL? { sources.first }
private let blurhash: String
private let failureInitials: String
init(src: URL, bh: String = "001fC^", failureInitials: String = "") {
self.source = src
self.sources = [src]
self.blurhash = bh
self.failureInitials = failureInitials
}
// TODO: fix placeholder hash image
init(sources: [URL], bh: String = "001fC^", failureInitials: String = "") {
assert(!sources.isEmpty, "Must supply at least one source")
self.sources = sources
self.blurhash = bh
self.failureInitials = failureInitials
}
// TODO: fix placeholder hash view
@ViewBuilder
private var placeholderImage: some View {
Image(uiImage: UIImage(blurHash: blurhash, size: CGSize(width: 8, height: 8)) ??
UIImage(blurHash: "001fC^", size: CGSize(width: 8, height: 8))!)
.resizable()
}
private func placeholderView() -> some View {
// Image(uiImage: UIImage(blurHash: blurhash, size: CGSize(width: 8, height: 8)) ??
// UIImage(blurHash: "001fC^", size: CGSize(width: 8, height: 8))!)
// .resizable()
@ViewBuilder
private var failureImage: some View {
ZStack {
Rectangle()
.foregroundColor(Color(UIColor.darkGray))
Text(failureInitials)
.font(.largeTitle)
.foregroundColor(.secondary)
.accessibilityHidden(true)
}
}
var body: some View {
LazyImage(source: source) { state in
if let image = state.image {
image
} else if state.error != nil {
failureImage
} else {
#if os(tvOS)
ZStack {
Color.black.ignoresSafeArea()
@ -62,7 +53,35 @@ struct ImageView: View {
}
#endif
}
@ViewBuilder
private func failureImage() -> some View {
ZStack {
Rectangle()
.foregroundColor(Color(UIColor.darkGray))
Text(failureInitials)
.font(.largeTitle)
.foregroundColor(.secondary)
.accessibilityHidden(true)
}
}
var body: some View {
if let u = currentURL {
LazyImage(source: u) { state in
if let image = state.image {
image
} else if state.error != nil {
failureImage().onAppear { sources.removeFirst() }
} else {
placeholderView()
}
}
.pipeline(ImagePipeline(configuration: .withDataCache))
.id(u)
} else {
failureImage()
}
}
}

11
Swiftfin tvOS/Components/HomeCinematicView/CinematicNextUpCardView.swift
View File

@ -24,10 +24,17 @@ struct CinematicNextUpCardView: View {
ZStack(alignment: .bottomLeading) {
if item.itemType == .episode {
ImageView(src: item.getSeriesBackdropImage(maxWidth: 350))
ImageView(sources: [
item.getSeriesThumbImage(maxWidth: 350),
item.getSeriesBackdropImage(maxWidth: 350),
])
.frame(width: 350, height: 210)
} else {
ImageView(src: item.getBackdropImage(maxWidth: 350))
ImageView(sources: [
item.getThumbImage(maxWidth: 350),
item.getBackdropImage(maxWidth: 350),
],
bh: item.getBackdropImageBlurHash())
.frame(width: 350, height: 210)
}

11
Swiftfin tvOS/Components/HomeCinematicView/CinematicResumeCardView.swift
View File

@ -25,10 +25,17 @@ struct CinematicResumeCardView: View {
ZStack(alignment: .bottom) {
if item.itemType == .episode {
ImageView(src: item.getSeriesBackdropImage(maxWidth: 350))
ImageView(sources: [
item.getSeriesThumbImage(maxWidth: 350),
item.getSeriesBackdropImage(maxWidth: 350),
])
.frame(width: 350, height: 210)
} else {
ImageView(src: item.getBackdropImage(maxWidth: 350))
ImageView(sources: [
item.getThumbImage(maxWidth: 350),
item.getBackdropImage(maxWidth: 350),
],
bh: item.getBackdropImageBlurHash())
.frame(width: 350, height: 210)
}

15
Swiftfin/Views/ContinueWatchingView.swift
View File

@ -27,8 +27,21 @@ struct ContinueWatchingView: View {
VStack(alignment: .leading) {
ZStack {
ImageView(src: item.getBackdropImage(maxWidth: 320), bh: item.getBackdropImageBlurHash())
Group {
if item.itemType == .episode {
ImageView(sources: [
item.getSeriesThumbImage(maxWidth: 320),
item.getSeriesBackdropImage(maxWidth: 320),
])
.frame(width: 320, height: 180)
} else {
ImageView(sources: [
item.getThumbImage(maxWidth: 320),
item.getBackdropImage(maxWidth: 320),
])
.frame(width: 320, height: 180)
}
}
.accessibilityIgnoresInvertColors()
HStack {

4
Swiftfin/Views/ItemView/ItemViewDetailsView.swift
View File

@ -48,6 +48,8 @@ struct ItemViewDetailsView: View {
L10n.file.text
.font(.subheadline)
Text(viewModel.selectedVideoPlayerViewModel?.filename ?? "--")
.lineLimit(nil)
.fixedSize(horizontal: false, vertical: true)
.font(.subheadline)
.foregroundColor(Color.secondary)
}
@ -67,6 +69,8 @@ struct ItemViewDetailsView: View {
Text(mediaItem.title)
.font(.subheadline)
Text(mediaItem.content)
.lineLimit(nil)
.fixedSize(horizontal: false, vertical: true)
.font(.subheadline)
.foregroundColor(Color.secondary)
}