Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-01-10 14:57:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add CachedAsyncImage"

Browse Source 
This reverts commit 50c77325f6.
This commit is contained in:
Arkadiusz Fal 2022-09-11 21:22:07 +02:00
parent b320ffb540
commit b94dc08b68
9 changed files with 7 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shared/Player/ChapterView.swift
View File

@ -1,4 +1,3 @@
import CachedAsyncImage
import Foundation import Foundation
import SDWebImageSwiftUI import SDWebImageSwiftUI
import SwiftUI import SwiftUI
@ -33,7 +32,7 @@ struct ChapterView: View {
@ViewBuilder func smallImage(_ chapter: Chapter) -> some View { @ViewBuilder func smallImage(_ chapter: Chapter) -> some View {
if #available(iOS 15, macOS 12, *) { if #available(iOS 15, macOS 12, *) {
CachedAsyncImage(url: chapter.image) { image in AsyncImage(url: chapter.image) { image in
image image
.resizable() .resizable()
} placeholder: { } placeholder: {

3
Shared/Player/Controls/PlayerControls.swift
View File

@ -1,4 +1,3 @@
import CachedAsyncImage
import Defaults import Defaults
import Foundation import Foundation
import SDWebImageSwiftUI import SDWebImageSwiftUI
@ -223,7 +222,7 @@ struct PlayerControls: View {
let url = thumbnails.best(video) let url = thumbnails.best(video)
{ {
if #available(iOS 15, macOS 12, *) { if #available(iOS 15, macOS 12, *) {
CachedAsyncImage(url: url) { image in AsyncImage(url: url) { image in
image image
.resizable() .resizable()
} placeholder: { } placeholder: {

3
Shared/Videos/VideoBanner.swift
View File

@ -1,4 +1,3 @@
import CachedAsyncImage
import CoreMedia import CoreMedia
import Foundation import Foundation
import SDWebImageSwiftUI import SDWebImageSwiftUI
@ -74,7 +73,7 @@ struct VideoBanner: View {
@ViewBuilder private var smallThumbnail: some View { @ViewBuilder private var smallThumbnail: some View {
let url = video?.thumbnailURL(quality: .medium) let url = video?.thumbnailURL(quality: .medium)
if #available(iOS 15, macOS 12, *) { if #available(iOS 15, macOS 12, *) {
CachedAsyncImage(url: url) { image in AsyncImage(url: url) { image in
image image
.resizable() .resizable()
} placeholder: { } placeholder: {

3
Shared/Videos/VideoCell.swift
View File

@ -1,4 +1,3 @@
import CachedAsyncImage
import CoreMedia import CoreMedia
import Defaults import Defaults
import SDWebImageSwiftUI import SDWebImageSwiftUI
@ -423,7 +422,7 @@ struct VideoCell: View {
Group { Group {
let url = thumbnails.best(video) let url = thumbnails.best(video)
if #available(iOS 15, macOS 12, *) { if #available(iOS 15, macOS 12, *) {
CachedAsyncImage(url: url) { image in AsyncImage(url: url) { image in
image image
.resizable() .resizable()
} placeholder: { } placeholder: {

3
Shared/Views/ChannelCell.swift
View File

@ -1,4 +1,3 @@
import CachedAsyncImage
import Foundation import Foundation
import SDWebImageSwiftUI import SDWebImageSwiftUI
import SwiftUI import SwiftUI
@ -39,7 +38,7 @@ struct ChannelCell: View {
} }
.foregroundColor(.secondary) .foregroundColor(.secondary)
if #available(iOS 15, macOS 12, *) { if #available(iOS 15, macOS 12, *) {
CachedAsyncImage(url: channel.thumbnailURL) { image in AsyncImage(url: channel.thumbnailURL) { image in
image image
.resizable() .resizable()
} placeholder: { } placeholder: {

3
Shared/Views/ChannelPlaylistCell.swift
View File

@ -1,4 +1,3 @@
import CachedAsyncImage
import SDWebImageSwiftUI import SDWebImageSwiftUI
import SwiftUI import SwiftUI
@ -39,7 +38,7 @@ struct ChannelPlaylistCell: View {
.foregroundColor(.secondary) .foregroundColor(.secondary)
if #available(iOS 15, macOS 12, *) { if #available(iOS 15, macOS 12, *) {
CachedAsyncImage(url: playlist.thumbnailURL) { image in AsyncImage(url: playlist.thumbnailURL) { image in
image image
.resizable() .resizable()
} placeholder: { } placeholder: {

3
Shared/Views/ControlsBar.swift
View File

@ -1,4 +1,3 @@
import CachedAsyncImage
import Defaults import Defaults
import SDWebImageSwiftUI import SDWebImageSwiftUI
import SwiftUI import SwiftUI
@ -273,7 +272,7 @@ struct ControlsBar: View {
Group { Group {
if let video = model.currentItem?.video, let url = video.channel.thumbnailURL { if let video = model.currentItem?.video, let url = video.channel.thumbnailURL {
if #available(iOS 15, macOS 12, *) { if #available(iOS 15, macOS 12, *) {
CachedAsyncImage(url: url) { image in AsyncImage(url: url) { image in
image image
.resizable() .resizable()
} placeholder: { } placeholder: {

33
Yattee.xcodeproj/project.pbxproj
View File

@ -246,9 +246,6 @@
3736A219286BB72300C9E5EE /* libharfbuzz.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3736A1FC286BB72300C9E5EE /* libharfbuzz.xcframework */; }; 3736A219286BB72300C9E5EE /* libharfbuzz.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3736A1FC286BB72300C9E5EE /* libharfbuzz.xcframework */; };
3736A21A286BB72300C9E5EE /* libmpv.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3736A1FD286BB72300C9E5EE /* libmpv.xcframework */; }; 3736A21A286BB72300C9E5EE /* libmpv.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3736A1FD286BB72300C9E5EE /* libmpv.xcframework */; };
3736A21B286BB72300C9E5EE /* libmpv.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3736A1FD286BB72300C9E5EE /* libmpv.xcframework */; }; 3736A21B286BB72300C9E5EE /* libmpv.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3736A1FD286BB72300C9E5EE /* libmpv.xcframework */; };
373AD20128BF504B00DB3ADA /* CachedAsyncImage in Frameworks */ = {isa = PBXBuildFile; productRef = 373AD20028BF504B00DB3ADA /* CachedAsyncImage */; };
373AD20328BF512400DB3ADA /* CachedAsyncImage in Frameworks */ = {isa = PBXBuildFile; productRef = 373AD20228BF512400DB3ADA /* CachedAsyncImage */; };
373AD20528BF579F00DB3ADA /* CachedAsyncImage in Frameworks */ = {isa = PBXBuildFile; productRef = 373AD20428BF579F00DB3ADA /* CachedAsyncImage */; };
373C8FE4275B955100CB5936 /* CommentsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373C8FE3275B955100CB5936 /* CommentsPage.swift */; }; 373C8FE4275B955100CB5936 /* CommentsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373C8FE3275B955100CB5936 /* CommentsPage.swift */; };
373C8FE5275B955100CB5936 /* CommentsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373C8FE3275B955100CB5936 /* CommentsPage.swift */; }; 373C8FE5275B955100CB5936 /* CommentsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373C8FE3275B955100CB5936 /* CommentsPage.swift */; };
373C8FE6275B955100CB5936 /* CommentsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373C8FE3275B955100CB5936 /* CommentsPage.swift */; }; 373C8FE6275B955100CB5936 /* CommentsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373C8FE3275B955100CB5936 /* CommentsPage.swift */; };
@ -1370,7 +1367,6 @@
375B8AB128B57F4200397B31 /* KeychainAccess in Frameworks */, 375B8AB128B57F4200397B31 /* KeychainAccess in Frameworks */,
3736A21A286BB72300C9E5EE /* libmpv.xcframework in Frameworks */, 3736A21A286BB72300C9E5EE /* libmpv.xcframework in Frameworks */,
3765917C27237D21009F956E /* PINCache in Frameworks */, 3765917C27237D21009F956E /* PINCache in Frameworks */,
373AD20328BF512400DB3ADA /* CachedAsyncImage in Frameworks */,
37BD07B72698AB2E003EBB87 /* Defaults in Frameworks */, 37BD07B72698AB2E003EBB87 /* Defaults in Frameworks */,
3736A20C286BB72300C9E5EE /* libavutil.xcframework in Frameworks */, 3736A20C286BB72300C9E5EE /* libavutil.xcframework in Frameworks */,
37FB285627220D9000A57617 /* SDWebImagePINPlugin in Frameworks */, 37FB285627220D9000A57617 /* SDWebImagePINPlugin in Frameworks */,
@ -1434,7 +1430,6 @@
3703205C27D2BAF3007A0CB8 /* SwiftyJSON in Frameworks */, 3703205C27D2BAF3007A0CB8 /* SwiftyJSON in Frameworks */,
370F4FD627CC16CB001B35DC /* libbrotlidec.1.0.9.dylib in Frameworks */, 370F4FD627CC16CB001B35DC /* libbrotlidec.1.0.9.dylib in Frameworks */,
370F4FCD27CC16CB001B35DC /* libfribidi.0.dylib in Frameworks */, 370F4FCD27CC16CB001B35DC /* libfribidi.0.dylib in Frameworks */,
373AD20528BF579F00DB3ADA /* CachedAsyncImage in Frameworks */,
370F4FE027CC16CB001B35DC /* libX11.6.dylib in Frameworks */, 370F4FE027CC16CB001B35DC /* libX11.6.dylib in Frameworks */,
370F4FD727CC16CB001B35DC /* libharfbuzz-subset.0.dylib in Frameworks */, 370F4FD727CC16CB001B35DC /* libharfbuzz-subset.0.dylib in Frameworks */,
); );
@ -1484,7 +1479,6 @@
3736A209286BB72300C9E5EE /* libcrypto.xcframework in Frameworks */, 3736A209286BB72300C9E5EE /* libcrypto.xcframework in Frameworks */,
37FB28462722054C00A57617 /* SDWebImageSwiftUI in Frameworks */, 37FB28462722054C00A57617 /* SDWebImageSwiftUI in Frameworks */,
3736A217286BB72300C9E5EE /* libavfilter.xcframework in Frameworks */, 3736A217286BB72300C9E5EE /* libavfilter.xcframework in Frameworks */,
373AD20128BF504B00DB3ADA /* CachedAsyncImage in Frameworks */,
3736A21B286BB72300C9E5EE /* libmpv.xcframework in Frameworks */, 3736A21B286BB72300C9E5EE /* libmpv.xcframework in Frameworks */,
3765917E27237D2A009F956E /* PINCache in Frameworks */, 3765917E27237D2A009F956E /* PINCache in Frameworks */,
3772003E27E8EEEB00CB2475 /* VideoToolbox.framework in Frameworks */, 3772003E27E8EEEB00CB2475 /* VideoToolbox.framework in Frameworks */,
@ -2359,7 +2353,6 @@
37EE6DC428A305AD00BFD632 /* Reachability */, 37EE6DC428A305AD00BFD632 /* Reachability */,
3799AC0828B03CED001376F9 /* ActiveLabel */, 3799AC0828B03CED001376F9 /* ActiveLabel */,
375B8AB028B57F4200397B31 /* KeychainAccess */, 375B8AB028B57F4200397B31 /* KeychainAccess */,
373AD20228BF512400DB3ADA /* CachedAsyncImage */,
); );
productName = "Yattee (iOS)"; productName = "Yattee (iOS)";
productReference = 37D4B0C92671614900C925CA /* Yattee.app */; productReference = 37D4B0C92671614900C925CA /* Yattee.app */;
@ -2397,7 +2390,6 @@
37A5DBC5285E06B100CA4DD1 /* SwiftUIPager */, 37A5DBC5285E06B100CA4DD1 /* SwiftUIPager */,
372AA413286D06A10000B1DC /* Repeat */, 372AA413286D06A10000B1DC /* Repeat */,
375B8AB628B583BD00397B31 /* KeychainAccess */, 375B8AB628B583BD00397B31 /* KeychainAccess */,
373AD20428BF579F00DB3ADA /* CachedAsyncImage */,
); );
productName = "Yattee (macOS)"; productName = "Yattee (macOS)";
productReference = 37D4B0CF2671614900C925CA /* Yattee.app */; productReference = 37D4B0CF2671614900C925CA /* Yattee.app */;
@ -2475,7 +2467,6 @@
372AA411286D06950000B1DC /* Repeat */, 372AA411286D06950000B1DC /* Repeat */,
37E80F42287B7AAF00561799 /* SwiftUIPager */, 37E80F42287B7AAF00561799 /* SwiftUIPager */,
3732BFCF28B83763009F3F4D /* KeychainAccess */, 3732BFCF28B83763009F3F4D /* KeychainAccess */,
373AD20028BF504B00DB3ADA /* CachedAsyncImage */,
); );
productName = Yattee; productName = Yattee;
productReference = 37D4B158267164AE00C925CA /* Yattee.app */; productReference = 37D4B158267164AE00C925CA /* Yattee.app */;
@ -2576,7 +2567,6 @@
37EE6DC328A305AD00BFD632 /* XCRemoteSwiftPackageReference "Reachability" */, 37EE6DC328A305AD00BFD632 /* XCRemoteSwiftPackageReference "Reachability" */,
3799AC0728B03CEC001376F9 /* XCRemoteSwiftPackageReference "ActiveLabel.swift" */, 3799AC0728B03CEC001376F9 /* XCRemoteSwiftPackageReference "ActiveLabel.swift" */,
375B8AAF28B57F4200397B31 /* XCRemoteSwiftPackageReference "KeychainAccess" */, 375B8AAF28B57F4200397B31 /* XCRemoteSwiftPackageReference "KeychainAccess" */,
373AD1FF28BF504B00DB3ADA /* XCRemoteSwiftPackageReference "swiftui-cached-async-image" */,
); );
productRefGroup = 37D4B0CA2671614900C925CA /* Products */; productRefGroup = 37D4B0CA2671614900C925CA /* Products */;
projectDirPath = ""; projectDirPath = "";
@ -4428,14 +4418,6 @@
minimumVersion = 0.6.0; minimumVersion = 0.6.0;
}; };
}; };
373AD1FF28BF504B00DB3ADA /* XCRemoteSwiftPackageReference "swiftui-cached-async-image" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/lorenzofiamingo/swiftui-cached-async-image";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.0.0;
};
};
375B8AAF28B57F4200397B31 /* XCRemoteSwiftPackageReference "KeychainAccess" */ = { 375B8AAF28B57F4200397B31 /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {
isa = XCRemoteSwiftPackageReference; isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/kishikawakatsumi/KeychainAccess.git"; repositoryURL = "https://github.com/kishikawakatsumi/KeychainAccess.git";
@ -4621,21 +4603,6 @@
package = 375B8AAF28B57F4200397B31 /* XCRemoteSwiftPackageReference "KeychainAccess" */; package = 375B8AAF28B57F4200397B31 /* XCRemoteSwiftPackageReference "KeychainAccess" */;
productName = KeychainAccess; productName = KeychainAccess;
}; };
373AD20028BF504B00DB3ADA /* CachedAsyncImage */ = {
isa = XCSwiftPackageProductDependency;
package = 373AD1FF28BF504B00DB3ADA /* XCRemoteSwiftPackageReference "swiftui-cached-async-image" */;
productName = CachedAsyncImage;
};
373AD20228BF512400DB3ADA /* CachedAsyncImage */ = {
isa = XCSwiftPackageProductDependency;
package = 373AD1FF28BF504B00DB3ADA /* XCRemoteSwiftPackageReference "swiftui-cached-async-image" */;
productName = CachedAsyncImage;
};
373AD20428BF579F00DB3ADA /* CachedAsyncImage */ = {
isa = XCSwiftPackageProductDependency;
package = 373AD1FF28BF504B00DB3ADA /* XCRemoteSwiftPackageReference "swiftui-cached-async-image" */;
productName = CachedAsyncImage;
};
375B8AB028B57F4200397B31 /* KeychainAccess */ = { 375B8AB028B57F4200397B31 /* KeychainAccess */ = {
isa = XCSwiftPackageProductDependency; isa = XCSwiftPackageProductDependency;
package = 375B8AAF28B57F4200397B31 /* XCRemoteSwiftPackageReference "KeychainAccess" */; package = 375B8AAF28B57F4200397B31 /* XCRemoteSwiftPackageReference "KeychainAccess" */;

9
Yattee.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -135,15 +135,6 @@
"version" : "1.4.4" "version" : "1.4.4"
} }
}, },
{
"identity" : "swiftui-cached-async-image",
"kind" : "remoteSourceControl",
"location" : "https://github.com/lorenzofiamingo/swiftui-cached-async-image",
"state" : {
"revision" : "467a3d17479887943ab917a379e62bbaff60ac8a",
"version" : "2.1.1"
}
},
{ {
"identity" : "swiftui-introspect", "identity" : "swiftui-introspect",
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",