refresh mimetype activity list on changing sorting

2025-02-17 04:10:39 +01:00 · 2021-10-13 16:39:53 +02:00 · 2021-10-13 16:39:53 +02:00 · e000962a94
commit e000962a94
parent c249b33a5b
1 changed files with 84 additions and 74 deletions
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt
@ -52,33 +52,12 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {

        ensureBackgroundThread {
            getProperFileDirItems { fileDirItems ->
-                FileDirItem.sorting = config.getFolderSorting(currentMimeType)
-                fileDirItems.sort()
                val listItems = getListItemsFromFileDirItems(fileDirItems)
-                runOnUiThread {
-                    ItemsAdapter(this as SimpleActivity, listItems, this, mimetypes_list, false, items_fastscroller, null) {
-                        tryOpenPathIntent((it as ListItem).path, false)
-                    }.apply {
-                        mimetypes_list.adapter = this
-                    }
-
-                    if (areSystemAnimationsEnabled) {
-                        mimetypes_list.scheduleLayoutAnimation()
-                    }
-
-                    val dateFormat = config.dateFormat
-                    val timeFormat = getTimeFormat()
-                    items_fastscroller.setViews(mimetypes_list) {
-                        val listItem = getRecyclerAdapter()?.listItems?.getOrNull(it)
-                        items_fastscroller.updateBubbleText(listItem?.getBubbleText(this, dateFormat, timeFormat) ?: "")
-                    }
-                }
+                setupAdapter(listItems)
            }
        }
    }

-    private fun getRecyclerAdapter() = mimetypes_list.adapter as? ItemsAdapter
-
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        menuInflater.inflate(R.menu.menu, menu)
        setupSearch(menu)
@ -121,9 +100,63 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
            R.id.reduce_column_count -> reduceColumnCount()
            else -> return super.onOptionsItemSelected(item)
        }
+
        return true
    }

+    override fun refreshFragment() {}
+
+    override fun deleteFiles(files: ArrayList<FileDirItem>) {}
+
+    override fun selectedPaths(paths: ArrayList<String>) {}
+
+    override fun searchQueryChanged(text: String) {}
+
+    override fun setupDateTimeFormat() {}
+
+    override fun setupFontSize() {}
+
+    override fun toggleFilenameVisibility() {
+        config.displayFilenames = !config.displayFilenames
+    }
+
+    override fun increaseColumnCount() {}
+
+    override fun reduceColumnCount() {}
+
+    override fun finishActMode() {}
+
+    private fun setupSearch(menu: Menu) {
+        val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager
+        searchMenuItem = menu.findItem(R.id.search)
+        (searchMenuItem!!.actionView as SearchView).apply {
+            setSearchableInfo(searchManager.getSearchableInfo(componentName))
+            isSubmitButtonEnabled = false
+            queryHint = getString(R.string.search)
+            setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String) = false
+
+                override fun onQueryTextChange(newText: String): Boolean {
+                    if (isSearchOpen) {
+                    }
+                    return true
+                }
+            })
+        }
+
+        MenuItemCompat.setOnActionExpandListener(searchMenuItem, object : MenuItemCompat.OnActionExpandListener {
+            override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
+                isSearchOpen = true
+                return true
+            }
+
+            override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
+                isSearchOpen = false
+                return true
+            }
+        })
+    }
+
    private fun getProperFileDirItems(callback: (ArrayList<FileDirItem>) -> Unit) {
        val fileDirItems = ArrayList<FileDirItem>()
        val showHidden = config.shouldShowHidden
@ -187,6 +220,30 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
        callback(fileDirItems)
    }

+    private fun setupAdapter(listItems: ArrayList<ListItem>) {
+        FileDirItem.sorting = config.getFolderSorting(currentMimeType)
+        listItems.sort()
+
+        runOnUiThread {
+            ItemsAdapter(this as SimpleActivity, listItems, this, mimetypes_list, false, items_fastscroller, null) {
+                tryOpenPathIntent((it as ListItem).path, false)
+            }.apply {
+                mimetypes_list.adapter = this
+            }
+
+            if (areSystemAnimationsEnabled) {
+                mimetypes_list.scheduleLayoutAnimation()
+            }
+
+            val dateFormat = config.dateFormat
+            val timeFormat = getTimeFormat()
+            items_fastscroller.setViews(mimetypes_list) {
+                val listItem = getRecyclerAdapter()?.listItems?.getOrNull(it)
+                items_fastscroller.updateBubbleText(listItem?.getBubbleText(this, dateFormat, timeFormat) ?: "")
+            }
+        }
+    }
+
    private fun getListItemsFromFileDirItems(fileDirItems: ArrayList<FileDirItem>): ArrayList<ListItem> {
        val listItems = ArrayList<ListItem>()
        fileDirItems.forEach {
@ -196,64 +253,17 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
        return listItems
    }

-    private fun setupSearch(menu: Menu) {
-        val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager
-        searchMenuItem = menu.findItem(R.id.search)
-        (searchMenuItem!!.actionView as SearchView).apply {
-            setSearchableInfo(searchManager.getSearchableInfo(componentName))
-            isSubmitButtonEnabled = false
-            queryHint = getString(R.string.search)
-            setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-                override fun onQueryTextSubmit(query: String) = false
-
-                override fun onQueryTextChange(newText: String): Boolean {
-                    if (isSearchOpen) {
-                    }
-                    return true
-                }
-            })
-        }
-
-        MenuItemCompat.setOnActionExpandListener(searchMenuItem, object : MenuItemCompat.OnActionExpandListener {
-            override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
-                isSearchOpen = true
-                return true
-            }
-
-            override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
-                isSearchOpen = false
-                return true
-            }
-        })
-    }
+    private fun getRecyclerAdapter() = mimetypes_list.adapter as? ItemsAdapter

    private fun showSortingDialog() {
        ChangeSortingDialog(this, currentMimeType) {
+            val listItems = getRecyclerAdapter()?.listItems
+            if (listItems != null) {
+                setupAdapter(listItems as ArrayList<ListItem>)
+            }
        }
    }

-    override fun refreshFragment() {}
-
-    override fun deleteFiles(files: ArrayList<FileDirItem>) {}
-
-    override fun selectedPaths(paths: ArrayList<String>) {}
-
-    override fun searchQueryChanged(text: String) {}
-
-    override fun setupDateTimeFormat() {}
-
-    override fun setupFontSize() {}
-
-    override fun toggleFilenameVisibility() {
-        config.displayFilenames = !config.displayFilenames
-    }
-
-    override fun increaseColumnCount() {}
-
-    override fun reduceColumnCount() {}
-
-    override fun finishActMode() {}
-
    private fun changeViewType() {
        ChangeViewTypeDialog(this, currentMimeType, true) { }
    }