fix some weird sorting at search results

This commit is contained in:
tibbi 2020-06-07 23:02:07 +02:00
parent e665c38f05
commit b948390008

View File

@ -175,7 +175,8 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
items_fastscroller.allowBubbleDisplay = true items_fastscroller.allowBubbleDisplay = true
items_fastscroller.setViews(items_list, mView.items_swipe_refresh) { items_fastscroller.setViews(items_list, mView.items_swipe_refresh) {
items_fastscroller.updateBubbleText(storedItems.getOrNull(it)?.getBubbleText(context, storedDateFormat, storedTimeFormat) ?: "") items_fastscroller.updateBubbleText(storedItems.getOrNull(it)?.getBubbleText(context, storedDateFormat, storedTimeFormat)
?: "")
} }
getRecyclerLayoutManager().onRestoreInstanceState(scrollStates[currentPath]) getRecyclerLayoutManager().onRestoreInstanceState(scrollStates[currentPath])
@ -348,7 +349,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
val sorting = context!!.config.getFolderSorting(path) val sorting = context!!.config.getFolderSorting(path)
FileDirItem.sorting = context!!.config.getFolderSorting(currentPath) FileDirItem.sorting = context!!.config.getFolderSorting(currentPath)
val isSortingBySize = sorting and SORT_BY_SIZE != 0 val isSortingBySize = sorting and SORT_BY_SIZE != 0
File(path).listFiles()?.forEach { File(path).listFiles()?.sortedBy { it.isDirectory }?.forEach {
if (it.isDirectory) { if (it.isDirectory) {
files.addAll(searchFiles(text, it.absolutePath)) files.addAll(searchFiles(text, it.absolutePath))
} else { } else {
@ -360,7 +361,6 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
} }
} }
} }
files.sort()
return files return files
} }