Skip to content

Commit c7cc156

Browse files
committed
[NDGL-123] feat: TravelContent 및 관련 UI에 국가명(countryName) 필드 추가 및 적용
1 parent 3b96dca commit c7cc156

File tree

10 files changed

+17
-1
lines changed

10 files changed

+17
-1
lines changed

data/travel/src/main/java/com/yapp/ndgl/data/travel/model/TravelTemplateSummary.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ data class TravelTemplateSummary(
77
val id: Long,
88
val title: String,
99
val country: String,
10+
val countryName: String,
1011
val city: String,
1112
val nights: Int,
1213
val days: Int,

feature/home/src/main/java/com/yapp/ndgl/feature/home/component/TravelTemplate.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ internal fun TravelTemplate(
6161
style = NDGLTheme.typography.bodyLgMedium,
6262
)
6363
Text(
64-
text = travel.country,
64+
text = travel.countryName,
6565
color = NDGLTheme.colors.black400,
6666
style = NDGLTheme.typography.bodyMdMedium,
6767
)

feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeScreen.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ private fun HomeScreenPreview() {
166166
travelId = 1,
167167
title = "곽준빈의 신혼여행",
168168
country = "FR",
169+
countryName = "프랑스",
169170
city = "파리",
170171
nights = 7,
171172
days = 9,
@@ -177,6 +178,7 @@ private fun HomeScreenPreview() {
177178
travelId = 2,
178179
title = "스위스 여행",
179180
country = "CH",
181+
countryName = "스위스",
180182
city = "스위스",
181183
nights = 5,
182184
days = 6,
@@ -188,6 +190,7 @@ private fun HomeScreenPreview() {
188190
travelId = 3,
189191
title = "충격적인 북유럽 물가",
190192
country = "DK",
193+
countryName = "덴마크",
191194
city = "덴마크",
192195
nights = 4,
193196
days = 6,

feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeViewModel.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ class HomeViewModel @Inject constructor(
184184
travelId = id,
185185
title = title,
186186
country = country,
187+
countryName = countryName,
187188
city = city,
188189
nights = nights,
189190
days = days,

feature/home/src/main/java/com/yapp/ndgl/feature/home/main/PopularTravelSection.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ private fun PopularTravelSectionPreview() {
155155
travelId = 1,
156156
title = "곽준빈의 신혼여행",
157157
country = "FR",
158+
countryName = "프랑스",
158159
city = "파리",
159160
nights = 7,
160161
days = 9,
@@ -166,6 +167,7 @@ private fun PopularTravelSectionPreview() {
166167
travelId = 2,
167168
title = "스위스 여행",
168169
country = "CH",
170+
countryName = "스위스",
169171
city = "스위스",
170172
nights = 5,
171173
days = 6,
@@ -177,6 +179,7 @@ private fun PopularTravelSectionPreview() {
177179
travelId = 3,
178180
title = "충격적인 북유럽 물가",
179181
country = "DK",
182+
countryName = "덴마크",
180183
city = "덴마크",
181184
nights = 4,
182185
days = 6,

feature/home/src/main/java/com/yapp/ndgl/feature/home/main/RecommendedContentSection.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ private fun RecommendedContentSectionPreview() {
182182
travelId = 1,
183183
title = "곽준빈의 신혼여행",
184184
country = "FR",
185+
countryName = "프랑스",
185186
city = "파리",
186187
nights = 7,
187188
days = 9,
@@ -193,6 +194,7 @@ private fun RecommendedContentSectionPreview() {
193194
travelId = 2,
194195
title = "스위스 여행",
195196
country = "CH",
197+
countryName = "스위스",
196198
city = "스위스",
197199
nights = 5,
198200
days = 6,

feature/home/src/main/java/com/yapp/ndgl/feature/home/model/TravelContent.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ data class TravelContent(
88
val travelId: Long,
99
val title: String,
1010
val country: String,
11+
val countryName: String,
1112
val city: String,
1213
val nights: Int,
1314
val days: Int,

feature/home/src/main/java/com/yapp/ndgl/feature/home/popular/PopularTravelListViewModel.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ class PopularTravelListViewModel @Inject constructor(
9797
travelId = id,
9898
title = title,
9999
country = country,
100+
countryName = countryName,
100101
city = city,
101102
nights = nights,
102103
days = days,

feature/home/src/main/java/com/yapp/ndgl/feature/home/search/TemplateSearchScreen.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ private fun TemplateSearchScreenFilledPreview() {
275275
travelId = 1,
276276
title = "곽준빈의 신혼여행",
277277
country = "FR",
278+
countryName = "프랑스",
278279
city = "파리",
279280
nights = 7,
280281
days = 9,
@@ -286,6 +287,7 @@ private fun TemplateSearchScreenFilledPreview() {
286287
travelId = 2,
287288
title = "스위스 여행",
288289
country = "CH",
290+
countryName = "스위스",
289291
city = "스위스",
290292
nights = 5,
291293
days = 6,
@@ -297,6 +299,7 @@ private fun TemplateSearchScreenFilledPreview() {
297299
travelId = 3,
298300
title = "충격적인 북유럽 물가",
299301
country = "DK",
302+
countryName = "덴마크",
300303
city = "덴마크",
301304
nights = 4,
302305
days = 6,

feature/home/src/main/java/com/yapp/ndgl/feature/home/search/TemplateSearchViewModel.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class TemplateSearchViewModel @Inject constructor(
4242
travelId = travel.id,
4343
title = travel.title,
4444
country = travel.country,
45+
countryName = travel.countryName,
4546
city = travel.city,
4647
nights = travel.nights,
4748
days = travel.days,

0 commit comments

Comments
 (0)