Michatec/michas-droid
1
1
Fork 0
mirror of https://github.com/Michatec/michas-droid.git synced 2026-05-31 02:12:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better back press handling

Browse Source
This commit is contained in:
kitsunyan
2020-07-04 03:14:23 +03:00
parent c34574c014
commit ba3936311e
10 changed files with 61 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/kotlin/nya/kitsunyan/foxydroid/screen/TabsFragment.kt
+24 -6
View File
@@ -44,7 +44,7 @@ import nya.kitsunyan.foxydroid.utility.extension.text.*
import nya.kitsunyan.foxydroid.widget.EnumRecyclerAdapter
import kotlin.math.*
class TabsFragment: Fragment() {
class TabsFragment: ScreenFragment() {
companion object {
private const val STATE_SEARCH_QUERY = "searchQuery"
private const val STATE_SHOW_CATEGORIES = "showCategories"
@@ -61,6 +61,7 @@ class TabsFragment: Fragment() {
val categoryIcon = view.findViewById<ImageView>(R.id.category_icon)!!
}
private var searchMenuItem: MenuItem? = null
private var sortOrderMenu: Pair<MenuItem, List<MenuItem>>? = null
private var syncRepositoriesMenuItem: MenuItem? = null
private var layout: Layout? = null
@@ -111,8 +112,8 @@ class TabsFragment: Fragment() {
syncConnection.bind(requireContext())
val toolbar = view.findViewById<Toolbar>(R.id.toolbar)
screenActivity.onFragmentViewCreated(toolbar)
val toolbar = view.findViewById<Toolbar>(R.id.toolbar)!!
screenActivity.onToolbarCreated(toolbar)
toolbar.setTitle(R.string.app_name)
val searchView = SearchView(toolbar.context)
@@ -137,7 +138,7 @@ class TabsFragment: Fragment() {
setGroupDividerEnabled(true)
}
add(0, R.id.toolbar_search, 0, R.string.search)
searchMenuItem = add(0, R.id.toolbar_search, 0, R.string.search)
.setIcon(Utils.getToolbarIcon(toolbar.context, R.drawable.ic_search))
.setActionView(searchView)
.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS or MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW)
@@ -183,7 +184,7 @@ class TabsFragment: Fragment() {
searchQuery = savedInstanceState?.getString(STATE_SEARCH_QUERY).orEmpty()
productFragments.forEach { it.setSearchQuery(searchQuery) }
val toolbarExtra = view.findViewById<FrameLayout>(R.id.toolbar_extra)
val toolbarExtra = view.findViewById<FrameLayout>(R.id.toolbar_extra)!!
toolbarExtra.addView(toolbarExtra.inflate(R.layout.tabs_toolbar))
val layout = Layout(view)
this.layout = layout
@@ -219,7 +220,7 @@ class TabsFragment: Fragment() {
sortOrderMenu!!.second[order.ordinal].isChecked = true
productFragments.forEach { it.setOrder(order) }
val content = view.findViewById<FrameLayout>(R.id.fragment_content)
val content = view.findViewById<FrameLayout>(R.id.fragment_content)!!
viewPager = ViewPager2(content.context).apply {
id = R.id.fragment_pager
@@ -289,6 +290,7 @@ class TabsFragment: Fragment() {
override fun onDestroyView() {
super.onDestroyView()
searchMenuItem = null
sortOrderMenu = null
syncRepositoriesMenuItem = null
layout = null
@@ -331,6 +333,22 @@ class TabsFragment: Fragment() {
}
}
override fun onBackPressed(): Boolean {
return when {
searchMenuItem?.isActionViewExpanded == true -> {
searchMenuItem?.collapseActionView()
true
}
showCategories -> {
showCategories = false
true
}
else -> {
super.onBackPressed()
}
}
}
private fun setSelectedTab(source: ProductsFragment.Source) {
val layout = layout!!
(0 until layout.tabs.childCount).forEach { layout.tabs.getChildAt(it).isSelected = it == source.ordinal }