From ff9fbf142a0608bab41e345d149ee9c24eb5bf80 Mon Sep 17 00:00:00 2001 From: roel Date: Wed, 15 Jan 2025 22:21:46 +0900 Subject: [PATCH 01/11] =?UTF-8?q?[Feat/#34]=20StoreInfoItem=20UI=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../placeDetail/component/StoreInfoItem.kt | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfoItem.kt diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfoItem.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfoItem.kt new file mode 100644 index 0000000..489df6a --- /dev/null +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfoItem.kt @@ -0,0 +1,159 @@ +package com.spoony.spoony.presentation.placeDetail.component + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.spoony.spoony.R +import com.spoony.spoony.core.designsystem.theme.SpoonyAndroidTheme + +@Composable +fun StoreInfoItem( + title: String, + subTitle: String? = null, + items: List, + isMenu: Boolean = true, + modifier: Modifier = Modifier +) { + val (shape, paddingValues) = remember(isMenu) { + when (isMenu) { + true -> RoundedCornerShape( + topStart = 8.dp, + topEnd = 8.dp, + bottomStart = 20.dp, + bottomEnd = 20.dp + ) to PaddingValues( + top = 20.dp, + bottom = 28.dp, + start = 16.dp, + end = 16.dp + ) + false -> RoundedCornerShape( + topStart = 20.dp, + topEnd = 20.dp, + bottomStart = 8.dp, + bottomEnd = 8.dp + ) to PaddingValues( + vertical = 22.dp, + horizontal = 16.dp + ) + } + } + Column( + modifier = modifier + .fillMaxWidth() + .background( + shape = shape, + color = SpoonyAndroidTheme.colors.gray0 + ) + .padding(paddingValues) + ) { + Text( + title, + style = SpoonyAndroidTheme.typography.body1b + ) + Spacer(modifier = Modifier.height(12.dp)) + if (subTitle != null) { + Text( + subTitle, + style = SpoonyAndroidTheme.typography.title2sb + ) + Spacer(modifier = Modifier.height(11.dp)) + } + Column( + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + items.forEach { item -> + IconText( + icon = if (isMenu) R.drawable.ic_spoon_24 else R.drawable.ic_pin_24, + iconSize = 20, + text = item, + textStyle = SpoonyAndroidTheme.typography.body2m, + modifier = Modifier.fillMaxWidth() + ) + } + } + } +} + +@Composable +private fun IconText( + icon: Int, + iconSize: Int, + text: String, + textStyle: TextStyle, + modifier: Modifier = Modifier, + textColor: Color = SpoonyAndroidTheme.colors.black, + iconTint: Color = SpoonyAndroidTheme.colors.gray600 +) { + Row( + modifier = modifier, + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + imageVector = ImageVector.vectorResource(icon), + contentDescription = null, + modifier = Modifier.size(iconSize.dp), + tint = iconTint + ) + Spacer(modifier = Modifier.width(4.dp)) + Text( + text = text, + color = textColor, + style = textStyle, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } +} + +@Preview +@Composable +private fun StoreInfoItemMenuPreview() { + SpoonyAndroidTheme { + StoreInfoItem( + title = "Menu", + items = listOf( + "고등어봉초밥고등어봉초밥고등어봉초밥고등어봉초밥고등어봉초밥고등어봉초밥고등어봉초밥고등어봉초밥", + "크렘브륄레" + ), + isMenu = true + ) + } +} + +@Preview +@Composable +private fun StoreInfoItemLocationPreview() { + SpoonyAndroidTheme { + StoreInfoItem( + title = "Location", + subTitle = "이키", + items = listOf( + "서울 서대문구 연희로11가길 39" + ), + isMenu = false + ) + } +} From b08299ffe4d1466d517d5fc95b6cd14f213fcf5b Mon Sep 17 00:00:00 2001 From: roel Date: Wed, 15 Jan 2025 22:21:52 +0900 Subject: [PATCH 02/11] =?UTF-8?q?[Feat/#34]=20StoreInfo=20UI=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../placeDetail/component/StoreInfo.kt | 120 ++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt new file mode 100644 index 0000000..a88c436 --- /dev/null +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt @@ -0,0 +1,120 @@ +package com.spoony.spoony.presentation.placeDetail.component + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.blur +import androidx.compose.ui.draw.clip +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathEffect +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.spoony.spoony.core.designsystem.theme.SpoonyAndroidTheme + +@Composable +fun StoreInfo( + menuItems: List, + locationItems: List, + modifier: Modifier = Modifier, + isBlurred: Boolean = true +) { + Column( + modifier = modifier + .clip(RoundedCornerShape(8.dp)) + .then( + if (isBlurred) { + Modifier.blur(16.dp) + } else { + Modifier + } + ) + ) { + StoreInfoItem( + title = "Menu", + items = menuItems, + isMenu = true + ) + HorizontalDashedLine() + StoreInfoItem( + title = "Location", + subTitle = "이키", + items = locationItems, + isMenu = false + ) + } +} + +@Composable +private fun HorizontalDashedLine( + modifier: Modifier = Modifier, + color: Color = SpoonyAndroidTheme.colors.gray200, + strokeWidth: Float = 2f, + dashLengths: FloatArray = floatArrayOf(30f, 30f) +) { + Box( + modifier = modifier + .fillMaxWidth() + .height(1.dp) + ) { + Canvas(modifier = Modifier.matchParentSize()) { + val pathEffect = PathEffect.dashPathEffect( + intervals = dashLengths, + phase = 0f + ) + val horizontalPadding = 25.dp.toPx() + val yPos = size.height / 2 + drawLine( + color = color, + start = Offset(x = horizontalPadding, y = yPos), + end = Offset(x = size.width - horizontalPadding, y = yPos), + strokeWidth = strokeWidth, + pathEffect = pathEffect + ) + } + } +} + +@Preview(showBackground = true) +@Composable +private fun StoreInfoPreview() { + SpoonyAndroidTheme { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(20.dp) + ) { + StoreInfo( + modifier = Modifier + .padding(horizontal = 20.dp), + isBlurred = true, + menuItems = listOf( + "고등어봉초밥", + "크렘브륄레" + ), + locationItems = listOf( + "서울 서대문구 연희로11가길 39" + ) + ) + StoreInfo( + modifier = Modifier + .padding(horizontal = 20.dp), + isBlurred = false, + menuItems = listOf( + "고등어봉초밥", + "크렘브륄레" + ), + locationItems = listOf( + "서울 서대문구 연희로11가길 39" + ) + ) + } + } +} From 9e4bb4af6de1789d7f44cde98270878eb8946fe0 Mon Sep 17 00:00:00 2001 From: roel Date: Thu, 16 Jan 2025 01:33:09 +0900 Subject: [PATCH 03/11] =?UTF-8?q?[Feat/#34]=20StoreInfo=20=EB=B0=8F=20Stor?= =?UTF-8?q?eInfoItem=20=EC=A0=84=EC=B2=B4=EC=A0=81=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/PlaceDetailIconText.kt | 49 ++++++ .../placeDetail/component/StoreInfo.kt | 130 +++++++++++--- .../placeDetail/component/StoreInfoItem.kt | 164 ++++++++---------- 3 files changed, 226 insertions(+), 117 deletions(-) create mode 100644 app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/PlaceDetailIconText.kt diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/PlaceDetailIconText.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/PlaceDetailIconText.kt new file mode 100644 index 0000000..08d3ea4 --- /dev/null +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/PlaceDetailIconText.kt @@ -0,0 +1,49 @@ +package com.spoony.spoony.presentation.placeDetail.component + +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import com.spoony.spoony.core.designsystem.theme.SpoonyAndroidTheme + +@Composable +fun PlaceDetailIconText( + icon: ImageVector, + iconSize: Dp, + text: String, + textStyle: TextStyle, + modifier: Modifier = Modifier, + textColor: Color = SpoonyAndroidTheme.colors.black, + iconTint: Color = SpoonyAndroidTheme.colors.gray600 +) { + Row( + modifier = modifier, + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + imageVector = icon, + contentDescription = null, + modifier = Modifier.size(iconSize), + tint = iconTint + ) + Spacer(modifier = Modifier.width(4.dp)) + Text( + text = text, + color = textColor, + style = textStyle, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } +} diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt index a88c436..46bd1fd 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt @@ -4,11 +4,15 @@ import androidx.compose.foundation.Canvas import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.key import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.blur @@ -16,14 +20,18 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.PathEffect +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.spoony.spoony.R import com.spoony.spoony.core.designsystem.theme.SpoonyAndroidTheme +import kotlinx.collections.immutable.immutableListOf @Composable fun StoreInfo( - menuItems: List, - locationItems: List, + menuContent: @Composable () -> Unit, + locationContent: @Composable () -> Unit, modifier: Modifier = Modifier, isBlurred: Boolean = true ) { @@ -40,15 +48,34 @@ fun StoreInfo( ) { StoreInfoItem( title = "Menu", - items = menuItems, - isMenu = true + content = menuContent, + padding = PaddingValues( + top = 20.dp, + bottom = 28.dp, + start = 16.dp, + end = 16.dp + ), + shape = RoundedCornerShape( + topStart = 8.dp, + topEnd = 8.dp, + bottomStart = 20.dp, + bottomEnd = 20.dp + ) ) HorizontalDashedLine() StoreInfoItem( title = "Location", - subTitle = "이키", - items = locationItems, - isMenu = false + content = locationContent, + padding = PaddingValues( + vertical = 22.dp, + horizontal = 16.dp + ), + shape = RoundedCornerShape( + topStart = 20.dp, + topEnd = 20.dp, + bottomStart = 8.dp, + bottomEnd = 8.dp + ) ) } } @@ -86,6 +113,11 @@ private fun HorizontalDashedLine( @Preview(showBackground = true) @Composable private fun StoreInfoPreview() { + val menuItems = immutableListOf( + "고등어봉초밥", + "크렘브륄레", + "사케" + ) SpoonyAndroidTheme { Column( horizontalAlignment = Alignment.CenterHorizontally, @@ -95,25 +127,81 @@ private fun StoreInfoPreview() { modifier = Modifier .padding(horizontal = 20.dp), isBlurred = true, - menuItems = listOf( - "고등어봉초밥", - "크렘브륄레" - ), - locationItems = listOf( - "서울 서대문구 연희로11가길 39" - ) + menuContent = { + Column( + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + menuItems.forEach { menuItem -> + key(menuItem) { + PlaceDetailIconText( + icon = ImageVector.vectorResource(R.drawable.ic_spoon_24), + iconSize = 20.dp, + text = menuItem, + textStyle = SpoonyAndroidTheme.typography.body2m, + modifier = Modifier.fillMaxWidth() + ) + } + } + } + }, + locationContent = { + Text( + "어키", + style = SpoonyAndroidTheme.typography.title2sb + ) + Spacer(modifier = Modifier.height(11.dp)) + Column( + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + PlaceDetailIconText( + icon = ImageVector.vectorResource(R.drawable.ic_pin_24), + iconSize = 20.dp, + text = "서울 마포구 연희로11가길 39", + textStyle = SpoonyAndroidTheme.typography.body2m, + modifier = Modifier.fillMaxWidth() + ) + } + } ) StoreInfo( modifier = Modifier .padding(horizontal = 20.dp), isBlurred = false, - menuItems = listOf( - "고등어봉초밥", - "크렘브륄레" - ), - locationItems = listOf( - "서울 서대문구 연희로11가길 39" - ) + menuContent = { + Column( + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + menuItems.forEach { menuItem -> + key(menuItem) { + PlaceDetailIconText( + icon = ImageVector.vectorResource(R.drawable.ic_spoon_24), + iconSize = 20.dp, + text = menuItem, + textStyle = SpoonyAndroidTheme.typography.body2m, + modifier = Modifier.fillMaxWidth() + ) + } + } + } + }, + locationContent = { + Text( + "어키", + style = SpoonyAndroidTheme.typography.title2sb + ) + Spacer(modifier = Modifier.height(11.dp)) + Column( + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + PlaceDetailIconText( + icon = ImageVector.vectorResource(R.drawable.ic_pin_24), + iconSize = 20.dp, + text = "서울 마포구 연희로11가길 39", + textStyle = SpoonyAndroidTheme.typography.body2m, + modifier = Modifier.fillMaxWidth() + ) + } + } ) } } diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfoItem.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfoItem.kt index 489df6a..8ffd5d5 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfoItem.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfoItem.kt @@ -4,62 +4,32 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember -import androidx.compose.ui.Alignment +import androidx.compose.runtime.key import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Shape import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.spoony.spoony.R import com.spoony.spoony.core.designsystem.theme.SpoonyAndroidTheme +import kotlinx.collections.immutable.immutableListOf @Composable fun StoreInfoItem( title: String, - subTitle: String? = null, - items: List, - isMenu: Boolean = true, + content: @Composable () -> Unit, + shape: Shape, + padding: PaddingValues, modifier: Modifier = Modifier ) { - val (shape, paddingValues) = remember(isMenu) { - when (isMenu) { - true -> RoundedCornerShape( - topStart = 8.dp, - topEnd = 8.dp, - bottomStart = 20.dp, - bottomEnd = 20.dp - ) to PaddingValues( - top = 20.dp, - bottom = 28.dp, - start = 16.dp, - end = 16.dp - ) - false -> RoundedCornerShape( - topStart = 20.dp, - topEnd = 20.dp, - bottomStart = 8.dp, - bottomEnd = 8.dp - ) to PaddingValues( - vertical = 22.dp, - horizontal = 16.dp - ) - } - } Column( modifier = modifier .fillMaxWidth() @@ -67,78 +37,57 @@ fun StoreInfoItem( shape = shape, color = SpoonyAndroidTheme.colors.gray0 ) - .padding(paddingValues) + .padding(padding) ) { Text( title, style = SpoonyAndroidTheme.typography.body1b ) Spacer(modifier = Modifier.height(12.dp)) - if (subTitle != null) { - Text( - subTitle, - style = SpoonyAndroidTheme.typography.title2sb - ) - Spacer(modifier = Modifier.height(11.dp)) - } - Column( - verticalArrangement = Arrangement.spacedBy(12.dp) - ) { - items.forEach { item -> - IconText( - icon = if (isMenu) R.drawable.ic_spoon_24 else R.drawable.ic_pin_24, - iconSize = 20, - text = item, - textStyle = SpoonyAndroidTheme.typography.body2m, - modifier = Modifier.fillMaxWidth() - ) - } - } - } -} - -@Composable -private fun IconText( - icon: Int, - iconSize: Int, - text: String, - textStyle: TextStyle, - modifier: Modifier = Modifier, - textColor: Color = SpoonyAndroidTheme.colors.black, - iconTint: Color = SpoonyAndroidTheme.colors.gray600 -) { - Row( - modifier = modifier, - verticalAlignment = Alignment.CenterVertically - ) { - Icon( - imageVector = ImageVector.vectorResource(icon), - contentDescription = null, - modifier = Modifier.size(iconSize.dp), - tint = iconTint - ) - Spacer(modifier = Modifier.width(4.dp)) - Text( - text = text, - color = textColor, - style = textStyle, - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) + content() } } @Preview @Composable private fun StoreInfoItemMenuPreview() { + val menuItems = immutableListOf( + "고등어봉초밥", + "크렘브륄레", + "사케" + ) SpoonyAndroidTheme { StoreInfoItem( title = "Menu", - items = listOf( - "고등어봉초밥고등어봉초밥고등어봉초밥고등어봉초밥고등어봉초밥고등어봉초밥고등어봉초밥고등어봉초밥", - "크렘브륄레" + content = { + Column( + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + menuItems.forEach { menuItem -> + key(menuItem) { + PlaceDetailIconText( + icon = ImageVector.vectorResource(R.drawable.ic_spoon_24), + iconSize = 20.dp, + text = menuItem, + textStyle = SpoonyAndroidTheme.typography.body2m, + modifier = Modifier.fillMaxWidth() + ) + } + } + } + }, + padding = PaddingValues( + top = 20.dp, + bottom = 28.dp, + start = 16.dp, + end = 16.dp ), - isMenu = true + shape = RoundedCornerShape( + topStart = 8.dp, + topEnd = 8.dp, + bottomStart = 20.dp, + bottomEnd = 20.dp + ) ) } } @@ -149,11 +98,34 @@ private fun StoreInfoItemLocationPreview() { SpoonyAndroidTheme { StoreInfoItem( title = "Location", - subTitle = "이키", - items = listOf( - "서울 서대문구 연희로11가길 39" + content = { + Text( + "어키", + style = SpoonyAndroidTheme.typography.title2sb + ) + Spacer(modifier = Modifier.height(11.dp)) + Column( + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + PlaceDetailIconText( + icon = ImageVector.vectorResource(R.drawable.ic_pin_24), + iconSize = 20.dp, + text = "서울 마포구 연희로11가길 39", + textStyle = SpoonyAndroidTheme.typography.body2m, + modifier = Modifier.fillMaxWidth() + ) + } + }, + padding = PaddingValues( + vertical = 22.dp, + horizontal = 16.dp ), - isMenu = false + shape = RoundedCornerShape( + topStart = 20.dp, + topEnd = 20.dp, + bottomStart = 8.dp, + bottomEnd = 8.dp + ) ) } } From 6d6b8b6f5143ae1015eed4f724a600355dc21f22 Mon Sep 17 00:00:00 2001 From: roel Date: Thu, 16 Jan 2025 01:45:06 +0900 Subject: [PATCH 04/11] =?UTF-8?q?[Feat/#34]=20StoreInfo=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20StoreInfoItem=20ti?= =?UTF-8?q?tle=20strings=20=EC=B6=94=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../placeDetail/component/StoreInfo.kt | 83 +++++++++++++------ app/src/main/res/values/strings.xml | 2 + 2 files changed, 59 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt index 46bd1fd..1650c45 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt @@ -21,6 +21,7 @@ import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.PathEffect import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -31,7 +32,11 @@ import kotlinx.collections.immutable.immutableListOf @Composable fun StoreInfo( menuContent: @Composable () -> Unit, + menuPaddingValues: PaddingValues, + menuShape: RoundedCornerShape, locationContent: @Composable () -> Unit, + locationPaddingValues: PaddingValues, + locationShape: RoundedCornerShape, modifier: Modifier = Modifier, isBlurred: Boolean = true ) { @@ -47,35 +52,17 @@ fun StoreInfo( ) ) { StoreInfoItem( - title = "Menu", + title = stringResource(id = R.string.PLACE_DETAIL_STORE_INFO_MENU_TITLE), content = menuContent, - padding = PaddingValues( - top = 20.dp, - bottom = 28.dp, - start = 16.dp, - end = 16.dp - ), - shape = RoundedCornerShape( - topStart = 8.dp, - topEnd = 8.dp, - bottomStart = 20.dp, - bottomEnd = 20.dp - ) + padding = menuPaddingValues, + shape = menuShape ) HorizontalDashedLine() StoreInfoItem( - title = "Location", + title = stringResource(id = R.string.PLACE_DETAIL_STORE_INFO_LOCATION_TITLE), content = locationContent, - padding = PaddingValues( - vertical = 22.dp, - horizontal = 16.dp - ), - shape = RoundedCornerShape( - topStart = 20.dp, - topEnd = 20.dp, - bottomStart = 8.dp, - bottomEnd = 8.dp - ) + padding = locationPaddingValues, + shape = locationShape ) } } @@ -144,6 +131,18 @@ private fun StoreInfoPreview() { } } }, + menuPaddingValues = PaddingValues( + top = 20.dp, + bottom = 28.dp, + start = 16.dp, + end = 16.dp + ), + menuShape = RoundedCornerShape( + topStart = 8.dp, + topEnd = 8.dp, + bottomStart = 20.dp, + bottomEnd = 20.dp + ), locationContent = { Text( "어키", @@ -161,7 +160,17 @@ private fun StoreInfoPreview() { modifier = Modifier.fillMaxWidth() ) } - } + }, + locationPaddingValues = PaddingValues( + vertical = 22.dp, + horizontal = 16.dp + ), + locationShape = RoundedCornerShape( + topStart = 20.dp, + topEnd = 20.dp, + bottomStart = 8.dp, + bottomEnd = 8.dp + ) ) StoreInfo( modifier = Modifier @@ -184,6 +193,18 @@ private fun StoreInfoPreview() { } } }, + menuPaddingValues = PaddingValues( + top = 20.dp, + bottom = 28.dp, + start = 16.dp, + end = 16.dp + ), + menuShape = RoundedCornerShape( + topStart = 8.dp, + topEnd = 8.dp, + bottomStart = 20.dp, + bottomEnd = 20.dp + ), locationContent = { Text( "어키", @@ -201,7 +222,17 @@ private fun StoreInfoPreview() { modifier = Modifier.fillMaxWidth() ) } - } + }, + locationPaddingValues = PaddingValues( + vertical = 22.dp, + horizontal = 16.dp + ), + locationShape = RoundedCornerShape( + topStart = 20.dp, + topEnd = 20.dp, + bottomStart = 8.dp, + bottomEnd = 8.dp + ) ) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1d37292..da3df7e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,6 @@ Spoony-Android %1$s / %2$s + Menu + Location From f187f66ada3f982b1a1e6ce11d105d5c1af0d47f Mon Sep 17 00:00:00 2001 From: roel Date: Thu, 16 Jan 2025 01:55:47 +0900 Subject: [PATCH 05/11] =?UTF-8?q?[Feat/#34]=20Hairline=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spoony/presentation/placeDetail/component/StoreInfo.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt index 1650c45..02a84a7 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt @@ -21,6 +21,7 @@ import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.PathEffect import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview @@ -74,10 +75,11 @@ private fun HorizontalDashedLine( strokeWidth: Float = 2f, dashLengths: FloatArray = floatArrayOf(30f, 30f) ) { + val density = LocalDensity.current Box( modifier = modifier .fillMaxWidth() - .height(1.dp) + .height(with(density) { 1 / density.density }.dp) ) { Canvas(modifier = Modifier.matchParentSize()) { val pathEffect = PathEffect.dashPathEffect( From f8945cf4f367289c745885e18bc692803d0ddc1a Mon Sep 17 00:00:00 2001 From: roel Date: Thu, 16 Jan 2025 02:03:06 +0900 Subject: [PATCH 06/11] =?UTF-8?q?[Feat/#34]=20padding=20=EA=B0=92=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spoony/presentation/placeDetail/component/StoreInfo.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt index 02a84a7..cfa3ae9 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt @@ -164,7 +164,7 @@ private fun StoreInfoPreview() { } }, locationPaddingValues = PaddingValues( - vertical = 22.dp, + vertical = 21.dp, horizontal = 16.dp ), locationShape = RoundedCornerShape( @@ -226,7 +226,7 @@ private fun StoreInfoPreview() { } }, locationPaddingValues = PaddingValues( - vertical = 22.dp, + vertical = 21.dp, horizontal = 16.dp ), locationShape = RoundedCornerShape( From 193dd10707ef8c95293aea8bd42e4c7c9e030211 Mon Sep 17 00:00:00 2001 From: roel Date: Thu, 16 Jan 2025 02:07:13 +0900 Subject: [PATCH 07/11] =?UTF-8?q?[Feat/#34]=20isBlurred=20=EB=94=94?= =?UTF-8?q?=ED=8F=B4=ED=8A=B8=EA=B0=92=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spoony/presentation/placeDetail/component/StoreInfo.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt index cfa3ae9..21c840b 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt @@ -38,8 +38,8 @@ fun StoreInfo( locationContent: @Composable () -> Unit, locationPaddingValues: PaddingValues, locationShape: RoundedCornerShape, + isBlurred: Boolean, modifier: Modifier = Modifier, - isBlurred: Boolean = true ) { Column( modifier = modifier From a3317e5b1744a34948ea5e9abcb5ab28d0c09910 Mon Sep 17 00:00:00 2001 From: roel Date: Thu, 16 Jan 2025 02:09:24 +0900 Subject: [PATCH 08/11] =?UTF-8?q?[Feat/#34]=20ktLintFormat=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spoony/presentation/placeDetail/component/StoreInfo.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt index 21c840b..1fd258a 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt @@ -39,7 +39,7 @@ fun StoreInfo( locationPaddingValues: PaddingValues, locationShape: RoundedCornerShape, isBlurred: Boolean, - modifier: Modifier = Modifier, + modifier: Modifier = Modifier ) { Column( modifier = modifier From 1376affca3c568a7374618720d17301954006d7d Mon Sep 17 00:00:00 2001 From: roel Date: Thu, 16 Jan 2025 03:00:37 +0900 Subject: [PATCH 09/11] =?UTF-8?q?[Feat/#34]=20StoreInfo=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../placeDetail/component/StoreInfo.kt | 189 ++++++------------ 1 file changed, 63 insertions(+), 126 deletions(-) diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt index 1fd258a..3eb8b55 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt @@ -28,16 +28,14 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.spoony.spoony.R import com.spoony.spoony.core.designsystem.theme.SpoonyAndroidTheme +import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.immutableListOf @Composable fun StoreInfo( - menuContent: @Composable () -> Unit, - menuPaddingValues: PaddingValues, - menuShape: RoundedCornerShape, - locationContent: @Composable () -> Unit, - locationPaddingValues: PaddingValues, - locationShape: RoundedCornerShape, + menuItems: ImmutableList, + locationSubTitle: String, + location: String, isBlurred: Boolean, modifier: Modifier = Modifier ) { @@ -54,16 +52,63 @@ fun StoreInfo( ) { StoreInfoItem( title = stringResource(id = R.string.PLACE_DETAIL_STORE_INFO_MENU_TITLE), - content = menuContent, - padding = menuPaddingValues, - shape = menuShape + content = { + Column( + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + menuItems.forEach { menuItem -> + key(menuItem) { + PlaceDetailIconText( + icon = ImageVector.vectorResource(R.drawable.ic_spoon_24), + iconSize = 20.dp, + text = menuItem, + textStyle = SpoonyAndroidTheme.typography.body2m, + modifier = Modifier.fillMaxWidth() + ) + } + } + } + }, + padding = PaddingValues( + top = 20.dp, + bottom = 28.dp, + start = 16.dp, + end = 16.dp + ), + shape = RoundedCornerShape( + topStart = 8.dp, + topEnd = 8.dp, + bottomStart = 20.dp, + bottomEnd = 20.dp + ) ) HorizontalDashedLine() StoreInfoItem( title = stringResource(id = R.string.PLACE_DETAIL_STORE_INFO_LOCATION_TITLE), - content = locationContent, - padding = locationPaddingValues, - shape = locationShape + content = { + Text( + locationSubTitle, + style = SpoonyAndroidTheme.typography.title2sb + ) + Spacer(modifier = Modifier.height(11.dp)) + PlaceDetailIconText( + icon = ImageVector.vectorResource(R.drawable.ic_pin_24), + iconSize = 20.dp, + text = location, + textStyle = SpoonyAndroidTheme.typography.body2m, + modifier = Modifier.fillMaxWidth() + ) + }, + padding = PaddingValues( + vertical = 21.dp, + horizontal = 16.dp + ), + shape = RoundedCornerShape( + topStart = 20.dp, + topEnd = 20.dp, + bottomStart = 8.dp, + bottomEnd = 8.dp + ) ) } } @@ -116,125 +161,17 @@ private fun StoreInfoPreview() { modifier = Modifier .padding(horizontal = 20.dp), isBlurred = true, - menuContent = { - Column( - verticalArrangement = Arrangement.spacedBy(12.dp) - ) { - menuItems.forEach { menuItem -> - key(menuItem) { - PlaceDetailIconText( - icon = ImageVector.vectorResource(R.drawable.ic_spoon_24), - iconSize = 20.dp, - text = menuItem, - textStyle = SpoonyAndroidTheme.typography.body2m, - modifier = Modifier.fillMaxWidth() - ) - } - } - } - }, - menuPaddingValues = PaddingValues( - top = 20.dp, - bottom = 28.dp, - start = 16.dp, - end = 16.dp - ), - menuShape = RoundedCornerShape( - topStart = 8.dp, - topEnd = 8.dp, - bottomStart = 20.dp, - bottomEnd = 20.dp - ), - locationContent = { - Text( - "어키", - style = SpoonyAndroidTheme.typography.title2sb - ) - Spacer(modifier = Modifier.height(11.dp)) - Column( - verticalArrangement = Arrangement.spacedBy(12.dp) - ) { - PlaceDetailIconText( - icon = ImageVector.vectorResource(R.drawable.ic_pin_24), - iconSize = 20.dp, - text = "서울 마포구 연희로11가길 39", - textStyle = SpoonyAndroidTheme.typography.body2m, - modifier = Modifier.fillMaxWidth() - ) - } - }, - locationPaddingValues = PaddingValues( - vertical = 21.dp, - horizontal = 16.dp - ), - locationShape = RoundedCornerShape( - topStart = 20.dp, - topEnd = 20.dp, - bottomStart = 8.dp, - bottomEnd = 8.dp - ) + menuItems = menuItems, + locationSubTitle = "어키", + location = "서울 마포구 연희로11가길 39" ) StoreInfo( modifier = Modifier .padding(horizontal = 20.dp), isBlurred = false, - menuContent = { - Column( - verticalArrangement = Arrangement.spacedBy(12.dp) - ) { - menuItems.forEach { menuItem -> - key(menuItem) { - PlaceDetailIconText( - icon = ImageVector.vectorResource(R.drawable.ic_spoon_24), - iconSize = 20.dp, - text = menuItem, - textStyle = SpoonyAndroidTheme.typography.body2m, - modifier = Modifier.fillMaxWidth() - ) - } - } - } - }, - menuPaddingValues = PaddingValues( - top = 20.dp, - bottom = 28.dp, - start = 16.dp, - end = 16.dp - ), - menuShape = RoundedCornerShape( - topStart = 8.dp, - topEnd = 8.dp, - bottomStart = 20.dp, - bottomEnd = 20.dp - ), - locationContent = { - Text( - "어키", - style = SpoonyAndroidTheme.typography.title2sb - ) - Spacer(modifier = Modifier.height(11.dp)) - Column( - verticalArrangement = Arrangement.spacedBy(12.dp) - ) { - PlaceDetailIconText( - icon = ImageVector.vectorResource(R.drawable.ic_pin_24), - iconSize = 20.dp, - text = "서울 마포구 연희로11가길 39", - textStyle = SpoonyAndroidTheme.typography.body2m, - modifier = Modifier.fillMaxWidth() - ) - } - }, - locationPaddingValues = PaddingValues( - vertical = 21.dp, - horizontal = 16.dp - ), - locationShape = RoundedCornerShape( - topStart = 20.dp, - topEnd = 20.dp, - bottomStart = 8.dp, - bottomEnd = 8.dp - ) + menuItems = menuItems, + locationSubTitle = "어키", + location = "서울 마포구 연희로11가길 39" ) } } From 608683a9fdb6a85ed8b445a1a5445b1383f7340e Mon Sep 17 00:00:00 2001 From: roel Date: Thu, 16 Jan 2025 03:03:19 +0900 Subject: [PATCH 10/11] =?UTF-8?q?[Feat/#34]=20StoreInfoItem=20content=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../placeDetail/component/StoreInfo.kt | 64 +++++++++---------- .../placeDetail/component/StoreInfoItem.kt | 4 +- 2 files changed, 33 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt index 3eb8b55..fe3dd35 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt @@ -52,23 +52,6 @@ fun StoreInfo( ) { StoreInfoItem( title = stringResource(id = R.string.PLACE_DETAIL_STORE_INFO_MENU_TITLE), - content = { - Column( - verticalArrangement = Arrangement.spacedBy(12.dp) - ) { - menuItems.forEach { menuItem -> - key(menuItem) { - PlaceDetailIconText( - icon = ImageVector.vectorResource(R.drawable.ic_spoon_24), - iconSize = 20.dp, - text = menuItem, - textStyle = SpoonyAndroidTheme.typography.body2m, - modifier = Modifier.fillMaxWidth() - ) - } - } - } - }, padding = PaddingValues( top = 20.dp, bottom = 28.dp, @@ -81,24 +64,26 @@ fun StoreInfo( bottomStart = 20.dp, bottomEnd = 20.dp ) - ) + ) { + Column( + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + menuItems.forEach { menuItem -> + key(menuItem) { + PlaceDetailIconText( + icon = ImageVector.vectorResource(R.drawable.ic_spoon_24), + iconSize = 20.dp, + text = menuItem, + textStyle = SpoonyAndroidTheme.typography.body2m, + modifier = Modifier.fillMaxWidth() + ) + } + } + } + } HorizontalDashedLine() StoreInfoItem( title = stringResource(id = R.string.PLACE_DETAIL_STORE_INFO_LOCATION_TITLE), - content = { - Text( - locationSubTitle, - style = SpoonyAndroidTheme.typography.title2sb - ) - Spacer(modifier = Modifier.height(11.dp)) - PlaceDetailIconText( - icon = ImageVector.vectorResource(R.drawable.ic_pin_24), - iconSize = 20.dp, - text = location, - textStyle = SpoonyAndroidTheme.typography.body2m, - modifier = Modifier.fillMaxWidth() - ) - }, padding = PaddingValues( vertical = 21.dp, horizontal = 16.dp @@ -109,7 +94,20 @@ fun StoreInfo( bottomStart = 8.dp, bottomEnd = 8.dp ) - ) + ) { + Text( + locationSubTitle, + style = SpoonyAndroidTheme.typography.title2sb + ) + Spacer(modifier = Modifier.height(11.dp)) + PlaceDetailIconText( + icon = ImageVector.vectorResource(R.drawable.ic_pin_24), + iconSize = 20.dp, + text = location, + textStyle = SpoonyAndroidTheme.typography.body2m, + modifier = Modifier.fillMaxWidth() + ) + } } } diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfoItem.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfoItem.kt index 8ffd5d5..c6b2670 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfoItem.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfoItem.kt @@ -25,10 +25,10 @@ import kotlinx.collections.immutable.immutableListOf @Composable fun StoreInfoItem( title: String, - content: @Composable () -> Unit, shape: Shape, padding: PaddingValues, - modifier: Modifier = Modifier + modifier: Modifier = Modifier, + content: @Composable () -> Unit ) { Column( modifier = modifier From 869c28b146642ad9c7155a3ad2f6cefe010f2589 Mon Sep 17 00:00:00 2001 From: roel Date: Thu, 16 Jan 2025 04:03:40 +0900 Subject: [PATCH 11/11] =?UTF-8?q?[Feat/#34]=20string=20snake=20case=20?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spoony/presentation/placeDetail/component/StoreInfo.kt | 4 ++-- app/src/main/res/values/strings.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt index fe3dd35..a15ff5f 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/placeDetail/component/StoreInfo.kt @@ -51,7 +51,7 @@ fun StoreInfo( ) ) { StoreInfoItem( - title = stringResource(id = R.string.PLACE_DETAIL_STORE_INFO_MENU_TITLE), + title = stringResource(id = R.string.place_detail_store_info_menu_title), padding = PaddingValues( top = 20.dp, bottom = 28.dp, @@ -83,7 +83,7 @@ fun StoreInfo( } HorizontalDashedLine() StoreInfoItem( - title = stringResource(id = R.string.PLACE_DETAIL_STORE_INFO_LOCATION_TITLE), + title = stringResource(id = R.string.place_detail_store_info_location_title), padding = PaddingValues( vertical = 21.dp, horizontal = 16.dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index da3df7e..34bf61f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ Spoony-Android %1$s / %2$s - Menu - Location + Menu + Location