Skip to content
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

Jump to bottom

feat: 빈 쪽지 못남기게 하는 기능 구현 #542

Merged
merged 4 commits into from
Nov 8, 2023
Merged

feat: 빈 쪽지 못남기게 하는 기능 구현 #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f40e3ac
feat: 경고 문구 리소스 추가
hyunji1203 Nov 7, 2023
0265a57
feat: 쪽지 내용이 비어 있을 때 등록 하지 못 하도록 구현
hyunji1203 Nov 7, 2023
ffab36d
refactor: 전송하기 클릭 시에만 경고 문구가 뜨도록 수정
hyunji1203 Nov 7, 2023
674d51b
fix: 쪽지가 등록되지 않는 로직 수정
hyunji1203 Nov 8, 2023
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
10 changes: 9 additions & 1 deletion android/app/src/main/java/com/now/naaga/presentation/onadventure/OnAdventureActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class OnAdventureActivity :
viewModel.endAdventure()
}
binding.ivSendLetter.setOnClickListener {
LetterSendDialog(viewModel::sendLetter).show(supportFragmentManager, LetterSendDialog.TAG)
LetterSendDialog(::registerLetter).show(supportFragmentManager, LetterSendDialog.TAG)
}
}

Expand Down Expand Up @@ -203,6 +203,14 @@ class OnAdventureActivity :
}
}

private fun registerLetter(message: String) {
if (message.isNotEmpty()) {
viewModel.sendLetter(message)
} else {
showToast(getString(R.string.send_letter_dialog_warning))
}
}

private fun showGiveUpDialog() {
val fragment: Fragment? = supportFragmentManager.findFragmentByTag(GIVE_UP)
if (fragment == null) {
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@

<!-- SendLetterDialog -->
<string name="send_letter_dialog_hint">이 곳에 내용을 작성해주세요!</string>
<string name="send_letter_dialog_warning">내용을 1자 이상 입력해주세요!</string>
<string name="send_letter_dialog_submit">전송하기</string>

<!-- All -->
Expand Down
Loading