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

Merge and resolve conflit

Browse source
This commit is contained in:
Bob Sun 2017-03-21 13:34:26 -07:00
commit c21502a10f
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
5 changed files with 139 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pass/Views/FillPasswordTableViewCell.swift
View file

@ -20,6 +20,7 @@ class FillPasswordTableViewCell: ContentTableViewCell {
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
contentTextField.font = UIFont(name: Globals.passwordFonts, size: (contentTextField.font?.pointSize)!)
}
override func setSelected(_ selected: Bool, animated: Bool) {
@ -30,7 +31,7 @@ class FillPasswordTableViewCell: ContentTableViewCell {
@IBAction func generatePassword(_ sender: UIButton) {
let plainPassword = self.delegate?.generatePassword() ?? Utils.generatePassword(length: 16)
contentTextField.attributedText = Utils.attributedPassword(plainPassword: plainPassword)
self.setContent(content: plainPassword)
Utils.copyToPasteboard(textToCopy: plainPassword)
}