Skip to content

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

style: migrate UI components to Material 3 and theme cleanup

ExTv6aff93cdb3df
diff --git a/app/src/main/java/com/excp/podroid/ui/HapticManager.kt b/app/src/main/java/com/excp/podroid/ui/HapticManager.kt
deleted file mode 100644
index da04fe6..0000000
--- a/app/src/main/java/com/excp/podroid/ui/HapticManager.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.excp.podroid.ui
-
-import android.content.Context
-import android.os.Build
-import android.os.VibrationEffect
-import android.os.Vibrator
-import android.os.VibratorManager
-import kotlinx.coroutines.delay
-
-/**
- * Centralized haptic feedback manager for Podroid terminal interactions.
- * Provides various vibration patterns for different terminal events.
- *
- * Features debouncing to prevent haptic spam during rapid input.
- */
-class HapticManager(private val context: Context) {
-
- private val vibrator: Vibrator = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
- (context.getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as VibratorManager).defaultVibrator
- } else {
- @Suppress("DEPRECATION")
- context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
- }
-
- // Debounce tracking
- private var lastVibrateTime = 0L
- private val debounceWindowMs = 30L // Minimum ms between vibrations
-
- // Vibration enabled flag
- var isEnabled: Boolean = true
-
- /**
- * Check if device can vibrate
- */
- private fun canVibrate(): Boolean {
- return isEnabled && vibrator.hasVibrator()
- }
-
- /**
- * Core vibration function with debouncing
- */
- private fun vibrate(effect: VibrationEffect) {
- if (!canVibrate()) return
-
- val now = System.currentTimeMillis()
- if (now - lastVibrateTime < debounceWindowMs) return
-
- lastVibrateTime = now
- vibrator.vibrate(effect)
- }
-
- private fun vibrate(durationMs: Long) {
- vibrate(VibrationEffect.createOneShot(durationMs, VibrationEffect.DEFAULT_AMPLITUDE))
- }
-
- /**
- * Light tap for regular key presses
- */
- fun keyPress() {
- vibrate(5)
- }
-
- /**
- * Slightly stronger tick for extra keys bar presses
- */
- fun extraKeyPress() {
- vibrate(10)
- }
-
- /**
- * Medium pulse for long-press menu activation
- */
- fun longPressMenu() {
- vibrate(30)
- }
-
- /**
- * Double-tap confirmation for copy operations
- */
- fun copyConfirmation() {
- if (!canVibrate()) return
- val now = System.currentTimeMillis()
- if (now - lastVibrateTime < debounceWindowMs) return
- lastVibrateTime = now
- vibrator.vibrate(VibrationEffect.createWaveform(longArrayOf(0, 20, 50, 20), -1))
- }
-
- /**
- * Single tick for paste operations
- */
- fun pasteInput() {
- vibrate(15)
- }
-
- /**
- * Success feedback pulse
- */
- fun actionComplete() {
- vibrate(25)
- }
-
- /**
- * Error pattern: 50ms + pause + 50ms
- */
- fun error() {
- if (!canVibrate()) return
- val now = System.currentTimeMillis()
- if (now - lastVibrateTime < debounceWindowMs) return
- lastVibrateTime = now
- vibrator.vibrate(VibrationEffect.createWaveform(longArrayOf(0, 50, 100, 50), -1))
- }
-
- /**
- * Bell event (for terminal bell)
- */
- fun bell() {
- vibrate(50)
- }
-}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/home/AnimatedBootProgress.kt b/app/src/main/java/com/excp/podroid/ui/screens/home/AnimatedBootProgress.kt
index 32b4296..6e63408 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/home/AnimatedBootProgress.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/home/AnimatedBootProgress.kt
@@ -7,152 +7,82 @@ import androidx.compose.animation.core.infiniteRepeatable
import androidx.compose.animation.core.rememberInfiniteTransition
import androidx.compose.animation.core.tween
import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableFloatStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.StrokeCap
import androidx.compose.ui.graphics.drawscope.Stroke
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import kotlinx.coroutines.delay
+/**
+ * Indeterminate boot indicator for the Home screen. Sized to fill the parent
+ * Box (caller controls the dimension) — the previous version hard-coded a
+ * 120 dp Canvas inside a 72 dp parent, which clipped the ring.
+ */
@Composable
fun AnimatedBootProgress(bootStage: String, modifier: Modifier = Modifier) {
- val infiniteTransition = rememberInfiniteTransition()
-
- val pulseScale by infiniteTransition.animateFloat(
+ val transition = rememberInfiniteTransition(label = "boot")
+
+ val pulseScale by transition.animateFloat(
initialValue = 0.9f,
targetValue = 1.1f,
animationSpec = infiniteRepeatable(
animation = tween(600, easing = LinearEasing),
- repeatMode = RepeatMode.Reverse
- )
+ repeatMode = RepeatMode.Reverse,
+ ),
+ label = "pulse",
)
-
- val rotationAngle by infiniteTransition.animateFloat(
+
+ val rotationAngle by transition.animateFloat(
initialValue = 0f,
targetValue = 360f,
animationSpec = infiniteRepeatable(
animation = tween(1500, easing = LinearEasing),
- repeatMode = RepeatMode.Restart
- )
+ repeatMode = RepeatMode.Restart,
+ ),
+ label = "rotation",
)
- var animatedProgress by remember { mutableFloatStateOf(0f) }
val isReady = bootStage == "Ready"
-
- LaunchedEffect(bootStage) {
- if (!isReady) {
- animatedProgress = minOf(animatedProgress + 0.15f, 0.95f)
- } else {
- animatedProgress = 1f
- }
- }
+ val primary = MaterialTheme.colorScheme.primary
+ val track = MaterialTheme.colorScheme.surfaceVariant
- val primaryColor = MaterialTheme.colorScheme.primary
- val surfaceVariantColor = MaterialTheme.colorScheme.surfaceVariant
+ Box(modifier = modifier, contentAlignment = Alignment.Center) {
+ Canvas(modifier = Modifier.matchParentSize()) {
+ val strokeWidth = (size.minDimension * 0.07f).coerceAtLeast(4f)
+ val radius = (size.minDimension - strokeWidth) / 2
+ val center = Offset(size.width / 2, size.height / 2)
- Column(
- horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.Center,
- modifier = modifier
- ) {
- Box(
- contentAlignment = Alignment.Center,
- modifier = Modifier.size(120.dp)
- ) {
- Canvas(modifier = Modifier.size(120.dp)) {
- val strokeWidth = 8.dp.toPx()
- val radius = (size.minDimension - strokeWidth) / 2
- val center = Offset(size.width / 2, size.height / 2)
-
- drawCircle(
- color = surfaceVariantColor,
- radius = radius,
- center = center,
- style = Stroke(width = strokeWidth)
- )
-
- if (!isReady) {
- drawArc(
- color = primaryColor,
- startAngle = rotationAngle,
- sweepAngle = 270f,
- useCenter = false,
- topLeft = Offset(center.x - radius, center.y - radius),
- size = Size(radius * 2, radius * 2),
- style = Stroke(width = strokeWidth, cap = StrokeCap.Round)
- )
- } else {
- drawArc(
- color = primaryColor,
- startAngle = 0f,
- sweepAngle = 360f,
- useCenter = false,
- topLeft = Offset(center.x - radius, center.y - radius),
- size = Size(radius * 2, radius * 2),
- style = Stroke(width = strokeWidth, cap = StrokeCap.Round)
- )
- }
- }
-
- Column(horizontalAlignment = Alignment.CenterHorizontally) {
- Text(
- text = if (isReady) "✓" else "P",
- color = primaryColor,
- fontSize = if (isReady) 48.sp else (40 * pulseScale).sp,
- fontWeight = FontWeight.Bold
- )
- }
+ drawCircle(
+ color = track,
+ radius = radius,
+ center = center,
+ style = Stroke(width = strokeWidth),
+ )
+ drawArc(
+ color = primary,
+ startAngle = if (isReady) 0f else rotationAngle,
+ sweepAngle = if (isReady) 360f else 270f,
+ useCenter = false,
+ topLeft = Offset(center.x - radius, center.y - radius),
+ size = Size(radius * 2, radius * 2),
+ style = Stroke(width = strokeWidth, cap = StrokeCap.Round),
+ )
}
- Spacer(modifier = Modifier.height(16.dp))
-
- LinearProgressIndicator(
- progress = { animatedProgress },
- modifier = Modifier
- .fillMaxWidth(0.7f)
- .height(6.dp),
- color = primaryColor,
- trackColor = surfaceVariantColor,
- )
-
- Spacer(modifier = Modifier.height(12.dp))
-
Text(
- text = if (isReady) "Boot Complete!" else bootStage.ifEmpty { "Starting..." },
- style = MaterialTheme.typography.titleMedium,
- color = if (isReady) primaryColor else MaterialTheme.colorScheme.onSurfaceVariant,
- fontWeight = FontWeight.SemiBold
+ text = if (isReady) "✓" else "P",
+ color = primary,
+ fontSize = if (isReady) 32.sp else (28 * pulseScale).sp,
+ fontWeight = FontWeight.Bold,
)
-
- if (!isReady) {
- Spacer(modifier = Modifier.height(4.dp))
- Text(
- text = "Please wait...",
- style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
- )
- }
}
}
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 e542f06..84199fe 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
@@ -33,8 +33,9 @@ class HomeViewModel @Inject constructor(
val vmState: StateFlow<VmState> = podroidQemu.state
.stateIn(viewModelScope, SharingStarted.Eagerly, VmState.Idle)
+ // Eagerly so a brief detour to Settings while booting doesn't drop progress updates.
val bootStage: StateFlow<String> = podroidQemu.bootStage
- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), "")
+ .stateIn(viewModelScope, SharingStarted.Eagerly, "")
val storageAccessEnabled: StateFlow<Boolean> = settingsRepository.storageAccessEnabled
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), false)
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 50bba64..65dfcc0 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
@@ -1,5 +1,10 @@
package com.excp.podroid.ui.screens.settings
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.provider.Settings
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
@@ -49,6 +54,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontFamily
@@ -78,6 +84,7 @@ fun SettingsScreen(
val vmCpus by viewModel.vmCpus.collectAsStateWithLifecycle()
val storageSizeGb by viewModel.storageSizeGb.collectAsStateWithLifecycle()
val sshEnabled by viewModel.sshEnabled.collectAsStateWithLifecycle(false)
+ val storageAccessEnabled by viewModel.storageAccessEnabled.collectAsStateWithLifecycle(false)
val qemuExtraArgs by viewModel.qemuExtraArgs.collectAsStateWithLifecycle()
val kernelExtraCmdline by viewModel.kernelExtraCmdline.collectAsStateWithLifecycle()
var advancedExpanded by remember { mutableStateOf(false) }
@@ -208,6 +215,12 @@ fun SettingsScreen(
modifier = Modifier.padding(top = 2.dp, bottom = 8.dp),
)
+ DownloadsSharingCard(
+ enabled = storageAccessEnabled,
+ vmNotRunning = vmNotRunning,
+ onToggle = { viewModel.setStorageAccessEnabled(it) },
+ )
+
Spacer(Modifier.height(16.dp))
// ── Network ───────────────────────────────────────────────
@@ -631,6 +644,106 @@ private fun SettingsInfoRow(label: String, value: String) {
}
}
+/**
+ * Mirrors the setup-wizard's storage-access card: toggle, "may crash the VM"
+ * warning, and a permission-grant button when MANAGE_EXTERNAL_STORAGE isn't held.
+ */
+@Composable
+private fun DownloadsSharingCard(
+ enabled: Boolean,
+ vmNotRunning: Boolean,
+ onToggle: (Boolean) -> Unit,
+) {
+ val context = LocalContext.current
+ val canManageAllFiles = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+ val hasStoragePermission = !canManageAllFiles || Environment.isExternalStorageManager()
+
+ fun openAllFilesAccessSettings() {
+ context.startActivity(
+ Intent(
+ Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
+ Uri.parse("package:${context.packageName}"),
+ )
+ )
+ }
+
+ Card(
+ modifier = Modifier.fillMaxWidth(),
+ colors = CardDefaults.cardColors(
+ containerColor = MaterialTheme.colorScheme.surfaceVariant,
+ ),
+ ) {
+ Column(modifier = Modifier.padding(16.dp)) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Column(modifier = Modifier.weight(1f)) {
+ Text(
+ text = "Downloads sharing",
+ style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.SemiBold,
+ )
+ Spacer(Modifier.height(4.dp))
+ Text(
+ text = if (enabled)
+ "Mounted as /mnt/downloads in the VM via virtio-9p."
+ else
+ "Share the Android Downloads folder with the VM.",
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ )
+ }
+ Spacer(Modifier.width(12.dp))
+ Switch(
+ checked = enabled,
+ onCheckedChange = { checked ->
+ onToggle(checked)
+ // Mirror SetupScreen behavior: when the user enables sharing
+ // and we're on R+ without MANAGE_EXTERNAL_STORAGE held, jump
+ // straight to the system grant screen so they can flip it.
+ if (checked && canManageAllFiles && !Environment.isExternalStorageManager()) {
+ openAllFilesAccessSettings()
+ }
+ },
+ )
+ }
+
+ Spacer(Modifier.height(12.dp))
+ Text(
+ text = "On some devices this may crash the VM.",
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.error,
+ fontWeight = FontWeight.SemiBold,
+ )
+
+ if (enabled && canManageAllFiles && !hasStoragePermission) {
+ Spacer(Modifier.height(12.dp))
+ FilledTonalButton(onClick = ::openAllFilesAccessSettings) {
+ Text("Grant storage access")
+ }
+ } else if (enabled && canManageAllFiles) {
+ Spacer(Modifier.height(8.dp))
+ Text(
+ text = if (hasStoragePermission) "All files access granted." else "All files access not granted.",
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ )
+ }
+
+ if (!vmNotRunning) {
+ Spacer(Modifier.height(8.dp))
+ Text(
+ text = "Restart the VM for changes to take effect.",
+ style = MaterialTheme.typography.labelSmall,
+ color = MaterialTheme.colorScheme.error,
+ )
+ }
+ }
+ }
+}
+
@Composable
private fun AdvancedTextSetting(
label: String,
@@ -641,21 +754,29 @@ private fun AdvancedTextSetting(
onReset: () -> Unit,
minLines: Int,
) {
+ // Editing is local; we only persist when the field loses focus. Avoids
+ // round-tripping every keystroke through DataStore on a multi-line config field.
var localValue by remember(value) { mutableStateOf(value) }
+ var hadFocus by remember { mutableStateOf(false) }
Column(modifier = Modifier.fillMaxWidth()) {
OutlinedTextField(
value = localValue,
- onValueChange = {
- localValue = it
- onValueChange(it)
- },
+ onValueChange = { localValue = it },
label = { Text(label) },
enabled = enabled,
singleLine = false,
minLines = minLines,
textStyle = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace),
- modifier = Modifier.fillMaxWidth(),
+ modifier = Modifier
+ .fillMaxWidth()
+ .onFocusChanged { state ->
+ if (state.isFocused) {
+ hadFocus = true
+ } else if (hadFocus && localValue != value) {
+ onValueChange(localValue)
+ }
+ },
)
Row(
modifier = Modifier
@@ -669,10 +790,7 @@ private fun AdvancedTextSetting(
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.weight(1f),
)
- TextButton(
- onClick = onReset,
- enabled = enabled,
- ) {
+ TextButton(onClick = onReset, enabled = enabled) {
Text("Reset")
}
}
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 d42bdd0..f6f8c1e 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
@@ -18,6 +18,7 @@ import com.excp.podroid.data.repository.PortForwardRule
import com.excp.podroid.data.repository.SettingsRepository
import com.excp.podroid.engine.PodroidQemu
import com.excp.podroid.engine.VmState
+import com.excp.podroid.util.NetworkUtils
import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.Dispatchers
@@ -89,6 +90,12 @@ class SettingsViewModel @Inject constructor(
viewModelScope.launch { settingsRepository.setSshEnabled(value) }
}
+ val storageAccessEnabled: Flow<Boolean> = settingsRepository.storageAccessEnabled
+
+ fun setStorageAccessEnabled(value: Boolean) {
+ viewModelScope.launch { settingsRepository.setStorageAccessEnabled(value) }
+ }
+
val portForwardRules: StateFlow<List<PortForwardRule>> = portForwardRepository.rules
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
@@ -119,12 +126,15 @@ class SettingsViewModel @Inject constructor(
viewModelScope.launch { settingsRepository.setTerminalFont(value) }
}
- // "both" expands into separate TCP + UDP rules
+ // "both" expands into separate TCP + UDP rules. Existing rules with the
+ // same host port + protocol are skipped so the persisted Set doesn't grow.
fun addPortForward(hostPort: Int, guestPort: Int, protocol: String = "tcp") {
val protos = if (protocol == "both") listOf("tcp", "udp") else listOf(protocol)
viewModelScope.launch {
+ val existing = portForwardRules.value.toSet()
protos.forEach { proto ->
val rule = PortForwardRule(hostPort, guestPort, proto)
+ if (existing.any { it.hostPort == hostPort && it.protocol == proto }) return@forEach
portForwardRepository.addRule(rule)
if (podroidQemu.state.value is VmState.Running) {
podroidQemu.qmpClient.addPortForward(hostPort, guestPort, proto)
@@ -133,15 +143,8 @@ class SettingsViewModel @Inject constructor(
}
}
- /** Current LAN IP of the Android device — shown next to port forward rules. */
- val phoneIp: String
- get() = try {
- java.net.NetworkInterface.getNetworkInterfaces()
- ?.asSequence()
- ?.flatMap { it.inetAddresses.asSequence() }
- ?.firstOrNull { !it.isLoopbackAddress && it is java.net.Inet4Address }
- ?.hostAddress ?: "unknown"
- } catch (_: Exception) { "unknown" }
+ /** Current LAN IP of the Android device — shown next to port forward rules. Cached for the VM lifetime. */
+ val phoneIp: String by lazy { NetworkUtils.localIpv4() }
fun removePortForward(rule: PortForwardRule) {
viewModelScope.launch {
@@ -276,8 +279,9 @@ class SettingsViewModel @Inject constructor(
appendLine("=== QEMU Console Log ===")
val consoleFile = File(context.filesDir, "console.log")
if (consoleFile.exists() && consoleFile.length() > 0) {
- append(consoleFile.readText())
- if (!consoleFile.readText().endsWith("\n")) appendLine()
+ val text = consoleFile.readText()
+ append(text)
+ if (!text.endsWith("\n")) appendLine()
} else {
appendLine("(no console.log — VM has not been started this session)")
}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupViewModel.kt
index 31b7a05..7371b2f 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupViewModel.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupViewModel.kt
@@ -1,9 +1,13 @@
package com.excp.podroid.ui.screens.setup
+import androidx.datastore.preferences.core.edit
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.excp.podroid.data.repository.SettingsRepository
+import com.excp.podroid.data.repository.dataStore
+import android.content.Context
import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
@@ -12,19 +16,24 @@ import javax.inject.Inject
@HiltViewModel
class SetupViewModel @Inject constructor(
- private val settingsRepository: SettingsRepository,
+ @ApplicationContext private val context: Context,
) : ViewModel() {
private val _setupComplete = MutableStateFlow(false)
val setupComplete: StateFlow<Boolean> = _setupComplete.asStateFlow()
+ /**
+ * Persists all setup choices in a single DataStore transaction so a process
+ * kill mid-write can't leave the app in a half-completed setup state.
+ */
fun completeSetup(storageSizeGb: Int, sshEnabled: Boolean, storageAccessEnabled: Boolean) {
viewModelScope.launch {
- // Write all settings fully before signalling completion
- settingsRepository.setStorageSizeGb(storageSizeGb)
- settingsRepository.setSshEnabled(sshEnabled)
- settingsRepository.setStorageAccessEnabled(storageAccessEnabled)
- settingsRepository.markSetupDone()
+ context.dataStore.edit { prefs ->
+ prefs[SettingsRepository.KEY_STORAGE_GB] = storageSizeGb
+ prefs[SettingsRepository.KEY_SSH_ENABLED] = sshEnabled
+ prefs[SettingsRepository.KEY_STORAGE_ACCESS_ENABLED] = storageAccessEnabled
+ prefs[SettingsRepository.KEY_SETUP_DONE] = true
+ }
_setupComplete.value = true
}
}
diff --git a/app/src/main/java/com/excp/podroid/ui/theme/Color.kt b/app/src/main/java/com/excp/podroid/ui/theme/Color.kt
index 30c6f57..2c43056 100644
--- a/app/src/main/java/com/excp/podroid/ui/theme/Color.kt
+++ b/app/src/main/java/com/excp/podroid/ui/theme/Color.kt
@@ -11,8 +11,6 @@ package com.excp.podroid.ui.theme
import androidx.compose.ui.graphics.Color
-// ── Core palette (deep indigo + cyan accent) ──────────────────────────────────
-
val Purple80 = Color(0xFFD0BCFF)
val PurpleGrey80 = Color(0xFFCCC2DC)
val Cyan80 = Color(0xFF80DEEA)
@@ -20,14 +18,3 @@ val Cyan80 = Color(0xFF80DEEA)
val Purple40 = Color(0xFF6650A4)
val PurpleGrey40 = Color(0xFF625B71)
val Cyan40 = Color(0xFF00838F)
-
-// ── VM status indicator colors ────────────────────────────────────────────────
-
-/** Shown on the VM card when the machine is actively running. */
-val RunningGreen = Color(0xFF4CAF50)
-
-/** Shown when the VM is paused / saved. */
-val PausedAmber = Color(0xFFFFC107)
-
-/** Error / stopped state. */
-val ErrorRed = Color(0xFFF44336)
diff --git a/app/src/main/java/com/excp/podroid/ui/theme/Theme.kt b/app/src/main/java/com/excp/podroid/ui/theme/Theme.kt
index 58db467..2630a02 100644
--- a/app/src/main/java/com/excp/podroid/ui/theme/Theme.kt
+++ b/app/src/main/java/com/excp/podroid/ui/theme/Theme.kt
@@ -30,17 +30,18 @@ private val LightColorScheme = lightColorScheme(
@Composable
fun PodroidTheme(
- darkTheme: Boolean = isSystemInDarkTheme(),
+ darkTheme: Boolean? = null,
dynamicColor: Boolean = true,
content: @Composable () -> Unit,
) {
+ val effectiveDark = darkTheme ?: isSystemInDarkTheme()
val colorScheme = when {
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
val context = LocalContext.current
- if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+ if (effectiveDark) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
}
- darkTheme -> DarkColorScheme
- else -> LightColorScheme
+ effectiveDark -> DarkColorScheme
+ else -> LightColorScheme
}
MaterialTheme(