diff --git a/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt b/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt index e5bd2eef5..38f36351d 100644 --- a/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt +++ b/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt @@ -109,10 +109,8 @@ class ReadRecordActivity : BaseActivity() { private fun initSearchView() { searchView.applyTint(primaryTextColor) - searchView.onActionViewExpanded() searchView.isSubmitButtonEnabled = true searchView.queryHint = getString(R.string.search) - searchView.clearFocus() searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener { override fun onQueryTextSubmit(query: String): Boolean { searchView.clearFocus() diff --git a/app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt index b21662c60..c597e15e7 100644 --- a/app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/BaseImportBookActivity.kt @@ -17,7 +17,12 @@ import io.legado.app.lib.theme.primaryTextColor import io.legado.app.model.localBook.LocalBook import io.legado.app.ui.book.read.ReadBookActivity import io.legado.app.ui.file.HandleFileContract -import io.legado.app.utils.* +import io.legado.app.utils.ArchiveUtils +import io.legado.app.utils.FileDoc +import io.legado.app.utils.applyTint +import io.legado.app.utils.hideSoftInput +import io.legado.app.utils.startActivity +import io.legado.app.utils.toastOnUi import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine @@ -156,9 +161,7 @@ abstract class BaseImportBookActivity : VMBaseActivity>("searchResultList") val position = intent.getIntExtra("searchResultIndex", 0) val noSearchResult = searchResultList == null - initSearchView(!noSearchResult) + initSearchView(noSearchResult) initRecyclerView() initView() val bookUrl = intent.getStringExtra("bookUrl") ?: return @@ -97,6 +105,7 @@ class SearchContentActivity : if (ev.action == MotionEvent.ACTION_DOWN) { currentFocus?.let { if (it.shouldHideSoftInput(ev)) { + searchView.clearFocus() it.hideSoftInput() } } @@ -112,12 +121,11 @@ class SearchContentActivity : binding.recyclerView.scrollToPosition(position) } - private fun initSearchView(clearFocus: Boolean) { + private fun initSearchView(requestFocus: Boolean) { searchView.applyTint(primaryTextColor) - searchView.onActionViewExpanded() searchView.isSubmitButtonEnabled = true searchView.queryHint = getString(R.string.search) - if (clearFocus) searchView.clearFocus() + if (requestFocus) searchView.isIconified = false searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener { override fun onQueryTextSubmit(query: String): Boolean { startContentSearch(query.trim()) diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt index 1445c6ec0..0741791c2 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt @@ -288,9 +288,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.fragment_exp private fun initSearchView() { searchView.applyTint(primaryTextColor) - searchView.setIconifiedByDefault(false) searchView.isSubmitButtonEnabled = true searchView.queryHint = getString(R.string.screen_find) searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener { diff --git a/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt b/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt index 3d22dae2e..9840375c3 100644 --- a/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt @@ -109,7 +109,6 @@ class RssFragment() : VMBaseFragment(R.layout.fragment_rss), private fun initSearchView() { searchView.applyTint(primaryTextColor) - searchView.setIconifiedByDefault(false) searchView.isSubmitButtonEnabled = true searchView.queryHint = getString(R.string.rss) searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener { diff --git a/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt index 74f8eecb7..6e5b93f97 100644 --- a/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt +++ b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt @@ -168,9 +168,7 @@ class ReplaceRuleActivity : VMBaseActivity \ No newline at end of file