From e3a49e2632cfda9c548728ae306ceb06374855ea Mon Sep 17 00:00:00 2001 From: Fabian Henneke Date: Mon, 6 Apr 2020 22:56:52 +0200 Subject: Modernize file listing and search in AutofillFilterActivity (#683) * WIP: Modernize file listing and search * Refactor * Implement fuzzy search * Improve ViewModel API and introduce Adapter * Integrate new search into AutofillFilterActivity and dedebounce * Improve no results layout * Reformat * Highlight origin in FileBased directory structure * Extract highlighting logic into DirectoryStructure * Trim whitespace before searching * Remove debug logging * Remove more debug logging * Organize imports * Remove imports * Update app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt Co-Authored-By: Harsh Shandilya * Address review comments Signed-off-by: Harsh Shandilya --- app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 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 52d3881e..fc0a0c00 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt @@ -159,11 +159,12 @@ class PasswordFragment : Fragment() { /** refreshes the adapter with the latest opened category */ fun refreshAdapter() { recyclerAdapter.clear() + val currentDir = if (pathStack.isEmpty()) getRepositoryDirectory(requireContext()) else pathStack.peek() recyclerAdapter.addAll( if (pathStack.isEmpty()) - getPasswords(getRepositoryDirectory(requireContext()), sortOrder) + getPasswords(currentDir, sortOrder) else - getPasswords(pathStack.peek(), getRepositoryDirectory(requireContext()), sortOrder) + getPasswords(currentDir, getRepositoryDirectory(requireContext()), sortOrder) ) } -- cgit v1.2.3