From 403a369df98ad98052340c7a689525ed99080c03 Mon Sep 17 00:00:00 2001 From: Joshua Laymon <71040782+bogotesr@users.noreply.github.com> Date: Sat, 5 Nov 2022 23:50:07 -0700 Subject: [PATCH] Match branding some more (#72) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * change app name to SideStore * Make it P U R P L E * Fix actions for branding * Change patreon description in settings * Update RefreshAttemptsViewController.swift * Update LaunchViewController.swift * Update some of Credits * Fix space * More Branding fixes * Change How it Works to have better wording. * Change Branding for source and bundle * Get the Rest of the Branding and popup naming fixes * Welcome to SiteStore * Update instructions to not include sideserver This removes sideserver fro the instructions on how it works as sideServer in background of a computer so far isn’t needed. * Remove mention of sideserver in the app * SideStore error Message instead of AltServer * some adjustments * forgot to add this in the last commit * Try fixing compile error * Spell correct of last commit * Fix Requested changes 11/5/2022 Signed-off-by: bogotesr <71040782+bogotesr@users.noreply.github.com> Co-authored-by: Spidy123222 <64176728+Spidy123222@users.noreply.github.com> --- .github/workflows/build.yml | 8 +- AltBackup/ViewController.swift | 2 +- AltStore.xcodeproj/project.pbxproj | 16 +-- AltStore/App IDs/AppIDsViewController.swift | 6 +- AltStore/AppDelegate.swift | 4 +- .../Authentication/Authentication.storyboard | 14 +- .../RefreshAltStoreViewController.swift | 4 +- AltStore/Base.lproj/Main.storyboard | 130 +++++++++--------- AltStore/Info.plist | 2 - AltStore/LaunchViewController.swift | 2 +- AltStore/My Apps/MyAppsViewController.swift | 4 +- AltStore/Operations/OperationError.swift | 6 +- .../Patch App/PatchViewController.swift | 4 +- AltStore/Settings/AboutPatreonHeaderView.xib | 2 +- .../RefreshAttemptsViewController.swift | 2 +- AltStore/Settings/Settings.storyboard | 12 +- .../Settings/SettingsViewController.swift | 14 +- AltStore/Sources/SourcesViewController.swift | 8 +- AltStoreCore/Model/Source.swift | 4 +- AltStoreCore/Model/StoreApp.swift | 10 +- AltWidget/AltWidget.swift | 2 +- Build.xcconfig | 2 +- Shared/Categories/NSError+ALTServerError.m | 26 ++-- .../ALTApplication+AltStoreApp.swift | 2 +- app.json | 8 +- 25 files changed, 146 insertions(+), 148 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd5d1e01..fe056977 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,13 +85,13 @@ jobs: xcodebuild -project AltStore.xcodeproj -scheme AltStore -sdk iphoneos archive -archivePath ./archive CODE_SIGNING_REQUIRED=NO AD_HOC_CODE_SIGNING_ALLOWED=YES CODE_SIGNING_ALLOWED=NO DEVELOPMENT_TEAM=XYZ0123456 ORG_IDENTIFIER=com.SideStore | xcpretty && exit ${PIPESTATUS[0]} - name: Fakesign app run: | - rm -rf archive.xcarchive/Products/Applications/AltStore.app/Frameworks/AltStoreCore.framework/Frameworks/ - ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/AltStore.app/AltStore + rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/ + ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore - name: Convert to IPA run: | mkdir Payload - mkdir Payload/AltStore.app - cp -R archive.xcarchive/Products/Applications/AltStore.app/ Payload/AltStore.app/ + mkdir Payload/SideStore.app + cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/ zip -r SideStore.ipa Payload - name: Upload Artifact uses: actions/upload-artifact@v3.1.0 diff --git a/AltBackup/ViewController.swift b/AltBackup/ViewController.swift index 0efb7112..17a819a5 100644 --- a/AltBackup/ViewController.swift +++ b/AltBackup/ViewController.swift @@ -160,7 +160,7 @@ private extension ViewController self.textLabel.text = String(format: NSLocalizedString("%@ is inactive.", comment: ""), Bundle.main.appName ?? NSLocalizedString("App", comment: "")) - self.detailTextLabel.text = String(format: NSLocalizedString("Refresh %@ in AltStore to continue using it.", comment: ""), + self.detailTextLabel.text = String(format: NSLocalizedString("Refresh %@ in SideStore to continue using it.", comment: ""), Bundle.main.appName ?? NSLocalizedString("this app", comment: "")) self.detailTextLabel.isHidden = false diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index cfa1b19d..0af0d835 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -820,7 +820,7 @@ BFC84A4C2421A19100853474 /* SourcesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourcesViewController.swift; sourceTree = ""; }; BFCB9206250AB2120057B44E /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = ""; }; BFCCB519245E3401001853EA /* VerifyAppOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerifyAppOperation.swift; sourceTree = ""; }; - BFD2476A2284B9A500981D42 /* AltStore.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AltStore.app; sourceTree = BUILT_PRODUCTS_DIR; }; + BFD2476A2284B9A500981D42 /* SideStore.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SideStore.app; sourceTree = BUILT_PRODUCTS_DIR; }; BFD2476D2284B9A500981D42 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; BFD247742284B9A500981D42 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; BFD247762284B9A700981D42 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -1661,7 +1661,7 @@ BFD2476B2284B9A500981D42 /* Products */ = { isa = PBXGroup; children = ( - BFD2476A2284B9A500981D42 /* AltStore.app */, + BFD2476A2284B9A500981D42 /* SideStore.app */, BF45868D229872EA00BD7491 /* AltServer.app */, BF45872B2298D31600BD7491 /* libimobiledevice.a */, BF5C5FC5237DF5AE00EDD0C6 /* AltPlugin.mailbundle */, @@ -2182,9 +2182,9 @@ productReference = BF989167250AABF3002ACF50 /* AltWidgetExtension.appex */; productType = "com.apple.product-type.app-extension"; }; - BFD247692284B9A500981D42 /* AltStore */ = { + BFD247692284B9A500981D42 /* SideStore */ = { isa = PBXNativeTarget; - buildConfigurationList = BFD2477E2284B9A700981D42 /* Build configuration list for PBXNativeTarget "AltStore" */; + buildConfigurationList = BFD2477E2284B9A700981D42 /* Build configuration list for PBXNativeTarget "SideStore" */; buildPhases = ( BFD247662284B9A500981D42 /* Sources */, BFD247672284B9A500981D42 /* Frameworks */, @@ -2201,7 +2201,7 @@ BF66EE842501AE50007EE018 /* PBXTargetDependency */, BF989176250AABF4002ACF50 /* PBXTargetDependency */, ); - name = AltStore; + name = SideStore; packageProductDependencies = ( B3C395F3284F35DD00DA9E2F /* Nuke */, B3C395F6284F362400DA9E2F /* AppCenterAnalytics */, @@ -2209,7 +2209,7 @@ 4879A9612861049C00FC1BBD /* OpenSSL */, ); productName = AltStore; - productReference = BFD2476A2284B9A500981D42 /* AltStore.app */; + productReference = BFD2476A2284B9A500981D42 /* SideStore.app */; productType = "com.apple.product-type.application"; }; BFF7C903257844C900E55F36 /* AltXPC */ = { @@ -2325,7 +2325,7 @@ ); projectRoot = ""; targets = ( - BFD247692284B9A500981D42 /* AltStore */, + BFD247692284B9A500981D42 /* SideStore */, BF45868C229872EA00BD7491 /* AltServer */, BF45872A2298D31600BD7491 /* libimobiledevice */, BF5C5FC4237DF5AE00EDD0C6 /* AltPlugin */, @@ -3833,7 +3833,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - BFD2477E2284B9A700981D42 /* Build configuration list for PBXNativeTarget "AltStore" */ = { + BFD2477E2284B9A700981D42 /* Build configuration list for PBXNativeTarget "SideStore" */ = { isa = XCConfigurationList; buildConfigurations = ( BFD2477F2284B9A700981D42 /* Debug */, diff --git a/AltStore/App IDs/AppIDsViewController.swift b/AltStore/App IDs/AppIDsViewController.swift index 0172e5b3..d5ab49ab 100644 --- a/AltStore/App IDs/AppIDsViewController.swift +++ b/AltStore/App IDs/AppIDsViewController.swift @@ -201,9 +201,9 @@ extension AppIDsViewController: UICollectionViewDelegateFlowLayout if let activeTeam = DatabaseManager.shared.activeTeam(), activeTeam.type == .free { let text = NSLocalizedString(""" - Each app and app extension installed with AltStore must register an App ID with Apple. Apple limits non-developer Apple IDs to 10 App IDs at a time. + Each app and app extension installed with SideStore must register an App ID with Apple. Apple limits non-developer Apple IDs to 10 App IDs at a time. - **App IDs can't be deleted**, but they do expire after one week. AltStore will automatically renew App IDs for all active apps once they've expired. + **App IDs can't be deleted**, but they do expire after one week. SideStore will automatically renew App IDs for all active apps once they've expired. """, comment: "") let attributedText = NSAttributedString(markdownRepresentation: text, attributes: [.font: headerView.textLabel.font as Any]) @@ -212,7 +212,7 @@ extension AppIDsViewController: UICollectionViewDelegateFlowLayout else { headerView.textLabel.text = NSLocalizedString(""" - Each app and app extension installed with AltStore must register an App ID with Apple. + Each app and app extension installed with SideStore must register an App ID with Apple. App IDs for paid developer accounts never expire, and there is no limit to how many you can create. """, comment: "") diff --git a/AltStore/AppDelegate.swift b/AltStore/AppDelegate.swift index 7fc07b1e..2451464b 100644 --- a/AltStore/AppDelegate.swift +++ b/AltStore/AppDelegate.swift @@ -264,7 +264,7 @@ extension AppDelegate let content = UNMutableNotificationContent() content.title = NSLocalizedString("App Refresh Tip", comment: "") - content.body = NSLocalizedString("The more you open AltStore, the more chances it's given to refresh apps in the background.", comment: "") + content.body = NSLocalizedString("The more you open SideStore, the more chances it's given to refresh apps in the background.", comment: "") let request = UNNotificationRequest(identifier: "background-refresh-reminder5", content: content, trigger: trigger) UNUserNotificationCenter.current().add(request) @@ -392,7 +392,7 @@ private extension AppDelegate } else { - content.title = NSLocalizedString("AltStore News", comment: "") + content.title = NSLocalizedString("SideStore News", comment: "") } content.body = newsItem.title diff --git a/AltStore/Authentication/Authentication.storyboard b/AltStore/Authentication/Authentication.storyboard index 278831b0..d4e7e2ec 100644 --- a/AltStore/Authentication/Authentication.storyboard +++ b/AltStore/Authentication/Authentication.storyboard @@ -56,7 +56,7 @@ -