diff --git a/AltStore/App Detail/AppViewController.swift b/AltStore/App Detail/AppViewController.swift index adab9819..37a6b31a 100644 --- a/AltStore/App Detail/AppViewController.swift +++ b/AltStore/App Detail/AppViewController.swift @@ -392,7 +392,7 @@ private extension AppViewController navigationController?.navigationBar.barStyle = .default navigationController?.navigationBar.alpha = 1.0 navigationController?.navigationBar.barTintColor = .white - navigationController?.navigationBar.tintColor = .altGreen + navigationController?.navigationBar.tintColor = .altRed } func hideNavigationBar(for navigationController: UINavigationController? = nil) diff --git a/AltStore/AppDelegate.swift b/AltStore/AppDelegate.swift index 9d8e74e8..3ff9c071 100644 --- a/AltStore/AppDelegate.swift +++ b/AltStore/AppDelegate.swift @@ -96,7 +96,7 @@ private extension AppDelegate { func setTintColor() { - self.window?.tintColor = .altGreen + self.window?.tintColor = .altRed } } diff --git a/AltStore/Authentication/AuthenticationViewController.swift b/AltStore/Authentication/AuthenticationViewController.swift index aad7e1c0..30163986 100644 --- a/AltStore/Authentication/AuthenticationViewController.swift +++ b/AltStore/Authentication/AuthenticationViewController.swift @@ -104,7 +104,6 @@ private extension AuthenticationViewController { DispatchQueue.main.async { let toastView = ToastView(text: NSLocalizedString("Failed to Log In", comment: ""), detailText: error.localizedDescription) - toastView.tintColor = .altGreen toastView.show(in: self.navigationController?.view ?? self.view) self.toastView = toastView diff --git a/AltStore/Base.lproj/Main.storyboard b/AltStore/Base.lproj/Main.storyboard index 8f5a463c..ccc65b52 100644 --- a/AltStore/Base.lproj/Main.storyboard +++ b/AltStore/Base.lproj/Main.storyboard @@ -642,7 +642,7 @@ World - + @@ -658,7 +658,7 @@ World - + @@ -776,7 +776,7 @@ World @@ -860,12 +860,12 @@ World - - + + - + diff --git a/AltStore/Browse/BrowseViewController.swift b/AltStore/Browse/BrowseViewController.swift index 70f81f8f..4618e13a 100644 --- a/AltStore/Browse/BrowseViewController.swift +++ b/AltStore/Browse/BrowseViewController.swift @@ -78,7 +78,7 @@ private extension BrowseViewController // Otherwise, cell reuse can mess up some cached values. cell.actionButton.isIndicatingActivity = false - let tintColor = app.tintColor ?? .altGreen + let tintColor = app.tintColor ?? .altRed cell.tintColor = tintColor if app.installedApp == nil diff --git a/AltStore/Extensions/UIColor+AltStore.swift b/AltStore/Extensions/UIColor+AltStore.swift index 8db64781..8ee97f5b 100644 --- a/AltStore/Extensions/UIColor+AltStore.swift +++ b/AltStore/Extensions/UIColor+AltStore.swift @@ -10,8 +10,6 @@ import UIKit extension UIColor { - static let altPurple = UIColor(named: "Purple")! - static let altGreen = UIColor(named: "Green")! static let altRed = UIColor(named: "Red")! static let altPink = UIColor(named: "Pink")! diff --git a/AltStore/My Apps/MyAppsViewController.swift b/AltStore/My Apps/MyAppsViewController.swift index fe246664..f3f6ac3a 100644 --- a/AltStore/My Apps/MyAppsViewController.swift +++ b/AltStore/My Apps/MyAppsViewController.swift @@ -81,7 +81,7 @@ class MyAppsViewController: UICollectionViewController self.sideloadingProgressView = UIProgressView(progressViewStyle: .bar) self.sideloadingProgressView.translatesAutoresizingMaskIntoConstraints = false - self.sideloadingProgressView.progressTintColor = .altGreen + self.sideloadingProgressView.progressTintColor = .altRed self.sideloadingProgressView.progress = 0 if let navigationBar = self.navigationController?.navigationBar @@ -145,7 +145,7 @@ private extension MyAppsViewController dynamicDataSource.cellConfigurationHandler = { (cell, _, indexPath) in cell.layer.cornerRadius = 20 cell.layer.masksToBounds = true - cell.contentView.backgroundColor = UIColor.altGreen.withAlphaComponent(0.15) + cell.contentView.backgroundColor = UIColor.altRed.withAlphaComponent(0.15) } return dynamicDataSource @@ -165,7 +165,7 @@ private extension MyAppsViewController guard let app = installedApp.storeApp else { return } let cell = cell as! UpdateCollectionViewCell - cell.tintColor = app.tintColor ?? .altGreen + cell.tintColor = app.tintColor ?? .altRed cell.nameLabel.text = app.name cell.versionDescriptionTextView.text = app.versionDescription cell.appIconImageView.image = nil @@ -237,7 +237,7 @@ private extension MyAppsViewController let dataSource = RSTFetchedResultsCollectionViewPrefetchingDataSource(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext) dataSource.cellIdentifierHandler = { _ in "AppCell" } dataSource.cellConfigurationHandler = { (cell, installedApp, indexPath) in - let tintColor = installedApp.storeApp?.tintColor ?? .altGreen + let tintColor = installedApp.storeApp?.tintColor ?? .altRed let cell = cell as! InstalledAppCollectionViewCell cell.tintColor = tintColor @@ -636,10 +636,10 @@ extension MyAppsViewController let headerView = collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "UpdatesHeader", for: indexPath) as! UpdatesCollectionHeaderView UIView.performWithoutAnimation { - headerView.button.backgroundColor = UIColor.altGreen.withAlphaComponent(0.15) + headerView.button.backgroundColor = UIColor.altRed.withAlphaComponent(0.15) headerView.button.setTitle("▾", for: .normal) headerView.button.titleLabel?.font = UIFont.boldSystemFont(ofSize: 28) - headerView.button.setTitleColor(.altGreen, for: .normal) + headerView.button.setTitleColor(.altRed, for: .normal) headerView.button.addTarget(self, action: #selector(MyAppsViewController.toggleAppUpdates), for: .primaryActionTriggered) if self.isUpdateSectionCollapsed @@ -665,7 +665,7 @@ extension MyAppsViewController headerView.textLabel.text = NSLocalizedString("Installed", comment: "") headerView.button.isIndicatingActivity = false - headerView.button.activityIndicatorView.color = .altGreen + headerView.button.activityIndicatorView.color = .altRed headerView.button.setTitle(NSLocalizedString("Refresh All", comment: ""), for: .normal) headerView.button.addTarget(self, action: #selector(MyAppsViewController.refreshAllApps(_:)), for: .primaryActionTriggered) headerView.button.isIndicatingActivity = self.isRefreshingAllApps diff --git a/AltStore/Resources/Assets.xcassets/Colors/Green.colorset/Contents.json b/AltStore/Resources/Assets.xcassets/Colors/Green.colorset/Contents.json deleted file mode 100644 index d3d6625b..00000000 --- a/AltStore/Resources/Assets.xcassets/Colors/Green.colorset/Contents.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - }, - "colors" : [ - { - "idiom" : "universal", - "color" : { - "color-space" : "srgb", - "components" : { - "red" : "57", - "alpha" : "1.000", - "blue" : "101", - "green" : "126" - } - } - } - ] -} \ No newline at end of file diff --git a/AltStore/Resources/Assets.xcassets/Colors/Orange.colorset/Contents.json b/AltStore/Resources/Assets.xcassets/Colors/Orange.colorset/Contents.json deleted file mode 100644 index f5e0bf0f..00000000 --- a/AltStore/Resources/Assets.xcassets/Colors/Orange.colorset/Contents.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - }, - "colors" : [ - { - "idiom" : "universal", - "color" : { - "color-space" : "srgb", - "components" : { - "red" : "241", - "alpha" : "1.000", - "blue" : "62", - "green" : "172" - } - } - } - ] -} \ No newline at end of file diff --git a/AltStore/Resources/Assets.xcassets/Colors/Purple.colorset/Contents.json b/AltStore/Resources/Assets.xcassets/Colors/Purple.colorset/Contents.json deleted file mode 100644 index fb2e176c..00000000 --- a/AltStore/Resources/Assets.xcassets/Colors/Purple.colorset/Contents.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - }, - "colors" : [ - { - "idiom" : "universal", - "color" : { - "color-space" : "srgb", - "components" : { - "red" : "0x8A", - "alpha" : "1.000", - "blue" : "0xF7", - "green" : "0x28" - } - } - } - ] -} \ No newline at end of file diff --git a/AltStore/Settings/RefreshAttemptsViewController.swift b/AltStore/Settings/RefreshAttemptsViewController.swift index 81290290..d3e32d0a 100644 --- a/AltStore/Settings/RefreshAttemptsViewController.swift +++ b/AltStore/Settings/RefreshAttemptsViewController.swift @@ -54,7 +54,7 @@ private extension RefreshAttemptsViewController if attempt.isSuccess { cell.successLabel.text = NSLocalizedString("Success", comment: "") - cell.successLabel.textColor = .altGreen + cell.successLabel.textColor = .refreshGreen } else {