From af9d4f1c2469fdc9ef7bcaa8130591e5788355cd Mon Sep 17 00:00:00 2001 From: Yishi Lin Date: Thu, 6 Apr 2017 22:44:44 +0800 Subject: [PATCH] Polish the storyboard - Set navigation titles in the storyboard, easier to find scenes now --- pass/Base.lproj/Main.storyboard | 176 ++++++++++-------- .../AboutRepositoryTableViewController.swift | 1 - .../AboutTableViewController.swift | 1 - .../AdvancedSettingsTableViewController.swift | 1 - .../CommitLogsTableViewController.swift | 2 - .../GeneralSettingsTableViewController.swift | 1 - ...SHKeyArmorSettingTableViewController.swift | 9 +- ...nSourceComponentsTableViewController.swift | 1 - .../SSHKeySettingTableViewController.swift | 11 +- .../SpecialThanksTableViewController.swift | 1 - 10 files changed, 102 insertions(+), 102 deletions(-) diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard index ef63a55..eaba41e 100644 --- a/pass/Base.lproj/Main.storyboard +++ b/pass/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ - + @@ -72,7 +72,7 @@ - + @@ -89,11 +89,11 @@ - + - + @@ -288,7 +288,7 @@ - + - + @@ -340,10 +341,10 @@ - + - + @@ -370,10 +371,10 @@ - + - + @@ -399,10 +400,10 @@ - + - + - + - + @@ -511,7 +512,7 @@ - + @@ -635,12 +636,12 @@ - + - + - + @@ -658,7 +659,7 @@ - + @@ -677,7 +678,7 @@ - + @@ -750,7 +751,7 @@ - + @@ -767,7 +768,6 @@ - Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda. @@ -794,9 +794,9 @@ - + - + @@ -810,13 +810,16 @@ + + + - + @@ -834,9 +837,9 @@ - + - + @@ -851,7 +854,7 @@ - + - + - + @@ -945,13 +955,14 @@ + - + @@ -969,9 +980,9 @@ - + - + @@ -990,7 +1001,7 @@ - + - + @@ -1073,6 +1085,7 @@ + @@ -1080,9 +1093,9 @@ - + - + @@ -1096,12 +1109,13 @@ + - + - + @@ -1115,10 +1129,11 @@ + - + @@ -1136,7 +1151,7 @@ - + @@ -1154,7 +1169,7 @@ - + @@ -1171,7 +1186,7 @@ - + @@ -1229,7 +1244,7 @@ - + @@ -1253,10 +1268,10 @@ - + - + @@ -1304,7 +1319,7 @@ - + @@ -1322,7 +1337,7 @@ - + @@ -1340,9 +1355,9 @@ - + - + @@ -1357,7 +1372,7 @@ - + @@ -1415,7 +1430,7 @@ - + @@ -1439,10 +1454,10 @@ - + - + @@ -1469,6 +1484,13 @@ + + + + + + + @@ -1476,7 +1498,7 @@ - + diff --git a/pass/Controllers/AboutRepositoryTableViewController.swift b/pass/Controllers/AboutRepositoryTableViewController.swift index 7789a6f..55deb52 100644 --- a/pass/Controllers/AboutRepositoryTableViewController.swift +++ b/pass/Controllers/AboutRepositoryTableViewController.swift @@ -18,7 +18,6 @@ class AboutRepositoryTableViewController: BasicStaticTableViewController { private let passwordStore = PasswordStore.shared override func viewDidLoad() { - navigationItemTitle = "About Repository" super.viewDidLoad() indicator.center = CGPoint(x: view.bounds.midX, y: view.bounds.height * 0.382) diff --git a/pass/Controllers/AboutTableViewController.swift b/pass/Controllers/AboutTableViewController.swift index 2562149..7ff79e2 100644 --- a/pass/Controllers/AboutTableViewController.swift +++ b/pass/Controllers/AboutTableViewController.swift @@ -21,7 +21,6 @@ class AboutTableViewController: BasicStaticTableViewController { [[.title: "Open Source Components", .action: "segue", .link: "showOpenSourceComponentsSegue"], [.title: "Special Thanks", .action: "segue", .link: "showSpecialThanksSegue"],], ] - navigationItemTitle = "About" super.viewDidLoad() } diff --git a/pass/Controllers/AdvancedSettingsTableViewController.swift b/pass/Controllers/AdvancedSettingsTableViewController.swift index c3ddc76..d8e5afd 100644 --- a/pass/Controllers/AdvancedSettingsTableViewController.swift +++ b/pass/Controllers/AdvancedSettingsTableViewController.swift @@ -27,7 +27,6 @@ class AdvancedSettingsTableViewController: UITableViewController { override func viewDidLoad() { super.viewDidLoad() - navigationItem.title = "Advanced" encryptInASCIIArmoredSwitch.isOn = Defaults[.encryptInArmored] encryptInASCIIArmoredTableViewCell.accessoryView = encryptInASCIIArmoredSwitch encryptInASCIIArmoredTableViewCell.selectionStyle = .none diff --git a/pass/Controllers/CommitLogsTableViewController.swift b/pass/Controllers/CommitLogsTableViewController.swift index 63e7d24..cabad03 100644 --- a/pass/Controllers/CommitLogsTableViewController.swift +++ b/pass/Controllers/CommitLogsTableViewController.swift @@ -16,8 +16,6 @@ class CommitLogsTableViewController: UITableViewController { override func viewDidLoad() { super.viewDidLoad() commits = passwordStore.getRecentCommits(count: 20) - navigationItem.title = "Recent Commit Logs" - navigationController!.navigationBar.topItem!.title = "About" } override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { diff --git a/pass/Controllers/GeneralSettingsTableViewController.swift b/pass/Controllers/GeneralSettingsTableViewController.swift index df1bede..686fe1d 100644 --- a/pass/Controllers/GeneralSettingsTableViewController.swift +++ b/pass/Controllers/GeneralSettingsTableViewController.swift @@ -47,7 +47,6 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController { }() override func viewDidLoad() { - navigationItemTitle = "General" tableData = [ // section 0 [[.title: "About Repository", .action: "segue", .link: "showAboutRepositorySegue"],], diff --git a/pass/Controllers/GitSSHKeyArmorSettingTableViewController.swift b/pass/Controllers/GitSSHKeyArmorSettingTableViewController.swift index 89a85cd..035f73a 100644 --- a/pass/Controllers/GitSSHKeyArmorSettingTableViewController.swift +++ b/pass/Controllers/GitSSHKeyArmorSettingTableViewController.swift @@ -14,7 +14,6 @@ class GitSSHKeyArmorSettingTableViewController: UITableViewController, UITextVie @IBOutlet weak var armorPrivateKeyTextView: UITextView! var gitSSHPrivateKeyPassphrase: String? let passwordStore = PasswordStore.shared - var doneBarButtonItem: UIBarButtonItem? private var recentPastedText = "" @@ -24,12 +23,6 @@ class GitSSHKeyArmorSettingTableViewController: UITableViewController, UITextVie armorPrivateKeyTextView.text = Defaults[.gitSSHPrivateKeyArmor] gitSSHPrivateKeyPassphrase = passwordStore.gitSSHPrivateKeyPassphrase - doneBarButtonItem = UIBarButtonItem(title: "Done", - style: UIBarButtonItemStyle.done, - target: self, - action: #selector(doneButtonTapped(_:))) - navigationItem.rightBarButtonItem = doneBarButtonItem - navigationItem.title = "SSH Key" armorPublicKeyTextView.delegate = self armorPrivateKeyTextView.delegate = self } @@ -50,7 +43,7 @@ class GitSSHKeyArmorSettingTableViewController: UITableViewController, UITextVie return savePassphraseAlert } - func doneButtonTapped(_ sender: Any) { + @IBAction func doneButtonTapped(_ sender: Any) { Defaults[.gitSSHPublicKeyArmor] = armorPublicKeyTextView.text Defaults[.gitSSHPrivateKeyArmor] = armorPrivateKeyTextView.text do { diff --git a/pass/Controllers/OpenSourceComponentsTableViewController.swift b/pass/Controllers/OpenSourceComponentsTableViewController.swift index 0dcc64d..6bffac5 100644 --- a/pass/Controllers/OpenSourceComponentsTableViewController.swift +++ b/pass/Controllers/OpenSourceComponentsTableViewController.swift @@ -44,7 +44,6 @@ class OpenSourceComponentsTableViewController: BasicStaticTableViewController { [CellDataKey.title: item[0], CellDataKey.action: "link", CellDataKey.link: item[1], CellDataKey.accessoryType: UITableViewCellAccessoryType.detailDisclosureButton, CellDataKey.detailDisclosureAction: #selector(actOnDetailDisclosureButton(_:)), CellDataKey.detailDisclosureData: item[2]] ) } - navigationItemTitle = "Open Source Components" super.viewDidLoad() } diff --git a/pass/Controllers/SSHKeySettingTableViewController.swift b/pass/Controllers/SSHKeySettingTableViewController.swift index eec6800..23f0c5c 100644 --- a/pass/Controllers/SSHKeySettingTableViewController.swift +++ b/pass/Controllers/SSHKeySettingTableViewController.swift @@ -20,17 +20,10 @@ class SSHKeySettingTableViewController: UITableViewController { super.viewDidLoad() privateKeyURLTextField.text = Defaults[.gitSSHPrivateKeyURL]?.absoluteString publicKeyURLTextField.text = Defaults[.gitSSHPublicKeyURL]?.absoluteString - var doneBarButtonItem: UIBarButtonItem? - - doneBarButtonItem = UIBarButtonItem(title: "Done", - style: UIBarButtonItemStyle.done, - target: self, - action: #selector(doneButtonTapped(_:))) - navigationItem.rightBarButtonItem = doneBarButtonItem - navigationItem.title = "SSH Key" } - func doneButtonTapped(_ sender: UIButton) { + + @IBAction func doneButtonTapped(_ sender: UIButton) { guard let publicKeyURL = URL(string: publicKeyURLTextField.text!) else { Utils.alert(title: "Cannot Save", message: "Please set Public Key URL first.", controller: self, completion: nil) return diff --git a/pass/Controllers/SpecialThanksTableViewController.swift b/pass/Controllers/SpecialThanksTableViewController.swift index 3c08198..8d58cee 100644 --- a/pass/Controllers/SpecialThanksTableViewController.swift +++ b/pass/Controllers/SpecialThanksTableViewController.swift @@ -27,7 +27,6 @@ class SpecialThanksTableViewController: BasicStaticTableViewController { [CellDataKey.action: "link", CellDataKey.title: item[0], CellDataKey.link: item[1]] ) } - navigationItemTitle = "Special Thanks" super.viewDidLoad() } }