Merge pull request #113 from lucasnlm/fix-resume-bug

Fix mine count value on resume game

app/build.gradle

@@ -9,8 +9,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 702011
+        versionCode 702021
-        versionName '7.2.1'
+        versionName '7.2.2'
         minSdkVersion 16
         targetSdkVersion 29
         multiDexEnabled true

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

@@ -139,7 +139,7 @@ class GameActivity : AppCompatActivity(), DialogInterface.OnDismissListener {
                 val mines = area.filter { it.hasMine }
                 totalArea = area.count()
                 totalMines = mines.count()
-                rightMines = mines.map { if (it.mark.isFlag()) 1 else 0 }.sum()
+                rightMines = mines.count { it.mark.isFlag() }
             }
         )
 
@@ -166,13 +166,18 @@ class GameActivity : AppCompatActivity(), DialogInterface.OnDismissListener {
 
     override fun onResume() {
         super.onResume()
-        if (status == Status.Running) {
+        val willReset = restartIfNeed()
-            viewModel.refreshUserPreferences()
-            viewModel.resumeGame()
-            analyticsManager.sentEvent(Analytics.Resume())
-        }
 
-        restartIfNeed()
+        if (!willReset) {
+            if (status == Status.Running) {
+                viewModel.run {
+                    refreshUserPreferences()
+                    resumeGame()
+                }
+
+                analyticsManager.sentEvent(Analytics.Resume())
+            }
+        }
     }
 
     override fun onPause() {
@@ -536,9 +541,11 @@ class GameActivity : AppCompatActivity(), DialogInterface.OnDismissListener {
      * If user change any accessibility preference, the game will restart the activity to
      * apply these changes.
      */
-    private fun restartIfNeed() {
+    private fun restartIfNeed(): Boolean {
-        if (usingLargeArea != preferencesRepository.useLargeAreas()) {
+        return (usingLargeArea != preferencesRepository.useLargeAreas()).also {
-            recreate()
+            if (it) {
+                recreate()
+            }
         }
     }
 

common/build.gradle

@@ -9,8 +9,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 702011
+        versionCode 702021
-        versionName '7.2.1'
+        versionName '7.2.2'
         minSdkVersion 16
         targetSdkVersion 29
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

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

@@ -94,6 +94,7 @@ class GameViewModel @ViewModelInject constructor(
         difficulty.postValue(save.difficulty)
         levelSetup.postValue(setup)
         refreshAll()
+        refreshMineCount()
 
         when {
             gameController.hasAnyMineExploded() -> eventObserver.postValue(Event.GameOver)

foss/build.gradle

@@ -6,8 +6,8 @@ android {
     compileSdkVersion 29
 
     defaultConfig {
-        versionCode 702011 // MMmmPPv
+        versionCode 702021 // MMmmPPv
-        versionName '7.2.1'
+        versionName '7.2.2'
         minSdkVersion 16
         targetSdkVersion 29
         resConfigs 'ar', 'en', 'cs', 'de', 'el', 'es', 'fr', 'ja', 'pt', 'ru', 'tr', 'uk', 'vi', 'zh'

proprietary/build.gradle

@@ -6,8 +6,8 @@ android {
     compileSdkVersion 29
 
     defaultConfig {
-        versionCode 702011 // MMmmPPv
+        versionCode 702021 // MMmmPPv
-        versionName '7.2.1'
+        versionName '7.2.2'
         minSdkVersion 16
         targetSdkVersion 29
         resConfigs 'ar', 'en', 'cs', 'de', 'el', 'es', 'fr', 'ja', 'pt', 'ru', 'tr', 'uk', 'vi', 'zh'

wear/build.gradle

@@ -9,8 +9,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 702011
+        versionCode 702021
-        versionName '7.2.1'
+        versionName '7.2.2'
         applicationId 'dev.lucasnlm.antimine'
         minSdkVersion 23
         targetSdkVersion 29