From 06e926d62be1a31241edda977d015143dd3ddb76 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 7 Oct 2026 12:15:48 +0000 Subject: [PATCH] Remove close button from Now Playing sheet The sheet is dismissed by swiping down, tapping outside it or pressing Back, so the explicit close button and its now-unused ic_close icon are dropped. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_015g6ECVSKcBG8CJPrqC3G5o --- .../fogwave/ui/components/NowPlayingSheet.kt | 46 +++++------------- app/src/main/res/drawable-nodpi/ic_close.png | Bin 6052 -> 0 bytes 2 files changed, 11 insertions(+), 35 deletions(-) delete mode 100644 app/src/main/res/drawable-nodpi/ic_close.png diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/NowPlayingSheet.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/NowPlayingSheet.kt index d150034..b31abf3 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/NowPlayingSheet.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/NowPlayingSheet.kt @@ -169,41 +169,17 @@ fun NowPlayingSheet( .background(LocalGeoColors.current.outlineVariant) ) - Row( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 24.dp, vertical = 10.dp), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically - ) { - Text( - text = stringResource(R.string.now_playing_label), - style = MaterialTheme.typography.labelSmall.copy( - fontWeight = FontWeight.Bold, - fontSize = 11.5.sp, - letterSpacing = 1.2.sp, - color = LocalGeoColors.current.primary - ) - ) - - Box( - modifier = Modifier - .size(36.dp) - .clip(CircleShape) - .background(LocalGeoColors.current.surfaceContainer) - .border(1.dp, LocalGeoColors.current.outlineVariant, CircleShape) - .clickable { onClose() } - .testTag("np_close_btn"), - contentAlignment = Alignment.Center - ) { - AppIcon( - resId = R.drawable.ic_close, - contentDescription = stringResource(R.string.close_content_desc), - tint = LocalGeoColors.current.deepPurple, - size = 18.dp - ) - } - } + // The sheet closes by swiping down, tapping outside it or pressing Back. + Text( + text = stringResource(R.string.now_playing_label), + style = MaterialTheme.typography.labelSmall.copy( + fontWeight = FontWeight.Bold, + fontSize = 11.5.sp, + letterSpacing = 1.2.sp, + color = LocalGeoColors.current.primary + ), + modifier = Modifier.padding(horizontal = 24.dp, vertical = 12.dp) + ) Box( modifier = Modifier diff --git a/app/src/main/res/drawable-nodpi/ic_close.png b/app/src/main/res/drawable-nodpi/ic_close.png deleted file mode 100644 index 1391448b1dbabb41b3329d0e026d38dbd7489bde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6052 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