fenix/Simple-Gallery
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git synced 2025-06-05 21:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

show the current folder as an available option at grouping too, not just subfolders

Browse Source
This commit is contained in:
tibbi
2018-12-15 22:40:15 +01:00
parent ce4dee2573
commit 619e7ee3f4
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
View File

@ -975,6 +975,16 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
val foldersToShow = getDirectParentSubfolders(dirFolders) val foldersToShow = getDirectParentSubfolders(dirFolders)
val parentDirs = dirs.filter { foldersToShow.contains(it.path) } as ArrayList<Directory> val parentDirs = dirs.filter { foldersToShow.contains(it.path) } as ArrayList<Directory>
updateSubfolderCounts(dirs, parentDirs) updateSubfolderCounts(dirs, parentDirs)
// show the current folder as an available option too, not just subfolders
if (mCurrentPathPrefix.isNotEmpty()) {
val currentFolder = mDirs.firstOrNull { parentDirs.firstOrNull { it.path == mCurrentPathPrefix } == null && it.path == mCurrentPathPrefix }
currentFolder?.apply {
subfoldersCount = 1
parentDirs.add(this)
}
}
parentDirs parentDirs
} else { } else {
dirs.forEach { it.subfoldersMediaCount = it.mediaCnt } dirs.forEach { it.subfoldersMediaCount = it.mediaCnt }