A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
refactor(ui): remove dead composable parameters, tokens and flows
ExTv5f41af5b228e
diff --git a/app/src/main/java/com/excp/podroid/ui/components/PodroidButtons.kt b/app/src/main/java/com/excp/podroid/ui/components/PodroidButtons.ktindex 20099ec..932b37c 100644--- a/app/src/main/java/com/excp/podroid/ui/components/PodroidButtons.kt+++ b/app/src/main/java/com/excp/podroid/ui/components/PodroidButtons.kt@@ -1,21 +1,16 @@package com.excp.podroid.ui.componentsimport androidx.compose.foundation.BorderStroke-import androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.height-import androidx.compose.foundation.layout.size-import androidx.compose.foundation.layout.widthimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.Buttonimport androidx.compose.material3.ButtonDefaults-import androidx.compose.material3.Iconimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.OutlinedButtonimport androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.ui.Modifier-import androidx.compose.ui.graphics.vector.ImageVectorimport androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.unit.dpimport com.excp.podroid.ui.theme.PodroidTokens@@ -25,7 +20,6 @@ fun PodroidPrimaryButton(text: String,onClick: () -> Unit,modifier: Modifier = Modifier,- icon: ImageVector? = null,enabled: Boolean = true,) {Button(@@ -41,10 +35,6 @@ fun PodroidPrimaryButton(contentColor = MaterialTheme.colorScheme.onPrimary,),) {- if (icon != null) {- Icon(icon, contentDescription = null, modifier = Modifier.size(18.dp))- Spacer(Modifier.width(PodroidTokens.Spacing.SM))- }Text(text, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Medium)}}@@ -54,7 +44,6 @@ fun PodroidGhostButton(text: String,onClick: () -> Unit,modifier: Modifier = Modifier,- icon: ImageVector? = null,enabled: Boolean = true,) {OutlinedButton(@@ -67,10 +56,6 @@ fun PodroidGhostButton(contentColor = MaterialTheme.colorScheme.onSurface,),) {- if (icon != null) {- Icon(icon, contentDescription = null, modifier = Modifier.size(18.dp))- Spacer(Modifier.width(PodroidTokens.Spacing.SM))- }Text(text, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Medium)}}@@ -80,7 +65,6 @@ fun PodroidDestructiveButton(text: String,onClick: () -> Unit,modifier: Modifier = Modifier,- icon: ImageVector? = null,enabled: Boolean = true,) {OutlinedButton(@@ -93,10 +77,6 @@ fun PodroidDestructiveButton(contentColor = PodroidTokens.Red,),) {- if (icon != null) {- Icon(icon, contentDescription = null, modifier = Modifier.size(18.dp))- Spacer(Modifier.width(PodroidTokens.Spacing.SM))- }Text(text, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Medium)}}diff --git a/app/src/main/java/com/excp/podroid/ui/components/PodroidStatus.kt b/app/src/main/java/com/excp/podroid/ui/components/PodroidStatus.ktindex aee7507..38b1794 100644--- a/app/src/main/java/com/excp/podroid/ui/components/PodroidStatus.kt+++ b/app/src/main/java/com/excp/podroid/ui/components/PodroidStatus.kt@@ -52,5 +52,4 @@ object PodroidStatusColors {val Running = PodroidTokens.Accentval Starting = PodroidTokens.Amberval Stopped = PodroidDarkTextFaint- val Error = PodroidTokens.Red}diff --git a/app/src/main/java/com/excp/podroid/ui/components/PodroidTopBar.kt b/app/src/main/java/com/excp/podroid/ui/components/PodroidTopBar.ktindex 6b6cd25..74e7269 100644--- a/app/src/main/java/com/excp/podroid/ui/components/PodroidTopBar.kt+++ b/app/src/main/java/com/excp/podroid/ui/components/PodroidTopBar.kt@@ -6,7 +6,6 @@ import androidx.compose.material3.HorizontalDividerimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Textimport androidx.compose.material3.TopAppBar-import androidx.compose.material3.TopAppBarColorsimport androidx.compose.material3.TopAppBarDefaultsimport androidx.compose.runtime.Composableimport androidx.compose.ui.Modifier@@ -25,12 +24,6 @@ fun PodroidTopBar(modifier: Modifier = Modifier,navigationIcon: @Composable () -> Unit = {},actions: @Composable androidx.compose.foundation.layout.RowScope.() -> Unit = {},- colors: TopAppBarColors = TopAppBarDefaults.topAppBarColors(- containerColor = MaterialTheme.colorScheme.surface,- navigationIconContentColor = MaterialTheme.colorScheme.onSurface,- titleContentColor = MaterialTheme.colorScheme.onSurface,- actionIconContentColor = MaterialTheme.colorScheme.onSurfaceVariant,- ),) {Column(modifier = modifier) {TopAppBar(@@ -43,7 +36,12 @@ fun PodroidTopBar(},navigationIcon = navigationIcon,actions = actions,- colors = colors,+ colors = TopAppBarDefaults.topAppBarColors(+ containerColor = MaterialTheme.colorScheme.surface,+ navigationIconContentColor = MaterialTheme.colorScheme.onSurface,+ titleContentColor = MaterialTheme.colorScheme.onSurface,+ actionIconContentColor = MaterialTheme.colorScheme.onSurfaceVariant,+ ),)HorizontalDivider(color = MaterialTheme.colorScheme.outline,diff --git a/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupScreen.ktindex fb69c77..c92b205 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/backup/ContainerBackupScreen.kt@@ -26,7 +26,6 @@ import androidx.compose.ui.Modifierimport androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.font.FontFamily-import androidx.compose.ui.unit.dpimport androidx.hilt.lifecycle.viewmodel.compose.hiltViewModelimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport com.excp.podroid.Rdiff --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 2661a0d..f4f8240 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@@ -11,8 +11,6 @@ import androidx.activity.result.contract.ActivityResultContracts.RequestPermissiimport androidx.core.content.ContextCompatimport androidx.compose.foundation.layout.Arrangementimport 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@@ -20,7 +18,6 @@ import androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.heightInimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.rememberScrollState@@ -33,7 +30,6 @@ import androidx.compose.material.icons.filled.Deleteimport androidx.compose.material3.AlertDialogimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.FilterChip-import androidx.compose.material3.FilterChipDefaultsimport androidx.compose.material3.HorizontalDividerimport androidx.compose.material3.Iconimport androidx.compose.material3.IconButton@@ -61,7 +57,6 @@ import androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.platform.LocalUriHandlerimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.font.FontFamily-import androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.input.KeyboardTypeimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.sp@@ -115,7 +110,6 @@ private fun languageDisplayName(language: String, systemDefaultLanguage: String)fun SettingsScreen(windowSizeClass: WindowSizeClass,onNavigateBack: () -> Unit,- onThemeOrFontChanged: () -> Unit = {},onLanguageChanged: () -> Unit = {},onNavigateToContainerBackup: () -> Unit = {},viewModel: SettingsViewModel = hiltViewModel(),@@ -210,10 +204,7 @@ fun SettingsScreen(rightSlot = {PodroidSwitch(checked = ui.darkTheme,- onCheckedChange = {- viewModel.setDarkTheme(it)- onThemeOrFontChanged()- },+ onCheckedChange = { viewModel.setDarkTheme(it) },)},)@@ -222,10 +213,7 @@ fun SettingsScreen(rightSlot = {PodroidSwitch(checked = ui.dynamicColorEnabled,- onCheckedChange = {- viewModel.setDynamicColorEnabled(it)- onThemeOrFontChanged()- },+ onCheckedChange = { viewModel.setDynamicColorEnabled(it) },)},)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 b716895..5ce539a 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@@ -78,24 +78,9 @@ class SettingsViewModel @Inject constructor(@ApplicationScope private val externalScope: CoroutineScope,) : ViewModel() {- val vmRamMb: StateFlow<Int> = settingsRepository.vmRamMb- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 512)-- val vmCpus: StateFlow<Int> = settingsRepository.vmCpus- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 1)-- val qemuExtraArgs: StateFlow<String> = settingsRepository.qemuExtraArgs- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), SettingsRepository.DEFAULT_QEMU_EXTRA_ARGS)-- val kernelExtraCmdline: StateFlow<String> = settingsRepository.kernelExtraCmdline- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), SettingsRepository.DEFAULT_KERNEL_EXTRA_CMDLINE)-/*** Single combined stream of the 8 form-style rows. SettingsScreen can collect* this once with collectAsStateWithLifecycle instead of subscribing 8 times.- * The original per-flow StateFlows above are kept so callers that want one- * value (e.g. the About section reading storageSizeGb) don't pay for the- * combined object on every emit.*/val uiState: StateFlow<SettingsUiState> = combine(combine(@@ -165,9 +150,6 @@ class SettingsViewModel @Inject constructor(externalScope.launch { settingsRepository.setKernelExtraCmdline(SettingsRepository.DEFAULT_KERNEL_EXTRA_CMDLINE) }}- val storageSizeGb: StateFlow<Int> = settingsRepository.storageSizeGb- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 2)-fun setSshEnabled(value: Boolean) {viewModelScope.launch { settingsRepository.setSshEnabled(value) }}@@ -273,18 +255,6 @@ class SettingsViewModel @Inject constructor(}}- fun setTerminalFontSize(value: Int) {- viewModelScope.launch { settingsRepository.setTerminalFontSize(value) }- }-- fun setTerminalColorTheme(value: String) {- viewModelScope.launch { settingsRepository.setTerminalColorTheme(value) }- }-- fun setTerminalFont(value: String) {- viewModelScope.launch { settingsRepository.setTerminalFont(value) }- }-// "both" expands into separate TCP + UDP rules. Returns true if at least one// rule was added; false if every expansion was already present (duplicate).// The caller uses the return value to show feedback instead of silentlydiff --git a/app/src/main/java/com/excp/podroid/ui/screens/status/StatusScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/status/StatusScreen.ktindex 36d96e5..5a80a5b 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/status/StatusScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/status/StatusScreen.kt@@ -26,7 +26,6 @@ import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.font.FontFamily-import androidx.compose.ui.unit.dpimport androidx.hilt.lifecycle.viewmodel.compose.hiltViewModelimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport com.excp.podroid.Rdiff --git a/app/src/main/java/com/excp/podroid/ui/theme/Color.kt b/app/src/main/java/com/excp/podroid/ui/theme/Color.ktindex e48ee46..5fbbe23 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@@ -19,7 +19,6 @@ val PodroidLightSurface2 = Color(0xFFF4F4F5)val PodroidLightBorder = Color(0xFFE4E4E7)val PodroidLightText = Color(0xFF0A0A0A)val PodroidLightTextMute = Color(0xFF525252)-val PodroidLightTextFaint = Color(0xFF737373)// Accent (mode-invariant)val PodroidAccent = Color(0xFF4ADE80)diff --git a/app/src/main/java/com/excp/podroid/ui/theme/Language.kt b/app/src/main/java/com/excp/podroid/ui/theme/Language.ktdeleted file mode 100644index 8ae9286..0000000--- a/app/src/main/java/com/excp/podroid/ui/theme/Language.kt+++ /dev/null@@ -1,14 +0,0 @@-/*- * Podroid - Rootless Podman for Android- * Copyright (C) 2024-2026 Podroid contributors- */-package com.excp.podroid.ui.theme--import androidx.compose.runtime.compositionLocalOf--/**- * Provides the current language code (e.g., "zh", "en") to Compose components.- * Note: Language is now managed by Android's resource system automatically,- * so this LocalLanguage is primarily for programmatic language detection.- */-val LocalLanguage = compositionLocalOf<String> { "en" }diff --git a/app/src/main/java/com/excp/podroid/ui/theme/PodroidTokens.kt b/app/src/main/java/com/excp/podroid/ui/theme/PodroidTokens.ktindex 69b8baf..e08144a 100644--- a/app/src/main/java/com/excp/podroid/ui/theme/PodroidTokens.kt+++ b/app/src/main/java/com/excp/podroid/ui/theme/PodroidTokens.kt@@ -26,8 +26,6 @@ object PodroidTokens {val LG = 16.dpval XL = 20.dpval XL2 = 24.dp- val XL3 = 32.dp- val XL4 = 40.dp}object Radius {@@ -35,7 +33,6 @@ object PodroidTokens {val Button = 8.dpval Card = 12.dpval Sheet = 20.dp- val Large = 24.dp}object TypeSize {