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 1876829b7..e9f7cc520 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 @@ -1,7 +1,6 @@ package io.legado.app.ui.book.import import android.os.Bundle -import android.view.MotionEvent import androidx.appcompat.widget.SearchView import androidx.lifecycle.ViewModel import io.legado.app.R @@ -19,8 +18,6 @@ import io.legado.app.ui.file.HandleFileContract 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.shouldHideSoftInput import io.legado.app.utils.startActivityForBook import io.legado.app.utils.toastOnUi import io.legado.app.utils.viewbindingdelegate.viewBinding @@ -49,20 +46,6 @@ abstract class BaseImportBookActivity : initSearchView() } - override fun dispatchTouchEvent(ev: MotionEvent): Boolean { - if (ev.action == MotionEvent.ACTION_DOWN) { - currentFocus?.let { - if (it.shouldHideSoftInput(ev)) { - it.post { - it.clearFocus() - it.hideSoftInput() - } - } - } - } - return super.dispatchTouchEvent(ev) - } - /** * 设置书籍保存位置 */ diff --git a/app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageActivity.kt b/app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageActivity.kt index 6e812f849..464848f09 100644 --- a/app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageActivity.kt @@ -4,7 +4,6 @@ import android.annotation.SuppressLint import android.os.Bundle import android.view.Menu import android.view.MenuItem -import android.view.MotionEvent import android.widget.CheckBox import android.widget.LinearLayout import androidx.activity.viewModels @@ -42,11 +41,9 @@ import io.legado.app.ui.widget.recycler.VerticalDivider import io.legado.app.utils.applyTint import io.legado.app.utils.cnCompare import io.legado.app.utils.dpToPx -import io.legado.app.utils.hideSoftInput import io.legado.app.utils.isAbsUrl import io.legado.app.utils.sendToClip import io.legado.app.utils.setEdgeEffectColor -import io.legado.app.utils.shouldHideSoftInput import io.legado.app.utils.showDialogFragment import io.legado.app.utils.startActivity import io.legado.app.utils.viewbindingdelegate.viewBinding @@ -119,20 +116,6 @@ class BookshelfManageActivity : upBookDataByGroupId() } - override fun dispatchTouchEvent(ev: MotionEvent): Boolean { - if (ev.action == MotionEvent.ACTION_DOWN) { - currentFocus?.let { - if (it.shouldHideSoftInput(ev)) { - it.post { - it.clearFocus() - it.hideSoftInput() - } - } - } - } - return super.dispatchTouchEvent(ev) - } - override fun observeLiveBus() { viewModel.batchChangeSourceState.observe(this) { if (it) { diff --git a/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt index b7b4111d9..0b902e9d2 100644 --- a/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt @@ -5,7 +5,6 @@ import android.content.Intent import android.os.Bundle import android.view.Menu import android.view.MenuItem -import android.view.MotionEvent import android.widget.EditText import androidx.activity.viewModels import androidx.appcompat.widget.SearchView @@ -30,11 +29,9 @@ import io.legado.app.ui.widget.recycler.VerticalDivider import io.legado.app.utils.ColorUtils import io.legado.app.utils.applyNavigationBarMargin import io.legado.app.utils.applyTint -import io.legado.app.utils.hideSoftInput import io.legado.app.utils.invisible import io.legado.app.utils.observeEvent import io.legado.app.utils.postEvent -import io.legado.app.utils.shouldHideSoftInput import io.legado.app.utils.showSoftInput import io.legado.app.utils.viewbindingdelegate.viewBinding import io.legado.app.utils.visible @@ -101,20 +98,6 @@ class SearchContentActivity : return super.onCompatOptionsItemSelected(item) } - override fun dispatchTouchEvent(ev: MotionEvent): Boolean { - if (ev.action == MotionEvent.ACTION_DOWN) { - currentFocus?.let { - if (it.shouldHideSoftInput(ev)) { - it.post { - it.clearFocus() - it.hideSoftInput() - } - } - } - } - return super.dispatchTouchEvent(ev) - } - private fun initSearchResultList(list: List?, position: Int) { list ?: return viewModel.searchResultList.addAll(list) 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 db7cdeb95..f9ab3358f 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 @@ -4,7 +4,6 @@ import android.annotation.SuppressLint import android.os.Bundle import android.view.Menu import android.view.MenuItem -import android.view.MotionEvent import android.view.SubMenu import android.view.WindowManager import androidx.activity.viewModels @@ -54,14 +53,12 @@ import io.legado.app.utils.cnCompare import io.legado.app.utils.dpToPx import io.legado.app.utils.flowWithLifecycleAndDatabaseChange import io.legado.app.utils.flowWithLifecycleAndDatabaseChangeFirst -import io.legado.app.utils.hideSoftInput import io.legado.app.utils.isAbsUrl import io.legado.app.utils.launch import io.legado.app.utils.observeEvent import io.legado.app.utils.sendToClip import io.legado.app.utils.setEdgeEffectColor import io.legado.app.utils.share -import io.legado.app.utils.shouldHideSoftInput import io.legado.app.utils.showDialogFragment import io.legado.app.utils.showHelp import io.legado.app.utils.splitNotBlank @@ -159,20 +156,6 @@ class BookSourceActivity : VMBaseActivity(), } } - override fun dispatchTouchEvent(ev: MotionEvent): Boolean { - if (ev.action == MotionEvent.ACTION_DOWN) { - currentFocus?.let { - if (it.shouldHideSoftInput(ev)) { - it.hideSoftInput() - } - } - } - return super.dispatchTouchEvent(ev) - } - override fun onCompatCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.book_toc, menu) this.menu = menu diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt index 2f46af982..adc8b8f65 100644 --- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt @@ -5,7 +5,6 @@ package io.legado.app.ui.main import android.os.Bundle import android.text.format.DateUtils import android.view.MenuItem -import android.view.MotionEvent import android.view.ViewGroup import androidx.activity.addCallback import androidx.activity.viewModels @@ -42,13 +41,11 @@ import io.legado.app.ui.main.explore.ExploreFragment import io.legado.app.ui.main.my.MyFragment import io.legado.app.ui.main.rss.RssFragment import io.legado.app.ui.widget.dialog.TextDialog -import io.legado.app.utils.hideSoftInput import io.legado.app.utils.isCreated import io.legado.app.utils.navigationBarHeight import io.legado.app.utils.observeEvent import io.legado.app.utils.setEdgeEffectColor import io.legado.app.utils.setOnApplyWindowInsetsListenerCompat -import io.legado.app.utils.shouldHideSoftInput import io.legado.app.utils.showDialogFragment import io.legado.app.utils.toastOnUi import io.legado.app.utils.viewbindingdelegate.viewBinding @@ -116,20 +113,6 @@ class MainActivity : VMBaseActivity(), } } - override fun dispatchTouchEvent(ev: MotionEvent): Boolean { - if (ev.action == MotionEvent.ACTION_DOWN) { - currentFocus?.let { - if (it.shouldHideSoftInput(ev)) { - it.post { - it.clearFocus() - it.hideSoftInput() - } - } - } - } - return super.dispatchTouchEvent(ev) - } - override fun onPostCreate(savedInstanceState: Bundle?) { super.onPostCreate(savedInstanceState) lifecycleScope.launch { 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 ad180be66..e5e9b66a7 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 @@ -5,7 +5,6 @@ import android.app.Activity import android.os.Bundle import android.view.Menu import android.view.MenuItem -import android.view.MotionEvent import android.view.SubMenu import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels @@ -38,13 +37,11 @@ import io.legado.app.ui.widget.recycler.VerticalDivider import io.legado.app.utils.ACache import io.legado.app.utils.GSON import io.legado.app.utils.applyTint -import io.legado.app.utils.hideSoftInput import io.legado.app.utils.isAbsUrl import io.legado.app.utils.launch import io.legado.app.utils.readText import io.legado.app.utils.sendToClip import io.legado.app.utils.setEdgeEffectColor -import io.legado.app.utils.shouldHideSoftInput import io.legado.app.utils.showDialogFragment import io.legado.app.utils.showHelp import io.legado.app.utils.splitNotBlank @@ -127,20 +124,6 @@ class ReplaceRuleActivity : VMBaseActivity