From e3038daee16b32a224bef24d4d4204881d0c2f87 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sun, 20 Feb 2022 17:20:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=95=E7=AB=A0=E6=8D=A2?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/book/changecover/ChangeCoverDialog.kt | 8 ++++---- .../ui/book/changesource/ChangeSourceDialog.kt | 8 ++++---- .../app/ui/book/read/ReadBookActivity.kt | 8 +++++++- app/src/main/res/menu/book_read.xml | 18 +++++++++++++++++- app/src/main/res/values-es-rES/strings.xml | 2 ++ app/src/main/res/values-ja-rJP/strings.xml | 2 ++ app/src/main/res/values-pt-rBR/strings.xml | 2 ++ app/src/main/res/values-zh-rHK/strings.xml | 2 ++ app/src/main/res/values-zh-rTW/strings.xml | 2 ++ app/src/main/res/values-zh/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 6 ++++-- 11 files changed, 48 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt index 204adc35a..ae578fb62 100644 --- a/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt @@ -61,7 +61,7 @@ class ChangeCoverDialog() : BaseDialogFragment(R.layout.dialog_change_cover), override fun observeLiveBus() { super.observeLiveBus() - viewModel.searchStateData.observe(viewLifecycleOwner, { + viewModel.searchStateData.observe(viewLifecycleOwner) { binding.refreshProgressBar.isAutoLoading = it if (it) { startStopMenuItem?.let { item -> @@ -75,10 +75,10 @@ class ChangeCoverDialog() : BaseDialogFragment(R.layout.dialog_change_cover), } } binding.toolBar.menu.applyTint(requireContext()) - }) - viewModel.searchBooksLiveData.observe(viewLifecycleOwner, { + } + viewModel.searchBooksLiveData.observe(viewLifecycleOwner) { adapter.setItems(it) - }) + } } override fun onMenuItemClick(item: MenuItem?): Boolean { 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 f5fed2bbc..5ee975143 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 @@ -128,7 +128,7 @@ class ChangeSourceDialog() : BaseDialogFragment(R.layout.dialog_change_source), } private fun initLiveData() { - viewModel.searchStateData.observe(viewLifecycleOwner, { + viewModel.searchStateData.observe(viewLifecycleOwner) { binding.refreshProgressBar.isAutoLoading = it if (it) { startStopMenuItem?.let { item -> @@ -142,10 +142,10 @@ class ChangeSourceDialog() : BaseDialogFragment(R.layout.dialog_change_source), } } binding.toolBar.menu.applyTint(requireContext()) - }) - viewModel.searchBooksLiveData.observe(viewLifecycleOwner, { + } + viewModel.searchBooksLiveData.observe(viewLifecycleOwner) { adapter.setItems(it) - }) + } launch { appDb.bookSourceDao.flowGroupEnabled().collect { groups.clear() diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt index 893987264..4a5bf7ce7 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt @@ -236,7 +236,13 @@ class ReadBookActivity : BaseReadBookActivity(), */ override fun onCompatOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - R.id.menu_change_source -> { + R.id.menu_book_change_source -> { + binding.readMenu.runMenuOut() + ReadBook.book?.let { + showDialogFragment(ChangeSourceDialog(it.name, it.author)) + } + } + R.id.menu_chapter_change_source -> { binding.readMenu.runMenuOut() ReadBook.book?.let { showDialogFragment(ChangeSourceDialog(it.name, it.author)) diff --git a/app/src/main/res/menu/book_read.xml b/app/src/main/res/menu/book_read.xml index c6b87b55e..dcff16f99 100644 --- a/app/src/main/res/menu/book_read.xml +++ b/app/src/main/res/menu/book_read.xml @@ -9,7 +9,23 @@ android:id="@+id/menu_change_source" android:icon="@drawable/ic_exchange" android:title="@string/change_origin" - app:showAsAction="always" /> + app:showAsAction="always"> + + + + + + + + + + 刷新之后章节 刷新全部章节 编辑内容 + 单章换源 + 整书换源 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index dc7c74989..63e284e46 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -942,5 +942,7 @@ 刷新之后章节 刷新全部章节 编辑内容 + 单章换源 + 整书换源 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index bbab00ab5..7ed33933c 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -942,5 +942,7 @@ 刷新之后章节 刷新全部章节 编辑内容 + 单章换源 + 整书换源 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 38bb2f7e4..48bae19f7 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -939,5 +939,7 @@ 刷新之后章节 刷新全部章节 编辑内容 + 单章换源 + 整书换源 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 575685f14..29cacaa4a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -941,5 +941,7 @@ 刷新之后章节 刷新全部章节 编辑内容 + 单章换源 + 整书换源 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index e9c3b2ce6..3056ada0a 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -941,5 +941,7 @@ 刷新之后章节 刷新全部章节 编辑内容 + 单章换源 + 整书换源 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index eeaa3236e..5b6aa7626 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -930,7 +930,7 @@ 小于 校验超时: %1$s秒\n校验项目:%2$s - 记录调试日志 + Record debug log Sub dir General Use replace @@ -941,6 +941,8 @@ 刷新当前章节 刷新之后章节 刷新全部章节 - 编辑内容 + Edit Content + 单章换源 + 整书换源