Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-04-26 00:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix images layout"

Browse Source 
This reverts commit ee6e2370d22fb6d9013a4a05b51b4c6d155a3068.
This commit is contained in:
Arkadiusz Fal 2022-09-11 21:21:50 +02:00
parent 6ec59cf442
commit b320ffb540
5 changed files with 80 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shared/Player/ChapterView.swift
View File

@ -32,7 +32,6 @@ struct ChapterView: View {
}
@ViewBuilder func smallImage(_ chapter: Chapter) -> some View {
Group {
if #available(iOS 15, macOS 12, *) {
CachedAsyncImage(url: chapter.image) { image in
image
@ -47,8 +46,6 @@ struct ChapterView: View {
ProgressView()
}
.indicator(.activity)
}
}
#if os(tvOS)
.frame(width: thumbnailWidth, height: 140)
.mask(RoundedRectangle(cornerRadius: 12))
@ -57,6 +54,7 @@ struct ChapterView: View {
.mask(RoundedRectangle(cornerRadius: 6))
#endif
}
}
private var thumbnailWidth: Double {
#if os(tvOS)

25
Shared/Videos/VideoBanner.swift
View File

@ -73,7 +73,6 @@ struct VideoBanner: View {
@ViewBuilder private var smallThumbnail: some View {
let url = video?.thumbnailURL(quality: .medium)
Group {
if #available(iOS 15, macOS 12, *) {
CachedAsyncImage(url: url) { image in
image
@ -81,15 +80,6 @@ struct VideoBanner: View {
} placeholder: {
Rectangle().foregroundColor(Color("PlaceholderColor"))
}
} else {
WebImage(url: url)
.resizable()
.placeholder {
ProgressView()
}
.indicator(.activity)
}
}
#if os(tvOS)
.frame(width: thumbnailWidth, height: 140)
.mask(RoundedRectangle(cornerRadius: 12))
@ -97,6 +87,21 @@ struct VideoBanner: View {
.frame(width: thumbnailWidth, height: 60)
.mask(RoundedRectangle(cornerRadius: 6))
#endif
} else {
WebImage(url: url)
.resizable()
.placeholder {
ProgressView()
}
.indicator(.activity)
#if os(tvOS)
.frame(width: thumbnailWidth, height: 140)
.mask(RoundedRectangle(cornerRadius: 12))
#else
.frame(width: thumbnailWidth, height: 60)
.mask(RoundedRectangle(cornerRadius: 6))
#endif
}
}
private var thumbnailWidth: Double {

8
Shared/Videos/VideoCell.swift
View File

@ -429,6 +429,9 @@ struct VideoCell: View {
} placeholder: {
Rectangle().foregroundColor(Color("PlaceholderColor"))
}
#if os(tvOS)
.frame(minHeight: 320)
#endif
} else {
WebImage(url: url)
.resizable()
@ -440,11 +443,12 @@ struct VideoCell: View {
guard let url = url else { return }
thumbnails.insertUnloadable(url)
}
}
}
#if os(tvOS)
.frame(minHeight: 320)
#endif
}
}
.mask(RoundedRectangle(cornerRadius: thumbnailRoundingCornerRadius))
.modifier(AspectRatioModifier())
}

5
Shared/Views/ChannelCell.swift
View File

@ -38,8 +38,6 @@ struct ChannelCell: View {
.opacity(0.6)
}
.foregroundColor(.secondary)
Group {
if #available(iOS 15, macOS 12, *) {
CachedAsyncImage(url: channel.thumbnailURL) { image in
image
@ -54,10 +52,9 @@ struct ChannelCell: View {
Rectangle().fill(Color("PlaceholderColor"))
}
.indicator(.activity)
}
}
.frame(width: 88, height: 88)
.clipShape(Circle())
}
DetailBadge(text: channel.name, style: .prominent)

5
Shared/Views/ChannelPlaylistCell.swift
View File

@ -38,7 +38,6 @@ struct ChannelPlaylistCell: View {
}
.foregroundColor(.secondary)
Group {
if #available(iOS 15, macOS 12, *) {
CachedAsyncImage(url: playlist.thumbnailURL) { image in
image
@ -53,11 +52,9 @@ struct ChannelPlaylistCell: View {
Rectangle().fill(Color("PlaceholderColor"))
}
.indicator(.activity)
}
}
.frame(width: 165, height: 88)
.clipShape(RoundedRectangle(cornerRadius: 10))
}
Group {
DetailBadge(text: playlist.title, style: .prominent)
.lineLimit(2)