pull/2565/head
kunfei 2 years ago
parent 7f4a8b4d5e
commit 014d6a957d
  1. 2
      app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
  2. 2
      app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt
  3. 7
      app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt
  4. 2
      app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
  5. 2
      app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
  6. 2
      app/src/main/res/layout/dialog_add_to_bookshelf.xml
  7. 2
      app/src/main/res/values-es-rES/strings.xml
  8. 2
      app/src/main/res/values-ja-rJP/strings.xml
  9. 2
      app/src/main/res/values-pt-rBR/strings.xml
  10. 2
      app/src/main/res/values-zh-rHK/strings.xml
  11. 2
      app/src/main/res/values-zh-rTW/strings.xml
  12. 2
      app/src/main/res/values-zh/strings.xml
  13. 2
      app/src/main/res/values/strings.xml

@ -211,7 +211,7 @@ class AudioPlayActivity :
if (!AppConfig.showAddToShelfAlert) {
viewModel.removeFromBookshelf { super.finish() }
} else {
alert(title = getString(R.string.add_to_shelf)) {
alert(title = getString(R.string.add_to_bookshelf)) {
setMessage(getString(R.string.check_add_bookshelf, it.name))
okButton {
AudioPlay.inBookshelf = true

@ -118,7 +118,7 @@ class ImportBookActivity : BaseImportBookActivity<ActivityImportBookBinding, Imp
binding.tvEmptyMsg.setText(R.string.empty_msg_import_book)
binding.recyclerView.layoutManager = LinearLayoutManager(this)
binding.recyclerView.adapter = adapter
binding.selectActionBar.setMainActionText(R.string.add_to_shelf)
binding.selectActionBar.setMainActionText(R.string.add_to_bookshelf)
binding.selectActionBar.inflateMenu(R.menu.import_book_sel)
binding.selectActionBar.setOnMenuItemClickListener(this)
binding.selectActionBar.setCallBack(this)

@ -27,8 +27,6 @@ import java.io.File
/**
* 展示远程书籍
* @author qianfanguojin
* @time 2022/05/12
*/
class RemoteBookActivity : BaseImportBookActivity<ActivityImportBookBinding, RemoteBookViewModel>(),
RemoteBookAdapter.CallBack,
@ -55,7 +53,7 @@ class RemoteBookActivity : BaseImportBookActivity<ActivityImportBookBinding, Rem
binding.layTop.setBackgroundColor(backgroundColor)
binding.recyclerView.layoutManager = LinearLayoutManager(this)
binding.recyclerView.adapter = adapter
binding.selectActionBar.setMainActionText(R.string.add_to_shelf)
binding.selectActionBar.setMainActionText(R.string.add_to_bookshelf)
binding.selectActionBar.setCallBack(this)
if (!LocalConfig.webDavBookHelpVersionIsLast) {
showHelp("webDavBookHelp")
@ -188,6 +186,9 @@ class RemoteBookActivity : BaseImportBookActivity<ActivityImportBookBinding, Rem
override fun upCountView() {
binding.selectActionBar.upCountView(adapter.selected.size, adapter.checkableCount)
}
@Suppress("SameParameterValue")
private fun showHelp(fileName: String) {
//显示目录help下的帮助文档
val mdText = String(assets.open("help/${fileName}.md").readBytes())

@ -283,7 +283,7 @@ class BookInfoActivity :
if (viewModel.inBookshelf) {
binding.tvShelf.text = getString(R.string.remove_from_bookshelf)
} else {
binding.tvShelf.text = getString(R.string.add_to_shelf)
binding.tvShelf.text = getString(R.string.add_to_bookshelf)
}
}

@ -1274,7 +1274,7 @@ class ReadBookActivity : BaseReadBookActivity(),
if (!AppConfig.showAddToShelfAlert) {
viewModel.removeFromBookshelf { super.finish() }
} else {
alert(title = getString(R.string.add_to_shelf)) {
alert(title = getString(R.string.add_to_bookshelf)) {
setMessage(getString(R.string.check_add_bookshelf, it.name))
okButton {
ReadBook.inBookshelf = true

@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="18dp"
android:text="@string/add_book_url"
android:text="@string/add_to_bookshelf"
android:textColor="@color/primaryText"
android:textSize="16sp"
android:textStyle="bold"

@ -364,7 +364,7 @@
<string name="status_bar_immersion">El color de la barra de estado se vuelve transparente</string>
<string name="imm_navigation_bar">barra de navegación de inmersión</string>
<string name="imm_navigation_bar_s">La barra de navegación se vuelve transparente</string>
<string name="add_to_shelf">Agregar a la estantería</string>
<string name="add_to_bookshelf">Agregar a la estantería</string>
<string name="continue_read">Seguir leyendo</string>
<string name="cover_path">Carpeta de portada</string>
<string name="page_anim_cover">Portada</string>

@ -368,7 +368,7 @@
<string name="status_bar_immersion">The status bar color becomes transparent</string>
<string name="imm_navigation_bar">immersion navigation bar</string>
<string name="imm_navigation_bar_s">The navigation bar becomes transparent</string>
<string name="add_to_shelf">Add to Bookshelf</string>
<string name="add_to_bookshelf">Add to Bookshelf</string>
<string name="continue_read">Continue reading</string>
<string name="cover_path">Cover path</string>
<string name="page_anim_cover">Cover</string>

@ -366,7 +366,7 @@
<string name="status_bar_immersion">A cor da barra de status fica transparente</string>
<string name="imm_navigation_bar">barra de navegação de imersão</string>
<string name="imm_navigation_bar_s">A barra de navegação fica transparente</string>
<string name="add_to_shelf">Adicionar à Estante</string>
<string name="add_to_bookshelf">Adicionar à Estante</string>
<string name="continue_read">Continuar lendo</string>
<string name="cover_path">Pasta das capas</string>
<string name="page_anim_cover">Capa</string>

@ -365,7 +365,7 @@
<string name="status_bar_immersion">狀態欄顏色透明</string>
<string name="imm_navigation_bar">沉浸式导航栏</string>
<string name="imm_navigation_bar_s">导航栏颜色透明</string>
<string name="add_to_shelf">放入書架</string>
<string name="add_to_bookshelf">放入書架</string>
<string name="continue_read">繼續閲讀</string>
<string name="cover_path">封面地址</string>
<string name="page_anim_cover">覆蓋</string>

@ -367,7 +367,7 @@
<string name="status_bar_immersion">狀態欄顏色透明</string>
<string name="imm_navigation_bar">沉浸式導航欄</string>
<string name="imm_navigation_bar_s">導航欄顏色透明</string>
<string name="add_to_shelf">放入書架</string>
<string name="add_to_bookshelf">放入書架</string>
<string name="continue_read">繼續閱讀</string>
<string name="cover_path">封面地址</string>
<string name="page_anim_cover">覆蓋</string>

@ -367,7 +367,7 @@
<string name="status_bar_immersion">状态栏颜色透明</string>
<string name="imm_navigation_bar">沉浸式导航栏</string>
<string name="imm_navigation_bar_s">导航栏颜色透明</string>
<string name="add_to_shelf">放入书架</string>
<string name="add_to_bookshelf">放入书架</string>
<string name="continue_read">继续阅读</string>
<string name="cover_path">封面地址</string>
<string name="page_anim_cover">覆盖</string>

@ -368,7 +368,7 @@
<string name="status_bar_immersion">The status bar color becomes transparent</string>
<string name="imm_navigation_bar">immersion navigation bar</string>
<string name="imm_navigation_bar_s">The navigation bar becomes transparent</string>
<string name="add_to_shelf">Add to Bookshelf</string>
<string name="add_to_bookshelf">Add to Bookshelf</string>
<string name="continue_read">Continue reading</string>
<string name="cover_path">Cover path</string>
<string name="page_anim_cover">Cover</string>

Loading…
Cancel
Save