empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Close search if open on back pressed in stories landing page.

Browse source
This commit is contained in:
Alex Hart 2022-10-06 10:57:22 -03:00 • committed by Greyson Parrelli
parent f3fabcbe6a
commit da9dcc794f
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
View file

@ -167,7 +167,9 @@ class StoriesLandingFragment : DSLSettingsFragment(layoutId = R.layout.stories_l
viewLifecycleOwner,
object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
tabsViewModel.onChatsSelected()
if (!closeSearchIfOpen()) {
tabsViewModel.onChatsSelected()
}
}
}
)
@ -350,4 +352,25 @@ class StoriesLandingFragment : DSLSettingsFragment(layoutId = R.layout.stories_l
viewModel.isTransitioningToAnotherScreen = true
startActivity(intent, options)
}
private fun isSearchOpen(): Boolean {
return isSearchVisible()
}
private fun isSearchVisible(): Boolean {
return requreSearchBinder().getSearchToolbar().resolved() && requreSearchBinder().getSearchToolbar().get().getVisibility() == View.VISIBLE
}
private fun closeSearchIfOpen(): Boolean {
if (isSearchOpen()) {
requreSearchBinder().getSearchToolbar().get().collapse()
requreSearchBinder().onSearchClosed()
return true
}
return false
}
private fun requreSearchBinder(): SearchBinder {
return requireListener()
}
}