优化
This commit is contained in:
@@ -219,6 +219,7 @@ abstract class BaseReadBookActivity :
|
||||
upNavigationBar()
|
||||
when {
|
||||
binding.readMenu.isVisible -> super.upNavigationBarColor()
|
||||
binding.searchMenu.bottomMenuVisible -> super.upNavigationBarColor()
|
||||
bottomDialog > 0 -> super.upNavigationBarColor()
|
||||
!AppConfig.immNavigationBar -> super.upNavigationBarColor()
|
||||
else -> setNavigationBarColorAuto(ReadBookConfig.bgMeanColor)
|
||||
@@ -228,7 +229,7 @@ abstract class BaseReadBookActivity :
|
||||
@SuppressLint("RtlHardcoded")
|
||||
private fun upNavigationBar() {
|
||||
binding.navigationBar.run {
|
||||
if (bottomDialog > 0 || binding.readMenu.isVisible) {
|
||||
if (bottomDialog > 0 || binding.readMenu.isVisible || binding.searchMenu.bottomMenuVisible) {
|
||||
// val navigationBarHeight =
|
||||
// if (ReadBookConfig.hideNavigationBar) navigationBarHeight else 0
|
||||
// when (navigationBarGravity) {
|
||||
|
||||
@@ -232,7 +232,7 @@ class ReadBookActivity : BaseReadBookActivity(),
|
||||
override val pageFactory get() = binding.readView.pageFactory
|
||||
override val pageDelegate get() = binding.readView.pageDelegate
|
||||
override val headerHeight: Int get() = binding.readView.curPage.headerHeight
|
||||
private val menuLayoutIsVisible get() = bottomDialog > 0 || binding.readMenu.isVisible
|
||||
private val menuLayoutIsVisible get() = bottomDialog > 0 || binding.readMenu.isVisible || binding.searchMenu.bottomMenuVisible
|
||||
private val nextPageDebounce by lazy { Debounce { keyPage(PageDirection.NEXT) } }
|
||||
private val prevPageDebounce by lazy { Debounce { keyPage(PageDirection.PREV) } }
|
||||
private var bookChanged = false
|
||||
|
||||
@@ -225,7 +225,6 @@ class ReadMenu @JvmOverloads constructor(
|
||||
ivSetting.setColorFilter(textColor, PorterDuff.Mode.SRC_IN)
|
||||
tvSetting.setTextColor(textColor)
|
||||
vwBrightnessPosAdjust.setColorFilter(textColor, PorterDuff.Mode.SRC_IN)
|
||||
vwBg.setOnClickListener(null)
|
||||
llBrightness.setOnClickListener(null)
|
||||
seekBrightness.post {
|
||||
seekBrightness.progress = AppConfig.readBrightness
|
||||
|
||||
@@ -59,6 +59,7 @@ class SearchMenu @JvmOverloads constructor(
|
||||
get() = searchResultList.getOrNull(currentSearchResultIndex)
|
||||
val previousSearchResult: SearchResult?
|
||||
get() = searchResultList.getOrNull(lastSearchResultIndex)
|
||||
val bottomMenuVisible get() = binding.llBottomMenu.isVisible
|
||||
|
||||
init {
|
||||
initAnimation()
|
||||
|
||||
Reference in New Issue
Block a user