Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-20 03:39:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the readernav disappearing on theme switching

Browse Source
This commit is contained in:
Jays2Kings 2021-07-19 19:22:02 -04:00
parent 3d6d934708
commit a3d0beb40c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt
View File

@ -7,7 +7,6 @@ import android.util.AttributeSet
import android.view.View import android.view.View
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.core.graphics.ColorUtils import androidx.core.graphics.ColorUtils
import androidx.core.view.isGone
import androidx.core.view.isInvisible import androidx.core.view.isInvisible
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
@ -68,7 +67,8 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr
binding.chapterRecycler.alpha = if (sheetBehavior.isExpanded()) 1f else 0f binding.chapterRecycler.alpha = if (sheetBehavior.isExpanded()) 1f else 0f
binding.chapterRecycler.isClickable = sheetBehavior.isExpanded() binding.chapterRecycler.isClickable = sheetBehavior.isExpanded()
binding.chapterRecycler.isFocusable = sheetBehavior.isExpanded() binding.chapterRecycler.isFocusable = sheetBehavior.isExpanded()
if (!activity.binding.readerNav.root.isGone) { val canShowNav = presenter.getCurrentChapter()?.pages?.size ?: 1 > 1
if (canShowNav) {
activity.binding.readerNav.root.isVisible = sheetBehavior.isCollapsed() activity.binding.readerNav.root.isVisible = sheetBehavior.isCollapsed()
} }
} }
@ -89,24 +89,25 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr
} }
override fun onStateChanged(p0: View, state: Int) { override fun onStateChanged(p0: View, state: Int) {
val canShowNav = presenter.getCurrentChapter()?.pages?.size ?: 1 > 1
if (state == BottomSheetBehavior.STATE_COLLAPSED) { if (state == BottomSheetBehavior.STATE_COLLAPSED) {
sheetBehavior?.isHideable = false sheetBehavior?.isHideable = false
(binding.chapterRecycler.layoutManager as LinearLayoutManager).scrollToPositionWithOffset( (binding.chapterRecycler.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(
adapter?.getPosition(presenter.getCurrentChapter()?.chapter?.id ?: 0L) ?: 0, adapter?.getPosition(presenter.getCurrentChapter()?.chapter?.id ?: 0L) ?: 0,
binding.chapterRecycler.height / 2 - 30.dpToPx binding.chapterRecycler.height / 2 - 30.dpToPx
) )
if (!activity.binding.readerNav.root.isGone) { if (canShowNav) {
activity.binding.readerNav.root.isVisible = true activity.binding.readerNav.root.isVisible = true
} }
activity.binding.readerNav.root.alpha = 1f activity.binding.readerNav.root.alpha = 1f
} }
if (state == BottomSheetBehavior.STATE_DRAGGING || state == BottomSheetBehavior.STATE_SETTLING) { if (state == BottomSheetBehavior.STATE_DRAGGING || state == BottomSheetBehavior.STATE_SETTLING) {
if (!activity.binding.readerNav.root.isGone) { if (canShowNav) {
activity.binding.readerNav.root.isVisible = true activity.binding.readerNav.root.isVisible = true
} }
} }
if (state == BottomSheetBehavior.STATE_EXPANDED) { if (state == BottomSheetBehavior.STATE_EXPANDED) {
if (!activity.binding.readerNav.root.isGone) { if (canShowNav) {
activity.binding.readerNav.root.isInvisible = true activity.binding.readerNav.root.isInvisible = true
} }
activity.binding.readerNav.root.alpha = 0f activity.binding.readerNav.root.alpha = 0f
@ -115,7 +116,7 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr
} }
if (state == BottomSheetBehavior.STATE_HIDDEN) { if (state == BottomSheetBehavior.STATE_HIDDEN) {
activity.binding.readerNav.root.alpha = 0f activity.binding.readerNav.root.alpha = 0f
if (!activity.binding.readerNav.root.isGone) { if (canShowNav) {
activity.binding.readerNav.root.isInvisible = true activity.binding.readerNav.root.isInvisible = true
} }
} }