Skip to content

Commit f2c1f76

Browse files
committed
allow changing the column level with zooming again
1 parent 10ab225 commit f2c1f76

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ class MainActivity : SimpleActivity() {
291291

292292
private fun changeViewType() {
293293
ChangeViewTypeDialog(this, fragment.currentPath) {
294-
fragment.setupLayoutManager(true)
294+
fragment.setupLayoutManager()
295295
}
296296
}
297297

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
6969
breadcrumbs.listener = this@ItemsFragment
7070
breadcrumbs.updateFontSize(context!!.getTextSize())
7171
}
72-
initZoomListener()
7372
}
7473

7574
override fun onSaveInstanceState(outState: Bundle) {
@@ -156,9 +155,8 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
156155
activity?.runOnUiThread {
157156
activity?.invalidateOptionsMenu()
158157
addItems(listItems, forceRefresh)
159-
val curr = context?.config?.getFolderViewType(currentPath)
160158
if (currentViewType != context?.config?.getFolderViewType(currentPath)) {
161-
setupLayoutManager(true)
159+
setupLayoutManager()
162160
}
163161
}
164162
}
@@ -412,7 +410,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
412410

413411
private fun getRecyclerAdapter() = mView.items_list.adapter as? ItemsAdapter
414412

415-
fun setupLayoutManager(resetAdapter: Boolean) {
413+
fun setupLayoutManager() {
416414
if (context!!.config.getFolderViewType(currentPath) == VIEW_TYPE_GRID) {
417415
currentViewType = VIEW_TYPE_GRID
418416
setupGridLayoutManager()
@@ -421,10 +419,9 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
421419
setupListLayoutManager()
422420
}
423421

424-
if (resetAdapter) {
425-
mView.items_list.adapter = null
426-
addItems(storedItems, true)
427-
}
422+
mView.items_list.adapter = null
423+
initZoomListener()
424+
addItems(storedItems, true)
428425
}
429426

430427
private fun setupGridLayoutManager() {

0 commit comments

Comments
 (0)