From cd9b5e5a440c7b6f9e3f1db4dfe154df93b9dd36 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Mon, 2 Jan 2023 10:56:20 +0800
Subject: [PATCH] Simplify onNavigationClick

---
 .../com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java   | 5 -----
 .../com/hippo/ehviewer/ui/scene/GalleryDetailScene.java     | 6 ------
 .../com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java   | 5 -----
 .../main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt   | 1 -
 .../main/java/com/hippo/ehviewer/ui/scene/ToolbarScene.kt   | 4 +++-
 5 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
index 2c9da996b..622efbf8c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
@@ -266,11 +266,6 @@ public final class GalleryCommentsScene extends ToolbarScene
         setNavigationIcon(R.drawable.v_arrow_left_dark_x24);
     }
 
-    @Override
-    public void onNavigationClick() {
-        requireActivity().getOnBackPressedDispatcher().onBackPressed();
-    }
-
     private void showFilterCommenterDialog(String commenter, int position) {
         Context context = getContext();
         if (context == null || commenter == null) {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
index 0716c467d..169f5da10 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -471,12 +471,6 @@ public class GalleryDetailScene extends CollapsingToolbarScene implements View.O
         setNavigationIcon(R.drawable.v_arrow_left_dark_x24);
     }
 
-    @Override
-    public void onNavigationClick() {
-        requireActivity().getOnBackPressedDispatcher().onBackPressed();
-        super.onNavigationClick();
-    }
-
     @Override
     public boolean onMenuItemClick(MenuItem item) {
         int itemId = item.getItemId();
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java
index 547d081fc..229ee86dd 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java
@@ -218,11 +218,6 @@ public class GalleryPreviewsScene extends ToolbarScene {
         return false;
     }
 
-    @Override
-    public void onNavigationClick() {
-        requireActivity().getOnBackPressedDispatcher().onBackPressed();
-    }
-
     public boolean onItemClick(int position) {
         Context context = getContext();
         if (null != context && null != mHelper && null != mGalleryInfo) {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
index 908b701b5..b993027b0 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
@@ -189,7 +189,6 @@ class HistoryScene : ToolbarScene() {
         mRecyclerView = null
     }
 
-    @SuppressLint("RtlHardcoded")
     override fun onNavigationClick() {
         toggleDrawer(GravityCompat.START)
     }
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/ToolbarScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/ToolbarScene.kt
index a064af0c9..60468c37d 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/ToolbarScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/ToolbarScene.kt
@@ -86,7 +86,9 @@ abstract class ToolbarScene : BaseScene() {
         return false
     }
 
-    open fun onNavigationClick() {}
+    open fun onNavigationClick() {
+        requireActivity().onBackPressedDispatcher.onBackPressed()
+    }
 
     fun setNavigationIcon(@DrawableRes resId: Int) {
         mToolbar?.setNavigationIcon(resId)