diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.kt b/app/src/main/java/com/hippo/ehviewer/Settings.kt index c7adf8660..d5bbc074d 100755 --- a/app/src/main/java/com/hippo/ehviewer/Settings.kt +++ b/app/src/main/java/com/hippo/ehviewer/Settings.kt @@ -2,7 +2,6 @@ package com.hippo.ehviewer -import androidx.annotation.DimenRes import com.hippo.ehviewer.client.data.FavListUrlBuilder import splitties.preferences.DefaultPreferences import splitties.preferences.edit @@ -53,14 +52,6 @@ object Settings : DefaultPreferences() { } } - @get:DimenRes - val detailSizeResId: Int - get() = when (detailSize) { - 0 -> R.dimen.gallery_list_column_width_long - 1 -> R.dimen.gallery_list_column_width_short - else -> throw IllegalStateException("Unexpected value: $detailSize") - } - var downloadScheme by stringOrNullPref("image_scheme", null) var downloadAuthority by stringOrNullPref("image_authority", null) var downloadPath by stringOrNullPref("image_path", null) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt index 9fe50c05e..8a2bfd94b 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt @@ -60,6 +60,7 @@ import com.hippo.ehviewer.EhApplication.Companion.imageCache import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings +import com.hippo.ehviewer.Settings.detailSize import com.hippo.ehviewer.Settings.listThumbSize import com.hippo.ehviewer.client.EhUtils import com.hippo.ehviewer.client.data.GalleryInfo @@ -262,7 +263,15 @@ class DownloadsScene : mAdapter!!.setHasStableIds(true) recyclerView.adapter = mAdapter val layoutManager = AutoStaggeredGridLayoutManager(0, StaggeredGridLayoutManager.VERTICAL) - layoutManager.setColumnSize(resources.getDimensionPixelOffset(Settings.detailSizeResId)) + layoutManager.setColumnSize( + resources.getDimensionPixelOffset( + when (detailSize) { + 0 -> R.dimen.gallery_list_column_width_long + 1 -> R.dimen.gallery_list_column_width_short + else -> throw IllegalStateException("Unexpected value: $detailSize") + }, + ), + ) layoutManager.setStrategy(STRATEGY_MIN_SIZE) layoutManager.supportsPredictiveItemAnimations = false recyclerView.layoutManager = layoutManager diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt index d3e0889dc..cb7e4b27b 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt @@ -25,7 +25,7 @@ import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.ItemDecoration import androidx.recyclerview.widget.StaggeredGridLayoutManager import com.hippo.ehviewer.R -import com.hippo.ehviewer.Settings +import com.hippo.ehviewer.Settings.detailSize import com.hippo.ehviewer.Settings.thumbSizeDp import com.hippo.ehviewer.client.data.GalleryInfo import com.hippo.ehviewer.ui.legacy.easyrecyclerview.MarginItemDecoration @@ -58,7 +58,13 @@ abstract class GalleryAdapter( val recyclerView = mRecyclerView when (type) { TYPE_LIST -> { - val columnWidth = mResources.getDimensionPixelOffset(Settings.detailSizeResId) + val columnWidth = mResources.getDimensionPixelOffset( + when (detailSize) { + 0 -> R.dimen.gallery_list_column_width_long + 1 -> R.dimen.gallery_list_column_width_short + else -> throw IllegalStateException("Unexpected value: $detailSize") + }, + ) mLayoutManager.setColumnSize(columnWidth) mLayoutManager.setStrategy(STRATEGY_MIN_SIZE) if (null != mGirdDecoration) {