Replace thumb size setting with thumb column count

app/src/main/kotlin/com/hippo/ehviewer/Settings.kt

@@ -103,7 +103,7 @@ object Settings : DataStorePreferences(null) {
 
     val listMode = intPref("list_mode_2", 0)
     val detailSize = intPref("detail_size_2", 0)
-    val thumbSizeDp = intPref("thumb_size_", 120)
+    val thumbColumns = intPref("thumb_columns", 3)
     val listThumbSize = intPref("list_tile_size", 40)
 
     val needSignInFlow: Flow<Boolean>

app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt

@@ -919,7 +919,7 @@ fun GalleryDetailScreen(args: GalleryDetailScreenArgs, navigator: NavController)
     ) {
         val galleryDetail = galleryInfo.asGalleryDetail()
         val windowSizeClass = calculateWindowSizeClass(activity)
-        val thumbWidth by Settings.thumbSizeDp.collectAsState()
+        val thumbColumns by Settings.thumbColumns.collectAsState()
         val readText = stringResource(R.string.read)
         val downloadText = stringResource(R.string.download)
         var readButtonText by rememberSaveable { mutableStateOf(readText) }
@@ -1004,7 +1004,7 @@ fun GalleryDetailScreen(args: GalleryDetailScreenArgs, navigator: NavController)
 
         when (windowSizeClass.widthSizeClass) {
             WindowWidthSizeClass.Medium, WindowWidthSizeClass.Compact -> LazyVerticalGrid(
-                columns = GridCells.Adaptive(thumbWidth.dp),
+                columns = GridCells.Fixed(thumbColumns),
                 contentPadding = contentPadding,
                 modifier = modifier.padding(horizontal = keylineMargin),
                 horizontalArrangement = Arrangement.spacedBy(dimensionResource(id = R.dimen.strip_item_padding)),
@@ -1055,7 +1055,7 @@ fun GalleryDetailScreen(args: GalleryDetailScreenArgs, navigator: NavController)
             }
 
             WindowWidthSizeClass.Expanded -> LazyVerticalGrid(
-                columns = GridCells.Adaptive(thumbWidth.dp),
+                columns = GridCells.Fixed(thumbColumns),
                 contentPadding = contentPadding,
                 modifier = modifier.padding(horizontal = keylineMargin),
                 horizontalArrangement = Arrangement.spacedBy(dimensionResource(id = R.dimen.strip_item_padding)),

app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryList.kt

@@ -117,9 +117,9 @@ fun GalleryList(
             }
         } else {
             val gridInterval = dimensionResource(R.dimen.gallery_grid_interval)
-            val thumbWidth by Settings.thumbSizeDp.collectAsState()
+            val thumbColumns by Settings.thumbColumns.collectAsState()
             FastScrollLazyVerticalStaggeredGrid(
-                columns = StaggeredGridCells.Adaptive(thumbWidth.dp),
+                columns = StaggeredGridCells.Fixed(thumbColumns),
                 modifier = combinedModifier,
                 state = thumbListState,
                 verticalItemSpacing = gridInterval,

app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryPreviewFragment.kt

@@ -135,9 +135,9 @@ fun GalleryPreviewScreen(galleryDetail: GalleryDetail, toNextPageArg: Boolean, n
             )
         },
     ) { paddingValues ->
-        val thumbWidth by Settings.thumbSizeDp.collectAsState()
+        val thumbColumns by Settings.thumbColumns.collectAsState()
         FastScrollLazyVerticalGrid(
-            columns = GridCells.Adaptive(thumbWidth.dp),
+            columns = GridCells.Fixed(thumbColumns),
             modifier = Modifier.nestedScroll(scrollBehaviour.nestedScrollConnection).padding(horizontal = dimensionResource(id = R.dimen.gallery_list_margin_h)),
             state = state,
             contentPadding = paddingValues,

app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt

@@ -253,11 +253,10 @@ fun EhScreen(navigator: DestinationsNavigator) {
                 value = Settings.detailSize.asMutableState(),
             )
             IntSliderPreference(
-                maxValue = 400,
-                minValue = 80,
-                step = 7,
-                title = stringResource(id = R.string.settings_eh_thumb_size),
-                value = Settings.thumbSizeDp::value,
+                maxValue = 10,
+                minValue = 1,
+                title = stringResource(id = R.string.settings_eh_thumb_columns),
+                value = Settings.thumbColumns::value,
             )
             val thumbResolution = Settings::thumbResolution.observed
             val summary2 = stringResource(id = R.string.settings_eh_thumb_resolution_summary, stringArrayResource(id = R.array.thumb_resolution_entries)[thumbResolution.value])

app/src/main/res/values-de/strings.xml

@@ -250,7 +250,6 @@
     <string name="settings_eh_detail_size">Größe der Details</string>
     <string name="settings_eh_detail_size_long">Lange</string>
     <string name="settings_eh_detail_size_short">Kurz</string>
-    <string name="settings_eh_thumb_size">Größe des Miniaturbilds</string>
     <string name="settings_eh_thumb_resolution">Auflösung der Miniaturbilder</string>
     <string name="settings_eh_thumb_resolution_summary">Nun %s. Mit abnormale Auflösung kann die Miniaturbilder nicht normalerweise geladen werden.</string>
     <string name="settings_eh_thumb_resolution_auto">Automatisch</string>

app/src/main/res/values-es/strings.xml

@@ -280,7 +280,6 @@
     <string name="settings_eh_detail_size">Tamaño del detalle</string>
     <string name="settings_eh_detail_size_long">Largo</string>
     <string name="settings_eh_detail_size_short">Corto</string>
-    <string name="settings_eh_thumb_size">Tamaño de vista previa</string>
     <string name="settings_eh_thumb_resolution">Resolución de vista previa</string>
     <string name="settings_eh_thumb_resolution_summary">%s, las resoluciones especiales podrían causar errores en la vista previa</string>
     <string name="settings_eh_thumb_resolution_auto">Automático</string>

app/src/main/res/values-fr/strings.xml

@@ -315,7 +315,6 @@
     <string name="settings_eh_detail_size">Taille des détails</string>
     <string name="settings_eh_detail_size_long">Long</string>
     <string name="settings_eh_detail_size_short">Court</string>
-    <string name="settings_eh_thumb_size">Taille des mimniatures</string>
     <string name="settings_eh_thumb_resolution">Résolution des miniatures</string>
     <string name="settings_eh_thumb_resolution_summary">Auctuellement %s. Certaines résolutions spéciales êmpechent de les charger correctement.</string>
     <string name="settings_eh_thumb_resolution_auto">Auto</string>

app/src/main/res/values-ja/strings.xml

@@ -313,7 +313,6 @@
     <string name="settings_eh_detail_size">詳細情報のサイズ</string>
     <string name="settings_eh_detail_size_long">長い</string>
     <string name="settings_eh_detail_size_short">短い</string>
-    <string name="settings_eh_thumb_size">サムネイルサイズ</string>
     <string name="settings_eh_thumb_resolution">サムネイル解像度</string>
     <string name="settings_eh_thumb_resolution_summary">%s。解像度を正しく設定しないと、サムネイルを取得できない場合があります</string>
     <string name="settings_eh_thumb_resolution_auto">自動</string>

app/src/main/res/values-ko/strings.xml

@@ -285,7 +285,6 @@
     <string name="settings_eh_detail_size">상세 정보 크기</string>
     <string name="settings_eh_detail_size_long">길게</string>
     <string name="settings_eh_detail_size_short">짧게</string>
-    <string name="settings_eh_thumb_size">섬네일 크기</string>
     <string name="settings_eh_thumb_resolution">섬네일 해상도</string>
     <string name="settings_eh_thumb_resolution_summary">특정 해상도로 설정하면 섬네일을 불러오지 못할 수 있습니다. 현재 설정\u003a \u005b%s\u005d</string>
     <string name="settings_eh_thumb_resolution_auto">자동</string>

app/src/main/res/values-th/strings.xml

@@ -300,7 +300,6 @@
     <string name="settings_eh_detail_size">ขนาดของรายละเอียด</string>
     <string name="settings_eh_detail_size_long">อย่างยาว</string>
     <string name="settings_eh_detail_size_short">อย่างสั้น</string>
-    <string name="settings_eh_thumb_size">ขนาดภาพตัวอย่าง</string>
     <string name="settings_eh_thumb_resolution">ความละเอียดภาพตัวอย่าง</string>
     <string name="settings_eh_thumb_resolution_summary">ค่าตอนนี้เป็น %s. การตั้งความละเอียดที่แน่นอนอาจจะส่งผลต่อการโหลดตัวอย่างที่อาจจะไม่สำเร็จด้วย</string>
     <string name="settings_eh_thumb_resolution_auto">อัตโนมัติ</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -321,7 +321,7 @@
     <string name="settings_eh_detail_size">详情宽度</string>
     <string name="settings_eh_detail_size_long">长</string>
     <string name="settings_eh_detail_size_short">短</string>
-    <string name="settings_eh_thumb_size">缩略图大小</string>
+    <string name="settings_eh_thumb_columns">缩略图列数</string>
     <string name="settings_eh_thumb_resolution">缩略图分辨率</string>
     <string name="settings_eh_thumb_resolution_summary">%s，指定分辨率可能使获取缩略图失败</string>
     <string name="settings_eh_thumb_resolution_auto">自动</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -333,7 +333,7 @@
     <string name="settings_eh_detail_size">詳情大小</string>
     <string name="settings_eh_detail_size_long">長</string>
     <string name="settings_eh_detail_size_short">短</string>
-    <string name="settings_eh_thumb_size">縮略圖大小</string>
+    <string name="settings_eh_thumb_columns">縮略圖列數</string>
     <string name="settings_eh_thumb_resolution">縮略圖分辨率</string>
     <string name="settings_eh_thumb_resolution_summary">%s，指定分辨率可能使獲取縮略圖失敗</string>
     <string name="settings_eh_thumb_resolution_auto">自動</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -321,7 +321,7 @@
     <string name="settings_eh_detail_size">詳細大小</string>
     <string name="settings_eh_detail_size_long">長</string>
     <string name="settings_eh_detail_size_short">短</string>
-    <string name="settings_eh_thumb_size">縮圖大小</string>
+    <string name="settings_eh_thumb_columns">縮圖列數</string>
     <string name="settings_eh_thumb_resolution">縮圖解析度</string>
     <string name="settings_eh_thumb_resolution_summary">%s，指定解析度可能會使縮圖取得失敗</string>
     <string name="settings_eh_thumb_resolution_auto">自動</string>

app/src/main/res/values/strings.xml

@@ -362,7 +362,7 @@
     <string name="settings_eh_detail_size">Detail width</string>
     <string name="settings_eh_detail_size_long">Long</string>
     <string name="settings_eh_detail_size_short">Short</string>
-    <string name="settings_eh_thumb_size">Thumb size</string>
+    <string name="settings_eh_thumb_columns">Thumb columns</string>
     <string name="settings_eh_thumb_resolution">Thumb resolution</string>
     <string name="settings_eh_thumb_resolution_summary">Currently %s. Certain resolutions might cause getting thumb failed</string>
     <string name="settings_eh_thumb_resolution_auto">Auto</string>