From 9255583f2d0e5cfb7a88ee54ceb4f5284d41cbfa Mon Sep 17 00:00:00 2001 From: Gigahawk Date: Wed, 19 Feb 2020 22:19:09 -0800 Subject: Better UI flow (#630) * Filter against entire pathname when searching * Add option to directly open search dialog on start * Replace basic search filter with fuzzy search * Update CHANGELOG Signed-off-by: Harsh Shandilya * Open search in onResume, force search icon to always show * Add option to always search from root directory Co-authored-by: Harsh Shandilya --- .../java/com/zeapo/pwdstore/PasswordFragment.kt | 31 +++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt index dc3331d2..ad01000c 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt @@ -24,7 +24,6 @@ import com.zeapo.pwdstore.utils.PasswordRepository.Companion.getPasswords import com.zeapo.pwdstore.utils.PasswordRepository.Companion.getRepositoryDirectory import com.zeapo.pwdstore.utils.PasswordRepository.PasswordSortOrder.Companion.getSortOrder import java.io.File -import java.util.Locale import java.util.Stack import me.zhanghai.android.fastscroll.FastScrollerBuilder @@ -157,10 +156,36 @@ class PasswordFragment : Fragment() { if (filter.isEmpty()) { refreshAdapter() } else { - recursiveFilter(filter, if (pathStack.isEmpty()) null else pathStack.peek()) + recursiveFilter( + filter, + if (pathStack.isEmpty() || + settings.getBoolean("search_from_root", false)) + null + else pathStack.peek()) } } + /** + * fuzzy matches the filter against the given string + * + * based on https://www.forrestthewoods.com/blog/reverse_engineering_sublime_texts_fuzzy_match/ + * + * @param filter the filter to apply + * @param str the string to filter against + * + * @return true if the filter fuzzymatches the string + */ + private fun fuzzyMatch(filter: String, str: String): Boolean { + var i = 0 + var j = 0 + while (i < filter.length && j < str.length) { + if (filter[i].isWhitespace() || filter[i].toLowerCase() == str[j].toLowerCase()) + i++ + j++ + } + return i == filter.length + } + /** * recursively filters a directory and extract all the matching items * @@ -177,7 +202,7 @@ class PasswordFragment : Fragment() { if (item.type == PasswordItem.TYPE_CATEGORY && rec) { recursiveFilter(filter, item.file) } - val matches = item.toString().toLowerCase(Locale.ROOT).contains(filter.toLowerCase(Locale.ROOT)) + val matches = fuzzyMatch(filter, item.longName) val inAdapter = recyclerAdapter.values.contains(item) if (matches && !inAdapter) { recyclerAdapter.add(item) -- cgit v1.2.3