From 65d31cdfcc93d7d4cf85ec1541aff6ce16e13805 Mon Sep 17 00:00:00 2001 From: 62160052 <62160052@go.buu.ac.th> Date: Tue, 6 Sep 2022 15:34:24 +0700 Subject: [PATCH] Implement OnClickListener for Submit button --- .../android/unscramble/ui/game/GameFragment.kt | 13 ++++++++++++- .../android/unscramble/ui/game/GameViewModel.kt | 13 +++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/android/unscramble/ui/game/GameFragment.kt b/app/src/main/java/com/example/android/unscramble/ui/game/GameFragment.kt index af18c93..cb29d0d 100644 --- a/app/src/main/java/com/example/android/unscramble/ui/game/GameFragment.kt +++ b/app/src/main/java/com/example/android/unscramble/ui/game/GameFragment.kt @@ -76,7 +76,18 @@ class GameFragment : Fragment() { * Displays the next scrambled word. */ private fun onSubmitWord() { - + val playerWord = binding.textInputEditText.text.toString() + + if (viewModel.isUserWordCorrect(playerWord)) { + setErrorTextField(false) + if (viewModel.nextWord()) { + updateNextWordOnScreen() + } else { + showFinalScoreDialog() + } + } else { + setErrorTextField(true) + } } /* diff --git a/app/src/main/java/com/example/android/unscramble/ui/game/GameViewModel.kt b/app/src/main/java/com/example/android/unscramble/ui/game/GameViewModel.kt index dcde4b3..69cdfd0 100644 --- a/app/src/main/java/com/example/android/unscramble/ui/game/GameViewModel.kt +++ b/app/src/main/java/com/example/android/unscramble/ui/game/GameViewModel.kt @@ -50,4 +50,17 @@ class GameViewModel: ViewModel() { } else false } + private fun increaseScore() { + _score += SCORE_INCREASE + } + + fun isUserWordCorrect(playerWord: String): Boolean { + if (playerWord.equals(currentWord, true)) { + increaseScore() + return true + } + return false + } + + } \ No newline at end of file -- GitLab