Skip to content

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

feat(ui): follow Material 3 and platform conventions across the app

ExTv3713e08e1c44
diff --git a/app/src/main/java/com/excp/podroid/ui/components/PodroidListRow.kt b/app/src/main/java/com/excp/podroid/ui/components/PodroidListRow.kt
index 76cfc65..cba5081 100644
--- a/app/src/main/java/com/excp/podroid/ui/components/PodroidListRow.kt
+++ b/app/src/main/java/com/excp/podroid/ui/components/PodroidListRow.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.material3.HorizontalDivider
@@ -13,6 +14,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.Role
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
@@ -39,7 +41,8 @@ fun PodroidListRow(
) {
val rowMod = modifier
.fillMaxWidth()
- .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier)
+ .heightIn(min = 48.dp)
+ .then(if (onClick != null) Modifier.clickable(role = Role.Button, onClick = onClick) else Modifier)
.padding(vertical = PodroidTokens.Spacing.MD)
Row(
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 04cf9af..eb2d3cd 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,9 +1,14 @@
package com.excp.podroid.ui.navigation
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.windowsizeclass.WindowSizeClass
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
import androidx.activity.compose.LocalActivity
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -44,10 +49,19 @@ fun PodroidNavGraph(
// Scoped to PodroidNavGraph composable — survives all navigation including popUpTo(0)
val terminalViewModel: TerminalViewModel = hiltViewModel()
+ if (isSetupDone == null) {
+ // isSetupDone starts null on every fresh composition (e.g. the
+ // activity.recreate() a language change triggers) until the flow's
+ // first value arrives. Paint the themed background instead of
+ // returning with nothing composed, so that frame doesn't flash an
+ // empty window.
+ Box(modifier = Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background))
+ return
+ }
+
val startDestination = when (isSetupDone) {
true -> Routes.HOME
- false -> Routes.SETUP
- null -> return
+ else -> Routes.SETUP
}
NavHost(
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupScreen.kt
index c92b205..a6488ed 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupScreen.kt
@@ -1,6 +1,5 @@
package com.excp.podroid.ui.screens.backup
-import android.widget.Toast
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
@@ -18,12 +17,15 @@ import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Text
import androidx.compose.material3.windowsizeclass.WindowSizeClass
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontFamily
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -36,6 +38,7 @@ import com.excp.podroid.ui.components.PodroidPrimaryButton
import com.excp.podroid.ui.components.PodroidSectionLabel
import com.excp.podroid.ui.components.PodroidTopBar
import com.excp.podroid.ui.theme.PodroidTokens
+import kotlinx.coroutines.launch
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -45,7 +48,9 @@ fun ContainerBackupScreen(
viewModel: ContainerBackupViewModel = hiltViewModel(),
) {
val ui by viewModel.uiState.collectAsStateWithLifecycle()
- val context = LocalContext.current
+ val snackbarHostState = remember { SnackbarHostState() }
+ val scope = rememberCoroutineScope()
+ val copiedMessage = stringResource(R.string.container_backup_copied)
Scaffold(
topBar = {
@@ -58,6 +63,7 @@ fun ContainerBackupScreen(
},
)
},
+ snackbarHost = { SnackbarHost(snackbarHostState) },
) { innerPadding ->
AdaptiveContainer(
windowSizeClass = windowSizeClass,
@@ -117,7 +123,7 @@ fun ContainerBackupScreen(
text = stringResource(R.string.container_backup_copy_export),
onClick = {
if (viewModel.copyExportCommand()) {
- Toast.makeText(context, context.getString(R.string.container_backup_copied), Toast.LENGTH_SHORT).show()
+ scope.launch { snackbarHostState.showSnackbar(copiedMessage) }
}
},
enabled = ui.containerName.isNotBlank(),
@@ -136,7 +142,7 @@ fun ContainerBackupScreen(
text = stringResource(R.string.container_backup_copy_save),
onClick = {
if (viewModel.copySaveCommand()) {
- Toast.makeText(context, context.getString(R.string.container_backup_copied), Toast.LENGTH_SHORT).show()
+ scope.launch { snackbarHostState.showSnackbar(copiedMessage) }
}
},
modifier = Modifier.fillMaxWidth(),
@@ -147,7 +153,7 @@ fun ContainerBackupScreen(
text = stringResource(R.string.container_backup_copy_list),
onClick = {
viewModel.copyListCommand()
- Toast.makeText(context, context.getString(R.string.container_backup_copied), Toast.LENGTH_SHORT).show()
+ scope.launch { snackbarHostState.showSnackbar(copiedMessage) }
},
modifier = Modifier.fillMaxWidth(),
)
@@ -155,7 +161,7 @@ fun ContainerBackupScreen(
text = stringResource(R.string.container_backup_copy_all),
onClick = {
viewModel.copyAllCommand()
- Toast.makeText(context, context.getString(R.string.container_backup_copied), Toast.LENGTH_SHORT).show()
+ scope.launch { snackbarHostState.showSnackbar(copiedMessage) }
},
modifier = Modifier.fillMaxWidth(),
)
@@ -174,7 +180,13 @@ fun ContainerBackupScreen(
onClick = viewModel::refresh,
modifier = Modifier.fillMaxWidth(),
)
- if (ui.backupFiles.isEmpty()) {
+ if (ui.backupListError) {
+ Text(
+ text = stringResource(R.string.container_backup_list_error),
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.error,
+ )
+ } else if (ui.backupFiles.isEmpty()) {
Text(
text = stringResource(R.string.container_backup_none),
style = MaterialTheme.typography.bodyMedium,
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
index f4f8240..a69877b 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
@@ -49,6 +49,7 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -122,11 +123,17 @@ fun SettingsScreen(
val usbPassthrough by viewModel.usbPassthroughEnabled.collectAsStateWithLifecycle()
val autostartOnBoot by viewModel.autostartOnBoot.collectAsStateWithLifecycle()
- var advancedExpanded by remember { mutableStateOf(false) }
- var showAddDialog by remember { mutableStateOf(false) }
- var showResetDialog by remember { mutableStateOf(false) }
- var showLanguageDialog by remember { mutableStateOf(false) }
- var avfReportText by remember { mutableStateOf<String?>(null) }
+ // rememberSaveable: changing the language calls activity.recreate(), which
+ // would otherwise silently close any open dialog and collapse Advanced.
+ var advancedExpanded by rememberSaveable { mutableStateOf(false) }
+ var showAddDialog by rememberSaveable { mutableStateOf(false) }
+ var showResetDialog by rememberSaveable { mutableStateOf(false) }
+ var showLanguageDialog by rememberSaveable { mutableStateOf(false) }
+ var avfReportText by rememberSaveable { mutableStateOf<String?>(null) }
+ // Not rememberSaveable: this flag only tracks the in-flight avfScope coroutine
+ // below, which is cancelled on activity.recreate(); restoring a saved `true`
+ // would permanently disable the diagnostic button since nothing would ever
+ // clear it back to false.
var avfRunning by remember { mutableStateOf(false) }
val avfScope = rememberCoroutineScope()
val ctx = LocalContext.current
@@ -140,6 +147,24 @@ fun SettingsScreen(
val isUsbPassthroughAvailable = activeBackendId == "qemu"
val backendFallback by viewModel.backendFallback.collectAsStateWithLifecycle()
+ val runAvfDiagnostic: () -> Unit = {
+ if (!avfRunning) {
+ avfRunning = true
+ avfReportText = ctx.getString(R.string.probing_avf)
+ avfScope.launch {
+ val probe = AvfDiagnostics.probe(ctx)
+ val smoke = if (probe.featureSupported && probe.managePermissionGranted) {
+ withContext(Dispatchers.IO) { AvfDiagnostics.runSmokeTest(ctx) }
+ } else null
+ avfReportText = probe.copy(
+ smokeTestResult = smoke,
+ activeBackend = activeBackendId,
+ ).pretty()
+ avfRunning = false
+ }
+ }
+ }
+
// Re-sync the persisted storageAccessEnabled flag against the real OS grant on
// every resume (user may have denied all-files-access on the system screen we
// sent them to, but the DataStore flag still reads true).
@@ -198,93 +223,35 @@ fun SettingsScreen(
.padding(horizontal = PodroidTokens.Spacing.XL),
) {
// ── APPEARANCE ────────────────────────────────────────
- PodroidSectionLabel(stringResource(R.string.appearance))
- PodroidListRow(
- label = stringResource(R.string.dark_theme),
- rightSlot = {
- PodroidSwitch(
- checked = ui.darkTheme,
- onCheckedChange = { viewModel.setDarkTheme(it) },
- )
- },
- )
- PodroidListRow(
- label = stringResource(R.string.dynamic_color),
- rightSlot = {
- PodroidSwitch(
- checked = ui.dynamicColorEnabled,
- onCheckedChange = { viewModel.setDynamicColorEnabled(it) },
- )
- },
+ AppearanceSection(
+ darkTheme = ui.darkTheme,
+ onDarkThemeChange = viewModel::setDarkTheme,
+ dynamicColorEnabled = ui.dynamicColorEnabled,
+ onDynamicColorChange = viewModel::setDynamicColorEnabled,
)
// ── LANGUAGE ───────────────────────────────────────────
- PodroidSectionLabel(stringResource(R.string.language_label))
- PodroidListRow(
- label = stringResource(R.string.language_label),
- value = languageDisplayName(ui.language, ui.systemDefaultLanguage),
+ LanguageSection(
+ language = ui.language,
+ systemDefaultLanguage = ui.systemDefaultLanguage,
onClick = { showLanguageDialog = true },
)
// ── VM RESOURCES ──────────────────────────────────────
- PodroidSectionLabel(stringResource(R.string.vm_resources))
- if (!vmNotRunning) {
- Text(
- text = stringResource(R.string.stop_vm_to_change),
- style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.error,
- modifier = Modifier.padding(top = PodroidTokens.Spacing.SM),
- )
- }
- PodroidListRow(
- label = stringResource(R.string.load_balance),
- rightSlot = {
- PodroidSwitch(
- checked = ui.loadBalanceEnabled,
- onCheckedChange = { viewModel.setLoadBalanceEnabled(it) },
- enabled = vmNotRunning,
- )
- },
- )
- VmRamChips(
- currentMb = ui.vmRamMb,
- onChange = viewModel::setVmRamMb,
- enabled = vmNotRunning && !ui.loadBalanceEnabled,
- )
- VmCpuChips(
- currentCpus = ui.vmCpus,
- onChange = viewModel::setVmCpus,
- enabled = vmNotRunning && !ui.loadBalanceEnabled,
- )
- VmBandwidthChips(
- currentMbps = ui.bandwidthMbps,
- onChange = viewModel::setBandwidthMbps,
- enabled = vmNotRunning && !ui.loadBalanceEnabled,
- )
- VmStorageChips(
- currentGb = ui.storageSizeGb,
- onChange = viewModel::setStorageSizeGb,
- minGb = ui.storageSizeGb,
- enabled = vmNotRunning && !ui.loadBalanceEnabled,
- )
- PodroidListRow(
- label = stringResource(R.string.autostart_on_boot),
- rightSlot = {
- PodroidSwitch(
- checked = autostartOnBoot,
- onCheckedChange = { viewModel.setAutostartOnBoot(it) },
- )
- },
- )
- Text(
- text = stringResource(R.string.autostart_on_boot_desc),
- style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.onSurfaceVariant,
- modifier = Modifier.padding(
- start = PodroidTokens.Spacing.MD,
- end = PodroidTokens.Spacing.MD,
- bottom = PodroidTokens.Spacing.SM,
- ),
+ VmResourcesSection(
+ vmNotRunning = vmNotRunning,
+ loadBalanceEnabled = ui.loadBalanceEnabled,
+ onLoadBalanceChange = viewModel::setLoadBalanceEnabled,
+ vmRamMb = ui.vmRamMb,
+ onVmRamChange = viewModel::setVmRamMb,
+ vmCpus = ui.vmCpus,
+ onVmCpusChange = viewModel::setVmCpus,
+ bandwidthMbps = ui.bandwidthMbps,
+ onBandwidthChange = viewModel::setBandwidthMbps,
+ storageSizeGb = ui.storageSizeGb,
+ onStorageSizeChange = viewModel::setStorageSizeGb,
+ autostartOnBoot = autostartOnBoot,
+ onAutostartChange = viewModel::setAutostartOnBoot,
)
// ── NETWORK ───────────────────────────────────────────
@@ -296,6 +263,7 @@ fun SettingsScreen(
)
PodroidListRow(
label = stringResource(R.string.ssh),
+ onClick = { if (vmNotRunning) viewModel.setSshEnabled(!ui.sshEnabled) },
rightSlot = {
PodroidSwitch(
checked = ui.sshEnabled,
@@ -397,52 +365,14 @@ fun SettingsScreen(
}
// ── ABOUT ─────────────────────────────────────────────
- PodroidSectionLabel(stringResource(R.string.about))
- PodroidListRow(label = stringResource(R.string.version_label), value = "v${BuildConfig.VERSION_NAME}", mono = true)
- PodroidListRow(label = stringResource(R.string.qemu_label), value = "v${BuildConfig.QEMU_VERSION}", mono = true)
- PodroidListRow(label = stringResource(R.string.architecture), value = "AArch64", mono = true)
- PodroidListRow(label = stringResource(R.string.linux_distro), value = "Alpine 3.24", mono = true)
- Spacer(Modifier.height(PodroidTokens.Spacing.MD))
- val uriHandler = LocalUriHandler.current
- PodroidGhostButton(
- text = stringResource(R.string.documentation),
- onClick = { uriHandler.openUri("https://extv.github.io/Podroid/guide/") },
- )
- Spacer(Modifier.height(PodroidTokens.Spacing.SM))
- PodroidGhostButton(
- text = stringResource(R.string.export_diagnostic_log),
- onClick = { viewModel.exportConsoleLogs() },
- )
- Spacer(Modifier.height(PodroidTokens.Spacing.SM))
// Use lifecycle-aware collection to match the rest of the screen.
val avfVerbose by viewModel.avfVerboseLogging.collectAsStateWithLifecycle()
- PodroidListRow(
- label = stringResource(R.string.verbose_avf_logging),
- rightSlot = {
- PodroidSwitch(
- checked = avfVerbose,
- onCheckedChange = { viewModel.setAvfVerboseLogging(it) },
- )
- },
- )
- PodroidGhostButton(
- text = if (avfRunning) stringResource(R.string.running_avf_diagnostic) else stringResource(R.string.avf_diagnostic),
- onClick = {
- if (avfRunning) return@PodroidGhostButton
- avfRunning = true
- avfReportText = ctx.getString(R.string.probing_avf)
- avfScope.launch {
- val probe = AvfDiagnostics.probe(ctx)
- val smoke = if (probe.featureSupported && probe.managePermissionGranted) {
- withContext(Dispatchers.IO) { AvfDiagnostics.runSmokeTest(ctx) }
- } else null
- avfReportText = probe.copy(
- smokeTestResult = smoke,
- activeBackend = activeBackendId,
- ).pretty()
- avfRunning = false
- }
- },
+ AboutSection(
+ avfVerboseLogging = avfVerbose,
+ onAvfVerboseLoggingChange = viewModel::setAvfVerboseLogging,
+ avfRunning = avfRunning,
+ onRunAvfDiagnostic = runAvfDiagnostic,
+ onExportLogs = { viewModel.exportConsoleLogs() },
)
Spacer(Modifier.height(PodroidTokens.Spacing.XL2))
@@ -466,96 +396,295 @@ fun SettingsScreen(
}
avfReportText?.let { report ->
- AlertDialog(
- onDismissRequest = { avfReportText = null },
- title = { Text(stringResource(R.string.avf_diagnostic)) },
- text = {
- androidx.compose.material3.Card(
- colors = androidx.compose.material3.CardDefaults.cardColors(
- containerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
- ),
- modifier = Modifier.fillMaxWidth(),
- ) {
- androidx.compose.foundation.layout.Box(
- modifier = Modifier
- .fillMaxWidth()
- .verticalScroll(rememberScrollState())
- .padding(PodroidTokens.Spacing.SM),
- ) {
- Text(
- text = report,
- fontFamily = FontFamily.Monospace,
- style = MaterialTheme.typography.labelSmall.copy(
- fontSize = 10.sp,
- lineHeight = 14.sp,
- ),
- )
- }
- }
- },
- confirmButton = {
- TextButton(onClick = { avfReportText = null }) { Text(stringResource(R.string.close)) }
- },
+ AvfDiagnosticDialog(
+ report = report,
+ onDismiss = { avfReportText = null },
)
}
if (showResetDialog) {
- AlertDialog(
- onDismissRequest = { showResetDialog = false },
- title = { Text(stringResource(R.string.reset_vm_description)) },
- text = {
- Text(stringResource(R.string.reset_vm_text))
- },
- confirmButton = {
- TextButton(onClick = {
- viewModel.resetVm()
- showResetDialog = false
- }) {
- Text(stringResource(R.string.reset_everything), color = MaterialTheme.colorScheme.error)
- }
- },
- dismissButton = {
- TextButton(onClick = { showResetDialog = false }) {
- Text(stringResource(R.string.cancel))
- }
+ ResetVmDialog(
+ onConfirm = {
+ viewModel.resetVm()
+ showResetDialog = false
},
+ onDismiss = { showResetDialog = false },
)
}
if (showLanguageDialog) {
- AlertDialog(
- onDismissRequest = { showLanguageDialog = false },
- title = { Text(stringResource(R.string.language_label)) },
- text = {
- Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
- listOf(
- "auto" to stringResource(R.string.system_default),
- "zh" to stringResource(R.string.language_zh),
- "en" to stringResource(R.string.language_en),
- ).forEach { (code, label) ->
- FilterChip(
- selected = ui.language == code,
- onClick = {
- avfScope.launch {
- viewModel.setLanguage(code)
- showLanguageDialog = false
- onLanguageChanged()
- }
- },
- label = { Text(label) },
- shape = RoundedCornerShape(PodroidTokens.Radius.Chip),
- colors = PodroidChipColors(),
- )
- }
- }
- },
- confirmButton = {
- TextButton(onClick = { showLanguageDialog = false }) {
- Text(stringResource(R.string.cancel))
+ LanguagePickerDialog(
+ selectedLanguage = ui.language,
+ onSelect = { code ->
+ avfScope.launch {
+ viewModel.setLanguage(code)
+ showLanguageDialog = false
+ onLanguageChanged()
}
},
+ onDismiss = { showLanguageDialog = false },
+ )
+ }
+}
+
+@Composable
+private fun AppearanceSection(
+ darkTheme: Boolean,
+ onDarkThemeChange: (Boolean) -> Unit,
+ dynamicColorEnabled: Boolean,
+ onDynamicColorChange: (Boolean) -> Unit,
+) {
+ PodroidSectionLabel(stringResource(R.string.appearance))
+ PodroidListRow(
+ label = stringResource(R.string.dark_theme),
+ onClick = { onDarkThemeChange(!darkTheme) },
+ rightSlot = {
+ PodroidSwitch(
+ checked = darkTheme,
+ onCheckedChange = onDarkThemeChange,
+ )
+ },
+ )
+ PodroidListRow(
+ label = stringResource(R.string.dynamic_color),
+ onClick = { onDynamicColorChange(!dynamicColorEnabled) },
+ rightSlot = {
+ PodroidSwitch(
+ checked = dynamicColorEnabled,
+ onCheckedChange = onDynamicColorChange,
+ )
+ },
+ )
+}
+
+@Composable
+private fun LanguageSection(
+ language: String,
+ systemDefaultLanguage: String,
+ onClick: () -> Unit,
+) {
+ PodroidSectionLabel(stringResource(R.string.language_label))
+ PodroidListRow(
+ label = stringResource(R.string.language_label),
+ value = languageDisplayName(language, systemDefaultLanguage),
+ onClick = onClick,
+ )
+}
+
+@Composable
+private fun VmResourcesSection(
+ vmNotRunning: Boolean,
+ loadBalanceEnabled: Boolean,
+ onLoadBalanceChange: (Boolean) -> Unit,
+ vmRamMb: Int,
+ onVmRamChange: (Int) -> Unit,
+ vmCpus: Int,
+ onVmCpusChange: (Int) -> Unit,
+ bandwidthMbps: Int,
+ onBandwidthChange: (Int) -> Unit,
+ storageSizeGb: Int,
+ onStorageSizeChange: (Int) -> Unit,
+ autostartOnBoot: Boolean,
+ onAutostartChange: (Boolean) -> Unit,
+) {
+ PodroidSectionLabel(stringResource(R.string.vm_resources))
+ if (!vmNotRunning) {
+ Text(
+ text = stringResource(R.string.stop_vm_to_change),
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.error,
+ modifier = Modifier.padding(top = PodroidTokens.Spacing.SM),
)
}
+ PodroidListRow(
+ label = stringResource(R.string.load_balance),
+ onClick = { if (vmNotRunning) onLoadBalanceChange(!loadBalanceEnabled) },
+ rightSlot = {
+ PodroidSwitch(
+ checked = loadBalanceEnabled,
+ onCheckedChange = onLoadBalanceChange,
+ enabled = vmNotRunning,
+ )
+ },
+ )
+ VmRamChips(
+ currentMb = vmRamMb,
+ onChange = onVmRamChange,
+ enabled = vmNotRunning && !loadBalanceEnabled,
+ )
+ VmCpuChips(
+ currentCpus = vmCpus,
+ onChange = onVmCpusChange,
+ enabled = vmNotRunning && !loadBalanceEnabled,
+ )
+ VmBandwidthChips(
+ currentMbps = bandwidthMbps,
+ onChange = onBandwidthChange,
+ enabled = vmNotRunning && !loadBalanceEnabled,
+ )
+ VmStorageChips(
+ currentGb = storageSizeGb,
+ onChange = onStorageSizeChange,
+ minGb = storageSizeGb,
+ enabled = vmNotRunning && !loadBalanceEnabled,
+ )
+ PodroidListRow(
+ label = stringResource(R.string.autostart_on_boot),
+ onClick = { onAutostartChange(!autostartOnBoot) },
+ rightSlot = {
+ PodroidSwitch(
+ checked = autostartOnBoot,
+ onCheckedChange = onAutostartChange,
+ )
+ },
+ )
+ Text(
+ text = stringResource(R.string.autostart_on_boot_desc),
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ modifier = Modifier.padding(
+ start = PodroidTokens.Spacing.MD,
+ end = PodroidTokens.Spacing.MD,
+ bottom = PodroidTokens.Spacing.SM,
+ ),
+ )
+}
+
+@Composable
+private fun AboutSection(
+ avfVerboseLogging: Boolean,
+ onAvfVerboseLoggingChange: (Boolean) -> Unit,
+ avfRunning: Boolean,
+ onRunAvfDiagnostic: () -> Unit,
+ onExportLogs: () -> Unit,
+) {
+ PodroidSectionLabel(stringResource(R.string.about))
+ PodroidListRow(label = stringResource(R.string.version_label), value = "v${BuildConfig.VERSION_NAME}", mono = true)
+ PodroidListRow(label = stringResource(R.string.qemu_label), value = "v${BuildConfig.QEMU_VERSION}", mono = true)
+ PodroidListRow(label = stringResource(R.string.architecture), value = "AArch64", mono = true)
+ PodroidListRow(label = stringResource(R.string.linux_distro), value = "Alpine 3.24", mono = true)
+ Spacer(Modifier.height(PodroidTokens.Spacing.MD))
+ val uriHandler = LocalUriHandler.current
+ PodroidGhostButton(
+ text = stringResource(R.string.documentation),
+ onClick = { uriHandler.openUri("https://extv.github.io/Podroid/guide/") },
+ )
+ Spacer(Modifier.height(PodroidTokens.Spacing.SM))
+ PodroidGhostButton(
+ text = stringResource(R.string.export_diagnostic_log),
+ onClick = onExportLogs,
+ )
+ Spacer(Modifier.height(PodroidTokens.Spacing.SM))
+ PodroidListRow(
+ label = stringResource(R.string.verbose_avf_logging),
+ onClick = { onAvfVerboseLoggingChange(!avfVerboseLogging) },
+ rightSlot = {
+ PodroidSwitch(
+ checked = avfVerboseLogging,
+ onCheckedChange = onAvfVerboseLoggingChange,
+ )
+ },
+ )
+ PodroidGhostButton(
+ text = if (avfRunning) stringResource(R.string.running_avf_diagnostic) else stringResource(R.string.avf_diagnostic),
+ onClick = onRunAvfDiagnostic,
+ )
+}
+
+@Composable
+private fun AvfDiagnosticDialog(
+ report: String,
+ onDismiss: () -> Unit,
+) {
+ AlertDialog(
+ onDismissRequest = onDismiss,
+ title = { Text(stringResource(R.string.avf_diagnostic)) },
+ text = {
+ androidx.compose.material3.Card(
+ colors = androidx.compose.material3.CardDefaults.cardColors(
+ containerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+ ),
+ modifier = Modifier.fillMaxWidth(),
+ ) {
+ androidx.compose.foundation.layout.Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .verticalScroll(rememberScrollState())
+ .padding(PodroidTokens.Spacing.SM),
+ ) {
+ Text(
+ text = report,
+ fontFamily = FontFamily.Monospace,
+ style = MaterialTheme.typography.labelSmall.copy(
+ fontSize = 10.sp,
+ lineHeight = 14.sp,
+ ),
+ )
+ }
+ }
+ },
+ confirmButton = {
+ TextButton(onClick = onDismiss) { Text(stringResource(R.string.close)) }
+ },
+ )
+}
+
+@Composable
+private fun ResetVmDialog(
+ onConfirm: () -> Unit,
+ onDismiss: () -> Unit,
+) {
+ AlertDialog(
+ onDismissRequest = onDismiss,
+ title = { Text(stringResource(R.string.reset_vm_description)) },
+ text = {
+ Text(stringResource(R.string.reset_vm_text))
+ },
+ confirmButton = {
+ TextButton(onClick = onConfirm) {
+ Text(stringResource(R.string.reset_everything), color = MaterialTheme.colorScheme.error)
+ }
+ },
+ dismissButton = {
+ TextButton(onClick = onDismiss) {
+ Text(stringResource(R.string.cancel))
+ }
+ },
+ )
+}
+
+@Composable
+private fun LanguagePickerDialog(
+ selectedLanguage: String,
+ onSelect: (String) -> Unit,
+ onDismiss: () -> Unit,
+) {
+ AlertDialog(
+ onDismissRequest = onDismiss,
+ title = { Text(stringResource(R.string.language_label)) },
+ text = {
+ Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+ listOf(
+ "auto" to stringResource(R.string.system_default),
+ "zh" to stringResource(R.string.language_zh),
+ "en" to stringResource(R.string.language_en),
+ ).forEach { (code, label) ->
+ FilterChip(
+ selected = selectedLanguage == code,
+ onClick = { onSelect(code) },
+ label = { Text(label) },
+ shape = RoundedCornerShape(PodroidTokens.Radius.Chip),
+ colors = PodroidChipColors(),
+ )
+ }
+ }
+ },
+ confirmButton = {
+ TextButton(onClick = onDismiss) {
+ Text(stringResource(R.string.cancel))
+ }
+ },
+ )
}
@Composable
@@ -726,25 +855,28 @@ private fun DownloadsSharingRow(
)
}
+ fun toggleDownloadsSharing(checked: Boolean) {
+ onToggle(checked)
+ if (checked) {
+ if (canManageAllFiles && !Environment.isExternalStorageManager()) {
+ openAllFilesAccessSettings()
+ } else if (!canManageAllFiles &&
+ ContextCompat.checkSelfPermission(
+ context, android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+ ) != PackageManager.PERMISSION_GRANTED
+ ) {
+ writeStoragePermLauncher.launch(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
+ }
+ }
+ }
+
PodroidListRow(
label = stringResource(R.string.downloads_sharing),
+ onClick = { if (vmNotRunning) toggleDownloadsSharing(!enabled) },
rightSlot = {
PodroidSwitch(
checked = enabled,
- onCheckedChange = { checked ->
- onToggle(checked)
- if (checked) {
- if (canManageAllFiles && !Environment.isExternalStorageManager()) {
- openAllFilesAccessSettings()
- } else if (!canManageAllFiles &&
- ContextCompat.checkSelfPermission(
- context, android.Manifest.permission.WRITE_EXTERNAL_STORAGE
- ) != PackageManager.PERMISSION_GRANTED
- ) {
- writeStoragePermLauncher.launch(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
- }
- }
- },
+ onCheckedChange = { checked -> toggleDownloadsSharing(checked) },
enabled = vmNotRunning,
)
},
@@ -768,6 +900,7 @@ private fun UsbPassthroughRow(
) {
PodroidListRow(
label = stringResource(R.string.usb_passthrough_settings_label),
+ onClick = { if (vmNotRunning && available) onToggle(!(enabled && available)) },
rightSlot = {
PodroidSwitch(
checked = enabled && available,
@@ -964,6 +1097,7 @@ private fun AdvancedTextSetting(
}
}
}
+ var showResetConfirm by remember { mutableStateOf(false) }
Column(modifier = Modifier.fillMaxWidth()) {
OutlinedTextField(
@@ -996,9 +1130,30 @@ private fun AdvancedTextSetting(
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.weight(1f),
)
- TextButton(onClick = onReset, enabled = enabled) {
+ TextButton(onClick = { showResetConfirm = true }, enabled = enabled) {
Text(stringResource(R.string.reset))
}
}
}
+
+ if (showResetConfirm) {
+ AlertDialog(
+ onDismissRequest = { showResetConfirm = false },
+ title = { Text(stringResource(R.string.reset_field_confirm_title, label)) },
+ text = { Text(stringResource(R.string.reset_field_confirm_body)) },
+ confirmButton = {
+ TextButton(onClick = {
+ onReset()
+ showResetConfirm = false
+ }) {
+ Text(stringResource(R.string.reset), color = MaterialTheme.colorScheme.error)
+ }
+ },
+ dismissButton = {
+ TextButton(onClick = { showResetConfirm = false }) {
+ Text(stringResource(R.string.cancel))
+ }
+ },
+ )
+ }
}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt
index 5ce539a..c264adb 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt
@@ -68,6 +68,32 @@ data class SettingsUiState(
val bandwidthMbps: Int = 0,
)
+// Typed intermediates for the three sub-combines below, so a reordered flow
+// is a compile error instead of a silently cross-wired setting (the previous
+// arrayOf<Any> packing cast back by index).
+private data class VmRowsGroup(
+ val vmRamMb: Int,
+ val vmCpus: Int,
+ val storageSizeGb: Int,
+ val sshEnabled: Boolean,
+ val loadBalanceEnabled: Boolean,
+)
+
+private data class MiscRowsGroup(
+ val storageAccessEnabled: Boolean,
+ val qemuExtraArgs: String,
+ val kernelExtraCmdline: String,
+ val darkTheme: Boolean,
+ val dynamicColorEnabled: Boolean,
+)
+
+private data class LocaleRowsGroup(
+ val bandwidthMbps: Int,
+ val engineSelection: EngineSelection,
+ val language: String,
+ val systemDefaultLanguage: String,
+)
+
@HiltViewModel
class SettingsViewModel @Inject constructor(
@ApplicationContext private val context: Context,
@@ -90,7 +116,7 @@ class SettingsViewModel @Inject constructor(
settingsRepository.sshEnabled,
settingsRepository.loadBalanceEnabled,
) { ram, cpus, storage, ssh, loadBal ->
- arrayOf(ram, cpus, storage, ssh, loadBal)
+ VmRowsGroup(ram, cpus, storage, ssh, loadBal)
},
combine(
settingsRepository.storageAccessEnabled,
@@ -99,7 +125,7 @@ class SettingsViewModel @Inject constructor(
settingsRepository.darkTheme,
settingsRepository.dynamicColorEnabled,
) { storageAccess, qemu, kernel, dark, dyn ->
- arrayOf(storageAccess, qemu, kernel, dark, dyn)
+ MiscRowsGroup(storageAccess, qemu, kernel, dark, dyn)
},
combine(
settingsRepository.bandwidthMbps,
@@ -107,24 +133,24 @@ class SettingsViewModel @Inject constructor(
settingsRepository.language,
languageManager.language,
) { bandwidth, engineSel, lang, sysLang ->
- arrayOf(bandwidth, engineSel, lang, sysLang)
+ LocaleRowsGroup(bandwidth, engineSel, lang, sysLang)
},
- ) { a, b, c ->
+ ) { vm, misc, locale ->
SettingsUiState(
- vmRamMb = a[0] as Int,
- vmCpus = a[1] as Int,
- storageSizeGb = a[2] as Int,
- sshEnabled = a[3] as Boolean,
- storageAccessEnabled = b[0] as Boolean,
- qemuExtraArgs = b[1] as String,
- kernelExtraCmdline = b[2] as String,
- darkTheme = b[3] as Boolean,
- dynamicColorEnabled = b[4] as Boolean,
- engineSelection = c[1] as EngineSelection,
- language = c[2] as String,
- systemDefaultLanguage = c[3] as String,
- loadBalanceEnabled = a[4] as Boolean,
- bandwidthMbps = c[0] as Int,
+ vmRamMb = vm.vmRamMb,
+ vmCpus = vm.vmCpus,
+ storageSizeGb = vm.storageSizeGb,
+ sshEnabled = vm.sshEnabled,
+ storageAccessEnabled = misc.storageAccessEnabled,
+ qemuExtraArgs = misc.qemuExtraArgs,
+ kernelExtraCmdline = misc.kernelExtraCmdline,
+ darkTheme = misc.darkTheme,
+ dynamicColorEnabled = misc.dynamicColorEnabled,
+ engineSelection = locale.engineSelection,
+ language = locale.language,
+ systemDefaultLanguage = locale.systemDefaultLanguage,
+ loadBalanceEnabled = vm.loadBalanceEnabled,
+ bandwidthMbps = locale.bandwidthMbps,
)
}.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), SettingsUiState())
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/status/StatusScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/status/StatusScreen.kt
index 5a80a5b..48f77b2 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/status/StatusScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/status/StatusScreen.kt
@@ -1,5 +1,6 @@
package com.excp.podroid.ui.screens.status
+import androidx.compose.animation.AnimatedContent
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@@ -26,6 +27,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.style.TextAlign
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.excp.podroid.R
@@ -112,7 +114,19 @@ fun StatusScreen(
PodroidSectionLabel(stringResource(R.string.status_vm_section))
PodroidListRow(
label = stringResource(R.string.vm_status),
- value = vmStatusLabel(ui.vmState, ui.uptimeLabel),
+ rightSlot = {
+ AnimatedContent(
+ targetState = vmStatusLabel(ui.vmState, ui.uptimeLabel),
+ label = "status_vm_status",
+ ) { text ->
+ Text(
+ text = text,
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ textAlign = TextAlign.End,
+ )
+ }
+ },
)
PodroidListRow(
label = stringResource(R.string.backend),
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalQuickSettings.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalQuickSettings.kt
index c905013..633bee9 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalQuickSettings.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalQuickSettings.kt
@@ -1,6 +1,5 @@
package com.excp.podroid.ui.screens.terminal
-import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.border
@@ -11,17 +10,17 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
-import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
@@ -34,6 +33,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Slider
import androidx.compose.material3.Text
@@ -42,6 +42,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
@@ -61,10 +62,12 @@ import com.excp.podroid.ui.components.PodroidListRow
import com.excp.podroid.ui.components.PodroidSectionLabel
import com.excp.podroid.ui.components.PodroidSwitch
import com.excp.podroid.ui.theme.PodroidTokens
+import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
/**
- * Quick Settings: minimal top-anchored sheet. Shows a few items per section
+ * Quick Settings: minimal bottom sheet. Shows a few items per section
* with ghost buttons that open full pickers (with search) on demand.
*/
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
@@ -84,8 +87,15 @@ internal fun QuickSettingsDialog(
viewModel: TerminalViewModel,
) {
var bump by remember { mutableIntStateOf(0) }
- val themes = remember(bump) { viewModel.listAvailableThemes() }
- val fonts = remember(bump) { viewModel.listAvailableFonts() }
+ // listAvailableThemes/Fonts read the appearance store's directories; keep
+ // that file I/O off the composition/main thread, with an empty list shown
+ // until the real result arrives.
+ val themes by produceState(initialValue = emptyList<String>(), bump) {
+ value = withContext(Dispatchers.IO) { viewModel.listAvailableThemes() }
+ }
+ val fonts by produceState(initialValue = emptyList<String>(), bump) {
+ value = withContext(Dispatchers.IO) { viewModel.listAvailableFonts() }
+ }
var showThemePicker by remember { mutableStateOf(false) }
var showFontPicker by remember { mutableStateOf(false) }
@@ -172,137 +182,99 @@ internal fun QuickSettingsDialog(
)
}
- // ── The top-anchored drawer ────────────────────────────────────
- androidx.compose.ui.window.Dialog(
- onDismissRequest = onDismiss,
- properties = androidx.compose.ui.window.DialogProperties(
- usePlatformDefaultWidth = false,
- dismissOnBackPress = true,
- dismissOnClickOutside = true,
- ),
- ) {
- Box(modifier = Modifier.fillMaxSize()) {
- val windowInfo = androidx.compose.ui.platform.LocalWindowInfo.current
- val density = androidx.compose.ui.platform.LocalDensity.current
- val maxSheetHeight = with(density) {
- (windowInfo.containerSize.height * 0.92f).toInt().toDp()
+ // ── The settings sheet ──────────────────────────────────────────
+ ModalBottomSheet(onDismissRequest = onDismiss) {
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .verticalScroll(rememberScrollState())
+ .padding(horizontal = PodroidTokens.Spacing.LG)
+ .padding(bottom = PodroidTokens.Spacing.MD),
+ ) {
+ // Header
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Text(
+ stringResource(R.string.settings),
+ style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.Medium,
+ modifier = Modifier.weight(1f),
+ )
+ IconButton(onClick = onDismiss, modifier = Modifier.size(36.dp)) {
+ Icon(Icons.Default.Close, contentDescription = stringResource(R.string.close))
+ }
}
- androidx.compose.material3.Surface(
- modifier = Modifier
- .align(Alignment.TopCenter)
- .fillMaxWidth()
- .heightIn(max = maxSheetHeight),
- shape = RoundedCornerShape(bottomStart = PodroidTokens.Radius.Sheet, bottomEnd = PodroidTokens.Radius.Sheet),
- color = MaterialTheme.colorScheme.surface,
- border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline),
- tonalElevation = 0.dp,
- ) {
- Column(
- modifier = Modifier
- .fillMaxWidth()
- .verticalScroll(rememberScrollState())
- .padding(horizontal = PodroidTokens.Spacing.LG)
- .padding(top = PodroidTokens.Spacing.SM, bottom = PodroidTokens.Spacing.MD),
- ) {
- // Drag handle
- Box(
- modifier = Modifier.fillMaxWidth().padding(bottom = PodroidTokens.Spacing.XS),
- contentAlignment = Alignment.Center,
- ) {
- Box(
- modifier = Modifier
- .size(width = 32.dp, height = 3.dp)
- .clip(RoundedCornerShape(2.dp))
- .background(MaterialTheme.colorScheme.onSurfaceVariant),
- )
- }
- // Header
- Row(verticalAlignment = Alignment.CenterVertically) {
- Text(
- stringResource(R.string.settings),
- style = MaterialTheme.typography.titleMedium,
- fontWeight = FontWeight.Medium,
- modifier = Modifier.weight(1f),
- )
- IconButton(onClick = onDismiss, modifier = Modifier.size(36.dp)) {
- Icon(Icons.Default.Close, contentDescription = stringResource(R.string.close))
- }
- }
-
- PodroidSectionLabel(stringResource(R.string.display_section))
+ PodroidSectionLabel(stringResource(R.string.display_section))
- // Size slider: sliding doesn't dismiss (you want to adjust),
- // but releasing the thumb does (matches the "any interaction
- // closes the drawer" rule).
- Row(
- verticalAlignment = Alignment.CenterVertically,
- modifier = Modifier.fillMaxWidth().padding(vertical = PodroidTokens.Spacing.SM),
- ) {
- Text(
- stringResource(R.string.size_label),
- style = MaterialTheme.typography.bodyMedium,
- modifier = Modifier.width(56.dp),
- )
- Slider(
- value = fontSize.toFloat(),
- onValueChange = { v ->
- val rounded = v.toInt()
- if (rounded != fontSize) onFontSizeChange(rounded)
- },
- onValueChangeFinished = onDismiss,
- // Shared with pinch-to-zoom so the two can't disagree.
- valueRange = TerminalViewModel.MIN_FONT_SIZE.toFloat()..TerminalViewModel.MAX_FONT_SIZE.toFloat(),
- modifier = Modifier.weight(1f),
- )
- Text(
- "$fontSize",
- style = MaterialTheme.typography.bodyMedium,
- color = MaterialTheme.colorScheme.primary,
- modifier = Modifier.width(36.dp),
- textAlign = TextAlign.End,
- )
- }
+ // Size slider: sliding doesn't dismiss (you want to adjust),
+ // but releasing the thumb does (matches the "any interaction
+ // closes the drawer" rule).
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ modifier = Modifier.fillMaxWidth().padding(vertical = PodroidTokens.Spacing.SM),
+ ) {
+ Text(
+ stringResource(R.string.size_label),
+ style = MaterialTheme.typography.bodyMedium,
+ modifier = Modifier.width(56.dp),
+ )
+ Slider(
+ value = fontSize.toFloat(),
+ onValueChange = { v ->
+ val rounded = v.toInt()
+ if (rounded != fontSize) onFontSizeChange(rounded)
+ },
+ onValueChangeFinished = onDismiss,
+ // Shared with pinch-to-zoom so the two can't disagree.
+ valueRange = TerminalViewModel.MIN_FONT_SIZE.toFloat()..TerminalViewModel.MAX_FONT_SIZE.toFloat(),
+ modifier = Modifier.weight(1f),
+ )
+ Text(
+ "$fontSize",
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.primary,
+ modifier = Modifier.width(36.dp),
+ textAlign = TextAlign.End,
+ )
+ }
- // Theme + Font: full-width ghost buttons so they read as
- // actions, not list rows. Picker's onPick already calls
- // onDismiss to close the drawer.
- Spacer(Modifier.height(PodroidTokens.Spacing.SM))
- PodroidGhostButton(
- text = stringResource(R.string.theme_with_value, prettyName(colorTheme)),
- onClick = { showThemePicker = true },
- )
- Spacer(Modifier.height(PodroidTokens.Spacing.SM))
- PodroidGhostButton(
- text = stringResource(R.string.font_with_value, prettyName(terminalFont)),
- onClick = { showFontPicker = true },
- )
+ // Theme + Font: full-width ghost buttons so they read as
+ // actions, not list rows. Picker's onPick already calls
+ // onDismiss to close the drawer.
+ Spacer(Modifier.height(PodroidTokens.Spacing.SM))
+ PodroidGhostButton(
+ text = stringResource(R.string.theme_with_value, prettyName(colorTheme)),
+ onClick = { showThemePicker = true },
+ )
+ Spacer(Modifier.height(PodroidTokens.Spacing.SM))
+ PodroidGhostButton(
+ text = stringResource(R.string.font_with_value, prettyName(terminalFont)),
+ onClick = { showFontPicker = true },
+ )
- PodroidSectionLabel(stringResource(R.string.input_section))
+ PodroidSectionLabel(stringResource(R.string.input_section))
- // Toggles: flipping any of these dismisses the drawer
- // immediately so the terminal is unblocked.
- PodroidListRow(
- label = stringResource(R.string.extra_keys),
- rightSlot = {
- PodroidSwitch(
- checked = showExtraKeys,
- onCheckedChange = { onToggleExtraKeys(it); onDismiss() },
- )
- },
+ // Toggles: flipping any of these dismisses the drawer
+ // immediately so the terminal is unblocked.
+ PodroidListRow(
+ label = stringResource(R.string.extra_keys),
+ rightSlot = {
+ PodroidSwitch(
+ checked = showExtraKeys,
+ onCheckedChange = { onToggleExtraKeys(it); onDismiss() },
)
- PodroidListRow(
- label = stringResource(R.string.haptics),
- rightSlot = {
- PodroidSwitch(
- checked = hapticsEnabled,
- onCheckedChange = { onToggleHaptics(it); onDismiss() },
- )
- },
- divider = false,
+ },
+ )
+ PodroidListRow(
+ label = stringResource(R.string.haptics),
+ rightSlot = {
+ PodroidSwitch(
+ checked = hapticsEnabled,
+ onCheckedChange = { onToggleHaptics(it); onDismiss() },
)
- }
- }
+ },
+ divider = false,
+ )
}
}
}
@@ -321,8 +293,11 @@ private fun ThemeSwatch(
onLongClick: (() -> Unit)?,
viewModel: TerminalViewModel,
) {
- val colors = remember(name) {
- viewModel.peekThemeColors(name) ?: (0xFF101010.toInt() to 0xFFE0E0E0.toInt())
+ val placeholderColors = remember { 0xFF101010.toInt() to 0xFFE0E0E0.toInt() }
+ val colors by produceState(initialValue = placeholderColors, name) {
+ value = withContext(Dispatchers.IO) {
+ viewModel.peekThemeColors(name) ?: placeholderColors
+ }
}
SwatchBox(
selected = selected,
@@ -359,7 +334,9 @@ private fun FontSwatch(
onLongClick: (() -> Unit)?,
viewModel: TerminalViewModel,
) {
- val typeface = remember(name) { viewModel.loadFont(name) }
+ val typeface by produceState<android.graphics.Typeface?>(initialValue = null, name) {
+ value = withContext(Dispatchers.IO) { viewModel.loadFont(name) }
+ }
val previewColor = MaterialTheme.colorScheme.onSurface.toArgb()
SwatchBox(
selected = selected,
@@ -430,7 +407,7 @@ private fun AddSwatch(
* buttons: search field + grid of preview swatches. Long-press a custom item
* to delete it.
*/
-@OptIn(ExperimentalLayoutApi::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
@Composable
private fun FullPickerDialog(
title: String,
@@ -451,63 +428,56 @@ private fun FullPickerDialog(
if (query.isBlank()) items
else items.filter { it.contains(query, ignoreCase = true) }
}
- androidx.compose.ui.window.Dialog(
- onDismissRequest = onDismiss,
- properties = androidx.compose.ui.window.DialogProperties(
- usePlatformDefaultWidth = false,
- ),
- ) {
- androidx.compose.material3.Surface(
- modifier = Modifier
- .fillMaxWidth()
- .fillMaxHeight(0.92f)
- .padding(8.dp),
- shape = RoundedCornerShape(PodroidTokens.Radius.Sheet),
- border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline),
- tonalElevation = 0.dp,
- color = MaterialTheme.colorScheme.surface,
- ) {
- Column(modifier = Modifier
- .fillMaxSize()
- .padding(horizontal = 16.dp, vertical = 12.dp)) {
- Row(verticalAlignment = Alignment.CenterVertically) {
- Text(title, style = MaterialTheme.typography.titleMedium,
- fontWeight = FontWeight.Medium,
- modifier = Modifier.weight(1f))
- IconButton(onClick = onDismiss, modifier = Modifier.size(36.dp)) {
- Icon(Icons.Default.Close, contentDescription = stringResource(R.string.close))
- }
+ ModalBottomSheet(onDismissRequest = onDismiss) {
+ Column(modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 16.dp, vertical = 12.dp)) {
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Text(title, style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.Medium,
+ modifier = Modifier.weight(1f))
+ IconButton(onClick = onDismiss, modifier = Modifier.size(36.dp)) {
+ Icon(Icons.Default.Close, contentDescription = stringResource(R.string.close))
}
- OutlinedTextField(
- value = query,
- onValueChange = { query = it },
- placeholder = { Text(stringResource(R.string.search_n_items, items.size)) },
- leadingIcon = { Icon(Icons.Default.Search, contentDescription = null) },
- singleLine = true,
- modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
- )
- Spacer(modifier = Modifier.height(8.dp))
- Box(modifier = Modifier
- .fillMaxWidth()
- .weight(1f)
- .verticalScroll(rememberScrollState())) {
- FlowRow(
- modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally),
- verticalArrangement = Arrangement.spacedBy(8.dp),
- ) {
- filtered.forEach { name ->
- val custom = isCustom(name)
- renderChip(
- name,
- name == selected,
- { onPick(name) },
- if (custom) ({ onLongPressCustom(name) }) else null,
- )
- }
- extraTrailingChip()
+ }
+ OutlinedTextField(
+ value = query,
+ onValueChange = { query = it },
+ placeholder = { Text(stringResource(R.string.search_n_items, items.size)) },
+ leadingIcon = { Icon(Icons.Default.Search, contentDescription = null) },
+ singleLine = true,
+ modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
+ )
+ Spacer(modifier = Modifier.height(8.dp))
+ // Single scroll surface, bounded by whatever room the sheet actually
+ // has left after the header/search field above (not a fraction of max
+ // height): the dialog-era fixed-height Column + inner verticalScroll
+ // put the viewport's bottom outside the sheet's visible area, so the
+ // trailing chip could never be scrolled into view, and once the inner
+ // scroll bottomed out, leftover drag delta went to the sheet's own
+ // nested-scroll connection and replayed a settle animation on every
+ // swipe near the end. A lazy grid also avoids composing all N chips
+ // (each with its own produceState file read) up front.
+ LazyVerticalGrid(
+ columns = GridCells.Adaptive(minSize = 104.dp),
+ horizontalArrangement = Arrangement.spacedBy(8.dp),
+ verticalArrangement = Arrangement.spacedBy(8.dp),
+ modifier = Modifier.fillMaxWidth().weight(1f),
+ ) {
+ items(filtered, key = { it }) { name ->
+ val custom = isCustom(name)
+ Box(contentAlignment = Alignment.Center) {
+ renderChip(
+ name,
+ name == selected,
+ { onPick(name) },
+ if (custom) ({ onLongPressCustom(name) }) else null,
+ )
}
}
+ item(key = "__extra_trailing__") {
+ Box(contentAlignment = Alignment.Center) { extraTrailingChip() }
+ }
}
}
}
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 493f6ba..d4e2caf 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
@@ -60,6 +60,7 @@ import androidx.compose.ui.graphics.CompositingStrategy
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
@@ -96,11 +97,8 @@ fun TerminalScreen(
DisposableEffect(Unit) {
val activity = context as? Activity
activity?.window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
- activity?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
onDispose {
activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
- @Suppress("DEPRECATION")
- activity?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_UNSPECIFIED)
}
}
@@ -122,6 +120,7 @@ fun TerminalScreen(
val colorTheme by viewModel.terminalColorTheme.collectAsStateWithLifecycle()
val terminalFont by viewModel.terminalFont.collectAsStateWithLifecycle()
+ val keyboardController = LocalSoftwareKeyboardController.current
if (showQuickSettings) {
// Pass the screen's viewModel explicitly so QuickSettingsDialog uses
@@ -154,11 +153,7 @@ fun TerminalScreen(
title = stringResource(R.string.terminal_title),
navigationIcon = {
IconButton(onClick = {
- val imm = context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE)
- as android.view.inputmethod.InputMethodManager
- (context as? Activity)?.currentFocus?.let {
- imm.hideSoftInputFromWindow(it.windowToken, 0)
- }
+ keyboardController?.hide()
onNavigateBack()
}) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.back))
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt b/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt
index 46a0728..f387842 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt
@@ -151,6 +151,16 @@ fun X11Screen(
ctrl.show(WindowInsetsCompat.Type.systemBars())
}
}
+ // Belt-and-braces: force the system bars back on when this screen goes
+ // away, so a future navigation path that bypasses Back (and therefore the
+ // fullscreen-exit LaunchedEffect above) can't strand the next screen with
+ // hidden bars.
+ DisposableEffect(Unit) {
+ onDispose {
+ val window = activity?.window ?: return@onDispose
+ WindowInsetsControllerCompat(window, view).show(WindowInsetsCompat.Type.systemBars())
+ }
+ }
// Keep the display awake while the X11 viewer is open, matching the
// terminal (TerminalScreen adds the same flag). The VM-lifetime WakeLock in
diff --git a/app/src/main/java/com/excp/podroid/ui/theme/Type.kt b/app/src/main/java/com/excp/podroid/ui/theme/Type.kt
index fcf65a0..7779637 100644
--- a/app/src/main/java/com/excp/podroid/ui/theme/Type.kt
+++ b/app/src/main/java/com/excp/podroid/ui/theme/Type.kt
@@ -15,6 +15,10 @@ import androidx.compose.ui.unit.sp
@Composable @ReadOnlyComposable
fun buildPodroidTypography(): Typography {
val ui = PodroidTokens.ui()
+ // Default M3 slots, carried forward only to pick up their fontFamily so
+ // the app cannot drift to Roboto the first time a screen reaches for a
+ // slot we haven't hand-tuned yet.
+ val defaults = Typography()
return Typography(
displayLarge = TextStyle(
fontFamily = ui,
@@ -23,29 +27,39 @@ fun buildPodroidTypography(): Typography {
letterSpacing = (-0.02).sp,
lineHeight = 34.sp,
),
+ displayMedium = defaults.displayMedium.copy(fontFamily = ui),
+ displaySmall = defaults.displaySmall.copy(fontFamily = ui),
+ headlineLarge = defaults.headlineLarge.copy(fontFamily = ui),
+ headlineMedium = defaults.headlineMedium.copy(fontFamily = ui),
headlineSmall = TextStyle(
fontFamily = ui,
fontWeight = FontWeight.SemiBold,
fontSize = PodroidTokens.TypeSize.Headline,
lineHeight = 26.sp,
),
+ titleLarge = defaults.titleLarge.copy(fontFamily = ui),
titleMedium = TextStyle(
fontFamily = ui,
fontWeight = FontWeight.Normal,
fontSize = PodroidTokens.TypeSize.Title,
letterSpacing = (-0.005).sp,
),
+ titleSmall = defaults.titleSmall.copy(fontFamily = ui),
+ bodyLarge = defaults.bodyLarge.copy(fontFamily = ui),
bodyMedium = TextStyle(
fontFamily = ui,
fontWeight = FontWeight.Normal,
fontSize = PodroidTokens.TypeSize.Body,
lineHeight = 18.sp,
),
+ bodySmall = defaults.bodySmall.copy(fontFamily = ui),
+ labelLarge = defaults.labelLarge.copy(fontFamily = ui),
labelMedium = TextStyle(
fontFamily = ui,
fontWeight = FontWeight.Normal,
fontSize = PodroidTokens.TypeSize.Label,
letterSpacing = 1.4.sp,
),
+ labelSmall = defaults.labelSmall.copy(fontFamily = ui),
)
}
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..9a43c90
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <!-- Matches PodroidDarkBg in ui/theme/Color.kt: the launch window must not
+ flash a color the Compose dark scheme doesn't use. -->
+ <color name="window_background">#FF0A0A0A</color>
+</resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..426a49a
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <style name="Theme.Podroid" parent="android:Theme.Material.NoActionBar">
+ <item name="android:windowBackground">@color/window_background</item>
+ </style>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..23a5645
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <!-- Matches PodroidLightBg in ui/theme/Color.kt: the launch window must not
+ flash a color the Compose light scheme doesn't use. -->
+ <color name="window_background">#FFFAFAFA</color>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 47ca1e2..1e643fd 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="Theme.Podroid" parent="android:Theme.Material.Light.NoActionBar" />
+ <style name="Theme.Podroid" parent="android:Theme.Material.Light.NoActionBar">
+ <item name="android:windowBackground">@color/window_background</item>
+ </style>
</resources>
\ No newline at end of file