diff --git a/app/src/main/java/com/example/android/guesstheword/screens/game/GameFragment.kt b/app/src/main/java/com/example/android/guesstheword/screens/game/GameFragment.kt index e30db35..410cd4f 100644 --- a/app/src/main/java/com/example/android/guesstheword/screens/game/GameFragment.kt +++ b/app/src/main/java/com/example/android/guesstheword/screens/game/GameFragment.kt @@ -51,18 +51,7 @@ class GameFragment : Fragment() { viewModel = ViewModelProviders.of(this).get(GameViewModel::class.java) binding.gameViewModel = viewModel - - viewModel.score.observe(this, Observer { - binding.scoreText.text = getString(R.string.score_format, it) - }) - - viewModel.word.observe(this, Observer { - binding.wordText.text = it - }) - - viewModel.gameTimer.observe(this, Observer { - binding.timerText.text = getString(R.string.time_format, it) - }) + binding.lifecycleOwner = this viewModel.eventGameFinished.observe(this, Observer { if (it) { diff --git a/app/src/main/java/com/example/android/guesstheword/screens/score/ScoreFragment.kt b/app/src/main/java/com/example/android/guesstheword/screens/score/ScoreFragment.kt index 027375e..e95fcbb 100644 --- a/app/src/main/java/com/example/android/guesstheword/screens/score/ScoreFragment.kt +++ b/app/src/main/java/com/example/android/guesstheword/screens/score/ScoreFragment.kt @@ -57,10 +57,7 @@ class ScoreFragment : Fragment() { .get(ScoreViewModel::class.java) binding.scoreViewModel = viewModel - - viewModel.score.observe(this, Observer { - binding.scoreText.text = it.toString() - }) + binding.lifecycleOwner = this viewModel.eventPlayAgain.observe(this, Observer { if (it) { diff --git a/app/src/main/java/com/example/android/guesstheword/screens/score/ScoreViewModel.kt b/app/src/main/java/com/example/android/guesstheword/screens/score/ScoreViewModel.kt index 94e91d0..32e1c0d 100644 --- a/app/src/main/java/com/example/android/guesstheword/screens/score/ScoreViewModel.kt +++ b/app/src/main/java/com/example/android/guesstheword/screens/score/ScoreViewModel.kt @@ -3,7 +3,6 @@ package com.example.android.guesstheword.screens.score import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import timber.log.Timber class ScoreViewModel(var finalScore: Int): ViewModel() { @@ -17,7 +16,6 @@ class ScoreViewModel(var finalScore: Int): ViewModel() { get() = _eventPlayAgain init { - Timber.i("finalScore: $finalScore") _eventPlayAgain.value = false _score.value = finalScore } diff --git a/app/src/main/res/layout/game_fragment.xml b/app/src/main/res/layout/game_fragment.xml index de6bfb8..133b61c 100644 --- a/app/src/main/res/layout/game_fragment.xml +++ b/app/src/main/res/layout/game_fragment.xml @@ -57,6 +57,7 @@ android:textColor="@color/black_text_color" android:textSize="34sp" android:textStyle="normal" + android:text="@{@string/quote_format(gameViewModel.word)}" app:layout_constraintBottom_toTopOf="@+id/score_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -76,6 +77,7 @@ android:textColor="@color/grey_text_color" android:textSize="14sp" android:textStyle="normal" + android:text="@{@string/time_format(gameViewModel.gameTimer)}" app:layout_constraintBottom_toTopOf="@+id/score_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -91,6 +93,7 @@ android:textColor="@color/grey_text_color" android:textSize="14sp" android:textStyle="normal" + android:text="@{@string/score_format(gameViewModel.score)}" app:layout_constraintBottom_toTopOf="@+id/guideline" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/score_fragment.xml b/app/src/main/res/layout/score_fragment.xml index 25ef056..48ff4d3 100644 --- a/app/src/main/res/layout/score_fragment.xml +++ b/app/src/main/res/layout/score_fragment.xml @@ -57,6 +57,7 @@ android:textColor="@color/black_text_color" android:textSize="34sp" android:textStyle="normal" + android:text="@{scoreViewModel.score.toString()}" app:layout_constraintBottom_toTopOf="@+id/play_again_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5"