Merge remote-tracking branch 'origin/master'

This commit is contained in:
kunfei 2023-03-13 21:20:51 +08:00
commit 2a2846d22b

View File

@ -101,6 +101,7 @@ class BookInfoActivity :
}
private var tocChanged = false
private val waitDialog by lazy { WaitDialog(this) }
private var editMenuItem: MenuItem? = null
override val binding by viewBinding(ActivityBookInfoBinding::inflate)
override val viewModel by viewModels<BookInfoViewModel>()
@ -123,7 +124,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
editMenuItem = menu.findItem(R.id.menu_edit)
return super.onCompatCreateOptionsMenu(menu)
}
@ -261,6 +262,7 @@ class BookInfoActivity :
tvLasted.text = getString(R.string.lasted_show, book.latestChapterTitle)
tvIntro.text = book.getDisplayIntro()
llToc?.visible(!book.isWebFile)
editMenuItem?.visible(viewModel.inBookshelf)
upTvBookshelf()
val kinds = book.getKindList()
if (kinds.isEmpty()) {