From 76b52223eb515fe71f31dcb0783d7a6dae8324e9 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Sat, 11 Mar 2023 21:37:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/ui/book/info/BookInfoActivity.kt | 11 +++++------ app/src/main/res/menu/book_remote.xml | 6 ++++++ app/src/main/res/menu/import_book.xml | 6 ++++++ 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 | 2 -- 10 files changed, 17 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt index e0a05b546..f37cf8581 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt @@ -117,6 +117,7 @@ class BookInfoActivity : override fun onCompatCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.book_info, menu) + menu.findItem(R.id.menu_edit)?.isVisible = viewModel.inBookshelf return super.onCompatCreateOptionsMenu(menu) } @@ -137,23 +138,21 @@ class BookInfoActivity : viewModel.bookData.value?.isLocalTxt ?: false menu.findItem(R.id.menu_upload)?.isVisible = viewModel.bookData.value?.isLocal ?: false - menu.findItem(R.id.menu_edit)?.isVisible = - !(viewModel.bookData.value?.isWebFile ?: true) return super.onMenuOpened(featureId, menu) } override fun onCompatOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.menu_edit -> { - if (viewModel.inBookshelf) { + // if (viewModel.inBookshelf) { viewModel.bookData.value?.let { infoEditResult.launch { putExtra("bookUrl", it.bookUrl) } } - } else { - toastOnUi(R.string.after_add_bookshelf) - } + // } else { + // toastOnUi(R.string.after_add_bookshelf) + //} } R.id.menu_share_it -> { viewModel.bookData.value?.let { diff --git a/app/src/main/res/menu/book_remote.xml b/app/src/main/res/menu/book_remote.xml index 37d670244..8c0264405 100644 --- a/app/src/main/res/menu/book_remote.xml +++ b/app/src/main/res/menu/book_remote.xml @@ -4,6 +4,12 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="AlwaysShowAction"> + + + + Defina qué botones pasan de página Botón de página anterior Botón de página siguiente - Primero agregue este libro a Estantería Sin grupo Oración anterior Siguiente oración @@ -984,7 +983,6 @@ 导入主题 导入txt目录规则 CookieJar - 点击阅读加载目录 清除cookie 导入在线书籍文件 Upload Success diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index f9e2f5be5..b7885f90e 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -621,7 +621,6 @@ Set page-turning buttons Page up button Page down button - Add this book to Bookshelf first Ungrouped Prior sentence Next sentence @@ -987,7 +986,6 @@ 导入主题 导入txt目录规则 CookieJar - 点击阅读加载目录 清除cookie 导入在线书籍文件 Upload Success diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 742282612..859049346 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -619,7 +619,6 @@ Definir que botões viram as páginas Botão de página anterior Botão de página seguinte - Primeiro adicionar este livro à Estante Sem grupo Frase anterior Frase seguinte @@ -987,7 +986,6 @@ 导入主题 导入txt目录规则 CookieJar - 点击阅读加载目录 清除cookie 导入在线书籍文件 Upload Success diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 385286c0c..902830842 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -612,7 +612,6 @@ 自定義翻頁按鍵 上一頁按鍵 下一頁按鍵 - 先將書籍加入書架 未分組 上一句 下一句 @@ -984,7 +983,6 @@ 导入主题 导入txt目录规则 CookieJar - 点击阅读加载目录 清除cookie 导入在线书籍文件 Upload Success diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 60bff7d95..d90258a84 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -620,7 +620,6 @@ 自訂翻頁按鍵 上一頁按鍵 下一頁按鍵 - 先將書籍加入書架 未分組 上一句 下一句 @@ -986,7 +985,6 @@ 匯入主題 匯入txt目錄規則 CookieJar - 點擊閱讀載入目錄 清除cookie 匯入線上書籍文件 上傳成功 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 7597845c6..cc4582ccc 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -620,7 +620,6 @@ 自定义翻页按键 上一页按键 下一页按键 - 先将书籍加入书架 未分组 上一句 下一句 @@ -986,7 +985,6 @@ 导入主题 导入 TXT 目录规则 CookieJar - 点击阅读加载目录 清除 Cookie 导入在线书籍文件 上传成功 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0b8c75f1f..c4440b8a2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -621,7 +621,6 @@ Set page-turning buttons Page up button Page down button - Add this book to Bookshelf first Ungrouped Prior sentence Next sentence @@ -988,7 +987,6 @@ Import theme Import txt directory rules CookieJar - Click to read the load directory Clear cookie Import online book files Upload Success