From 3cdf77347a4e35232bbbe2b7445f96af63ecfc0c Mon Sep 17 00:00:00 2001 From: Danny Moesch Date: Wed, 12 Feb 2020 23:28:04 +0100 Subject: [PATCH] Name classes consistently * Settings are called *SettingsTableViewController * Key importers are called *ImportTableViewController * Classes in UserInterface folder are split into Controllers or Views --- pass.xcodeproj/project.pbxproj | 70 ++++++++----------- pass/Base.lproj/Main.storyboard | 14 ++-- .../AdvancedSettingsTableViewController.swift | 2 +- .../AutoCellHeightUITableViewController.swift | 0 ...itConfigSettingsTableViewController.swift} | 4 +- ...positorySettingsTableViewController.swift} | 4 +- ...GPKeyArmorImportTableViewController.swift} | 6 +- ...PGPKeyFIleImportTableViewController.swift} | 8 +-- ... PGPKeyUrlImportTableViewController.swift} | 6 +- ...SHKeyArmorImportTableViewController.swift} | 4 +- ... SSHKeyUrlImportTableViewController.swift} | 4 +- .../SettingsTableViewController.swift | 6 +- .../UICodeHighlightingLabel.swift | 0 .../UILocalizedLabel.swift | 0 14 files changed, 60 insertions(+), 68 deletions(-) rename pass/{UserInterface => Controllers}/AutoCellHeightUITableViewController.swift (100%) rename pass/Controllers/{GitConfigSettingTableViewController.swift => GitConfigSettingsTableViewController.swift} (92%) rename pass/Controllers/{GitServerSettingTableViewController.swift => GitRepositorySettingsTableViewController.swift} (99%) rename pass/Controllers/{PGPKeyArmorSettingTableViewController.swift => PGPKeyArmorImportTableViewController.swift} (96%) rename pass/Controllers/{PGPKeyFileSettingTableViewController.swift => PGPKeyFIleImportTableViewController.swift} (92%) rename pass/Controllers/{PGPKeyUrlTableViewController.swift => PGPKeyUrlImportTableViewController.swift} (94%) rename pass/Controllers/{GitSSHKeyArmorSettingTableViewController.swift => SSHKeyArmorImportTableViewController.swift} (95%) rename pass/Controllers/{SSHKeySettingTableViewController.swift => SSHKeyUrlImportTableViewController.swift} (91%) rename pass/{UserInterface => Views}/UICodeHighlightingLabel.swift (100%) rename pass/{UserInterface => Views}/UILocalizedLabel.swift (100%) diff --git a/pass.xcodeproj/project.pbxproj b/pass.xcodeproj/project.pbxproj index 2ff17b4..b93b18d 100644 --- a/pass.xcodeproj/project.pbxproj +++ b/pass.xcodeproj/project.pbxproj @@ -13,7 +13,7 @@ 301F6463216162550071A4CE /* AdditionField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 301F6462216162550071A4CE /* AdditionField.swift */; }; 301F6468216165290071A4CE /* ConstantsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 301F6467216165290071A4CE /* ConstantsTest.swift */; }; 301F646D216166AA0071A4CE /* AdditionFieldTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 301F646C216166AA0071A4CE /* AdditionFieldTest.swift */; }; - 302269B323E634B000F843A3 /* PGPKeyFileSettingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 302269B223E634B000F843A3 /* PGPKeyFileSettingTableViewController.swift */; }; + 302269B323E634B000F843A3 /* PGPKeyFIleImportTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 302269B223E634B000F843A3 /* PGPKeyFIleImportTableViewController.swift */; }; 302B2C9822C2BDE700D831EE /* AppKeychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 302B2C9722C2BDE700D831EE /* AppKeychain.swift */; }; 302E85612125ECC70031BA64 /* Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 302E85602125ECC70031BA64 /* Parser.swift */; }; 302E85632125EE550031BA64 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 302E85622125EE550031BA64 /* Constants.swift */; }; @@ -84,7 +84,7 @@ 9A8A8387402FCCCECB1232A4 /* Pods_passKitTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B2B2F844061EFA534FE9506 /* Pods_passKitTests.framework */; }; 9AA710CA23939C68009E3213 /* GitCredentialPassword.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AA710C923939C68009E3213 /* GitCredentialPassword.swift */; }; A20691F41F2A3D0E0096483D /* SecurePasteboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = A20691F31F2A3D0E0096483D /* SecurePasteboard.swift */; }; - A217ACE41E9BBBBD00A1A6CF /* GitConfigSettingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A217ACE31E9BBBBD00A1A6CF /* GitConfigSettingTableViewController.swift */; }; + A217ACE41E9BBBBD00A1A6CF /* GitConfigSettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A217ACE31E9BBBBD00A1A6CF /* GitConfigSettingsTableViewController.swift */; }; A2367B9C1EEFE2E500C8FE8B /* SwiftyUserDefaults.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCA049951E3357E000522E8F /* SwiftyUserDefaults.framework */; }; A2367BA01EF0387000C8FE8B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A2367B9F1EF0387000C8FE8B /* Assets.xcassets */; }; A239F5902158C07D00576CBF /* AuthenticationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A239F58F2158C07D00576CBF /* AuthenticationServices.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; @@ -129,19 +129,19 @@ DC4914961E434301007FF592 /* LabelTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC4914941E434301007FF592 /* LabelTableViewCell.swift */; }; DC4914991E434600007FF592 /* PasswordDetailTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC4914981E434600007FF592 /* PasswordDetailTableViewController.swift */; }; DC5734AE1E439AD400D09270 /* PasswordsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC5734AD1E439AD400D09270 /* PasswordsViewController.swift */; }; - DC5F385B1E56AADB00C69ACA /* PGPKeyArmorSettingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC5F385A1E56AADB00C69ACA /* PGPKeyArmorSettingTableViewController.swift */; }; - DC8963C01E38EEB900828B09 /* SSHKeySettingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC8963BF1E38EEB900828B09 /* SSHKeySettingTableViewController.swift */; }; + DC5F385B1E56AADB00C69ACA /* PGPKeyArmorImportTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC5F385A1E56AADB00C69ACA /* PGPKeyArmorImportTableViewController.swift */; }; + DC8963C01E38EEB900828B09 /* SSHKeyUrlImportTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC8963BF1E38EEB900828B09 /* SSHKeyUrlImportTableViewController.swift */; }; DC917BD71E2E8231000FDF54 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC917BD61E2E8231000FDF54 /* AppDelegate.swift */; }; DC917BDC1E2E8231000FDF54 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DC917BDA1E2E8231000FDF54 /* Main.storyboard */; }; DC917BDE1E2E8231000FDF54 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DC917BDD1E2E8231000FDF54 /* Assets.xcassets */; }; DC917BE11E2E8231000FDF54 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DC917BDF1E2E8231000FDF54 /* LaunchScreen.storyboard */; }; DC962CDF1E4B62C10033B5D8 /* AboutTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC962CDE1E4B62C10033B5D8 /* AboutTableViewController.swift */; }; - DCA0499A1E335CC800522E8F /* GitServerSettingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA049991E335CC800522E8F /* GitServerSettingTableViewController.swift */; }; - DCA0499C1E3362F400522E8F /* PGPKeyUrlTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA0499B1E3362F400522E8F /* PGPKeyUrlTableViewController.swift */; }; + DCA0499A1E335CC800522E8F /* GitRepositorySettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA049991E335CC800522E8F /* GitRepositorySettingsTableViewController.swift */; }; + DCA0499C1E3362F400522E8F /* PGPKeyUrlImportTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA0499B1E3362F400522E8F /* PGPKeyUrlImportTableViewController.swift */; }; DCAAF7451E2FA66800AB94BC /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAAF7441E2FA66800AB94BC /* SettingsTableViewController.swift */; }; DCC408C71E307DBB00F29B0E /* SVProgressHUD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC408C61E307DBB00F29B0E /* SVProgressHUD.framework */; }; DCC441521E8F6C06008A90C4 /* RawPasswordViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCC441511E8F6C06008A90C4 /* RawPasswordViewController.swift */; }; - DCC441541E916382008A90C4 /* GitSSHKeyArmorSettingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCC441531E916382008A90C4 /* GitSSHKeyArmorSettingTableViewController.swift */; }; + DCC441541E916382008A90C4 /* SSHKeyArmorImportTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCC441531E916382008A90C4 /* SSHKeyArmorImportTableViewController.swift */; }; DCD3C65E1EFB9BB400CBE842 /* SettingsSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCD3C65D1EFB9BB400CBE842 /* SettingsSplitViewController.swift */; }; DCDDEAB01E4639F300F68193 /* LabelTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = DCDDEAAF1E4639F300F68193 /* LabelTableViewCell.xib */; }; DCDDEAB31E4896BF00F68193 /* PasswordDetailTitleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCDDEAB11E4896BF00F68193 /* PasswordDetailTitleTableViewCell.swift */; }; @@ -234,7 +234,7 @@ 301F6467216165290071A4CE /* ConstantsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstantsTest.swift; sourceTree = ""; }; 301F646C216166AA0071A4CE /* AdditionFieldTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionFieldTest.swift; sourceTree = ""; }; 302202EE222F14E400555236 /* SearchBarScope.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchBarScope.swift; sourceTree = ""; }; - 302269B223E634B000F843A3 /* PGPKeyFileSettingTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PGPKeyFileSettingTableViewController.swift; sourceTree = ""; }; + 302269B223E634B000F843A3 /* PGPKeyFIleImportTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PGPKeyFIleImportTableViewController.swift; sourceTree = ""; }; 302B2C9722C2BDE700D831EE /* AppKeychain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppKeychain.swift; sourceTree = ""; }; 302E85602125ECC70031BA64 /* Parser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Parser.swift; sourceTree = ""; }; 302E85622125EE550031BA64 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = ""; }; @@ -301,7 +301,7 @@ 7CAD21E487234A0631B52E20 /* Pods-passKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-passKit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-passKit/Pods-passKit.debug.xcconfig"; sourceTree = ""; }; 9AA710C923939C68009E3213 /* GitCredentialPassword.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GitCredentialPassword.swift; sourceTree = ""; }; A20691F31F2A3D0E0096483D /* SecurePasteboard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecurePasteboard.swift; sourceTree = ""; }; - A217ACE31E9BBBBD00A1A6CF /* GitConfigSettingTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = GitConfigSettingTableViewController.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; + A217ACE31E9BBBBD00A1A6CF /* GitConfigSettingsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = GitConfigSettingsTableViewController.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; A2367B9F1EF0387000C8FE8B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; A239F58F2158C07D00576CBF /* AuthenticationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AuthenticationServices.framework; path = System/Library/Frameworks/AuthenticationServices.framework; sourceTree = SDKROOT; }; A239F5952158C08B00576CBF /* passAutoFillExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = passAutoFillExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -351,8 +351,8 @@ DC4914981E434600007FF592 /* PasswordDetailTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordDetailTableViewController.swift; sourceTree = ""; }; DC547D572040664E838F3DB3 /* Pods-pass.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-pass.debug.xcconfig"; path = "Pods/Target Support Files/Pods-pass/Pods-pass.debug.xcconfig"; sourceTree = ""; }; DC5734AD1E439AD400D09270 /* PasswordsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordsViewController.swift; sourceTree = ""; }; - DC5F385A1E56AADB00C69ACA /* PGPKeyArmorSettingTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PGPKeyArmorSettingTableViewController.swift; sourceTree = ""; }; - DC8963BF1E38EEB900828B09 /* SSHKeySettingTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SSHKeySettingTableViewController.swift; sourceTree = ""; }; + DC5F385A1E56AADB00C69ACA /* PGPKeyArmorImportTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PGPKeyArmorImportTableViewController.swift; sourceTree = ""; }; + DC8963BF1E38EEB900828B09 /* SSHKeyUrlImportTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SSHKeyUrlImportTableViewController.swift; sourceTree = ""; }; DC917BD31E2E8231000FDF54 /* pass.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = pass.app; sourceTree = BUILT_PRODUCTS_DIR; }; DC917BD61E2E8231000FDF54 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; DC917BDB1E2E8231000FDF54 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; @@ -361,14 +361,14 @@ DC917BE21E2E8231000FDF54 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; DC962CDE1E4B62C10033B5D8 /* AboutTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutTableViewController.swift; sourceTree = ""; }; DCA049951E3357E000522E8F /* SwiftyUserDefaults.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftyUserDefaults.framework; path = Carthage/Build/iOS/SwiftyUserDefaults.framework; sourceTree = ""; }; - DCA049991E335CC800522E8F /* GitServerSettingTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitServerSettingTableViewController.swift; sourceTree = ""; }; - DCA0499B1E3362F400522E8F /* PGPKeyUrlTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PGPKeyUrlTableViewController.swift; sourceTree = ""; }; + DCA049991E335CC800522E8F /* GitRepositorySettingsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitRepositorySettingsTableViewController.swift; sourceTree = ""; }; + DCA0499B1E3362F400522E8F /* PGPKeyUrlImportTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PGPKeyUrlImportTableViewController.swift; sourceTree = ""; }; DCA671DE1E7A73B100D3ABE1 /* OneTimePassword.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OneTimePassword.framework; path = Carthage/Build/iOS/OneTimePassword.framework; sourceTree = ""; }; DCA742D91E599ED400D54E16 /* KeychainAccess.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = KeychainAccess.framework; path = Carthage/Build/iOS/KeychainAccess.framework; sourceTree = ""; }; DCAAF7441E2FA66800AB94BC /* SettingsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewController.swift; sourceTree = ""; }; DCC408C61E307DBB00F29B0E /* SVProgressHUD.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SVProgressHUD.framework; path = Carthage/Build/iOS/SVProgressHUD.framework; sourceTree = ""; }; DCC441511E8F6C06008A90C4 /* RawPasswordViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RawPasswordViewController.swift; sourceTree = ""; }; - DCC441531E916382008A90C4 /* GitSSHKeyArmorSettingTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitSSHKeyArmorSettingTableViewController.swift; sourceTree = ""; }; + DCC441531E916382008A90C4 /* SSHKeyArmorImportTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SSHKeyArmorImportTableViewController.swift; sourceTree = ""; }; DCD3C65D1EFB9BB400CBE842 /* SettingsSplitViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsSplitViewController.swift; sourceTree = ""; }; DCDDEAAF1E4639F300F68193 /* LabelTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LabelTableViewCell.xib; sourceTree = ""; }; DCDDEAB11E4896BF00F68193 /* PasswordDetailTitleTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordDetailTitleTableViewCell.swift; sourceTree = ""; }; @@ -546,16 +546,6 @@ path = Models; sourceTree = ""; }; - 30C25DD421F4831200BB27BB /* UserInterface */ = { - isa = PBXGroup; - children = ( - 30C25DD621F4834D00BB27BB /* UICodeHighlightingLabel.swift */, - 30C25DD521F4834D00BB27BB /* UILocalizedLabel.swift */, - 300713C42219D54100F553AC /* AutoCellHeightUITableViewController.swift */, - ); - path = UserInterface; - sourceTree = ""; - }; 30CCA90C232584560048CA51 /* Crypto */ = { isa = PBXGroup; children = ( @@ -707,27 +697,28 @@ DC962CDE1E4B62C10033B5D8 /* AboutTableViewController.swift */, DC037CB71E4DD1A500609409 /* AddPasswordTableViewController.swift */, DC193FF91E49B4430077E0A3 /* AdvancedSettingsTableViewController.swift */, + 300713C42219D54100F553AC /* AutoCellHeightUITableViewController.swift */, DC037CA71E4B898100609409 /* BasicStaticTableViewController.swift */, DC3E64E51E656F11009A83DE /* CommitLogsTableViewController.swift */, DCFB77A61E502DF9008DE471 /* EditPasswordTableViewController.swift */, DC037CAF1E4CA51F00609409 /* GeneralSettingsTableViewController.swift */, - A217ACE31E9BBBBD00A1A6CF /* GitConfigSettingTableViewController.swift */, - DCA049991E335CC800522E8F /* GitServerSettingTableViewController.swift */, - DCC441531E916382008A90C4 /* GitSSHKeyArmorSettingTableViewController.swift */, + A217ACE31E9BBBBD00A1A6CF /* GitConfigSettingsTableViewController.swift */, + DCA049991E335CC800522E8F /* GitRepositorySettingsTableViewController.swift */, DC037CA51E4B883900609409 /* OpenSourceComponentsTableViewController.swift */, DC4914981E434600007FF592 /* PasswordDetailTableViewController.swift */, DCFB77A81E502FF6008DE471 /* PasswordEditorTableViewController.swift */, DC5734AD1E439AD400D09270 /* PasswordsViewController.swift */, - DC5F385A1E56AADB00C69ACA /* PGPKeyArmorSettingTableViewController.swift */, - 302269B223E634B000F843A3 /* PGPKeyFileSettingTableViewController.swift */, + DC5F385A1E56AADB00C69ACA /* PGPKeyArmorImportTableViewController.swift */, + 302269B223E634B000F843A3 /* PGPKeyFIleImportTableViewController.swift */, 3066AD6723EE0D6500F65535 /* PGPKeyImporter.swift */, - DCA0499B1E3362F400522E8F /* PGPKeyUrlTableViewController.swift */, + DCA0499B1E3362F400522E8F /* PGPKeyUrlImportTableViewController.swift */, A2A7813E1E97DBD9001311F5 /* QRScannerController.swift */, DCC441511E8F6C06008A90C4 /* RawPasswordViewController.swift */, DCD3C65D1EFB9BB400CBE842 /* SettingsSplitViewController.swift */, DCAAF7441E2FA66800AB94BC /* SettingsTableViewController.swift */, DC037CA91E4B8EAE00609409 /* SpecialThanksTableViewController.swift */, - DC8963BF1E38EEB900828B09 /* SSHKeySettingTableViewController.swift */, + DCC441531E916382008A90C4 /* SSHKeyArmorImportTableViewController.swift */, + DC8963BF1E38EEB900828B09 /* SSHKeyUrlImportTableViewController.swift */, ); path = Controllers; sourceTree = ""; @@ -759,6 +750,8 @@ DC037CBA1E4DD47B00609409 /* TextFieldTableViewCell.xib */, DC037CBD1E4ED4E100609409 /* TextViewTableViewCell.swift */, DC037CBE1E4ED4E100609409 /* TextViewTableViewCell.xib */, + 30C25DD621F4834D00BB27BB /* UICodeHighlightingLabel.swift */, + 30C25DD521F4834D00BB27BB /* UILocalizedLabel.swift */, ); path = Views; sourceTree = ""; @@ -796,7 +789,6 @@ children = ( DC19400C1E4B39400077E0A3 /* Controllers */, DC19400E1E4B3A610077E0A3 /* Helpers */, - 30C25DD421F4831200BB27BB /* UserInterface */, DC19400F1E4B3A9E0077E0A3 /* Views */, DC917BDD1E2E8231000FDF54 /* Assets.xcassets */, DC917BD61E2E8231000FDF54 /* AppDelegate.swift */, @@ -1384,18 +1376,18 @@ buildActionMask = 2147483647; files = ( DC037CBF1E4ED4E100609409 /* TextViewTableViewCell.swift in Sources */, - DCC441541E916382008A90C4 /* GitSSHKeyArmorSettingTableViewController.swift in Sources */, + DCC441541E916382008A90C4 /* SSHKeyArmorImportTableViewController.swift in Sources */, A2A61C201EEFABAD00CFE063 /* UtilsExtension.swift in Sources */, - DC8963C01E38EEB900828B09 /* SSHKeySettingTableViewController.swift in Sources */, + DC8963C01E38EEB900828B09 /* SSHKeyUrlImportTableViewController.swift in Sources */, 3066AD6823EE0D6500F65535 /* PGPKeyImporter.swift in Sources */, DC193FFA1E49B4430077E0A3 /* AdvancedSettingsTableViewController.swift in Sources */, DCFB77AB1E503729008DE471 /* ContentProvider.swift in Sources */, - DCA0499C1E3362F400522E8F /* PGPKeyUrlTableViewController.swift in Sources */, + DCA0499C1E3362F400522E8F /* PGPKeyUrlImportTableViewController.swift in Sources */, DC4914961E434301007FF592 /* LabelTableViewCell.swift in Sources */, - DC5F385B1E56AADB00C69ACA /* PGPKeyArmorSettingTableViewController.swift in Sources */, + DC5F385B1E56AADB00C69ACA /* PGPKeyArmorImportTableViewController.swift in Sources */, DCAAF7451E2FA66800AB94BC /* SettingsTableViewController.swift in Sources */, DCFB77A71E502DF9008DE471 /* EditPasswordTableViewController.swift in Sources */, - DCA0499A1E335CC800522E8F /* GitServerSettingTableViewController.swift in Sources */, + DCA0499A1E335CC800522E8F /* GitRepositorySettingsTableViewController.swift in Sources */, DCDDEAB31E4896BF00F68193 /* PasswordDetailTitleTableViewCell.swift in Sources */, A2A7813F1E97DBD9001311F5 /* QRScannerController.swift in Sources */, DC4914991E434600007FF592 /* PasswordDetailTableViewController.swift in Sources */, @@ -1404,7 +1396,7 @@ 30C25DD721F4834D00BB27BB /* UILocalizedLabel.swift in Sources */, DC5734AE1E439AD400D09270 /* PasswordsViewController.swift in Sources */, 300713C52219D54100F553AC /* AutoCellHeightUITableViewController.swift in Sources */, - 302269B323E634B000F843A3 /* PGPKeyFileSettingTableViewController.swift in Sources */, + 302269B323E634B000F843A3 /* PGPKeyFIleImportTableViewController.swift in Sources */, DCD3C65E1EFB9BB400CBE842 /* SettingsSplitViewController.swift in Sources */, A20691F41F2A3D0E0096483D /* SecurePasteboard.swift in Sources */, DC3E64E61E656F11009A83DE /* CommitLogsTableViewController.swift in Sources */, @@ -1414,7 +1406,7 @@ DCFB779E1E4F40C7008DE471 /* FillPasswordTableViewCell.swift in Sources */, A2802BF91E70813A00879216 /* SliderTableViewCell.swift in Sources */, DC037CB21E4CAB1700609409 /* AboutRepositoryTableViewController.swift in Sources */, - A217ACE41E9BBBBD00A1A6CF /* GitConfigSettingTableViewController.swift in Sources */, + A217ACE41E9BBBBD00A1A6CF /* GitConfigSettingsTableViewController.swift in Sources */, 9AA710CA23939C68009E3213 /* GitCredentialPassword.swift in Sources */, DC037CB01E4CA51F00609409 /* GeneralSettingsTableViewController.swift in Sources */, DC037CB81E4DD1A500609409 /* AddPasswordTableViewController.swift in Sources */, diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard index 5fbb26a..d9bf56d 100644 --- a/pass/Base.lproj/Main.storyboard +++ b/pass/Base.lproj/Main.storyboard @@ -312,7 +312,7 @@ - + @@ -506,7 +506,7 @@ - + @@ -946,7 +946,7 @@ Secret Question 1: What is your childhood best friend's most bizarre superhero f - + @@ -1299,7 +1299,7 @@ Secret Question 1: What is your childhood best friend's most bizarre superhero f - + @@ -1473,7 +1473,7 @@ Secret Question 1: What is your childhood best friend's most bizarre superhero f - + @@ -1567,7 +1567,7 @@ Secret Question 1: What is your childhood best friend's most bizarre superhero f - + @@ -1760,7 +1760,7 @@ Secret Question 1: What is your childhood best friend's most bizarre superhero f - + diff --git a/pass/Controllers/AdvancedSettingsTableViewController.swift b/pass/Controllers/AdvancedSettingsTableViewController.swift index 5ac0e5b..2275201 100644 --- a/pass/Controllers/AdvancedSettingsTableViewController.swift +++ b/pass/Controllers/AdvancedSettingsTableViewController.swift @@ -82,7 +82,7 @@ class AdvancedSettingsTableViewController: UITableViewController { } @IBAction func saveGitConfigSetting(segue: UIStoryboardSegue) { - if let controller = segue.source as? GitConfigSettingTableViewController { + if let controller = segue.source as? GitConfigSettingsTableViewController { if let gitSignatureName = controller.nameTextField.text, let gitSignatureEmail = controller.emailTextField.text { Defaults.gitSignatureName = gitSignatureName.isEmpty ? nil : gitSignatureName diff --git a/pass/UserInterface/AutoCellHeightUITableViewController.swift b/pass/Controllers/AutoCellHeightUITableViewController.swift similarity index 100% rename from pass/UserInterface/AutoCellHeightUITableViewController.swift rename to pass/Controllers/AutoCellHeightUITableViewController.swift diff --git a/pass/Controllers/GitConfigSettingTableViewController.swift b/pass/Controllers/GitConfigSettingsTableViewController.swift similarity index 92% rename from pass/Controllers/GitConfigSettingTableViewController.swift rename to pass/Controllers/GitConfigSettingsTableViewController.swift index ae25bed..9a02af5 100644 --- a/pass/Controllers/GitConfigSettingTableViewController.swift +++ b/pass/Controllers/GitConfigSettingsTableViewController.swift @@ -1,5 +1,5 @@ // -// GitConfigSettingTableViewController.swift +// GitConfigSettingsTableViewController.swift // pass // // Created by Yishi Lin on 10/4/17. @@ -9,7 +9,7 @@ import UIKit import passKit -class GitConfigSettingTableViewController: UITableViewController { +class GitConfigSettingsTableViewController: UITableViewController { let passwordStore = PasswordStore.shared @IBOutlet weak var nameTextField: UITextField! diff --git a/pass/Controllers/GitServerSettingTableViewController.swift b/pass/Controllers/GitRepositorySettingsTableViewController.swift similarity index 99% rename from pass/Controllers/GitServerSettingTableViewController.swift rename to pass/Controllers/GitRepositorySettingsTableViewController.swift index c6a3723..9145fe8 100644 --- a/pass/Controllers/GitServerSettingTableViewController.swift +++ b/pass/Controllers/GitRepositorySettingsTableViewController.swift @@ -1,5 +1,5 @@ // -// GitServerSettingTableViewController.swift +// GitRepositorySettingsTableViewController.swift // pass // // Created by Mingshen Sun on 21/1/2017. @@ -11,7 +11,7 @@ import SVProgressHUD import passKit -class GitServerSettingTableViewController: UITableViewController { +class GitRepositorySettingsTableViewController: UITableViewController { // MARK: - View Outlet @IBOutlet weak var gitURLTextField: UITextField! diff --git a/pass/Controllers/PGPKeyArmorSettingTableViewController.swift b/pass/Controllers/PGPKeyArmorImportTableViewController.swift similarity index 96% rename from pass/Controllers/PGPKeyArmorSettingTableViewController.swift rename to pass/Controllers/PGPKeyArmorImportTableViewController.swift index 3280265..137873b 100644 --- a/pass/Controllers/PGPKeyArmorSettingTableViewController.swift +++ b/pass/Controllers/PGPKeyArmorImportTableViewController.swift @@ -1,5 +1,5 @@ // -// PGPKeyArmorSettingTableViewController.swift +// PGPKeyArmorImportTableViewController.swift // pass // // Created by Mingshen Sun on 17/2/2017. @@ -9,7 +9,7 @@ import UIKit import passKit -class PGPKeyArmorSettingTableViewController: AutoCellHeightUITableViewController, UITextViewDelegate, QRScannerControllerDelegate { +class PGPKeyArmorImportTableViewController: AutoCellHeightUITableViewController, UITextViewDelegate, QRScannerControllerDelegate { @IBOutlet weak var armorPublicKeyTextView: UITextView! @IBOutlet weak var armorPrivateKeyTextView: UITextView! @IBOutlet weak var scanPublicKeyCell: UITableViewCell! @@ -130,7 +130,7 @@ class PGPKeyArmorSettingTableViewController: AutoCellHeightUITableViewController } } -extension PGPKeyArmorSettingTableViewController: PGPKeyImporter { +extension PGPKeyArmorImportTableViewController: PGPKeyImporter { static let keySource = PGPKeySource.armor static let label = "AsciiArmorEncryptedKey".localize() diff --git a/pass/Controllers/PGPKeyFileSettingTableViewController.swift b/pass/Controllers/PGPKeyFIleImportTableViewController.swift similarity index 92% rename from pass/Controllers/PGPKeyFileSettingTableViewController.swift rename to pass/Controllers/PGPKeyFIleImportTableViewController.swift index a487843..6c8ad21 100644 --- a/pass/Controllers/PGPKeyFileSettingTableViewController.swift +++ b/pass/Controllers/PGPKeyFIleImportTableViewController.swift @@ -1,5 +1,5 @@ // -// PGPKeyFileSettingTableViewController.swift +// PGPKeyFileImportTableViewController.swift // pass // // Created by Danny Moesch on 01.02.20. @@ -8,7 +8,7 @@ import passKit -class PGPKeyFileSettingTableViewController: AutoCellHeightUITableViewController { +class PGPKeyFileImportTableViewController: AutoCellHeightUITableViewController { @IBOutlet weak var pgpPublicKeyFile: UITableViewCell! @IBOutlet weak var pgpPrivateKeyFile: UITableViewCell! @@ -45,7 +45,7 @@ class PGPKeyFileSettingTableViewController: AutoCellHeightUITableViewController } } -extension PGPKeyFileSettingTableViewController: UIDocumentPickerDelegate { +extension PGPKeyFileImportTableViewController: UIDocumentPickerDelegate { func documentPicker(_: UIDocumentPickerViewController, didPickDocumentsAt url: [URL]) { guard let url = url.first else { @@ -70,7 +70,7 @@ extension PGPKeyFileSettingTableViewController: UIDocumentPickerDelegate { } } -extension PGPKeyFileSettingTableViewController: PGPKeyImporter { +extension PGPKeyFileImportTableViewController: PGPKeyImporter { static let keySource = PGPKeySource.files static let label = "LoadFromFiles".localize() diff --git a/pass/Controllers/PGPKeyUrlTableViewController.swift b/pass/Controllers/PGPKeyUrlImportTableViewController.swift similarity index 94% rename from pass/Controllers/PGPKeyUrlTableViewController.swift rename to pass/Controllers/PGPKeyUrlImportTableViewController.swift index f059dcf..dc60726 100644 --- a/pass/Controllers/PGPKeyUrlTableViewController.swift +++ b/pass/Controllers/PGPKeyUrlImportTableViewController.swift @@ -1,5 +1,5 @@ // -// PGPKeyUrlTableViewController.swift +// PGPKeyUrlImportTableViewController.swift // pass // // Created by Mingshen Sun on 21/1/2017. @@ -9,7 +9,7 @@ import UIKit import passKit -class PGPKeyUrlTableViewController: AutoCellHeightUITableViewController { +class PGPKeyUrlImportTableViewController: AutoCellHeightUITableViewController { @IBOutlet weak var pgpPublicKeyURLTextField: UITextField! @IBOutlet weak var pgpPrivateKeyURLTextField: UITextField! @@ -44,7 +44,7 @@ class PGPKeyUrlTableViewController: AutoCellHeightUITableViewController { } } -extension PGPKeyUrlTableViewController: PGPKeyImporter { +extension PGPKeyUrlImportTableViewController: PGPKeyImporter { static let keySource = PGPKeySource.url static let label = "DownloadFromUrl".localize() diff --git a/pass/Controllers/GitSSHKeyArmorSettingTableViewController.swift b/pass/Controllers/SSHKeyArmorImportTableViewController.swift similarity index 95% rename from pass/Controllers/GitSSHKeyArmorSettingTableViewController.swift rename to pass/Controllers/SSHKeyArmorImportTableViewController.swift index 82d0aa3..43e8905 100644 --- a/pass/Controllers/GitSSHKeyArmorSettingTableViewController.swift +++ b/pass/Controllers/SSHKeyArmorImportTableViewController.swift @@ -1,5 +1,5 @@ // -// GitSSHKeyArmorSettingTableViewController.swift +// SSHKeyArmorImportTableViewController.swift // pass // // Created by Mingshen Sun on 2/4/2017. @@ -9,7 +9,7 @@ import UIKit import passKit -class GitSSHKeyArmorSettingTableViewController: AutoCellHeightUITableViewController, UITextViewDelegate, QRScannerControllerDelegate { +class SSHKeyArmorImportTableViewController: AutoCellHeightUITableViewController, UITextViewDelegate, QRScannerControllerDelegate { @IBOutlet weak var armorPrivateKeyTextView: UITextView! @IBOutlet weak var scanPrivateKeyCell: UITableViewCell! diff --git a/pass/Controllers/SSHKeySettingTableViewController.swift b/pass/Controllers/SSHKeyUrlImportTableViewController.swift similarity index 91% rename from pass/Controllers/SSHKeySettingTableViewController.swift rename to pass/Controllers/SSHKeyUrlImportTableViewController.swift index f5e0f6c..6c7da7c 100644 --- a/pass/Controllers/SSHKeySettingTableViewController.swift +++ b/pass/Controllers/SSHKeyUrlImportTableViewController.swift @@ -1,5 +1,5 @@ // -// SSHKeySettingTableViewController.swift +// SSHKeyUrlImportTableViewController.swift // pass // // Created by Mingshen Sun on 25/1/2017. @@ -10,7 +10,7 @@ import UIKit import SVProgressHUD import passKit -class SSHKeySettingTableViewController: AutoCellHeightUITableViewController { +class SSHKeyUrlImportTableViewController: AutoCellHeightUITableViewController { @IBOutlet weak var privateKeyURLTextField: UITextField! diff --git a/pass/Controllers/SettingsTableViewController.swift b/pass/Controllers/SettingsTableViewController.swift index 4f9a431..a04fdbe 100644 --- a/pass/Controllers/SettingsTableViewController.swift +++ b/pass/Controllers/SettingsTableViewController.swift @@ -130,13 +130,13 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele func showPGPKeyActionSheet() { let optionMenu = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) - optionMenu.addAction(UIAlertAction(title: PGPKeyUrlTableViewController.menuLabel, style: .default) { _ in + optionMenu.addAction(UIAlertAction(title: PGPKeyUrlImportTableViewController.menuLabel, style: .default) { _ in self.performSegue(withIdentifier: "setPGPKeyByURLSegue", sender: self) }) - optionMenu.addAction(UIAlertAction(title: PGPKeyArmorSettingTableViewController.menuLabel, style: .default) { _ in + optionMenu.addAction(UIAlertAction(title: PGPKeyArmorImportTableViewController.menuLabel, style: .default) { _ in self.performSegue(withIdentifier: "setPGPKeyByASCIISegue", sender: self) }) - optionMenu.addAction(UIAlertAction(title: PGPKeyFileSettingTableViewController.menuLabel, style: .default) { _ in + optionMenu.addAction(UIAlertAction(title: PGPKeyFileImportTableViewController.menuLabel, style: .default) { _ in self.performSegue(withIdentifier: "setPGPKeyByFileSegue", sender: self) }) diff --git a/pass/UserInterface/UICodeHighlightingLabel.swift b/pass/Views/UICodeHighlightingLabel.swift similarity index 100% rename from pass/UserInterface/UICodeHighlightingLabel.swift rename to pass/Views/UICodeHighlightingLabel.swift diff --git a/pass/UserInterface/UILocalizedLabel.swift b/pass/Views/UILocalizedLabel.swift similarity index 100% rename from pass/UserInterface/UILocalizedLabel.swift rename to pass/Views/UILocalizedLabel.swift