wbrawner/Simple-File-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make item displaying asynchronous

Browse source
This commit is contained in:
tibbi 2017-03-19 10:58:21 +01:00
parent c2fe859e94
commit 12d234d0d5
1 changed files with 52 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
View file

@ -22,6 +22,7 @@ import com.simplemobiletools.filemanager.adapters.ItemsAdapter
import com.simplemobiletools.filemanager.dialogs.CreateNewItemDialog
import com.simplemobiletools.filemanager.extensions.config
import kotlinx.android.synthetic.main.items_fragment.*
import kotlinx.android.synthetic.main.items_fragment.view.*
import java.io.File
import java.util.*
@ -31,12 +32,15 @@ class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperat
lateinit var mItems: ArrayList<FileDirItem>
lateinit var mConfig: Config
lateinit var fragmentView: View
private var mShowHidden = false
var mPath = ""
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?) =
inflater!!.inflate(R.layout.items_fragment, container, false)!!
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View {
fragmentView = inflater!!.inflate(R.layout.items_fragment, container, false)!!
return fragmentView
}
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
@ -70,36 +74,43 @@ class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperat
private fun fillItems() {
mPath = arguments.getString(PATH)
val newItems = getItems(mPath)
Collections.sort(newItems)
items_swipe_refresh.isRefreshing = false
if (newItems.hashCode() == mItems.hashCode()) {
return
}
getItems(mPath) {
val newItems = it
Collections.sort(newItems)
mItems = newItems
fragmentView.apply {
items_swipe_refresh.isRefreshing = false
if (newItems.hashCode() == mItems.hashCode()) {
return@getItems
}
val adapter = ItemsAdapter(activity as SimpleActivity, mItems, this) {
itemClicked(it)
}
mItems = newItems
val currAdapter = items_list.adapter
if (currAdapter == null) {
items_list.apply {
this@apply.adapter = adapter
addItemDecoration(RecyclerViewDivider(context))
val adapter = ItemsAdapter(activity as SimpleActivity, mItems, this@ItemsFragment) {
itemClicked(it)
}
activity.runOnUiThread {
val currAdapter = items_list.adapter
if (currAdapter == null) {
items_list.apply {
this.adapter = adapter
addItemDecoration(RecyclerViewDivider(context))
}
items_fastscroller.setViews(items_list, items_swipe_refresh)
} else {
val state = (items_list.layoutManager as LinearLayoutManager).onSaveInstanceState()
(currAdapter as ItemsAdapter).updateItems(mItems)
(items_list.layoutManager as LinearLayoutManager).onRestoreInstanceState(state)
}
getRecyclerLayoutManager().onRestoreInstanceState(arguments.getParcelable<Parcelable>(SCROLL_STATE))
}
}
items_fastscroller.setViews(items_list, items_swipe_refresh)
} else {
val state = (items_list.layoutManager as LinearLayoutManager).onSaveInstanceState()
(currAdapter as ItemsAdapter).updateItems(mItems)
(items_list.layoutManager as LinearLayoutManager).onRestoreInstanceState(state)
}
getRecyclerLayoutManager().onRestoreInstanceState(arguments.getParcelable<Parcelable>(SCROLL_STATE))
}
fun getRecyclerLayoutManager() = (items_list.layoutManager as LinearLayoutManager)
fun getRecyclerLayoutManager() = (fragmentView.items_list.layoutManager as LinearLayoutManager)
fun getScrollState() = getRecyclerLayoutManager().onSaveInstanceState()
@ -107,23 +118,25 @@ class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperat
mListener = listener
}
private fun getItems(path: String): ArrayList<FileDirItem> {
val items = ArrayList<FileDirItem>()
val files = File(path).listFiles()
if (files != null) {
for (file in files) {
val curPath = file.absolutePath
val curName = curPath.getFilenameFromPath()
if (!mShowHidden && curName.startsWith("."))
continue
private fun getItems(path: String, callback: (items: ArrayList<FileDirItem>) -> Unit) {
Thread({
val items = ArrayList<FileDirItem>()
val files = File(path).listFiles()
if (files != null) {
for (file in files) {
val curPath = file.absolutePath
val curName = curPath.getFilenameFromPath()
if (!mShowHidden && curName.startsWith("."))
continue
val children = getChildren(file)
val size = file.length()
val children = getChildren(file)
val size = file.length()
items.add(FileDirItem(curPath, curName, file.isDirectory, children, size))
items.add(FileDirItem(curPath, curName, file.isDirectory, children, size))
}
}
}
return items
callback(items)
}).start()
}
private fun getChildren(file: File): Int {