pull/525/head
gedoor 5 years ago
parent 4ac2e38875
commit 776c54159f
  1. 35
      app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
  2. 12
      app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt

@ -153,22 +153,22 @@ class ReadBookActivity : ReadBookBaseActivity(),
} }
private fun upMenu() { private fun upMenu() {
menu?.let { menu -> val menu = menu
ReadBook.book?.let { book -> val book = ReadBook.book
val onLine = !book.isLocalBook() if (menu != null && book != null) {
for (i in 0 until menu.size) { val onLine = !book.isLocalBook()
val item = menu[i] for (i in 0 until menu.size) {
when (item.groupId) { val item = menu[i]
R.id.menu_group_on_line, when (item.groupId) {
R.id.menu_group_on_line_ns -> item.isVisible = onLine R.id.menu_group_on_line,
R.id.menu_group_local -> item.isVisible = !onLine R.id.menu_group_on_line_ns -> item.isVisible = onLine
R.id.menu_group_text -> item.isVisible = book.isLocalTxt() R.id.menu_group_local -> item.isVisible = !onLine
R.id.menu_group_login -> R.id.menu_group_text -> item.isVisible = book.isLocalTxt()
item.isVisible = !ReadBook.webBook?.bookSource?.loginUrl.isNullOrEmpty() R.id.menu_group_login ->
else -> when (item.itemId) { item.isVisible = !ReadBook.webBook?.bookSource?.loginUrl.isNullOrEmpty()
R.id.menu_enable_replace -> item.isChecked = book.getUseReplaceRule() else -> when (item.itemId) {
R.id.menu_re_segment -> item.isChecked = book.getReSegment() R.id.menu_enable_replace -> item.isChecked = book.getUseReplaceRule()
} R.id.menu_re_segment -> item.isChecked = book.getReSegment()
} }
} }
} }
@ -581,14 +581,15 @@ class ReadBookActivity : ReadBookBaseActivity(),
binding.readView.upContent() binding.readView.upContent()
binding.readView.upContent(1) binding.readView.upContent(1)
autoPagePlus() autoPagePlus()
binding.readMenu.setAutoPage(true)
} }
binding.readMenu.setAutoPage(isAutoPage)
} }
override fun autoPageStop() { override fun autoPageStop() {
isAutoPage = false isAutoPage = false
mHandler.removeCallbacks(autoPageRunnable) mHandler.removeCallbacks(autoPageRunnable)
binding.readView.upContent() binding.readView.upContent()
binding.readMenu.setAutoPage(false)
} }
private fun autoPagePlus() { private fun autoPagePlus() {

@ -300,15 +300,15 @@ class ReadMenu @JvmOverloads constructor(
binding.seekReadPage.progress = seek binding.seekReadPage.progress = seek
} }
fun setAutoPage(autoPage: Boolean) { fun setAutoPage(autoPage: Boolean) = with(binding) {
if (autoPage) { if (autoPage) {
binding.fabAutoPage.setImageResource(R.drawable.ic_auto_page_stop) fabAutoPage.setImageResource(R.drawable.ic_auto_page_stop)
binding.fabAutoPage.contentDescription = context.getString(R.string.auto_next_page_stop) fabAutoPage.contentDescription = context.getString(R.string.auto_next_page_stop)
} else { } else {
binding.fabAutoPage.setImageResource(R.drawable.ic_auto_page) fabAutoPage.setImageResource(R.drawable.ic_auto_page)
binding.fabAutoPage.contentDescription = context.getString(R.string.auto_next_page) fabAutoPage.contentDescription = context.getString(R.string.auto_next_page)
} }
binding.fabAutoPage.setColorFilter(textColor) fabAutoPage.setColorFilter(textColor)
} }
interface CallBack { interface CallBack {

Loading…
Cancel
Save