diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.kt b/app/src/main/java/com/hippo/ehviewer/Settings.kt index 7e8b977ff..5a0592bc8 100755 --- a/app/src/main/java/com/hippo/ehviewer/Settings.kt +++ b/app/src/main/java/com/hippo/ehviewer/Settings.kt @@ -22,7 +22,6 @@ import androidx.annotation.DimenRes import androidx.preference.PreferenceManager import com.hippo.ehviewer.client.data.FavListUrlBuilder import com.hippo.ehviewer.ui.scene.GalleryListScene -import com.hippo.ehviewer.yorozuya.LayoutUtils.dp2pix import com.hippo.ehviewer.yorozuya.NumberUtils import com.hippo.unifile.UniFile import splitties.experimental.ExperimentalSplittiesApi @@ -160,9 +159,6 @@ object Settings : DefaultPreferences() { else -> throw IllegalStateException("Unexpected value: $detailSize") } - val thumbSize: Int - get() = dp2pix(appCtx, thumbSizeDp.toFloat()) - var downloadLocation: UniFile get() = Uri.Builder().apply { scheme(getString(KEY_DOWNLOAD_SAVE_SCHEME, null)) 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 5092bb393..d3e0889dc 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 @@ -26,11 +26,14 @@ 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.thumbSizeDp import com.hippo.ehviewer.client.data.GalleryInfo import com.hippo.ehviewer.ui.legacy.easyrecyclerview.MarginItemDecoration import com.hippo.ehviewer.ui.legacy.recyclerview.AutoStaggeredGridLayoutManager import com.hippo.ehviewer.ui.legacy.recyclerview.STRATEGY_MIN_SIZE import com.hippo.ehviewer.ui.legacy.recyclerview.STRATEGY_SUITABLE_SIZE +import com.hippo.ehviewer.yorozuya.LayoutUtils.dp2pix +import splitties.init.appCtx abstract class GalleryAdapter( private val mResources: Resources, @@ -91,7 +94,7 @@ abstract class GalleryAdapter( } TYPE_GRID -> { - val columnWidth = Settings.thumbSize + val columnWidth = dp2pix(appCtx, thumbSizeDp.toFloat()) mLayoutManager.setColumnSize(columnWidth) mLayoutManager.setStrategy(STRATEGY_SUITABLE_SIZE) if (null != mListDecoration) {