From 0510d8a860de9fe5ce664e7c6bf97b1623c8fa18 Mon Sep 17 00:00:00 2001 From: Jhansi Date: Thu, 16 Jan 2020 15:36:46 -0800 Subject: [PATCH] FiX: Score is not updated for the last word Issue link: https://github.com/google-developer-training/android-kotlin-fundamentals-apps/pull/19 --- .../android/guesstheword/screens/game/GameViewModel.kt | 8 ++------ .../android/guesstheword/screens/game/GameViewModel.kt | 8 ++------ .../android/guesstheword/screens/game/GameViewModel.kt | 8 ++------ .../android/guesstheword/screens/game/GameViewModel.kt | 8 ++------ 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/GuessTheWordDataBinding/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt b/GuessTheWordDataBinding/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt index d2f60c7..74c8a5c 100644 --- a/GuessTheWordDataBinding/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt +++ b/GuessTheWordDataBinding/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt @@ -94,15 +94,11 @@ class GameViewModel : ViewModel() { /** Methods for updating the UI **/ fun onSkip() { - if (!wordList.isEmpty()) { - _score.value = (_score.value)?.minus(1) - } + _score.value = (_score.value)?.minus(1) nextWord() } fun onCorrect() { - if (!wordList.isEmpty()) { - _score.value = (_score.value)?.plus(1) - } + _score.value = (_score.value)?.plus(1) nextWord() } diff --git a/GuessTheWordLiveData/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt b/GuessTheWordLiveData/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt index 15fe71f..a23815c 100644 --- a/GuessTheWordLiveData/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt +++ b/GuessTheWordLiveData/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt @@ -94,15 +94,11 @@ class GameViewModel : ViewModel() { /** Methods for updating the UI **/ fun onSkip() { - if (!wordList.isEmpty()) { - _score.value = (_score.value)?.minus(1) - } + _score.value = (_score.value)?.minus(1) nextWord() } fun onCorrect() { - if (!wordList.isEmpty()) { - _score.value = (_score.value)?.plus(1) - } + _score.value = (_score.value)?.plus(1) nextWord() } diff --git a/GuessTheWordTransformation/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt b/GuessTheWordTransformation/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt index 8a35257..89c0050 100644 --- a/GuessTheWordTransformation/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt +++ b/GuessTheWordTransformation/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt @@ -138,15 +138,11 @@ class GameViewModel : ViewModel() { /** Methods for updating the UI **/ fun onSkip() { - if (!wordList.isEmpty()) { - _score.value = (_score.value)?.minus(1) - } + _score.value = (_score.value)?.minus(1) nextWord() } fun onCorrect() { - if (!wordList.isEmpty()) { - _score.value = (_score.value)?.plus(1) - } + _score.value = (_score.value)?.plus(1) nextWord() } diff --git a/GuessTheWordViewModel/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt b/GuessTheWordViewModel/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt index f48c37c..7137715 100644 --- a/GuessTheWordViewModel/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt +++ b/GuessTheWordViewModel/app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt @@ -80,15 +80,11 @@ class GameViewModel : ViewModel() { /** Methods for updating the UI **/ fun onSkip() { - if (!wordList.isEmpty()) { - score-- - } + score-- nextWord() } fun onCorrect() { - if (!wordList.isEmpty()) { - score++ - } + score++ nextWord() }