diff --git a/app/src/main/java/io/legado/app/model/ReadManga.kt b/app/src/main/java/io/legado/app/model/ReadManga.kt index e9c00ddcc..a76905014 100644 --- a/app/src/main/java/io/legado/app/model/ReadManga.kt +++ b/app/src/main/java/io/legado/app/model/ReadManga.kt @@ -255,11 +255,7 @@ object ReadManga : CoroutineScope by MainScope() { nextFinish = true list.addAll(it.contents) } - pos = if (list.isNotEmpty()) { - pos.coerceIn(0, list.lastIndex) - } else { - -1 - } + pos = pos.coerceIn(0, list.lastIndex) return MangaContent(pos, list, curFinish, nextFinish) } diff --git a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt index a880232ff..e3150760c 100644 --- a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt @@ -267,10 +267,8 @@ class ReadMangaActivity : VMBaseActivity -1) { - upInfoBar(list[pos]) - mLayoutManager.scrollToPositionWithOffset(pos, 0) - } + upInfoBar(list[pos]) + mLayoutManager.scrollToPositionWithOffset(pos, 0) binding.flLoading.isGone = true loadMoreView.visible() binding.mangaMenu.upSeekBar( @@ -522,7 +520,7 @@ class ReadMangaActivity : VMBaseActivity { - MangaFooterSettingDialog().show(supportFragmentManager, "mangaFooterSettingDialog") + showDialogFragment(MangaFooterSettingDialog()) } R.id.menu_enable_horizontal_scroller -> { @@ -537,7 +535,7 @@ class ReadMangaActivity : VMBaseActivity { binding.mangaMenu.runMenuOut() - MangaColorFilterDialog().show(supportFragmentManager, "MangaColorFilterDialog") + showDialogFragment(MangaColorFilterDialog()) } } return super.onCompatOptionsItemSelected(item) diff --git a/app/src/main/java/io/legado/app/ui/book/read/MangaMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/MangaMenu.kt index fb24bf001..34006baa9 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/MangaMenu.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/MangaMenu.kt @@ -150,7 +150,7 @@ class MangaMenu @JvmOverloads constructor( /** * 确保视图不被导航栏遮挡 */ - applyNavigationBarPadding() + bottomMenu.applyNavigationBarPadding() } private fun upBrightnessVwPos() { @@ -248,6 +248,14 @@ class MangaMenu @JvmOverloads constructor( callBack.skipToPage(seekBar.progress) } } + + override fun onStartTrackingTouch(seekBar: SeekBar) { + binding.vwMenuBg.setOnClickListener(null) + } + + override fun onStopTrackingTouch(seekBar: SeekBar) { + binding.vwMenuBg.setOnClickListener { runMenuOut() } + } }) } diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt index d68810b65..b16ec6f06 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt @@ -412,7 +412,12 @@ class ReadMenu @JvmOverloads constructor( //阅读进度 seekReadPage.setOnSeekBarChangeListener(object : SeekBarChangeListener { + override fun onStartTrackingTouch(seekBar: SeekBar) { + binding.vwMenuBg.setOnClickListener(null) + } + override fun onStopTrackingTouch(seekBar: SeekBar) { + binding.vwMenuBg.setOnClickListener { runMenuOut() } when (AppConfig.progressBarBehavior) { "page" -> ReadBook.skipToPage(seekBar.progress) "chapter" -> {