mirror of
https://github.com/SimpleMobileTools/Simple-File-Manager.git
synced 2025-04-26 16:08:57 +02:00
finish actionmode and search on swiping between tabs
This commit is contained in:
parent
8226588d95
commit
be0fba6be8
@ -13,6 +13,7 @@ import android.view.Menu
|
|||||||
import android.view.MenuItem
|
import android.view.MenuItem
|
||||||
import androidx.appcompat.widget.SearchView
|
import androidx.appcompat.widget.SearchView
|
||||||
import androidx.core.view.MenuItemCompat
|
import androidx.core.view.MenuItemCompat
|
||||||
|
import androidx.viewpager.widget.ViewPager
|
||||||
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
|
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
|
||||||
import com.simplemobiletools.commons.extensions.*
|
import com.simplemobiletools.commons.extensions.*
|
||||||
import com.simplemobiletools.commons.helpers.*
|
import com.simplemobiletools.commons.helpers.*
|
||||||
@ -316,6 +317,25 @@ class MainActivity : SimpleActivity() {
|
|||||||
)
|
)
|
||||||
|
|
||||||
setupTabColors(tabToOpen)
|
setupTabColors(tabToOpen)
|
||||||
|
|
||||||
|
main_view_pager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
|
||||||
|
override fun onPageScrollStateChanged(state: Int) {
|
||||||
|
if (isSearchOpen) {
|
||||||
|
getCurrentFragment()?.searchQueryChanged("")
|
||||||
|
searchMenuItem?.collapseActionView()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
|
||||||
|
|
||||||
|
override fun onPageSelected(position: Int) {
|
||||||
|
main_tabs_holder.getTabAt(position)?.select()
|
||||||
|
getAllFragments().forEach {
|
||||||
|
it?.finishActMode()
|
||||||
|
}
|
||||||
|
invalidateOptionsMenu()
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupTabColors(lastUsedTab: Int) {
|
private fun setupTabColors(lastUsedTab: Int) {
|
||||||
|
@ -77,7 +77,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
|
|||||||
getRecyclerAdapter()?.updateDateTimeFormat()
|
getRecyclerAdapter()?.updateDateTimeFormat()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun finishActMode() {
|
override fun finishActMode() {
|
||||||
getRecyclerAdapter()?.finishActMode()
|
getRecyclerAdapter()?.finishActMode()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -276,7 +276,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
|
|||||||
openPath(path)
|
openPath(path)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun searchQueryChanged(text: String) {
|
override fun searchQueryChanged(text: String) {
|
||||||
val searchText = text.trim()
|
val searchText = text.trim()
|
||||||
lastSearchedText = searchText
|
lastSearchedText = searchText
|
||||||
ensureBackgroundThread {
|
ensureBackgroundThread {
|
||||||
|
@ -13,4 +13,8 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
|
|||||||
abstract fun setupFontSize()
|
abstract fun setupFontSize()
|
||||||
|
|
||||||
abstract fun setupDateTimeFormat()
|
abstract fun setupDateTimeFormat()
|
||||||
|
|
||||||
|
abstract fun searchQueryChanged(text: String)
|
||||||
|
|
||||||
|
abstract fun finishActMode()
|
||||||
}
|
}
|
||||||
|
@ -64,6 +64,8 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun getRecyclerAdapter() = recents_list.adapter as? ItemsAdapter
|
||||||
|
|
||||||
override fun refreshItems() {}
|
override fun refreshItems() {}
|
||||||
|
|
||||||
override fun deleteFiles(files: ArrayList<FileDirItem>) {}
|
override fun deleteFiles(files: ArrayList<FileDirItem>) {}
|
||||||
@ -73,4 +75,10 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
|
|||||||
override fun setupFontSize() {}
|
override fun setupFontSize() {}
|
||||||
|
|
||||||
override fun setupDateTimeFormat() {}
|
override fun setupDateTimeFormat() {}
|
||||||
|
|
||||||
|
override fun searchQueryChanged(text: String) {}
|
||||||
|
|
||||||
|
override fun finishActMode() {
|
||||||
|
getRecyclerAdapter()?.finishActMode()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user