From 95f269402c2933622d7f890a887e02c5fa9fc2fc Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Wed, 31 Jul 2019 11:46:26 -0700 Subject: [PATCH] [AltStore] Renames AccountViewController to SettingsViewController --- AltStore.xcodeproj/project.pbxproj | 14 +++++++------- AltStore/Base.lproj/Main.storyboard | 2 +- .../SettingsViewController.swift} | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) rename AltStore/{Account/AccountViewController.swift => Settings/SettingsViewController.swift} (94%) diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index 31580ccd..6c1d41be 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -169,7 +169,7 @@ BFD6B03322DFF20800B86064 /* MyAppsComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFD6B03222DFF20800B86064 /* MyAppsComponents.swift */; }; BFDB5B1622EE90D300F74113 /* Date+RelativeDate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFDB5B1522EE90D300F74113 /* Date+RelativeDate.swift */; }; BFDB5B2622EFBBEA00F74113 /* BrowseCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BFDB5B2522EFBBEA00F74113 /* BrowseCollectionViewCell.xib */; }; - BFDB69FD22A9A7B7007EA6D6 /* AccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFDB69FC22A9A7B7007EA6D6 /* AccountViewController.swift */; }; + BFDB69FD22A9A7B7007EA6D6 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFDB69FC22A9A7B7007EA6D6 /* SettingsViewController.swift */; }; BFDB6A0522A9AFB2007EA6D6 /* Fetchable.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFDB6A0422A9AFB2007EA6D6 /* Fetchable.swift */; }; BFDB6A0822AAED73007EA6D6 /* ResignAppOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFDB6A0722AAED73007EA6D6 /* ResignAppOperation.swift */; }; BFDB6A0B22AAEDB7007EA6D6 /* Operation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFDB6A0A22AAEDB7007EA6D6 /* Operation.swift */; }; @@ -421,7 +421,7 @@ BFD6B03222DFF20800B86064 /* MyAppsComponents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyAppsComponents.swift; sourceTree = ""; }; BFDB5B1522EE90D300F74113 /* Date+RelativeDate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+RelativeDate.swift"; sourceTree = ""; }; BFDB5B2522EFBBEA00F74113 /* BrowseCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BrowseCollectionViewCell.xib; sourceTree = ""; }; - BFDB69FC22A9A7B7007EA6D6 /* AccountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountViewController.swift; sourceTree = ""; }; + BFDB69FC22A9A7B7007EA6D6 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; BFDB6A0422A9AFB2007EA6D6 /* Fetchable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Fetchable.swift; sourceTree = ""; }; BFDB6A0722AAED73007EA6D6 /* ResignAppOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResignAppOperation.swift; sourceTree = ""; }; BFDB6A0A22AAEDB7007EA6D6 /* Operation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Operation.swift; sourceTree = ""; }; @@ -770,7 +770,7 @@ BF9ABA4322DCFF33008935CF /* Browse */, BF3D64A022E7FAD800E9056B /* App Detail */, BFBBE2E2229320A2002097FA /* My Apps */, - BFDB69FB22A9A7A6007EA6D6 /* Account */, + BFDB69FB22A9A7A6007EA6D6 /* Settings */, BFD2478A2284C49000981D42 /* Managing Apps */, BFC51D7922972F1F00388324 /* Server */, BFD247982284D7FC00981D42 /* Model */, @@ -879,12 +879,12 @@ path = Connections; sourceTree = ""; }; - BFDB69FB22A9A7A6007EA6D6 /* Account */ = { + BFDB69FB22A9A7A6007EA6D6 /* Settings */ = { isa = PBXGroup; children = ( - BFDB69FC22A9A7B7007EA6D6 /* AccountViewController.swift */, + BFDB69FC22A9A7B7007EA6D6 /* SettingsViewController.swift */, ); - path = Account; + path = Settings; sourceTree = ""; }; BFDB6A0622A9B114007EA6D6 /* Protocols */ = { @@ -1280,7 +1280,7 @@ BF3D649D22E7AC1B00E9056B /* PermissionPopoverViewController.swift in Sources */, BFE6325E22A8497000F30809 /* SelectTeamViewController.swift in Sources */, BFD2478F2284C8F900981D42 /* Button.swift in Sources */, - BFDB69FD22A9A7B7007EA6D6 /* AccountViewController.swift in Sources */, + BFDB69FD22A9A7B7007EA6D6 /* SettingsViewController.swift in Sources */, BFE6326A22A85DAF00F30809 /* ReplaceCertificateViewController.swift in Sources */, BFB11692229322E400BB457C /* DatabaseManager.swift in Sources */, BFC1F38D22AEE3A4003AC21A /* DownloadAppOperation.swift in Sources */, diff --git a/AltStore/Base.lproj/Main.storyboard b/AltStore/Base.lproj/Main.storyboard index 59b8353c..af0754bc 100644 --- a/AltStore/Base.lproj/Main.storyboard +++ b/AltStore/Base.lproj/Main.storyboard @@ -607,7 +607,7 @@ World - + diff --git a/AltStore/Account/AccountViewController.swift b/AltStore/Settings/SettingsViewController.swift similarity index 94% rename from AltStore/Account/AccountViewController.swift rename to AltStore/Settings/SettingsViewController.swift index 3ca63e52..c7ed7159 100644 --- a/AltStore/Account/AccountViewController.swift +++ b/AltStore/Settings/SettingsViewController.swift @@ -10,7 +10,7 @@ import UIKit import Roxas -class AccountViewController: UITableViewController +class SettingsViewController: UITableViewController { private var team: Team? @@ -37,7 +37,7 @@ class AccountViewController: UITableViewController } } -private extension AccountViewController +private extension SettingsViewController { func makePlaceholderView() -> RSTPlaceholderView { @@ -49,7 +49,7 @@ private extension AccountViewController let signInButton = UIButton(type: .system) signInButton.titleLabel?.font = UIFont.preferredFont(forTextStyle: .body) signInButton.setTitle(NSLocalizedString("Sign In", comment: ""), for: .normal) - signInButton.addTarget(self, action: #selector(AccountViewController.signIn(_:)), for: .primaryActionTriggered) + signInButton.addTarget(self, action: #selector(SettingsViewController.signIn(_:)), for: .primaryActionTriggered) placeholderView.stackView.addArrangedSubview(signInButton) return placeholderView @@ -91,7 +91,7 @@ private extension AccountViewController } } -private extension AccountViewController +private extension SettingsViewController { @objc func signIn(_ sender: UIButton) { @@ -136,7 +136,7 @@ private extension AccountViewController } } -extension AccountViewController +extension SettingsViewController { override func numberOfSections(in tableView: UITableView) -> Int {