From a95088d26f20a100105ac77d514fa08354fd2bf7 Mon Sep 17 00:00:00 2001 From: HapeLee <1321903405@qq.com> Date: Sat, 6 Dec 2025 02:25:37 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E5=8F=91=E7=8E=B0?= =?UTF-8?q?=E9=A1=B5=E7=BD=91=E6=A0=BC=E5=88=97=E6=95=B0=E8=B7=9F=E9=9A=8F?= =?UTF-8?q?=E4=B9=A6=E6=9E=B6=E5=88=97=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../legado/app/ui/book/explore/ExploreShowScreen.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowScreen.kt b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowScreen.kt index 01b3f3580..ca325ad6f 100644 --- a/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowScreen.kt +++ b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowScreen.kt @@ -1,5 +1,6 @@ package io.legado.app.ui.book.explore +import android.annotation.SuppressLint import android.content.Intent import androidx.compose.animation.AnimatedContent import androidx.compose.animation.Crossfade @@ -78,6 +79,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow @@ -90,8 +92,10 @@ import io.legado.app.ui.widget.components.AnimatedTextButton import io.legado.app.ui.widget.components.AnimatedTextLine import io.legado.app.ui.widget.components.Cover import io.legado.app.ui.widget.components.EmptyMessageView +import io.legado.app.utils.bookshelfLayoutGrid import org.koin.androidx.compose.koinViewModel +@SuppressLint("LocalContextConfigurationRead") @OptIn(ExperimentalMaterial3Api::class) @Composable fun ExploreShowScreen( @@ -120,7 +124,10 @@ fun ExploreShowScreen( var showKindSheet by remember { mutableStateOf(false) } val layoutState by viewModel.layoutState.collectAsState() val isGridMode = layoutState == 1 - + val context = LocalContext.current + val gridColumnCount = remember(context.resources.configuration.orientation) { + context.bookshelfLayoutGrid + } val shouldLoadMore = remember { derivedStateOf { val totalItems: Int @@ -229,7 +236,7 @@ fun ExploreShowScreen( LazyVerticalGrid( state = gridState, modifier = Modifier.fillMaxSize(), - columns = GridCells.Adaptive(minSize = 90.dp), + columns = GridCells.Fixed(gridColumnCount), contentPadding = PaddingValues(12.dp), horizontalArrangement = Arrangement.spacedBy(4.dp), verticalArrangement = Arrangement.spacedBy(8.dp)