From c12120fe10c50f528080a578c5a1943c1935f414 Mon Sep 17 00:00:00 2001 From: yeonwoo Date: Tue, 13 Jan 2026 15:05:49 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat=20:=20=EC=A7=80=EB=AA=85=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EA=B2=B0=EA=B3=BC=20=EC=97=86=EB=8A=94=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bottomsheet/LocationBottomSheet.kt | 109 ++++++++++-------- 1 file changed, 59 insertions(+), 50 deletions(-) diff --git a/core/designsystem/src/main/java/com/umcspot/spot/designsystem/component/bottomsheet/LocationBottomSheet.kt b/core/designsystem/src/main/java/com/umcspot/spot/designsystem/component/bottomsheet/LocationBottomSheet.kt index 7c3c4fd9..06ff142c 100644 --- a/core/designsystem/src/main/java/com/umcspot/spot/designsystem/component/bottomsheet/LocationBottomSheet.kt +++ b/core/designsystem/src/main/java/com/umcspot/spot/designsystem/component/bottomsheet/LocationBottomSheet.kt @@ -268,62 +268,71 @@ fun LocationBottomSheet( Spacer(modifier = Modifier.height(screenHeightDp(13.dp))) - if (results.isNotEmpty()) { - val isMaxSelected = selected.size >= 10 + Box( + modifier = Modifier + .fillMaxWidth() + .weight(1f) + .padding(bottom = navBarPadding) + .background(SpotTheme.colors.white) + ) { + if (results.isNotEmpty()) { + val isMaxSelected = selected.size >= 10 - HorizontalDivider(thickness = 0.5.dp, color = SpotTheme.colors.G200) - LazyColumn( - modifier = Modifier - .fillMaxWidth() - .padding(bottom = navBarPadding) - .background(SpotTheme.colors.white), - ) { - itemsIndexed(results, key = { _, row -> row.code }) { index, row -> - val isAlreadySelected = selected.any { it.code == row.code } - ListItem( - headlineContent = { - Text( - text = row.fullName, - style = SpotTheme.typography.h5, - maxLines = 1, - color = if (isMaxSelected && !isAlreadySelected) { - SpotTheme.colors.gray400 - } else { - LocalContentColor.current - } - ) - }, - colors = ListItemDefaults.colors( - containerColor = SpotTheme.colors.white - ), - modifier = Modifier - .fillMaxWidth() - .clickable( - enabled = !isMaxSelected || isAlreadySelected, - onClick = { - if (!isAlreadySelected) { - onAddSelected(row) + HorizontalDivider(thickness = 0.5.dp, color = SpotTheme.colors.G200) + LazyColumn( + modifier = Modifier + .fillMaxWidth() + .padding(bottom = navBarPadding) + .background(SpotTheme.colors.white), + ) { + itemsIndexed( + results, + key = { _, row -> row.code }) { index, row -> + val isAlreadySelected = selected.any { it.code == row.code } + ListItem( + headlineContent = { + Text( + text = row.fullName, + style = SpotTheme.typography.h5, + maxLines = 1, + color = if (isMaxSelected && !isAlreadySelected) { + SpotTheme.colors.gray400 + } else { + LocalContentColor.current } - } - ) - ) + ) + }, + colors = ListItemDefaults.colors( + containerColor = SpotTheme.colors.white + ), + modifier = Modifier + .fillMaxWidth() + .clickable( + enabled = !isMaxSelected || isAlreadySelected, + onClick = { + if (!isAlreadySelected) { + onAddSelected(row) + } + } + ) + ) - HorizontalDivider( - thickness = 0.5.dp, - color = SpotTheme.colors.G200 + HorizontalDivider( + thickness = 0.5.dp, + color = SpotTheme.colors.G200 + ) + } + } + } else { + if (query.isNotBlank()) { + Text( + text = "검색 결과가 없습니다.", + color = SpotTheme.colors.gray400, + style = SpotTheme.typography.medium_400, + modifier = Modifier.align(Alignment.Center), ) } } - } else { - if (query.isNotBlank()) { - Text( - - text = "검색 결과가 없습니다.", - color = SpotTheme.colors.gray400, - style = SpotTheme.typography.small_300, - modifier = Modifier.padding(top = 14.dp), - ) - } } } } From 859a7cb3b0e373a8d465384981b4c6198f82d225 Mon Sep 17 00:00:00 2001 From: yeonwoo Date: Wed, 14 Jan 2026 09:07:37 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=EC=A4=91=EB=B3=B5=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designsystem/component/bottomsheet/LocationBottomSheet.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/core/designsystem/src/main/java/com/umcspot/spot/designsystem/component/bottomsheet/LocationBottomSheet.kt b/core/designsystem/src/main/java/com/umcspot/spot/designsystem/component/bottomsheet/LocationBottomSheet.kt index 06ff142c..b73c14bd 100644 --- a/core/designsystem/src/main/java/com/umcspot/spot/designsystem/component/bottomsheet/LocationBottomSheet.kt +++ b/core/designsystem/src/main/java/com/umcspot/spot/designsystem/component/bottomsheet/LocationBottomSheet.kt @@ -282,7 +282,6 @@ fun LocationBottomSheet( LazyColumn( modifier = Modifier .fillMaxWidth() - .padding(bottom = navBarPadding) .background(SpotTheme.colors.white), ) { itemsIndexed(