Merge pull request #316 from lucasnlm/update-code

Update code

.editorconfig

@@ -2,4 +2,3 @@
 indent_size=4
 insert_final_newline=true
 max_line_length=120
-disabled_rules=import-ordering

app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt

@@ -20,17 +20,17 @@ import com.badlogic.gdx.backends.android.AndroidFragmentApplication
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dev.lucasnlm.antimine.common.level.repository.ISavesRepository
+import dev.lucasnlm.antimine.common.level.view.GdxLevelFragment
 import dev.lucasnlm.antimine.common.level.viewmodel.GameEvent
 import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModel
+import dev.lucasnlm.antimine.control.ControlActivity
 import dev.lucasnlm.antimine.core.cloud.CloudSaveManager
 import dev.lucasnlm.antimine.core.isPortrait
 import dev.lucasnlm.antimine.core.models.Analytics
 import dev.lucasnlm.antimine.core.models.Difficulty
 import dev.lucasnlm.antimine.gameover.GameOverDialogFragment
 import dev.lucasnlm.antimine.gameover.WinGameDialogFragment
 import dev.lucasnlm.antimine.gameover.model.GameResult
-import dev.lucasnlm.antimine.common.level.view.GdxLevelFragment
-import dev.lucasnlm.antimine.control.ControlActivity
 import dev.lucasnlm.antimine.gdx.GdxLocal
 import dev.lucasnlm.antimine.main.MainActivity
 import dev.lucasnlm.antimine.preferences.IPreferencesRepository

app/src/main/java/dev/lucasnlm/antimine/TvGameActivity.kt

@@ -8,13 +8,13 @@ import android.view.View
 import androidx.lifecycle.lifecycleScope
 import com.badlogic.gdx.backends.android.AndroidFragmentApplication
 import dev.lucasnlm.antimine.common.level.repository.ISavesRepository
+import dev.lucasnlm.antimine.common.level.view.GdxLevelFragment
+import dev.lucasnlm.antimine.common.level.viewmodel.GameEvent
 import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModel
 import dev.lucasnlm.antimine.core.models.Analytics
 import dev.lucasnlm.antimine.gameover.GameOverDialogFragment
 import dev.lucasnlm.antimine.gameover.WinGameDialogFragment
 import dev.lucasnlm.antimine.gameover.model.GameResult
-import dev.lucasnlm.antimine.common.level.view.GdxLevelFragment
-import dev.lucasnlm.antimine.common.level.viewmodel.GameEvent
 import dev.lucasnlm.antimine.preferences.IPreferencesRepository
 import dev.lucasnlm.antimine.ui.ThematicActivity
 import dev.lucasnlm.antimine.ui.ext.toAndroidColor

app/src/main/java/dev/lucasnlm/antimine/di/AppModule.kt

@@ -1,7 +1,7 @@
 package dev.lucasnlm.antimine.di
 
-import dev.lucasnlm.antimine.cloud.CloudSaveManagerImpl
 import dev.lucasnlm.antimine.BuildConfig
+import dev.lucasnlm.antimine.cloud.CloudSaveManagerImpl
 import dev.lucasnlm.antimine.core.IAppVersionManager
 import dev.lucasnlm.antimine.core.analytics.DebugAnalyticsManager
 import dev.lucasnlm.antimine.core.analytics.ProdAnalyticsManager

app/src/main/java/dev/lucasnlm/antimine/gameover/GameOverDialogFragment.kt

@@ -25,11 +25,11 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dev.lucasnlm.antimine.R
 import dev.lucasnlm.antimine.common.level.viewmodel.GameEvent
 import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModel
+import dev.lucasnlm.antimine.core.isAndroidTv
 import dev.lucasnlm.antimine.core.models.Analytics
 import dev.lucasnlm.antimine.gameover.model.GameResult
 import dev.lucasnlm.antimine.gameover.viewmodel.EndGameDialogEvent
 import dev.lucasnlm.antimine.gameover.viewmodel.EndGameDialogViewModel
-import dev.lucasnlm.antimine.core.isAndroidTv
 import dev.lucasnlm.antimine.level.view.NewGameFragment
 import dev.lucasnlm.antimine.preferences.IPreferencesRepository
 import dev.lucasnlm.antimine.preferences.PreferencesActivity

