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

Added chapter/page-contextual disabling / hiding of nav buttons and nav bar

Browse Source 
Co-Authored-By: Hunter Nickel <25621728+datreesezcup@users.noreply.github.com>
This commit is contained in:
Jays2Kings 2021-07-19 17:37:16 -04:00
parent 0892a23f2a
commit 3d6d934708
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View File

@ -957,12 +957,21 @@ class ReaderActivity :
) )
) % 2 != 0 ) % 2 != 0
} }
val currentChapterPageCount = viewerChapters.currChapter.pages?.size ?: 1
binding.readerNav.root.visibility = when {
currentChapterPageCount == 1 -> View.GONE
binding.chaptersSheet.root.sheetBehavior.isCollapsed() -> View.VISIBLE
else -> View.INVISIBLE
}
lastShiftDoubleState = null lastShiftDoubleState = null
viewer?.setChapters(viewerChapters) viewer?.setChapters(viewerChapters)
intentPageNumber?.let { moveToPageIndex(it) } intentPageNumber?.let { moveToPageIndex(it) }
intentPageNumber = null intentPageNumber = null
binding.toolbar.subtitle = viewerChapters.currChapter.chapter.name binding.toolbar.subtitle = viewerChapters.currChapter.chapter.name
if (viewer is R2LPagerViewer) { if (viewerChapters.nextChapter == null && viewerChapters.prevChapter == null) {
binding.readerNav.leftChapter.isVisible = false
binding.readerNav.rightChapter.isVisible = false
} else if (viewer is R2LPagerViewer) {
binding.readerNav.leftChapter.alpha = if (viewerChapters.nextChapter != null) 1f else 0.5f binding.readerNav.leftChapter.alpha = if (viewerChapters.nextChapter != null) 1f else 0.5f
binding.readerNav.rightChapter.alpha = if (viewerChapters.prevChapter != null) 1f else 0.5f binding.readerNav.rightChapter.alpha = if (viewerChapters.prevChapter != null) 1f else 0.5f
} else { } else {

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

@ -7,6 +7,7 @@ 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
@ -67,7 +68,9 @@ 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()
activity.binding.readerNav.root.isVisible = sheetBehavior.isCollapsed() if (!activity.binding.readerNav.root.isGone) {
activity.binding.readerNav.root.isVisible = sheetBehavior.isCollapsed()
}
} }
sheetBehavior?.addBottomSheetCallback( sheetBehavior?.addBottomSheetCallback(
@ -92,21 +95,29 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr
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
) )
activity.binding.readerNav.root.isVisible = true if (!activity.binding.readerNav.root.isGone) {
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) {
activity.binding.readerNav.root.isVisible = true if (!activity.binding.readerNav.root.isGone) {
activity.binding.readerNav.root.isVisible = true
}
} }
if (state == BottomSheetBehavior.STATE_EXPANDED) { if (state == BottomSheetBehavior.STATE_EXPANDED) {
activity.binding.readerNav.root.isInvisible = true if (!activity.binding.readerNav.root.isGone) {
activity.binding.readerNav.root.isInvisible = true
}
activity.binding.readerNav.root.alpha = 0f activity.binding.readerNav.root.alpha = 0f
binding.chapterRecycler.alpha = 1f binding.chapterRecycler.alpha = 1f
if (activity.sheetManageNavColor) activity.window.navigationBarColor = primary if (activity.sheetManageNavColor) activity.window.navigationBarColor = primary
} }
if (state == BottomSheetBehavior.STATE_HIDDEN) { if (state == BottomSheetBehavior.STATE_HIDDEN) {
activity.binding.readerNav.root.alpha = 0f activity.binding.readerNav.root.alpha = 0f
activity.binding.readerNav.root.isInvisible = true if (!activity.binding.readerNav.root.isGone) {
activity.binding.readerNav.root.isInvisible = true
}
} }
binding.chapterRecycler.isClickable = state == BottomSheetBehavior.STATE_EXPANDED binding.chapterRecycler.isClickable = state == BottomSheetBehavior.STATE_EXPANDED
binding.chapterRecycler.isFocusable = state == BottomSheetBehavior.STATE_EXPANDED binding.chapterRecycler.isFocusable = state == BottomSheetBehavior.STATE_EXPANDED