From c88eb1868ae8b188d7eb277ef7e598efb0bbdc6c Mon Sep 17 00:00:00 2001 From: beyond Date: Sat, 5 Sep 2026 20:12:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myapplication/screens/LibraryScreen.kt | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/example/myapplication/screens/LibraryScreen.kt b/app/src/main/kotlin/com/example/myapplication/screens/LibraryScreen.kt index 9879ffb..0246953 100644 --- a/app/src/main/kotlin/com/example/myapplication/screens/LibraryScreen.kt +++ b/app/src/main/kotlin/com/example/myapplication/screens/LibraryScreen.kt @@ -1294,7 +1294,14 @@ private fun IconPickerDialog( Box( Modifier.fillMaxWidth() .height(iconLibraryControlHeight) - .lumaGlass(radius = 14.dp, level = LumaGlassLevel.Regular, shadowElevation = 0.dp) + .lumaGlass( + radius = 14.dp, + level = LumaGlassLevel.Regular, + tint = GlassTokens.glassFill, + borderColor = GlassTokens.glassBorder, + shadowElevation = 0.dp, + highlight = false, + ) .padding(horizontal = 12.dp, vertical = 6.dp), ) { Row( @@ -1379,7 +1386,14 @@ private fun IconPickerDialog( Text(stringResource(Res.string.icon_picker_loaded_hint, allIcons.size), fontSize = 13.sp, color = GlassTokens.subtext) Box( Modifier.fillMaxWidth().weight(1f) - .lumaGlass(radius = 20.dp, level = LumaGlassLevel.Clear) + .lumaGlass( + radius = 14.dp, + level = LumaGlassLevel.Regular, + tint = GlassTokens.glassFill, + borderColor = GlassTokens.glassBorder, + shadowElevation = 0.dp, + highlight = false, + ) .padding(8.dp) ) { LazyVerticalGrid( @@ -1395,9 +1409,10 @@ private fun IconPickerDialog( .lumaGlass( radius = 12.dp, level = if (isSelected) LumaGlassLevel.Interactive else LumaGlassLevel.Clear, - tint = if (isSelected) LumaColors.accentSoft else null, + tint = if (isSelected) LumaColors.accentSoft else Color.Transparent, borderColor = if (isSelected) GlassTokens.accent else LumaColors.glassBorder, shadowElevation = 0.dp, + highlight = false, ) .clickable { onPick(server, icon.url) }, contentAlignment = Alignment.Center, @@ -1440,11 +1455,18 @@ private fun IconPickerDialog( Box( modifier = Modifier.fillMaxWidth() - .lumaGlass(radius = 16.dp, level = LumaGlassLevel.Clear) + .lumaGlass( + radius = 14.dp, + level = LumaGlassLevel.Regular, + tint = GlassTokens.glassFill, + borderColor = GlassTokens.glassBorder, + shadowElevation = 0.dp, + highlight = false, + ) .clickable { onDismiss() } .padding(vertical = 14.dp), contentAlignment = Alignment.Center, - ) { Text(text = stringResource(Res.string.icon_lib_close), color = GlassTokens.subtext, fontSize = 15.sp, fontWeight = FontWeight.Medium) } + ) { Text(text = stringResource(Res.string.icon_lib_close), color = GlassTokens.text, fontSize = 15.sp, fontWeight = FontWeight.Medium) } } } }