A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
feat(setup): move the load balance toggle to the first step
ExTvcfe3ab3d12c7
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 764216a..18c7d7b 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@@ -193,6 +193,10 @@ fun SetupScreen(windowSizeClass = windowSizeClass,selectedGb = selectedGb,loadBalanceEnabled = loadBalanceEnabled,+ onLoadBalanceToggle = { enabled ->+ loadBalanceEnabled = enabled+ if (enabled) applyLoadBalance()+ },onSelect = { selectedGb = it },onNext = { scope.launch { pagerState.animateScrollToPage(1) } },)@@ -203,10 +207,6 @@ fun SetupScreen(cpus = selectedCpus,bandwidthMbps = selectedBandwidthMbps,loadBalanceEnabled = loadBalanceEnabled,- onLoadBalanceToggle = { enabled ->- loadBalanceEnabled = enabled- if (enabled) applyLoadBalance()- },onRamChange = { selectedRamMb = it },onCpusChange = { selectedCpus = it },onBandwidthChange = { selectedBandwidthMbps = it },@@ -400,6 +400,7 @@ private fun StoragePage(windowSizeClass: WindowSizeClass,selectedGb: Int,loadBalanceEnabled: Boolean,+ onLoadBalanceToggle: (Boolean) -> Unit,onSelect: (Int) -> Unit,onNext: () -> Unit,) {@@ -410,20 +411,26 @@ private fun StoragePage(description = stringResource(R.string.storage_description),bottomBar = { SetupNextBar(onNext = onNext) },) {- VmStorageChips(- currentGb = selectedGb,- onChange = onSelect,- enabled = !loadBalanceEnabled,- showDivider = false,+ PodroidListRow(+ label = stringResource(R.string.load_balance),+ rightSlot = {+ PodroidSwitch(checked = loadBalanceEnabled, onCheckedChange = onLoadBalanceToggle)+ },)if (loadBalanceEnabled) {- Spacer(Modifier.height(PodroidTokens.Spacing.SM))Text(- text = stringResource(R.string.load_balance_storage_hint),+ text = stringResource(R.string.load_balance_description),style = MaterialTheme.typography.bodyMedium,color = MaterialTheme.colorScheme.onSurfaceVariant,+ modifier = Modifier.padding(bottom = PodroidTokens.Spacing.SM),)}+ VmStorageChips(+ currentGb = selectedGb,+ onChange = onSelect,+ enabled = !loadBalanceEnabled,+ showDivider = false,+ )}}@@ -437,7 +444,6 @@ private fun VmConfigPage(cpus: Int,bandwidthMbps: Int,loadBalanceEnabled: Boolean,- onLoadBalanceToggle: (Boolean) -> Unit,onRamChange: (Int) -> Unit,onCpusChange: (Int) -> Unit,onBandwidthChange: (Int) -> Unit,@@ -453,15 +459,9 @@ private fun VmConfigPage(description = stringResource(R.string.vm_config_description),bottomBar = { SetupNavBar(onBack = onBack, onNext = onNext, nextLabel = stringResource(R.string.continue_label)) },) {- PodroidListRow(- label = stringResource(R.string.load_balance),- rightSlot = {- PodroidSwitch(checked = loadBalanceEnabled, onCheckedChange = onLoadBalanceToggle)- },- )if (loadBalanceEnabled) {Text(- text = stringResource(R.string.load_balance_description),+ text = stringResource(R.string.load_balance_resources_hint),style = MaterialTheme.typography.bodyMedium,color = MaterialTheme.colorScheme.onSurfaceVariant,modifier = Modifier.padding(bottom = PodroidTokens.Spacing.SM),diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xmlindex 384829d..5fcc90e 100644--- a/app/src/main/res/values-zh/strings.xml+++ b/app/src/main/res/values-zh/strings.xml@@ -59,7 +59,7 @@<string name="ssh_password_hint">ssh root@<手机-ip> -p 9922 (密码: podroid)</string><string name="load_balance">负载均衡</string><string name="load_balance_description">根据本机自动调整 CPU、内存、存储和带宽。</string>- <string name="load_balance_storage_hint">存储大小已自动设置。在下一步关闭负载均衡后可手动选择。</string>+ <string name="load_balance_resources_hint">已由负载均衡自动设置。在上一步关闭负载均衡后可手动选择。</string><string name="bandwidth_limit">带宽限制</string><string name="bandwidth_unlimited">无限制</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex d1fbff2..54589a2 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -59,7 +59,7 @@<string name="ssh_password_hint">ssh root@<phone-ip> -p 9922 (password: podroid)</string><string name="load_balance">Load balance</string><string name="load_balance_description">Automatically tune CPU, RAM, storage, and bandwidth for this device.</string>- <string name="load_balance_storage_hint">Storage size is set automatically. Turn off load balance on the next step to pick manually.</string>+ <string name="load_balance_resources_hint">Set automatically by load balance. Turn it off on the previous step to pick these yourself.</string><string name="bandwidth_limit">Bandwidth limit</string><string name="bandwidth_unlimited">Unlimited</string>