Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2024-11-23 04:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove hidden folders instantly, do not refetch everything

Browse source
This commit is contained in:
tibbi 2018-04-09 00:00:03 +02:00
parent c4dd4696de
commit b6d24492ed
3 changed files with 40 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
View file

@ -681,8 +681,12 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
gotDirectories(movePinnedDirectoriesToFront(mDirs), true)
}
override fun updateDirectories(directories: ArrayList<Directory>) {
override fun updateDirectories(directories: ArrayList<Directory>, refreshList: Boolean) {
if (refreshList) {
gotDirectories(directories, true)
} else {
mDirs = directories
}
}
private fun checkWhatsNewDialog() {

37
app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
View file

@ -1,5 +1,6 @@
package com.simplemobiletools.gallery.adapters
import android.util.SparseArray
import android.view.Menu
import android.view.View
import android.view.ViewGroup
@ -170,11 +171,10 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: MutableList<Direc
dirs[selectedPositions.first()].apply {
path = it
name = it.getFilenameFromPath()
val tmbFile = tmb.getFilenameFromPath()
tmb = File(it, tmbFile).absolutePath
tmb = File(it, tmb.getFilenameFromPath()).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) {
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 updateDirectories(directories: ArrayList<Directory>)
fun updateDirectories(directories: ArrayList<Directory>, refreshList: Boolean)
}
}

4
app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt
View file

@ -110,8 +110,10 @@ fun AppCompatActivity.hideSystemUI() {
fun BaseSimpleActivity.addNoMedia(path: String, callback: () -> Unit) {
val file = File(path, NOMEDIA)
if (file.exists())
if (file.exists()) {
callback()
return
}
if (needsStupidWritePermissions(path)) {
handleSAFDialog(file.absolutePath) {