This commit is contained in:
Horis
2025-03-16 13:48:39 +08:00
parent c1da73b1fe
commit 7b6531d3e1
4 changed files with 19 additions and 12 deletions

View File

@@ -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)
}

View File

@@ -267,10 +267,8 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
mAdapter.submitList(list) {
if (loadingViewVisible && curFinish) {
binding.infobar.isVisible = true
if (pos > -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<ActivityMangaBinding, ReadMangaViewMode
}
R.id.menu_manga_footer_config -> {
MangaFooterSettingDialog().show(supportFragmentManager, "mangaFooterSettingDialog")
showDialogFragment(MangaFooterSettingDialog())
}
R.id.menu_enable_horizontal_scroller -> {
@@ -537,7 +535,7 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
R.id.menu_manga_color_filter -> {
binding.mangaMenu.runMenuOut()
MangaColorFilterDialog().show(supportFragmentManager, "MangaColorFilterDialog")
showDialogFragment(MangaColorFilterDialog())
}
}
return super.onCompatOptionsItemSelected(item)

View File

@@ -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() }
}
})
}

View File

@@ -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" -> {