Skip to content

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

feat: update MainActivity and NavGraph for terminal viewmodel scoping

ExTva60b34452cfe
diff --git a/app/src/main/java/com/excp/podroid/MainActivity.kt b/app/src/main/java/com/excp/podroid/MainActivity.kt
index 4c17d79..39d0656 100644
--- a/app/src/main/java/com/excp/podroid/MainActivity.kt
+++ b/app/src/main/java/com/excp/podroid/MainActivity.kt
@@ -9,6 +9,8 @@ import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
+import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
+import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
@@ -25,17 +27,22 @@ class MainActivity : ComponentActivity() {
@Inject lateinit var settingsRepository: SettingsRepository
+ @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContent {
+ val windowSizeClass = calculateWindowSizeClass(this)
val darkTheme by settingsRepository.darkTheme.collectAsState(initial = true)
PodroidTheme(darkTheme = darkTheme) {
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background,
) {
- PodroidNavGraph(settingsRepository = settingsRepository)
+ PodroidNavGraph(
+ settingsRepository = settingsRepository,
+ windowSizeClass = windowSizeClass
+ )
}
}
}
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 f60d580..b428fec 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,5 +1,6 @@
package com.excp.podroid.ui.navigation
+import androidx.compose.material3.windowsizeclass.WindowSizeClass
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
@@ -25,6 +26,7 @@ object Routes {
@Composable
fun PodroidNavGraph(
settingsRepository: SettingsRepository,
+ windowSizeClass: WindowSizeClass,
navController: NavHostController = rememberNavController(),
) {
val isSetupDone by settingsRepository.isSetupDone.collectAsState(initial = null)
@@ -44,6 +46,7 @@ fun PodroidNavGraph(
) {
composable(Routes.SETUP) {
SetupScreen(
+ windowSizeClass = windowSizeClass,
onSetupComplete = {
navController.navigate(Routes.HOME) {
popUpTo(Routes.SETUP) { inclusive = true }
@@ -54,6 +57,7 @@ fun PodroidNavGraph(
composable(Routes.HOME) {
HomeScreen(
+ windowSizeClass = windowSizeClass,
onNavigateToTerminal = {
navController.navigate(Routes.TERMINAL) { launchSingleTop = true }
},
@@ -65,6 +69,7 @@ fun PodroidNavGraph(
composable(Routes.TERMINAL) {
TerminalScreen(
+ windowSizeClass = windowSizeClass,
viewModel = terminalViewModel,
onNavigateBack = {
// Only pop if we're not already at HOME to avoid the warning
@@ -81,6 +86,7 @@ fun PodroidNavGraph(
composable(Routes.SETTINGS) {
SettingsScreen(
+ windowSizeClass = windowSizeClass,
onNavigateBack = {
if (navController.currentDestination?.route == Routes.SETTINGS) {
navController.popBackStack()
@@ -90,9 +96,6 @@ fun PodroidNavGraph(
}
}
},
- onThemeOrFontChanged = {
- terminalViewModel.invalidateTerminalView()
- },
)
}
}