diff --git a/pass/Password.swift b/pass/Password.swift index 8bcd2a7..f1818ff 100644 --- a/pass/Password.swift +++ b/pass/Password.swift @@ -37,12 +37,12 @@ extension PasswordEntity { var decrypted_password = "" var decrypted_addtions = [String: String]() plain.enumerateLines(invoking: { line, _ in - let item = line.characters.split(separator: ":").map(String.init) - if item.count == 1 { - decrypted_password = item[0] + let items = line.characters.split(separator: ":").map(String.init) + if items.count == 1 { + decrypted_password = items[0] } else { - let key = item[0] - let value = item[1].trimmingCharacters(in: .whitespaces) + let key = items[0] + let value = items[1].trimmingCharacters(in: .whitespaces) decrypted_addtions[key] = value } }) diff --git a/pass/PasswordDetailTableViewController.swift b/pass/PasswordDetailTableViewController.swift index 44aed71..0a79bd6 100644 --- a/pass/PasswordDetailTableViewController.swift +++ b/pass/PasswordDetailTableViewController.swift @@ -10,6 +10,8 @@ import UIKit class PasswordDetailTableViewController: UITableViewController, UIGestureRecognizerDelegate { var passwordEntity: PasswordEntity? + var passwordCategoryEntities: [PasswordCategoryEntity]? + var passwordCategoryText = "" var password = Password() struct TableCell { @@ -29,6 +31,11 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni tableView.register(UINib(nibName: "LabelTableViewCell", bundle: nil), forCellReuseIdentifier: "labelCell") tableView.register(UINib(nibName: "PasswordDetailTitleTableViewCell", bundle: nil), forCellReuseIdentifier: "passwordDetailTitleTableViewCell") + let passwordCategoryArray = passwordCategoryEntities?.map({ (value: PasswordCategoryEntity) -> String in + value.category! + }) + passwordCategoryText = (passwordCategoryArray?.joined(separator: " > "))! + let tapGesture = UITapGestureRecognizer(target: self, action: #selector(PasswordDetailTableViewController.tapMenu(recognizer:))) tableView.addGestureRecognizer(tapGesture) tapGesture.delegate = self @@ -119,7 +126,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni let cell = tableView.dequeueReusableCell(withIdentifier: "passwordDetailTitleTableViewCell", for: indexPath) as! PasswordDetailTitleTableViewCell cell.passwordImageImageView.image = #imageLiteral(resourceName: "PasswordImagePlaceHolder") cell.nameLabel.text = passwordEntity?.name - cell.categoryLabel.text = "category1 > category2" + cell.categoryLabel.text = passwordCategoryText return cell } else { diff --git a/pass/PasswordDetailTitleTableViewCell.xib b/pass/PasswordDetailTitleTableViewCell.xib index 9d36397..ff63b25 100644 --- a/pass/PasswordDetailTitleTableViewCell.xib +++ b/pass/PasswordDetailTitleTableViewCell.xib @@ -33,7 +33,7 @@