Merge pull request #116 from YAPP-Github/BOOK-225-feature/#111

feat: OCR, 홈, 로그인, 온보딩 등 그래픽 추가 및 실시간 변경사항 적용

Author: seoyoon513

core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/AuthRepository.kt

@@ -10,7 +10,5 @@ interface AuthRepository {
 
     suspend fun withdraw(): Result<Unit>
 
-    suspend fun agreeTerms(termsAgreed: Boolean): Result<Unit>
-
     val autoLoginState: Flow<AutoLoginState>
 }

core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/UserRepository.kt

@@ -5,6 +5,8 @@ import com.ninecraft.booket.core.model.UserProfileModel
 import kotlinx.coroutines.flow.Flow
 
 interface UserRepository {
+    suspend fun agreeTerms(termsAgreed: Boolean): Result<Unit>
+
     suspend fun getUserProfile(): Result<UserProfileModel>
 
     val onboardingState: Flow<OnboardingState>

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultAuthRepository.kt

@@ -5,7 +5,6 @@ import com.ninecraft.booket.core.data.api.repository.AuthRepository
 import com.ninecraft.booket.core.datastore.api.datasource.TokenDataSource
 import com.ninecraft.booket.core.model.AutoLoginState
 import com.ninecraft.booket.core.network.request.LoginRequest
-import com.ninecraft.booket.core.network.request.TermsAgreementRequest
 import com.ninecraft.booket.core.network.service.ReedService
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
@@ -36,11 +35,6 @@ internal class DefaultAuthRepository @Inject constructor(
         clearTokens()
     }
 
-    override suspend fun agreeTerms(termsAgreed: Boolean) = runSuspendCatching {
-        service.agreeTerms(TermsAgreementRequest(termsAgreed))
-        Unit
-    }
-
     private suspend fun saveTokens(accessToken: String, refreshToken: String) {
         tokenDataSource.apply {
             setAccessToken(accessToken)

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultUserRepository.kt

@@ -4,13 +4,19 @@ import com.ninecraft.booket.core.common.utils.runSuspendCatching
 import com.ninecraft.booket.core.data.api.repository.UserRepository
 import com.ninecraft.booket.core.data.impl.mapper.toModel
 import com.ninecraft.booket.core.datastore.api.datasource.OnboardingDataSource
+import com.ninecraft.booket.core.network.request.TermsAgreementRequest
 import com.ninecraft.booket.core.network.service.ReedService
 import javax.inject.Inject
 
 internal class DefaultUserRepository @Inject constructor(
     private val service: ReedService,
     private val onboardingDataSource: OnboardingDataSource,
 ) : UserRepository {
+    override suspend fun agreeTerms(termsAgreed: Boolean) = runSuspendCatching {
+        service.agreeTerms(TermsAgreementRequest(termsAgreed))
+        Unit
+    }
+
     override suspend fun getUserProfile() = runSuspendCatching {
         service.getUserProfile().toModel()
     }

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/EmotionTag.kt

@@ -5,14 +5,14 @@ import com.ninecraft.booket.core.designsystem.theme.JoyBgColor
 import com.ninecraft.booket.core.designsystem.theme.JoyTextColor
 import com.ninecraft.booket.core.designsystem.theme.SadnessBgColor
 import com.ninecraft.booket.core.designsystem.theme.SadnessTextColor
-import com.ninecraft.booket.core.designsystem.theme.TensionBgColor
-import com.ninecraft.booket.core.designsystem.theme.TensionTextColor
+import com.ninecraft.booket.core.designsystem.theme.InsightBgColor
+import com.ninecraft.booket.core.designsystem.theme.InsightTextColor
 import com.ninecraft.booket.core.designsystem.theme.WarmthBgColor
 import com.ninecraft.booket.core.designsystem.theme.WarmthTextColor
 
 enum class EmotionTag(val label: String, val bgColor: Color, val textColor: Color, val graphic: Int) {
     WARMTH("따뜻함", WarmthBgColor, WarmthTextColor, R.drawable.img_emotion_warmth),
     JOY("즐거움", JoyBgColor, JoyTextColor, R.drawable.img_emotion_joy),
-    TENSION("긴장감", TensionBgColor, TensionTextColor, R.drawable.img_emotion_tension),
     SADNESS("슬픔", SadnessBgColor, SadnessTextColor, R.drawable.img_emotion_sadness),
+    INSIGHT("깨달음", InsightBgColor, InsightTextColor, R.drawable.img_emotion_insight),
 }

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button/ReedButton.kt

@@ -23,6 +23,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.unit.dp
@@ -78,7 +79,10 @@ fun ReedButton(
         interactionSource = interactionSource,
     ) {
         if (leadingIcon != null) {
-            Box(Modifier.size(sizeStyle.iconSize)) {
+            Box(
+                modifier = Modifier.size(sizeStyle.iconSize),
+                contentAlignment = Alignment.Center,
+            ) {
                 leadingIcon()
             }
         }
@@ -99,7 +103,10 @@ fun ReedButton(
         }
 
         if (trailingIcon != null) {
-            Box(Modifier.size(sizeStyle.iconSize)) {
+            Box(
+                modifier = Modifier.size(sizeStyle.iconSize),
+                contentAlignment = Alignment.Center,
+            ) {
                 trailingIcon()
             }
         }

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/theme/Color.kt

@@ -72,8 +72,8 @@ val WarmthTextColor = Color(0xFFE3931B)
 val WarmthBgColor = Color(0xFFFFF5D3)
 val JoyTextColor = Color(0xFFEE6B33)
 val JoyBgColor = Color(0xFFFFEBE3)
-val TensionTextColor = Color(0xFF9A55E4)
-val TensionBgColor = Color(0xFFF3E8FF)
+val InsightTextColor = Color(0xFF9A55E4)
+val InsightBgColor = Color(0xFFF3E8FF)
 val SadnessTextColor = Color(0xFF2872E9)
 val SadnessBgColor = Color(0xFFE1ECFF)