fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-02-16 11:50:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow changing Recents fragments column count with zoom gestures too

Browse Source
This commit is contained in:
tibbi 2023-01-05 13:06:47 +01:00
parent 51c38109e9
commit ebd65dd134
5 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -583,6 +583,12 @@ class MainActivity : SimpleActivity() {
}
}
fun updateFragmentColumnCounts() {
getAllFragments().forEach {
(it as? ItemOperationsListener)?.columnCountChanged()
}
}
private fun goToFavorite() {
val favorites = config.favorites
val items = ArrayList<RadioItem>(favorites.size)

4
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt
View File

@ -182,14 +182,14 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
}
}
override fun increaseColumnCount() {
fun increaseColumnCount() {
if (currentViewType == VIEW_TYPE_GRID) {
config.fileColumnCnt += 1
columnCountChanged()
}
}
override fun reduceColumnCount() {
fun reduceColumnCount() {
if (currentViewType == VIEW_TYPE_GRID) {
config.fileColumnCnt -= 1
columnCountChanged()

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

@ -486,17 +486,17 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
}
}
override fun increaseColumnCount() {
private fun increaseColumnCount() {
if (currentViewType == VIEW_TYPE_GRID) {
context!!.config.fileColumnCnt += 1
columnCountChanged()
(activity as? MainActivity)?.updateFragmentColumnCounts()
}
}
override fun reduceColumnCount() {
private fun reduceColumnCount() {
if (currentViewType == VIEW_TYPE_GRID) {
context!!.config.fileColumnCnt -= 1
columnCountChanged()
(activity as? MainActivity)?.updateFragmentColumnCounts()
}
}

37
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt
View File

@ -14,12 +14,14 @@ import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.helpers.isOreoPlus
import com.simplemobiletools.commons.models.FileDirItem
import com.simplemobiletools.commons.views.MyGridLayoutManager
import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.filemanager.pro.R
import com.simplemobiletools.filemanager.pro.activities.MainActivity
import com.simplemobiletools.filemanager.pro.activities.SimpleActivity
import com.simplemobiletools.filemanager.pro.adapters.ItemsAdapter
import com.simplemobiletools.filemanager.pro.extensions.config
import com.simplemobiletools.filemanager.pro.extensions.isPathOnRoot
import com.simplemobiletools.filemanager.pro.helpers.MAX_COLUMN_COUNT
import com.simplemobiletools.filemanager.pro.helpers.RootHelpers
import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener
import com.simplemobiletools.filemanager.pro.models.ListItem
@ -30,6 +32,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
private val RECENTS_LIMIT = 50
private var filesIgnoringSearch = ArrayList<ListItem>()
private var lastSearchedText = ""
private var zoomListener: MyRecyclerView.MyZoomListener? = null
override fun setupFragment(activity: SimpleActivity) {
if (this.activity == null) {
@ -64,6 +67,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
ItemsAdapter(activity as SimpleActivity, recents, this, recents_list, isPickMultipleIntent, recents_swipe_refresh, false) {
clickedPath((it as FileDirItem).path)
}.apply {
setupZoomListener(zoomListener)
recents_list.adapter = this
}
@ -95,6 +99,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
val oldItems = (recents_list.adapter as? ItemsAdapter)?.listItems?.toMutableList() as ArrayList<ListItem>
recents_list.adapter = null
initZoomListener()
addItems(oldItems, true)
}
@ -116,6 +121,30 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
private fun setupListLayoutManager() {
val layoutManager = recents_list.layoutManager as MyGridLayoutManager
layoutManager.spanCount = 1
zoomListener = null
}
private fun initZoomListener() {
if (context?.config?.getFolderViewType(currentPath) == VIEW_TYPE_GRID) {
val layoutManager = recents_list.layoutManager as MyGridLayoutManager
zoomListener = object : MyRecyclerView.MyZoomListener {
override fun zoomIn() {
if (layoutManager.spanCount > 1) {
reduceColumnCount()
getRecyclerAdapter()?.finishActMode()
}
}
override fun zoomOut() {
if (layoutManager.spanCount < MAX_COLUMN_COUNT) {
increaseColumnCount()
getRecyclerAdapter()?.finishActMode()
}
}
}
} else {
zoomListener = null
}
}
private fun getRecents(callback: (recents: ArrayList<ListItem>) -> Unit) {
@ -176,17 +205,17 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
getRecyclerAdapter()?.updateDisplayFilenamesInGrid()
}
override fun increaseColumnCount() {
private fun increaseColumnCount() {
if (currentViewType == VIEW_TYPE_GRID) {
context!!.config.fileColumnCnt += 1
columnCountChanged()
(activity as? MainActivity)?.updateFragmentColumnCounts()
}
}
override fun reduceColumnCount() {
private fun reduceColumnCount() {
if (currentViewType == VIEW_TYPE_GRID) {
context!!.config.fileColumnCnt -= 1
columnCountChanged()
(activity as? MainActivity)?.updateFragmentColumnCounts()
}
}

5
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/interfaces/ItemOperationsListener.kt
View File

@ -1,7 +1,6 @@
package com.simplemobiletools.filemanager.pro.interfaces
import com.simplemobiletools.commons.models.FileDirItem
import java.util.*
interface ItemOperationsListener {
fun refreshFragment()
@ -20,9 +19,5 @@ interface ItemOperationsListener {
fun columnCountChanged()
fun increaseColumnCount()
fun reduceColumnCount()
fun finishActMode()
}