From b320ffb5401063150e93e2f7927bcd5d239c0467 Mon Sep 17 00:00:00 2001 From: Arkadiusz Fal Date: Sun, 11 Sep 2022 21:21:50 +0200 Subject: [PATCH] Revert "Fix images layout" This reverts commit ee6e2370d22fb6d9013a4a05b51b4c6d155a3068. --- Shared/Player/ChapterView.swift | 40 +++++++++++----------- Shared/Videos/VideoBanner.swift | 47 ++++++++++++++------------ Shared/Videos/VideoCell.swift | 10 ++++-- Shared/Views/ChannelCell.swift | 31 ++++++++--------- Shared/Views/ChannelPlaylistCell.swift | 31 ++++++++--------- 5 files changed, 80 insertions(+), 79 deletions(-) diff --git a/Shared/Player/ChapterView.swift b/Shared/Player/ChapterView.swift index 4bbde4db..f8225bf2 100644 --- a/Shared/Player/ChapterView.swift +++ b/Shared/Player/ChapterView.swift @@ -32,30 +32,28 @@ struct ChapterView: View { } @ViewBuilder func smallImage(_ chapter: Chapter) -> some View { - Group { - if #available(iOS 15, macOS 12, *) { - CachedAsyncImage(url: chapter.image) { image in - image - .resizable() - } placeholder: { - Rectangle().foregroundColor(Color("PlaceholderColor")) - } - } else { - WebImage(url: chapter.image) + if #available(iOS 15, macOS 12, *) { + CachedAsyncImage(url: chapter.image) { image in + image .resizable() - .placeholder { - ProgressView() - } - .indicator(.activity) + } placeholder: { + Rectangle().foregroundColor(Color("PlaceholderColor")) } + } else { + WebImage(url: chapter.image) + .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 } - #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 { diff --git a/Shared/Videos/VideoBanner.swift b/Shared/Videos/VideoBanner.swift index 13e62e6c..8c175fec 100644 --- a/Shared/Videos/VideoBanner.swift +++ b/Shared/Videos/VideoBanner.swift @@ -73,30 +73,35 @@ 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 - .resizable() - } placeholder: { - Rectangle().foregroundColor(Color("PlaceholderColor")) - } - } else { - WebImage(url: url) + if #available(iOS 15, macOS 12, *) { + CachedAsyncImage(url: url) { image in + image .resizable() - .placeholder { - ProgressView() - } - .indicator(.activity) + } placeholder: { + Rectangle().foregroundColor(Color("PlaceholderColor")) } + #if os(tvOS) + .frame(width: thumbnailWidth, height: 140) + .mask(RoundedRectangle(cornerRadius: 12)) + #else + .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 } - #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 { diff --git a/Shared/Videos/VideoCell.swift b/Shared/Videos/VideoCell.swift index 0e0383bb..501b5b17 100644 --- a/Shared/Videos/VideoCell.swift +++ b/Shared/Videos/VideoCell.swift @@ -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 } } - #if os(tvOS) - .frame(minHeight: 320) - #endif .mask(RoundedRectangle(cornerRadius: thumbnailRoundingCornerRadius)) .modifier(AspectRatioModifier()) } diff --git a/Shared/Views/ChannelCell.swift b/Shared/Views/ChannelCell.swift index 6c5b8fb3..cf526632 100644 --- a/Shared/Views/ChannelCell.swift +++ b/Shared/Views/ChannelCell.swift @@ -38,26 +38,23 @@ struct ChannelCell: View { .opacity(0.6) } .foregroundColor(.secondary) - - Group { - if #available(iOS 15, macOS 12, *) { - CachedAsyncImage(url: channel.thumbnailURL) { image in - image - .resizable() - } placeholder: { - Rectangle().foregroundColor(Color("PlaceholderColor")) - } - } else { - WebImage(url: channel.thumbnailURL) + if #available(iOS 15, macOS 12, *) { + CachedAsyncImage(url: channel.thumbnailURL) { image in + image .resizable() - .placeholder { - Rectangle().fill(Color("PlaceholderColor")) - } - .indicator(.activity) + } placeholder: { + Rectangle().foregroundColor(Color("PlaceholderColor")) } + } else { + WebImage(url: channel.thumbnailURL) + .resizable() + .placeholder { + Rectangle().fill(Color("PlaceholderColor")) + } + .indicator(.activity) + .frame(width: 88, height: 88) + .clipShape(Circle()) } - .frame(width: 88, height: 88) - .clipShape(Circle()) DetailBadge(text: channel.name, style: .prominent) diff --git a/Shared/Views/ChannelPlaylistCell.swift b/Shared/Views/ChannelPlaylistCell.swift index c2399f7e..9e7bc0a5 100644 --- a/Shared/Views/ChannelPlaylistCell.swift +++ b/Shared/Views/ChannelPlaylistCell.swift @@ -38,26 +38,23 @@ struct ChannelPlaylistCell: View { } .foregroundColor(.secondary) - Group { - if #available(iOS 15, macOS 12, *) { - CachedAsyncImage(url: playlist.thumbnailURL) { image in - image - .resizable() - } placeholder: { - Rectangle().foregroundColor(Color("PlaceholderColor")) - } - } else { - WebImage(url: playlist.thumbnailURL) + if #available(iOS 15, macOS 12, *) { + CachedAsyncImage(url: playlist.thumbnailURL) { image in + image .resizable() - .placeholder { - Rectangle().fill(Color("PlaceholderColor")) - } - .indicator(.activity) + } placeholder: { + Rectangle().foregroundColor(Color("PlaceholderColor")) } + } else { + WebImage(url: playlist.thumbnailURL) + .resizable() + .placeholder { + Rectangle().fill(Color("PlaceholderColor")) + } + .indicator(.activity) + .frame(width: 165, height: 88) + .clipShape(RoundedRectangle(cornerRadius: 10)) } - .frame(width: 165, height: 88) - .clipShape(RoundedRectangle(cornerRadius: 10)) - Group { DetailBadge(text: playlist.title, style: .prominent) .lineLimit(2)