Merge pull request #214 from YAPP-Github/BOOK-417-fix/#213

easyhooon · web-flow · commit a41d39c89b7c · 2025-11-05T15:03:22.000+09:00
fix: 감정별 배경/텍스트 색상 매칭 수정
diff --git a/core/common/src/main/kotlin/com/ninecraft/booket/core/common/extensions/Emotion.kt b/core/common/src/main/kotlin/com/ninecraft/booket/core/common/extensions/Emotion.kt
diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
@@ -12,6 +12,7 @@ android {
 dependencies {
     implementations(
         projects.core.common,
+        projects.core.model,
 
         libs.androidx.splash,
 
diff --git a/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/Emotion.kt b/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/Emotion.kt
@@ -0,0 +1,36 @@
+package com.ninecraft.booket.core.designsystem
+
+import androidx.compose.ui.graphics.Color
+import com.ninecraft.booket.core.designsystem.theme.InsightBgColor
+import com.ninecraft.booket.core.designsystem.theme.InsightTextColor
+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.WarmthBgColor
+import com.ninecraft.booket.core.designsystem.theme.WarmthTextColor
+import com.ninecraft.booket.core.model.Emotion
+
+val Emotion.bgColor: Color
+    get() = when (this) {
+        Emotion.WARM -> WarmthBgColor
+        Emotion.JOY -> JoyBgColor
+        Emotion.SAD -> SadnessBgColor
+        Emotion.INSIGHT -> InsightBgColor
+    }
+
+val Emotion.textColor: Color
+    get() = when (this) {
+        Emotion.WARM -> WarmthTextColor
+        Emotion.JOY -> JoyTextColor
+        Emotion.SAD -> SadnessTextColor
+        Emotion.INSIGHT -> InsightTextColor
+    }
+
+val Emotion.graphicRes: Int
+    get() = when (this) {
+        Emotion.WARM -> R.drawable.img_emotion_warmth
+        Emotion.JOY -> R.drawable.img_emotion_joy
+        Emotion.SAD -> R.drawable.img_emotion_sadness
+        Emotion.INSIGHT -> R.drawable.img_emotion_insight
+    }
diff --git a/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/EmotionTag.kt b/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/EmotionTag.kt
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailPresenter.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailPresenter.kt
@@ -306,7 +306,7 @@ class BookDetailPresenter @AssistedInject constructor(
                         RecordCardScreen(
                             quote = selectedRecordInfo.quote,
                             bookTitle = selectedRecordInfo.bookTitle,
-                            emotionTag = selectedRecordInfo.emotionTags[0],
+                            emotion = selectedRecordInfo.emotionTags[0],
                         ),
                     )
                 }
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/SeedItem.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/SeedItem.kt
@@ -16,9 +16,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import com.ninecraft.booket.core.common.extensions.toBackgroundColor
-import com.ninecraft.booket.core.common.extensions.toTextColor
 import com.ninecraft.booket.core.designsystem.ComponentPreview
+import com.ninecraft.booket.core.designsystem.bgColor
+import com.ninecraft.booket.core.designsystem.textColor
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
 import com.ninecraft.booket.core.model.Emotion
 import com.ninecraft.booket.core.model.EmotionModel
@@ -42,7 +42,7 @@ internal fun SeedItem(
         Box(
             modifier = Modifier
                 .clip(RoundedCornerShape(ReedTheme.radius.full))
-                .background(emotion.name.toBackgroundColor())
+                .background(emotion.name.bgColor)
                 .padding(
                     horizontal = ReedTheme.spacing.spacing2,
                     vertical = ReedTheme.spacing.spacing1,
@@ -51,7 +51,7 @@ internal fun SeedItem(
         ) {
             Text(
                 text = emotion.name.displayName,
-                color = emotion.name.toTextColor(),
+                color = emotion.name.textColor,
                 style = ReedTheme.typography.label2SemiBold,
             )
         }
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/card/RecordCardPresenter.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/card/RecordCardPresenter.kt
@@ -74,7 +74,7 @@ class RecordCardPresenter @AssistedInject constructor(
             isLoading = isLoading,
             quote = screen.quote,
             bookTitle = screen.bookTitle,
-            emotionTag = screen.emotionTag,
+            emotion = screen.emotion,
             isCapturing = isCapturing,
             isSharing = isSharing,
             sideEffect = sideEffect,
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/card/RecordCardUi.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/card/RecordCardUi.kt
@@ -83,7 +83,7 @@ internal fun RecordCardUi(
                 RecordCard(
                     quote = state.quote,
                     bookTitle = state.bookTitle,
-                    emotionTag = state.emotionTag,
+                    emotion = state.emotion,
                     modifier = Modifier
                         .padding(top = ReedTheme.spacing.spacing5)
                         .clip(RoundedCornerShape(ReedTheme.radius.md))
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/card/RecordCardUiState.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/card/RecordCardUiState.kt
@@ -11,7 +11,7 @@ data class RecordCardUiState(
     val quote: String = "",
     val bookTitle: String = "",
     val author: String = "",
-    val emotionTag: String = "",
+    val emotion: String = "",
     val isCapturing: Boolean = false,
     val isSharing: Boolean = false,
     val sideEffect: RecordCardSideEffect? = null,
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/card/component/RecordCard.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/card/component/RecordCard.kt
@@ -19,20 +19,20 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.sp
 import com.ninecraft.booket.core.designsystem.ComponentPreview
-import com.ninecraft.booket.core.designsystem.EmotionTag
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
+import com.ninecraft.booket.core.model.Emotion
 import com.ninecraft.booket.feature.detail.R
 
 @Composable
 internal fun RecordCard(
     quote: String,
     bookTitle: String,
-    emotionTag: String,
+    emotion: String,
     modifier: Modifier = Modifier,
 ) {
     Box(modifier = modifier.fillMaxWidth()) {
         Image(
-            painter = painterResource(getEmotionCardImage(emotionTag)),
+            painter = painterResource(getEmotionCardImage(emotion)),
             contentDescription = "Record Card Image",
             modifier = Modifier.fillMaxSize(),
             contentScale = ContentScale.Crop,
@@ -74,12 +74,12 @@ internal fun RecordCard(
     }
 }
 
-private fun getEmotionCardImage(emotionTag: String): Int {
-    return when (emotionTag) {
-        EmotionTag.WARMTH.label -> R.drawable.img_record_card_warm
-        EmotionTag.JOY.label -> R.drawable.img_record_card_joy
-        EmotionTag.SADNESS.label -> R.drawable.img_record_card_sad
-        EmotionTag.INSIGHT.label -> R.drawable.img_record_card_insight
+private fun getEmotionCardImage(emotion: String): Int {
+    return when (emotion) {
+        Emotion.WARM.displayName -> R.drawable.img_record_card_warm
+        Emotion.JOY.displayName -> R.drawable.img_record_card_joy
+        Emotion.SAD.displayName -> R.drawable.img_record_card_sad
+        Emotion.INSIGHT.displayName -> R.drawable.img_record_card_insight
         else -> R.drawable.img_record_card_warm
     }
 }
@@ -91,7 +91,7 @@ private fun RecordCardPreview() {
         RecordCard(
             quote = "이 세상에 집이라 이름 붙일 수 없는 것이 있다면 그건 바로 여기, 내가 앉아 있는 이곳일 것이다.",
             bookTitle = "샤이닝",
-            emotionTag = EmotionTag.WARMTH.label,
+            emotion = Emotion.WARM.displayName,
         )
     }
 }
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/record/RecordDetailPresenter.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/record/RecordDetailPresenter.kt
@@ -127,7 +127,7 @@ class RecordDetailPresenter @AssistedInject constructor(
                         RecordCardScreen(
                             quote = recordDetailInfo.quote,
                             bookTitle = recordDetailInfo.bookTitle,
-                            emotionTag = recordDetailInfo.emotionTags[0],
+                            emotion = recordDetailInfo.emotionTags[0],
                         ),
                     )
                 }
diff --git a/feature/edit/src/main/kotlin/com/ninecraft/booket/feature/edit/emotion/EmotionEditPresenter.kt b/feature/edit/src/main/kotlin/com/ninecraft/booket/feature/edit/emotion/EmotionEditPresenter.kt
@@ -6,7 +6,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import com.ninecraft.booket.core.designsystem.EmotionTag
+import com.ninecraft.booket.core.model.Emotion
 import com.ninecraft.booket.feature.screens.EmotionEditScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.retained.rememberRetained
@@ -25,7 +25,7 @@ class EmotionEditPresenter @AssistedInject constructor(
     @Composable
     override fun present(): EmotionEditUiState {
         var selectedEmotion by rememberRetained { mutableStateOf(screen.emotion) }
-        val emotionTags by rememberRetained { mutableStateOf(EmotionTag.entries.toPersistentList()) }
+        val emotions by rememberRetained { mutableStateOf(Emotion.entries.toPersistentList()) }
         val isEditButtonEnabled by remember {
             derivedStateOf {
                 selectedEmotion != screen.emotion
@@ -50,7 +50,7 @@ class EmotionEditPresenter @AssistedInject constructor(
 
         return EmotionEditUiState(
             selectedEmotion = selectedEmotion,
-            emotionTags = emotionTags,
+            emotions = emotions,
             isEditButtonEnabled = isEditButtonEnabled,
             eventSink = ::handleEvent,
         )
diff --git a/feature/edit/src/main/kotlin/com/ninecraft/booket/feature/edit/emotion/EmotionEditUi.kt b/feature/edit/src/main/kotlin/com/ninecraft/booket/feature/edit/emotion/EmotionEditUi.kt
@@ -26,12 +26,13 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.common.extensions.clickableSingle
 import com.ninecraft.booket.core.designsystem.ComponentPreview
-import com.ninecraft.booket.core.designsystem.EmotionTag
 import com.ninecraft.booket.core.designsystem.component.button.ReedButton
 import com.ninecraft.booket.core.designsystem.component.button.ReedButtonColorStyle
 import com.ninecraft.booket.core.designsystem.component.button.largeButtonStyle
+import com.ninecraft.booket.core.designsystem.graphicRes
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
 import com.ninecraft.booket.core.designsystem.theme.White
+import com.ninecraft.booket.core.model.Emotion
 import com.ninecraft.booket.core.ui.ReedScaffold
 import com.ninecraft.booket.core.ui.component.ReedBackTopAppBar
 import com.ninecraft.booket.feature.edit.R
@@ -100,13 +101,13 @@ private fun EmotionEditContent(
             verticalArrangement = Arrangement.spacedBy(ReedTheme.spacing.spacing3),
             horizontalArrangement = Arrangement.spacedBy(ReedTheme.spacing.spacing3),
             content = {
-                items(state.emotionTags) { tag ->
+                items(state.emotions) { tag ->
                     EmotionItem(
-                        emotionTag = tag,
+                        emotion = tag,
                         onClick = {
-                            state.eventSink(EmotionEditUiEvent.OnSelectEmotion(tag.label))
+                            state.eventSink(EmotionEditUiEvent.OnSelectEmotion(tag.displayName))
                         },
-                        isSelected = state.selectedEmotion == tag.label,
+                        isSelected = state.selectedEmotion == tag.displayName,
                         modifier = Modifier.fillMaxWidth(),
                     )
                 }
@@ -129,7 +130,7 @@ private fun EmotionEditContent(
 
 @Composable
 private fun EmotionItem(
-    emotionTag: EmotionTag,
+    emotion: Emotion,
     onClick: () -> Unit,
     isSelected: Boolean,
     modifier: Modifier = Modifier,
@@ -156,7 +157,7 @@ private fun EmotionItem(
         contentAlignment = Alignment.Center,
     ) {
         Image(
-            painter = painterResource(emotionTag.graphic),
+            painter = painterResource(emotion.graphicRes),
             contentDescription = "Emotion Image",
             modifier = Modifier.fillMaxSize(),
             contentScale = ContentScale.Crop,
@@ -168,11 +169,11 @@ private fun EmotionItem(
 @Composable
 private fun EmotionEditUiPreview() {
     ReedTheme {
-        val emotionTags = EmotionTag.entries.toPersistentList()
+        val emotions = Emotion.entries.toPersistentList()
 
         EmotionEditUi(
             state = EmotionEditUiState(
-                emotionTags = emotionTags,
+                emotions = emotions,
                 eventSink = {},
             ),
         )
diff --git a/feature/edit/src/main/kotlin/com/ninecraft/booket/feature/edit/emotion/EmotionEditUiState.kt b/feature/edit/src/main/kotlin/com/ninecraft/booket/feature/edit/emotion/EmotionEditUiState.kt
@@ -1,6 +1,6 @@
 package com.ninecraft.booket.feature.edit.emotion
 
-import com.ninecraft.booket.core.designsystem.EmotionTag
+import com.ninecraft.booket.core.model.Emotion
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import kotlinx.collections.immutable.ImmutableList
@@ -9,7 +9,7 @@ import kotlinx.collections.immutable.persistentListOf
 data class EmotionEditUiState(
     val selectedEmotion: String = "",
     val isEditButtonEnabled: Boolean = false,
-    val emotionTags: ImmutableList<EmotionTag> = persistentListOf(),
+    val emotions: ImmutableList<Emotion> = persistentListOf(),
     val eventSink: (EmotionEditUiEvent) -> Unit,
 ) : CircuitUiState
 
diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/register/RecordRegisterPresenter.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/register/RecordRegisterPresenter.kt
@@ -13,8 +13,8 @@ import androidx.compose.ui.text.TextRange
 import com.ninecraft.booket.core.common.analytics.AnalyticsHelper
 import com.ninecraft.booket.core.common.utils.handleException
 import com.ninecraft.booket.core.data.api.repository.RecordRepository
-import com.ninecraft.booket.core.designsystem.EmotionTag
 import com.ninecraft.booket.core.designsystem.RecordStep
+import com.ninecraft.booket.core.model.Emotion
 import com.ninecraft.booket.feature.screens.LoginScreen
 import com.ninecraft.booket.feature.screens.OcrScreen
 import com.ninecraft.booket.feature.screens.RecordDetailScreen
@@ -73,8 +73,8 @@ class RecordRegisterPresenter @AssistedInject constructor(
                 ).toPersistentList(),
             )
         }
-        val emotionTags by rememberRetained { mutableStateOf(EmotionTag.entries.toPersistentList()) }
-        var selectedEmotion by rememberRetained { mutableStateOf<EmotionTag?>(null) }
+        val emotions by rememberRetained { mutableStateOf(Emotion.entries.toPersistentList()) }
+        var selectedEmotion by rememberRetained { mutableStateOf<Emotion?>(null) }
         var selectedImpressionGuide by rememberRetained { mutableStateOf("") }
         var beforeSelectedImpressionGuide by rememberRetained { mutableStateOf(selectedImpressionGuide) }
         val impressionState = rememberTextFieldState()
@@ -254,7 +254,7 @@ class RecordRegisterPresenter @AssistedInject constructor(
                                 userBookId = screen.userBookId,
                                 pageNumber = recordPageState.text.toString().toIntOrNull() ?: 0,
                                 quote = recordSentenceState.text.toString(),
-                                emotionTags = selectedEmotion?.let { listOf(it.label) } ?: emptyList(),
+                                emotionTags = selectedEmotion?.let { listOf(it.displayName) } ?: emptyList(),
                                 impression = impressionState.text.toString(),
                             )
                         }
@@ -292,7 +292,7 @@ class RecordRegisterPresenter @AssistedInject constructor(
             recordPageState = recordPageState,
             recordSentenceState = recordSentenceState,
             isPageError = isPageError,
-            emotionTags = emotionTags,
+            emotions = emotions,
             selectedEmotion = selectedEmotion,
             impressionState = impressionState,
             impressionGuideList = impressionGuideList,
diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/register/RecordRegisterUiState.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/register/RecordRegisterUiState.kt
@@ -2,8 +2,8 @@ package com.ninecraft.booket.feature.record.register
 
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.runtime.Immutable
-import com.ninecraft.booket.core.designsystem.EmotionTag
 import com.ninecraft.booket.core.designsystem.RecordStep
+import com.ninecraft.booket.core.model.Emotion
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import kotlinx.collections.immutable.ImmutableList
@@ -16,8 +16,8 @@ data class RecordRegisterUiState(
     val recordPageState: TextFieldState = TextFieldState(),
     val recordSentenceState: TextFieldState = TextFieldState(),
     val isPageError: Boolean = false,
-    val emotionTags: ImmutableList<EmotionTag> = persistentListOf(),
-    val selectedEmotion: EmotionTag? = null,
+    val emotions: ImmutableList<Emotion> = persistentListOf(),
+    val selectedEmotion: Emotion? = null,
     val impressionState: TextFieldState = TextFieldState(),
     val impressionGuideList: ImmutableList<String> = persistentListOf(),
     val selectedImpressionGuide: String = "",
@@ -46,7 +46,7 @@ sealed interface RecordRegisterUiEvent : CircuitUiEvent {
     data object OnClearClick : RecordRegisterUiEvent
     data object OnNextButtonClick : RecordRegisterUiEvent
     data object OnSentenceScanButtonClick : RecordRegisterUiEvent
-    data class OnSelectEmotion(val emotion: EmotionTag) : RecordRegisterUiEvent
+    data class OnSelectEmotion(val emotion: Emotion) : RecordRegisterUiEvent
     data object OnImpressionGuideButtonClick : RecordRegisterUiEvent
     data object OnImpressionGuideBottomSheetDismiss : RecordRegisterUiEvent
     data class OnSelectImpressionGuide(val index: Int) : RecordRegisterUiEvent
diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/EmotionStep.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/EmotionStep.kt
diff --git a/feature/screens/src/main/kotlin/com/ninecraft/booket/feature/screens/Screens.kt b/feature/screens/src/main/kotlin/com/ninecraft/booket/feature/screens/Screens.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ class BookDetailPresenter @AssistedInject constructor(`
`306`	`306`	`RecordCardScreen(`
`307`	`307`	`quote = selectedRecordInfo.quote,`
`308`	`308`	`bookTitle = selectedRecordInfo.bookTitle,`
`309`		`- emotionTag = selectedRecordInfo.emotionTags[0],`
	`309`	`+ emotion = selectedRecordInfo.emotionTags[0],`
`310`	`310`	`),`
`311`	`311`	`)`
`312`	`312`	`}`