[NDGL-123] fix: 여행 카드 D-Day 표시 로직 및 썸네일 이미지 경로 수정

jihee-dev · jihee-dev · commit b5d584faf0e6 · 2026-02-27T18:40:35.000+09:00
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,
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,
         )
     }
 }
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
`@@ -178,19 +178,19 @@ private fun DayTag(`
`178`	`178`	`modifier = modifier`
`179`	`179`	`.background(`
`180`	`180`	`color = NDGLTheme.colors.black100,`
`181`		`- shape = RoundedCornerShape(999.dp),`
	`181`	`+ shape = CircleShape,`
`182`	`182`	`)`
`183`	`183`	`.padding(horizontal = 12.dp, vertical = 4.dp),`
`184`	`184`	`contentAlignment = Alignment.Center,`
`185`	`185`	`) {`
`186`	`186`	`Text(`
`187`		`- text = if (dDay <= 0) {`
	`187`	`+ text = if (dDay > 0) {`
`188`	`188`	`stringResource(R.string.home_my_travel_card_d_day_minus, dDay)`
`189`	`189`	`} else {`
`190`	`190`	`stringResource(R.string.home_my_travel_card_d_day_plus, dDay)`
`191`	`191`	`},`
`192`		`- style = NDGLTheme.typography.bodyMdMedium,`
`193`	`192`	`color = NDGLTheme.colors.black400,`
	`193`	`+ style = NDGLTheme.typography.bodyMdMedium,`
`194`	`194`	`)`
`195`	`195`	`}`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class MyTravelViewModel @Inject constructor(`
`60`	`60`	`title = travel.title,`
`61`	`61`	`startDate = travel.startDate,`
`62`	`62`	`endDate = travel.endDate,`
`63`		`- imageUrl = travel.upcomingUserTravelPlace?.place?.thumbnail ?: "",`
	`63`	`+ imageUrl = travel.thumbnail ?: "",`
`64`	`64`	`dDay = dDay,`
`65`	`65`	`)`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ private fun DayTag(`
`143`	`143`	`modifier = modifier`
`144`	`144`	`.background(`
`145`	`145`	`color = NDGLTheme.colors.black100,`
`146`		`- shape = RoundedCornerShape(999.dp),`
	`146`	`+ shape = CircleShape,`
`147`	`147`	`)`
`148`	`148`	`.padding(horizontal = 12.dp, vertical = 4.dp),`
`149`	`149`	`contentAlignment = Alignment.Center,`