fix(android): return to correct game when reloading from background

autoreleasefool · Sep 14, 2024 · fac3b59 · fac3b59
1 parent 6b0400b
commit fac3b59
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/...id/core/navigation/src/main/java/ca/josephroque/bowlingcompanion/core/navigation/Route.kt b/...id/core/navigation/src/main/java/ca/josephroque/bowlingcompanion/core/navigation/Route.kt
@@ -120,6 +120,9 @@ sealed class Route(val route: String, val isBottomBarVisible: Boolean = true) {
 			savedStateHandle.get<String>("series")?.decodeListFromRoute()?.map {
 				SeriesID.fromString(it)
 			} ?: emptyList()
+		fun setGame(savedStateHandle: SavedStateHandle, game: GameID) {
+			savedStateHandle["game"] = game.toString()
+		}
 	}
 	data object EditTeamSeries : Route(
 		"edit_team_series/{teamSeries}/{game}",

diff --git a/...src/main/java/ca/josephroque/bowlingcompanion/feature/gameseditor/GamesEditorViewModel.kt b/...src/main/java/ca/josephroque/bowlingcompanion/feature/gameseditor/GamesEditorViewModel.kt
@@ -215,6 +215,14 @@ class GamesEditorViewModel @Inject constructor(
 		initialValue = GamesEditorScreenUiState.Loading,
 	)
 
+	init {
+		viewModelScope.launch(ioDispatcher) {
+			currentGameId
+				.onEach { Route.EditGame.setGame(savedStateHandle, it) }
+				.launchIn(this)
+		}
+	}
+
 	override fun onResume(owner: LifecycleOwner) {
 		isGameDetailsSheetVisible.value = true
 	}