From 1e41ce5ded8a2f0a84771a561a3725b8ce41d26e Mon Sep 17 00:00:00 2001 From: HapeLee <1321903405@qq.com> Date: Sun, 22 Mar 2026 03:00:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=B9=A6=E6=9E=B6=E7=9A=84=E6=80=A7=E8=83=BD=E4=B8=8E=E7=A8=B3?= =?UTF-8?q?=E5=AE=9A=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/widget/components/card/GlassCard.kt | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/widget/components/card/GlassCard.kt b/app/src/main/java/io/legado/app/ui/widget/components/card/GlassCard.kt index 223ae4632..b76ecefc9 100644 --- a/app/src/main/java/io/legado/app/ui/widget/components/card/GlassCard.kt +++ b/app/src/main/java/io/legado/app/ui/widget/components/card/GlassCard.kt @@ -2,6 +2,7 @@ package io.legado.app.ui.widget.components.card import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material3.Card import androidx.compose.material3.CardColors import androidx.compose.material3.CardDefaults @@ -12,6 +13,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Shape import io.legado.app.ui.config.themeConfig.ThemeConfig +@OptIn(ExperimentalMaterialApi::class) @Composable fun GlassCard( modifier: Modifier = Modifier, @@ -29,13 +31,24 @@ fun GlassCard( contentColor = MaterialTheme.colorScheme.onSecondaryContainer ) - Card( - onClick = onClick ?: {}, - modifier = modifier, - shape = shape, - colors = finalColors, - elevation = elevation, - border = border, - content = content - ) + if (onClick != null) { + Card( + onClick = onClick, + modifier = modifier, + shape = shape, + colors = finalColors, + elevation = elevation, + border = border, + content = content + ) + } else { + Card( + modifier = modifier, + shape = shape, + colors = finalColors, + elevation = elevation, + border = border, + content = content + ) + } }