fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-06-05 22:09:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

allow changing the column level with zooming again

Browse Source
This commit is contained in:
tibbi 2020-10-29 23:03:59 +01:00
parent 10ab22508f
commit f2c1f7688a
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
View File

@ -291,7 +291,7 @@ class MainActivity : SimpleActivity() {
private fun changeViewType() { private fun changeViewType() {
ChangeViewTypeDialog(this, fragment.currentPath) { ChangeViewTypeDialog(this, fragment.currentPath) {
fragment.setupLayoutManager(true) fragment.setupLayoutManager()
} }
} }

13
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
View File

@ -69,7 +69,6 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
breadcrumbs.listener = this@ItemsFragment breadcrumbs.listener = this@ItemsFragment
breadcrumbs.updateFontSize(context!!.getTextSize()) breadcrumbs.updateFontSize(context!!.getTextSize())
} }
initZoomListener()
} }
override fun onSaveInstanceState(outState: Bundle) { override fun onSaveInstanceState(outState: Bundle) {
@ -156,9 +155,8 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
activity?.runOnUiThread { activity?.runOnUiThread {
activity?.invalidateOptionsMenu() activity?.invalidateOptionsMenu()
addItems(listItems, forceRefresh) addItems(listItems, forceRefresh)
val curr = context?.config?.getFolderViewType(currentPath)
if (currentViewType != context?.config?.getFolderViewType(currentPath)) { if (currentViewType != context?.config?.getFolderViewType(currentPath)) {
setupLayoutManager(true) setupLayoutManager()
} }
} }
} }
@ -412,7 +410,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
private fun getRecyclerAdapter() = mView.items_list.adapter as? ItemsAdapter private fun getRecyclerAdapter() = mView.items_list.adapter as? ItemsAdapter
fun setupLayoutManager(resetAdapter: Boolean) { fun setupLayoutManager() {
if (context!!.config.getFolderViewType(currentPath) == VIEW_TYPE_GRID) { if (context!!.config.getFolderViewType(currentPath) == VIEW_TYPE_GRID) {
currentViewType = VIEW_TYPE_GRID currentViewType = VIEW_TYPE_GRID
setupGridLayoutManager() setupGridLayoutManager()
@ -421,10 +419,9 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
setupListLayoutManager() setupListLayoutManager()
} }
if (resetAdapter) { mView.items_list.adapter = null
mView.items_list.adapter = null initZoomListener()
addItems(storedItems, true) addItems(storedItems, true)
}
} }
private fun setupGridLayoutManager() { private fun setupGridLayoutManager() {