A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
refactor(ui): drop dead colors, tokens, composables, viewmodel flows + PodroidChipColors casing
ExTvcb80f9b427cc
diff --git a/app/src/main/java/com/excp/podroid/ui/components/AdaptiveContainer.kt b/app/src/main/java/com/excp/podroid/ui/components/AdaptiveContainer.ktindex 329cda1..2541e47 100644--- a/app/src/main/java/com/excp/podroid/ui/components/AdaptiveContainer.kt+++ b/app/src/main/java/com/excp/podroid/ui/components/AdaptiveContainer.kt@@ -3,6 +3,7 @@ package com.excp.podroid.ui.componentsimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.widthIn+import androidx.compose.foundation.layout.wrapContentWidthimport androidx.compose.material3.windowsizeclass.WindowSizeClassimport androidx.compose.material3.windowsizeclass.WindowWidthSizeClassimport androidx.compose.runtime.Composable@@ -12,7 +13,8 @@ import androidx.compose.ui.unit.dp/*** A container that constrains its content to a maximum width on large screens- * to follow Material 3 adaptive layout best practices.+ * to follow Material 3 adaptive layout best practices. Compact widths+ * fall through to the caller's modifier unchanged.*/@Composablefun AdaptiveContainer(@@ -21,21 +23,20 @@ fun AdaptiveContainer(maxWidth: Int = 600,content: @Composable () -> Unit) {- val isExpanded = windowSizeClass.widthSizeClass == WindowWidthSizeClass.Expanded- val isMedium = windowSizeClass.widthSizeClass == WindowWidthSizeClass.Medium+ val widthClass = windowSizeClass.widthSizeClass+ val constrainWidth = widthClass == WindowWidthSizeClass.Expanded ||+ widthClass == WindowWidthSizeClass.Medium- Box(- modifier = modifier.fillMaxWidth(),- contentAlignment = Alignment.TopCenter- ) {- Box(- modifier = if (isExpanded || isMedium) {- Modifier.widthIn(max = maxWidth.dp)- } else {- Modifier.fillMaxWidth()- }- ) {- content()- }+ val sizing = if (constrainWidth) {+ Modifier+ .fillMaxWidth()+ .wrapContentWidth(Alignment.CenterHorizontally)+ .widthIn(max = maxWidth.dp)+ } else {+ Modifier.fillMaxWidth()+ }++ Box(modifier = modifier.then(sizing)) {+ content()}}diff --git a/app/src/main/java/com/excp/podroid/ui/components/PodroidChip.kt b/app/src/main/java/com/excp/podroid/ui/components/PodroidChip.ktindex 4d861ac..37f5da6 100644--- a/app/src/main/java/com/excp/podroid/ui/components/PodroidChip.kt+++ b/app/src/main/java/com/excp/podroid/ui/components/PodroidChip.kt@@ -20,7 +20,7 @@ import com.excp.podroid.ui.theme.PodroidTokens*/@OptIn(ExperimentalMaterial3Api::class)@Composable-fun podroidChipColors(): SelectableChipColors = FilterChipDefaults.filterChipColors(+fun PodroidChipColors(): SelectableChipColors = FilterChipDefaults.filterChipColors(containerColor = MaterialTheme.colorScheme.surfaceVariant,labelColor = MaterialTheme.colorScheme.onSurface,selectedContainerColor = PodroidTokens.Accent,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 fad14c1..aee7507 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@@ -15,6 +15,7 @@ import androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clipimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.unit.dp+import com.excp.podroid.ui.theme.PodroidDarkTextFaintimport com.excp.podroid.ui.theme.PodroidTokens/**@@ -50,6 +51,6 @@ fun PodroidStatus(object PodroidStatusColors {val Running = PodroidTokens.Accentval Starting = PodroidTokens.Amber- val Stopped = Color(0xFF737373)+ val Stopped = PodroidDarkTextFaintval Error = PodroidTokens.Red}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.ktindex b9f659e..a32e9c0 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@@ -15,7 +15,6 @@ import com.excp.podroid.util.NetworkUtilsimport dagger.hilt.android.lifecycle.HiltViewModelimport dagger.hilt.android.qualifiers.ApplicationContextimport kotlinx.coroutines.delay-import kotlinx.coroutines.flow.Flowimport kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.SharingStartedimport kotlinx.coroutines.flow.StateFlow@@ -64,9 +63,6 @@ class HomeViewModel @Inject constructor(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,@@ -90,32 +86,9 @@ class HomeViewModel @Inject constructor(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.)+ // Ticker — drives uptime display refresh every second while running. The+ // formatted label is computed synchronously by uptimeLabel(); this flow+ // exists only to recompose the consumer once per second.val uptimeTicker: StateFlow<Long> = flow {while (true) {emit(System.currentTimeMillis() / 1000)@@ -178,10 +151,6 @@ class HomeViewModel @Inject constructor(fun startPodroid() = PodroidService.start(context)- fun setStorageAccessEnabled(enabled: Boolean) {- viewModelScope.launch { settingsRepository.setStorageAccessEnabled(enabled) }- }-fun stopVm() = PodroidService.stop(context)fun restartVm() {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 1665764..0b9ddc6 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@@ -62,7 +62,7 @@ import com.excp.podroid.ui.components.PodroidDestructiveButtonimport com.excp.podroid.ui.components.PodroidGhostButtonimport com.excp.podroid.ui.components.PodroidInlineActionimport com.excp.podroid.ui.components.PodroidListRow-import com.excp.podroid.ui.components.podroidChipColors+import com.excp.podroid.ui.components.PodroidChipColorsimport com.excp.podroid.ui.components.PodroidSectionLabelimport com.excp.podroid.ui.components.PodroidSwitchimport com.excp.podroid.ui.components.PodroidTopBar@@ -299,7 +299,7 @@ private fun RamSection(currentMb: Int, onChange: (Int) -> Unit, enabled: BooleanonClick = { onChange(mb) },label = { Text(if (mb >= 1024) "${mb / 1024} GB" else "$mb MB") },shape = RoundedCornerShape(PodroidTokens.Radius.Chip),- colors = podroidChipColors(),+ colors = PodroidChipColors(),)}}@@ -336,7 +336,7 @@ private fun CpusSection(currentCpus: Int, onChange: (Int) -> Unit, enabled: BoolonClick = { onChange(n) },label = { Text("$n") },shape = RoundedCornerShape(PodroidTokens.Radius.Chip),- colors = podroidChipColors(),+ colors = PodroidChipColors(),)}}@@ -520,7 +520,7 @@ private fun AddPortForwardDialog()},shape = RoundedCornerShape(PodroidTokens.Radius.Chip),- colors = podroidChipColors(),+ colors = PodroidChipColors(),)}}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 4e74932..f2700c0 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@@ -22,7 +22,6 @@ import com.excp.podroid.util.NetworkUtilsimport dagger.hilt.android.lifecycle.HiltViewModelimport dagger.hilt.android.qualifiers.ApplicationContextimport kotlinx.coroutines.Dispatchers-import kotlinx.coroutines.flow.Flowimport kotlinx.coroutines.flow.SharingStartedimport kotlinx.coroutines.flow.StateFlowimport kotlinx.coroutines.flow.combine@@ -62,23 +61,12 @@ class SettingsViewModel @Inject constructor(private val podroidQemu: PodroidQemu,) : ViewModel() {- val darkTheme: Flow<Boolean> = settingsRepository.darkTheme-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 terminalFontSize: StateFlow<Int> = settingsRepository.terminalFontSize- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 20)-- val terminalColorTheme: StateFlow<String> = settingsRepository.terminalColorTheme- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), "default")-- val terminalFont: StateFlow<String> = settingsRepository.terminalFont- .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), "default")-val qemuExtraArgs: StateFlow<String> = settingsRepository.qemuExtraArgs.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), SettingsRepository.DEFAULT_QEMU_EXTRA_ARGS)@@ -143,14 +131,10 @@ class SettingsViewModel @Inject constructor(val storageSizeGb: StateFlow<Int> = settingsRepository.storageSizeGb.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 2)- val sshEnabled: Flow<Boolean> = settingsRepository.sshEnabled-fun setSshEnabled(value: Boolean) {viewModelScope.launch { settingsRepository.setSshEnabled(value) }}- val storageAccessEnabled: Flow<Boolean> = settingsRepository.storageAccessEnabled-fun setStorageAccessEnabled(value: Boolean) {viewModelScope.launch { settingsRepository.setStorageAccessEnabled(value) }}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 7d0cdf3..ae033b6 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@@ -35,7 +35,6 @@ import androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Scaffoldimport androidx.compose.material3.Textimport androidx.compose.material3.FilterChip-import androidx.compose.material3.FilterChipDefaultsimport androidx.compose.material3.windowsizeclass.WindowHeightSizeClassimport androidx.compose.material3.windowsizeclass.WindowSizeClassimport androidx.compose.runtime.Composable@@ -59,7 +58,7 @@ 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.podroidChipColors+import com.excp.podroid.ui.components.PodroidChipColorsimport com.excp.podroid.ui.theme.PodroidTokensimport kotlinx.coroutines.launch@@ -447,7 +446,7 @@ private fun StorageSizeChips(selectedGb: Int, onSelect: (Int) -> Unit) {)},shape = RoundedCornerShape(16.dp),- colors = podroidChipColors(),+ colors = PodroidChipColors(),)}}diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.ktindex 5b9e426..bee4b6a 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt@@ -10,10 +10,6 @@ import androidx.compose.foundation.combinedClickableimport androidx.compose.foundation.horizontalScrollimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.PaddingValues-import androidx.compose.foundation.lazy.LazyColumn-import androidx.compose.foundation.lazy.LazyRow-import androidx.compose.foundation.lazy.items-import androidx.compose.foundation.lazy.rememberLazyListStateimport androidx.compose.foundation.verticalScrollimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Column@@ -36,9 +32,6 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBackimport androidx.compose.material3.AlertDialogimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.ExperimentalMaterial3Api-import androidx.compose.material3.FilledTonalButton-import androidx.compose.material3.FilterChip-import androidx.compose.material3.FilterChipDefaultsimport androidx.compose.material3.HorizontalDividerimport androidx.compose.material3.Iconimport androidx.compose.material3.IconButton@@ -51,7 +44,6 @@ import androidx.compose.material3.Textimport androidx.compose.material3.TextButtonimport androidx.compose.material3.TopAppBarimport androidx.compose.material3.TopAppBarDefaults-import androidx.compose.material3.rememberModalBottomSheetStateimport androidx.compose.material3.windowsizeclass.WindowSizeClassimport androidx.compose.material.icons.filled.Closeimport androidx.compose.material.icons.filled.DesktopWindows@@ -67,7 +59,6 @@ import androidx.compose.foundation.layout.widthimport androidx.compose.foundation.layout.wrapContentSizeimport androidx.compose.foundation.layout.aspectRatioimport androidx.compose.ui.graphics.toArgb-import androidx.compose.foundation.text.BasicTextimport androidx.compose.runtime.derivedStateOfimport androidx.compose.runtime.LaunchedEffect as ComposeLaunchedEffectimport androidx.compose.ui.platform.LocalConfiguration@@ -106,7 +97,6 @@ import androidx.compose.ui.graphics.CompositingStrategyimport androidx.compose.ui.graphics.graphicsLayerimport androidx.compose.ui.unit.Dpimport androidx.compose.ui.platform.LocalContext-import androidx.compose.ui.text.font.FontFamilyimport androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.unit.dp@@ -120,7 +110,6 @@ import com.excp.podroid.ui.components.PodroidListRowimport com.excp.podroid.ui.components.PodroidSectionLabelimport com.excp.podroid.ui.components.PodroidSwitchimport com.excp.podroid.ui.components.PodroidTopBar-import com.excp.podroid.ui.components.podroidChipColorsimport com.excp.podroid.ui.theme.PodroidTokensimport com.termux.view.TerminalView@@ -1140,53 +1129,6 @@ private fun SwatchBox()}-@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class)-@Composable-private fun QuickChip(- label: String,- selected: Boolean,- onClick: () -> Unit,- onLongClick: (() -> Unit)? = null,-) {- // FilterChip doesn't expose onLongClick, so when a long-press handler is- // supplied we wrap it in a combinedClickable Box that mimics the chip's- // rounded shape + selected colors.- if (onLongClick != null) {- val bg = if (selected) PodroidTokens.Accent- else MaterialTheme.colorScheme.surfaceContainerHighest- val fg = if (selected) PodroidTokens.AccentInk- else MaterialTheme.colorScheme.onSurface- Box(- modifier = Modifier- .clip(RoundedCornerShape(14.dp))- .background(bg)- .combinedClickable(onClick = onClick, onLongClick = onLongClick)- .padding(horizontal = 16.dp, vertical = 8.dp),- ) {- Text(- label,- style = MaterialTheme.typography.labelLarge,- color = fg,- fontWeight = if (selected) FontWeight.Bold else FontWeight.Normal,- )- }- return- }- FilterChip(- selected = selected,- onClick = onClick,- label = {- Text(- label,- style = MaterialTheme.typography.labelLarge,- fontWeight = if (selected) FontWeight.Bold else FontWeight.Normal,- )- },- shape = RoundedCornerShape(14.dp),- colors = podroidChipColors(),- )-}-/** "monokai-bright" → "Monokai bright"; trims `.properties`/`.ttf` if present. */private fun prettyName(raw: String): String =raw.substringBeforeLast('.')@@ -1194,167 +1136,3 @@ private fun prettyName(raw: String): String =.replace('_', ' ').replaceFirstChar { it.uppercaseChar() }-/**- * Horizontal gradient fade at the edges of a scrollable container, drawn only- * on the side(s) where more content exists. Uses an offscreen layer + DstIn- * blend so the fade actually masks the chips rather than overpainting them.- */-private fun Modifier.fadingEdges(- state: androidx.compose.foundation.lazy.LazyListState,- fadeWidth: Dp = 28.dp,-): Modifier = this- .graphicsLayer { compositingStrategy = CompositingStrategy.Offscreen }- .drawWithContent {- drawContent()- val fadePx = fadeWidth.toPx()- if (state.canScrollBackward) {- drawRect(- topLeft = Offset.Zero,- size = Size(fadePx, size.height),- brush = Brush.horizontalGradient(- listOf(Color.Transparent, Color.Black),- startX = 0f,- endX = fadePx,- ),- blendMode = BlendMode.DstIn,- )- }- if (state.canScrollForward) {- drawRect(- topLeft = Offset(size.width - fadePx, 0f),- size = Size(fadePx, size.height),- brush = Brush.horizontalGradient(- listOf(Color.Black, Color.Transparent),- startX = size.width - fadePx,- endX = size.width,- ),- blendMode = BlendMode.DstIn,- )- }- }--/**- * Thin scrollbar drawn on the LEFT edge of the container. Track is always- * visible (so users see "scrollable area"), thumb only appears when the- * content actually overflows. The thumb size is proportional to viewport /- * total content; its Y offset reflects current scroll position.- */-private fun Modifier.verticalScrollbar(- state: androidx.compose.foundation.ScrollState,- width: Dp = 3.dp,- thumbColor: Color,- trackColor: Color,- minThumbHeight: Dp = 32.dp,-): Modifier = this.drawWithContent {- drawContent()- val maxValue = state.maxValue- if (maxValue <= 0) return@drawWithContent-- val widthPx = width.toPx()- val viewportH = size.height- val totalH = viewportH + maxValue- val thumbH = (viewportH * viewportH / totalH).coerceAtLeast(minThumbHeight.toPx())- val thumbY = (state.value.toFloat() / maxValue) * (viewportH - thumbH)- val cornerPx = widthPx / 2f-- drawRoundRect(- color = trackColor,- topLeft = Offset(0f, 0f),- size = Size(widthPx, viewportH),- cornerRadius = androidx.compose.ui.geometry.CornerRadius(cornerPx, cornerPx),- )- drawRoundRect(- color = thumbColor,- topLeft = Offset(0f, thumbY),- size = Size(widthPx, thumbH),- cornerRadius = androidx.compose.ui.geometry.CornerRadius(cornerPx, cornerPx),- )-}--@Composable-private fun ThemeSelectionDialog(- currentTheme: String,- onThemeSelect: (String) -> Unit,- onDismiss: () -> Unit,- viewModel: TerminalViewModel = hiltViewModel(),-) {- val themes = remember { viewModel.listAssetNames("colors", ".properties") }-- AlertDialog(- onDismissRequest = onDismiss,- title = { Text("Select Theme") },- text = {- LazyColumn(modifier = Modifier.height(400.dp)) {- items(themes.size) { index ->- val theme = themes[index]- val isSelected = theme == currentTheme- Box(- modifier = Modifier- .fillMaxWidth()- .clip(RoundedCornerShape(8.dp))- .background(- if (isSelected) MaterialTheme.colorScheme.primary- else Color.Transparent- )- .clickable { onThemeSelect(theme) }- .padding(horizontal = 16.dp, vertical = 12.dp)- ) {- Text(- text = theme.replace('-', ' ').replaceFirstChar { it.uppercase() },- color = if (isSelected) MaterialTheme.colorScheme.onPrimary- else MaterialTheme.colorScheme.onSurface,- )- }- }- }- },- confirmButton = {- TextButton(onClick = onDismiss) { Text("Cancel") }- }- )-}--@Composable-private fun FontSelectionDialog(- currentFont: String,- onFontSelect: (String) -> Unit,- onDismiss: () -> Unit,- viewModel: TerminalViewModel = hiltViewModel(),-) {- val fonts = remember { viewModel.listAssetNames("fonts", ".ttf") }-- AlertDialog(- onDismissRequest = onDismiss,- title = { Text("Select Font") },- text = {- LazyColumn(modifier = Modifier.height(400.dp)) {- items(fonts.size) { index ->- val font = fonts[index]- val isSelected = font == currentFont- Box(- modifier = Modifier- .fillMaxWidth()- .clip(RoundedCornerShape(8.dp))- .background(- if (isSelected) MaterialTheme.colorScheme.primary- else Color.Transparent- )- .clickable { onFontSelect(font) }- .padding(horizontal = 16.dp, vertical = 12.dp)- ) {- Text(- text = font.replace('-', ' ').replaceFirstChar { it.uppercase() },- fontFamily = FontFamily.Monospace,- color = if (isSelected) MaterialTheme.colorScheme.onPrimary- else MaterialTheme.colorScheme.onSurface,- )- }- }- }- },- confirmButton = {- TextButton(onClick = onDismiss) { Text("Cancel") }- }- )-}-diff --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 923b1f9..e48ee46 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@@ -2,16 +2,6 @@ package com.excp.podroid.ui.themeimport androidx.compose.ui.graphics.Color-// Legacy Material You fallback — kept for runtime compat with screens that-// still reference the old constants. Safe to drop once Task 12 (Settings)-// lands and no screen-level code references them.-val Purple80 = Color(0xFFD0BCFF)-val PurpleGrey80 = Color(0xFFCCC2DC)-val Cyan80 = Color(0xFF80DEEA)-val Purple40 = Color(0xFF6650A4)-val PurpleGrey40 = Color(0xFF625B71)-val Cyan40 = Color(0xFF00838F)-// ── Podroid "Server console" palette ──────────────────────────────────────────// Darkval PodroidDarkBg = Color(0xFF0A0A0A)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 0fd13d3..4c0a817 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@@ -43,7 +43,6 @@ object PodroidTokens {val Headline = 20.spval Title = 14.spval Body = 12.sp- val Mono = 11.spval Label = 10.sp}diff --git a/app/src/main/java/com/excp/podroid/ui/theme/Type.kt b/app/src/main/java/com/excp/podroid/ui/theme/Type.ktindex ebce9d9..fcf65a0 100644--- a/app/src/main/java/com/excp/podroid/ui/theme/Type.kt+++ b/app/src/main/java/com/excp/podroid/ui/theme/Type.kt@@ -48,8 +48,4 @@ fun buildPodroidTypography(): Typography {letterSpacing = 1.4.sp,),)-}--// Backwards-compat default so any direct `Typography` references in tooling-// keep compiling. Real screens go through buildPodroidTypography() via Theme.-val Typography = Typography()\ No newline at end of file+}\ No newline at end of file