From d0738f5b00dfc2f6225cf7a20758b61dcb720168 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Tue, 30 Mar 2021 22:51:38 -0400
Subject: [PATCH] Fix n/p chapters strings + action for n/p chapter

---
 .../tachiyomi/ui/reader/ReaderActivity.kt     | 26 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  4 +--
 2 files changed, 28 insertions(+), 2 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 7cbfd6d427..398742e02f 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
@@ -357,6 +357,22 @@ class ReaderActivity :
             }
         }
 
+        binding.readerNav.leftChapter.setOnClickListener {
+            if (viewer is R2LPagerViewer) {
+                presenter.loadNextChapter()
+            } else {
+                presenter.loadPreviousChapter()
+            }
+        }
+
+        binding.readerNav.rightChapter.setOnClickListener {
+            if (viewer !is R2LPagerViewer) {
+                presenter.loadNextChapter()
+            } else {
+                presenter.loadPreviousChapter()
+            }
+        }
+
         // Init listeners on bottom menu
         binding.readerNav.pageSeekbar.setOnSeekBarChangeListener(
             object : SimpleSeekBarListener() {
@@ -511,6 +527,16 @@ class ReaderActivity :
         viewer = newViewer
         binding.viewerContainer.addView(newViewer.getView())
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (newViewer is R2LPagerViewer) {
+                binding.readerNav.leftChapter.tooltipText = getString(R.string.next_chapter)
+                binding.readerNav.rightChapter.tooltipText = getString(R.string.previous_chapter)
+            } else {
+                binding.readerNav.leftChapter.tooltipText = getString(R.string.previous_chapter)
+                binding.readerNav.rightChapter.tooltipText = getString(R.string.next_chapter)
+            }
+        }
+
         binding.navigationOverlay.isLTR = !(viewer is L2RPagerViewer)
         binding.viewerContainer.setBackgroundColor(
             if (viewer is WebtoonViewer) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c13d70b58b..e88a9aa0e8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -303,8 +303,8 @@
     <string name="webtoon_style">webtoon style</string>
     <string name="next_page">Next page</string>
     <string name="previous_page">Previous page</string>
-    <string name="next_chapter">Next page</string>
-    <string name="previous_chapter">Previous page</string>
+    <string name="next_chapter">Next chapter</string>
+    <string name="previous_chapter">Previous chapter</string>
 
     <!-- Reader settings -->
     <string name="fullscreen">Fullscreen</string>