fix: repeated logs

Pablito2020 · May 8, 2022 · 9c3800d · 9c3800d
1 parent af50060
commit 9c3800d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/app/src/main/java/com/pablo/tetris/presentation/game/GameActivity.kt b/app/src/main/java/com/pablo/tetris/presentation/game/GameActivity.kt
@@ -41,6 +41,7 @@ class GameActivity : HideStatusBarActivity(), View.OnClickListener {
         setUpGridView()
         setUpButtons()
         setUpResumeAction()
+        setUpLogger()
     }
 
     private fun setUpViewModel() {
@@ -62,6 +63,11 @@ class GameActivity : HideStatusBarActivity(), View.OnClickListener {
         binding.GameGrid.adapter = adapter
     }
 
+    private fun setUpLogger() {
+        if (!model.gameOpened.value!!)
+            factory.logData()
+    }
+
     private fun setUpButtons() {
         binding.root.getButtons().forEach { it.setOnClickListener(this) }
         binding.pauseButton.setOnClickListener(this)

diff --git a/app/src/main/java/com/pablo/tetris/presentation/game/GameViewModel.kt b/app/src/main/java/com/pablo/tetris/presentation/game/GameViewModel.kt
@@ -17,7 +17,7 @@ class GameViewModel : ViewModel() {
     private val lengthSong: MutableLiveData<Int> = MutableLiveData(0)
     private val song: MutableLiveData<MediaPlayer> = MutableLiveData(null)
     private val gamePaused: MutableLiveData<Boolean> = MutableLiveData(false)
-    private val gameOpened: MutableLiveData<Boolean> = MutableLiveData(false)
+    val gameOpened: MutableLiveData<Boolean> = MutableLiveData(false)
     private lateinit var speedStrategy: SpeedStrategy
 
     fun setUp(gameFacade: GameFacade, speed: SpeedStrategy) {

diff --git a/app/src/main/java/com/pablo/tetris/presentation/game/SettingsFactory.kt b/app/src/main/java/com/pablo/tetris/presentation/game/SettingsFactory.kt
@@ -21,6 +21,24 @@ class SettingsFactory {
     fun fromIntent(intent: Intent) {
         if (data == null) {
             data = intent.getSerializableExtra(GAME_INFORMATION) as SettingsData
+        }
+    }
+
+    fun getFacade(): GameFacade {
+        val generator = BlockGeneratorFactory.getGenerator(data!!.level)
+        return GameFacade(blockGenerator = generator, ghost = data!!.isGhostBlock)
+    }
+
+    fun getStyle(context: Context): StyleCreator {
+        return StyleFactory.getStyleCreator(Style.values()[data!!.themeIndex], context)
+    }
+
+    fun getSpeedStrategy() = SpeedFactory.get(data!!.level)
+
+    fun hasMusic() = data!!.hasMusic
+
+    fun logData() {
+        if (data != null) {
             LoggerGetter.get().add(
                 UiText.ResourceString(R.string.player_name_log, data!!.name),
             )
@@ -43,17 +61,4 @@ class SettingsFactory {
         }
     }
 
-    fun getFacade(): GameFacade {
-        val generator = BlockGeneratorFactory.getGenerator(data!!.level)
-        return GameFacade(blockGenerator = generator, ghost = data!!.isGhostBlock)
-    }
-
-    fun getStyle(context: Context): StyleCreator {
-        return StyleFactory.getStyleCreator(Style.values()[data!!.themeIndex], context)
-    }
-
-    fun getSpeedStrategy() = SpeedFactory.get(data!!.level)
-
-    fun hasMusic() = data!!.hasMusic
-
 }