v6.0.2

Lrdsnow · Lrdsnow · commit cb7ddb0769dc · 2024-11-22T23:04:27.000-08:00
diff --git a/PureKFD.xcodeproj/project.pbxproj b/PureKFD.xcodeproj/project.pbxproj
@@ -160,13 +160,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		657BA6AC2C9EDC030002FDAD /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 656C14A12C2D32D60017F279 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 65916F392C9532C3005C8462;
-			remoteInfo = SparseBox;
-		};
 		65916F3F2C9540C9005C8462 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 656C14A12C2D32D60017F279 /* Project object */;
@@ -269,20 +262,8 @@
 		65DA9E152C3100DC007D9AAA /* Popup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Popup.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
-/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		6589F2222CB1E93600F742D8 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
-			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
-			membershipExceptions = (
-				Backend/SparseRestore/exploit/__init__.py,
-				Backend/SparseRestore/exploit/backup.py,
-				Backend/SparseRestore/exploit/mbdb.py,
-			);
-			target = 65486BA92C8571A9002E2F28 /* PureRestore */;
-		};
-/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
-
 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		65486BAB2C8571A9002E2F28 /* PureRestore */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (6589F2222CB1E93600F742D8 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (Backend/SparseRestore/exploit, ); path = PureRestore; sourceTree = "<group>"; };
+		65486BAB2C8571A9002E2F28 /* PureRestore */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (Backend/SparseRestore/exploit, ); path = PureRestore; sourceTree = "<group>"; };
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -687,7 +668,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				657BA6AB2C9EDC030002FDAD /* PBXTargetDependency */,
 			);
 			name = "PureKFD noSparse";
 			packageProductDependencies = (
@@ -927,11 +907,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		657BA6AB2C9EDC030002FDAD /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 65916F392C9532C3005C8462 /* SparseBox */;
-			targetProxy = 657BA6AC2C9EDC030002FDAD /* PBXContainerItemProxy */;
-		};
 		65916F402C9540C9005C8462 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 65916F392C9532C3005C8462 /* SparseBox */;
@@ -948,6 +923,7 @@
 				CODE_SIGN_ENTITLEMENTS = PureRestore/PureRestore.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGNING_ALLOWED = NO;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
@@ -979,6 +955,7 @@
 				CODE_SIGN_ENTITLEMENTS = PureRestore/PureRestore.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGNING_ALLOWED = NO;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
@@ -1071,6 +1048,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
+				CODE_SIGNING_ALLOWED = NO;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_ENABLE_MODULES = YES;
@@ -1127,6 +1105,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGNING_ALLOWED = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 6Q625HQD73;
@@ -1166,6 +1145,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGNING_ALLOWED = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 6Q625HQD73;
@@ -1205,6 +1185,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGNING_ALLOWED = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 6Q625HQD73;
@@ -1247,6 +1228,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGNING_ALLOWED = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 6Q625HQD73;
@@ -1287,6 +1269,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGNING_ALLOWED = NO;
 				DEBUGGING_SYMBOLS = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 6Q625HQD73;
@@ -1302,6 +1285,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGNING_ALLOWED = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 6Q625HQD73;
 				OTHER_CFLAGS = "";
