From 7dc37d82e3f1da789ed72bd3a99804111cd686ee Mon Sep 17 00:00:00 2001 From: Stern Date: Sat, 14 Dec 2024 18:23:33 -0500 Subject: [PATCH] UI: Change more UI/UX reflect SideStore branding. Signed-off-by: Stern --- .../xcschemes/SideStore - Release.xcscheme | 2 +- .../AppDetailCollectionViewController.swift | 2 +- AltStore/Managing Apps/AppManager.swift | 2 +- .../Operations/Errors/OperationError.swift | 2 +- .../Operations/Errors/VerificationError.swift | 2 +- .../Operations/VerifyAppPledgeOperation.swift | 2 +- .../ReviewPermissionsViewController.swift | 2 +- AltStore/Settings/AboutPatreonHeaderView.xib | 27 ++-- AltStore/Settings/Settings.storyboard | 135 ++++-------------- .../Settings/SettingsViewController.swift | 4 +- AltStore/Sources/SourcesViewController.swift | 2 +- AltStoreCore/Model/DatabaseManager.swift | 2 +- AltStoreCore/Model/MergePolicy.swift | 2 +- 13 files changed, 57 insertions(+), 129 deletions(-) diff --git a/AltStore.xcodeproj/xcshareddata/xcschemes/SideStore - Release.xcscheme b/AltStore.xcodeproj/xcshareddata/xcschemes/SideStore - Release.xcscheme index d883d237..bd0d76af 100644 --- a/AltStore.xcodeproj/xcshareddata/xcschemes/SideStore - Release.xcscheme +++ b/AltStore.xcodeproj/xcshareddata/xcschemes/SideStore - Release.xcscheme @@ -1,7 +1,7 @@ + version = "1.7"> diff --git a/AltStore/App Detail/AppDetailCollectionViewController.swift b/AltStore/App Detail/AppDetailCollectionViewController.swift index f9fd55a5..a65d5b26 100644 --- a/AltStore/App Detail/AppDetailCollectionViewController.swift +++ b/AltStore/App Detail/AppDetailCollectionViewController.swift @@ -274,7 +274,7 @@ private extension AppDetailCollectionViewController func showUnknownEntitlementsAlert() { - let alertController = UIAlertController(title: NSLocalizedString("Other Entitlements", comment: ""), message: NSLocalizedString("AltStore does not have detailed information for these entitlements.", comment: ""), preferredStyle: .alert) + let alertController = UIAlertController(title: NSLocalizedString("Other Entitlements", comment: ""), message: NSLocalizedString("SideStore does not have detailed information for these entitlements.", comment: ""), preferredStyle: .alert) alertController.addAction(.ok) self.present(alertController, animated: true) } diff --git a/AltStore/Managing Apps/AppManager.swift b/AltStore/Managing Apps/AppManager.swift index 022328e6..ae3a447a 100644 --- a/AltStore/Managing Apps/AppManager.swift +++ b/AltStore/Managing Apps/AppManager.swift @@ -387,7 +387,7 @@ extension AppManager { let (sourceName, sourceID) = await $source.perform { ($0.name, $0.identifier) } guard sourceID != Source.altStoreIdentifier else { - throw OperationError.forbidden(failureReason: NSLocalizedString("The default AltStore source cannot be removed.", comment: "")) + throw OperationError.forbidden(failureReason: NSLocalizedString("The default SideStore source cannot be removed.", comment: "")) } let title = String(format: NSLocalizedString("Are you sure you want to remove the source “%@”?", comment: ""), sourceName) diff --git a/AltStore/Operations/Errors/OperationError.swift b/AltStore/Operations/Errors/OperationError.swift index e9c82047..775ba34a 100644 --- a/AltStore/Operations/Errors/OperationError.swift +++ b/AltStore/Operations/Errors/OperationError.swift @@ -206,7 +206,7 @@ struct OperationError: ALTLocalizedError { case .sourceNotAdded: let sourceName = self.sourceName.map { String(format: NSLocalizedString("The source “%@”", comment: ""), $0) } ?? NSLocalizedString("The source", comment: "") - return String(format: NSLocalizedString("%@ is not added to AltStore.", comment: ""), sourceName) + return String(format: NSLocalizedString("%@ is not added to SideStore.", comment: ""), sourceName) case .appNotFound: let appName = self.appName ?? NSLocalizedString("The app", comment: "") diff --git a/AltStore/Operations/Errors/VerificationError.swift b/AltStore/Operations/Errors/VerificationError.swift index e6b410dc..3219dfec 100644 --- a/AltStore/Operations/Errors/VerificationError.swift +++ b/AltStore/Operations/Errors/VerificationError.swift @@ -195,7 +195,7 @@ struct VerificationError: ALTLocalizedError case .undeclaredPermissions: guard let permissionsDescription else { return nil } - let baseMessage = NSLocalizedString("These permissions must be declared by the source in order for AltStore to install this app:", comment: "") + let baseMessage = NSLocalizedString("These permissions must be declared by the source in order for SideStore to install this app:", comment: "") let recoverySuggestion = [baseMessage, permissionsDescription].joined(separator: "\n\n") return recoverySuggestion diff --git a/AltStore/Operations/VerifyAppPledgeOperation.swift b/AltStore/Operations/VerifyAppPledgeOperation.swift index 82b40615..ef3eebf4 100644 --- a/AltStore/Operations/VerifyAppPledgeOperation.swift +++ b/AltStore/Operations/VerifyAppPledgeOperation.swift @@ -151,7 +151,7 @@ private extension VerifyAppPledgeOperation Logger.sideload.debug("Patreon Auth cookie: \(authCookie.name)=\(authCookie.value)") - let message = NSLocalizedString("You're signed into Patreon but haven't connected your account with AltStore.\n\nPlease connect your account to download Patreon-exclusive apps.", comment: "") + let message = NSLocalizedString("You're signed into Patreon but haven't connected your account with SideStore.\n\nPlease connect your account to download Patreon-exclusive apps.", comment: "") let action = await UIAlertAction(title: NSLocalizedString("Connect Patreon Account", comment: ""), style: .default) do diff --git a/AltStore/Permissions/ReviewPermissionsViewController.swift b/AltStore/Permissions/ReviewPermissionsViewController.swift index b4e725c4..5238213b 100644 --- a/AltStore/Permissions/ReviewPermissionsViewController.swift +++ b/AltStore/Permissions/ReviewPermissionsViewController.swift @@ -196,7 +196,7 @@ extension ReviewPermissionsViewController case .unknown: configuration.text = NSLocalizedString("Additional Permissions", comment: "") - configuration.secondaryText = String(format: NSLocalizedString("These are permissions required by “%@” that AltStore does not recognize. Make sure you understand them before continuing.", comment: ""), self.app.name) + configuration.secondaryText = String(format: NSLocalizedString("These are permissions required by “%@” that SideStore does not recognize. Make sure you understand them before continuing.", comment: ""), self.app.name) case .approve: break } diff --git a/AltStore/Settings/AboutPatreonHeaderView.xib b/AltStore/Settings/AboutPatreonHeaderView.xib index 365b3d3e..3864ffb7 100644 --- a/AltStore/Settings/AboutPatreonHeaderView.xib +++ b/AltStore/Settings/AboutPatreonHeaderView.xib @@ -1,9 +1,9 @@ - + - + @@ -18,7 +18,7 @@ - + @@ -31,10 +31,10 @@ - + - + - + - - + Thank you for using SideStore! @@ -99,7 +99,7 @@ Following us on social media allows us to give quick updates and spread the word - +