Improve the password length slider
- the slider appears after clicking "generate" - the slider goes away after clicking a non-password-related section - generate new password if the slider value changes
This commit is contained in:
Yishi Lin
parent
e4e20b1d6f
commit
5a02cb726e
6 changed files with 75 additions and 25 deletions
|
|
@ -16,8 +16,7 @@ class AddPasswordTableViewController: PasswordEditorTableViewController {
|
|||
override func viewDidLoad() {
|
||||
tableData = [
|
||||
[[.type: PasswordEditorCellType.textFieldCell, .title: "name"]],
|
||||
[[.type: PasswordEditorCellType.fillPasswordCell, .title: "password"],
|
||||
[.type: PasswordEditorCellType.passwordLengthCell, .title: "passwordlength"]],
|
||||
[[.type: PasswordEditorCellType.fillPasswordCell, .title: "password"]],
|
||||
[[.type: PasswordEditorCellType.textViewCell, .title: "additions"]],
|
||||
]
|
||||
super.viewDidLoad()
|
||||
|
|
|
|||
|
|
@ -12,8 +12,7 @@ class EditPasswordTableViewController: PasswordEditorTableViewController {
|
|||
override func viewDidLoad() {
|
||||
tableData = [
|
||||
[[.type: PasswordEditorCellType.textFieldCell, .title: "name", .content: password!.name]],
|
||||
[[.type: PasswordEditorCellType.fillPasswordCell, .title: "password", .content: password!.password],
|
||||
[.type: PasswordEditorCellType.passwordLengthCell, .title: "passwordlength"]],
|
||||
[[.type: PasswordEditorCellType.fillPasswordCell, .title: "password", .content: password!.password]],
|
||||
[[.type: PasswordEditorCellType.textViewCell, .title: "additions", .content: password!.getAdditionsPlainText()]],
|
||||
[[.type: PasswordEditorCellType.deletePasswordCell]],
|
||||
]
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ enum PasswordEditorCellKey {
|
|||
case type, title, content, placeholders
|
||||
}
|
||||
|
||||
class PasswordEditorTableViewController: UITableViewController, FillPasswordTableViewCellDelegate {
|
||||
class PasswordEditorTableViewController: UITableViewController, FillPasswordTableViewCellDelegate, PasswordSettingSliderTableViewCellDelegate, UIGestureRecognizerDelegate {
|
||||
var navigationItemTitle: String?
|
||||
var password: Password?
|
||||
var tableData = [
|
||||
|
|
@ -23,7 +23,9 @@ class PasswordEditorTableViewController: UITableViewController, FillPasswordTabl
|
|||
]()
|
||||
var sectionHeaderTitles = ["name", "password", "additions",""].map {$0.uppercased()}
|
||||
var sectionFooterTitles = ["", "", "Use \"key: value\" format for additional fields.", ""]
|
||||
let passwordSection = 1
|
||||
|
||||
var fillPasswordCell: FillPasswordTableViewCell?
|
||||
var passwordLengthCell: SliderTableViewCell?
|
||||
var deletePasswordCell: UITableViewCell?
|
||||
|
||||
|
|
@ -47,6 +49,10 @@ class PasswordEditorTableViewController: UITableViewController, FillPasswordTabl
|
|||
tableView.estimatedRowHeight = 48
|
||||
self.tableView.sectionFooterHeight = UITableViewAutomaticDimension;
|
||||
self.tableView.estimatedSectionFooterHeight = 0;
|
||||
|
||||
let tapGesture = UITapGestureRecognizer(target: self, action: #selector(tableTapped))
|
||||
tapGesture.delegate = self
|
||||
tableView.addGestureRecognizer(tapGesture)
|
||||
}
|
||||
|
||||
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
|
||||
|
|
@ -58,13 +64,14 @@ class PasswordEditorTableViewController: UITableViewController, FillPasswordTabl
|
|||
cell.setContent(content: cellData[PasswordEditorCellKey.content] as? String)
|
||||
return cell
|
||||
case .fillPasswordCell:
|
||||
let cell = tableView.dequeueReusableCell(withIdentifier: "fillPasswordCell", for: indexPath) as! FillPasswordTableViewCell
|
||||
cell.delegate = self
|
||||
cell.setContent(content: cellData[PasswordEditorCellKey.content] as? String)
|
||||
return cell
|
||||
fillPasswordCell = tableView.dequeueReusableCell(withIdentifier: "fillPasswordCell", for: indexPath) as? FillPasswordTableViewCell
|
||||
fillPasswordCell?.delegate = self
|
||||
fillPasswordCell?.setContent(content: cellData[PasswordEditorCellKey.content] as? String)
|
||||
return fillPasswordCell!
|
||||
case .passwordLengthCell:
|
||||
passwordLengthCell = tableView.dequeueReusableCell(withIdentifier: "passwordLengthCell", for: indexPath) as? SliderTableViewCell
|
||||
passwordLengthCell?.reset(title: "Length", minimumValue: Globals.passwordMinimumLength, maximumValue: Globals.passwordMaximumLength, defaultValue: Globals.passwordDefaultLength)
|
||||
passwordLengthCell?.delegate = self
|
||||
return passwordLengthCell!
|
||||
case .deletePasswordCell:
|
||||
return deletePasswordCell!
|
||||
|
|
@ -86,7 +93,7 @@ class PasswordEditorTableViewController: UITableViewController, FillPasswordTabl
|
|||
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
|
||||
return tableData[section].count
|
||||
}
|
||||
|
||||
|
||||
override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
|
||||
return sectionHeaderTitles[section]
|
||||
}
|
||||
|
|
@ -107,8 +114,41 @@ class PasswordEditorTableViewController: UITableViewController, FillPasswordTabl
|
|||
tableView.deselectRow(at: indexPath, animated: true)
|
||||
}
|
||||
|
||||
func generatePassword() -> String {
|
||||
// generate password, copy to pasteboard, and set the cell
|
||||
func generateAndCopyPassword() {
|
||||
// insert the length slider if not existed
|
||||
if passwordLengthCell == nil {
|
||||
let row = tableData[passwordSection].count
|
||||
tableData[passwordSection].append([.type: PasswordEditorCellType.passwordLengthCell, .title: "passwordlength"])
|
||||
let indexPath = IndexPath(row: row, section: passwordSection)
|
||||
tableView.insertRows(at: [indexPath], with: UITableViewRowAnimation.automatic)
|
||||
}
|
||||
let length = passwordLengthCell?.roundedValue ?? Globals.passwordDefaultLength
|
||||
return Utils.generatePassword(length: length)
|
||||
let plainPassword = Utils.generatePassword(length: length)
|
||||
Utils.copyToPasteboard(textToCopy: plainPassword)
|
||||
fillPasswordCell?.setContent(content: plainPassword)
|
||||
}
|
||||
|
||||
func tableTapped(tap: UITapGestureRecognizer) {
|
||||
let location = tap.location(in: self.tableView)
|
||||
let path = self.tableView.indexPathForRow(at: location)
|
||||
if path?.section != passwordSection, tableData[passwordSection].count > 1 {
|
||||
// remove password settings (e.g., sliders)
|
||||
let row = tableData[passwordSection].count
|
||||
passwordLengthCell = nil
|
||||
tableData[passwordSection].removeLast(row - 1)
|
||||
let indexPaths = (1...row-1).map{IndexPath(row: $0, section: passwordSection)}
|
||||
print(indexPaths)
|
||||
tableView.deleteRows(at: indexPaths, with: UITableViewRowAnimation.automatic)
|
||||
}
|
||||
}
|
||||
|
||||
func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
|
||||
if (gestureRecognizer is UITapGestureRecognizer) {
|
||||
// so that the tap gesture could be passed by
|
||||
return true
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
import UIKit
|
||||
|
||||
protocol FillPasswordTableViewCellDelegate {
|
||||
func generatePassword() -> String
|
||||
func generateAndCopyPassword()
|
||||
}
|
||||
|
||||
class FillPasswordTableViewCell: ContentTableViewCell {
|
||||
|
|
@ -30,9 +30,7 @@ class FillPasswordTableViewCell: ContentTableViewCell {
|
|||
}
|
||||
|
||||
@IBAction func generatePassword(_ sender: UIButton) {
|
||||
let plainPassword = self.delegate?.generatePassword() ?? Utils.generatePassword(length: 16)
|
||||
self.setContent(content: plainPassword)
|
||||
Utils.copyToPasteboard(textToCopy: plainPassword)
|
||||
self.delegate?.generateAndCopyPassword()
|
||||
}
|
||||
|
||||
override func getContent() -> String? {
|
||||
|
|
|
|||
|
|
@ -9,15 +9,21 @@
|
|||
|
||||
import UIKit
|
||||
|
||||
protocol PasswordSettingSliderTableViewCellDelegate {
|
||||
func generateAndCopyPassword()
|
||||
}
|
||||
|
||||
class SliderTableViewCell: ContentTableViewCell {
|
||||
|
||||
@IBOutlet weak var titleLabel: UILabel!
|
||||
@IBOutlet weak var valueLabel: UILabel!
|
||||
@IBOutlet weak var slider: UISlider!
|
||||
|
||||
var delegate: UITableViewController?
|
||||
|
||||
var roundedValue: Int {
|
||||
get {
|
||||
return Int(slider.value)
|
||||
return Int(valueLabel.text!)!
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -33,9 +39,17 @@ class SliderTableViewCell: ContentTableViewCell {
|
|||
}
|
||||
|
||||
@IBAction func handleSliderValueChange(_ sender: UISlider) {
|
||||
let roundedValue = round(sender.value)
|
||||
sender.value = roundedValue
|
||||
valueLabel.text = "\(Int(roundedValue))"
|
||||
let oldRoundedValue = self.roundedValue
|
||||
let newRoundedValue = Int(sender.value)
|
||||
// proceed only when the rounded value gets updated
|
||||
guard newRoundedValue != oldRoundedValue else {
|
||||
return;
|
||||
}
|
||||
sender.value = Float(newRoundedValue)
|
||||
valueLabel.text = "\(newRoundedValue)"
|
||||
if let delegate: PasswordSettingSliderTableViewCellDelegate = self.delegate as? PasswordSettingSliderTableViewCellDelegate {
|
||||
delegate.generateAndCopyPassword()
|
||||
}
|
||||
}
|
||||
|
||||
func reset(title: String, minimumValue: Int, maximumValue: Int, defaultValue: Int) {
|
||||
|
|
|
|||
|
|
@ -13,20 +13,20 @@
|
|||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="71" id="KGk-i7-Jjw" customClass="SliderTableViewCell" customModule="pass" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="71"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="74"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="70.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="73.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="MwT-Jl-hhE">
|
||||
<rect key="frame" x="60.5" y="20.5" width="205.5" height="31"/>
|
||||
<rect key="frame" x="60.5" y="22" width="205.5" height="31"/>
|
||||
<connections>
|
||||
<action selector="handleSliderValueChange:" destination="KGk-i7-Jjw" eventType="valueChanged" id="WwM-ZE-yIB"/>
|
||||
</connections>
|
||||
</slider>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="88" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GJP-Fj-VZt" userLabel="Value">
|
||||
<rect key="frame" x="281" y="8" width="24" height="54.5"/>
|
||||
<rect key="frame" x="281" y="8" width="24" height="57.5"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="24" id="tOG-yp-eFw"/>
|
||||
</constraints>
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t7T-HC-hUd" userLabel="Title">
|
||||
<rect key="frame" x="15" y="8" width="30" height="54.5"/>
|
||||
<rect key="frame" x="15" y="8" width="30" height="57.5"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="38" id="8Tz-Qo-Mkg"/>
|
||||
</constraints>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue