From eb33ea1e176bcc8f3d37d07e11985e994f353ec3 Mon Sep 17 00:00:00 2001 From: kunfei Date: Wed, 12 Feb 2020 17:00:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/ui/book/search/SearchActivity.kt | 14 ++++++++++---- .../io/legado/app/ui/widget/ViewDetailSeekBar.kt | 2 ++ ...{view_seek_bar.xml => view_detail_seek_bar.xml} | 0 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 app/src/main/java/io/legado/app/ui/widget/ViewDetailSeekBar.kt rename app/src/main/res/layout/{view_seek_bar.xml => view_detail_seek_bar.xml} (100%) diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt index d97bee198..841d9ee87 100644 --- a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt @@ -295,10 +295,16 @@ class SearchActivity : VMBaseActivity(R.layout.activity_book_se override fun searchHistory(key: String) { launch { - if (withContext(IO) { App.db.bookDao().findByName(key).isEmpty() }) { - search_view.setQuery(key, true) - } else { - search_view.setQuery(key, false) + when { + search_view.query == key -> { + search_view.setQuery(key, true) + } + withContext(IO) { App.db.bookDao().findByName(key).isEmpty() } -> { + search_view.setQuery(key, true) + } + else -> { + search_view.setQuery(key, false) + } } } } diff --git a/app/src/main/java/io/legado/app/ui/widget/ViewDetailSeekBar.kt b/app/src/main/java/io/legado/app/ui/widget/ViewDetailSeekBar.kt new file mode 100644 index 000000000..507b7a9da --- /dev/null +++ b/app/src/main/java/io/legado/app/ui/widget/ViewDetailSeekBar.kt @@ -0,0 +1,2 @@ +package io.legado.app.ui.widget + diff --git a/app/src/main/res/layout/view_seek_bar.xml b/app/src/main/res/layout/view_detail_seek_bar.xml similarity index 100% rename from app/src/main/res/layout/view_seek_bar.xml rename to app/src/main/res/layout/view_detail_seek_bar.xml