diff --git a/PureKFD.xcodeproj/project.xcworkspace/xcuserdata/lrdsnow.xcuserdatad/UserInterfaceState.xcuserstate b/PureKFD.xcodeproj/project.xcworkspace/xcuserdata/lrdsnow.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/PureKFD/Backend/RepoHandler.swift b/PureKFD/Backend/RepoHandler.swift
@@ -28,6 +28,7 @@ public class RepoHandler: ObservableObject {
                     URL(string: "https://raw.githubusercontent.com/dora727/doworarepo/master/Essentials/manifest.json")!, // MeowRepo - Built for PureKFD v6
                     URL(string: "https://raw.githubusercontent.com/Lrdsnow/SnowRepo/refs/heads/main/v6/repo.json")!, // SnowRepo - Built for PureKFD v6
                     URL(string: "https://raw.githubusercontent.com/jailbreakdotparty/jailbreak.party-repo/refs/heads/main/v6/repo.json")!, // Jailbreak.party - Built for PureKFD v6
+                    URL(string: "https://raw.githubusercontent.com/lunginspector/SparseTweaks/refs/heads/main/v6/repo.json")!, // SparseTweaks - Built for PureKFD v6
                     URL(string: "https://raw.githubusercontent.com/Dreel0akl/poopypoopermaybeworking/master/Essentials/manifest.json")!, // Poop Repo - Built for PureKFD
                     URL(string: "https://raw.githubusercontent.com/circularsprojects/circles-repo/main/purekfd.json")!, // Circular's Repo - Built for PureKFD
                     URL(string: "https://raw.githubusercontent.com/EPOS05/EPOSbox/main/purekfd.json")!, // EPOS Box - Built for PureKFD
@@ -53,13 +54,14 @@ public class RepoHandler: ObservableObject {
     
     func updateRepos(_ appData: AppData) {
         for url in repo_urls {
-            getRepo(url) { repo, error in
+            getRepo(url, appData) { repo, error in
                 if var repo = repo {
                     
                     var new_pkgs: [Package] = []
                     repo.packages.forEach({ pkg in
                         var temp_pkg = pkg
                         temp_pkg.feature = repo.featured?.first(where: { $0.bundleid == pkg.bundleid })
+                        temp_pkg._liveAccent = appData.getLiveAccent(temp_pkg.bundleid, temp_pkg.icon)
                         new_pkgs.append(temp_pkg)
                     })
                     repo.packages = new_pkgs
@@ -97,11 +99,16 @@ public class RepoHandler: ObservableObject {
         }
     }
     
-    func getRepo(_ url: URL, completion: @escaping (Repo?, Error?) -> Void) {
+    func getRepo(_ url: URL, _ appData: AppData? = nil, completion: @escaping (Repo?, Error?) -> Void) {
         AF.request(url).responseJASON { response in
             switch response.result {
             case .success(let json):
-                completion(Repo(json, url), nil)
+                var repo = Repo(json, url)
+                if appData != nil,
+                   let repoKey = repo.url?.absoluteString {
+                    repo._liveAccent = appData?.getLiveAccent(repoKey, repo.iconURL)
+                }
+                completion(repo, nil)
             case .failure(let error):
                 completion(Repo(error, url), error)
             }
diff --git a/PureKFD/Backend/Structs/AppData.swift b/PureKFD/Backend/Structs/AppData.swift
@@ -22,5 +22,50 @@ public class AppData: ObservableObject {
     @AppStorage("FilterPackages") var filterPackages = true
     @AppStorage("savedExploitSettings") var savedSettings: [String: String] = [:]
     
+    @AppStorage("savedLiveAccents") var savedLiveAccents: [String: String] = [:]
+    
+    func getLiveAccent(_ key: String, _ iconURL: URL?) -> Color? {
+        if let saved = savedLiveAccents[key] {
+            let comp = saved.components(separatedBy: ":")
+            if let hex = comp.first,
+               let oldIconURLKey = comp.last {
+                if let iconURLKey = iconURL?.absoluteString {
+                    if oldIconURLKey != iconURLKey {
+                        return nil
+                    }
+                }
+                return Color(hex: hex)
+            }
+        }
+        return nil
+    }
+
+    func setPkgLiveAccent(_ color: Color?, _ bundleId: String, _ iconURL: URL?) {
+        if let mainPKG = pkgs.firstIndex(where: { $0.bundleid == bundleId }) {
+            pkgs[mainPKG]._liveAccent = color
+        }
+        if let installedPKG = installed_pkgs.firstIndex(where: { $0.bundleid == bundleId }) {
+            installed_pkgs[installedPKG]._liveAccent = color
+        }
+        if let updatePKG = available_updates.firstIndex(where: { $0.bundleid == bundleId }) {
+            available_updates[updatePKG]._liveAccent = color
+        }
+        if let hex = color?.toHex(),
+           let iconURLKey = iconURL?.absoluteString {
+            savedLiveAccents[bundleId] = "\(hex):\(iconURLKey)"
+        }
+    }
+    
+    func setRepoLiveAccent(_ color: Color?, _ url: URL?, _ iconURL: URL?) {
+        if let repo = repos.firstIndex(where: { $0.url == url }) {
+            repos[repo]._liveAccent = color
+        }
+        if let hex = color?.toHex(),
+           let urlKey = url?.absoluteString,
+           let iconURLKey = iconURL?.absoluteString {
+            savedLiveAccents[urlKey] = "\(hex):\(iconURLKey)"
+        }
+    }
+    
     static let shared = AppData()
 }
diff --git a/PureKFD/Backend/Structs/Package.swift b/PureKFD/Backend/Structs/Package.swift
@@ -44,6 +44,42 @@ public struct Package: Codable {
     }
     var installed: Bool
     
+    var _liveAccent: Color? = nil
+    
+    private enum CodingKeys: String, CodingKey {
+        // Package Info
+        case name
+        case bundleid
+        case author
+        case version
+        case description
+        case long_description
+        case icon
+        case accent
+        case accentRow
+        case screenshots
+        case banner
+        case category
+        case depiction
+        
+        // Install Values
+        case path
+        case versions
+        
+        // Repo Values
+        case url
+        case repo
+        case feature
+        
+        // Installed Values
+        case disabled
+        case hasprefs
+        case hasRestore
+        case error
+        case varonly
+        case installed
+    }
+    
     // JSON init stuff
     init(_ json: [String: Any], _ _repo: Repo?, _ _featured: [Featured]?) {
         name = json["name"] as? String ?? "Unknown Tweak"
@@ -63,6 +99,9 @@ public struct Package: Codable {
         }
         accent = json["accent"] as? String
         accentRow = json["accentRow"] as? String ?? _repo?.defaultRowAccent
+        if let _override_accent = json["FORCE_ACCENT_OVERRIDE"] as? String {
+            _liveAccent = Color(hex: _override_accent)
+        }
         let _banner = json["banner"] as? String
         if let _banner = _banner {
             if _banner.hasPrefix("https://") || _banner.hasPrefix("http://") {
diff --git a/PureKFD/Backend/Structs/Repo.swift b/PureKFD/Backend/Structs/Repo.swift
@@ -57,6 +57,21 @@ public struct Repo: Codable, Hashable {
         }
     }
     
+    var _liveAccent: Color? = nil
+    
+    private enum CodingKeys: String, CodingKey {
+        case name
+        case description
+        case url
+        case fullURL
+        case icon
+        case accent
+        case featured
+        case packages
+        case defaultRowAccent
+        case error
+    }
+    
     init(_ _error: Error, _ _url: URL?) {
         name = "Unknown Repo"
         description = _url?.absoluteString ?? _error.localizedDescription
diff --git a/PureKFD/Views/BrowseView.swift b/PureKFD/Views/BrowseView.swift
@@ -157,6 +157,7 @@ struct RepoListRowView: View {
                                         if let uiImage = state.imageContainer?.image,
                                            let accentColor = averageColor(from: uiImage) {
                                             accent = Color(accentColor.bright())
+                                            appData.setRepoLiveAccent(accent, repo.url, repo.iconURL)
                                         }
                                     }
                                 }
@@ -177,7 +178,9 @@ struct RepoListRowView: View {
                     Image(systemName: "chevron.right").foregroundColor(accent ?? repo.accentColor ?? .accentColor).font(.footnote)
                 }
             }.padding()
-        }.background(RoundedRectangle(cornerRadius: 25).foregroundColor((accent ?? repo.accentColor ?? .accentColor).opacity(0.1))).listRowSeparator(.hidden).contextMenu {
+        }.background(RoundedRectangle(cornerRadius: 25).foregroundColor((accent ?? repo.accentColor ?? .accentColor).opacity(0.1))).listRowSeparator(.hidden).onAppear() {
+            accent = repo._liveAccent
+        }.contextMenu {
             if let url = repo.prettyURL {
                 Text(url).font(.footnote).minimumScaleFactor(0.5).lineLimit(1).opacity(0.5)
             }
diff --git a/PureKFD/Views/InstalledView.swift b/PureKFD/Views/InstalledView.swift
@@ -240,7 +240,7 @@ struct InstalledView: View {
                                             
                                             if tweak.hasRestore {
                                                 Button(action: {
-                                                    TweakHandler.applyTweak(pkg: tweak, appData.selectedExploit, .restore, saveEnv)
+                                                    TweakHandler.applyTweaks(pkgs: [tweak], appData.selectedExploit, .restore, savedSettings, saveEnv)
                                                 }, label: {
                                                     HStack {
                                                         Text("Restore Files")
diff --git a/PureKFD/Views/SubViews/Prefs/purePrefs.swift b/PureKFD/Views/SubViews/Prefs/purePrefs.swift
@@ -53,7 +53,7 @@ struct PrefView: View {
             } else {
                 loadingView()
             }
-        }
+        }.accentColor(selectedTweak?._liveAccent)
     }
     
     func loadPreferences(pkgpath: URL) {
diff --git a/PureKFD/Views/SubViews/RepoView.swift b/PureKFD/Views/SubViews/RepoView.swift
@@ -140,6 +140,7 @@ struct TweakListRowView: View {
                                                    let accentColor = averageColor(from: uiImage) {
                                                     DispatchQueue.main.async {
                                                         accent = Color(accentColor.bright())
+                                                        appData.setPkgLiveAccent(accent, tweak.bundleid, tweak.icon)
                                                     }
                                                 }
                                             }
@@ -179,6 +180,7 @@ struct TweakListRowView: View {
             }.padding())
         )
         }.background(RoundedRectangle(cornerRadius: 25).foregroundColor((accent ?? tweak.accentColor ?? tweak.repo?.accentColor ?? .accentColor).opacity(0.1))).onAppear() {
+            accent = tweak._liveAccent
             if search {
                 Task(priority: .background) {
                     DispatchQueue.main.asyncAfter(deadline: .now()+2, execute: {
diff --git a/PureKFD/Views/SubViews/TweakView.swift b/PureKFD/Views/SubViews/TweakView.swift
@@ -112,6 +112,7 @@ struct TweakView: View {
                 }.padding().padding(.top, 20)
             }
         }.animation(.easeInOut(duration: 0.25), value: bgColor).onAppear() {
+            accent = tweak._liveAccent
             queued = appData.queued_pkgs.contains(where: { $0.0.bundleid == tweak.bundleid })
             installed = appData.installed_pkgs.contains(where: { $0.bundleid == tweak.bundleid })
         }

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ struct RepoListRowView: View {`
`157`	`157`	`if let uiImage = state.imageContainer?.image,`
`158`	`158`	`let accentColor = averageColor(from: uiImage) {`
`159`	`159`	`accent = Color(accentColor.bright())`
	`160`	`+ appData.setRepoLiveAccent(accent, repo.url, repo.iconURL)`
`160`	`161`	`}`
`161`	`162`	`}`
`162`	`163`	`}`
`@@ -177,7 +178,9 @@ struct RepoListRowView: View {`
`177`	`178`	`Image(systemName: "chevron.right").foregroundColor(accent ?? repo.accentColor ?? .accentColor).font(.footnote)`
`178`	`179`	`}`
`179`	`180`	`}.padding()`
`180`		`- }.background(RoundedRectangle(cornerRadius: 25).foregroundColor((accent ?? repo.accentColor ?? .accentColor).opacity(0.1))).listRowSeparator(.hidden).contextMenu {`
	`181`	`+ }.background(RoundedRectangle(cornerRadius: 25).foregroundColor((accent ?? repo.accentColor ?? .accentColor).opacity(0.1))).listRowSeparator(.hidden).onAppear() {`
	`182`	`+ accent = repo._liveAccent`
	`183`	`+ }.contextMenu {`
`181`	`184`	`if let url = repo.prettyURL {`
`182`	`185`	`Text(url).font(.footnote).minimumScaleFactor(0.5).lineLimit(1).opacity(0.5)`
`183`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ struct PrefView: View {`
`53`	`53`	`} else {`
`54`	`54`	`loadingView()`
`55`	`55`	`}`
`56`		`- }`
	`56`	`+ }.accentColor(selectedTweak?._liveAccent)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`func loadPreferences(pkgpath: URL) {`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ struct TweakListRowView: View {`
`140`	`140`	`let accentColor = averageColor(from: uiImage) {`
`141`	`141`	`DispatchQueue.main.async {`
`142`	`142`	`accent = Color(accentColor.bright())`
	`143`	`+ appData.setPkgLiveAccent(accent, tweak.bundleid, tweak.icon)`
`143`	`144`	`}`
`144`	`145`	`}`
`145`	`146`	`}`
`@@ -179,6 +180,7 @@ struct TweakListRowView: View {`
`179`	`180`	`}.padding())`
`180`	`181`	`)`
`181`	`182`	`}.background(RoundedRectangle(cornerRadius: 25).foregroundColor((accent ?? tweak.accentColor ?? tweak.repo?.accentColor ?? .accentColor).opacity(0.1))).onAppear() {`
	`183`	`+ accent = tweak._liveAccent`
`182`	`184`	`if search {`
`183`	`185`	`Task(priority: .background) {`
`184`	`186`	`DispatchQueue.main.asyncAfter(deadline: .now()+2, execute: {`