Merge remote-tracking branch 'origin/develop' into release

Author: jihee-dev

core/ui/src/main/java/com/yapp/ndgl/core/ui/CommonErrorView.kt

@@ -0,0 +1,67 @@
+package com.yapp.ndgl.core.ui
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.yapp.ndgl.core.ui.theme.NDGLTheme
+
+@Composable
+fun CommonErrorView(
+    modifier: Modifier = Modifier,
+    title: String? = null,
+    description: String? = null,
+) {
+    Column(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 24.dp, vertical = 165.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Image(
+            painter = painterResource(R.drawable.img_empty_browser),
+            contentDescription = null,
+            modifier = Modifier.size(100.dp),
+        )
+        Column(
+            modifier = Modifier.fillMaxWidth(),
+            verticalArrangement = Arrangement.spacedBy(4.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Text(
+                text = title ?: stringResource(R.string.common_error_title),
+                color = NDGLTheme.colors.black500,
+                textAlign = TextAlign.Center,
+                style = NDGLTheme.typography.subtitleMdSemiBold,
+            )
+            Text(
+                text = description ?: stringResource(R.string.common_error_description),
+                color = NDGLTheme.colors.black400,
+                textAlign = TextAlign.Center,
+                style = NDGLTheme.typography.bodyLgRegular,
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun CommonErrorViewPreview() {
+    NDGLTheme {
+        CommonErrorView(
+            modifier = Modifier,
+        )
+    }
+}

core/ui/src/main/java/com/yapp/ndgl/core/ui/designsystem/NDGLChipTab.kt

@@ -4,13 +4,14 @@ import androidx.annotation.DrawableRes
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
@@ -45,14 +46,17 @@ fun NDGLChipTab(
     selectedIndex: Int,
     onTabSelected: (Int) -> Unit,
     modifier: Modifier = Modifier,
+    contentPadding: PaddingValues = PaddingValues(0.dp),
 ) {
-    val scrollState = rememberScrollState()
-
-    Row(
-        modifier = modifier.horizontalScroll(scrollState),
+    LazyRow(
+        modifier = modifier,
         horizontalArrangement = Arrangement.spacedBy(8.dp),
+        contentPadding = contentPadding,
     ) {
-        tabs.forEachIndexed { index, tab ->
+        itemsIndexed(
+            items = tabs,
+            key = { index, tab -> "${index}_${tab.tag}" },
+        ) { index, tab ->
             NDGLChipTabItem(
                 isSelected = index == selectedIndex,
                 name = tab.name,

core/ui/src/main/res/drawable/ic_24_change.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6.53,16.47C6.388,16.337 6.2,16.265 6.005,16.269C5.811,16.272 5.626,16.351 5.488,16.488C5.351,16.626 5.272,16.811 5.269,17.005C5.265,17.2 5.337,17.388 5.47,17.53L7.47,19.53C7.61,19.67 7.801,19.749 8,19.749C8.199,19.749 8.389,19.67 8.53,19.53L10.53,17.53C10.604,17.461 10.663,17.378 10.704,17.287C10.745,17.194 10.767,17.095 10.768,16.994C10.77,16.894 10.752,16.794 10.714,16.7C10.676,16.607 10.62,16.522 10.549,16.451C10.478,16.38 10.393,16.323 10.299,16.286C10.206,16.248 10.106,16.23 10.005,16.231C9.905,16.233 9.805,16.255 9.713,16.296C9.621,16.337 9.539,16.396 9.47,16.47L8.75,17.19V7C8.75,6.801 8.671,6.61 8.53,6.47C8.39,6.329 8.199,6.25 8,6.25C7.801,6.25 7.61,6.329 7.47,6.47C7.329,6.61 7.25,6.801 7.25,7V17.19L6.53,16.47ZM13.47,7.53C13.611,7.67 13.801,7.749 14,7.749C14.199,7.749 14.389,7.67 14.53,7.53L15.25,6.81V17C15.25,17.199 15.329,17.39 15.469,17.53C15.61,17.671 15.801,17.75 16,17.75C16.199,17.75 16.389,17.671 16.53,17.53C16.671,17.39 16.75,17.199 16.75,17V6.81L17.47,7.53C17.538,7.604 17.621,7.663 17.713,7.704C17.805,7.745 17.905,7.767 18.005,7.769C18.106,7.77 18.206,7.752 18.299,7.714C18.393,7.676 18.478,7.62 18.549,7.549C18.62,7.478 18.676,7.393 18.714,7.3C18.752,7.206 18.77,7.106 18.768,7.005C18.767,6.905 18.745,6.805 18.704,6.713C18.663,6.621 18.604,6.539 18.53,6.47L16.53,4.47C16.389,4.329 16.199,4.251 16,4.251C15.801,4.251 15.611,4.329 15.47,4.47L13.47,6.47C13.329,6.611 13.25,6.801 13.25,7C13.25,7.199 13.329,7.389 13.47,7.53Z"
+      android:fillColor="#000000"/>
+</vector>

core/ui/src/main/res/values/strings.xml

@@ -15,6 +15,9 @@
     <string name="common_dot_separator">•</string>
     <string name="common_retry">다시 시도</string>
     <string name="common_all">전체</string>
+    <string name="common_err_unknown">알 수 없는 오류입니다</string>
+    <string name="common_error_title">정보를 불러올 수 없어요</string>
+    <string name="common_error_description">인터넷 연결 확인 후 다시 시도해 주세요</string>
 
     <!-- User Guide Modal -->
     <string name="user_guide_modal_title">서비스 이용 전\n반드시 확인해주세요.</string>

data/auth/src/main/java/com/yapp/ndgl/data/auth/local/LocalAuthDataSource.kt

@@ -45,15 +45,28 @@ class LocalAuthDataSource @Inject constructor(
         }
     }
 
+    suspend fun getNickname(): String = dataStore.data
+        .handleException()
+        .map { preferences -> preferences[NICKNAME_KEY] ?: "" }
+        .first()
+
+    suspend fun setNickname(nickname: String) {
+        dataStore.edit { preferences ->
+            preferences[NICKNAME_KEY] = nickname
+        }
+    }
+
     suspend fun clearSession() {
         dataStore.edit { preferences ->
             preferences.remove(ACCESS_TOKEN_KEY)
             preferences.remove(UUID_KEY)
+            preferences.remove(NICKNAME_KEY)
         }
     }
 
     private companion object {
         private val ACCESS_TOKEN_KEY = stringPreferencesKey("access_token")
         private val UUID_KEY = stringPreferencesKey("uuid")
+        private val NICKNAME_KEY = stringPreferencesKey("nickname")
     }
 }

data/auth/src/main/java/com/yapp/ndgl/data/auth/repository/AuthRepository.kt

@@ -39,6 +39,7 @@ class AuthRepository @Inject constructor(
 
         localAuthDataSource.setAccessToken(response.accessToken)
         localAuthDataSource.setUuid(response.uuid)
+        localAuthDataSource.setNickname(response.nickname)
         return isFirstUser
     }
 
@@ -66,5 +67,7 @@ class AuthRepository @Inject constructor(
         }
     }
 
+    suspend fun getNickname(): String = localAuthDataSource.getNickname()
+
     suspend fun getIdentifierCode(): String = localAuthDataSource.getUuid()
 }

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,

data/travel/src/main/java/com/yapp/ndgl/data/travel/repository/TravelTemplateRepository.kt

@@ -18,13 +18,14 @@ import javax.inject.Singleton
 class TravelTemplateRepository @Inject constructor(
     private val travelTemplateApi: TravelTemplateApi,
 ) {
-    suspend fun getAllPopularTravelTemplates(): PopularTravelTemplates {
-        return travelTemplateApi.getPopularTravelTemplates().getData()
+    suspend fun getAllPopularTravelTemplates(page: Int = 0): PopularTravelTemplates {
+        return travelTemplateApi.getPopularTravelTemplates(page = page).getData()
     }
 
-    suspend fun getPopularTravelTemplates(travelProgramId: Long): PopularTravelTemplates {
+    suspend fun getPopularTravelTemplates(travelProgramId: Long, page: Int = 0): PopularTravelTemplates {
         return travelTemplateApi.getPopularTravelTemplates(
             travelProgramId = travelProgramId,
+            page = page,
         ).getData()
     }
 

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,
                 )

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,