Skip to content

Commit 15c5ba3

Browse files
committed
FIX: 일부 오타 수정, 일부 변수가 반영되지 않던 문제 수정
1 parent 1b08cab commit 15c5ba3

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/atom/EmotionMarbleImage.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fun EmotionMarbleImage(
2525
.crossfade(true)
2626
.build(),
2727
modifier = modifier,
28-
contentDescription = null,
28+
contentDescription = contentDescription,
2929
alpha = alpha,
3030
error = image.offlineBackupImageResourceId?.let { painterResource(it) },
3131
)
@@ -35,6 +35,7 @@ fun EmotionMarbleImage(
3535
painter = painterResource(id = image.resourceId),
3636
contentDescription = contentDescription,
3737
modifier = modifier,
38+
alpha = alpha,
3839
)
3940
}
4041
}

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/component/template/EmotionRecommendRoutineScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fun EmotionRecommendRoutineScreen(
4444
Spacer(modifier = Modifier.height(54.dp))
4545

4646
Text(
47-
text = "오늘 감정에 따른\n루틴을 추천드릴께요!",
47+
text = "오늘 감정에 따른\n루틴을 추천드릴게요!",
4848
color = BitnagilTheme.colors.navy500,
4949
style = BitnagilTheme.typography.title2Bold,
5050
)

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionImageUiModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ import kotlinx.parcelize.Parcelize
55

66
@Parcelize
77
sealed class EmotionImageUiModel : Parcelable {
8-
class Url(val url: String, val offlineBackupImageResourceId: Int?) : EmotionImageUiModel()
9-
class Resource(val resourceId: Int) : EmotionImageUiModel()
8+
data class Url(val url: String, val offlineBackupImageResourceId: Int?) : EmotionImageUiModel()
9+
data class Resource(val resourceId: Int) : EmotionImageUiModel()
1010
}

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/model/EmotionUiModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ data class EmotionUiModel(
4242

4343
private fun getMessage(emotionType: String): String? {
4444
return when (emotionType) {
45-
"CALM" -> "평온함은 마음이 고요하고 편안해\n균형을 이루는 상태에요"
45+
"CALM" -> "평온함은 마음이 고요하고 편안해\n균형을 이루는 상태에요."
4646
"VITALITY" -> "활기참은 생기가 가득 차\n활발하고 적극적인 상태예요."
4747
"LETHARGY" -> "무기력함은 의욕이 없어 아무것도\n하기 힘든 상태예요."
4848
"ANXIETY" -> "불안함은 마음이 불안정하고 쉽게\n안심하기 어려운 상태예요."

0 commit comments

Comments
 (0)