mirror of
https://github.com/FossifyOrg/Gallery.git
synced 2024-11-23 13:08:00 +01:00
remove hidden folders instantly, do not refetch everything
This commit is contained in:
parent
c4dd4696de
commit
b6d24492ed
3 changed files with 40 additions and 9 deletions
|
@ -681,8 +681,12 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
|
||||||
gotDirectories(movePinnedDirectoriesToFront(mDirs), true)
|
gotDirectories(movePinnedDirectoriesToFront(mDirs), true)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun updateDirectories(directories: ArrayList<Directory>) {
|
override fun updateDirectories(directories: ArrayList<Directory>, refreshList: Boolean) {
|
||||||
|
if (refreshList) {
|
||||||
gotDirectories(directories, true)
|
gotDirectories(directories, true)
|
||||||
|
} else {
|
||||||
|
mDirs = directories
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun checkWhatsNewDialog() {
|
private fun checkWhatsNewDialog() {
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package com.simplemobiletools.gallery.adapters
|
package com.simplemobiletools.gallery.adapters
|
||||||
|
|
||||||
|
import android.util.SparseArray
|
||||||
import android.view.Menu
|
import android.view.Menu
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
@ -170,11 +171,10 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: MutableList<Direc
|
||||||
dirs[selectedPositions.first()].apply {
|
dirs[selectedPositions.first()].apply {
|
||||||
path = it
|
path = it
|
||||||
name = it.getFilenameFromPath()
|
name = it.getFilenameFromPath()
|
||||||
|
tmb = File(it, tmb.getFilenameFromPath()).absolutePath
|
||||||
val tmbFile = tmb.getFilenameFromPath()
|
|
||||||
tmb = File(it, tmbFile).absolutePath
|
|
||||||
}
|
}
|
||||||
listener?.updateDirectories(dirs.toList() as ArrayList)
|
currentDirectoriesHash = dirs.hashCode()
|
||||||
|
listener?.updateDirectories(dirs.toList() as ArrayList, true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -201,7 +201,32 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: MutableList<Direc
|
||||||
|
|
||||||
private fun hideFolder(path: String) {
|
private fun hideFolder(path: String) {
|
||||||
activity.addNoMedia(path) {
|
activity.addNoMedia(path) {
|
||||||
noMediaHandled()
|
val positionsToRemove = ArrayList<Int>()
|
||||||
|
val newDirs = dirs.filterIndexed { index, directory ->
|
||||||
|
val removeDir = directory.path.startsWith(path, true)
|
||||||
|
if (removeDir) {
|
||||||
|
positionsToRemove.add(index)
|
||||||
|
}
|
||||||
|
!removeDir
|
||||||
|
} as ArrayList<Directory>
|
||||||
|
|
||||||
|
activity.runOnUiThread {
|
||||||
|
positionsToRemove.sortedDescending().forEach {
|
||||||
|
notifyItemRemoved(it + positionOffset)
|
||||||
|
itemViews.put(it, null)
|
||||||
|
}
|
||||||
|
|
||||||
|
val newItems = SparseArray<View>()
|
||||||
|
(0 until itemViews.size())
|
||||||
|
.filter { itemViews[it] != null }
|
||||||
|
.forEachIndexed { curIndex, i -> newItems.put(curIndex, itemViews[i]) }
|
||||||
|
|
||||||
|
currentDirectoriesHash = newDirs.hashCode()
|
||||||
|
itemViews = newItems
|
||||||
|
finishActMode()
|
||||||
|
fastScroller?.measureRecyclerView()
|
||||||
|
listener?.updateDirectories(newDirs, false)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -398,6 +423,6 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: MutableList<Direc
|
||||||
|
|
||||||
fun recheckPinnedFolders()
|
fun recheckPinnedFolders()
|
||||||
|
|
||||||
fun updateDirectories(directories: ArrayList<Directory>)
|
fun updateDirectories(directories: ArrayList<Directory>, refreshList: Boolean)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -110,8 +110,10 @@ fun AppCompatActivity.hideSystemUI() {
|
||||||
|
|
||||||
fun BaseSimpleActivity.addNoMedia(path: String, callback: () -> Unit) {
|
fun BaseSimpleActivity.addNoMedia(path: String, callback: () -> Unit) {
|
||||||
val file = File(path, NOMEDIA)
|
val file = File(path, NOMEDIA)
|
||||||
if (file.exists())
|
if (file.exists()) {
|
||||||
|
callback()
|
||||||
return
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if (needsStupidWritePermissions(path)) {
|
if (needsStupidWritePermissions(path)) {
|
||||||
handleSAFDialog(file.absolutePath) {
|
handleSAFDialog(file.absolutePath) {
|
||||||
|
|
Loading…
Reference in a new issue