This commit is contained in:
kunfei
2022-11-12 22:20:00 +08:00
parent 406af01cb2
commit d93cfa0d9e
13 changed files with 16 additions and 15 deletions
@@ -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