From 82caa39dc106f451567ea15aef516208fed87d0e Mon Sep 17 00:00:00 2001 From: Hyemin <143622050+hyeminililo@users.noreply.github.com> Date: Fri, 20 Feb 2026 20:00:14 +0900 Subject: [PATCH 1/8] =?UTF-8?q?feature/#40:=20HomeHashtag=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/home/component/HomeHashtag.kt | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt diff --git a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt new file mode 100644 index 0000000..05ddf46 --- /dev/null +++ b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt @@ -0,0 +1,46 @@ +package com.gildongmu.dduru.presentation.feature.home.component + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +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.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.gildongmu.dduru.core.designsystem.theme.DduruTheme + +@Composable +fun HomeHashtag( + text: String, + modifier: Modifier = Modifier +) { + Box( + modifier = modifier + .clip(shape=RoundedCornerShape(size=99.dp)) + .background(color = DduruTheme.colors.gray300.copy(alpha = 0.3f)) + .padding(horizontal = 12.dp, vertical = 8.dp), + contentAlignment = Alignment.Center + ) { + Text( + text = "#$text", + color = DduruTheme.colors.gray300, + style = DduruTheme.typography.Caption2 + ) + } +} + +@Preview(name = "HomeHashtag - Default") +@Composable +private fun HomeHashtagDefaultPreview() { + HomeHashtag(text = "사진") +} + +@Preview(name = "HomeHashtag - LongText") +@Composable +private fun HomeHashtagLongTextPreview() { + HomeHashtag(text = "카페투어") +} From 2bda6823552e4caddd60ddaad8e22d1a8f8a8569 Mon Sep 17 00:00:00 2001 From: Hyemin <143622050+hyeminililo@users.noreply.github.com> Date: Fri, 20 Feb 2026 20:33:59 +0900 Subject: [PATCH 2/8] =?UTF-8?q?feature/#40:=20HomeSectionTrailingAction=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/HomeSectionTrailingAction.kt | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeSectionTrailingAction.kt diff --git a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeSectionTrailingAction.kt b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeSectionTrailingAction.kt new file mode 100644 index 0000000..81990e1 --- /dev/null +++ b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeSectionTrailingAction.kt @@ -0,0 +1,56 @@ +package com.gildongmu.dduru.presentation.feature.home.component + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight +import androidx.compose.material.icons.filled.KeyboardArrowRight +import androidx.compose.material3.Icon +import androidx.compose.material3.SegmentedButtonDefaults.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.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.gildongmu.dduru.core.designsystem.theme.DduruTheme + +@Composable +fun HomeSectionTrailingAction( + text: String, + onClick: () -> Unit, + modifier: Modifier = Modifier +) { + Row( + modifier = modifier + .fillMaxWidth() + .clickable(onClick = onClick) + .padding(vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Text( + text = text, + style = DduruTheme.typography.Body4, + color = DduruTheme.colors.gray600 + ) + + Icon( + imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, + contentDescription = null, + tint = DduruTheme.colors.gray600 + ) + } +} + +@Preview +@Composable +private fun HomeSectionTrailingActionPreview() { + HomeSectionTrailingAction( + text = "전체보기", + onClick = {} + ) +} From f155b8a61a607dfe596eab0a9e1c71c0aeb1ad9e Mon Sep 17 00:00:00 2001 From: Hyemin <143622050+hyeminililo@users.noreply.github.com> Date: Fri, 20 Feb 2026 20:34:40 +0900 Subject: [PATCH 3/8] =?UTF-8?q?chore/#40:=20ktLint=20=EC=8B=A4=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dduru/presentation/feature/home/component/HomeHashtag.kt | 2 +- .../feature/home/component/HomeSectionTrailingAction.kt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt index 05ddf46..4ce9134 100644 --- a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt +++ b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt @@ -20,7 +20,7 @@ fun HomeHashtag( ) { Box( modifier = modifier - .clip(shape=RoundedCornerShape(size=99.dp)) + .clip(shape = RoundedCornerShape(size = 99.dp)) .background(color = DduruTheme.colors.gray300.copy(alpha = 0.3f)) .padding(horizontal = 12.dp, vertical = 8.dp), contentAlignment = Alignment.Center diff --git a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeSectionTrailingAction.kt b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeSectionTrailingAction.kt index 81990e1..c70034d 100644 --- a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeSectionTrailingAction.kt +++ b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeSectionTrailingAction.kt @@ -7,9 +7,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight -import androidx.compose.material.icons.filled.KeyboardArrowRight import androidx.compose.material3.Icon -import androidx.compose.material3.SegmentedButtonDefaults.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment From 7f15b1f15af53fa0c527c2ac3607d6d9596fe403 Mon Sep 17 00:00:00 2001 From: Hyemin <143622050+hyeminililo@users.noreply.github.com> Date: Fri, 6 Mar 2026 23:56:41 +0900 Subject: [PATCH 4/8] =?UTF-8?q?refactor/#40:=20=EC=BD=94=EB=93=9C=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=20=EA=B8=B0=EB=B0=98=EC=9C=BC=EB=A1=9C=20=EB=A6=AC?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81=20=EC=A7=84=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 프리뷰 추가 - 디자인 변경에 맞춰 변경 - textStyle 인자로 외부에서 주입 --- .../feature/home/component/HomeHashtag.kt | 68 ++++++++++++++++--- 1 file changed, 58 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt index 4ce9134..a01a73e 100644 --- a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt +++ b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt @@ -2,6 +2,7 @@ package com.gildongmu.dduru.presentation.feature.home.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Text @@ -9,6 +10,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.TextStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.gildongmu.dduru.core.designsystem.theme.DduruTheme @@ -16,31 +19,76 @@ import com.gildongmu.dduru.core.designsystem.theme.DduruTheme @Composable fun HomeHashtag( text: String, + textColor: Color, + textStyle: TextStyle, + backgroundColor: Color, + contentPadding: PaddingValues, modifier: Modifier = Modifier ) { Box( modifier = modifier .clip(shape = RoundedCornerShape(size = 99.dp)) - .background(color = DduruTheme.colors.gray300.copy(alpha = 0.3f)) - .padding(horizontal = 12.dp, vertical = 8.dp), + .background(color = backgroundColor) + .padding(contentPadding), contentAlignment = Alignment.Center ) { Text( text = "#$text", - color = DduruTheme.colors.gray300, - style = DduruTheme.typography.Caption2 + color = textColor, + style = textStyle, ) } } -@Preview(name = "HomeHashtag - Default") +@Preview(name = "OnboardingHashtag - 설문조사 완료") @Composable -private fun HomeHashtagDefaultPreview() { - HomeHashtag(text = "사진") +private fun OnboardingHashtagPreview() { + DduruTheme { + HomeHashtag( + text = "세심함", + textColor = DduruTheme.colors.gray700, + textStyle = DduruTheme.typography.Caption2, + backgroundColor = DduruTheme.colors.gray300, + contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp) + ) + } } -@Preview(name = "HomeHashtag - LongText") +@Preview(name = "HomeHashtag - 실시간인기여행지") @Composable -private fun HomeHashtagLongTextPreview() { - HomeHashtag(text = "카페투어") +private fun HomeHashtagRealtimePreview() { + DduruTheme { + HomeHashtag( + text = "힐링", + textColor = DduruTheme.colors.gray700, + textStyle = DduruTheme.typography.Micro, + backgroundColor = DduruTheme.colors.gray100, + contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp) + )} } + +@Preview(name = "HomeHashtag - 슈퍼호스트") +@Composable +private fun HomeHashtagDefaultPreview() { + DduruTheme { + HomeHashtag( + text = "일출", + textColor = DduruTheme.colors.gray500, + textStyle = DduruTheme.typography.Caption1, + backgroundColor = DduruTheme.colors.gray300, + contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp) + ) +}} + +@Preview(name = "HomeHashtag - AI추천여행지") +@Composable +private fun HomeHashtagAIPreview() { + DduruTheme { + HomeHashtag( + text = "카페투어", + textColor = DduruTheme.colors.gray300, + textStyle = DduruTheme.typography.Caption2, + backgroundColor = DduruTheme.colors.gray300.copy(alpha = 0.3f), + contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp) + ) +}} From d3cf5cc49bd8bc80ac800a293b3768206e3e5d51 Mon Sep 17 00:00:00 2001 From: Hyemin <143622050+hyeminililo@users.noreply.github.com> Date: Sat, 7 Mar 2026 00:01:00 +0900 Subject: [PATCH 5/8] =?UTF-8?q?refactor/#40:=20=EC=BD=94=EB=93=9C=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=20=EA=B8=B0=EB=B0=98=EC=9C=BC=EB=A1=9C=20=EB=A6=AC?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81=20=EC=A7=84=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - HomeSectionTrailingAction fillMaxWidth() 제거 --- .../home/component/HomeSectionTrailingAction.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeSectionTrailingAction.kt b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeSectionTrailingAction.kt index c70034d..700bcf5 100644 --- a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeSectionTrailingAction.kt +++ b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeSectionTrailingAction.kt @@ -3,7 +3,6 @@ package com.gildongmu.dduru.presentation.feature.home.component import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight @@ -24,7 +23,6 @@ fun HomeSectionTrailingAction( ) { Row( modifier = modifier - .fillMaxWidth() .clickable(onClick = onClick) .padding(vertical = 4.dp), verticalAlignment = Alignment.CenterVertically, @@ -47,8 +45,10 @@ fun HomeSectionTrailingAction( @Preview @Composable private fun HomeSectionTrailingActionPreview() { - HomeSectionTrailingAction( - text = "전체보기", - onClick = {} - ) + DduruTheme { + HomeSectionTrailingAction( + text = "전체보기", + onClick = {} + ) + } } From 529a724d264e43f54787c3048cc2e8aa291b1957 Mon Sep 17 00:00:00 2001 From: Hyemin <143622050+hyeminililo@users.noreply.github.com> Date: Sat, 7 Mar 2026 00:05:39 +0900 Subject: [PATCH 6/8] =?UTF-8?q?chore/#40:=20ktLint=20=EC=8B=A4=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/home/component/HomeHashtag.kt | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt index a01a73e..c7d258a 100644 --- a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt +++ b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt @@ -35,7 +35,7 @@ fun HomeHashtag( Text( text = "#$text", color = textColor, - style = textStyle, + style = textStyle ) } } @@ -58,37 +58,40 @@ private fun OnboardingHashtagPreview() { @Composable private fun HomeHashtagRealtimePreview() { DduruTheme { - HomeHashtag( - text = "힐링", - textColor = DduruTheme.colors.gray700, - textStyle = DduruTheme.typography.Micro, - backgroundColor = DduruTheme.colors.gray100, - contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp) - )} + HomeHashtag( + text = "힐링", + textColor = DduruTheme.colors.gray700, + textStyle = DduruTheme.typography.Micro, + backgroundColor = DduruTheme.colors.gray100, + contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp) + ) + } } @Preview(name = "HomeHashtag - 슈퍼호스트") @Composable private fun HomeHashtagDefaultPreview() { DduruTheme { - HomeHashtag( - text = "일출", - textColor = DduruTheme.colors.gray500, - textStyle = DduruTheme.typography.Caption1, - backgroundColor = DduruTheme.colors.gray300, - contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp) - ) -}} + HomeHashtag( + text = "일출", + textColor = DduruTheme.colors.gray500, + textStyle = DduruTheme.typography.Caption1, + backgroundColor = DduruTheme.colors.gray300, + contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp) + ) + } +} @Preview(name = "HomeHashtag - AI추천여행지") @Composable private fun HomeHashtagAIPreview() { DduruTheme { - HomeHashtag( - text = "카페투어", - textColor = DduruTheme.colors.gray300, - textStyle = DduruTheme.typography.Caption2, - backgroundColor = DduruTheme.colors.gray300.copy(alpha = 0.3f), - contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp) - ) -}} + HomeHashtag( + text = "카페투어", + textColor = DduruTheme.colors.gray300, + textStyle = DduruTheme.typography.Caption2, + backgroundColor = DduruTheme.colors.gray300.copy(alpha = 0.3f), + contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp) + ) + } +} From 7e03658dab3936dd5b51955e5fd4e53b05fc7ed3 Mon Sep 17 00:00:00 2001 From: Hyemin <143622050+hyeminililo@users.noreply.github.com> Date: Sat, 7 Mar 2026 00:08:01 +0900 Subject: [PATCH 7/8] =?UTF-8?q?chore/#40:=20ktLint=20=EC=8B=A4=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dduru/presentation/feature/home/component/HomeHashtag.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt index c7d258a..ffc417a 100644 --- a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt +++ b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt @@ -79,7 +79,7 @@ private fun HomeHashtagDefaultPreview() { backgroundColor = DduruTheme.colors.gray300, contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp) ) - } + } } @Preview(name = "HomeHashtag - AI추천여행지") @@ -93,5 +93,5 @@ private fun HomeHashtagAIPreview() { backgroundColor = DduruTheme.colors.gray300.copy(alpha = 0.3f), contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp) ) - } + } } From 3c54f66060f02d499fe5c5876cf14a12dd25f2bf Mon Sep 17 00:00:00 2001 From: Hyemin <143622050+hyeminililo@users.noreply.github.com> Date: Sat, 7 Mar 2026 00:26:49 +0900 Subject: [PATCH 8/8] =?UTF-8?q?refactor/#40=20:=20DS=20Micro2=20TextStyle?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dduru/core/designsystem/typography/Type.kt | 10 +++++++++- .../presentation/feature/home/component/HomeHashtag.kt | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/gildongmu/dduru/core/designsystem/typography/Type.kt b/app/src/main/java/com/gildongmu/dduru/core/designsystem/typography/Type.kt index 3f3d34d..cb67b58 100644 --- a/app/src/main/java/com/gildongmu/dduru/core/designsystem/typography/Type.kt +++ b/app/src/main/java/com/gildongmu/dduru/core/designsystem/typography/Type.kt @@ -39,7 +39,8 @@ data class DduruTypography( val Caption1: TextStyle, val Caption2: TextStyle, - val Micro: TextStyle + val Micro: TextStyle, + val Micro2: TextStyle ) val defaultDduruTypography = DduruTypography( @@ -157,6 +158,13 @@ val defaultDduruTypography = DduruTypography( ), Micro = TextStyle( + fontFamily = Pretendard, + fontWeight = FontWeight.Bold, + fontSize = 10.sp, + lineHeight = 12.sp + ), + + Micro2 = TextStyle( fontFamily = Pretendard, fontWeight = FontWeight.SemiBold, fontSize = 10.sp, diff --git a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt index ffc417a..4713929 100644 --- a/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt +++ b/app/src/main/java/com/gildongmu/dduru/presentation/feature/home/component/HomeHashtag.kt @@ -61,7 +61,7 @@ private fun HomeHashtagRealtimePreview() { HomeHashtag( text = "힐링", textColor = DduruTheme.colors.gray700, - textStyle = DduruTheme.typography.Micro, + textStyle = DduruTheme.typography.Micro2, backgroundColor = DduruTheme.colors.gray100, contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp) ) @@ -76,7 +76,7 @@ private fun HomeHashtagDefaultPreview() { text = "일출", textColor = DduruTheme.colors.gray500, textStyle = DduruTheme.typography.Caption1, - backgroundColor = DduruTheme.colors.gray300, + backgroundColor = DduruTheme.colors.gray100, contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp) ) }