Skip to content

Revert "this is replaced with viewLifecycleOwner" #32

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

Open
wants to merge 1 commit into
base: Step.04-Exercise-Add-LiveData-Encapsulation
Choose a base branch
from
Open

Revert "this is replaced with viewLifecycleOwner" #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/src/main/java/com/example/android/guesstheword/screens/game/GameFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ class GameFragment : Fragment() {
}

/** Setting up LiveData observation relationship **/
viewModel.word.observe(viewLifecycleOwner, Observer { newWord ->
viewModel.word.observe(this, Observer { newWord ->
binding.wordText.text = newWord
})

viewModel.score.observe(viewLifecycleOwner, Observer { newScore ->
viewModel.score.observe(this, Observer { newScore ->
binding.scoreText.text = newScore.toString()
})

Expand Down
24 changes: 9 additions & 15 deletions app/src/main/java/com/example/android/guesstheword/screens/game/GameViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.example.android.guesstheword.screens.game

import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel

Expand All @@ -26,32 +25,27 @@ import androidx.lifecycle.ViewModel
*/
class GameViewModel : ViewModel() {

// DONE (01) Make an internal and external version of the word and score
// TODO (01) Make an internal and external version of the word and score
// The internal version should be a MutableLiveData, have an underscore in front of its' name
// and be private
// The external version should be a LiveData
// DONE (02) Make a backing property for the external version that returns the internal
// TODO (02) Make a backing property for the external version that returns the internal
// MutableLiveData as a LiveData

// The current word
private val _word = MutableLiveData<String>()
val word: LiveData<String>
get() = _word

val word = MutableLiveData<String>()

// The current score
private val _score = MutableLiveData<Int>()
val score: LiveData<Int>
get() = _score
val score = MutableLiveData<Int>()

// The list of words - the front of the list is the next word to guess
private lateinit var wordList: MutableList<String>

// DONE (03) Use the internal version (the MutableLiveData) of _score and _word in this class
// TODO (03) Use the internal version (the MutableLiveData) of _score and _word in this class
init {
resetList()
nextWord()
_score.value = 0
score.value = 0
}

/**
Expand Down Expand Up @@ -92,19 +86,19 @@ class GameViewModel : ViewModel() {
if (wordList.isEmpty()) {
// gameFinished() should happen here
} else {
_word.value = wordList.removeAt(0)
word.value = wordList.removeAt(0)
}
}

/** Methods for buttons presses **/

fun onSkip() {
_score.value = (score.value)?.minus(1)
score.value = (score.value)?.minus(1)
nextWord()
}

fun onCorrect() {
_score.value = (score.value)?.plus(1)
score.value = (score.value)?.plus(1)
nextWord()
}
}