From 718f5b4a75580cf93fc32ee373b92181c38cb037 Mon Sep 17 00:00:00 2001 From: cranci1 <100066266+cranci1@users.noreply.github.com> Date: Mon, 16 Jun 2025 09:45:37 +0200 Subject: [PATCH] Organized sttufs + maybe testflight build now --- .../ar.lproj/Localizable.strings | 0 .../cz.lproj/Localizable.strings | 0 .../en.lproj/Localizable.strings | 0 .../es.lproj/Localizable.strings | 0 .../fr.lproj/Localizable.strings | 0 .../nl.lproj/Localizable.strings | 0 .../nn.lproj/Localizable.strings | 0 .../ru.lproj/Localizable.strings | 0 .../AniList/Auth/Anilist-Login.swift | 0 .../AniList/Auth/Anilist-Token.swift | 0 .../Mutations/AniListPushUpdates.swift | 0 .../TMDB/TMDB-FetchID.swift | 0 .../Trakt/Auth/Trakt-Login.swift | 0 .../Trakt/Auth/Trakt-Token.swift | 0 .../Trakt/Mutations/TraktPushUpdates.swift | 0 Sulfur.xcodeproj/project.pbxproj | 74 ++++++++++--------- 16 files changed, 41 insertions(+), 33 deletions(-) rename Sora/{ => Localization}/ar.lproj/Localizable.strings (100%) rename Sora/{ => Localization}/cz.lproj/Localizable.strings (100%) rename Sora/{ => Localization}/en.lproj/Localizable.strings (100%) rename Sora/{ => Localization}/es.lproj/Localizable.strings (100%) rename Sora/{ => Localization}/fr.lproj/Localizable.strings (100%) rename Sora/{ => Localization}/nl.lproj/Localizable.strings (100%) rename Sora/{ => Localization}/nn.lproj/Localizable.strings (100%) rename Sora/{ => Localization}/ru.lproj/Localizable.strings (100%) rename Sora/{Tracking Services => Tracking & Metadata}/AniList/Auth/Anilist-Login.swift (100%) rename Sora/{Tracking Services => Tracking & Metadata}/AniList/Auth/Anilist-Token.swift (100%) rename Sora/{Tracking Services => Tracking & Metadata}/AniList/Mutations/AniListPushUpdates.swift (100%) rename Sora/{Tracking Services => Tracking & Metadata}/TMDB/TMDB-FetchID.swift (100%) rename Sora/{Tracking Services => Tracking & Metadata}/Trakt/Auth/Trakt-Login.swift (100%) rename Sora/{Tracking Services => Tracking & Metadata}/Trakt/Auth/Trakt-Token.swift (100%) rename Sora/{Tracking Services => Tracking & Metadata}/Trakt/Mutations/TraktPushUpdates.swift (100%) diff --git a/Sora/ar.lproj/Localizable.strings b/Sora/Localization/ar.lproj/Localizable.strings similarity index 100% rename from Sora/ar.lproj/Localizable.strings rename to Sora/Localization/ar.lproj/Localizable.strings diff --git a/Sora/cz.lproj/Localizable.strings b/Sora/Localization/cz.lproj/Localizable.strings similarity index 100% rename from Sora/cz.lproj/Localizable.strings rename to Sora/Localization/cz.lproj/Localizable.strings diff --git a/Sora/en.lproj/Localizable.strings b/Sora/Localization/en.lproj/Localizable.strings similarity index 100% rename from Sora/en.lproj/Localizable.strings rename to Sora/Localization/en.lproj/Localizable.strings diff --git a/Sora/es.lproj/Localizable.strings b/Sora/Localization/es.lproj/Localizable.strings similarity index 100% rename from Sora/es.lproj/Localizable.strings rename to Sora/Localization/es.lproj/Localizable.strings diff --git a/Sora/fr.lproj/Localizable.strings b/Sora/Localization/fr.lproj/Localizable.strings similarity index 100% rename from Sora/fr.lproj/Localizable.strings rename to Sora/Localization/fr.lproj/Localizable.strings diff --git a/Sora/nl.lproj/Localizable.strings b/Sora/Localization/nl.lproj/Localizable.strings similarity index 100% rename from Sora/nl.lproj/Localizable.strings rename to Sora/Localization/nl.lproj/Localizable.strings diff --git a/Sora/nn.lproj/Localizable.strings b/Sora/Localization/nn.lproj/Localizable.strings similarity index 100% rename from Sora/nn.lproj/Localizable.strings rename to Sora/Localization/nn.lproj/Localizable.strings diff --git a/Sora/ru.lproj/Localizable.strings b/Sora/Localization/ru.lproj/Localizable.strings similarity index 100% rename from Sora/ru.lproj/Localizable.strings rename to Sora/Localization/ru.lproj/Localizable.strings diff --git a/Sora/Tracking Services/AniList/Auth/Anilist-Login.swift b/Sora/Tracking & Metadata/AniList/Auth/Anilist-Login.swift similarity index 100% rename from Sora/Tracking Services/AniList/Auth/Anilist-Login.swift rename to Sora/Tracking & Metadata/AniList/Auth/Anilist-Login.swift diff --git a/Sora/Tracking Services/AniList/Auth/Anilist-Token.swift b/Sora/Tracking & Metadata/AniList/Auth/Anilist-Token.swift similarity index 100% rename from Sora/Tracking Services/AniList/Auth/Anilist-Token.swift rename to Sora/Tracking & Metadata/AniList/Auth/Anilist-Token.swift diff --git a/Sora/Tracking Services/AniList/Mutations/AniListPushUpdates.swift b/Sora/Tracking & Metadata/AniList/Mutations/AniListPushUpdates.swift similarity index 100% rename from Sora/Tracking Services/AniList/Mutations/AniListPushUpdates.swift rename to Sora/Tracking & Metadata/AniList/Mutations/AniListPushUpdates.swift diff --git a/Sora/Tracking Services/TMDB/TMDB-FetchID.swift b/Sora/Tracking & Metadata/TMDB/TMDB-FetchID.swift similarity index 100% rename from Sora/Tracking Services/TMDB/TMDB-FetchID.swift rename to Sora/Tracking & Metadata/TMDB/TMDB-FetchID.swift diff --git a/Sora/Tracking Services/Trakt/Auth/Trakt-Login.swift b/Sora/Tracking & Metadata/Trakt/Auth/Trakt-Login.swift similarity index 100% rename from Sora/Tracking Services/Trakt/Auth/Trakt-Login.swift rename to Sora/Tracking & Metadata/Trakt/Auth/Trakt-Login.swift diff --git a/Sora/Tracking Services/Trakt/Auth/Trakt-Token.swift b/Sora/Tracking & Metadata/Trakt/Auth/Trakt-Token.swift similarity index 100% rename from Sora/Tracking Services/Trakt/Auth/Trakt-Token.swift rename to Sora/Tracking & Metadata/Trakt/Auth/Trakt-Token.swift diff --git a/Sora/Tracking Services/Trakt/Mutations/TraktPushUpdates.swift b/Sora/Tracking & Metadata/Trakt/Mutations/TraktPushUpdates.swift similarity index 100% rename from Sora/Tracking Services/Trakt/Mutations/TraktPushUpdates.swift rename to Sora/Tracking & Metadata/Trakt/Mutations/TraktPushUpdates.swift diff --git a/Sulfur.xcodeproj/project.pbxproj b/Sulfur.xcodeproj/project.pbxproj index 93abb53..4b9be87 100644 --- a/Sulfur.xcodeproj/project.pbxproj +++ b/Sulfur.xcodeproj/project.pbxproj @@ -60,6 +60,7 @@ 133D7C932D2BE2640075467E /* Modules.swift in Sources */ = {isa = PBXBuildFile; fileRef = 133D7C892D2BE2640075467E /* Modules.swift */; }; 133D7C942D2BE2640075467E /* JSController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 133D7C8B2D2BE2640075467E /* JSController.swift */; }; 133F55BB2D33B55100E08EEA /* LibraryManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 133F55BA2D33B55100E08EEA /* LibraryManager.swift */; }; + 13530BDF2E0002790048B7DE /* SoraCore in Frameworks */ = {isa = PBXBuildFile; productRef = 13530BDE2E0002790048B7DE /* SoraCore */; }; 1359ED142D76F49900C13034 /* finTopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1359ED132D76F49900C13034 /* finTopView.swift */; }; 135CCBE22D4D1138008B9C0E /* SettingsViewPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 135CCBE12D4D1138008B9C0E /* SettingsViewPlayer.swift */; }; 13637B8A2DE0EA1100BDA2FC /* UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13637B892DE0EA1100BDA2FC /* UserDefaults.swift */; }; @@ -69,7 +70,6 @@ 138AA1B82D2D66FD0021F9DF /* EpisodeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 138AA1B62D2D66FD0021F9DF /* EpisodeCell.swift */; }; 138AA1B92D2D66FD0021F9DF /* CircularProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 138AA1B72D2D66FD0021F9DF /* CircularProgressBar.swift */; }; 138FE1D02DECA00D00936D81 /* TMDB-FetchID.swift in Sources */ = {isa = PBXBuildFile; fileRef = 138FE1CF2DECA00D00936D81 /* TMDB-FetchID.swift */; }; - 138FF5642DFB17FF00083087 /* SoraCore in Frameworks */ = {isa = PBXBuildFile; productRef = 138FF5632DFB17FF00083087 /* SoraCore */; }; 1398FB3F2DE4E161004D3F5F /* SettingsViewAbout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1398FB3E2DE4E161004D3F5F /* SettingsViewAbout.swift */; }; 139935662D468C450065CEFF /* ModuleManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 139935652D468C450065CEFF /* ModuleManager.swift */; }; 1399FAD42D3AB38C00E97C31 /* SettingsViewLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1399FAD32D3AB38C00E97C31 /* SettingsViewLogger.swift */; }; @@ -221,7 +221,7 @@ files = ( 13367ECC2DF70698009CB33F /* Nuke in Frameworks */, 13637B902DE0ECD200BDA2FC /* Drops in Frameworks */, - 138FF5642DFB17FF00083087 /* SoraCore in Frameworks */, + 13530BDF2E0002790048B7DE /* SoraCore in Frameworks */, 13637B932DE0ECDB00BDA2FC /* MarqueeLabel in Frameworks */, 13367ECE2DF70698009CB33F /* NukeUI in Frameworks */, ); @@ -359,14 +359,14 @@ path = Sora/Utils/WebAuthentication; sourceTree = SOURCE_ROOT; }; - 13103E802D589D6C000F0673 /* Tracking Services */ = { + 13103E802D589D6C000F0673 /* Tracking & Metadata */ = { isa = PBXGroup; children = ( - 138FE1CE2DEC9FFA00936D81 /* TMDB */, 13E62FBF2DABC3A20007E259 /* Trakt */, + 138FE1CE2DEC9FFA00936D81 /* TMDB */, 13103E812D589D77000F0673 /* AniList */, ); - path = "Tracking Services"; + path = "Tracking & Metadata"; sourceTree = ""; }; 13103E812D589D77000F0673 /* AniList */ = { @@ -435,23 +435,16 @@ 133D7C6C2D2BE2500075467E /* Sora */ = { isa = PBXGroup; children = ( - 04A1B73B2DFF39EB0064688A /* nn.lproj */, - 0409FE8B2DFF2886000DB00C /* ru.lproj */, - 0409FE832DFF0870000DB00C /* cz.lproj */, - 0409FE862DFF0870000DB00C /* es.lproj */, - 0488FA9B2DFDF385007575E1 /* ar.lproj */, - 0488FA972DFDF334007575E1 /* fr.lproj */, - 0488FA912DFDE724007575E1 /* en.lproj */, - 0488FA942DFDE724007575E1 /* nl.lproj */, - 130C6BF82D53A4C200DC1432 /* Sora.entitlements */, - 13DC0C412D2EC9BA00D0F966 /* Info.plist */, - 13103E802D589D6C000F0673 /* Tracking Services */, + 13103E802D589D6C000F0673 /* Tracking & Metadata */, + 13530BE02E00028E0048B7DE /* Localization */, 133CF6A92DFEBEAB00BD13F9 /* MediaUtils */, 133D7C7B2D2BE2630075467E /* Views */, 133D7C852D2BE2640075467E /* Utils */, + 13DC0C412D2EC9BA00D0F966 /* Info.plist */, 133D7C6D2D2BE2500075467E /* SoraApp.swift */, - 133D7C6F2D2BE2500075467E /* ContentView.swift */, 133D7C712D2BE2520075467E /* Assets.xcassets */, + 133D7C6F2D2BE2500075467E /* ContentView.swift */, + 130C6BF82D53A4C200DC1432 /* Sora.entitlements */, 133D7C732D2BE2520075467E /* Preview Content */, ); path = Sora; @@ -507,11 +500,11 @@ 133D7C852D2BE2640075467E /* Utils */ = { isa = PBXGroup; children = ( + 04F08EDA2DE10BE3006B29D9 /* ProgressiveBlurView */, 130326B42DF979A300AEF610 /* WebAuthentication */, 0457C5962DE7712A000AFBD9 /* ViewModifiers */, 04F08EE02DE10C22006B29D9 /* Models */, 04F08EDD2DE10C05006B29D9 /* TabBar */, - 04F08EDA2DE10BE3006B29D9 /* ProgressiveBlurView */, 13D842532D45266900EBBFA6 /* Drops */, 1399FAD12D3AB33D00E97C31 /* Logger */, 133D7C882D2BE2640075467E /* Modules */, @@ -586,6 +579,21 @@ path = Downloads; sourceTree = ""; }; + 13530BE02E00028E0048B7DE /* Localization */ = { + isa = PBXGroup; + children = ( + 04A1B73B2DFF39EB0064688A /* nn.lproj */, + 0409FE8B2DFF2886000DB00C /* ru.lproj */, + 0409FE832DFF0870000DB00C /* cz.lproj */, + 0409FE862DFF0870000DB00C /* es.lproj */, + 0488FA9B2DFDF385007575E1 /* ar.lproj */, + 0488FA972DFDF334007575E1 /* fr.lproj */, + 0488FA912DFDE724007575E1 /* en.lproj */, + 0488FA942DFDE724007575E1 /* nl.lproj */, + ); + path = Localization; + sourceTree = ""; + }; 1384DCDF2D89BE870094797A /* Helpers */ = { isa = PBXGroup; children = ( @@ -758,7 +766,7 @@ 13637B922DE0ECDB00BDA2FC /* MarqueeLabel */, 13367ECB2DF70698009CB33F /* Nuke */, 13367ECD2DF70698009CB33F /* NukeUI */, - 138FF5632DFB17FF00083087 /* SoraCore */, + 13530BDE2E0002790048B7DE /* SoraCore */, ); productName = Sora; productReference = 133D7C6A2D2BE2500075467E /* Sulfur.app */; @@ -799,7 +807,7 @@ 13637B8E2DE0ECD200BDA2FC /* XCRemoteSwiftPackageReference "Drops" */, 13637B912DE0ECDB00BDA2FC /* XCRemoteSwiftPackageReference "MarqueeLabel" */, 13367ECA2DF70698009CB33F /* XCRemoteSwiftPackageReference "Nuke" */, - 138FF5622DFB17FF00083087 /* XCRemoteSwiftPackageReference "SoraCore" */, + 13530BDD2E0002790048B7DE /* XCRemoteSwiftPackageReference "SoraCore" */, ); productRefGroup = 133D7C6B2D2BE2500075467E /* Products */; projectDirPath = ""; @@ -1247,6 +1255,14 @@ kind = branch; }; }; + 13530BDD2E0002790048B7DE /* XCRemoteSwiftPackageReference "SoraCore" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/cranci1/SoraCore"; + requirement = { + branch = main; + kind = branch; + }; + }; 13637B8E2DE0ECD200BDA2FC /* XCRemoteSwiftPackageReference "Drops" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/omaralbeik/Drops.git"; @@ -1263,14 +1279,6 @@ kind = branch; }; }; - 138FF5622DFB17FF00083087 /* XCRemoteSwiftPackageReference "SoraCore" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/cranci1/SoraCore"; - requirement = { - branch = main; - kind = branch; - }; - }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -1284,6 +1292,11 @@ package = 13367ECA2DF70698009CB33F /* XCRemoteSwiftPackageReference "Nuke" */; productName = NukeUI; }; + 13530BDE2E0002790048B7DE /* SoraCore */ = { + isa = XCSwiftPackageProductDependency; + package = 13530BDD2E0002790048B7DE /* XCRemoteSwiftPackageReference "SoraCore" */; + productName = SoraCore; + }; 13637B8F2DE0ECD200BDA2FC /* Drops */ = { isa = XCSwiftPackageProductDependency; package = 13637B8E2DE0ECD200BDA2FC /* XCRemoteSwiftPackageReference "Drops" */; @@ -1294,11 +1307,6 @@ package = 13637B912DE0ECDB00BDA2FC /* XCRemoteSwiftPackageReference "MarqueeLabel" */; productName = MarqueeLabel; }; - 138FF5632DFB17FF00083087 /* SoraCore */ = { - isa = XCSwiftPackageProductDependency; - package = 138FF5622DFB17FF00083087 /* XCRemoteSwiftPackageReference "SoraCore" */; - productName = SoraCore; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 133D7C622D2BE2500075467E /* Project object */;