diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java index 99a6d67d1..ad3248514 100755 --- a/app/src/main/java/com/hippo/ehviewer/Settings.java +++ b/app/src/main/java/com/hippo/ehviewer/Settings.java @@ -90,8 +90,6 @@ public class Settings { private static final boolean DEFAULT_HIDE_HV_EVENTS = true; private static final String KEY_SHOW_COMMENTS = "show_gallery_comments"; private static final boolean DEFAULT_SHOW_COMMENTS = true; - private static final String KEY_PREVIEW_NUM = "preview_num"; - private static final int DEFAULT_PREVIEW_NUM = 60; private static final String TAG = Settings.class.getSimpleName(); private static final String KEY_DISPLAY_NAME = "display_name"; private static final String DEFAULT_DISPLAY_NAME = null; @@ -423,10 +421,6 @@ public class Settings { putBoolean(KEY_SHOW_TAG_TRANSLATIONS, value); } - public static int getPreviewNum() { - return getInt(KEY_PREVIEW_NUM, DEFAULT_PREVIEW_NUM); - } - public static int getDefaultCategories() { return getInt(KEY_DEFAULT_CATEGORIES, DEFAULT_DEFAULT_CATEGORIES); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt index bcaf1c1e6..07ba3f033 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt @@ -690,7 +690,6 @@ class GalleryDetailScene : CollapsingToolbarScene(), View.OnClickListener, Downl private fun bindPreviews(gd: GalleryDetail) { val inflater = layoutInflater resourcesOrNull ?: return - val previewNum = Settings.getPreviewNum() _binding ?: return binding.content.previews.run { gridLayout.removeAllViews() @@ -698,7 +697,7 @@ class GalleryDetailScene : CollapsingToolbarScene(), View.OnClickListener, Downl if (gd.previewPages <= 0 || previewSet == null || previewSet.size() == 0) { previewText.setText(R.string.no_previews) return - } else if (gd.previewPages == 1 && previewSet.size() <= previewNum) { + } else if (gd.previewPages == 1) { previewText.setText(R.string.no_more_previews) } else { previewText.setText(R.string.more_previews) @@ -706,8 +705,7 @@ class GalleryDetailScene : CollapsingToolbarScene(), View.OnClickListener, Downl val columnWidth = Settings.getThumbSize() gridLayout.setColumnSize(columnWidth) gridLayout.setStrategy(SimpleGridAutoSpanLayout.STRATEGY_SUITABLE_SIZE) - val size = previewNum.coerceAtMost(previewSet.size()) - for (i in 0 until size) { + for (i in 0 until previewSet.size()) { val view = inflater.inflate(R.layout.item_gallery_preview, gridLayout, false) gridLayout.addView(view) val image = view.findViewById(R.id.image) diff --git a/app/src/main/res/xml/eh_settings.xml b/app/src/main/res/xml/eh_settings.xml index 0124cb53f..bc4bc2b79 100644 --- a/app/src/main/res/xml/eh_settings.xml +++ b/app/src/main/res/xml/eh_settings.xml @@ -146,17 +146,6 @@ app:iconSpaceReserved="false" app:url="@string/settings_eh_tag_translations_source_url" /> - -