Restore previous scrolling position of Note list after coming back fr…

…om search result
ARK-Builders · Sep 26, 2024 · 482fe08 · 482fe08
1 parent 9a5fd37
commit 482fe08
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/app/src/main/java/dev/arkbuilders/arkmemo/ui/fragments/NotesFragment.kt b/app/src/main/java/dev/arkbuilders/arkmemo/ui/fragments/NotesFragment.kt
@@ -158,8 +158,19 @@ class NotesFragment: Fragment() {
                         binding.groupSearchResultEmpty.gone()
                     }
                     notesAdapter?.updateData(notes, fromSearch = true, keyword = text.toString())
+
+                    //When search text is cleared, restore previous note item position in the list
+                    if (text.toString().isEmpty() && binding.edtSearch.hasFocus()) {
+                        binding.rvPinnedNotes.layoutManager?.scrollToPosition(lastNoteItemPosition)
+                    }
                 }
         })
+
+        binding.edtSearch.setOnFocusChangeListener { _, hasFocus ->
+            if (hasFocus) {
+                lastNoteItemPosition = getCurrentScrollPosition()
+            }
+        }
     }
 
     private fun onNotesLoaded(notes: List<Note>) {
@@ -251,8 +262,12 @@ class NotesFragment: Fragment() {
 
     override fun onPause() {
         super.onPause()
+        lastNoteItemPosition = getCurrentScrollPosition()
+    }
+
+    private fun getCurrentScrollPosition(): Int {
         val layoutMgr = (binding.rvPinnedNotes.layoutManager as? LinearLayoutManager)
-        lastNoteItemPosition = layoutMgr?.findFirstCompletelyVisibleItemPosition() ?: 0
+        return layoutMgr?.findFirstCompletelyVisibleItemPosition() ?: 0
     }
 
     override fun onResume() {

diff --git a/app/src/main/java/dev/arkbuilders/arkmemo/ui/viewmodels/NotesViewModel.kt b/app/src/main/java/dev/arkbuilders/arkmemo/ui/viewmodels/NotesViewModel.kt
@@ -69,9 +69,13 @@ class NotesViewModel @Inject constructor(
             //triggered within 0.5 second window.
             delay(500)
             notes.collectLatest {
-                val filteredNotes = it.filter { note ->
-                    note.title.contains(keyword, true)
-                }
+                val filteredNotes = it
+                    .filter { note ->
+                        note.title.contains(keyword, true)
+                    }
+
+                    //Keep the search result ordered chronologically
+                    .sortedByDescending { note -> note.resource?.modified }
                 withContext(Dispatchers.Main) {
                     onSuccess(filteredNotes)
                 }