From c7aa0c36d87856e9ffa1366c2ac47481eb5d163b Mon Sep 17 00:00:00 2001 From: EstimateFaster Date: Mon, 9 Nov 2026 15:48:05 +0000 Subject: [PATCH 1/3] feat(theme): graphite-teal expressive color scheme and radii --- .../audioforge/ui/theme/Color.kt | 272 +++++++----------- .../audioforge/ui/theme/Shape.kt | 12 +- 2 files changed, 110 insertions(+), 174 deletions(-) diff --git a/app/src/main/java/com/estimatefaster/audioforge/ui/theme/Color.kt b/app/src/main/java/com/estimatefaster/audioforge/ui/theme/Color.kt index ec10dc9..620f39d 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/ui/theme/Color.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/ui/theme/Color.kt @@ -4,177 +4,113 @@ import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.ui.graphics.Color -import kotlin.math.abs /** - * Material 3 Expressive 静态配色:由单一品牌 seed 推导全部 tonal role。 + * Forge 主题色:青绿 × 石墨(Graphite × Teal)。 * - * `Color.kt` 是唯一允许出现颜色字面量的文件;feature/组件只能读取 - * `MaterialTheme.colorScheme` 的语义 role。seed 变化会整体平移色相, - * secondary/tertiary 由 seed 的 analogous 色相派生,中性色使用低饱和同色相。 + * 只在本文件出现颜色字面量;其他层一律读取 MaterialTheme.colorScheme 的语义 role。 + * 取色来自已审阅的 docs/prototype/forge-framework.html(seed #0D9488,石墨 #18181B)。 */ -internal val ForgeSeed = Color(0xFF4F46E5) +internal val ForgeSeed = Color(0xFF0D9488) -/** 品牌强调色(录音/生成完成等少量强调,不作为大面积主色)。 */ -internal val ForgeAccent = Color(0xFFD97706) +internal val ForgeLightScheme: ColorScheme = lightColorScheme( + primary = Color(0xFF0D9488), + onPrimary = Color(0xFFFFFFFF), + primaryContainer = Color(0xFFCCFBF1), + onPrimaryContainer = Color(0xFF0F3F3A), + inversePrimary = Color(0xFF5EEAD4), + secondary = Color(0xFF0891B2), + onSecondary = Color(0xFFFFFFFF), + secondaryContainer = Color(0xFFCFFAFE), + onSecondaryContainer = Color(0xFF0E4A5A), + tertiary = Color(0xFFD97706), + onTertiary = Color(0xFFFFFFFF), + tertiaryContainer = Color(0xFFFEF3C7), + onTertiaryContainer = Color(0xFF6B3A05), + background = Color(0xFFF7F9F8), + onBackground = Color(0xFF18181B), + surface = Color(0xFFF7F9F8), + onSurface = Color(0xFF18181B), + surfaceVariant = Color(0xFFE0E7E4), + onSurfaceVariant = Color(0xFF59635F), + surfaceTint = Color(0xFF0D9488), + inverseSurface = Color(0xFF2C302F), + inverseOnSurface = Color(0xFFEFF2F1), + error = Color(0xFFDC2626), + onError = Color(0xFFFFFFFF), + errorContainer = Color(0xFFFEE2E2), + onErrorContainer = Color(0xFF7F1D1D), + outline = Color(0xFF8A9490), + outlineVariant = Color(0xFFCBD4D1), + scrim = Color(0xFF080C0B), + surfaceBright = Color(0xFFFFFFFF), + surfaceDim = Color(0xFFE6EBE9), + surfaceContainer = Color(0xFFE9EEEC), + surfaceContainerHigh = Color(0xFFE0E7E4), + surfaceContainerHighest = Color(0xFFD7E0DD), + surfaceContainerLow = Color(0xFFF1F4F3), + surfaceContainerLowest = Color(0xFFFFFFFF), + primaryFixed = Color(0xFFCCFBF1), + primaryFixedDim = Color(0xFF99F6E4), + onPrimaryFixed = Color(0xFF0F3F3A), + onPrimaryFixedVariant = Color(0xFF0B5F58), + secondaryFixed = Color(0xFFCFFAFE), + secondaryFixedDim = Color(0xFFA5F3FC), + onSecondaryFixed = Color(0xFF0E4A5A), + onSecondaryFixedVariant = Color(0xFF155E75), + tertiaryFixed = Color(0xFFFEF3C7), + tertiaryFixedDim = Color(0xFFFDE68A), + onTertiaryFixed = Color(0xFF6B3A05), + onTertiaryFixedVariant = Color(0xFF92400E), +) -private class Palette(private val hue: Float) { - fun at(tone: Int, saturation: Float = 0.52f): Color = - hsl(hue, saturation.coerceIn(0f, 1f), (tone / 100f).coerceIn(0f, 1f)) - - fun neutral(tone: Int): Color = at(tone, saturation = 0.06f) -} - -private fun seedPalette(seed: Color): Palette = Palette(hueOf(seed)) -private fun secondaryPalette(seed: Color): Palette = Palette((hueOf(seed) + 42f) % 360f) -private fun tertiaryPalette(seed: Color): Palette = Palette((hueOf(seed) + 88f) % 360f) -private val ErrorPalette = Palette(25f) - -internal val ForgeLightScheme: ColorScheme = run { - val primary = seedPalette(ForgeSeed) - val secondary = secondaryPalette(ForgeSeed) - val tertiary = tertiaryPalette(ForgeSeed) - val neutral = primary - lightColorScheme( - primary = primary.at(40), - onPrimary = primary.at(100), - primaryContainer = primary.at(90), - onPrimaryContainer = primary.at(10), - inversePrimary = primary.at(80), - secondary = secondary.at(40), - onSecondary = secondary.at(100), - secondaryContainer = secondary.at(90), - onSecondaryContainer = secondary.at(10), - tertiary = tertiary.at(40), - onTertiary = tertiary.at(100), - tertiaryContainer = tertiary.at(90), - onTertiaryContainer = tertiary.at(10), - background = neutral.neutral(99), - onBackground = neutral.neutral(10), - surface = neutral.neutral(99), - onSurface = neutral.neutral(10), - surfaceVariant = neutral.neutral(90), - onSurfaceVariant = neutral.neutral(30), - surfaceTint = primary.at(40), - inverseSurface = neutral.neutral(20), - inverseOnSurface = neutral.neutral(95), - error = ErrorPalette.at(40, 0.72f), - onError = ErrorPalette.at(100, 0.72f), - errorContainer = ErrorPalette.at(90, 0.72f), - onErrorContainer = ErrorPalette.at(10, 0.72f), - outline = neutral.neutral(50), - outlineVariant = neutral.neutral(80), - scrim = Color.Black, - surfaceBright = neutral.neutral(99), - surfaceDim = neutral.neutral(87), - surfaceContainer = neutral.neutral(94), - surfaceContainerHigh = neutral.neutral(92), - surfaceContainerHighest = neutral.neutral(90), - surfaceContainerLow = neutral.neutral(96), - surfaceContainerLowest = neutral.neutral(100), - primaryFixed = primary.at(90), - primaryFixedDim = primary.at(80), - onPrimaryFixed = primary.at(10), - onPrimaryFixedVariant = primary.at(30), - secondaryFixed = secondary.at(90), - secondaryFixedDim = secondary.at(80), - onSecondaryFixed = secondary.at(10), - onSecondaryFixedVariant = secondary.at(30), - tertiaryFixed = tertiary.at(90), - tertiaryFixedDim = tertiary.at(80), - onTertiaryFixed = tertiary.at(10), - onTertiaryFixedVariant = tertiary.at(30), - ) -} - -internal val ForgeDarkScheme: ColorScheme = run { - val primary = seedPalette(ForgeSeed) - val secondary = secondaryPalette(ForgeSeed) - val tertiary = tertiaryPalette(ForgeSeed) - val neutral = primary - darkColorScheme( - primary = primary.at(80), - onPrimary = primary.at(20), - primaryContainer = primary.at(30), - onPrimaryContainer = primary.at(90), - inversePrimary = primary.at(40), - secondary = secondary.at(80), - onSecondary = secondary.at(20), - secondaryContainer = secondary.at(30), - onSecondaryContainer = secondary.at(90), - tertiary = tertiary.at(80), - onTertiary = tertiary.at(20), - tertiaryContainer = tertiary.at(30), - onTertiaryContainer = tertiary.at(90), - background = neutral.neutral(10), - onBackground = neutral.neutral(90), - surface = neutral.neutral(10), - onSurface = neutral.neutral(90), - surfaceVariant = neutral.neutral(30), - onSurfaceVariant = neutral.neutral(80), - surfaceTint = primary.at(80), - inverseSurface = neutral.neutral(90), - inverseOnSurface = neutral.neutral(20), - error = ErrorPalette.at(80, 0.72f), - onError = ErrorPalette.at(20, 0.72f), - errorContainer = ErrorPalette.at(30, 0.72f), - onErrorContainer = ErrorPalette.at(90, 0.72f), - outline = neutral.neutral(60), - outlineVariant = neutral.neutral(30), - scrim = Color.Black, - surfaceBright = neutral.neutral(24), - surfaceDim = neutral.neutral(6), - surfaceContainer = neutral.neutral(12), - surfaceContainerHigh = neutral.neutral(17), - surfaceContainerHighest = neutral.neutral(22), - surfaceContainerLow = neutral.neutral(10), - surfaceContainerLowest = neutral.neutral(6), - primaryFixed = primary.at(90), - primaryFixedDim = primary.at(80), - onPrimaryFixed = primary.at(10), - onPrimaryFixedVariant = primary.at(30), - secondaryFixed = secondary.at(90), - secondaryFixedDim = secondary.at(80), - onSecondaryFixed = secondary.at(10), - onSecondaryFixedVariant = secondary.at(30), - tertiaryFixed = tertiary.at(90), - tertiaryFixedDim = tertiary.at(80), - onTertiaryFixed = tertiary.at(10), - onTertiaryFixedVariant = tertiary.at(30), - ) -} - -private fun hueOf(color: Color): Float { - val r = color.red - val g = color.green - val b = color.blue - val max = maxOf(r, g, b) - val min = minOf(r, g, b) - val delta = max - min - if (delta == 0f) return 0f - val hue = when (max) { - r -> 60f * (((g - b) / delta) % 6f) - g -> 60f * (((b - r) / delta) + 2f) - else -> 60f * (((r - g) / delta) + 4f) - } - return (hue + 360f) % 360f -} - -private fun hsl(hue: Float, saturation: Float, lightness: Float): Color { - val c = (1f - abs(2f * lightness - 1f)) * saturation - val x = c * (1f - abs((hue / 60f) % 2f - 1f)) - val m = lightness - c / 2f - val (r, g, b) = when { - hue < 60f -> Triple(c, x, 0f) - hue < 120f -> Triple(x, c, 0f) - hue < 180f -> Triple(0f, c, x) - hue < 240f -> Triple(0f, x, c) - hue < 300f -> Triple(x, 0f, c) - else -> Triple(c, 0f, x) - } - return Color( - red = (r + m).coerceIn(0f, 1f), - green = (g + m).coerceIn(0f, 1f), - blue = (b + m).coerceIn(0f, 1f), - ) -} +internal val ForgeDarkScheme: ColorScheme = darkColorScheme( + primary = Color(0xFF2DD4BF), + onPrimary = Color(0xFF04322D), + primaryContainer = Color(0xFF134E4A), + onPrimaryContainer = Color(0xFFA7F3E4), + inversePrimary = Color(0xFF0D9488), + secondary = Color(0xFF22D3EE), + onSecondary = Color(0xFF083344), + secondaryContainer = Color(0xFF155E75), + onSecondaryContainer = Color(0xFFCFFAFE), + tertiary = Color(0xFFFBBF24), + onTertiary = Color(0xFF451A03), + tertiaryContainer = Color(0xFF78350F), + onTertiaryContainer = Color(0xFFFDE68A), + background = Color(0xFF0F1211), + onBackground = Color(0xFFE6EBE9), + surface = Color(0xFF0F1211), + onSurface = Color(0xFFE6EBE9), + surfaceVariant = Color(0xFF242A28), + onSurfaceVariant = Color(0xFFA6B0AC), + surfaceTint = Color(0xFF2DD4BF), + inverseSurface = Color(0xFFE6EBE9), + inverseOnSurface = Color(0xFF232827), + error = Color(0xFFF87171), + onError = Color(0xFF450A0A), + errorContainer = Color(0xFF7F1D1D), + onErrorContainer = Color(0xFFFECACA), + outline = Color(0xFF7C8985), + outlineVariant = Color(0xFF3A4441), + scrim = Color(0xFF000000), + surfaceBright = Color(0xFF2E3532), + surfaceDim = Color(0xFF0A0D0C), + surfaceContainer = Color(0xFF1C211F), + surfaceContainerHigh = Color(0xFF242A28), + surfaceContainerHighest = Color(0xFF2E3532), + surfaceContainerLow = Color(0xFF161A19), + surfaceContainerLowest = Color(0xFF090B0A), + primaryFixed = Color(0xFFCCFBF1), + primaryFixedDim = Color(0xFF99F6E4), + onPrimaryFixed = Color(0xFF0F3F3A), + onPrimaryFixedVariant = Color(0xFF0B5F58), + secondaryFixed = Color(0xFFCFFAFE), + secondaryFixedDim = Color(0xFFA5F3FC), + onSecondaryFixed = Color(0xFF0E4A5A), + onSecondaryFixedVariant = Color(0xFF155E75), + tertiaryFixed = Color(0xFFFEF3C7), + tertiaryFixedDim = Color(0xFFFDE68A), + onTertiaryFixed = Color(0xFF6B3A05), + onTertiaryFixedVariant = Color(0xFF92400E), +) diff --git a/app/src/main/java/com/estimatefaster/audioforge/ui/theme/Shape.kt b/app/src/main/java/com/estimatefaster/audioforge/ui/theme/Shape.kt index a9ec202..5ea4678 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/ui/theme/Shape.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/ui/theme/Shape.kt @@ -11,12 +11,12 @@ import androidx.compose.ui.unit.dp val ForgeShapes: Shapes = Shapes( extraSmall = RoundedCornerShape(6.dp), small = RoundedCornerShape(10.dp), - medium = RoundedCornerShape(16.dp), - large = RoundedCornerShape(22.dp), - extraLarge = RoundedCornerShape(30.dp), - largeIncreased = RoundedCornerShape(26.dp), - extraLargeIncreased = RoundedCornerShape(36.dp), - extraExtraLarge = RoundedCornerShape(42.dp), + medium = RoundedCornerShape(14.dp), + large = RoundedCornerShape(18.dp), + extraLarge = RoundedCornerShape(24.dp), + largeIncreased = RoundedCornerShape(21.dp), + extraLargeIncreased = RoundedCornerShape(28.dp), + extraExtraLarge = RoundedCornerShape(32.dp), ) /** 项目内统一间距,禁止屏幕里散落裸 dp。 */ From 45bd2e6827aa9f55a7117831b782b3448ea2c4c2 Mon Sep 17 00:00:00 2001 From: EstimateFaster Date: Mon, 9 Nov 2026 15:48:24 +0000 Subject: [PATCH 2/3] feat(forge): align components with approved framework --- .../audioforge/ui/forge/ForgeComponents.kt | 76 ++++++++++++++++++- 1 file changed, 73 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/estimatefaster/audioforge/ui/forge/ForgeComponents.kt b/app/src/main/java/com/estimatefaster/audioforge/ui/forge/ForgeComponents.kt index 61485d5..6b91b70 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/ui/forge/ForgeComponents.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/ui/forge/ForgeComponents.kt @@ -30,6 +30,7 @@ import androidx.compose.material3.LinearWavyProgressIndicator import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.SegmentedButtonDefaults import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar @@ -138,11 +139,11 @@ fun ForgePrimaryAction( ) { Button( onClick = onClick, - modifier = modifier.heightIn(min = 56.dp), + modifier = modifier.heightIn(min = 48.dp), enabled = enabled && !loading, - shape = MaterialTheme.shapes.extraLarge, + shape = MaterialTheme.shapes.large, contentPadding = PaddingValues( - horizontal = MaterialTheme.spacing.xl, + horizontal = MaterialTheme.spacing.lg, vertical = MaterialTheme.spacing.md, ), colors = ButtonDefaults.buttonColors( @@ -206,6 +207,7 @@ fun ForgeCard( .animateContentSize(), shape = MaterialTheme.shapes.extraLarge, color = containerColor, + border = androidx.compose.foundation.BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant), contentColor = MaterialTheme.colorScheme.onSurface, ) { Column( @@ -301,6 +303,74 @@ fun ForgeFab( } } +@Composable +fun ForgeExtendedFab( + @DrawableRes icon: Int, + label: String, + onClick: () -> Unit, + modifier: Modifier = Modifier, +) { + androidx.compose.material3.ExtendedFloatingActionButton( + onClick = onClick, + modifier = modifier.heightIn(min = 56.dp), + shape = MaterialTheme.shapes.large, + containerColor = MaterialTheme.colorScheme.primary, + contentColor = MaterialTheme.colorScheme.onPrimary, + icon = { ForgeIcon(icon, contentDescription = null, tint = MaterialTheme.colorScheme.onPrimary) }, + text = { Text(label, style = MaterialTheme.typography.labelLargeEmphasized) }, + ) +} + +@Composable +fun ForgeSegmented( + options: List>, + selectedIndex: Int, + onSelect: (Int) -> Unit, + modifier: Modifier = Modifier, +) { + androidx.compose.material3.SingleChoiceSegmentedButtonRow(modifier = modifier.fillMaxWidth()) { + options.forEachIndexed { index, (icon, label) -> + androidx.compose.material3.SegmentedButton( + selected = index == selectedIndex, + onClick = { onSelect(index) }, + shape = androidx.compose.material3.SegmentedButtonDefaults.itemShape(index, options.size), + icon = { ForgeIcon(icon, contentDescription = null, modifier = Modifier.size(18.dp)) }, + ) { + Text(label, style = MaterialTheme.typography.labelMedium) + } + } + } +} + +@Composable +fun ForgeDialog( + title: String, + message: String, + confirmLabel: String, + onConfirm: () -> Unit, + onDismiss: () -> Unit, + @DrawableRes icon: Int = ForgeIcons.Info, + danger: Boolean = false, +) { + androidx.compose.material3.AlertDialog( + onDismissRequest = onDismiss, + shape = MaterialTheme.shapes.extraLarge, + icon = { ForgeIcon(icon, contentDescription = null, tint = if (danger) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary) }, + title = { Text(title, style = MaterialTheme.typography.titleLargeEmphasized) }, + text = { Text(message, style = MaterialTheme.typography.bodyMedium) }, + confirmButton = { + if (danger) { + ForgeSecondaryAction(ForgeIcons.Trash, confirmLabel, onConfirm, danger = true) + } else { + ForgePrimaryAction(ForgeIcons.Check, confirmLabel, onConfirm) + } + }, + dismissButton = { + ForgeSecondaryAction(ForgeIcons.Close, "取消", onDismiss) + }, + ) +} + @Composable fun ForgeSectionHeader( title: String, From 6194594bcc8ea3b0afedd5188ac54ad2c7b7f010 Mon Sep 17 00:00:00 2001 From: EstimateFaster Date: Mon, 9 Nov 2026 15:50:31 +0000 Subject: [PATCH 3/3] fix(forge): use icon chips for segmented control --- .../audioforge/ui/forge/ForgeComponents.kt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/estimatefaster/audioforge/ui/forge/ForgeComponents.kt b/app/src/main/java/com/estimatefaster/audioforge/ui/forge/ForgeComponents.kt index 6b91b70..dc289e3 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/ui/forge/ForgeComponents.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/ui/forge/ForgeComponents.kt @@ -30,7 +30,6 @@ import androidx.compose.material3.LinearWavyProgressIndicator import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton -import androidx.compose.material3.SegmentedButtonDefaults import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar @@ -328,16 +327,18 @@ fun ForgeSegmented( onSelect: (Int) -> Unit, modifier: Modifier = Modifier, ) { - androidx.compose.material3.SingleChoiceSegmentedButtonRow(modifier = modifier.fillMaxWidth()) { + Row( + modifier = modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { options.forEachIndexed { index, (icon, label) -> - androidx.compose.material3.SegmentedButton( + ForgeChip( + label = label, selected = index == selectedIndex, onClick = { onSelect(index) }, - shape = androidx.compose.material3.SegmentedButtonDefaults.itemShape(index, options.size), - icon = { ForgeIcon(icon, contentDescription = null, modifier = Modifier.size(18.dp)) }, - ) { - Text(label, style = MaterialTheme.typography.labelMedium) - } + icon = icon, + modifier = Modifier.weight(1f), + ) } } }