mirror of
https://github.com/SimpleMobileTools/Simple-Gallery.git
synced 2024-12-24 23:44:20 +01:00
remove mDirs from the MainActivity
This commit is contained in:
parent
0762918673
commit
b4e1e0c097
@ -42,8 +42,6 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
|
||||
private val LAST_MEDIA_CHECK_PERIOD = 3000L
|
||||
private val NEW_APP_PACKAGE = "com.simplemobiletools.clock"
|
||||
|
||||
lateinit var mDirs: ArrayList<Directory>
|
||||
|
||||
private var mIsPickImageIntent = false
|
||||
private var mIsPickVideoIntent = false
|
||||
private var mIsGetImageContentIntent = false
|
||||
@ -86,7 +84,6 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
|
||||
|
||||
removeTempFolder()
|
||||
directories_refresh_layout.setOnRefreshListener { getDirectories() }
|
||||
mDirs = ArrayList()
|
||||
storeStateVariables()
|
||||
checkWhatsNewDialog()
|
||||
|
||||
@ -287,7 +284,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
|
||||
if (config.directorySorting and SORT_BY_DATE_MODIFIED > 0 || config.directorySorting and SORT_BY_DATE_TAKEN > 0) {
|
||||
getDirectories()
|
||||
} else {
|
||||
gotDirectories(mDirs)
|
||||
gotDirectories(getCurrentlyDisplayedDirs())
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -417,7 +414,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
|
||||
FilePickerDialog(this, internalStoragePath, false, config.shouldShowHidden) {
|
||||
CreateNewFolderDialog(this, it) {
|
||||
config.tempFolderPath = it
|
||||
gotDirectories(addTempFolderIfNeeded(mDirs))
|
||||
gotDirectories(addTempFolderIfNeeded(getCurrentlyDisplayedDirs()))
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -757,16 +754,10 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
|
||||
}
|
||||
|
||||
override fun recheckPinnedFolders() {
|
||||
gotDirectories(movePinnedDirectoriesToFront(mDirs))
|
||||
gotDirectories(movePinnedDirectoriesToFront(getCurrentlyDisplayedDirs()))
|
||||
}
|
||||
|
||||
override fun updateDirectories(directories: ArrayList<Directory>, refreshList: Boolean) {
|
||||
if (refreshList) {
|
||||
gotDirectories(directories)
|
||||
} else {
|
||||
mDirs = directories
|
||||
}
|
||||
|
||||
override fun updateDirectories(directories: ArrayList<Directory>) {
|
||||
Thread {
|
||||
storeDirectoryItems(directories)
|
||||
removeInvalidDirectories()
|
||||
|
@ -171,7 +171,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
|
||||
tmb = File(it, tmb.getFilenameFromPath()).absolutePath
|
||||
}
|
||||
updateDirs(dirs)
|
||||
listener?.updateDirectories(dirs.toList() as ArrayList, false)
|
||||
listener?.updateDirectories(dirs.toList() as ArrayList)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -209,7 +209,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
|
||||
dirs.forEach {
|
||||
it.name = activity.checkAppendingHidden(it.path, hidden, includedFolders)
|
||||
}
|
||||
listener?.updateDirectories(dirs.toList() as ArrayList, false)
|
||||
listener?.updateDirectories(dirs.toList() as ArrayList)
|
||||
activity.runOnUiThread {
|
||||
updateDirs(dirs)
|
||||
}
|
||||
@ -246,7 +246,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
|
||||
dirs = newDirs
|
||||
finishActMode()
|
||||
fastScroller?.measureRecyclerView()
|
||||
listener?.updateDirectories(newDirs, false)
|
||||
listener?.updateDirectories(newDirs)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -440,6 +440,6 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
|
||||
|
||||
fun recheckPinnedFolders()
|
||||
|
||||
fun updateDirectories(directories: ArrayList<Directory>, refreshList: Boolean)
|
||||
fun updateDirectories(directories: ArrayList<Directory>)
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user