From c7cc1560fac52615b41a852681722a0c928b6e4e Mon Sep 17 00:00:00 2001 From: Jihee Han Date: Fri, 27 Feb 2026 14:31:55 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[NDGL-123]=20feat:=20TravelContent=20?= =?UTF-8?q?=EB=B0=8F=20=EA=B4=80=EB=A0=A8=20UI=EC=97=90=20=EA=B5=AD?= =?UTF-8?q?=EA=B0=80=EB=AA=85(countryName)=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yapp/ndgl/data/travel/model/TravelTemplateSummary.kt | 1 + .../com/yapp/ndgl/feature/home/component/TravelTemplate.kt | 2 +- .../main/java/com/yapp/ndgl/feature/home/main/HomeScreen.kt | 3 +++ .../main/java/com/yapp/ndgl/feature/home/main/HomeViewModel.kt | 1 + .../com/yapp/ndgl/feature/home/main/PopularTravelSection.kt | 3 +++ .../yapp/ndgl/feature/home/main/RecommendedContentSection.kt | 2 ++ .../java/com/yapp/ndgl/feature/home/model/TravelContent.kt | 1 + .../ndgl/feature/home/popular/PopularTravelListViewModel.kt | 1 + .../com/yapp/ndgl/feature/home/search/TemplateSearchScreen.kt | 3 +++ .../yapp/ndgl/feature/home/search/TemplateSearchViewModel.kt | 1 + 10 files changed, 17 insertions(+), 1 deletion(-) diff --git a/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/TravelTemplateSummary.kt b/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/TravelTemplateSummary.kt index 5b616d74..786adc09 100644 --- a/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/TravelTemplateSummary.kt +++ b/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/TravelTemplateSummary.kt @@ -7,6 +7,7 @@ data class TravelTemplateSummary( val id: Long, val title: String, val country: String, + val countryName: String, val city: String, val nights: Int, val days: Int, diff --git a/feature/home/src/main/java/com/yapp/ndgl/feature/home/component/TravelTemplate.kt b/feature/home/src/main/java/com/yapp/ndgl/feature/home/component/TravelTemplate.kt index 022b0d6a..a29ab659 100644 --- a/feature/home/src/main/java/com/yapp/ndgl/feature/home/component/TravelTemplate.kt +++ b/feature/home/src/main/java/com/yapp/ndgl/feature/home/component/TravelTemplate.kt @@ -61,7 +61,7 @@ internal fun TravelTemplate( style = NDGLTheme.typography.bodyLgMedium, ) Text( - text = travel.country, + text = travel.countryName, color = NDGLTheme.colors.black400, style = NDGLTheme.typography.bodyMdMedium, ) diff --git a/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeScreen.kt b/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeScreen.kt index 4b485c0b..ca91c9eb 100644 --- a/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeScreen.kt +++ b/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeScreen.kt @@ -166,6 +166,7 @@ private fun HomeScreenPreview() { travelId = 1, title = "곽준빈의 신혼여행", country = "FR", + countryName = "프랑스", city = "파리", nights = 7, days = 9, @@ -177,6 +178,7 @@ private fun HomeScreenPreview() { travelId = 2, title = "스위스 여행", country = "CH", + countryName = "스위스", city = "스위스", nights = 5, days = 6, @@ -188,6 +190,7 @@ private fun HomeScreenPreview() { travelId = 3, title = "충격적인 북유럽 물가", country = "DK", + countryName = "덴마크", city = "덴마크", nights = 4, days = 6, diff --git a/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeViewModel.kt b/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeViewModel.kt index de0307e1..1f760e91 100644 --- a/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeViewModel.kt +++ b/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeViewModel.kt @@ -184,6 +184,7 @@ class HomeViewModel @Inject constructor( travelId = id, title = title, country = country, + countryName = countryName, city = city, nights = nights, days = days, diff --git a/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/PopularTravelSection.kt b/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/PopularTravelSection.kt index a11f06cc..09f7c527 100644 --- a/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/PopularTravelSection.kt +++ b/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/PopularTravelSection.kt @@ -155,6 +155,7 @@ private fun PopularTravelSectionPreview() { travelId = 1, title = "곽준빈의 신혼여행", country = "FR", + countryName = "프랑스", city = "파리", nights = 7, days = 9, @@ -166,6 +167,7 @@ private fun PopularTravelSectionPreview() { travelId = 2, title = "스위스 여행", country = "CH", + countryName = "스위스", city = "스위스", nights = 5, days = 6, @@ -177,6 +179,7 @@ private fun PopularTravelSectionPreview() { travelId = 3, title = "충격적인 북유럽 물가", country = "DK", + countryName = "덴마크", city = "덴마크", nights = 4, days = 6, diff --git a/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/RecommendedContentSection.kt b/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/RecommendedContentSection.kt index e678ac02..d60f9240 100644 --- a/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/RecommendedContentSection.kt +++ b/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/RecommendedContentSection.kt @@ -182,6 +182,7 @@ private fun RecommendedContentSectionPreview() { travelId = 1, title = "곽준빈의 신혼여행", country = "FR", + countryName = "프랑스", city = "파리", nights = 7, days = 9, @@ -193,6 +194,7 @@ private fun RecommendedContentSectionPreview() { travelId = 2, title = "스위스 여행", country = "CH", + countryName = "스위스", city = "스위스", nights = 5, days = 6, diff --git a/feature/home/src/main/java/com/yapp/ndgl/feature/home/model/TravelContent.kt b/feature/home/src/main/java/com/yapp/ndgl/feature/home/model/TravelContent.kt index 5814800b..a293df1d 100644 --- a/feature/home/src/main/java/com/yapp/ndgl/feature/home/model/TravelContent.kt +++ b/feature/home/src/main/java/com/yapp/ndgl/feature/home/model/TravelContent.kt @@ -8,6 +8,7 @@ data class TravelContent( val travelId: Long, val title: String, val country: String, + val countryName: String, val city: String, val nights: Int, val days: Int, diff --git a/feature/home/src/main/java/com/yapp/ndgl/feature/home/popular/PopularTravelListViewModel.kt b/feature/home/src/main/java/com/yapp/ndgl/feature/home/popular/PopularTravelListViewModel.kt index 37f2c867..20d5600c 100644 --- a/feature/home/src/main/java/com/yapp/ndgl/feature/home/popular/PopularTravelListViewModel.kt +++ b/feature/home/src/main/java/com/yapp/ndgl/feature/home/popular/PopularTravelListViewModel.kt @@ -97,6 +97,7 @@ class PopularTravelListViewModel @Inject constructor( travelId = id, title = title, country = country, + countryName = countryName, city = city, nights = nights, days = days, diff --git a/feature/home/src/main/java/com/yapp/ndgl/feature/home/search/TemplateSearchScreen.kt b/feature/home/src/main/java/com/yapp/ndgl/feature/home/search/TemplateSearchScreen.kt index 9f4810e6..d947dac2 100644 --- a/feature/home/src/main/java/com/yapp/ndgl/feature/home/search/TemplateSearchScreen.kt +++ b/feature/home/src/main/java/com/yapp/ndgl/feature/home/search/TemplateSearchScreen.kt @@ -275,6 +275,7 @@ private fun TemplateSearchScreenFilledPreview() { travelId = 1, title = "곽준빈의 신혼여행", country = "FR", + countryName = "프랑스", city = "파리", nights = 7, days = 9, @@ -286,6 +287,7 @@ private fun TemplateSearchScreenFilledPreview() { travelId = 2, title = "스위스 여행", country = "CH", + countryName = "스위스", city = "스위스", nights = 5, days = 6, @@ -297,6 +299,7 @@ private fun TemplateSearchScreenFilledPreview() { travelId = 3, title = "충격적인 북유럽 물가", country = "DK", + countryName = "덴마크", city = "덴마크", nights = 4, days = 6, diff --git a/feature/home/src/main/java/com/yapp/ndgl/feature/home/search/TemplateSearchViewModel.kt b/feature/home/src/main/java/com/yapp/ndgl/feature/home/search/TemplateSearchViewModel.kt index 7af78aa7..4e5a7218 100644 --- a/feature/home/src/main/java/com/yapp/ndgl/feature/home/search/TemplateSearchViewModel.kt +++ b/feature/home/src/main/java/com/yapp/ndgl/feature/home/search/TemplateSearchViewModel.kt @@ -42,6 +42,7 @@ class TemplateSearchViewModel @Inject constructor( travelId = travel.id, title = travel.title, country = travel.country, + countryName = travel.countryName, city = travel.city, nights = travel.nights, days = travel.days, From 294e70977ddf9827bb909de4eb24d31fd0a16d49 Mon Sep 17 00:00:00 2001 From: Jihee Han Date: Fri, 27 Feb 2026 18:40:04 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[NDGL-123]=20fix:=20=EC=97=AC=ED=96=89=20?= =?UTF-8?q?=EC=B9=B4=EB=93=9C=20D-Day=20=ED=91=9C=EC=8B=9C=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EB=B0=8F=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EA=B2=BD=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 --- .../java/com/yapp/ndgl/feature/home/main/HomeViewModel.kt | 2 +- .../ndgl/feature/home/main/UpcomingTravelCardSection.kt | 8 ++++---- .../travelhelper/main/UpcomingTravelCardSection.kt | 4 ++-- .../ndgl/feature/travel/mytravel/MyTravelViewModel.kt | 2 +- .../feature/travel/mytravel/UpcomingTravelCardSection.kt | 4 ++-- .../feature/travel/mytravel/UpcomingTravelListSection.kt | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeViewModel.kt b/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeViewModel.kt index 1f760e91..50f7d033 100644 --- a/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeViewModel.kt +++ b/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeViewModel.kt @@ -71,7 +71,7 @@ class HomeViewModel @Inject constructor( travelId = travel.userTravelId, days = travel.days, title = travel.title, - imageUrl = travel.upcomingUserTravelPlace?.place?.thumbnail ?: "", + imageUrl = travel.thumbnail ?: "", dDay = dDay, startDate = travel.startDate, endDate = travel.endDate, diff --git a/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/UpcomingTravelCardSection.kt b/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/UpcomingTravelCardSection.kt index 84b7798f..6c0757e4 100644 --- a/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/UpcomingTravelCardSection.kt +++ b/feature/home/src/main/java/com/yapp/ndgl/feature/home/main/UpcomingTravelCardSection.kt @@ -178,19 +178,19 @@ private fun DayTag( modifier = modifier .background( color = NDGLTheme.colors.black100, - shape = RoundedCornerShape(999.dp), + shape = CircleShape, ) .padding(horizontal = 12.dp, vertical = 4.dp), contentAlignment = Alignment.Center, ) { Text( - text = if (dDay <= 0) { + text = if (dDay > 0) { stringResource(R.string.home_my_travel_card_d_day_minus, dDay) } else { stringResource(R.string.home_my_travel_card_d_day_plus, dDay) }, - style = NDGLTheme.typography.bodyMdMedium, color = NDGLTheme.colors.black400, + style = NDGLTheme.typography.bodyMdMedium, ) } } @@ -369,7 +369,7 @@ private fun UpcomingTravelCardPreview() { travelId = 1, days = 6, title = "도쿄 여행", - dDay = -7, + dDay = 7, startDate = LocalDate.of(2025, 2, 15), endDate = LocalDate.of(2025, 2, 20), imageUrl = "", diff --git a/feature/travel-helper/src/main/java/com/yapp/ndgl/feature/travelhelper/main/UpcomingTravelCardSection.kt b/feature/travel-helper/src/main/java/com/yapp/ndgl/feature/travelhelper/main/UpcomingTravelCardSection.kt index 6c760b37..883cd8d1 100644 --- a/feature/travel-helper/src/main/java/com/yapp/ndgl/feature/travelhelper/main/UpcomingTravelCardSection.kt +++ b/feature/travel-helper/src/main/java/com/yapp/ndgl/feature/travelhelper/main/UpcomingTravelCardSection.kt @@ -151,13 +151,13 @@ private fun DayTag( modifier = modifier .background( color = NDGLTheme.colors.black100, - shape = RoundedCornerShape(999.dp), + shape = CircleShape, ) .padding(horizontal = 12.dp, vertical = 4.dp), contentAlignment = Alignment.Center, ) { Text( - text = if (dDay <= 0) { + text = if (dDay > 0) { stringResource(R.string.travel_helper_card_d_day_minus, dDay) } else { stringResource(R.string.travel_helper_card_d_day_plus, dDay) diff --git a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/MyTravelViewModel.kt b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/MyTravelViewModel.kt index 29a9c7fc..c5872caf 100644 --- a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/MyTravelViewModel.kt +++ b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/MyTravelViewModel.kt @@ -60,7 +60,7 @@ class MyTravelViewModel @Inject constructor( title = travel.title, startDate = travel.startDate, endDate = travel.endDate, - imageUrl = travel.upcomingUserTravelPlace?.place?.thumbnail ?: "", + imageUrl = travel.thumbnail ?: "", dDay = dDay, ) } diff --git a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/UpcomingTravelCardSection.kt b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/UpcomingTravelCardSection.kt index 70924da7..653c232d 100644 --- a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/UpcomingTravelCardSection.kt +++ b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/UpcomingTravelCardSection.kt @@ -150,7 +150,7 @@ private fun DayTag( contentAlignment = Alignment.Center, ) { Text( - text = if (dDay <= 0) { + text = if (dDay > 0) { stringResource(R.string.my_travel_upcoming_travel_d_day_minus, dDay) } else { stringResource(R.string.my_travel_upcoming_travel_d_day_plus, dDay) @@ -324,7 +324,7 @@ private fun UpcomingTravelCardPreview() { title = "도쿄 여행", startDate = LocalDate.of(2025, 2, 15), endDate = LocalDate.of(2025, 2, 20), - dDay = -7, + dDay = 7, imageUrl = "", ), onTravelClick = { _, _ -> }, diff --git a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/UpcomingTravelListSection.kt b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/UpcomingTravelListSection.kt index def72e91..a70fdafd 100644 --- a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/UpcomingTravelListSection.kt +++ b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/UpcomingTravelListSection.kt @@ -143,7 +143,7 @@ private fun DayTag( modifier = modifier .background( color = NDGLTheme.colors.black100, - shape = RoundedCornerShape(999.dp), + shape = CircleShape, ) .padding(horizontal = 12.dp, vertical = 4.dp), contentAlignment = Alignment.Center,