From c46c72d66d0bbb20939eae916e91006118511beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=99=BD-=E7=99=BD?= Date: Mon, 5 Dec 2022 16:51:51 +0800 Subject: [PATCH] Add private category --- app/src/main/java/com/hippo/ehviewer/Settings.java | 2 +- app/src/main/java/com/hippo/ehviewer/client/EhUtils.java | 8 ++++---- .../com/hippo/ehviewer/ui/scene/GalleryDetailScene.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java index 0e97ad176..5ecb90864 100755 --- a/app/src/main/java/com/hippo/ehviewer/Settings.java +++ b/app/src/main/java/com/hippo/ehviewer/Settings.java @@ -64,7 +64,7 @@ public class Settings { public static final String KEY_THUMB_RESOLUTION = "thumb_resolution"; 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; + public static final int DEFAULT_DEFAULT_CATEGORIES = EhConfig.ALL_CATEGORY; public static final String KEY_EXCLUDED_TAG_NAMESPACES = "excluded_tag_namespaces"; public static final String KEY_EXCLUDED_LANGUAGES = "excluded_languages"; /******************** diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhUtils.java b/app/src/main/java/com/hippo/ehviewer/client/EhUtils.java index 3a7e26331..4439c01c3 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhUtils.java +++ b/app/src/main/java/com/hippo/ehviewer/client/EhUtils.java @@ -32,10 +32,8 @@ import java.util.regex.Pattern; public class EhUtils { public static final int NONE = -1; // Use it for homepage - public static final int UNKNOWN = 0x400; - - public static final int ALL_CATEGORY = EhUtils.UNKNOWN - 1; - //DOUJINSHI|MANGA|ARTIST_CG|GAME_CG|WESTERN|NON_H|IMAGE_SET|COSPLAY|ASIAN_PORN|MISC; + public static final int PRIVATE = 0x400; + public static final int UNKNOWN = 0x800; public static final int BG_COLOR_DOUJINSHI = 0xfff44336; public static final int BG_COLOR_MANGA = 0xffff9800; @@ -68,6 +66,7 @@ public class EhUtils { EhConfig.ASIAN_PORN, EhConfig.NON_H, EhConfig.WESTERN, + PRIVATE, UNKNOWN}; private static final String[][] CATEGORY_STRINGS = { @@ -81,6 +80,7 @@ public class EhUtils { new String[]{"asianporn", "Asian Porn"}, new String[]{"non-h"}, new String[]{"western"}, + new String[]{"private"}, new String[]{"unknown"} }; 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 e69ea278a..e8f5f707d 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 @@ -1135,7 +1135,7 @@ public class GalleryDetailScene extends CollapsingToolbarScene implements View.O GalleryListScene.startScene(this, lub); } else if (mCategory == v) { int category = getCategory(); - if (category == -1) { + if (category == EhUtils.NONE || category == EhUtils.PRIVATE || category == EhUtils.UNKNOWN) { return; } ListUrlBuilder lub = new ListUrlBuilder();