kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-27 23:40:33 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #1030 from Bnyro/master

Browse Source 
add back button to search
This commit is contained in:
Bnyro 2022-08-12 17:01:28 +02:00 committed by GitHub
commit 3ee35569db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/github/libretube/activities/MainActivity.kt
View File

@ -214,7 +214,6 @@ class MainActivity : BaseActivity() {
// stuff for the search in the topBar
val searchItem = menu.findItem(R.id.action_search)
searchView = searchItem.actionView as SearchView
searchView.maxWidth = Integer.MAX_VALUE
val searchViewModel = ViewModelProvider(this)[SearchViewModel::class.java]
@ -245,6 +244,22 @@ class MainActivity : BaseActivity() {
}
})
searchItem.setOnActionExpandListener(
object : MenuItem.OnActionExpandListener {
override fun onMenuItemActionExpand(p0: MenuItem?): Boolean {
return true
}
override fun onMenuItemActionCollapse(p0: MenuItem?): Boolean {
val currentFragmentId = navController.currentDestination?.id
if (currentFragmentId == R.id.searchFragment || currentFragmentId == R.id.searchResultFragment) {
onBackPressed()
}
return true
}
}
)
searchView.setOnCloseListener {
if (navController.currentDestination?.id == R.id.searchFragment) {
searchViewModel.setQuery(null)

2
app/src/main/res/menu/action_bar.xml
View File

@ -8,7 +8,7 @@
android:icon="@drawable/ic_search"
android:title="@string/search_hint"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="ifRoom" />
app:showAsAction="ifRoom|collapseActionView" />
<item
android:id="@+id/action_settings"