Skip to content

[fix/#51] QA 이슈 수정 #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sxunea merged 2 commits into from
Sep 24, 2025
Merged

[fix/#51] QA 이슈 수정 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
798b057
[fix/#51] 텍스트 수정
sxunea Sep 24, 2025
2bd247b
[refactor/#51] 요정리스트가 비었을 경우
sxunea Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions feature/chatting/src/commonMain/kotlin/com/nexters/emotia/feature/chatting/ChattingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,9 +429,13 @@ private fun FairySelectionScreen(
}

FairySelectionBottomSection(
selectedFairy = uiState.fairies.getOrNull(
uiState.selectedFairyIndex.coerceIn(0, uiState.fairies.size - 1)
),
selectedFairy = if (uiState.fairies.isNotEmpty()) {
uiState.fairies.getOrNull(
uiState.selectedFairyIndex.coerceIn(0, uiState.fairies.size - 1)
)
} else {
null
},
onConfirmClick = onSpotlightAnimationStart,
onRetryClick = {
viewModel.handleIntent(ChattingIntent.RestartChat)
Expand Down Expand Up @@ -534,25 +538,26 @@ private fun FairySelectionBottomSection(

if (selectedFairy != null) {
EmotiaButton(
text = "내 감정은 ${selectedFairy.emotion}이야",
text = "내 감정은 ${selectedFairy.emotion}인 것 같아",
Comment on lines -537 to +541
Copy link
Collaborator

@haeti-dev haeti-dev Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

자신감이 없어진 요정 ㅋㅋ

Copy link
Collaborator Author

@sxunea sxunea Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

제미나이는 좀 없어도돼 🥹

modifier = Modifier.padding(16.dp),
onClick = onConfirmClick
)
}

Text(
text = "다시 대화하기",
modifier = Modifier
.fillMaxWidth()
.rippleClickable(onClick = onRetryClick),
style = typography.emotia14M.copy(
color = colors.lightGray,
textDecoration = TextDecoration.Underline
),
textAlign = TextAlign.Center
)
Text(
text = "다시 대화하기",
modifier = Modifier
.fillMaxWidth()
.rippleClickable(onClick = onRetryClick),
style = typography.emotia14M.copy(
color = colors.lightGray,
textDecoration = TextDecoration.Underline
),
textAlign = TextAlign.Center
)

Spacer(Modifier.height(24.dp))

Spacer(Modifier.height(24.dp))
}
}

@Composable
Expand Down
2 changes: 1 addition & 1 deletion ...nboarding/src/commonMain/kotlin/com/nexters/emotia/feature/onboarding/OnBoardingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ private fun StoryContent(
4 -> "감정 요정들은 쉽게 모습을 드러내지 않아요.\n부끄러움을 많이 타거든요." to true
5 -> "앗..! 드디어 만났네.\n네 감정이 이 숲에 닿았을 때부터, 조용히 지켜보고 있었어." to false
6 -> "나는 감정 요정들이 사는 숲, 이모티아의 여왕이야." to false
7 -> "기쁨, 슬픔, 분노, 외로움… 당신이 느끼는 모든 감정이 이 숲 어딘가에 숨겨져 있어요." to false
7 -> "기쁨, 슬픔, 분노, 외로움… 당신이 느끼는 모든 감정이 이 숲 어딘가에 숨겨져 있어." to false
8 -> "이 숲을 거닐면서, 감정 요정들을 함께 찾아보자." to false
9 -> "그 아이들을 만나면, 너의 마음도 조금씩 또렷해질 거야." to false
10 -> "자, 이제 이모티아의 숲으로 같이 걸어가 볼까?" to false
Expand Down
Loading