Fix page animation switch

This commit is contained in:
Horis
2025-01-10 18:40:33 +08:00
parent 0c2cbe809d
commit 22862f60dc
3 changed files with 16 additions and 10 deletions
@@ -170,11 +170,11 @@ object ReadBook : CoroutineScope by MainScope() {
appDb.bookSourceDao.getBookSource(book.origin)?.let {
bookSource = it
if (book.getImageStyle().isNullOrBlank()) {
book.setImageStyle(it.getContentRule().imageStyle)
}
if (it.getContentRule().imageStyle == Book.imgStyleSingle) {
book.setImageStyle(it.getContentRule().imageStyle)
book.setPageAnim(0)
val imageStyle = it.getContentRule().imageStyle
book.setImageStyle(imageStyle)
if (imageStyle.equals(Book.imgStyleSingle, true)) {
book.setPageAnim(0)
}
}
} ?: let {
bookSource = null
@@ -565,14 +565,20 @@ class ReadBookActivity : BaseReadBookActivity(),
R.id.menu_set_charset -> showCharsetConfig()
R.id.menu_image_style -> {
val imgStyles =
arrayListOf(Book.imgStyleDefault, Book.imgStyleFull, Book.imgStyleText, Book.imgStyleSingle)
arrayListOf(
Book.imgStyleDefault, Book.imgStyleFull, Book.imgStyleText,
Book.imgStyleSingle
)
selector(
R.string.image_style,
imgStyles
) { _, index ->
ReadBook.book?.setImageStyle(imgStyles[index])
ReadBook.book?.setPageAnim(0) // 切换图片样式single后,自动切换为覆盖
binding.readView.upPageAnim()
val imageStyle = imgStyles[index]
ReadBook.book?.setImageStyle(imageStyle)
if (imageStyle == Book.imgStyleSingle) {
ReadBook.book?.setPageAnim(0) // 切换图片样式single后,自动切换为覆盖
binding.readView.upPageAnim()
}
ReadBook.loadContent(false)
}
}
@@ -134,7 +134,7 @@ class ReadStyleDialog : BaseDialogFragment(R.layout.dialog_read_book_style),
TipConfigDialog().show(childFragmentManager, "tipConfigDialog")
}
rgPageAnim.setOnCheckedChangeListener { _, checkedId ->
ReadBook.book?.setPageAnim(null)
ReadBook.book?.setPageAnim(-1)
ReadBookConfig.pageAnim = binding.rgPageAnim.getIndexById(checkedId)
callBack?.upPageAnim()
ReadBook.loadContent(false)