Switch search and goto in single page mode

max-kammerer · May 29, 2024 · 84a1865 · 84a1865
1 parent 6ed04cf
commit 84a1865
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/orion-viewer/src/main/java/universe/constellation/orion/viewer/MainMenu.kt b/orion-viewer/src/main/java/universe/constellation/orion/viewer/MainMenu.kt
@@ -31,13 +31,10 @@ class MainMenu(private val mainMenu: View, val orionViewerActivity: OrionViewerA
 
         pageSeeker.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
             override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                orionViewerActivity.controller?.let {
-                    controller ->
-                    if (fromUser) {
-                        controller.drawPage(progress)
-                    }
-                    curPage.setGotoSpannable((progress + 1).toString())
+                if (fromUser) {
+                    openPage(progress)
                 }
+                curPage.setGotoSpannable((progress + 1).toString())
             }
 
             override fun onStartTrackingTouch(seekBar: SeekBar?) {}
@@ -50,17 +47,21 @@ class MainMenu(private val mainMenu: View, val orionViewerActivity: OrionViewerA
         mainMenu.findViewById<ImageView>(R.id.page_picker_minus).setOnClickListener {
             if (pageSeeker.progress - 1 >= 0) {
                 pageSeeker.progress -= 1
-                orionViewerActivity.controller?.drawPage(pageSeeker.progress)
+                openPage(pageSeeker.progress)
             }
         }
         mainMenu.findViewById<ImageView>(R.id.page_picker_plus).setOnClickListener {
             if (pageSeeker.progress + 1 <= pageSeeker.max) {
                 pageSeeker.progress += 1
-                orionViewerActivity.controller?.drawPage(pageSeeker.progress)
+                openPage(pageSeeker.progress)
             }
         }
     }
 
+    private fun openPage(pageNum: Int) {
+        orionViewerActivity.controller?.drawPage(pageNum, isTapNavigation = true)
+    }
+
     private fun initImageViewActions(view: View, id: Int) {
         val panel = view.findViewById<ViewGroup>(id)
         initImageViewActions(panel)

diff --git a/orion-viewer/src/main/java/universe/constellation/orion/viewer/dialog/SearchDialog.java b/orion-viewer/src/main/java/universe/constellation/orion/viewer/dialog/SearchDialog.java
@@ -260,7 +260,7 @@ private void drawBatch(SubBatch subBatch, Controller controller) {
         log("Rect " + toAbsoluteRect(subBatch.lp));
 
         lastSearchResultRenderer.setBatch(subBatch);
-        controller.drawPage(subBatch.lp);
+        controller.drawPage(subBatch.lp, true);
     }
 
     @Override