app/src/main/java/dev/lucasnlm/antimine/gameover/WinGameDialogFragment.kt

@@ -23,11 +23,11 @@ import androidx.lifecycle.viewModelScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dev.lucasnlm.antimine.R
 import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModel
+import dev.lucasnlm.antimine.core.isAndroidTv
 import dev.lucasnlm.antimine.core.models.Analytics
 import dev.lucasnlm.antimine.gameover.model.GameResult
 import dev.lucasnlm.antimine.gameover.viewmodel.EndGameDialogEvent
 import dev.lucasnlm.antimine.gameover.viewmodel.EndGameDialogViewModel
-import dev.lucasnlm.antimine.core.isAndroidTv
 import dev.lucasnlm.antimine.level.view.NewGameFragment
 import dev.lucasnlm.antimine.preferences.IPreferencesRepository
 import dev.lucasnlm.antimine.preferences.PreferencesActivity

app/src/main/java/dev/lucasnlm/antimine/gameover/viewmodel/EndGameDialogViewModel.kt

@@ -1,21 +1,21 @@
 package dev.lucasnlm.antimine.gameover.viewmodel
 
-import android.content.Context
+import android.app.Application
 import androidx.annotation.DrawableRes
 import dev.lucasnlm.antimine.R
+import dev.lucasnlm.antimine.core.updateLanguage
 import dev.lucasnlm.antimine.core.viewmodel.IntentViewModel
 import dev.lucasnlm.antimine.gameover.model.GameResult
 import dev.lucasnlm.antimine.preferences.IPreferencesRepository
