From 4b2c0ee4ae837533a2d1725b4e80527f67b780ab Mon Sep 17 00:00:00 2001 From: HapeLee <1321903405@qq.com> Date: Sat, 6 Dec 2025 02:46:28 +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=E5=86=85=E5=88=86=E7=B1=BB=E4=B8=8D=E5=86=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E4=B8=A4=E6=AC=A1=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/book/explore/ExploreShowScreen.kt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 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 ca325ad6f..fbfb71d8b 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 @@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width @@ -60,6 +61,7 @@ import androidx.compose.material3.MediumTopAppBar import androidx.compose.material3.ModalBottomSheet import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Scaffold +import androidx.compose.material3.SheetValue import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -79,6 +81,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.LocalConfiguration import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign @@ -95,7 +98,7 @@ import io.legado.app.ui.widget.components.EmptyMessageView import io.legado.app.utils.bookshelfLayoutGrid import org.koin.androidx.compose.koinViewModel -@SuppressLint("LocalContextConfigurationRead") +@SuppressLint("LocalContextConfigurationRead", "ConfigurationScreenWidthHeight") @OptIn(ExperimentalMaterial3Api::class) @Composable fun ExploreShowScreen( @@ -169,7 +172,12 @@ fun ExploreShowScreen( if (showKindSheet) { val scrollState = rememberScrollState() - val sheetState = rememberModalBottomSheetState() + val sheetState = rememberModalBottomSheetState( + skipPartiallyExpanded = true, + confirmValueChange = { newValue -> + newValue != SheetValue.PartiallyExpanded + } + ) ModalBottomSheet( sheetState = sheetState, onDismissRequest = { showKindSheet = false } @@ -177,6 +185,7 @@ fun ExploreShowScreen( Column( modifier = Modifier .fillMaxWidth() + .heightIn(max = LocalConfiguration.current.screenHeightDp.dp * 0.8f) .verticalScroll(scrollState) .padding(12.dp) ) { @@ -310,7 +319,7 @@ fun KindListItem( label = { Text( text = kind.title, - fontSize = 14.sp, + fontSize = 12.sp, modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Center, maxLines = 1,