From a70a05c99ba923e19319bccc1e4c1ab74cf5f7d7 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Thu, 16 Feb 2023 17:06:39 -0500
Subject: [PATCH] Reader no longer hides menu when double page spreads zoom in
 for certain conditions

For example, while scrubbing through chapters and when scrolling through pages while the current page is zooming in
---
 .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt   | 4 ++--
 .../tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt    | 2 +-
 .../kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt | 7 +++++++
 3 files changed, 10 insertions(+), 3 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 5f34717ccf..5af61c58c1 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
@@ -227,7 +227,7 @@ class ReaderActivity : BaseActivity<ReaderActivityBinding>() {
             field = value
             (viewer as? PagerViewer)?.config?.hingeGapSize = value
         }
-    val decimalFormat by lazy {
+    private val decimalFormat by lazy {
         DecimalFormat(
             "#.###",
             DecimalFormatSymbols()
@@ -1080,7 +1080,7 @@ class ReaderActivity : BaseActivity<ReaderActivityBinding>() {
     }
 
     fun hideMenu() {
-        if (menuVisible) {
+        if (menuVisible && !isScrollingThroughPagesOrChapters) {
             setMenuVisibility(false)
         }
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
index 4350c1a67c..a022fbdbf2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
@@ -181,7 +181,7 @@ class PagerPageHolder(
 
     override fun onScaleChanged(newScale: Float) {
         super.onScaleChanged(newScale)
-        viewer.activity.hideMenu()
+        viewer.hideMenuIfVisible(item)
     }
 
     override fun onImageLoadError() {
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 ab93a845ec..bb8026b0ca 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
@@ -487,4 +487,11 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
         }
         return false
     }
+
+    fun hideMenuIfVisible(item: Any) {
+        val currentItem = adapter.joinedItems.getOrNull(pager.currentItem)
+        if (item == currentItem && isIdle) {
+            activity.hideMenu()
+        }
+    }
 }