Skip to content

A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.

fix: scope TerminalViewModel outside NavHost so it survives navigation

ExTv30d35acbd8c9
diff --git a/app/src/main/java/com/excp/podroid/ui/navigation/NavGraph.kt b/app/src/main/java/com/excp/podroid/ui/navigation/NavGraph.kt
index 3eba168..1d9ff18 100644
--- a/app/src/main/java/com/excp/podroid/ui/navigation/NavGraph.kt
+++ b/app/src/main/java/com/excp/podroid/ui/navigation/NavGraph.kt
@@ -1,7 +1,6 @@
package com.excp.podroid.ui.navigation
import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.hilt.navigation.compose.hiltViewModel
@@ -14,7 +13,7 @@ import com.excp.podroid.ui.screens.home.HomeScreen
import com.excp.podroid.ui.screens.settings.SettingsScreen
import com.excp.podroid.ui.screens.setup.SetupScreen
import com.excp.podroid.ui.screens.terminal.TerminalScreen
-import javax.inject.Inject
+import com.excp.podroid.ui.screens.terminal.TerminalViewModel
object Routes {
const val SETUP = "setup"
@@ -30,11 +29,13 @@ fun PodroidNavGraph(
) {
val isSetupDone by settingsRepository.isSetupDone.collectAsState(initial = null)
- // Wait until we know whether setup is done before deciding the start destination
+ // Scoped to PodroidNavGraph composable — survives all navigation including popUpTo(0)
+ val terminalViewModel: TerminalViewModel = hiltViewModel()
+
val startDestination = when (isSetupDone) {
true -> Routes.HOME
false -> Routes.SETUP
- null -> return // still loading — render nothing to avoid flicker
+ null -> return
}
NavHost(
@@ -64,6 +65,7 @@ fun PodroidNavGraph(
composable(Routes.TERMINAL) {
TerminalScreen(
+ viewModel = terminalViewModel,
onNavigateBack = {
if (!navController.popBackStack(Routes.HOME, inclusive = false)) {
navController.navigate(Routes.HOME) {
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt
index 6d11d49..f1c0915 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt
@@ -67,6 +67,7 @@ class TerminalViewModel @Inject constructor(
private var attached = false
fun getOrCreateTerminalView(): TerminalView {
+ Log.d(TAG, "getOrCreateTerminalView called, current view: $terminalView, this: ${System.identityHashCode(this)}")
terminalView?.let { return it }
val colorFile = java.io.File(context.filesDir, "colors.properties")