refactor: change namings and linter changes

Pablito2020 · May 28, 2022 · 48d68cd · 48d68cd
1 parent c4720dc
commit 48d68cd
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 18 deletions.
diff --git a/app/src/main/java/com/pablo/tetris/domain/user/ValidateName.kt b/app/src/main/java/com/pablo/tetris/domain/user/ValidateName.kt
@@ -5,7 +5,9 @@ import com.pablo.tetris.presentation.common.UiText
 
 class ValidateName(private val name: String): Validator {
 
-    val MAX_LENGTH = 20
+    companion object {
+        private const val MAX_LENGTH = 20
+    }
 
     override fun execute(): ValidationResult {
         if (name.isBlank())

diff --git a/app/src/main/java/com/pablo/tetris/infra/database/PlayerRepository.kt b/app/src/main/java/com/pablo/tetris/infra/database/PlayerRepository.kt
@@ -13,14 +13,10 @@ class PlayerRepository(private val playerDao: PlayerDao) {
         playerDao.insert(player)
     }
 
-    fun deleteAll() = playerDao.deleteAll()
-
     fun getPlayersThatMatch(search: String) = playerDao.getPlayersThatMatch(search)
 
     fun deletePlayer(id: Int) = playerDao.deletePlayer(id)
 
     fun getLogForPlayer(id: Int) = playerDao.getLogFromPlayer(id)
 
-    fun getPlayer(id: Int): Player? = playerDao.getPlayer(id)
-
 }
diff --git a/app/src/main/java/com/pablo/tetris/infra/logs/MemoryLogger.kt b/app/src/main/java/com/pablo/tetris/infra/logs/MemoryLogger.kt
@@ -12,8 +12,8 @@ import com.pablo.tetris.presentation.common.UiText
 
 object MemoryLogger : Logger {
 
-    val messages: MutableList<UiText> = mutableListOf()
-    val movements: MutableMap<UiText, Int> = mutableMapOf()
+    private val messages: MutableList<UiText> = mutableListOf()
+    private val movements: MutableMap<UiText, Int> = mutableMapOf()
 
     override fun add(message: UiText) {
         when (message) {

diff --git a/app/src/main/java/com/pablo/tetris/presentation/common/HideStatusBarActivity.kt b/app/src/main/java/com/pablo/tetris/presentation/common/HideStatusBarActivity.kt
@@ -18,7 +18,7 @@ open class HideStatusBarActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
     }
 
-    protected fun hideStatusBar() {
+    private fun hideStatusBar() {
         hideNavBar()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
             window.setDecorFitsSystemWindows(false)

diff --git a/app/src/main/java/com/pablo/tetris/presentation/finished/FinishedActivity.kt b/app/src/main/java/com/pablo/tetris/presentation/finished/FinishedActivity.kt
@@ -1,7 +1,6 @@
 package com.pablo.tetris.presentation.finished
 
 import android.content.Intent
-import android.icu.util.TimeUnit
 import android.os.Bundle
 import android.text.method.ScrollingMovementMethod
 import androidx.core.widget.addTextChangedListener
@@ -50,7 +49,7 @@ class FinishedActivity : HideStatusBarActivity() {
         setUpViewModel()
         setUpComponents()
         if (model.hasToShowConfetti(SettingsSingleton.getSettingsData(this).name, gameResult.score))
-            showKonfetty()
+            showConfetti()
         addResultToDataBase()
     }
 
@@ -92,8 +91,8 @@ class FinishedActivity : HideStatusBarActivity() {
                 }
             )
         }
-        binding.toolbar?.inflateMenu(R.menu.settings_menu)
-        binding.toolbar?.setOnMenuItemClickListener {
+        binding.toolbar.inflateMenu(R.menu.settings_menu)
+        binding.toolbar.setOnMenuItemClickListener {
             if (it.itemId == R.id.settings) {
                 startActivity(Intent(this, SettingsActivity::class.java))
                 true
@@ -117,7 +116,7 @@ class FinishedActivity : HideStatusBarActivity() {
 
     private fun getLogMessage() = model.result.value!!
 
-    private fun showKonfetty() {
+    private fun showConfetti() {
         val party = Party(
             speed = 0f,
             maxSpeed = 30f,

diff --git a/app/src/main/java/com/pablo/tetris/presentation/finished/FinishedViewModel.kt b/app/src/main/java/com/pablo/tetris/presentation/finished/FinishedViewModel.kt
@@ -19,7 +19,6 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import kotlin.properties.Delegates
 
 class FinishedViewModel(private val repository: PlayerRepository) : ViewModel() {
 
@@ -36,7 +35,7 @@ class FinishedViewModel(private val repository: PlayerRepository) : ViewModel()
     fun setUpLog(context: Context) {
         if (result.value == null) {
             val log = LoggerGetter.get().getLog()
-            result.value = log.map { it.asString(context) }.joinToString(separator = "\n")
+            result.value = log.joinToString(separator = "\n") { it.asString(context) }
         }
     }
 
@@ -68,10 +67,10 @@ class FinishedViewModel(private val repository: PlayerRepository) : ViewModel()
                 playerThatMatchName = repository.getPlayersThatMatch(name)
             }.join()
         }
-        try {
-            return playerThatMatchName.maxOf { it.score } < score
+        return try {
+            playerThatMatchName.maxOf { it.score } < score
         } catch (e: NoSuchElementException) {
-            return true;
+            true
         }
     }
 

diff --git a/app/src/main/java/com/pablo/tetris/presentation/game/fragments/GameFragment.kt b/app/src/main/java/com/pablo/tetris/presentation/game/fragments/GameFragment.kt
@@ -22,10 +22,13 @@ import com.pablo.tetris.presentation.game.actions.ResumeToastAction
 import com.pablo.tetris.presentation.game.grid.GameAdapter
 import com.pablo.tetris.presentation.game.results.GameResult
 import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import java.util.*
 
+@Suppress("OPT_IN_IS_NOT_ENABLED")
+@OptIn(ExperimentalCoroutinesApi::class)
 class GameFragment : Fragment(), View.OnClickListener {
 
     private lateinit var adapter: GameAdapter