From b948390008232fab75d6ea33a7c94c455fc74e3b Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 7 Jun 2020 23:02:07 +0200 Subject: [PATCH] fix some weird sorting at search results --- .../filemanager/pro/fragments/ItemsFragment.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt index ae7f710a..6db83309 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt @@ -175,7 +175,8 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb items_fastscroller.allowBubbleDisplay = true 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]) @@ -348,7 +349,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb val sorting = context!!.config.getFolderSorting(path) FileDirItem.sorting = context!!.config.getFolderSorting(currentPath) val isSortingBySize = sorting and SORT_BY_SIZE != 0 - File(path).listFiles()?.forEach { + File(path).listFiles()?.sortedBy { it.isDirectory }?.forEach { if (it.isDirectory) { files.addAll(searchFiles(text, it.absolutePath)) } else { @@ -360,7 +361,6 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb } } } - files.sort() return files }