-import dev.lucasnlm.antimine.core.updateLanguage
 import kotlinx.coroutines.flow.flow
 
 class EndGameDialogViewModel(
-    private val context: Context,
+    private val application: Application,
     preferencesRepository: IPreferencesRepository,
 ) : IntentViewModel<EndGameDialogEvent, EndGameDialogState>() {
     init {
         preferencesRepository.getPreferredLocale()?.let {
-            context.updateLanguage(it)
+            application.applicationContext.updateLanguage(it)
         }
     }
 
@@ -64,8 +64,9 @@ class EndGameDialogViewModel(
         R.drawable.emoji_sad_but_relieved_face,
     ).safeRandomEmoji(except)
 
-    private fun messageTo(minesCount: Int, time: Long, gameResult: GameResult): String =
-        if (time != 0L) {
+    private fun messageTo(minesCount: Int, time: Long, gameResult: GameResult): String {
+        val context = application.applicationContext
+        return if (time != 0L) {
             when (gameResult) {
                 GameResult.Victory -> context.getString(R.string.generic_win, minesCount, time)
                 GameResult.GameOver -> context.getString(R.string.generic_game_over)
@@ -74,6 +75,7 @@ class EndGameDialogViewModel(
         } else {
             context.getString(R.string.generic_game_over)
         }
+    }
 
     override fun initialState() = EndGameDialogState(
         R.drawable.emoji_triangular_flag,
@@ -86,6 +88,7 @@ class EndGameDialogViewModel(
     )
 
     override suspend fun mapEventToState(event: EndGameDialogEvent) = flow {
+        val context = application.applicationContext
         if (event is EndGameDialogEvent.BuildCustomEndGame) {
             val state = when (event.gameResult) {
                 GameResult.Victory -> {

app/src/main/java/dev/lucasnlm/antimine/history/viewmodel/HistoryViewModel.kt

@@ -1,14 +1,14 @@
 package dev.lucasnlm.antimine.history.viewmodel
 
-import android.content.Context
+import android.app.Application
 import android.content.Intent
 import dev.lucasnlm.antimine.GameActivity
 import dev.lucasnlm.antimine.common.level.repository.ISavesRepository
 import dev.lucasnlm.antimine.core.viewmodel.IntentViewModel
 import kotlinx.coroutines.flow.flow
 
 class HistoryViewModel(
-    private val context: Context,
+    private val application: Application,
     private val savesRepository: ISavesRepository,
 ) : IntentViewModel<HistoryEvent, HistoryState>() {
 
@@ -41,6 +41,7 @@ class HistoryViewModel(
     }
 
     private fun replayGame(uid: Int) {
+        val context = application.applicationContext
         val intent = Intent(context, GameActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK
             putExtra(GameActivity.RETRY_GAME, uid)
@@ -49,6 +50,7 @@ class HistoryViewModel(
     }
 
     private fun loadGame(uid: Int) {
+        val context = application.applicationContext
         val intent = Intent(context, GameActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK
             putExtra(GameActivity.START_GAME, uid)

app/src/main/java/dev/lucasnlm/antimine/level/view/NewGameFragment.kt

@@ -12,8 +12,8 @@ import dev.lucasnlm.antimine.R
 import dev.lucasnlm.antimine.common.level.repository.ISavesRepository
 import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModel
 import dev.lucasnlm.antimine.core.models.Difficulty
-import dev.lucasnlm.antimine.ui.view.CardButtonView
 import dev.lucasnlm.antimine.ui.repository.IThemeRepository
+import dev.lucasnlm.antimine.ui.view.CardButtonView
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel

app/src/main/java/dev/lucasnlm/antimine/main/MainActivity.kt

@@ -12,10 +12,10 @@ import dev.lucasnlm.antimine.about.AboutActivity
 import dev.lucasnlm.antimine.common.level.repository.IMinefieldRepository
 import dev.lucasnlm.antimine.common.level.repository.ISavesRepository
 import dev.lucasnlm.antimine.control.ControlActivity
-import dev.lucasnlm.antimine.custom.CustomLevelDialogFragment
 import dev.lucasnlm.antimine.core.models.Analytics
 import dev.lucasnlm.antimine.core.models.Difficulty
 import dev.lucasnlm.antimine.core.repository.IDimensionRepository
+import dev.lucasnlm.antimine.custom.CustomLevelDialogFragment
 import dev.lucasnlm.antimine.history.HistoryActivity
 import dev.lucasnlm.antimine.language.LanguageSelectorActivity
 import dev.lucasnlm.antimine.main.viewmodel.MainEvent

app/src/main/java/dev/lucasnlm/antimine/main/viewmodel/MainViewModel.kt

@@ -1,6 +1,6 @@
 package dev.lucasnlm.antimine.main.viewmodel
 
-import android.content.Context
+import android.app.Application
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
@@ -13,13 +13,13 @@ import dev.lucasnlm.antimine.core.viewmodel.StatelessViewModel
 import dev.lucasnlm.antimine.preferences.IPreferencesRepository
 import dev.lucasnlm.antimine.preferences.models.ControlStyle
 import dev.lucasnlm.antimine.splash.viewmodel.SplashViewModel
+import dev.lucasnlm.antimine.tutorial.TutorialActivity
 import dev.lucasnlm.external.ICloudStorageManager
 import dev.lucasnlm.external.model.CloudSave
-import dev.lucasnlm.antimine.tutorial.TutorialActivity
 import kotlinx.coroutines.launch
 
 class MainViewModel(
-    private val context: Context,
+    private val application: Application,
     private val preferencesRepository: IPreferencesRepository,
     private val statsRepository: IStatsRepository,
     private val saveCloudStorageManager: ICloudStorageManager,
@@ -119,6 +119,7 @@ class MainViewModel(
     }
 
     private fun continueGame(difficulty: Difficulty? = null) {
+        val context = application.applicationContext
         val intent = Intent(context, GameActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
             difficulty?.let {
@@ -132,6 +133,7 @@ class MainViewModel(
     }
 
     private fun startTutorial() {
+        val context = application.applicationContext
         val intent = Intent(context, TutorialActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
         }

app/src/test/java/dev/lucasnlm/antimine/di/TestAppModule.kt

@@ -42,11 +42,11 @@ val AppModule = module {
 
     single {
         object : IPlayGamesManager {
-            override fun playerId(): String? = null
+            override suspend fun playerId(): String? = null
 
             override fun hasGooglePlayGames(): Boolean = false
 
-            override fun silentLogin(): Boolean = false
+            override suspend fun silentLogin(): Boolean = false
 
             override fun showPlayPopUp(activity: Activity) {}
 

common/src/main/java/dev/lucasnlm/antimine/common/level/database/dao/SaveDao.kt

@@ -12,9 +12,6 @@ interface SaveDao {
     @Query("SELECT * FROM new_save")
     suspend fun getAll(): List<Save>
 
-    @Query("SELECT * FROM new_save WHERE uid IN (:gameIds)")
-    suspend fun loadAllByIds(gameIds: IntArray): List<Save>
-
     @Query("SELECT * FROM new_save WHERE uid = :gameId LIMIT 1")
     suspend fun loadFromId(gameId: Int): Save
 

common/src/main/java/dev/lucasnlm/antimine/common/level/viewmodel/GameViewModel.kt

@@ -339,7 +339,7 @@ open class GameViewModel(
         }
     }
 
-    suspend fun onContinueFromGameOver() {
+    private suspend fun onContinueFromGameOver() {
         if (initialized) {
             gameController.increaseErrorTolerance()
             statsRepository.deleteLastStats()
@@ -574,7 +574,7 @@ open class GameViewModel(
         }
     }
 
-    fun getScore() = gameController.getScore()
+    private fun getScore() = gameController.getScore()
 
     private suspend fun onGameOver(useGameOverFeedback: Boolean) {
         stopClock()

common/src/main/java/dev/lucasnlm/antimine/core/di/CommonModule.kt

@@ -2,11 +2,11 @@ package dev.lucasnlm.antimine.core.di
 
 import android.content.Context
 import android.view.ViewConfiguration
+import dev.lucasnlm.antimine.core.isAndroidTv
 import dev.lucasnlm.antimine.core.repository.DimensionRepository
 import dev.lucasnlm.antimine.core.repository.IDimensionRepository
 import dev.lucasnlm.antimine.core.sound.ISoundManager
 import dev.lucasnlm.antimine.core.sound.SoundManager
-import dev.lucasnlm.antimine.core.isAndroidTv
 import dev.lucasnlm.antimine.preferences.IPreferencesManager
 import dev.lucasnlm.antimine.preferences.IPreferencesRepository
 import dev.lucasnlm.antimine.preferences.PreferencesManager

common/src/test/java/dev/lucasnlm/antimine/common/level/solver/CheckNeighborsSolverTest.kt

@@ -6,7 +6,6 @@ import dev.lucasnlm.antimine.preferences.models.Minefield
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
-
 import kotlin.random.Random
 
 class CheckNeighborsSolverTest {

external/src/main/java/dev/lucasnlm/external/IPlayGamesManager.kt

@@ -27,9 +27,9 @@ enum class Leaderboard(
 }
 
 interface IPlayGamesManager {
-    fun playerId(): String?
+    suspend fun playerId(): String?
     fun hasGooglePlayGames(): Boolean
-    fun silentLogin(): Boolean
+    suspend fun silentLogin(): Boolean
     fun showPlayPopUp(activity: Activity)
     fun getLoginIntent(): Intent?
     fun handleLoginResult(data: Intent?)

foss/src/main/java/dev/lucasnlm/external/PlayGamesManager.kt

@@ -7,11 +7,11 @@ import android.content.Intent
 class PlayGamesManager(
     context: Context,
 ) : IPlayGamesManager {
-    override fun playerId(): String? = null
+    override suspend fun playerId(): String? = null
 
     override fun hasGooglePlayGames(): Boolean = false
 
-    override fun silentLogin(): Boolean {
+    override suspend fun silentLogin(): Boolean {
         // F-droid build doesn't have Google Play Games
         return false
     }

gdx/src/main/java/dev/lucasnlm/antimine/gdx/actors/AreaForm.kt

@@ -29,15 +29,6 @@ val areaFullForm = AreaForm(
     bottomRight = true,
 )
 
-fun allAreaForms() = (0..15).map {
-    AreaForm(
-        top = it and 0b1000 != 0x00,
-        bottom = it and 0b0100 != 0x00,
-        left = it and 0b0010 != 0x00,
-        right = it and 0b0001 != 0x00,
-    )
-}.toList()
-
 object FormNames {
     const val core = "core"
     const val bottom = "b"