Improve delete multiple games in a row.
All checks were successful
Build Android / build (push) Successful in 2m32s

closes #53
This commit is contained in:
2023-11-02 22:05:02 +01:00
parent 1e13c6f849
commit f48bf783b5
3 changed files with 33 additions and 11 deletions

View File

@@ -27,6 +27,8 @@ class GameRepository @Inject constructor(
private val newGameFlow = MutableStateFlow(Game()) private val newGameFlow = MutableStateFlow(Game())
private var deletedGame: GameWithScores? = null
init { init {
CoroutineScope(Dispatchers.IO).launch { CoroutineScope(Dispatchers.IO).launch {
gameDao.getActiveAsFlow().collect { gameDao.getActiveAsFlow().collect {
@@ -104,14 +106,33 @@ class GameRepository @Inject constructor(
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
try { try {
val game = gameDao.getGameById(uid) val game = gameDao.getGameById(uid)
gameDao.delete(game)
val rounds = roundDao.getAllForGame(game.uid) val rounds = roundDao.getAllForGame(game.uid)
deletedGame = GameWithScores(game, rounds)
gameDao.delete(game)
roundDao.delete(rounds) roundDao.delete(rounds)
} catch (_: NullPointerException) { } catch (_: NullPointerException) {
} }
} }
} }
suspend fun restoreLastDeletedGame() {
if (deletedGame == null) {
return
}
val revert = deletedGame!!
deletedGame = null
withContext(Dispatchers.IO) {
gameDao.insert(revert.game)
revert.rounds.forEach {
roundDao.insert(it)
}
}
}
suspend fun deleteAllInactive() { suspend fun deleteAllInactive() {
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
try { try {

View File

@@ -95,6 +95,7 @@ fun HistoryList(
viewModel.activateGame(it) viewModel.activateGame(it)
lazyListState.animateScrollToItem(0) lazyListState.animateScrollToItem(0)
snackbarHostState.currentSnackbarData?.dismiss()
val result = snackbarHostState.showSnackbar( val result = snackbarHostState.showSnackbar(
message = activatedMessage, message = activatedMessage,
actionLabel = activatedActionLabel, actionLabel = activatedActionLabel,
@@ -108,7 +109,9 @@ fun HistoryList(
}, },
onDeleteClicked = { onDeleteClicked = {
scope.launch { scope.launch {
viewModel.markToDelete(it) viewModel.deleteGame(it)
snackbarHostState.currentSnackbarData?.dismiss()
val result = snackbarHostState.showSnackbar( val result = snackbarHostState.showSnackbar(
message = deletedMessage, message = deletedMessage,
actionLabel = deletedActionLabel, actionLabel = deletedActionLabel,
@@ -118,7 +121,7 @@ fun HistoryList(
if (result == SnackbarResult.Dismissed) { if (result == SnackbarResult.Dismissed) {
viewModel.deleteGame(it) viewModel.deleteGame(it)
} else { } else {
viewModel.unmarkToDelete(it) viewModel.restoreLastDeletedGame()
} }
} }
}, },

View File

@@ -33,20 +33,18 @@ class HistoryViewModel @Inject constructor(
} }
} }
fun markToDelete(gameId: Long) {
gameAndHistory = fullList.filter { it.game.uid != gameId }
}
fun unmarkToDelete(gameId: Long) {
gameAndHistory = fullList
}
fun deleteGame(gameId: Long) { fun deleteGame(gameId: Long) {
viewModelScope.launch { viewModelScope.launch {
gameRepository.deleteGame(gameId) gameRepository.deleteGame(gameId)
} }
} }
fun restoreLastDeletedGame() {
viewModelScope.launch {
gameRepository.restoreLastDeletedGame()
}
}
fun activateGame(gameId: Long) { fun activateGame(gameId: Long) {
viewModelScope.launch { viewModelScope.launch {
gameRepository.setActive(gameId) gameRepository.setActive(gameId)