Creepso/Sora
1
0
Fork 0
mirror of https://github.com/cranci1/Sora.git synced 2026-03-11 17:45:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tetst

Browse source
This commit is contained in:
cranci1 2025-06-09 14:10:58 +02:00
parent 785297cd2a
commit 65f1fcf0d4
15 changed files with 81 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Sora/Utils/Modules/ModuleAdditionSettingsView.swift
View file

@ -45,7 +45,7 @@ struct ModuleAdditionSettingsView: View {
VStack(spacing: 24) {
if let metadata = moduleMetadata {
VStack(spacing: 0) {
LazyImage(source: URL(string: metadata.iconUrl)) { state in
LazyImage(url: URL(string: metadata.iconUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()
@ -72,7 +72,7 @@ struct ModuleAdditionSettingsView: View {
.padding(.top, 6)
HStack(spacing: 10) {
LazyImage(source: URL(string: metadata.author.icon)) { state in
LazyImage(url: URL(string: metadata.author.icon)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()

8
Sora/Views/DownloadView.swift
View file

@ -741,7 +741,7 @@ struct EnhancedActiveDownloadCard: View {
HStack(spacing: 16) {
Group {
if let imageURL = download.imageURL {
LazyImage(source: imageURL) { state in
LazyImage(url: imageURL) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()
@ -904,7 +904,7 @@ struct EnhancedDownloadGroupCard: View {
HStack(spacing: 16) {
Group {
if let posterURL = group.posterURL {
LazyImage(source: posterURL) { state in
LazyImage(url: posterURL) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()
@ -1008,7 +1008,7 @@ struct EnhancedShowEpisodesView: View {
HStack(alignment: .top, spacing: 20) {
Group {
if let posterURL = group.posterURL {
LazyImage(source: posterURL) { state in
LazyImage(url: posterURL) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()
@ -1200,7 +1200,7 @@ struct EnhancedEpisodeRow: View {
HStack(spacing: 16) {
Group {
if let backdropURL = asset.metadata?.backdropURL ?? asset.metadata?.posterURL {
LazyImage(source: backdropURL) { state in
LazyImage(url: backdropURL) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()

4
Sora/Views/LibraryView/AllBookmarks.swift
View file

@ -59,7 +59,7 @@ struct BookmarkCell: View {
var body: some View {
if let module = moduleManager.modules.first(where: { $0.id.uuidString == bookmark.moduleId }) {
ZStack {
LazyImage(source: URL(string: bookmark.imageUrl)) { state in
LazyImage(url: URL(string: bookmark.imageUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()
@ -79,7 +79,7 @@ struct BookmarkCell: View {
.fill(Color.black.opacity(0.5))
.frame(width: 28, height: 28)
.overlay(
LazyImage(source: URL(string: module.metadata.iconUrl)) { state in
LazyImage(url: URL(string: module.metadata.iconUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()

4
Sora/Views/LibraryView/AllWatching.swift
View file

@ -206,7 +206,7 @@ struct FullWidthContinueWatchingCell: View {
}) {
GeometryReader { geometry in
ZStack(alignment: .bottomLeading) {
LazyImage(source: URL(string: item.imageUrl.isEmpty ? "https://raw.githubusercontent.com/cranci1/Sora/refs/heads/main/assets/banner2.png" : item.imageUrl)) { state in
LazyImage(url: URL(string: item.imageUrl.isEmpty ? "https://raw.githubusercontent.com/cranci1/Sora/refs/heads/main/assets/banner2.png" : item.imageUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()
@ -268,7 +268,7 @@ struct FullWidthContinueWatchingCell: View {
.fill(Color.black.opacity(0.5))
.frame(width: 28, height: 28)
.overlay(
LazyImage(source: URL(string: item.module.metadata.iconUrl)) { state in
LazyImage(url: URL(string: item.module.metadata.iconUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()

8
Sora/Views/LibraryView/LibraryView.swift
View file

@ -286,7 +286,7 @@ struct ContinueWatchingCell: View {
}
}) {
ZStack(alignment: .bottomLeading) {
LazyImage(source: URL(string: item.imageUrl.isEmpty ? "https://raw.githubusercontent.com/cranci1/Sora/refs/heads/main/assets/banner2.png" : item.imageUrl)) { state in
LazyImage(url: URL(string: item.imageUrl.isEmpty ? "https://raw.githubusercontent.com/cranci1/Sora/refs/heads/main/assets/banner2.png" : item.imageUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()
@ -357,7 +357,7 @@ struct ContinueWatchingCell: View {
.fill(Color.black.opacity(0.5))
.frame(width: 28, height: 28)
.overlay(
LazyImage(source: URL(string: item.module.metadata.iconUrl)) { state in
LazyImage(url: URL(string: item.module.metadata.iconUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()
@ -542,7 +542,7 @@ struct BookmarkItemView: View {
isDetailActive = true
}) {
ZStack {
LazyImage(source: URL(string: item.imageUrl)) { state in
LazyImage(url: URL(string: item.imageUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()
@ -563,7 +563,7 @@ struct BookmarkItemView: View {
.fill(Color.black.opacity(0.5))
.frame(width: 28, height: 28)
.overlay(
LazyImage(source: URL(string: module.metadata.iconUrl)) { state in
LazyImage(url: URL(string: module.metadata.iconUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()

2
Sora/Views/MediaInfoView/AnilistMatchPopupView.swift
View file

@ -61,7 +61,7 @@ struct AnilistMatchPopupView: View {
HStack(spacing: 12) {
if let cover = result["cover"] as? String,
let url = URL(string: cover) {
LazyImage(source: url) { state in
LazyImage(url: url) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()

2
Sora/Views/MediaInfoView/EpisodeCell/EpisodeCell.swift
View file

@ -264,7 +264,7 @@ struct EpisodeCell: View {
private var episodeThumbnail: some View {
ZStack {
if let url = URL(string: episodeImageUrl.isEmpty ? defaultBannerImage : episodeImageUrl) {
LazyImage(source: url) { state in
LazyImage(url: url) { state in
if let image = state.imageContainer?.image {
Image(uiImage: image)
.resizable()

2
Sora/Views/MediaInfoView/MediaInfoView.swift
View file

@ -240,7 +240,7 @@ struct MediaInfoView: View {
private var mainScrollView: some View {
ScrollView {
ZStack(alignment: .top) {
LazyImage(source: URL(string: imageUrl)) { state in
LazyImage(url: URL(string: imageUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()

2
Sora/Views/SearchView/SearchResultsGrid.swift
View file

@ -32,7 +32,7 @@ struct SearchResultsGrid: View {
ForEach(items) { item in
NavigationLink(destination: MediaInfoView(title: item.title, imageUrl: item.imageUrl, href: item.href, module: selectedModule)) {
ZStack {
LazyImage(source: URL(string: item.imageUrl)) { state in
LazyImage(url: URL(string: item.imageUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()

4
Sora/Views/SearchView/SearchViewComponents.swift
View file

@ -27,7 +27,7 @@ struct ModuleSelectorMenu: View {
onModuleSelected(module.id.uuidString)
} label: {
HStack {
LazyImage(source: URL(string: module.metadata.iconUrl)) { state in
LazyImage(url: URL(string: module.metadata.iconUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()
@ -56,7 +56,7 @@ struct ModuleSelectorMenu: View {
Text(selectedModule.metadata.sourceName)
.font(.headline)
.foregroundColor(.primary)
LazyImage(source: URL(string: selectedModule.metadata.iconUrl)) { state in
LazyImage(url: URL(string: selectedModule.metadata.iconUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()

6
Sora/Views/SettingsView/SettingsSubViews/SettingsViewAbout.swift
View file

@ -66,7 +66,7 @@ struct SettingsViewAbout: View {
VStack(spacing: 24) {
SettingsSection(title: "App Info", footer: "Sora/Sulfur will always remain free with no ADs!") {
HStack(alignment: .center, spacing: 16) {
LazyImage(source: URL(string: "https://raw.githubusercontent.com/cranci1/Sora/refs/heads/dev/Sora/Assets.xcassets/AppIcons/AppIcon_Default.appiconset/darkmode.png")) { state in
LazyImage(url: URL(string: "https://raw.githubusercontent.com/cranci1/Sora/refs/heads/dev/Sora/Assets.xcassets/AppIcons/AppIcon_Default.appiconset/darkmode.png")) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()
@ -100,7 +100,7 @@ struct SettingsViewAbout: View {
}
}) {
HStack {
LazyImage(source: URL(string: "https://avatars.githubusercontent.com/u/100066266?v=4")) { state in
LazyImage(url: URL(string: "https://avatars.githubusercontent.com/u/100066266?v=4")) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()
@ -213,7 +213,7 @@ struct ContributorView: View {
}
}) {
HStack {
LazyImage(source: URL(string: contributor.avatarUrl)) { state in
LazyImage(url: URL(string: contributor.avatarUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()

2
Sora/Views/SettingsView/SettingsSubViews/SettingsViewModule.swift
View file

@ -67,7 +67,7 @@ fileprivate struct ModuleListItemView: View {
var body: some View {
VStack(spacing: 0) {
HStack {
LazyImage(source: URL(string: module.metadata.iconUrl)) { state in
LazyImage(url: URL(string: module.metadata.iconUrl)) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()

4
Sora/Views/SettingsView/SettingsSubViews/SettingsViewTrackers.swift
View file

@ -120,7 +120,7 @@ struct SettingsViewTrackers: View {
SettingsSection(title: "AniList") {
VStack(spacing: 0) {
HStack(alignment: .center, spacing: 10) {
LazyImage(source: URL(string: "https://raw.githubusercontent.com/cranci1/Ryu/2f10226aa087154974a70c1ec78aa83a47daced9/Ryu/Assets.xcassets/Listing/Anilist.imageset/anilist.png")) { state in
LazyImage(url: URL(string: "https://raw.githubusercontent.com/cranci1/Ryu/2f10226aa087154974a70c1ec78aa83a47daced9/Ryu/Assets.xcassets/Listing/Anilist.imageset/anilist.png")) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()
@ -215,7 +215,7 @@ struct SettingsViewTrackers: View {
SettingsSection(title: "Trakt") {
VStack(spacing: 0) {
HStack(alignment: .center, spacing: 10) {
LazyImage(source: URL(string: "https://static-00.iconduck.com/assets.00/trakt-icon-2048x2048-2633ksxg.png")) { state in
LazyImage(url: URL(string: "https://static-00.iconduck.com/assets.00/trakt-icon-2048x2048-2633ksxg.png")) { state in
if let uiImage = state.imageContainer?.image {
Image(uiImage: uiImage)
.resizable()

44
Sulfur.xcodeproj/project.pbxproj
View file

@ -32,6 +32,8 @@
132AF1212D99951700A0140B /* JSController-Streams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 132AF1202D99951700A0140B /* JSController-Streams.swift */; };
132AF1232D9995C300A0140B /* JSController-Details.swift in Sources */ = {isa = PBXBuildFile; fileRef = 132AF1222D9995C300A0140B /* JSController-Details.swift */; };
132AF1252D9995F900A0140B /* JSController-Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 132AF1242D9995F900A0140B /* JSController-Search.swift */; };
13367ECC2DF70698009CB33F /* Nuke in Frameworks */ = {isa = PBXBuildFile; productRef = 13367ECB2DF70698009CB33F /* Nuke */; };
13367ECE2DF70698009CB33F /* NukeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 13367ECD2DF70698009CB33F /* NukeUI */; };
133D7C6E2D2BE2500075467E /* SoraApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 133D7C6D2D2BE2500075467E /* SoraApp.swift */; };
133D7C702D2BE2500075467E /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 133D7C6F2D2BE2500075467E /* ContentView.swift */; };
133D7C722D2BE2520075467E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 133D7C712D2BE2520075467E /* Assets.xcassets */; };
@ -60,7 +62,6 @@
1399FAD62D3AB3DB00E97C31 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1399FAD52D3AB3DB00E97C31 /* Logger.swift */; };
13B77E202DA457AA00126FDF /* AniListPushUpdates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13B77E1F2DA457AA00126FDF /* AniListPushUpdates.swift */; };
13B7F4C12D58FFDD0045714A /* Shimmer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13B7F4C02D58FFDD0045714A /* Shimmer.swift */; };
13BC689F2DF61327009A0651 /* NukeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 13BC689E2DF61327009A0651 /* NukeUI */; };
13C0E5EA2D5F85EA00E7F619 /* ContinueWatchingManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13C0E5E92D5F85EA00E7F619 /* ContinueWatchingManager.swift */; };
13C0E5EC2D5F85F800E7F619 /* ContinueWatchingItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13C0E5EB2D5F85F800E7F619 /* ContinueWatchingItem.swift */; };
13CBA0882D60F19C00EFE70A /* VTTSubtitlesLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13CBA0872D60F19C00EFE70A /* VTTSubtitlesLoader.swift */; };
@ -191,9 +192,10 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
13367ECC2DF70698009CB33F /* Nuke in Frameworks */,
13637B902DE0ECD200BDA2FC /* Drops in Frameworks */,
13637B932DE0ECDB00BDA2FC /* MarqueeLabel in Frameworks */,
13BC689F2DF61327009A0651 /* NukeUI in Frameworks */,
13367ECE2DF70698009CB33F /* NukeUI in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -616,7 +618,8 @@
packageProductDependencies = (
13637B8F2DE0ECD200BDA2FC /* Drops */,
13637B922DE0ECDB00BDA2FC /* MarqueeLabel */,
13BC689E2DF61327009A0651 /* NukeUI */,
13367ECB2DF70698009CB33F /* Nuke */,
13367ECD2DF70698009CB33F /* NukeUI */,
);
productName = Sora;
productReference = 133D7C6A2D2BE2500075467E /* Sulfur.app */;
@ -648,7 +651,7 @@
packageReferences = (
13637B8E2DE0ECD200BDA2FC /* XCRemoteSwiftPackageReference "Drops" */,
13637B912DE0ECDB00BDA2FC /* XCRemoteSwiftPackageReference "MarqueeLabel" */,
13BC689D2DF61327009A0651 /* XCRemoteSwiftPackageReference "NukeUI" */,
13367ECA2DF70698009CB33F /* XCRemoteSwiftPackageReference "Nuke" */,
);
productRefGroup = 133D7C6B2D2BE2500075467E /* Products */;
projectDirPath = "";
@ -994,6 +997,14 @@
/* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */
13367ECA2DF70698009CB33F /* XCRemoteSwiftPackageReference "Nuke" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/kean/Nuke.git";
requirement = {
branch = main;
kind = branch;
};
};
13637B8E2DE0ECD200BDA2FC /* XCRemoteSwiftPackageReference "Drops" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/omaralbeik/Drops.git";
@ -1006,21 +1017,23 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/cbpowell/MarqueeLabel";
requirement = {
kind = exactVersion;
version = 4.2.1;
};
};
13BC689D2DF61327009A0651 /* XCRemoteSwiftPackageReference "NukeUI" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/kean/NukeUI";
requirement = {
branch = main;
branch = master;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
13367ECB2DF70698009CB33F /* Nuke */ = {
isa = XCSwiftPackageProductDependency;
package = 13367ECA2DF70698009CB33F /* XCRemoteSwiftPackageReference "Nuke" */;
productName = Nuke;
};
13367ECD2DF70698009CB33F /* NukeUI */ = {
isa = XCSwiftPackageProductDependency;
package = 13367ECA2DF70698009CB33F /* XCRemoteSwiftPackageReference "Nuke" */;
productName = NukeUI;
};
13637B8F2DE0ECD200BDA2FC /* Drops */ = {
isa = XCSwiftPackageProductDependency;
package = 13637B8E2DE0ECD200BDA2FC /* XCRemoteSwiftPackageReference "Drops" */;
@ -1031,11 +1044,6 @@
package = 13637B912DE0ECDB00BDA2FC /* XCRemoteSwiftPackageReference "MarqueeLabel" */;
productName = MarqueeLabel;
};
13BC689E2DF61327009A0651 /* NukeUI */ = {
isa = XCSwiftPackageProductDependency;
package = 13BC689D2DF61327009A0651 /* XCRemoteSwiftPackageReference "NukeUI" */;
productName = NukeUI;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 133D7C622D2BE2500075467E /* Project object */;

78
Sulfur.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file

@ -1,52 +1,32 @@
{
"object": {
"pins": [
{
"package": "Drops",
"repositoryURL": "https://github.com/omaralbeik/Drops.git",
"state": {
"branch": "main",
"revision": "5824681795286c36bdc4a493081a63e64e2a064e",
"version": null
}
},
{
"package": "Gifu",
"repositoryURL": "https://github.com/kaishin/Gifu",
"state": {
"branch": null,
"revision": "82da0086dea14ca9afc9801234ad8dc4cd9e2738",
"version": "3.4.1"
}
},
{
"package": "MarqueeLabel",
"repositoryURL": "https://github.com/cbpowell/MarqueeLabel",
"state": {
"branch": null,
"revision": "cffb6938940d3242882e6a2f9170b7890a4729ea",
"version": "4.2.1"
}
},
{
"package": "Nuke",
"repositoryURL": "https://github.com/kean/Nuke.git",
"state": {
"branch": null,
"revision": "a002b7fd786f2df2ed4333fe73a9727499fd9d97",
"version": "10.11.2"
}
},
{
"package": "NukeUI",
"repositoryURL": "https://github.com/kean/NukeUI",
"state": {
"branch": "main",
"revision": "7338ed8ea76de18598bfafbca0cbdc74300a6b10",
"version": null
}
"pins" : [
{
"identity" : "drops",
"kind" : "remoteSourceControl",
"location" : "https://github.com/omaralbeik/Drops.git",
"state" : {
"branch" : "main",
"revision" : "5824681795286c36bdc4a493081a63e64e2a064e"
}
]
},
"version": 1
},
{
"identity" : "marqueelabel",
"kind" : "remoteSourceControl",
"location" : "https://github.com/cbpowell/MarqueeLabel",
"state" : {
"branch" : "master",
"revision" : "18e4787f4dc1c26d2d581c4bc9aeae34686eeeae"
}
},
{
"identity" : "nuke",
"kind" : "remoteSourceControl",
"location" : "https://github.com/kean/Nuke.git",
"state" : {
"branch" : "main",
"revision" : "c7ba4833b1b38f09e9708858aeaf91babc69f65c"
}
}
],
"version" : 2
}