Skip to content

[NDGL-123] 다가오는 여행 카드 디데이 및 썸네일 이슈 수정 #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jihee-dev merged 2 commits into from
Feb 27, 2026
Merged

[NDGL-123] 다가오는 여행 카드 디데이 및 썸네일 이슈 수정 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7cc156
[NDGL-123] feat: TravelContent 및 관련 UI에 국가명(countryName) 필드 추가 및 적용
jihee-dev Feb 27, 2026
294e709
[NDGL-123] fix: 여행 카드 D-Day 표시 로직 및 썸네일 이미지 경로 수정
jihee-dev Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/travel/src/main/java/com/yapp/ndgl/data/travel/model/TravelTemplateSummary.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/main/java/com/yapp/ndgl/feature/home/component/TravelTemplate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
3 changes: 3 additions & 0 deletions feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ private fun HomeScreenPreview() {
travelId = 1,
title = "곽준빈의 신혼여행",
country = "FR",
countryName = "프랑스",
city = "파리",
nights = 7,
days = 9,
Expand All @@ -177,6 +178,7 @@ private fun HomeScreenPreview() {
travelId = 2,
title = "스위스 여행",
country = "CH",
countryName = "스위스",
city = "스위스",
nights = 5,
days = 6,
Expand All @@ -188,6 +190,7 @@ private fun HomeScreenPreview() {
travelId = 3,
title = "충격적인 북유럽 물가",
country = "DK",
countryName = "덴마크",
city = "덴마크",
nights = 4,
days = 6,
Expand Down
3 changes: 2 additions & 1 deletion feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -184,6 +184,7 @@ class HomeViewModel @Inject constructor(
travelId = id,
title = title,
country = country,
countryName = countryName,
city = city,
nights = nights,
days = days,
Expand Down
3 changes: 3 additions & 0 deletions feature/home/src/main/java/com/yapp/ndgl/feature/home/main/PopularTravelSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ private fun PopularTravelSectionPreview() {
travelId = 1,
title = "곽준빈의 신혼여행",
country = "FR",
countryName = "프랑스",
city = "파리",
nights = 7,
days = 9,
Expand All @@ -166,6 +167,7 @@ private fun PopularTravelSectionPreview() {
travelId = 2,
title = "스위스 여행",
country = "CH",
countryName = "스위스",
city = "스위스",
nights = 5,
days = 6,
Expand All @@ -177,6 +179,7 @@ private fun PopularTravelSectionPreview() {
travelId = 3,
title = "충격적인 북유럽 물가",
country = "DK",
countryName = "덴마크",
city = "덴마크",
nights = 4,
days = 6,
Expand Down
2 changes: 2 additions & 0 deletions feature/home/src/main/java/com/yapp/ndgl/feature/home/main/RecommendedContentSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ private fun RecommendedContentSectionPreview() {
travelId = 1,
title = "곽준빈의 신혼여행",
country = "FR",
countryName = "프랑스",
city = "파리",
nights = 7,
days = 9,
Expand All @@ -193,6 +194,7 @@ private fun RecommendedContentSectionPreview() {
travelId = 2,
title = "스위스 여행",
country = "CH",
countryName = "스위스",
city = "스위스",
nights = 5,
days = 6,
Expand Down
8 changes: 4 additions & 4 deletions feature/home/src/main/java/com/yapp/ndgl/feature/home/main/UpcomingTravelCardSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
}
}
Expand Down Expand Up @@ -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 = "",
Expand Down
1 change: 1 addition & 0 deletions feature/home/src/main/java/com/yapp/ndgl/feature/home/model/TravelContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions feature/home/src/main/java/com/yapp/ndgl/feature/home/popular/PopularTravelListViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ class PopularTravelListViewModel @Inject constructor(
travelId = id,
title = title,
country = country,
countryName = countryName,
city = city,
nights = nights,
days = days,
Expand Down
3 changes: 3 additions & 0 deletions feature/home/src/main/java/com/yapp/ndgl/feature/home/search/TemplateSearchScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ private fun TemplateSearchScreenFilledPreview() {
travelId = 1,
title = "곽준빈의 신혼여행",
country = "FR",
countryName = "프랑스",
city = "파리",
nights = 7,
days = 9,
Expand All @@ -286,6 +287,7 @@ private fun TemplateSearchScreenFilledPreview() {
travelId = 2,
title = "스위스 여행",
country = "CH",
countryName = "스위스",
city = "스위스",
nights = 5,
days = 6,
Expand All @@ -297,6 +299,7 @@ private fun TemplateSearchScreenFilledPreview() {
travelId = 3,
title = "충격적인 북유럽 물가",
country = "DK",
countryName = "덴마크",
city = "덴마크",
nights = 4,
days = 6,
Expand Down
1 change: 1 addition & 0 deletions feature/home/src/main/java/com/yapp/ndgl/feature/home/search/TemplateSearchViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions ...helper/src/main/java/com/yapp/ndgl/feature/travelhelper/main/UpcomingTravelCardSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion feature/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/MyTravelViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
}
Expand Down
4 changes: 2 additions & 2 deletions ...e/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/UpcomingTravelCardSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 = { _, _ -> },
Expand Down
2 changes: 1 addition & 1 deletion ...e/travel/src/main/java/com/yapp/ndgl/feature/travel/mytravel/UpcomingTravelListSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down