From 2845d8cc9883020622eb79a61a246c22d8dd55ea Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 13 Feb 2021 10:26:59 -0500
Subject: [PATCH] Allow clicking the toolbar to go to the manga

Co-authored-by: Jobobby04 <jobobby04@users.noreply.github.com>
(cherry picked from commit 8bb69c455b3af3c90340c8969f2c0f474daedbcb)
---
 .../tachiyomi/ui/reader/ReaderActivity.kt     | 26 +++++++++----------
 1 file changed, 12 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 5cd6daf33..d1a2cb727 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
@@ -367,7 +367,6 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
      * Initializes the reader menu. It sets up click listeners and the initial visibility.
      */
     private fun initializeMenu() {
-        // Set toolbar
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         binding.toolbar.setNavigationOnClickListener {
@@ -387,6 +386,18 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
             insets
         }
 
+        binding.toolbar.setOnClickListener {
+            presenter.manga?.id?.let { id ->
+                startActivity(
+                    Intent(this, MainActivity::class.java).apply {
+                        action = MainActivity.SHORTCUT_MANGA
+                        putExtra(MangaController.MANGA_EXTRA, id)
+                        addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                    }
+                )
+            }
+        }
+
         // Init listeners on bottom menu
         binding.pageSeekbar.setOnSeekBarChangeListener(
             object : SimpleSeekBarListener() {
@@ -593,19 +604,6 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
             }
             .launchIn(lifecycleScope)
 
-        binding.toolbar.clicks()
-            .onEach {
-                presenter.manga?.id?.let { id ->
-                    startActivity(
-                        Intent(this, MainActivity::class.java)
-                            .setAction(MainActivity.SHORTCUT_MANGA)
-                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                            .putExtra(MangaController.MANGA_EXTRA, id)
-                    )
-                }
-            }
-            .launchIn(lifecycleScope)
-
         autoScrollFlow
             .onEach {
                 viewer.let { v ->