A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
feat(settings): offer RAM sizes up to 16 GB, gated by device memory
ExTvf529ef8bfed8
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 07bc865..ddb449b 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@@ -13,6 +13,7 @@ import androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.ui.Modifier+import androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.unit.dp@@ -38,12 +39,16 @@ fun VmRamChips(bottom = PodroidTokens.Spacing.SM,),)+ val totalRamMb = DeviceResourcePolicy.deviceTotalRamMb(LocalContext.current)+ val ramOptions = DeviceResourcePolicy.ramOptionsFor(totalRamMb).let { options ->+ if (currentMb in options) options else options + currentMb+ }FlowRow(modifier = Modifier.fillMaxWidth(),horizontalArrangement = Arrangement.spacedBy(PodroidTokens.Spacing.SM),verticalArrangement = Arrangement.spacedBy(PodroidTokens.Spacing.SM),) {- DeviceResourcePolicy.RAM_OPTIONS_MB.forEach { mb ->+ ramOptions.forEach { mb ->FilterChip(selected = mb == currentMb,enabled = enabled,diff --git a/app/src/main/java/com/excp/podroid/util/DeviceResourcePolicy.kt b/app/src/main/java/com/excp/podroid/util/DeviceResourcePolicy.ktindex e9a5943..555d14f 100644--- a/app/src/main/java/com/excp/podroid/util/DeviceResourcePolicy.kt+++ b/app/src/main/java/com/excp/podroid/util/DeviceResourcePolicy.kt@@ -11,7 +11,7 @@ import android.content.Contextimport android.os.StatFsobject DeviceResourcePolicy {- val RAM_OPTIONS_MB = listOf(512, 1024, 2048, 4096)+ val RAM_OPTIONS_MB = listOf(512, 1024, 2048, 4096, 6144, 8192, 12288, 16384)val CPU_OPTIONS = listOf(1, 2, 4, 6, 8)/** 0 = unlimited */val BANDWIDTH_OPTIONS_MBPS = listOf(0, 10, 50, 100, 500)@@ -38,6 +38,14 @@ object DeviceResourcePolicy {return (stat.availableBytes / (1024L * 1024 * 1024)).toInt()}+ /** RAM options that fit the device, leaving ~3 GB for Android. Always at+ * least the first three options, so small devices still get a usable list. */+ fun ramOptionsFor(totalRamMb: Long): List<Int> {+ val cap = totalRamMb - 3072+ val filtered = RAM_OPTIONS_MB.filter { it <= cap }+ return if (filtered.size >= 3) filtered else RAM_OPTIONS_MB.take(3)+ }+fun nearestAtMost(options: List<Int>, target: Int): Int =options.filter { it <= target }.maxOrNull() ?: options.first()diff --git a/app/src/test/java/com/excp/podroid/util/DeviceResourcePolicyTest.kt b/app/src/test/java/com/excp/podroid/util/DeviceResourcePolicyTest.ktindex caa1197..6407afa 100644--- a/app/src/test/java/com/excp/podroid/util/DeviceResourcePolicyTest.kt+++ b/app/src/test/java/com/excp/podroid/util/DeviceResourcePolicyTest.kt@@ -33,4 +33,21 @@ class DeviceResourcePolicyTest {assertEquals(4, DeviceResourcePolicy.nearestAtMost(listOf(2, 4, 8), 5))assertEquals(2, DeviceResourcePolicy.nearestAtMost(listOf(2, 4, 8), 1))}++ @Test+ fun ramOptionsFor_capsToLeaveHeadroomForAndroid() {+ // 6 GB device: only options <= 3072 MB fit, but the floor guarantees+ // at least the first three options anyway.+ assertEquals(listOf(512, 1024, 2048), DeviceResourcePolicy.ramOptionsFor(6_144))+ }++ @Test+ fun ramOptionsFor_returnsFullListOnBigDevice() {+ assertEquals(DeviceResourcePolicy.RAM_OPTIONS_MB, DeviceResourcePolicy.ramOptionsFor(24_576))+ }++ @Test+ fun ramOptionsFor_neverDropsBelowThreeOptions() {+ assertEquals(listOf(512, 1024, 2048), DeviceResourcePolicy.ramOptionsFor(2_048))+ }}