From 33c48412beb78be98826c5f86a0e099d012697ca Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sat, 3 Jul 2021 22:37:25 -0400 Subject: [PATCH] Multiple bugfixes for the reader, includes double page and chapter buttons --- .../tachiyomi/ui/reader/ReaderActivity.kt | 17 ++++++++++++++++- .../tachiyomi/ui/reader/ReaderPresenter.kt | 2 +- .../ui/reader/chapter/ReaderChapterDialog.kt | 2 +- .../ui/reader/viewer/pager/PagerViewer.kt | 4 ++-- app/src/main/res/layout/reader_activity.xml | 10 +--------- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 2200e6f51..0006ff3d6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -477,7 +477,12 @@ class ReaderActivity : BaseRxActivity() binding.toolbarBottom, binding.leftChapter, binding.readerSeekbar, - binding.rightChapter + binding.rightChapter, + // SY --> + binding.pageSeekbarVert, + binding.aboveChapter, + binding.belowChapter + // SY <-- ).forEach { it.backgroundTintMode = PorterDuff.Mode.DST_IN it.backgroundTintList = ColorStateList.valueOf(toolbarColor) @@ -1072,6 +1077,8 @@ class ReaderActivity : BaseRxActivity() binding.leftChapter.setTooltip(R.string.action_previous_chapter) binding.rightChapter.setTooltip(R.string.action_next_chapter) } + binding.aboveChapter.setTooltip(R.string.action_previous_chapter) + binding.belowChapter.setTooltip(R.string.action_next_chapter) binding.pleaseWait.isVisible = true binding.pleaseWait.startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in_long)) @@ -1122,12 +1129,20 @@ class ReaderActivity : BaseRxActivity() if (leftChapterObject == null && rightChapterObject == null) { binding.leftChapter.isVisible = false binding.rightChapter.isVisible = false + binding.aboveChapter.isVisible = false + binding.belowChapter.isVisible = false } else { binding.leftChapter.isEnabled = leftChapterObject != null binding.leftChapter.imageAlpha = if (leftChapterObject != null) ENABLED_BUTTON_IMAGE_ALPHA else DISABLED_BUTTON_IMAGE_ALPHA binding.rightChapter.isEnabled = rightChapterObject != null binding.rightChapter.imageAlpha = if (rightChapterObject != null) ENABLED_BUTTON_IMAGE_ALPHA else DISABLED_BUTTON_IMAGE_ALPHA + + binding.aboveChapter.isEnabled = leftChapterObject != null + binding.aboveChapter.imageAlpha = if (leftChapterObject != null) ENABLED_BUTTON_IMAGE_ALPHA else DISABLED_BUTTON_IMAGE_ALPHA + + binding.belowChapter.isEnabled = rightChapterObject != null + binding.belowChapter.imageAlpha = if (rightChapterObject != null) ENABLED_BUTTON_IMAGE_ALPHA else DISABLED_BUTTON_IMAGE_ALPHA } // Invalidate menu to show proper chapter bookmark state diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt index 7781b0e46..9ca24db5a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt @@ -380,7 +380,7 @@ class ReaderPresenter( .also(::add) } - fun loadNewChapterFromSheet(chapter: Chapter) { + fun loadNewChapterFromDialog(chapter: Chapter) { val newChapter = chapterList.firstOrNull { it.chapter.id == chapter.id } ?: return loadAdjacent(newChapter) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt index e7b50f712..67dec7bcf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt @@ -34,7 +34,7 @@ class ReaderChapterDialog(private val activity: ReaderActivity) : ReaderChapterA val item = adapter?.getItem(position) if (item != null && item.id != presenter.getCurrentChapter()?.chapter?.id) { dismiss() - presenter.loadNewChapterFromSheet(item) + presenter.loadNewChapterFromDialog(item) } true } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt index 2a244e6d3..89d7fb9eb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt @@ -66,7 +66,7 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer { field = value if (value) { awaitingIdleViewerChapters?.let { - setChaptersInternal(it) + setChaptersDoubleShift(it) awaitingIdleViewerChapters = null } } @@ -239,7 +239,7 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer { */ override fun setChapters(chapters: ViewerChapters) { if (isIdle) { - setChaptersInternal(chapters) + setChaptersDoubleShift(chapters) } else { awaitingIdleViewerChapters = chapters } diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml index 932343ceb..389b01510 100755 --- a/app/src/main/res/layout/reader_activity.xml +++ b/app/src/main/res/layout/reader_activity.xml @@ -175,7 +175,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:orientation="horizontal" - app:layout_constraintBottom_toTopOf="@id/below_guideline" + app:layout_constraintBottom_toTopOf="@id/reader_menu_bottom" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/above_guideline" @@ -277,14 +277,6 @@ - -