From 324f68256c58e0524992441e99d020ee54085326 Mon Sep 17 00:00:00 2001 From: sanjeok77 Date: Wed, 4 Mar 2026 08:17:30 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=BB=B4=ED=8C=8C=EC=9D=BC=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alarm/presentation/components/DealItem.kt | 17 +-------- .../presentation/deallist/DealListScreen.kt | 35 +++++-------------- .../presentation/settings/SettingsScreen.kt | 12 +++---- 3 files changed, 16 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/com/hotdeal/alarm/presentation/components/DealItem.kt b/app/src/main/java/com/hotdeal/alarm/presentation/components/DealItem.kt index 497da9e..f418f06 100644 --- a/app/src/main/java/com/hotdeal/alarm/presentation/components/DealItem.kt +++ b/app/src/main/java/com/hotdeal/alarm/presentation/components/DealItem.kt @@ -16,8 +16,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.scale +import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.Shape import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow @@ -278,21 +278,6 @@ fun DealItem( } } -// Brush import를 위해 추가 -private fun Modifier.background(brush: Brush, shape: Shape): Modifier { - return this.then( - androidx.compose.ui.draw.drawBehind { - drawRect(brush) - } - ) -} - -private object Brush { - fun horizontalGradient(colors: List): androidx.compose.ui.graphics.Brush { - return androidx.compose.ui.graphics.Brush.horizontalGradient(colors) - } -} - private fun formatTime(timestamp: Long): String { val now = System.currentTimeMillis() val diff = now - timestamp diff --git a/app/src/main/java/com/hotdeal/alarm/presentation/deallist/DealListScreen.kt b/app/src/main/java/com/hotdeal/alarm/presentation/deallist/DealListScreen.kt index f2d866b..b768226 100644 --- a/app/src/main/java/com/hotdeal/alarm/presentation/deallist/DealListScreen.kt +++ b/app/src/main/java/com/hotdeal/alarm/presentation/deallist/DealListScreen.kt @@ -19,7 +19,6 @@ import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.scale import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext @@ -30,7 +29,6 @@ import com.hotdeal.alarm.domain.model.SiteType import com.hotdeal.alarm.presentation.components.* import com.hotdeal.alarm.presentation.main.MainUiState import com.hotdeal.alarm.presentation.main.MainViewModel -import com.hotdeal.alarm.ui.theme.Spacing import com.hotdeal.alarm.ui.theme.getSiteColor @OptIn(ExperimentalMaterial3Api::class) @@ -47,19 +45,13 @@ fun DealListScreen( var showFilterMenu by remember { mutableStateOf(false) } Column(modifier = Modifier.fillMaxSize()) { - // 개선된 TopAppBar TopAppBar( title = { - Row( - verticalAlignment = Alignment.CenterVertically - ) { + Row(verticalAlignment = Alignment.CenterVertically) { Box( modifier = Modifier .size(36.dp) - .background( - MaterialTheme.colorScheme.primary, - CircleShape - ), + .background(MaterialTheme.colorScheme.primary, CircleShape), contentAlignment = Alignment.Center ) { Icon( @@ -113,15 +105,10 @@ fun DealListScreen( ) ) - // 사이트 필터 칩들 - 개선된 디자인 AnimatedVisibility( visible = showFilterMenu, - enter = expandVertically( - animationSpec = spring(stiffness = Spring.StiffnessLow) - ) + fadeIn(), - exit = shrinkVertically( - animationSpec = spring(stiffness = Spring.StiffnessLow) - ) + fadeOut() + enter = expandVertically(animationSpec = spring(stiffness = Spring.StiffnessLow)) + fadeIn(), + exit = shrinkVertically(animationSpec = spring(stiffness = Spring.StiffnessLow)) + fadeOut() ) { Card( modifier = Modifier @@ -132,12 +119,8 @@ fun DealListScreen( containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f) ) ) { - Column( - modifier = Modifier.padding(16.dp) - ) { - Row( - verticalAlignment = Alignment.CenterVertically - ) { + Column(modifier = Modifier.padding(16.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { Icon( imageVector = Icons.Outlined.FilterAlt, contentDescription = null, @@ -183,7 +166,6 @@ fun DealListScreen( } } - // 검색창 - 개선된 디자인 OutlinedTextField( value = searchText, onValueChange = { searchText = it }, @@ -278,11 +260,12 @@ fun DealListScreen( color = MaterialTheme.colorScheme.onSurfaceVariant ) if (selectedSiteFilter != null) { + val filter = selectedSiteFilter!! Spacer(modifier = Modifier.width(8.dp)) Text( - text = "• ${selectedSiteFilter.displayName}", + text = "• ${filter.displayName}", style = MaterialTheme.typography.labelMedium, - color = getSiteColor(selectedSiteFilter) + color = getSiteColor(filter) ) } } diff --git a/app/src/main/java/com/hotdeal/alarm/presentation/settings/SettingsScreen.kt b/app/src/main/java/com/hotdeal/alarm/presentation/settings/SettingsScreen.kt index db55878..564d571 100644 --- a/app/src/main/java/com/hotdeal/alarm/presentation/settings/SettingsScreen.kt +++ b/app/src/main/java/com/hotdeal/alarm/presentation/settings/SettingsScreen.kt @@ -473,12 +473,12 @@ private fun PollingIntervalCard( // 선택 옵션들 val options = listOf( - 1 to "1분" to "빠름", - 2 to "2분" to "권장", - 5 to "5분" to "보통", - 10 to "10분" to "느림", - 15 to "15분" to "매우 느림", - 30 to "30분" to "절전" + Triple(1, "1분", "빠름"), + Triple(2, "2분", "권장"), + Triple(5, "5분", "보통"), + Triple(10, "10분", "느림"), + Triple(15, "15분", "매우 느림"), + Triple(30, "30분", "절전") ) options.chunked(3).forEach { rowOptions ->