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

Merge branch 'master' into update-translations

Browse source
This commit is contained in:
Lucas Nunes 2020-07-26 20:33:05 -03:00 committed by GitHub
commit e9333296b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,6 @@ class GameViewModel @ViewModelInject constructor(
private lateinit var gameController: GameController
private var currentDifficulty: Difficulty = Difficulty.Standard
private var initialized = false
val field = MutableLiveData<List<Area>>()
val fieldRefresh = MutableLiveData<Int>()
@ -155,8 +154,6 @@ class GameViewModel @ViewModelInject constructor(
} else {
// Fail to load
startNewGame()
}.also {
initialized = true
}
}
@ -182,8 +179,6 @@ class GameViewModel @ViewModelInject constructor(
} else {
// Fail to load
startNewGame()
}.also {
initialized = true
}
}
@ -197,22 +192,18 @@ class GameViewModel @ViewModelInject constructor(
} else {
// Fail to load
startNewGame()
}.also {
initialized = true
}
}
fun pauseGame() {
if (initialized) {
if (gameController.hasMines) {
eventObserver.postValue(Event.Pause)
}
clock.stop()
if (gameController.hasMines) {
eventObserver.postValue(Event.Pause)
}
clock.stop()
}
suspend fun saveGame() {
if (initialized && gameController.hasMines) {
if (gameController.hasMines) {
val id = savesRepository.saveGame(
gameController.getSaveState(elapsedTimeSeconds.value ?: 0L, currentDifficulty)
)
@ -222,7 +213,7 @@ class GameViewModel @ViewModelInject constructor(
}
private suspend fun saveStats() {
if (initialized && gameController.hasMines) {
if (gameController.hasMines) {
gameController.getStats(elapsedTimeSeconds.value ?: 0L)?.let {
statsRepository.addStats(it)
}
@ -230,7 +221,7 @@ class GameViewModel @ViewModelInject constructor(
}
fun resumeGame() {
if (initialized && gameController.hasMines && !gameController.isGameOver()) {
if (gameController.hasMines && !gameController.isGameOver()) {
eventObserver.postValue(Event.Resume)
runClock()
}