lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Implement selection of password generator flavor with segmented control

Browse source
This commit is contained in:
Danny Moesch 2020-03-07 23:32:59 +01:00 • committed by Mingshen Sun
parent 2c65173c71
commit eca4d79178
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
pass/Controllers/PasswordEditorTableViewController.swift
View file

@ -82,11 +82,14 @@ class PasswordEditorTableViewController: UITableViewController {
scanQRCodeCell?.selectionStyle = .default scanQRCodeCell?.selectionStyle = .default
scanQRCodeCell?.accessoryType = .disclosureIndicator scanQRCodeCell?.accessoryType = .disclosureIndicator
passwordFlavorCell = UITableViewCell(style: .value1, reuseIdentifier: "default") passwordFlavorCell = UITableViewCell(style: .default, reuseIdentifier: "default")
passwordFlavorCell?.textLabel?.text = "PasswordGeneratorFlavor".localize() passwordFlavorCell?.textLabel?.text = "PasswordGeneratorFlavor".localize()
passwordFlavorCell?.selectionStyle = .none passwordFlavorCell?.selectionStyle = .none
passwordFlavorCell?.accessoryType = .disclosureIndicator
passwordFlavorCell?.detailTextLabel?.text = passwordGenerator.flavor.localized let passwordFlavorSelector = UISegmentedControl(items: PasswordGeneratorFlavor.allCases.map { $0.localized })
passwordFlavorSelector.selectedSegmentIndex = PasswordGeneratorFlavor.allCases.firstIndex(of: passwordGenerator.flavor)!
passwordFlavorSelector.addTarget(self, action: #selector(flavorChanged), for: .valueChanged)
passwordFlavorCell?.accessoryView = passwordFlavorSelector
} }
override func viewDidLoad() { override func viewDidLoad() {
@ -112,11 +115,11 @@ class PasswordEditorTableViewController: UITableViewController {
], ],
[ [
[.type: PasswordEditorCellType.fillPasswordCell, .title: "Password".localize(), .content: password?.password ?? ""], [.type: PasswordEditorCellType.fillPasswordCell, .title: "Password".localize(), .content: password?.password ?? ""],
[.type: PasswordEditorCellType.passwordFlavorCell],
[.type: PasswordEditorCellType.passwordLengthCell], [.type: PasswordEditorCellType.passwordLengthCell],
[.type: PasswordEditorCellType.passwordUseDigitsCell], [.type: PasswordEditorCellType.passwordUseDigitsCell],
[.type: PasswordEditorCellType.passwordVaryCasesCell], [.type: PasswordEditorCellType.passwordVaryCasesCell],
[.type: PasswordEditorCellType.passwordUseSpecialSymbols], [.type: PasswordEditorCellType.passwordUseSpecialSymbols],
[.type: PasswordEditorCellType.passwordFlavorCell],
], ],
[ [
[.type: PasswordEditorCellType.additionsCell, .title: "Additions".localize(), .content: password?.additionsPlainText ?? ""], [.type: PasswordEditorCellType.additionsCell, .title: "Additions".localize(), .content: password?.additionsPlainText ?? ""],
@ -296,7 +299,7 @@ class PasswordEditorTableViewController: UITableViewController {
guard tableData[1].first(where: isPasswordDelimiterCellData) == nil else { guard tableData[1].first(where: isPasswordDelimiterCellData) == nil else {
return return
} }
tableData[1].insert([.type: PasswordEditorCellType.passwordGroupsCell], at: tableData[1].endIndex - 1) tableData[1].insert([.type: PasswordEditorCellType.passwordGroupsCell], at: tableData[1].endIndex)
case .xkcd: case .xkcd:
tableData[1].removeAll(where: isPasswordDelimiterCellData) tableData[1].removeAll(where: isPasswordDelimiterCellData)
} }
@ -306,6 +309,17 @@ class PasswordEditorTableViewController: UITableViewController {
return (data[.type] as? PasswordEditorCellType) == .some(.passwordGroupsCell) return (data[.type] as? PasswordEditorCellType) == .some(.passwordGroupsCell)
} }
@objc func flavorChanged(_ sender: UISegmentedControl) {
let flavor = PasswordGeneratorFlavor.allCases[sender.selectedSegmentIndex]
guard passwordGenerator.flavor != flavor else {
return
}
passwordGenerator.flavor = flavor
updateTableData(withRespectTo: flavor)
tableView.reloadSections([passwordSection], with: .none)
generateAndCopyPassword()
}
// generate the password, don't care whether the original line is otp // generate the password, don't care whether the original line is otp
private func generateAndCopyPasswordNoOtpCheck() { private func generateAndCopyPasswordNoOtpCheck() {
// show password settings (e.g., the length slider) // show password settings (e.g., the length slider)