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

Prevent winning dialog on game selected with sufficient points.
All checks were successful
Build Android / build (push) Successful in 8m36s
Details

Browse Source
This commit is contained in:
Fabian Zobrist
2023-09-27 18:53:05 +02:00
parent fa9786de04
commit 45ae61584d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,6 +169,7 @@ class CounterViewModel @Inject constructor(
get() = totalScoreA >= settings.victoryPoints.value || totalScoreB >= settings.victoryPoints.value get() = totalScoreA >= settings.victoryPoints.value || totalScoreB >= settings.victoryPoints.value
private var lastRoundCount: Int = 0 private var lastRoundCount: Int = 0
init { init {
viewModelScope.launch { viewModelScope.launch {
gameRepository.getActiveGameFlow().collect { gameRepository.getActiveGameFlow().collect {
@@ -191,6 +192,7 @@ class CounterViewModel @Inject constructor(
} }
lastGame = it.game lastGame = it.game
lastRoundCount = it.rounds.size lastRoundCount = it.rounds.size
return@collect
} }
// Game winning condition // Game winning condition
@@ -201,8 +203,7 @@ class CounterViewModel @Inject constructor(
} }
// Undo game winning if rounds were removed // Undo game winning if rounds were removed
if(lastRoundCount > it.rounds.size) if (lastRoundCount > it.rounds.size) {
{
if (!gameWon) { if (!gameWon) {
settings.gameFinished.value = false settings.gameFinished.value = false
} }

1
app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt
View File

@@ -53,7 +53,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import me.zobrist.tichucounter.R import me.zobrist.tichucounter.R