From dcc6be514a0232441faa963ab08c935ef29a8361 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 5 Jul 2019 10:59:35 +0200 Subject: [PATCH] Improve search behavior --- .../android/ui/fragment/DataListFragment.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt index 1bd58013..71798e66 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt @@ -44,6 +44,7 @@ open class DataListFragment : DeletableItemFragment(), LiveRowRepresentableDataS private lateinit var dataType: LiveData private lateinit var items: RealmResults private var dataListMenu: Menu? = null + private var searchView: SearchView? = null var isSearchable: Boolean = false set(value) { @@ -96,9 +97,9 @@ open class DataListFragment : DeletableItemFragment(), LiveRowRepresentableDataS val searchMenuItem = menu.findItem(R.id.action_search) searchMenuItem.isVisible = isSearchable - val searchView = searchMenuItem.actionView as SearchView - searchView.removeMargins() - searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener { + searchView = searchMenuItem.actionView as SearchView? + searchView?.removeMargins() + searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener { override fun onQueryTextSubmit(query: String?): Boolean { return false } @@ -131,6 +132,7 @@ open class DataListFragment : DeletableItemFragment(), LiveRowRepresentableDataS } override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) { + searchView?.clearFocus() when (this.dataType) { LiveData.FILTER -> {