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

Update the logic to generate password sections

Browse source 
Using localized indexed collation, instead of the first character.
This commit is contained in:
Yishi Lin 2017-04-03 22:40:17 +08:00
parent ddae01dac5
commit e155cbedb3
1 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

64
pass/Controllers/PasswordsViewController.swift
View file

@ -11,14 +11,15 @@ import SVProgressHUD
import SwiftyUserDefaults import SwiftyUserDefaults
import PasscodeLock import PasscodeLock
enum PasswordsTableEntryType { fileprivate class PasswordsTableEntry : NSObject {
case password, dir
}
struct PasswordsTableEntry {
var title: String var title: String
var isDir: Bool var isDir: Bool
var passwordEntity: PasswordEntity? var passwordEntity: PasswordEntity?
init(title: String, isDir: Bool, passwordEntity: PasswordEntity?) {
self.title = title
self.isDir = isDir
self.passwordEntity = passwordEntity
}
} }
class PasswordsViewController: UIViewController, UITableViewDataSource, UITableViewDelegate, UITabBarControllerDelegate { class PasswordsViewController: UIViewController, UITableViewDataSource, UITableViewDelegate, UITabBarControllerDelegate {
@ -29,7 +30,8 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
private var tapTabBarTime: TimeInterval = 0 private var tapTabBarTime: TimeInterval = 0
private var sections : [(index: Int, length :Int, title: String)] = Array() private var sections = [(title: String, entries: [PasswordsTableEntry])]()
private var searchActive : Bool = false private var searchActive : Bool = false
private lazy var searchController: UISearchController = { private lazy var searchController: UISearchController = {
@ -196,7 +198,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
} }
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return sections[section].length return sections[section].entries.count
} }
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@ -241,14 +243,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
} }
private func getPasswordEntry(by indexPath: IndexPath) -> PasswordsTableEntry { private func getPasswordEntry(by indexPath: IndexPath) -> PasswordsTableEntry {
var entry: PasswordsTableEntry return sections[indexPath.section].entries[indexPath.row]
let index = sections[indexPath.section].index + indexPath.row
if searchController.isActive && searchController.searchBar.text != "" {
entry = filteredPasswordsTableEntries[index]
} else {
entry = passwordsTableEntries[index]
}
return entry
} }
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
@ -345,25 +340,30 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
} }
private func generateSections(item: [PasswordsTableEntry]) { private func generateSections(item: [PasswordsTableEntry]) {
sections.removeAll() let collation = UILocalizedIndexedCollation.current()
guard item.count != 0 else { let sectionTitles = collation.sectionIndexTitles
return var newSections = [(title: String, entries: [PasswordsTableEntry])]()
// initialize all sections
for i in 0..<sectionTitles.count {
newSections.append((title: sectionTitles[i], entries: [PasswordsTableEntry]()))
} }
var index = 0
for i in 0 ..< item.count { // put entries into sections
let title = item[index].title.uppercased() for entry in item {
let commonPrefix = item[i].title.commonPrefix(with: title, options: .caseInsensitive) let sectionNumber = collation.section(for: entry, collationStringSelector: #selector(getter: PasswordsTableEntry.title))
if commonPrefix.characters.count == 0 { newSections[sectionNumber].entries.append(entry)
let firstCharacter = title[title.startIndex]
let newSection = (index: index, length: i - index, title: "\(firstCharacter)")
sections.append(newSection)
index = i
}
} }
let title = item[index].title.uppercased()
let firstCharacter = title[title.startIndex] // sort each list and set sectionTitles
let newSection = (index: index, length: item.count - index, title: "\(firstCharacter)") for i in 0..<sectionTitles.count {
sections.append(newSection) let entriesToSort = newSections[i].entries
let sortedEntries = collation.sortedArray(from: entriesToSort, collationStringSelector: #selector(getter: PasswordsTableEntry.title))
newSections[i].entries = sortedEntries as! [PasswordsTableEntry]
}
// only keep non-empty sections
sections = newSections.filter {$0.entries.count > 0}
} }
func actOnSearchNotification() { func actOnSearchNotification() {