zobrist/TichuCounter
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases 9 Wiki Activity

Reset gameFinished on removed round.

Browse Source 
closes: #52
This commit is contained in:
Fabian Zobrist
2023-09-27 18:30:03 +02:00
parent 44246e329e
commit 461dc4a30c
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/me/zobrist/tichucounter/ui/counter/CounterViewModel.kt
View File

@@ -168,6 +168,7 @@ class CounterViewModel @Inject constructor(
private val gameWon: Boolean private val gameWon: Boolean
get() = totalScoreA >= settings.victoryPoints.value || totalScoreB >= settings.victoryPoints.value get() = totalScoreA >= settings.victoryPoints.value || totalScoreB >= settings.victoryPoints.value
private var lastRoundCount: Int = 0
init { init {
viewModelScope.launch { viewModelScope.launch {
gameRepository.getActiveGameFlow().collect { gameRepository.getActiveGameFlow().collect {
@@ -183,18 +184,30 @@ class CounterViewModel @Inject constructor(
buildTeamNameSuggestions() buildTeamNameSuggestions()
// Game has changed
if (it.game.uid != lastGame?.uid) { if (it.game.uid != lastGame?.uid) {
if (lastGame != null) { if (lastGame != null) {
settings.gameFinished.value = false settings.gameFinished.value = false
} }
lastGame = it.game lastGame = it.game
lastRoundCount = it.rounds.size
} }
// Game winning condition
if (!settings.gameFinished.value) { if (!settings.gameFinished.value) {
if (gameWon) { if (gameWon) {
showVictoryDialog = true showVictoryDialog = true
} }
} }
// Undo game winning if rounds were removed
if(lastRoundCount > it.rounds.size)
{
if(!gameWon){
settings.gameFinished.value = false
}
}
lastRoundCount = it.rounds.size
} }
} }
} }