From 3ea1e1914a7b9a95fa1cd93733d2cf2d8ff7329b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E7=99=BD-=E7=99=BD?= <i@moedog.org>
Date: Thu, 17 Nov 2022 18:25:59 +0800
Subject: [PATCH] Support hide comments, Resolve $454

---
 app/src/main/java/com/hippo/ehviewer/Settings.java        | 6 ++++++
 .../com/hippo/ehviewer/ui/scene/GalleryDetailScene.java   | 8 ++++++--
 app/src/main/res/values-zh-rCN/strings.xml                | 2 ++
 app/src/main/res/values/strings.xml                       | 2 ++
 app/src/main/res/xml/eh_settings.xml                      | 7 +++++++
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java
index 5623c1fea..89e8268a5 100755
--- a/app/src/main/java/com/hippo/ehviewer/Settings.java
+++ b/app/src/main/java/com/hippo/ehviewer/Settings.java
@@ -62,6 +62,8 @@ public class Settings {
     public static final String KEY_DETAIL_SIZE = "detail_size";
     public static final String KEY_THUMB_SIZE = "thumb_size";
     public static final String KEY_THUMB_RESOLUTION = "thumb_resolution";
+    private static final String KEY_SHOW_COMMENTS = "show_gallery_comments";
+    private static final boolean DEFAULT_SHOW_COMMENTS = true;
     public static final String KEY_SHOW_TAG_TRANSLATIONS = "show_tag_translations";
     public static final String KEY_DEFAULT_CATEGORIES = "default_categories";
     public static final int DEFAULT_DEFAULT_CATEGORIES = EhUtils.ALL_CATEGORY;
@@ -557,6 +559,10 @@ public class Settings {
         return getIntFromStr(KEY_THUMB_RESOLUTION, DEFAULT_THUMB_RESOLUTION);
     }
 
+    public static boolean getShowComments() {
+        return getBoolean(KEY_SHOW_COMMENTS, DEFAULT_SHOW_COMMENTS);
+    }
+
     public static boolean getRequestNews() {
         return getBoolean(KEY_REQUEST_NEWS, DEFAULT_REQUEST_NEWS);
     }
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 75b9f1303..a2acfa565 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
@@ -637,8 +637,12 @@ public class GalleryDetailScene extends CollapsingToolbarScene implements View.O
         mNoTags = (TextView) ViewUtils.$$(mTags, R.id.no_tags);
 
         mComments = (LinearLayout) ViewUtils.$$(belowHeader, R.id.comments);
-        mCommentsText = (TextView) ViewUtils.$$(mComments, R.id.comments_text);
-        mComments.setOnClickListener(this);
+        if (Settings.getShowComments()) {
+            mCommentsText = (TextView) ViewUtils.$$(mComments, R.id.comments_text);
+            mComments.setOnClickListener(this);
+        } else {
+            mComments.setVisibility(View.GONE);
+        }
 
         mPreviews = ViewUtils.$$(belowHeader, R.id.previews);
         mGridLayout = (SimpleGridAutoSpanLayout) ViewUtils.$$(mPreviews, R.id.grid_layout);
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1e688eeab..a42ec38a6 100755
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -386,6 +386,8 @@
     <string name="settings_eh_show_jpn_title_summary">需同时在 EHentai 网站设置中启用 Japanese Title</string>
     <string name="settings_eh_show_gallery_pages">显示画廊页数</string>
     <string name="settings_eh_show_gallery_pages_summary">在画廊列表中显示页数</string>
+    <string name="settings_eh_show_gallery_comments">显示画廊评论</string>
+    <string name="settings_eh_show_gallery_comments_summary">在画廊详情页中显示评论</string>
     <string name="settings_eh_show_tag_translations">显示标签翻译</string>
     <string name="settings_eh_show_tag_translations_summary">显示翻译后的标签而非原始文字（需花费时间来下载数据文件）</string>
     <string name="settings_eh_tag_translations_source">补充翻译（由 EhTagTranslation 提供）</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 95b1b5beb..f2669bf57 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -431,6 +431,8 @@
     <string name="settings_eh_show_jpn_title_summary">Require enabling Japanese Title in Settings on EHentai website</string>
     <string name="settings_eh_show_gallery_pages">Show gallery pages</string>
     <string name="settings_eh_show_gallery_pages_summary">Display the number of pages in the gallery list</string>
+    <string name="settings_eh_show_gallery_comments">Show gallery comments</string>
+    <string name="settings_eh_show_gallery_comments_summary">Show comments on the gallery details page</string>
     <string name="settings_eh_show_tag_translations">Show tag translations</string>
     <string name="settings_eh_show_tag_translations_summary">Show tag translations instead of the original text (It takes time to download the data file)</string>
     <string name="settings_eh_tag_translations_source">Placeholder</string>
diff --git a/app/src/main/res/xml/eh_settings.xml b/app/src/main/res/xml/eh_settings.xml
index 1bd576ed0..d78392283 100644
--- a/app/src/main/res/xml/eh_settings.xml
+++ b/app/src/main/res/xml/eh_settings.xml
@@ -126,6 +126,13 @@
         android:title="@string/settings_eh_show_gallery_pages"
         app:iconSpaceReserved="false" />
 
+    <rikka.material.preference.MaterialSwitchPreference
+        android:defaultValue="false"
+        android:key="show_gallery_comments"
+        android:summary="@string/settings_eh_show_gallery_comments_summary"
+        android:title="@string/settings_eh_show_gallery_comments"
+        app:iconSpaceReserved="false" />
+
     <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="show_tag_translations"