wbrawner/antimine-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid haptic feedback on complete game overs

Browse source
This commit is contained in:
Lucas Lima 2021-01-01 12:36:36 -03:00 committed by Lucas Nunes
parent f134b3fc09
commit 460e92bee2
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
View file

@ -804,13 +804,13 @@ class GameActivity : ThematicActivity(R.layout.activity_game), DialogInterface.O
gameViewModel.stopClock() gameViewModel.stopClock()
if (!isResuming) { if (!isResuming) {
val isGameCompleted = gameViewModel.isCompletedWithMistakes()
cloudSaveManager.uploadSave() cloudSaveManager.uploadSave()
lifecycleScope.launch { lifecycleScope.launch {
gameViewModel.gameOver(isResuming) gameViewModel.gameOver(isResuming, !isGameCompleted)
gameViewModel.saveGame() gameViewModel.saveGame()
waitAndShowEndGameAlert( waitAndShowEndGameAlert(
gameResult = if (gameViewModel.isCompletedWithMistakes()) gameResult = if (isGameCompleted) GameResult.Completed else GameResult.GameOver,
GameResult.Completed else GameResult.GameOver,
await = true, await = true,
canContinue = gameViewModel.hasUnknownMines(), canContinue = gameViewModel.hasUnknownMines(),
) )

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

@ -428,11 +428,11 @@ open class GameViewModel(
} }
} }
suspend fun gameOver(fromResumeGame: Boolean) { suspend fun gameOver(fromResumeGame: Boolean, useGameOverFeedback: Boolean) {
gameController.run { gameController.run {
analyticsManager.sentEvent(Analytics.GameOver(clock.time(), getScore())) analyticsManager.sentEvent(Analytics.GameOver(clock.time(), getScore()))
if (!fromResumeGame) { if (!fromResumeGame && useGameOverFeedback) {
if (preferencesRepository.useHapticFeedback()) { if (preferencesRepository.useHapticFeedback()) {
hapticFeedbackManager.explosionFeedback() hapticFeedbackManager.explosionFeedback()
} }