Skip to content

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

feat(home): refresh + boot-duration tracking + data sections

ExTv63cbc975823f
diff --git a/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt b/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt
index 3e311eb..5afd478 100644
--- a/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt
+++ b/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt
@@ -12,6 +12,7 @@ import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.booleanPreferencesKey
import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.longPreferencesKey
import androidx.datastore.preferences.core.stringPreferencesKey
import androidx.datastore.preferences.preferencesDataStore
import dagger.hilt.android.qualifiers.ApplicationContext
@@ -44,6 +45,7 @@ class SettingsRepository @Inject constructor(
val KEY_SHOW_EXTRA_KEYS = booleanPreferencesKey("show_extra_keys")
val KEY_HAPTICS_ENABLED = booleanPreferencesKey("haptics_enabled")
val KEY_DYNAMIC_COLOR_ENABLED = booleanPreferencesKey("dynamic_color_enabled")
+ val KEY_LAST_BOOT_DURATION_MS = longPreferencesKey("last_boot_duration_ms")
/**
* Default tunable QEMU args — CPU model, accel tuning, RNG source, overcommit.
@@ -100,6 +102,7 @@ class SettingsRepository @Inject constructor(
val showExtraKeys = pref(KEY_SHOW_EXTRA_KEYS, true)
val hapticsEnabled = pref(KEY_HAPTICS_ENABLED, true)
val dynamicColorEnabled = pref(KEY_DYNAMIC_COLOR_ENABLED, false)
+ val lastBootDurationMs = pref(KEY_LAST_BOOT_DURATION_MS, 0L)
suspend fun setDarkTheme(value: Boolean) = set(KEY_DARK_THEME, value)
suspend fun setVmRamMb(value: Int) = set(KEY_VM_RAM, value)
@@ -116,6 +119,7 @@ class SettingsRepository @Inject constructor(
suspend fun setShowExtraKeys(value: Boolean) = set(KEY_SHOW_EXTRA_KEYS, value)
suspend fun setHapticsEnabled(value: Boolean) = set(KEY_HAPTICS_ENABLED, value)
suspend fun setDynamicColorEnabled(value: Boolean) = set(KEY_DYNAMIC_COLOR_ENABLED, value)
+ suspend fun setLastBootDurationMs(value: Long) = set(KEY_LAST_BOOT_DURATION_MS, value)
// Snapshots used by non-Compose call sites (PodroidService, exporters).
suspend fun getSshEnabledSnapshot() = sshEnabled.first()
diff --git a/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt b/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
index e499656..c8b45e3 100644
--- a/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
+++ b/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt
@@ -52,6 +52,7 @@ import javax.inject.Singleton
@Singleton
class PodroidQemu @Inject constructor(
@ApplicationContext private val context: Context,
+ private val settingsRepository: com.excp.podroid.data.repository.SettingsRepository,
) {
private val _state = MutableStateFlow<VmState>(VmState.Idle)
val state: StateFlow<VmState> = _state.asStateFlow()
@@ -85,6 +86,8 @@ class PodroidQemu @Inject constructor(
private var ioScope: CoroutineScope? = null
+ private var bootStartTime: Long = 0L
+
private val consoleBuilder = StringBuilder()
private val maxConsoleSize = 64 * 1024
@@ -140,6 +143,15 @@ class PodroidQemu @Inject constructor(
}
}
+ private fun persistBootDuration() {
+ if (bootStartTime == 0L) return
+ val duration = System.currentTimeMillis() - bootStartTime
+ bootStartTime = 0L
+ // ioScope is the same scope launched in start(); always non-null here
+ // because we're called from inside it.
+ ioScope?.launch { settingsRepository.setLastBootDurationMs(duration) }
+ }
+
private fun autoStartBridge() {
android.os.Handler(android.os.Looper.getMainLooper()).post {
if (_terminalSession != null) return@post
@@ -233,6 +245,7 @@ class PodroidQemu @Inject constructor(
ensureStorageImage(config.storageSizeGb)
cleanedUp.set(false)
+ bootStartTime = System.currentTimeMillis()
_state.value = VmState.Starting
consoleBuilder.clear()
_consoleText.value = ""
@@ -307,6 +320,7 @@ class PodroidQemu @Inject constructor(
if (_state.value is VmState.Starting) {
Log.w(TAG, "Boot timeout fallback → forcing Running state")
_bootStage.value = "Ready"
+ persistBootDuration()
_state.value = VmState.Running
autoStartBridge()
}
@@ -432,6 +446,7 @@ class PodroidQemu @Inject constructor(
when {
text.contains("Ready!") -> {
_bootStage.value = "Ready"
+ persistBootDuration()
_state.value = VmState.Running
autoStartBridge()
}
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
deleted file mode 100644
index 6e63408..0000000
--- a/app/src/main/java/com/excp/podroid/ui/screens/home/AnimatedBootProgress.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.excp.podroid.ui.screens.home
-
-import androidx.compose.animation.core.LinearEasing
-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.animateFloat
-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.Box
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-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.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
-
-/**
- * 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 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,
- ),
- label = "pulse",
- )
-
- val rotationAngle by transition.animateFloat(
- initialValue = 0f,
- targetValue = 360f,
- animationSpec = infiniteRepeatable(
- animation = tween(1500, easing = LinearEasing),
- repeatMode = RepeatMode.Restart,
- ),
- label = "rotation",
- )
-
- val isReady = bootStage == "Ready"
- val primary = MaterialTheme.colorScheme.primary
- val track = 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)
-
- 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),
- )
- }
-
- Text(
- text = if (isReady) "✓" else "P",
- color = primary,
- fontSize = if (isReady) 32.sp else (28 * pulseScale).sp,
- fontWeight = FontWeight.Bold,
- )
- }
-}
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 5d74722..cf61d9f 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
@@ -2,7 +2,6 @@ package com.excp.podroid.ui.screens.home
import android.content.Intent
import android.net.Uri
-import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@@ -11,31 +10,19 @@ import androidx.compose.foundation.layout.fillMaxSize
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.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.PowerSettingsNew
-import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.filled.SystemUpdate
-import androidx.compose.material.icons.filled.Terminal
import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBar
import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
import androidx.compose.material3.windowsizeclass.WindowSizeClass
import androidx.compose.runtime.Composable
@@ -43,14 +30,21 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.excp.podroid.BuildConfig
import com.excp.podroid.engine.VmState
import com.excp.podroid.ui.components.AdaptiveContainer
+import com.excp.podroid.ui.components.PodroidDestructiveButton
+import com.excp.podroid.ui.components.PodroidGhostButton
+import com.excp.podroid.ui.components.PodroidListRow
+import com.excp.podroid.ui.components.PodroidPrimaryButton
+import com.excp.podroid.ui.components.PodroidSectionLabel
+import com.excp.podroid.ui.components.PodroidStatus
+import com.excp.podroid.ui.components.PodroidStatusColors
+import com.excp.podroid.ui.components.PodroidTopBar
+import com.excp.podroid.ui.theme.PodroidTokens
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -64,41 +58,36 @@ fun HomeScreen(
val vmState by viewModel.vmState.collectAsStateWithLifecycle()
val bootStage by viewModel.bootStage.collectAsStateWithLifecycle()
val updateInfo by viewModel.updateInfo.collectAsStateWithLifecycle()
+ val meta by viewModel.meta.collectAsStateWithLifecycle()
+ val uptimeTick by viewModel.uptimeTicker.collectAsStateWithLifecycle()
- val isRunning = vmState is VmState.Running
+ val isRunning = vmState is VmState.Running
val isStarting = vmState is VmState.Starting
+ val uptimeLabel = viewModel.uptimeLabel(uptimeTick)
+ val phoneIp = viewModel.phoneIp()
- // Update dialog
updateInfo?.let { info ->
AlertDialog(
onDismissRequest = { viewModel.dismissUpdate() },
- icon = { Icon(Icons.Default.SystemUpdate, contentDescription = null) },
+ icon = { Icon(Icons.Default.SystemUpdate, contentDescription = null) },
title = { Text("Update available") },
- text = {
- Text("Version ${info.latestVersion} is available. You have ${BuildConfig.VERSION_NAME}.")
- },
+ text = { Text("Version ${info.latestVersion} is available. You have ${BuildConfig.VERSION_NAME}.") },
confirmButton = {
- Button(onClick = {
+ TextButton(onClick = {
context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(info.releaseUrl)))
viewModel.dismissUpdate()
- }) {
- Text("Download")
- }
+ }) { Text("Download") }
},
dismissButton = {
- TextButton(onClick = { viewModel.dismissUpdate() }) {
- Text("Later")
- }
+ TextButton(onClick = { viewModel.dismissUpdate() }) { Text("Later") }
},
)
}
- val isCompactHeight = windowSizeClass.heightSizeClass == WindowHeightSizeClass.Compact
-
Scaffold(
topBar = {
- TopAppBar(
- title = { Text("Podroid") },
+ PodroidTopBar(
+ title = "Podroid",
actions = {
IconButton(onClick = onNavigateToSettings) {
Icon(Icons.Default.Settings, contentDescription = "Settings")
@@ -106,7 +95,9 @@ fun HomeScreen(
},
)
},
+ containerColor = MaterialTheme.colorScheme.background,
) { innerPadding ->
+ val isCompactHeight = windowSizeClass.heightSizeClass == WindowHeightSizeClass.Compact
AdaptiveContainer(
windowSizeClass = windowSizeClass,
modifier = Modifier
@@ -115,31 +106,32 @@ fun HomeScreen(
maxWidth = if (isCompactHeight) 900 else 600,
) {
if (isCompactHeight) {
- // Landscape phone: hero on left, action buttons on right
+ // Landscape phone / split-screen: hero on left, action column on right.
Row(
modifier = Modifier
.fillMaxSize()
- .padding(horizontal = 24.dp, vertical = 16.dp),
+ .padding(horizontal = PodroidTokens.Spacing.XL2, vertical = PodroidTokens.Spacing.LG),
verticalAlignment = Alignment.CenterVertically,
) {
Column(
- modifier = Modifier.weight(1f),
- horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.Center,
+ modifier = Modifier
+ .weight(1f)
+ .padding(end = PodroidTokens.Spacing.XL2)
+ .verticalScroll(rememberScrollState()),
) {
- StatusHero(isStarting = isStarting, isRunning = isRunning, bootStage = bootStage, iconSize = 64)
+ HomeStatusBlock(isStarting, isRunning, vmState, bootStage, meta, uptimeLabel)
+ HomeDataSection(isRunning, vmState, meta, phoneIp)
}
- Spacer(Modifier.width(24.dp))
Column(
modifier = Modifier
.weight(1f)
.verticalScroll(rememberScrollState()),
- verticalArrangement = Arrangement.spacedBy(12.dp),
+ verticalArrangement = Arrangement.spacedBy(PodroidTokens.Spacing.SM),
) {
HomeActionButtons(
- vmState = vmState,
isRunning = isRunning,
isStarting = isStarting,
+ vmState = vmState,
onStart = { viewModel.startPodroid() },
onStop = { viewModel.stopVm() },
onRestart = { viewModel.restartVm() },
@@ -148,34 +140,27 @@ fun HomeScreen(
}
}
} else {
- // Portrait / tall: vertical stack
Column(
modifier = Modifier
.fillMaxSize()
.verticalScroll(rememberScrollState())
- .padding(horizontal = 24.dp),
- horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.spacedBy(20.dp),
+ .padding(horizontal = PodroidTokens.Spacing.XL),
+ verticalArrangement = Arrangement.spacedBy(PodroidTokens.Spacing.MD),
) {
- Spacer(modifier = Modifier.height(24.dp))
- StatusHero(isStarting = isStarting, isRunning = isRunning, bootStage = bootStage, iconSize = 72)
+ Spacer(Modifier.height(PodroidTokens.Spacing.XL))
+ HomeStatusBlock(isStarting, isRunning, vmState, bootStage, meta, uptimeLabel)
+ HomeDataSection(isRunning, vmState, meta, phoneIp)
+ Spacer(Modifier.weight(1f))
HomeActionButtons(
- vmState = vmState,
isRunning = isRunning,
isStarting = isStarting,
+ vmState = vmState,
onStart = { viewModel.startPodroid() },
onStop = { viewModel.stopVm() },
onRestart = { viewModel.restartVm() },
onOpenTerminal = onNavigateToTerminal,
)
- Spacer(Modifier.height(8.dp))
- Text(
- text = "Alpine Linux · Podman · QEMU",
- style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.onSurfaceVariant,
- textAlign = TextAlign.Center,
- )
- Spacer(Modifier.height(8.dp))
+ Spacer(Modifier.height(PodroidTokens.Spacing.XL))
}
}
}
@@ -183,134 +168,132 @@ fun HomeScreen(
}
@Composable
-private fun StatusHero(
+private fun HomeStatusBlock(
isStarting: Boolean,
isRunning: Boolean,
+ vmState: VmState,
bootStage: String,
- iconSize: Int,
+ meta: HomeMeta,
+ uptimeLabel: String?,
) {
- Box(modifier = Modifier.size(iconSize.dp), contentAlignment = Alignment.Center) {
- if (isStarting) {
- com.excp.podroid.ui.screens.home.AnimatedBootProgress(
- bootStage = bootStage,
- modifier = Modifier.size(iconSize.dp)
- )
- } else {
- Icon(
- imageVector = Icons.Default.Terminal,
- contentDescription = null,
- modifier = Modifier.size(iconSize.dp),
- tint = if (isRunning)
- MaterialTheme.colorScheme.primary
- else
- MaterialTheme.colorScheme.onSurfaceVariant,
- )
+ PodroidSectionLabel("VM Status")
+ Text(
+ text = when {
+ isStarting -> "Starting"
+ isRunning -> "Running"
+ else -> "Stopped"
+ },
+ style = MaterialTheme.typography.displayLarge,
+ color = when {
+ isRunning -> MaterialTheme.colorScheme.primary
+ isStarting -> MaterialTheme.colorScheme.tertiary
+ else -> MaterialTheme.colorScheme.onSurface
+ },
+ )
+ Spacer(Modifier.height(PodroidTokens.Spacing.SM))
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ val (dot, label) = when {
+ isRunning -> PodroidStatusColors.Running to (uptimeLabel ?: "Up")
+ isStarting -> PodroidStatusColors.Starting to bootStage.ifEmpty { "Starting" }
+ else -> PodroidStatusColors.Stopped to "Idle"
}
+ PodroidStatus(label = label, dotColor = dot)
+ Text(
+ text = meta.resourcesLabel,
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ )
}
- Spacer(Modifier.height(16.dp))
- Column(horizontalAlignment = Alignment.CenterHorizontally) {
+ if (vmState is VmState.Error) {
+ Spacer(Modifier.height(PodroidTokens.Spacing.MD))
+ PodroidSectionLabel("Error")
Text(
- text = when {
- isStarting -> "Starting…"
- isRunning -> "VM is running"
- else -> "VM is stopped"
- },
- style = MaterialTheme.typography.headlineSmall,
- fontWeight = FontWeight.SemiBold,
- color = when {
- isStarting -> MaterialTheme.colorScheme.primary
- isRunning -> MaterialTheme.colorScheme.primary
- else -> MaterialTheme.colorScheme.onSurfaceVariant
- },
+ text = vmState.message,
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.error,
+ )
+ }
+ // Starting state: the meta row already shows the amber dot + boot-stage
+ // text, which is the canonical boot indicator. No need for a separate ring.
+}
+
+@Composable
+private fun HomeDataSection(
+ isRunning: Boolean,
+ vmState: VmState,
+ meta: HomeMeta,
+ phoneIp: String,
+) {
+ val showStarting = vmState is VmState.Starting
+ val showError = vmState is VmState.Error
+ if (showStarting || showError) return
+ Spacer(Modifier.height(PodroidTokens.Spacing.MD))
+ if (isRunning) {
+ PodroidSectionLabel("Network")
+ PodroidListRow(label = "Phone IP", value = phoneIp, mono = true)
+ PodroidListRow(
+ label = "SSH",
+ value = if (meta.sshEnabled) ":9922 · podroid" else "Off",
+ mono = meta.sshEnabled,
)
- if (isStarting && bootStage.isNotEmpty()) {
- Spacer(Modifier.height(4.dp))
- Text(
- text = bootStage,
- style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.onSurfaceVariant,
- textAlign = TextAlign.Center,
+ PodroidListRow(
+ label = "Port forwards",
+ value = if (meta.portForwardCount == 0) "None" else "${meta.portForwardCount} active",
+ )
+ } else {
+ PodroidSectionLabel("Last session")
+ if (meta.lastBootDurationMs > 0L) {
+ PodroidListRow(
+ label = "Booted in",
+ value = formatBootDuration(meta.lastBootDurationMs),
)
}
+ PodroidListRow(
+ label = "Build",
+ value = "v${BuildConfig.VERSION_NAME} · QEMU ${BuildConfig.QEMU_VERSION}",
+ mono = true,
+ )
+ }
+}
+
+private fun formatBootDuration(ms: Long): String {
+ val totalSec = (ms / 1000).coerceAtLeast(0)
+ return if (totalSec >= 60) {
+ val m = totalSec / 60
+ val s = totalSec % 60
+ if (s == 0L) "${m}m" else "${m}m ${s}s"
+ } else {
+ val tenths = (ms / 100) % 10
+ if (tenths == 0L) "${totalSec}s" else "${totalSec}.${tenths}s"
}
}
@Composable
private fun HomeActionButtons(
- vmState: VmState,
isRunning: Boolean,
isStarting: Boolean,
+ vmState: VmState,
onStart: () -> Unit,
onStop: () -> Unit,
onRestart: () -> Unit,
onOpenTerminal: () -> Unit,
) {
- Button(
- onClick = { if (isRunning || isStarting) onStop() else onStart() },
- modifier = Modifier.fillMaxWidth().height(56.dp),
- shape = RoundedCornerShape(16.dp),
- colors = ButtonDefaults.buttonColors(
- containerColor = if (isRunning || isStarting)
- MaterialTheme.colorScheme.error
- else
- MaterialTheme.colorScheme.primary,
- ),
- ) {
- Icon(Icons.Default.PowerSettingsNew, contentDescription = null, modifier = Modifier.size(22.dp))
- Spacer(Modifier.width(10.dp))
- Text(
- text = if (isRunning || isStarting) "Stop VM" else "Start VM",
- style = MaterialTheme.typography.titleMedium,
- )
- }
- if (isRunning) {
- FilledTonalButton(
- onClick = onRestart,
- modifier = Modifier.fillMaxWidth().height(48.dp),
- shape = RoundedCornerShape(16.dp),
- ) {
- Icon(Icons.Default.Refresh, contentDescription = null, modifier = Modifier.size(20.dp))
- Spacer(Modifier.width(8.dp))
- Text("Restart VM")
- }
- }
- if (vmState is VmState.Error) {
- Card(
- modifier = Modifier.fillMaxWidth(),
- shape = RoundedCornerShape(16.dp),
- colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer),
- ) {
- Column(modifier = Modifier.padding(16.dp)) {
- Text(
- text = vmState.message,
- color = MaterialTheme.colorScheme.onErrorContainer,
- style = MaterialTheme.typography.bodyMedium,
- )
- Spacer(Modifier.height(12.dp))
- Button(
- onClick = onStart,
- modifier = Modifier.fillMaxWidth(),
- shape = RoundedCornerShape(12.dp),
- ) {
- Icon(Icons.Default.Refresh, contentDescription = null, modifier = Modifier.size(18.dp))
- Spacer(Modifier.width(8.dp))
- Text("Try again")
- }
- }
- }
- }
if (isRunning) {
- FilledTonalButton(
- onClick = onOpenTerminal,
- modifier = Modifier.fillMaxWidth().height(56.dp),
- shape = RoundedCornerShape(16.dp),
- ) {
- Icon(Icons.Default.Terminal, contentDescription = null, modifier = Modifier.size(22.dp))
- Spacer(Modifier.width(10.dp))
- Text(
- text = "Open Terminal",
- style = MaterialTheme.typography.titleMedium,
- )
+ PodroidPrimaryButton(text = "Open Terminal", onClick = onOpenTerminal)
+ Spacer(Modifier.height(PodroidTokens.Spacing.SM))
+ Row(horizontalArrangement = Arrangement.spacedBy(PodroidTokens.Spacing.SM)) {
+ PodroidGhostButton(text = "Restart", onClick = onRestart, modifier = Modifier.weight(1f))
+ PodroidDestructiveButton(text = "Stop", onClick = onStop, modifier = Modifier.weight(1f))
}
+ } else if (isStarting) {
+ PodroidDestructiveButton(text = "Stop", onClick = onStop)
+ } else if (vmState is VmState.Error) {
+ PodroidPrimaryButton(text = "Try again", onClick = onStart)
+ } else {
+ PodroidPrimaryButton(text = "Start VM", onClick = onStart)
}
}
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 7fec04c..b9f659e 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
@@ -4,47 +4,159 @@ import android.content.Context
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.excp.podroid.BuildConfig
+import com.excp.podroid.data.repository.PortForwardRepository
import com.excp.podroid.data.repository.SettingsRepository
import com.excp.podroid.data.repository.UpdateInfo
import com.excp.podroid.data.repository.UpdateRepository
import com.excp.podroid.engine.PodroidQemu
import com.excp.podroid.engine.VmState
import com.excp.podroid.service.PodroidService
+import com.excp.podroid.util.NetworkUtils
import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
import kotlinx.coroutines.withTimeoutOrNull
import javax.inject.Inject
+/**
+ * Aggregated Home metadata used by the data sections (resources, network,
+ * last-session). `Resources` is shown in the meta row in every state; the
+ * Network/LastSession sections render conditionally based on vmState.
+ */
+data class HomeMeta(
+ val ramMb: Int,
+ val cpus: Int,
+ val storageGb: Int,
+ val sshEnabled: Boolean,
+ val portForwardCount: Int,
+ val lastBootDurationMs: Long,
+) {
+ val resourcesLabel: String = "${formatRam(ramMb)} · $cpus CPU · ${storageGb} GB"
+
+ private fun formatRam(mb: Int): String =
+ if (mb >= 1024) "${mb / 1024} GB" else "$mb MB"
+}
+
@HiltViewModel
class HomeViewModel @Inject constructor(
@ApplicationContext private val context: Context,
private val podroidQemu: PodroidQemu,
private val settingsRepository: SettingsRepository,
+ private val portForwardRepository: PortForwardRepository,
private val updateRepository: UpdateRepository,
) : ViewModel() {
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.Eagerly, "")
val storageAccessEnabled: StateFlow<Boolean> = settingsRepository.storageAccessEnabled
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), false)
+ /** Aggregated metadata for the Home data sections. */
+ val meta: StateFlow<HomeMeta> = combine(
+ settingsRepository.vmRamMb,
+ settingsRepository.vmCpus,
+ settingsRepository.storageSizeGb,
+ settingsRepository.sshEnabled,
+ portForwardRepository.rules.map { it.size }.distinctUntilChanged(),
+ settingsRepository.lastBootDurationMs,
+ ) { values ->
+ HomeMeta(
+ ramMb = values[0] as Int,
+ cpus = values[1] as Int,
+ storageGb = values[2] as Int,
+ sshEnabled = values[3] as Boolean,
+ portForwardCount = values[4] as Int,
+ lastBootDurationMs = values[5] as Long,
+ )
+ }.stateIn(
+ viewModelScope,
+ SharingStarted.WhileSubscribed(5000),
+ HomeMeta(ramMb = 512, cpus = 2, storageGb = 8, sshEnabled = false, portForwardCount = 0, lastBootDurationMs = 0L),
+ )
+
+ /**
+ * Seconds since the VM transitioned to Running. Null when not running.
+ * Recomputed once per second by the ticker flow; the underlying timestamp
+ * is captured on the first observation of the Running state.
+ */
+ val uptimeSeconds: StateFlow<Long?> = flow {
+ var runningSince: Long? = null
+ var lastState: VmState? = null
+ podroidQemu.state.collect { state ->
+ if (state is VmState.Running && lastState !is VmState.Running) {
+ runningSince = System.currentTimeMillis()
+ } else if (state !is VmState.Running) {
+ runningSince = null
+ }
+ lastState = state
+ if (state is VmState.Running) {
+ emit((System.currentTimeMillis() - (runningSince ?: System.currentTimeMillis())) / 1000)
+ } else {
+ emit(null)
+ }
+ }
+ }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), null)
+
+ // Independent ticker — drives display refresh every second while running.
+ // (uptimeSeconds above only re-emits on state change; we need a ticker to
+ // re-evaluate display every second.)
+ val uptimeTicker: StateFlow<Long> = flow {
+ while (true) {
+ emit(System.currentTimeMillis() / 1000)
+ delay(1000)
+ }
+ }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 0L)
+
+ /** Phone IPv4 — cheap, lazily recomputed when the screen reads it. */
+ fun phoneIp(): String = NetworkUtils.localIpv4()
+
private val _updateInfo = MutableStateFlow<UpdateInfo?>(null)
val updateInfo: StateFlow<UpdateInfo?> = _updateInfo.asStateFlow()
+ private var runningSinceMs: Long? = null
+
init {
checkForUpdate()
+ // Maintain runningSinceMs for the synchronous read path used by uptime formatter.
+ viewModelScope.launch {
+ var lastWasRunning = false
+ podroidQemu.state.collect { state ->
+ val nowRunning = state is VmState.Running
+ if (nowRunning && !lastWasRunning) runningSinceMs = System.currentTimeMillis()
+ if (!nowRunning) runningSinceMs = null
+ lastWasRunning = nowRunning
+ }
+ }
+ }
+
+ /** Format "Up Xm Ys" / "Up Xh Ym" from runningSinceMs. */
+ fun uptimeLabel(@Suppress("UNUSED_PARAMETER") tickerTrigger: Long): String? {
+ val since = runningSinceMs ?: return null
+ val totalSec = ((System.currentTimeMillis() - since) / 1000).coerceAtLeast(0)
+ val hours = totalSec / 3600
+ val minutes = (totalSec % 3600) / 60
+ val seconds = totalSec % 60
+ return when {
+ hours > 0 -> "Up ${hours}h ${minutes}m"
+ minutes > 0 -> "Up ${minutes}m ${seconds}s"
+ else -> "Up ${seconds}s"
+ }
}
private fun checkForUpdate() {
@@ -54,45 +166,30 @@ class HomeViewModel @Inject constructor(
if (!updateRepository.isDismissed(info.latestVersion)) {
_updateInfo.value = info
}
- } catch (_: Exception) {
- // Network errors during init shouldn't crash the app — just skip.
- }
+ } catch (_: Exception) { }
}
}
fun dismissUpdate() {
val version = _updateInfo.value?.latestVersion ?: return
_updateInfo.value = null
- viewModelScope.launch {
- updateRepository.dismissUpdate(version)
- }
+ viewModelScope.launch { updateRepository.dismissUpdate(version) }
}
- fun startPodroid() {
- PodroidService.start(context)
- }
+ fun startPodroid() = PodroidService.start(context)
fun setStorageAccessEnabled(enabled: Boolean) {
- viewModelScope.launch {
- settingsRepository.setStorageAccessEnabled(enabled)
- }
+ viewModelScope.launch { settingsRepository.setStorageAccessEnabled(enabled) }
}
- fun stopVm() {
- PodroidService.stop(context)
- }
+ fun stopVm() = PodroidService.stop(context)
fun restartVm() {
PodroidService.stop(context)
viewModelScope.launch {
- // Wait for the VM to actually stop before starting again.
- // A fixed delay could race QEMU shutdown — await the terminal
- // state instead, with a safety timeout.
withTimeoutOrNull(10_000) {
podroidQemu.state.first { state ->
- state is VmState.Stopped ||
- state is VmState.Idle ||
- state is VmState.Error
+ state is VmState.Stopped || state is VmState.Idle || state is VmState.Error
}
}
PodroidService.start(context)