diff --git a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt
index 4ef9d56a3..5188e38ce 100644
--- a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt
@@ -113,15 +113,16 @@ class ChangeSourceDialog : DialogFragment(),
}
private fun initSearchView() {
- search_view.setOnCloseListener {
+ val searchView = tool_bar.menu.findItem(R.id.menu_screen).actionView as SearchView
+ searchView.setOnCloseListener {
showTitle()
false
}
- search_view.setOnSearchClickListener {
+ searchView.setOnSearchClickListener {
tool_bar.title = ""
tool_bar.subtitle = ""
}
- search_view.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+ searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
override fun onQueryTextSubmit(query: String?): Boolean {
return false
}
@@ -151,6 +152,7 @@ class ChangeSourceDialog : DialogFragment(),
putPrefBoolean(PreferKey.changeSourceLoadToc, !item.isChecked)
item.isChecked = !item.isChecked
}
+ R.id.menu_stop -> viewModel.stopSearch()
}
return false
}
diff --git a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceViewModel.kt
index 548038e59..06fd27a18 100644
--- a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceViewModel.kt
@@ -145,6 +145,10 @@ class ChangeSourceViewModel(application: Application) : BaseViewModel(applicatio
}
}
+ fun stopSearch() {
+ task?.cancel()
+ }
+
override fun onCleared() {
super.onCleared()
searchPool.close()
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt
index d28f8c816..125d6bb5f 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt
@@ -194,7 +194,6 @@ abstract class PageDelegate(protected val pageView: PageView) :
@CallSuper
open fun onTouch(event: MotionEvent) {
if (isStarted) return
- detector.setIsLongpressEnabled(false)
if (!detector.onTouchEvent(event)) {
//GestureDetector.onFling小幅移动不会触发,所以要自己判断
when (event.action) {
diff --git a/app/src/main/res/layout/dialog_change_source.xml b/app/src/main/res/layout/dialog_change_source.xml
index f007fae87..cc7486b05 100644
--- a/app/src/main/res/layout/dialog_change_source.xml
+++ b/app/src/main/res/layout/dialog_change_source.xml
@@ -5,26 +5,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
-
-
-
-
+ android:background="@color/background_menu"
+ android:elevation="5dp"
+ app:displayHomeAsUp="false"
+ app:fitStatusBar="false" />
+
+