fenix
/
Simple-File-Manager
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

group search results by parent folder

This commit is contained in:
tibbi 2019-03-27 17:48:32 +01:00
parent fbff35a25c
commit ad8745e109
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
View File

@ -575,7 +575,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
view.apply {
if (listItem.isSectionTitle) {
item_section.text = listItem.mName
item_section.setTextColor(adjustedPrimaryColor)
item_section.setTextColor(textColor)
} else {
item_frame.isSelected = isSelected
val fileName = listItem.name

20
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
View File

@ -204,7 +204,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
callback(path, items)
}
private fun getFileDirItemFromFile(file: File, isSortingBySize: Boolean, nestingLevel: Int = 0): ListItem? {
private fun getFileDirItemFromFile(file: File, isSortingBySize: Boolean): ListItem? {
val curPath = file.absolutePath
val curName = file.name
if (!showHidden && curName.startsWith(".")) {
@ -271,8 +271,18 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
}
}
else -> {
val files = searchFiles(searchText, currentPath)
val listItems = ArrayList<ListItem>()
listItems.addAll(searchFiles(searchText, currentPath, 0))
var previousParent = ""
files.forEach {
val parent = it.mPath.getParentPath()
if (parent != previousParent) {
listItems.add(ListItem("", context!!.humanizePath(parent), false, 0, 0, true))
previousParent = parent
}
listItems.add(it)
}
activity?.runOnUiThread {
getRecyclerAdapter()?.updateItems(listItems, text)
@ -287,15 +297,15 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
}.start()
}
private fun searchFiles(text: String, path: String, nestingLevel: Int): ArrayList<ListItem> {
private fun searchFiles(text: String, path: String): ArrayList<ListItem> {
val files = ArrayList<ListItem>()
val isSortingBySize = context!!.config.getFolderSorting(path) and SORT_BY_SIZE != 0
File(path).listFiles()?.forEach {
if (it.isDirectory) {
files.addAll(searchFiles(text, it.absolutePath, nestingLevel + 1))
files.addAll(searchFiles(text, it.absolutePath))
} else {
if (it.name.startsWith(text, true)) {
val fileDirItem = getFileDirItemFromFile(it, isSortingBySize, nestingLevel)
val fileDirItem = getFileDirItemFromFile(it, isSortingBySize)
if (fileDirItem != null) {
files.add(fileDirItem)
}