优化
This commit is contained in:
@@ -255,11 +255,7 @@ object ReadManga : CoroutineScope by MainScope() {
|
|||||||
nextFinish = true
|
nextFinish = true
|
||||||
list.addAll(it.contents)
|
list.addAll(it.contents)
|
||||||
}
|
}
|
||||||
pos = if (list.isNotEmpty()) {
|
pos = pos.coerceIn(0, list.lastIndex)
|
||||||
pos.coerceIn(0, list.lastIndex)
|
|
||||||
} else {
|
|
||||||
-1
|
|
||||||
}
|
|
||||||
return MangaContent(pos, list, curFinish, nextFinish)
|
return MangaContent(pos, list, curFinish, nextFinish)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -267,10 +267,8 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
|
|||||||
mAdapter.submitList(list) {
|
mAdapter.submitList(list) {
|
||||||
if (loadingViewVisible && curFinish) {
|
if (loadingViewVisible && curFinish) {
|
||||||
binding.infobar.isVisible = true
|
binding.infobar.isVisible = true
|
||||||
if (pos > -1) {
|
upInfoBar(list[pos])
|
||||||
upInfoBar(list[pos])
|
mLayoutManager.scrollToPositionWithOffset(pos, 0)
|
||||||
mLayoutManager.scrollToPositionWithOffset(pos, 0)
|
|
||||||
}
|
|
||||||
binding.flLoading.isGone = true
|
binding.flLoading.isGone = true
|
||||||
loadMoreView.visible()
|
loadMoreView.visible()
|
||||||
binding.mangaMenu.upSeekBar(
|
binding.mangaMenu.upSeekBar(
|
||||||
@@ -522,7 +520,7 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
|
|||||||
}
|
}
|
||||||
|
|
||||||
R.id.menu_manga_footer_config -> {
|
R.id.menu_manga_footer_config -> {
|
||||||
MangaFooterSettingDialog().show(supportFragmentManager, "mangaFooterSettingDialog")
|
showDialogFragment(MangaFooterSettingDialog())
|
||||||
}
|
}
|
||||||
|
|
||||||
R.id.menu_enable_horizontal_scroller -> {
|
R.id.menu_enable_horizontal_scroller -> {
|
||||||
@@ -537,7 +535,7 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
|
|||||||
|
|
||||||
R.id.menu_manga_color_filter -> {
|
R.id.menu_manga_color_filter -> {
|
||||||
binding.mangaMenu.runMenuOut()
|
binding.mangaMenu.runMenuOut()
|
||||||
MangaColorFilterDialog().show(supportFragmentManager, "MangaColorFilterDialog")
|
showDialogFragment(MangaColorFilterDialog())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return super.onCompatOptionsItemSelected(item)
|
return super.onCompatOptionsItemSelected(item)
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ class MangaMenu @JvmOverloads constructor(
|
|||||||
/**
|
/**
|
||||||
* 确保视图不被导航栏遮挡
|
* 确保视图不被导航栏遮挡
|
||||||
*/
|
*/
|
||||||
applyNavigationBarPadding()
|
bottomMenu.applyNavigationBarPadding()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun upBrightnessVwPos() {
|
private fun upBrightnessVwPos() {
|
||||||
@@ -248,6 +248,14 @@ class MangaMenu @JvmOverloads constructor(
|
|||||||
callBack.skipToPage(seekBar.progress)
|
callBack.skipToPage(seekBar.progress)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onStartTrackingTouch(seekBar: SeekBar) {
|
||||||
|
binding.vwMenuBg.setOnClickListener(null)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onStopTrackingTouch(seekBar: SeekBar) {
|
||||||
|
binding.vwMenuBg.setOnClickListener { runMenuOut() }
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -412,7 +412,12 @@ class ReadMenu @JvmOverloads constructor(
|
|||||||
//阅读进度
|
//阅读进度
|
||||||
seekReadPage.setOnSeekBarChangeListener(object : SeekBarChangeListener {
|
seekReadPage.setOnSeekBarChangeListener(object : SeekBarChangeListener {
|
||||||
|
|
||||||
|
override fun onStartTrackingTouch(seekBar: SeekBar) {
|
||||||
|
binding.vwMenuBg.setOnClickListener(null)
|
||||||
|
}
|
||||||
|
|
||||||
override fun onStopTrackingTouch(seekBar: SeekBar) {
|
override fun onStopTrackingTouch(seekBar: SeekBar) {
|
||||||
|
binding.vwMenuBg.setOnClickListener { runMenuOut() }
|
||||||
when (AppConfig.progressBarBehavior) {
|
when (AppConfig.progressBarBehavior) {
|
||||||
"page" -> ReadBook.skipToPage(seekBar.progress)
|
"page" -> ReadBook.skipToPage(seekBar.progress)
|
||||||
"chapter" -> {
|
"chapter" -> {
|
||||||
|
|||||||
Reference in New Issue
Block a user