A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
feat(storage): offer sizes up to 512 GB and let storage grow from Settings
ExTv58e4d22ef86a
diff --git a/app/src/main/java/com/excp/podroid/ui/components/VmResourceChips.kt b/app/src/main/java/com/excp/podroid/ui/components/VmResourceChips.ktindex ddb449b..eab1733 100644--- a/app/src/main/java/com/excp/podroid/ui/components/VmResourceChips.kt+++ b/app/src/main/java/com/excp/podroid/ui/components/VmResourceChips.kt@@ -131,6 +131,66 @@ fun VmCpuChips(}}+@OptIn(ExperimentalLayoutApi::class)+@Composable+fun VmStorageChips(+ currentGb: Int,+ onChange: (Int) -> Unit,+ minGb: Int = 0,+ enabled: Boolean = true,+ showDivider: Boolean = true,+) {+ Column(modifier = Modifier.padding(bottom = PodroidTokens.Spacing.SM)) {+ Text(+ "${stringResource(R.string.storage)} · $currentGb GB",+ style = MaterialTheme.typography.bodyMedium,+ color = MaterialTheme.colorScheme.onSurface,+ modifier = Modifier.padding(+ top = PodroidTokens.Spacing.MD,+ bottom = PodroidTokens.Spacing.SM,+ ),+ )+ val availableGb = DeviceResourcePolicy.deviceAvailableStorageGb(LocalContext.current)+ val storageOptions = DeviceResourcePolicy.storageOptionsFor(availableGb).let { options ->+ if (currentGb in options) options else options + currentGb+ }+ FlowRow(+ modifier = Modifier.fillMaxWidth(),+ horizontalArrangement = Arrangement.spacedBy(PodroidTokens.Spacing.SM),+ verticalArrangement = Arrangement.spacedBy(PodroidTokens.Spacing.SM),+ ) {+ storageOptions.forEach { gb ->+ FilterChip(+ selected = gb == currentGb,+ enabled = enabled && gb >= minGb,+ onClick = { onChange(gb) },+ label = {+ Text(+ "$gb GB",+ fontWeight = if (gb == currentGb) FontWeight.Bold else FontWeight.Normal,+ )+ },+ shape = RoundedCornerShape(PodroidTokens.Radius.Chip),+ colors = PodroidChipColors(),+ )+ }+ }+ Text(+ text = stringResource(R.string.storage_grow_hint),+ style = MaterialTheme.typography.bodySmall,+ color = MaterialTheme.colorScheme.onSurfaceVariant,+ modifier = Modifier.padding(top = PodroidTokens.Spacing.SM),+ )+ if (showDivider) {+ HorizontalDivider(+ color = MaterialTheme.colorScheme.outline,+ thickness = 1.dp,+ modifier = Modifier.padding(top = PodroidTokens.Spacing.MD),+ )+ }+ }+}+@OptIn(ExperimentalLayoutApi::class)@Composablefun VmBandwidthChips(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.ktindex e35fc76..3bc348b 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@@ -92,6 +92,7 @@ import com.excp.podroid.ui.components.PodroidListRowimport com.excp.podroid.ui.components.VmBandwidthChipsimport com.excp.podroid.ui.components.VmCpuChipsimport com.excp.podroid.ui.components.VmRamChips+import com.excp.podroid.ui.components.VmStorageChipsimport com.excp.podroid.ui.components.PodroidChipColorsimport com.excp.podroid.ui.components.PodroidSectionLabelimport com.excp.podroid.ui.components.PodroidSwitch@@ -266,9 +267,11 @@ fun SettingsScreen(onChange = viewModel::setBandwidthMbps,enabled = vmNotRunning && !ui.loadBalanceEnabled,)- PodroidListRow(- label = stringResource(R.string.storage),- value = "${ui.storageSizeGb} GB",+ VmStorageChips(+ currentGb = ui.storageSizeGb,+ onChange = viewModel::setStorageSizeGb,+ minGb = ui.storageSizeGb,+ enabled = vmNotRunning && !ui.loadBalanceEnabled,)PodroidListRow(label = stringResource(R.string.autostart_on_boot),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.ktindex 95e1170..40d063e 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@@ -230,6 +230,17 @@ class SettingsViewModel @Inject constructor(}}+ fun setStorageSizeGb(value: Int) {+ viewModelScope.launch {+ // storage.img is never shrunk; the disabled chips already stop this in+ // the UI, this is defence in depth against a stale/racing value.+ val current = settingsRepository.getStorageSizeGbSnapshot()+ if (value < current) return@launch+ settingsRepository.setLoadBalanceEnabled(false)+ settingsRepository.setStorageSizeGb(value)+ }+ }+fun setVmCpus(value: Int) {viewModelScope.launch {settingsRepository.setLoadBalanceEnabled(false)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.ktindex dba838d..4d48f57 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@@ -19,8 +19,6 @@ import androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Column-import androidx.compose.foundation.layout.ExperimentalLayoutApi-import androidx.compose.foundation.layout.FlowRowimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.fillMaxSize@@ -32,13 +30,11 @@ import androidx.compose.foundation.pager.HorizontalPagerimport androidx.compose.foundation.pager.rememberPagerStateimport androidx.compose.foundation.rememberScrollStateimport androidx.compose.foundation.shape.CircleShape-import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.verticalScrollimport androidx.compose.material3.LinearProgressIndicatorimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Scaffoldimport androidx.compose.material3.Text-import androidx.compose.material3.FilterChipimport androidx.compose.material3.windowsizeclass.WindowHeightSizeClassimport androidx.compose.material3.windowsizeclass.WindowSizeClassimport androidx.compose.runtime.Composable@@ -55,7 +51,6 @@ import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.res.stringResource-import androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.unit.dpimport androidx.hilt.lifecycle.viewmodel.compose.hiltViewModelimport androidx.lifecycle.compose.collectAsStateWithLifecycle@@ -66,15 +61,14 @@ import com.excp.podroid.ui.components.PodroidListRowimport com.excp.podroid.ui.components.PodroidPrimaryButtonimport com.excp.podroid.ui.components.PodroidSectionLabelimport com.excp.podroid.ui.components.PodroidSwitch-import com.excp.podroid.ui.components.PodroidChipColorsimport com.excp.podroid.ui.components.VmBandwidthChipsimport com.excp.podroid.ui.components.VmCpuChipsimport com.excp.podroid.ui.components.VmRamChips+import com.excp.podroid.ui.components.VmStorageChipsimport com.excp.podroid.ui.theme.PodroidTokensimport com.excp.podroid.util.DeviceResourcePolicyimport kotlinx.coroutines.launch-private val storageSizes = listOf(2, 4, 8, 16, 32, 64)private const val DEFAULT_STORAGE_GB = 8@Composable@@ -85,7 +79,7 @@ fun SetupScreen() {val context = LocalContext.current// rememberSaveable preserves wizard choices through config changes (rotation, font-scale, etc.)- // so a mid-wizard rotation doesn't silently reset storage to 8 GB (not resizable later).+ // so a mid-wizard rotation doesn't silently reset storage to 8 GB (can be grown, never shrunk).var selectedGb by rememberSaveable { mutableIntStateOf(DEFAULT_STORAGE_GB) }var selectedRamMb by rememberSaveable { mutableIntStateOf(512) }var selectedCpus by rememberSaveable { mutableIntStateOf(2) }@@ -388,16 +382,11 @@ private fun StoragePage(description = stringResource(R.string.storage_description),bottomBar = { SetupNextBar(onNext = onNext) },) {- Text(- text = "$selectedGb GB",- style = MaterialTheme.typography.displayLarge,- color = MaterialTheme.colorScheme.primary,- )- Spacer(Modifier.height(PodroidTokens.Spacing.MD))- StorageSizeChips(- selectedGb = selectedGb,- onSelect = onSelect,+ VmStorageChips(+ currentGb = selectedGb,+ onChange = onSelect,enabled = !loadBalanceEnabled,+ showDivider = false,)if (loadBalanceEnabled) {Spacer(Modifier.height(PodroidTokens.Spacing.SM))@@ -624,31 +613,3 @@ private fun SetupNavBar(PodroidPrimaryButton(text = nextLabel, onClick = onNext, modifier = Modifier.weight(2f))}}--@OptIn(ExperimentalLayoutApi::class)-@Composable-private fun StorageSizeChips(selectedGb: Int, onSelect: (Int) -> Unit, enabled: Boolean = true) {- FlowRow(- modifier = Modifier.fillMaxWidth(),- horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally),- verticalArrangement = Arrangement.spacedBy(8.dp),- maxItemsInEachRow = 3,- ) {- storageSizes.forEach { gb ->- FilterChip(- selected = gb == selectedGb,- enabled = enabled,- onClick = { onSelect(gb) },- label = {- Text(- text = "$gb GB",- style = MaterialTheme.typography.labelLarge,- fontWeight = if (gb == selectedGb) FontWeight.Bold else FontWeight.Normal,- )- },- shape = RoundedCornerShape(16.dp),- colors = PodroidChipColors(),- )- }- }-}diff --git a/app/src/main/java/com/excp/podroid/util/DeviceResourcePolicy.kt b/app/src/main/java/com/excp/podroid/util/DeviceResourcePolicy.ktindex 555d14f..e128a7f 100644--- a/app/src/main/java/com/excp/podroid/util/DeviceResourcePolicy.kt+++ b/app/src/main/java/com/excp/podroid/util/DeviceResourcePolicy.kt@@ -15,7 +15,7 @@ object DeviceResourcePolicy {val CPU_OPTIONS = listOf(1, 2, 4, 6, 8)/** 0 = unlimited */val BANDWIDTH_OPTIONS_MBPS = listOf(0, 10, 50, 100, 500)- val STORAGE_OPTIONS_GB = listOf(2, 4, 8, 16, 32, 64)+ val STORAGE_OPTIONS_GB = listOf(2, 4, 8, 16, 32, 64, 128, 256, 512)data class BalancedProfile(val ramMb: Int,@@ -46,6 +46,13 @@ object DeviceResourcePolicy {return if (filtered.size >= 3) filtered else RAM_OPTIONS_MB.take(3)}+ /** Storage options that fit the device's free app-private space. Always at+ * least the first three options, so small devices still get a usable list. */+ fun storageOptionsFor(availableGb: Int): List<Int> {+ val filtered = STORAGE_OPTIONS_GB.filter { it <= availableGb }+ return if (filtered.size >= 3) filtered else STORAGE_OPTIONS_GB.take(3)+ }+fun nearestAtMost(options: List<Int>, target: Int): Int =options.filter { it <= target }.maxOrNull() ?: options.first()diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xmlindex fce1932..fbe84b9 100644--- a/app/src/main/res/values-zh/strings.xml+++ b/app/src/main/res/values-zh/strings.xml@@ -43,7 +43,7 @@<!-- Storage --><string name="persistent_storage">持久化存储</string>- <string name="storage_description">用于安装的软件包、容器镜像和您的文件。不重置虚拟机则无法调整大小。</string>+ <string name="storage_description">用于安装的软件包、容器镜像和您的文件。您可以稍后在设置中增大存储空间,但无法缩小。</string><!-- VM Config --><string name="configure_vm">配置您的虚拟机</string>@@ -51,6 +51,7 @@<string name="resources">资源</string><string name="cpu_cores">CPU 核心数</string><string name="cpu_cores_hint">核心越多不一定越快:在 QEMU (TCG) 后端,实测 8 核比 4 核更慢。AVF 后端可正常扩展。</string>+ <string name="storage_grow_hint">存储空间可以稍后增大,但无法缩小。更大的存储空间将在虚拟机下次启动时生效。</string><string name="ram_label">内存</string><string name="network_label">网络</string><string name="ssh_access">SSH 访问</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 92e4c2e..f2be0a6 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -43,7 +43,7 @@<!-- Storage --><string name="persistent_storage">Persistent Storage</string>- <string name="storage_description">Storage for installed packages, container images, and your files. Cannot be resized later without resetting the VM.</string>+ <string name="storage_description">Storage for installed packages, container images, and your files. You can increase it later in Settings, but it cannot be shrunk.</string><!-- VM Config --><string name="configure_vm">Configure your VM</string>@@ -51,6 +51,7 @@<string name="resources">Resources</string><string name="cpu_cores">CPU cores</string><string name="cpu_cores_hint">More is not always faster: on the QEMU (TCG) backend 8 cores measured slower than 4. AVF scales normally.</string>+ <string name="storage_grow_hint">Storage can be increased later but never shrunk. A larger size takes effect on the next VM start.</string><string name="ram_label">RAM</string><string name="network_label">Network</string><string name="ssh_access">SSH access</string>diff --git a/app/src/test/java/com/excp/podroid/util/DeviceResourcePolicyTest.kt b/app/src/test/java/com/excp/podroid/util/DeviceResourcePolicyTest.ktindex 6407afa..0fa0e24 100644--- a/app/src/test/java/com/excp/podroid/util/DeviceResourcePolicyTest.kt+++ b/app/src/test/java/com/excp/podroid/util/DeviceResourcePolicyTest.kt@@ -25,7 +25,10 @@ class DeviceResourcePolicyTest {fun balancedStorageGb_respectsAvailableSpace() {assertEquals(2, DeviceResourcePolicy.balancedStorageGb(4))assertEquals(8, DeviceResourcePolicy.balancedStorageGb(40))- assertEquals(64, DeviceResourcePolicy.balancedStorageGb(512))+ assertEquals(128, DeviceResourcePolicy.balancedStorageGb(512))+ // 25% of 1024 GB lands exactly on the 256 GB option, proving the cap+ // still follows the 25% rule at the top of the longer list.+ assertEquals(256, DeviceResourcePolicy.balancedStorageGb(1024))}@Test@@ -50,4 +53,19 @@ class DeviceResourcePolicyTest {fun ramOptionsFor_neverDropsBelowThreeOptions() {assertEquals(listOf(512, 1024, 2048), DeviceResourcePolicy.ramOptionsFor(2_048))}++ @Test+ fun storageOptionsFor_capsToFreeSpace() {+ assertEquals(listOf(2, 4, 8, 16, 32, 64, 128), DeviceResourcePolicy.storageOptionsFor(197))+ }++ @Test+ fun storageOptionsFor_returnsFullListOnBigDevice() {+ assertEquals(DeviceResourcePolicy.STORAGE_OPTIONS_GB, DeviceResourcePolicy.storageOptionsFor(2_048))+ }++ @Test+ fun storageOptionsFor_neverDropsBelowThreeOptions() {+ assertEquals(listOf(2, 4, 8), DeviceResourcePolicy.storageOptionsFor(1))+ }}