From c08739396a7a5e21c2a387063cae3f68549d8298 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 20 Dec 2019 21:35:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsearch=5Fview=E8=8E=B7?= =?UTF-8?q?=E5=BE=97=E7=84=A6=E7=82=B9=E6=97=B6=E4=B8=8D=E8=83=BD=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/ui/book/search/SearchActivity.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 0ffefda51..d6eb7f836 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 @@ -49,6 +49,7 @@ class SearchActivity : VMBaseActivity(R.layout.activity_book_se private var menu: Menu? = null private var precisionSearchMenuItem: MenuItem? = null private var groups = hashSetOf() + private var queryText: String? = null override fun onActivityCreated(savedInstanceState: Bundle?) { viewModel.callBack = this @@ -107,8 +108,9 @@ class SearchActivity : VMBaseActivity(R.layout.activity_book_se } override fun onQueryTextChange(newText: String?): Boolean { - if (newText.isNullOrBlank()) viewModel.stop() - upHistory(newText) + queryText = newText + if (queryText.isNullOrBlank()) viewModel.stop() + upHistory(queryText) return false } }) @@ -180,7 +182,7 @@ class SearchActivity : VMBaseActivity(R.layout.activity_book_se private fun openOrCloseHistory(open: Boolean) { if (open) { - upHistory("") + upHistory(queryText) ll_history.visibility = VISIBLE } else { ll_history.visibility = GONE From b51097722249d1a1689513b4d977aad3a6e65e0e Mon Sep 17 00:00:00 2001 From: Administrator Date: Sun, 5 Jan 2020 14:46:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96bookshelf=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C=E4=BB=A5=E5=8F=8A=E5=8E=BB=E9=99=A4?= =?UTF-8?q?tabs=E7=82=B9=E5=87=BB=E9=BB=91=E8=89=B2=E8=83=8C=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/item_bookshelf_list.xml | 2 ++ app/src/main/res/layout/view_tab_layout_min.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/src/main/res/layout/item_bookshelf_list.xml b/app/src/main/res/layout/item_bookshelf_list.xml index ce882085b..56f40ab41 100644 --- a/app/src/main/res/layout/item_bookshelf_list.xml +++ b/app/src/main/res/layout/item_bookshelf_list.xml @@ -180,6 +180,8 @@ diff --git a/app/src/main/res/layout/view_tab_layout_min.xml b/app/src/main/res/layout/view_tab_layout_min.xml index b44dbd7c7..badf89a01 100644 --- a/app/src/main/res/layout/view_tab_layout_min.xml +++ b/app/src/main/res/layout/view_tab_layout_min.xml @@ -5,5 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:theme="?attr/actionBarStyle" + app:tabBackground="@android:color/transparent" + app:tabRippleColor="@android:color/transparent" app:tabMaxWidth="100dp" app:tabMinWidth="10dp" /> \ No newline at end of file From 75cac24f226f57c19e216dea82401645589a6cbc Mon Sep 17 00:00:00 2001 From: Administrator Date: Sun, 5 Jan 2020 15:24:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E6=89=8B=E6=9C=BAtv=5Ftitle=E4=BA=8C=E8=A1=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/item_rss_article.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/layout/item_rss_article.xml b/app/src/main/res/layout/item_rss_article.xml index 9196e88ad..f67f4d694 100644 --- a/app/src/main/res/layout/item_rss_article.xml +++ b/app/src/main/res/layout/item_rss_article.xml @@ -10,7 +10,6 @@ android:id="@+id/tv_title" android:layout_width="0dp" android:layout_height="0dp" - android:layout_marginBottom="10dp" android:text="@string/app_name" android:textColor="@color/tv_text_default" android:textSize="16sp" From f7d0a4748d77b09d43e11517aa97a622d10ac11c Mon Sep 17 00:00:00 2001 From: Administrator Date: Sun, 5 Jan 2020 17:37:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B9=A6=E7=B1=8D?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E9=A1=B5tabs=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/ui/chapterlist/ChapterListActivity.kt | 1 + app/src/main/res/layout/view_tab_layout.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/app/src/main/java/io/legado/app/ui/chapterlist/ChapterListActivity.kt b/app/src/main/java/io/legado/app/ui/chapterlist/ChapterListActivity.kt index 86db52459..a7876f8e4 100644 --- a/app/src/main/java/io/legado/app/ui/chapterlist/ChapterListActivity.kt +++ b/app/src/main/java/io/legado/app/ui/chapterlist/ChapterListActivity.kt @@ -25,6 +25,7 @@ class ChapterListActivity : VMBaseActivity(R.layout.activi private var searchView: SearchView? = null override fun onActivityCreated(savedInstanceState: Bundle?) { + tab_layout.isTabIndicatorFullWidth = false tab_layout.setSelectedTabIndicatorColor(accentColor) viewModel.bookUrl = intent.getStringExtra("bookUrl") viewModel.loadBook { diff --git a/app/src/main/res/layout/view_tab_layout.xml b/app/src/main/res/layout/view_tab_layout.xml index 877d7616f..5efc6cd26 100644 --- a/app/src/main/res/layout/view_tab_layout.xml +++ b/app/src/main/res/layout/view_tab_layout.xml @@ -1,6 +1,9 @@ \ No newline at end of file