Skip to content

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

ui: monitor toggle in terminal top bar -> X11 screen

ExTvba1b696b254e
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 3289ac3..968358c 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
@@ -14,12 +14,14 @@ 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 com.excp.podroid.ui.screens.terminal.TerminalViewModel
+import com.excp.podroid.ui.screens.x11.X11Screen
object Routes {
- const val SETUP = "setup"
- const val HOME = "home"
- const val TERMINAL = "terminal"
- const val SETTINGS = "settings"
+ const val SETUP = "setup"
+ const val HOME = "home"
+ const val TERMINAL = "terminal"
+ const val TERMINAL_X11 = "terminal/x11"
+ const val SETTINGS = "settings"
}
@Composable
@@ -83,6 +85,24 @@ fun PodroidNavGraph(
}
}
},
+ onNavigateToX11 = {
+ navController.navigate(Routes.TERMINAL_X11) { launchSingleTop = true }
+ },
+ )
+ }
+
+ composable(Routes.TERMINAL_X11) {
+ X11Screen(
+ onNavigateBack = {
+ if (!navController.popBackStack(Routes.TERMINAL, inclusive = false)) {
+ navController.navigate(Routes.TERMINAL) { launchSingleTop = true }
+ }
+ },
+ onNavigateToTerminal = {
+ if (!navController.popBackStack(Routes.TERMINAL, inclusive = false)) {
+ navController.navigate(Routes.TERMINAL) { launchSingleTop = true }
+ }
+ },
)
}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt
index 4b8444b..4e6e898 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt
@@ -53,6 +53,7 @@ import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.windowsizeclass.WindowSizeClass
import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.DesktopWindows
import androidx.compose.material.icons.filled.Search
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.BoxScope
@@ -118,6 +119,7 @@ import com.termux.view.TerminalView
fun TerminalScreen(
windowSizeClass: WindowSizeClass,
onNavigateBack: () -> Unit,
+ onNavigateToX11: () -> Unit,
viewModel: TerminalViewModel = hiltViewModel(),
) {
val context = LocalContext.current
@@ -194,6 +196,9 @@ fun TerminalScreen(
}
},
actions = {
+ IconButton(onClick = onNavigateToX11) {
+ Icon(Icons.Default.DesktopWindows, contentDescription = "X11 screen")
+ }
IconButton(onClick = { viewModel.openQuickSettings() }) {
Text("⚙", fontSize = 18.sp)
}