diff --git a/Cartfile b/Cartfile index 42faa39..f4c5aa1 100644 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,3 @@ github "SVProgressHUD/SVProgressHUD" github "radex/SwiftyUserDefaults" github "libgit2/objective-git" -github "ra1028/Former" diff --git a/pass.xcodeproj/project.pbxproj b/pass.xcodeproj/project.pbxproj index 0965ecb..7a2399d 100644 --- a/pass.xcodeproj/project.pbxproj +++ b/pass.xcodeproj/project.pbxproj @@ -10,10 +10,6 @@ 94BA784B85E071D25EE89B59 /* libPods-pass.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADCE7A5C3CCC67D7D21BB3C4 /* libPods-pass.a */; }; DC1208561E35D0BA0042942E /* PasswordsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC1208551E35D0BA0042942E /* PasswordsTableViewController.swift */; }; DC1208581E35EBE60042942E /* ObjectiveGit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1208571E35EBE60042942E /* ObjectiveGit.framework */; }; - DC286D461E37444D00DBF9C8 /* Former.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC286D451E37444D00DBF9C8 /* Former.framework */; }; - DC286D4A1E374AF100DBF9C8 /* SSHKeySettingFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC286D491E374AF100DBF9C8 /* SSHKeySettingFormViewController.swift */; }; - DC286D4E1E37B53F00DBF9C8 /* TextFieldTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC286D4C1E37B53E00DBF9C8 /* TextFieldTableViewCell.swift */; }; - DC286D4F1E37B53F00DBF9C8 /* TextFieldTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = DC286D4D1E37B53F00DBF9C8 /* TextFieldTableViewCell.xib */; }; DC3DC8391E2F63240062A988 /* PasswordDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC3DC8381E2F63240062A988 /* PasswordDetailViewController.swift */; }; DC8963BE1E38AD8300828B09 /* GitRepositoryAuthenticationSettingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC8963BD1E38AD8300828B09 /* GitRepositoryAuthenticationSettingTableViewController.swift */; }; DC917BD71E2E8231000FDF54 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC917BD61E2E8231000FDF54 /* AppDelegate.swift */; }; @@ -38,10 +34,6 @@ AEAD6B31EAF5D061447A68CC /* Pods-pass.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-pass.release.xcconfig"; path = "Pods/Target Support Files/Pods-pass/Pods-pass.release.xcconfig"; sourceTree = ""; }; DC1208551E35D0BA0042942E /* PasswordsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordsTableViewController.swift; sourceTree = ""; }; DC1208571E35EBE60042942E /* ObjectiveGit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ObjectiveGit.framework; path = Carthage/Build/iOS/ObjectiveGit.framework; sourceTree = ""; }; - DC286D451E37444D00DBF9C8 /* Former.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Former.framework; path = Carthage/Build/iOS/Former.framework; sourceTree = ""; }; - DC286D491E374AF100DBF9C8 /* SSHKeySettingFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SSHKeySettingFormViewController.swift; sourceTree = ""; }; - DC286D4C1E37B53E00DBF9C8 /* TextFieldTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFieldTableViewCell.swift; sourceTree = ""; }; - DC286D4D1E37B53F00DBF9C8 /* TextFieldTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TextFieldTableViewCell.xib; sourceTree = ""; }; DC3DC8381E2F63240062A988 /* PasswordDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordDetailViewController.swift; sourceTree = ""; }; DC4A746D1E30FBDE00E8EB18 /* Objective-CBridgingHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Objective-CBridgingHeader.h"; sourceTree = ""; }; DC8963BD1E38AD8300828B09 /* GitRepositoryAuthenticationSettingTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitRepositoryAuthenticationSettingTableViewController.swift; sourceTree = ""; }; @@ -70,7 +62,6 @@ files = ( DC917BEF1E2F38C5000FDF54 /* Result.framework in Frameworks */, DCC408C71E307DBB00F29B0E /* SVProgressHUD.framework in Frameworks */, - DC286D461E37444D00DBF9C8 /* Former.framework in Frameworks */, DC1208581E35EBE60042942E /* ObjectiveGit.framework in Frameworks */, DCA049961E3357E000522E8F /* SwiftyUserDefaults.framework in Frameworks */, 94BA784B85E071D25EE89B59 /* libPods-pass.a in Frameworks */, @@ -110,9 +101,6 @@ DC917BD51E2E8231000FDF54 /* pass */ = { isa = PBXGroup; children = ( - DC286D491E374AF100DBF9C8 /* SSHKeySettingFormViewController.swift */, - DC286D4C1E37B53E00DBF9C8 /* TextFieldTableViewCell.swift */, - DC286D4D1E37B53F00DBF9C8 /* TextFieldTableViewCell.xib */, DC1208551E35D0BA0042942E /* PasswordsTableViewController.swift */, DC4A746D1E30FBDE00E8EB18 /* Objective-CBridgingHeader.h */, DC917BD61E2E8231000FDF54 /* AppDelegate.swift */, @@ -136,7 +124,6 @@ DC917BED1E2F38C4000FDF54 /* Frameworks */ = { isa = PBXGroup; children = ( - DC286D451E37444D00DBF9C8 /* Former.framework */, DC1208571E35EBE60042942E /* ObjectiveGit.framework */, DCA049951E3357E000522E8F /* SwiftyUserDefaults.framework */, DCC408C61E307DBB00F29B0E /* SVProgressHUD.framework */, @@ -213,7 +200,6 @@ DC917BE11E2E8231000FDF54 /* LaunchScreen.storyboard in Resources */, DC917BDE1E2E8231000FDF54 /* Assets.xcassets in Resources */, DC917BDC1E2E8231000FDF54 /* Main.storyboard in Resources */, - DC286D4F1E37B53F00DBF9C8 /* TextFieldTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -275,7 +261,6 @@ "$(SRCROOT)/Carthage/Build/iOS/SVProgressHUD.framework", "$(SRCROOT)/Carthage/Build/iOS/SwiftyUserDefaults.framework", "$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework", - "$(SRCROOT)/Carthage/Build/iOS/Former.framework", ); outputPaths = ( ); @@ -293,10 +278,8 @@ DCC408A41E2FCC9E00F29B0E /* PasswordStore.swift in Sources */, DCA0499C1E3362F400522E8F /* PGPKeySettingTableViewController.swift in Sources */, DC1208561E35D0BA0042942E /* PasswordsTableViewController.swift in Sources */, - DC286D4E1E37B53F00DBF9C8 /* TextFieldTableViewCell.swift in Sources */, DCAAF7451E2FA66800AB94BC /* SettingsTableViewController.swift in Sources */, DCA0499A1E335CC800522E8F /* GitServerSettingTableViewController.swift in Sources */, - DC286D4A1E374AF100DBF9C8 /* SSHKeySettingFormViewController.swift in Sources */, DCC277D21E30D6EA00402246 /* pass.xcdatamodeld in Sources */, DC8963BE1E38AD8300828B09 /* GitRepositoryAuthenticationSettingTableViewController.swift in Sources */, DC917BD71E2E8231000FDF54 /* AppDelegate.swift in Sources */, diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard index e8b7bad..c93dab5 100644 --- a/pass/Base.lproj/Main.storyboard +++ b/pass/Base.lproj/Main.storyboard @@ -113,9 +113,6 @@ - - - @@ -165,14 +162,6 @@ - - - - - - - - diff --git a/pass/SSHKeySettingFormViewController.swift b/pass/SSHKeySettingFormViewController.swift deleted file mode 100644 index 921ba62..0000000 --- a/pass/SSHKeySettingFormViewController.swift +++ /dev/null @@ -1,35 +0,0 @@ -// -// SSHKeySettingFormViewController.swift -// pass -// -// Created by Mingshen Sun on 24/1/2017. -// Copyright © 2017 Bob Sun. All rights reserved. -// - -import Former - -class SSHKeySettingFormViewController: FormViewController { - - override func viewDidLoad() { - super.viewDidLoad() - - let publicKeyURLTextFieldRow = TextFieldRowFormer(instantiateType: .Nib(nibName: "TextFieldTableViewCell")) { (row: TextFieldTableViewCell) -> Void in - row.titleLabel.text = "SSH Public Key URL" - }.configure { (row) in - row.rowHeight = 52 - } - let privateKeyURLTextFieldRow = TextFieldRowFormer(instantiateType: .Nib(nibName: "TextFieldTableViewCell")) { (row: TextFieldTableViewCell) -> Void in - row.titleLabel.text = "SSH Private Key URL" - }.configure { (row) in - row.rowHeight = 52 - } - - let privateKeyPhassphraseTextFieldRow = TextFieldRowFormer(instantiateType: .Nib(nibName: "TextFieldTableViewCell")) { (row: TextFieldTableViewCell) -> Void in - row.titleLabel.text = "Phassphrase" - row.textField.isSecureTextEntry = true - }.configure { (row) in - row.rowHeight = 52 - } - former.append(sectionFormer: SectionFormer(rowFormer: publicKeyURLTextFieldRow, privateKeyURLTextFieldRow, privateKeyPhassphraseTextFieldRow)) - } -} diff --git a/pass/TextFieldTableViewCell.swift b/pass/TextFieldTableViewCell.swift deleted file mode 100644 index 81e4087..0000000 --- a/pass/TextFieldTableViewCell.swift +++ /dev/null @@ -1,30 +0,0 @@ -// -// TextFieldTableViewCell.swift -// pass -// -// Created by Mingshen Sun on 25/1/2017. -// Copyright © 2017 Bob Sun. All rights reserved. -// - -import UIKit -import Former - -class TextFieldTableViewCell: UITableViewCell, TextFieldFormableRow { - @IBOutlet weak var titleLabel: UILabel! - @IBOutlet weak var textField: UITextField! - - override func awakeFromNib() { - super.awakeFromNib() - } - - func formTextField() -> UITextField { - return textField - } - - func formTitleLabel() -> UILabel? { - return titleLabel - } - - func updateWithRowFormer(_ rowFormer: RowFormer) {} - -} diff --git a/pass/TextFieldTableViewCell.xib b/pass/TextFieldTableViewCell.xib deleted file mode 100644 index 613d83d..0000000 --- a/pass/TextFieldTableViewCell.xib +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -