Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates searchView in SearchActivity to clear focus after search #4578

Merged
merged 2 commits into from
Jul 20, 2024
Merged

Updates searchView in SearchActivity to clear focus after search #4578

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4555ba
Updates searchView in SearchActivity to clear focus when a user makes…
andrewhamilton0 Jul 17, 2024
10a5ed5
Fixes code formatting
andrewhamilton0 Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions app/src/main/java/com/keylesspalace/tusky/components/search/SearchActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ class SearchActivity : BottomSheetActivity(), MenuProvider, SearchView.OnQueryTe

private val binding by viewBinding(ActivitySearchBinding::inflate)

private lateinit var searchView: SearchView

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(binding.root)
Expand Down Expand Up @@ -78,8 +80,8 @@ class SearchActivity : BottomSheetActivity(), MenuProvider, SearchView.OnQueryTe
menuInflater.inflate(R.menu.search_toolbar, menu)
val searchViewMenuItem = menu.findItem(R.id.action_search)
searchViewMenuItem.expandActionView()
val searchView = searchViewMenuItem.actionView as SearchView
setupSearchView(searchView)
searchView = searchViewMenuItem.actionView as SearchView
setupSearchView()
}

override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
Expand All @@ -99,10 +101,11 @@ class SearchActivity : BottomSheetActivity(), MenuProvider, SearchView.OnQueryTe
if (Intent.ACTION_SEARCH == intent.action) {
viewModel.currentQuery = intent.getStringExtra(SearchManager.QUERY).orEmpty()
viewModel.search(viewModel.currentQuery)
searchView.clearFocus()
}
}

private fun setupSearchView(searchView: SearchView) {
private fun setupSearchView() {
searchView.setIconifiedByDefault(false)
searchView.setSearchableInfo(
(
Expand Down Expand Up @@ -143,7 +146,7 @@ class SearchActivity : BottomSheetActivity(), MenuProvider, SearchView.OnQueryTe
searchView.setOnQueryTextListener(this)
searchView.setQuery(viewModel.currentSearchFieldContent ?: "", false)

searchView.requestFocus()
if (viewModel.currentSearchFieldContent == "") searchView.requestFocus()
}

override fun onQueryTextSubmit(query: String?): Boolean {
Expand Down
Loading