Merge pull request #40 from YAPP-Github/feature/NDGL-123/fix-upcoming-travel-card-issue

jihee-dev · web-flow · commit 685d988d8f21 · 2026-02-28T00:27:05.000+09:00
[NDGL-123] 다가오는 여행 카드 디데이 및 썸네일 이슈 수정
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
@@ -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
@@ -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
@@ -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
@@ -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,
@@ -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
@@ -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
@@ -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/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/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
@@ -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
@@ -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
@@ -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,
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
@@ -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
@@ -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
@@ -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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ internal fun TravelTemplate(`
`61`	`61`	`style = NDGLTheme.typography.bodyLgMedium,`
`62`	`62`	`)`
`63`	`63`	`Text(`
`64`		`- text = travel.country,`
	`64`	`+ text = travel.countryName,`
`65`	`65`	`color = NDGLTheme.colors.black400,`
`66`	`66`	`style = NDGLTheme.typography.bodyMdMedium,`
`67`	`67`	`)`