Skip to content

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

fix(ui): honour dynamic color, fix setup back, x11 retry, and accessibility

ExTvc8d68e752b5c
diff --git a/app/src/main/java/com/excp/podroid/ui/components/PodroidButtons.kt b/app/src/main/java/com/excp/podroid/ui/components/PodroidButtons.kt
index 6074201..20099ec 100644
--- a/app/src/main/java/com/excp/podroid/ui/components/PodroidButtons.kt
+++ b/app/src/main/java/com/excp/podroid/ui/components/PodroidButtons.kt
@@ -34,8 +34,11 @@ fun PodroidPrimaryButton(
modifier = modifier.fillMaxWidth().height(44.dp),
shape = RoundedCornerShape(PodroidTokens.Radius.Button),
colors = ButtonDefaults.buttonColors(
- containerColor = PodroidTokens.Accent,
- contentColor = PodroidTokens.AccentInk,
+ // colorScheme.primary/onPrimary, not the fixed Accent literal, so the
+ // primary button re-tints when the user enables dynamic color (the
+ // fixed theme maps primary = Accent, so the default look is identical).
+ containerColor = MaterialTheme.colorScheme.primary,
+ contentColor = MaterialTheme.colorScheme.onPrimary,
),
) {
if (icon != null) {
diff --git a/app/src/main/java/com/excp/podroid/ui/components/PodroidChip.kt b/app/src/main/java/com/excp/podroid/ui/components/PodroidChip.kt
index 37f5da6..1a698c8 100644
--- a/app/src/main/java/com/excp/podroid/ui/components/PodroidChip.kt
+++ b/app/src/main/java/com/excp/podroid/ui/components/PodroidChip.kt
@@ -5,7 +5,6 @@ import androidx.compose.material3.FilterChipDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SelectableChipColors
import androidx.compose.runtime.Composable
-import com.excp.podroid.ui.theme.PodroidTokens
/**
* Shared FilterChip color scheme. Used wherever Material3 FilterChip appears so
@@ -23,9 +22,9 @@ import com.excp.podroid.ui.theme.PodroidTokens
fun PodroidChipColors(): SelectableChipColors = FilterChipDefaults.filterChipColors(
containerColor = MaterialTheme.colorScheme.surfaceVariant,
labelColor = MaterialTheme.colorScheme.onSurface,
- selectedContainerColor = PodroidTokens.Accent,
- selectedLabelColor = PodroidTokens.AccentInk,
+ selectedContainerColor = MaterialTheme.colorScheme.primary,
+ selectedLabelColor = MaterialTheme.colorScheme.onPrimary,
disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
disabledLabelColor = MaterialTheme.colorScheme.onSurfaceVariant,
- disabledSelectedContainerColor = PodroidTokens.Accent.copy(alpha = 0.45f),
+ disabledSelectedContainerColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.45f),
)
diff --git a/app/src/main/java/com/excp/podroid/ui/components/PodroidInlineAction.kt b/app/src/main/java/com/excp/podroid/ui/components/PodroidInlineAction.kt
index ac2380d..c060373 100644
--- a/app/src/main/java/com/excp/podroid/ui/components/PodroidInlineAction.kt
+++ b/app/src/main/java/com/excp/podroid/ui/components/PodroidInlineAction.kt
@@ -27,11 +27,11 @@ fun PodroidInlineAction(
Text(
text = label,
style = MaterialTheme.typography.labelMedium,
- color = PodroidTokens.AccentInk,
+ color = MaterialTheme.colorScheme.onPrimary,
fontWeight = FontWeight.SemiBold,
modifier = modifier
.clip(RoundedCornerShape(PodroidTokens.Radius.Chip))
- .background(PodroidTokens.Accent)
+ .background(MaterialTheme.colorScheme.primary)
.clickable(onClick = onClick)
.padding(horizontal = 12.dp, vertical = 6.dp),
)
diff --git a/app/src/main/java/com/excp/podroid/ui/components/PodroidSwitch.kt b/app/src/main/java/com/excp/podroid/ui/components/PodroidSwitch.kt
index a2440c4..97336a6 100644
--- a/app/src/main/java/com/excp/podroid/ui/components/PodroidSwitch.kt
+++ b/app/src/main/java/com/excp/podroid/ui/components/PodroidSwitch.kt
@@ -5,7 +5,6 @@ import androidx.compose.material3.Switch
import androidx.compose.material3.SwitchDefaults
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
-import com.excp.podroid.ui.theme.PodroidTokens
/**
* Switch wrapper that locks the colors to the Podroid palette. Material 3's
@@ -25,9 +24,9 @@ fun PodroidSwitch(
enabled = enabled,
modifier = modifier,
colors = SwitchDefaults.colors(
- checkedThumbColor = PodroidTokens.AccentInk,
- checkedTrackColor = PodroidTokens.Accent,
- checkedBorderColor = PodroidTokens.Accent,
+ checkedThumbColor = MaterialTheme.colorScheme.onPrimary,
+ checkedTrackColor = MaterialTheme.colorScheme.primary,
+ checkedBorderColor = MaterialTheme.colorScheme.primary,
uncheckedThumbColor = MaterialTheme.colorScheme.onSurfaceVariant,
uncheckedTrackColor = MaterialTheme.colorScheme.surfaceVariant,
uncheckedBorderColor = MaterialTheme.colorScheme.outline,
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt
index b1adaff..c9fd8f9 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt
@@ -28,8 +28,11 @@ import androidx.compose.material3.TextButton
import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
import androidx.compose.material3.windowsizeclass.WindowSizeClass
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
@@ -37,6 +40,9 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.unit.dp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.excp.podroid.BuildConfig
import com.excp.podroid.R
@@ -74,9 +80,19 @@ fun HomeScreen(
val isRunning = vmState is VmState.Running
val isStarting = vmState is VmState.Starting
val uptimeLabel = viewModel.uptimeLabel(uptimeTick)
- // Cache the result of the ConnectivityManager binder call so it doesn't
- // re-run on every 1 Hz tick or incidental recomposition.
- val phoneIp = remember { viewModel.phoneIp() }
+ // Cache the ConnectivityManager binder call so it doesn't re-run on every
+ // 1 Hz tick or incidental recomposition, but refresh it on ON_RESUME so a
+ // Wi-Fi / hotspot change (the headline SSH use case) shows the new address
+ // instead of a stale one for the screen's lifetime.
+ var phoneIp by remember { mutableStateOf(viewModel.phoneIp()) }
+ val lifecycleOwner = LocalLifecycleOwner.current
+ DisposableEffect(lifecycleOwner) {
+ val observer = LifecycleEventObserver { _, event ->
+ if (event == Lifecycle.Event.ON_RESUME) phoneIp = viewModel.phoneIp()
+ }
+ lifecycleOwner.lifecycle.addObserver(observer)
+ onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }
+ }
updateInfo?.let { info ->
AlertDialog(
@@ -88,8 +104,15 @@ fun HomeScreen(
TextButton(onClick = {
// Guard against ActivityNotFoundException (no browser) or a
// blank/malformed releaseUrl from the remote JSON source.
+ // Surface a toast on failure so the tap isn't a silent no-op.
runCatching {
context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(info.releaseUrl)))
+ }.onFailure {
+ android.widget.Toast.makeText(
+ context,
+ context.getString(R.string.update_open_failed),
+ android.widget.Toast.LENGTH_LONG,
+ ).show()
}
viewModel.dismissUpdate()
}) { Text(stringResource(R.string.download)) }
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt
index e8f0ba5..fe054d3 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt
@@ -204,7 +204,11 @@ class HomeViewModel @Inject constructor(
if (!updateRepository.isDismissed(info.latestVersion)) {
_updateInfo.value = info
}
- } catch (_: Exception) { }
+ } catch (c: kotlinx.coroutines.CancellationException) {
+ throw c
+ } catch (e: Exception) {
+ android.util.Log.w("HomeViewModel", "update check failed", e)
+ }
}
}
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 55e1ec7..c17d35c 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
@@ -41,6 +41,7 @@ import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
import androidx.compose.material3.windowsizeclass.WindowSizeClass
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.key
@@ -856,6 +857,20 @@ private fun AdvancedTextSetting(
}
var hadFocus by remember { mutableStateOf(false) }
+ // Commit a pending edit on dispose: persistence only happens on focus loss,
+ // but pressing system back while the field is still focused disposes the
+ // composable without a focus-change event, silently dropping the edit.
+ // rememberUpdatedState so onDispose sees the latest buffered/upstream values.
+ val currentUpstream by rememberUpdatedState(value)
+ val currentOnValueChange by rememberUpdatedState(onValueChange)
+ DisposableEffect(Unit) {
+ onDispose {
+ if (hadFocus && localState.value != currentUpstream) {
+ currentOnValueChange(localState.value)
+ }
+ }
+ }
+
Column(modifier = Modifier.fillMaxWidth()) {
OutlinedTextField(
value = localValue,
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt
index 944b11d..bf8d76e 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt
@@ -7,6 +7,7 @@ import android.net.Uri
import android.os.Build
import android.os.Environment
import android.provider.Settings
+import androidx.activity.compose.BackHandler
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
import androidx.compose.animation.core.animateDpAsState
@@ -112,6 +113,13 @@ fun SetupScreen(
}
}
+ // System back steps the wizard back one page instead of exiting the app
+ // (setup is the start destination, so an unhandled back would finish the
+ // Activity mid-wizard). Disabled on page 0 so back there behaves normally.
+ BackHandler(enabled = pagerState.currentPage > 0) {
+ scope.launch { pagerState.animateScrollToPage(pagerState.currentPage - 1) }
+ }
+
// Re-sync storageAccessEnabled against the actual OS grant on every
// resume (the user may have denied the all-files-access screen we sent them to).
val lifecycleOwner = LocalLifecycleOwner.current
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 6f28063..cb09235 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
@@ -25,8 +25,10 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.ime
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
@@ -42,6 +44,7 @@ import androidx.compose.material.icons.filled.DesktopWindows
import androidx.compose.material.icons.filled.Fullscreen
import androidx.compose.material.icons.filled.Keyboard
import androidx.compose.material.icons.filled.Tune
+import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
@@ -81,6 +84,10 @@ import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.platform.LocalView
import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.onClick
+import androidx.compose.ui.semantics.role
+import androidx.compose.ui.semantics.semantics
import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.WindowInsetsControllerCompat
@@ -417,10 +424,23 @@ fun X11Screen(
}
is X11ConnectionState.Failed -> {
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
- Text(
- "${stringResource(R.string.x11_not_ready)}\n${state.message}",
- color = MaterialTheme.colorScheme.error,
- )
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ modifier = Modifier.padding(24.dp),
+ ) {
+ Text(
+ "${stringResource(R.string.x11_not_ready)}\n${state.message}",
+ color = MaterialTheme.colorScheme.error,
+ textAlign = TextAlign.Center,
+ )
+ Spacer(Modifier.height(16.dp))
+ // Xvnc often isn't up yet right after boot; connect() is
+ // idempotent so a manual retry is safe instead of forcing
+ // the user to leave and re-enter the screen.
+ Button(onClick = { viewModel.connect() }) {
+ Text(stringResource(R.string.try_again))
+ }
+ }
}
}
X11ConnectionState.Connected -> {
@@ -793,20 +813,27 @@ private fun X11KeyButton(
}
}
val tapModifier = if (repeatable) {
- Modifier.pointerInput(sendKey) {
- awaitEachGesture {
- awaitFirstDown(requireUnconsumed = false)
- onKey(sendKey)
- pressed = true
- try {
- waitForUpOrCancellation()
- } finally {
- pressed = false
+ // Button semantics so TalkBack can announce/activate the repeatable keys
+ // (the raw pointerInput path is otherwise invisible to accessibility).
+ Modifier
+ .semantics {
+ role = Role.Button
+ onClick(label = sendKey) { onKey(sendKey); true }
+ }
+ .pointerInput(sendKey) {
+ awaitEachGesture {
+ awaitFirstDown(requireUnconsumed = false)
+ onKey(sendKey)
+ pressed = true
+ try {
+ waitForUpOrCancellation()
+ } finally {
+ pressed = false
+ }
}
}
- }
} else {
- Modifier.clickable { onKey(sendKey) }
+ Modifier.clickable(role = Role.Button) { onKey(sendKey) }
}
Text(
text = label,
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index c8d2ca3..a10d352 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -123,6 +123,7 @@
<!-- Dialogs -->
<string name="update_available">有新版本可用</string>
<string name="version_available">版本 %1$s 可用。当前版本 %2$s。</string>
+ <string name="update_open_failed">无法打开下载页面。没有可用的浏览器?</string>
<!-- Language -->
<string name="language_label">语言</string>
@@ -170,6 +171,7 @@
<!-- X11 -->
<string name="x11_title">X11</string>
+ <string name="x11_open">打开 X11 桌面</string>
<string name="x11_connecting">正在连接 X11 服务器...</string>
<string name="x11_not_ready">X11 服务器未就绪 — 虚拟机是否仍在启动?</string>
<string name="fullscreen">全屏</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9e1f5ff..fee5587 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -123,6 +123,7 @@
<!-- Dialogs -->
<string name="update_available">Update available</string>
<string name="version_available">Version %1$s is available. You have %2$s.</string>
+ <string name="update_open_failed">Couldn\'t open the download page. No browser available?</string>
<!-- Language -->
<string name="language_label">Language</string>
@@ -170,6 +171,7 @@
<!-- X11 -->
<string name="x11_title">X11</string>
+ <string name="x11_open">Open X11 desktop</string>
<string name="x11_connecting">Connecting to X11 server...</string>
<string name="x11_not_ready">X11 server not ready — VM still booting?</string>
<string name="fullscreen">Fullscreen</string>