Change tips number

lucasnlm · Dec 8, 2021 · 2daeb53 · 2daeb53
1 parent 541a0f0
commit 2daeb53
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
@@ -456,11 +456,7 @@ class GameActivity :
         tipsCounter.apply {
             visibility = if (canUseHelpNow) View.VISIBLE else View.GONE
             text = if (canRequestHelpWithAds) {
-                if (instantAppManager.isEnabled(applicationContext)) {
-                    "+" + 10.toL10nString()
-                } else {
-                    "+" + 25.toL10nString()
-                }
+                "+5"
             } else {
                 gameViewModel.getTips().toL10nString()
             }
@@ -489,12 +485,7 @@ class GameActivity :
                                 activity = this@GameActivity,
                                 skipIfFrequent = false,
                                 onRewarded = {
-                                    val value = if (instantAppManager.isEnabled(applicationContext)) {
-                                        10
-                                    } else {
-                                        25
-                                    }
-
+                                    val value = 5
                                     gameViewModel.revealRandomMine(false)
                                     gameViewModel.sendEvent(GameEvent.GiveMoreTip(value))
                                 },

diff --git a/themes/src/main/java/dev/lucasnlm/antimine/themes/ThemeActivity.kt b/themes/src/main/java/dev/lucasnlm/antimine/themes/ThemeActivity.kt
@@ -127,9 +127,9 @@ class ThemeActivity : ThematicActivity(R.layout.activity_theme), Slider.OnChange
                         cloudSaveManager.uploadSave()
                     }
 
-                    squareSize.value = it.squareSize.toFloat()
-                    squareDivider.value = it.squareDivider.toFloat()
-                    squareRadius.value = it.squareRadius.toFloat()
+                    squareSize.value = (it.squareSize / squareSize.stepSize).toInt() * squareSize.stepSize
+                    squareDivider.value = (it.squareDivider / squareSize.stepSize).toInt() * squareSize.stepSize
+                    squareRadius.value = (it.squareRadius / squareSize.stepSize).toInt() * squareSize.stepSize
                 }
             }
         }