refactor: extract hardcoded colors into KaizenSemanticColors

Single source of truth for error, success, indigo, link, and dropdown
colors. Replaces ~25 scattered Color(0xFF...) literals across 10 files.
Syntax highlighting and glass-surface tints intentionally left local.
This commit is contained in:
Bruno Deanoz 2026-06-23 12:56:09 +02:00
parent 75ca8c0e7b
commit 38678a2add
10 changed files with 52 additions and 27 deletions

View file

@ -50,6 +50,7 @@ import dev.kaizen.app.net.LoginResult
import dev.kaizen.app.net.SessionViewModel import dev.kaizen.app.net.SessionViewModel
import dev.kaizen.app.ui.effect.KaizenShadows import dev.kaizen.app.ui.effect.KaizenShadows
import dev.kaizen.app.ui.effect.kaizenShadow import dev.kaizen.app.ui.effect.kaizenShadow
import dev.kaizen.app.ui.theme.KaizenSemanticColors
import dev.kaizen.app.ui.theme.LocalKaizenAccent import dev.kaizen.app.ui.theme.LocalKaizenAccent
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import dev.kaizen.app.R import dev.kaizen.app.R
@ -143,7 +144,7 @@ fun LoginScreen(session: SessionViewModel, modifier: Modifier = Modifier) {
if (error != null) { if (error != null) {
Spacer(Modifier.size(14.dp)) Spacer(Modifier.size(14.dp))
Text(error!!, color = Color(0xFFEF4444), fontSize = 13.sp) Text(error!!, color = KaizenSemanticColors.error, fontSize = 13.sp)
} }
Spacer(Modifier.size(24.dp)) Spacer(Modifier.size(24.dp))

View file

@ -46,6 +46,7 @@ import dev.kaizen.app.R
import dev.kaizen.app.ui.effect.GlassSurface import dev.kaizen.app.ui.effect.GlassSurface
import dev.kaizen.app.ui.effect.GlassTiers import dev.kaizen.app.ui.effect.GlassTiers
import dev.kaizen.app.ui.shape.KaizenShapes import dev.kaizen.app.ui.shape.KaizenShapes
import dev.kaizen.app.ui.theme.KaizenSemanticColors
import dev.kaizen.app.ui.theme.LocalKaizenAccent import dev.kaizen.app.ui.theme.LocalKaizenAccent
@Composable @Composable
@ -90,7 +91,7 @@ fun PasswordUnlockDialog(
if (error != null) { if (error != null) {
Spacer(Modifier.size(10.dp)) Spacer(Modifier.size(10.dp))
Text(error, color = Color(0xFFEF4444), fontSize = 12.sp) Text(error, color = KaizenSemanticColors.error, fontSize = 12.sp)
} }
Spacer(Modifier.size(20.dp)) Spacer(Modifier.size(20.dp))

View file

@ -68,6 +68,7 @@ import dev.kaizen.app.ui.effect.KaizenShadows
import dev.kaizen.app.ui.effect.kaizenShadow import dev.kaizen.app.ui.effect.kaizenShadow
import dev.kaizen.app.ui.motion.Durations import dev.kaizen.app.ui.motion.Durations
import dev.kaizen.app.ui.shape.KaizenShapes import dev.kaizen.app.ui.shape.KaizenShapes
import dev.kaizen.app.ui.theme.KaizenSemanticColors
import dev.kaizen.app.ui.theme.LocalKaizenAccent import dev.kaizen.app.ui.theme.LocalKaizenAccent
import dev.kaizen.app.R import dev.kaizen.app.R
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
@ -185,7 +186,7 @@ fun ModePillsRow(
DropdownMenu( DropdownMenu(
expanded = showReasoningMenu, expanded = showReasoningMenu,
onDismissRequest = { showReasoningMenu = false }, onDismissRequest = { showReasoningMenu = false },
containerColor = if (isDark) Color(0xFF1A2030) else Color(0xFFF8F9FB), containerColor = if (isDark) KaizenSemanticColors.dropdownDark else KaizenSemanticColors.dropdownLight,
shadowElevation = 16.dp, shadowElevation = 16.dp,
shape = KaizenShapes.md, shape = KaizenShapes.md,
) { ) {
@ -225,7 +226,7 @@ fun ModePillsRow(
DropdownMenu( DropdownMenu(
expanded = showSamplingPopup, expanded = showSamplingPopup,
onDismissRequest = { showSamplingPopup = false }, onDismissRequest = { showSamplingPopup = false },
containerColor = if (isDark) Color(0xFF1A2030) else Color(0xFFF8F9FB), containerColor = if (isDark) KaizenSemanticColors.dropdownDark else KaizenSemanticColors.dropdownLight,
shadowElevation = 16.dp, shadowElevation = 16.dp,
shape = KaizenShapes.md, shape = KaizenShapes.md,
) { ) {
@ -278,7 +279,7 @@ fun ModePillsRow(
DropdownMenu( DropdownMenu(
expanded = showSearchProviderMenu, expanded = showSearchProviderMenu,
onDismissRequest = { showSearchProviderMenu = false }, onDismissRequest = { showSearchProviderMenu = false },
containerColor = if (isDark) Color(0xFF1A2030) else Color(0xFFF8F9FB), containerColor = if (isDark) KaizenSemanticColors.dropdownDark else KaizenSemanticColors.dropdownLight,
shadowElevation = 16.dp, shadowElevation = 16.dp,
shape = KaizenShapes.md, shape = KaizenShapes.md,
) { ) {
@ -535,7 +536,7 @@ fun MessageRow(
) { ) {
MessageActionButton( MessageActionButton(
icon = if (copied) KaizenIcons.Check else KaizenIcons.ClipboardCopy, icon = if (copied) KaizenIcons.Check else KaizenIcons.ClipboardCopy,
tint = if (copied) Color(0xFF10B981) else cs.onSurfaceVariant.copy(alpha = 0.55f), tint = if (copied) KaizenSemanticColors.success else cs.onSurfaceVariant.copy(alpha = 0.55f),
) { ) {
haptics.tick() haptics.tick()
copied = true copied = true
@ -553,7 +554,7 @@ fun MessageRow(
} }
} }
onDelete?.let { del -> onDelete?.let { del ->
MessageActionButton(KaizenIcons.Trash, Color(0xFFEF4444).copy(alpha = 0.70f)) { MessageActionButton(KaizenIcons.Trash, KaizenSemanticColors.error.copy(alpha = 0.70f)) {
haptics.tick(); del(message.wireId) haptics.tick(); del(message.wireId)
} }
} }
@ -595,7 +596,7 @@ fun MessageRow(
) { ) {
MessageActionButton( MessageActionButton(
icon = if (copied) KaizenIcons.Check else KaizenIcons.ClipboardCopy, icon = if (copied) KaizenIcons.Check else KaizenIcons.ClipboardCopy,
tint = if (copied) Color(0xFF10B981) else cs.onSurfaceVariant.copy(alpha = 0.55f), tint = if (copied) KaizenSemanticColors.success else cs.onSurfaceVariant.copy(alpha = 0.55f),
) { ) {
haptics.tick() haptics.tick()
copied = true copied = true
@ -619,7 +620,7 @@ fun MessageRow(
} }
} }
onDelete?.let { del -> onDelete?.let { del ->
MessageActionButton(KaizenIcons.Trash, Color(0xFFEF4444).copy(alpha = 0.70f)) { MessageActionButton(KaizenIcons.Trash, KaizenSemanticColors.error.copy(alpha = 0.70f)) {
haptics.tick(); del(message.wireId) haptics.tick(); del(message.wireId)
} }
} }
@ -761,7 +762,7 @@ fun ChatInput(
Spacer(Modifier.weight(1f)) Spacer(Modifier.weight(1f))
Box( Box(
Modifier.size(42.dp).clip(KaizenShapes.circle) Modifier.size(42.dp).clip(KaizenShapes.circle)
.background(Color(0xFFEF4444)) .background(KaizenSemanticColors.error)
.clickable(onClick = onMicClick), .clickable(onClick = onMicClick),
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
) { ) {
@ -854,7 +855,7 @@ private fun PendingFileChip(pf: PendingFile, onRemove: () -> Unit) {
} }
} }
if (pf.error != null) { if (pf.error != null) {
Box(Modifier.fillMaxSize().background(Color(0xFFDC2626).copy(alpha = 0.3f)), contentAlignment = Alignment.Center) { Box(Modifier.fillMaxSize().background(KaizenSemanticColors.errorDeep.copy(alpha = 0.3f)), contentAlignment = Alignment.Center) {
Icon(KaizenIcons.X, stringResource(R.string.chat_error), tint = Color.White, modifier = Modifier.size(18.dp)) Icon(KaizenIcons.X, stringResource(R.string.chat_error), tint = Color.White, modifier = Modifier.size(18.dp))
} }
} }
@ -939,7 +940,7 @@ private fun StopButton(onClick: () -> Unit) {
.size(38.dp) .size(38.dp)
.scale(pressScale) .scale(pressScale)
.clip(KaizenShapes.circle) .clip(KaizenShapes.circle)
.background(Color(0xFFEF4444).copy(alpha = if (isDark) 0.85f else 0.80f)) .background(KaizenSemanticColors.error.copy(alpha = if (isDark) 0.85f else 0.80f))
.clickable(interactionSource = interaction, indication = null, onClick = onClick), .clickable(interactionSource = interaction, indication = null, onClick = onClick),
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
) { ) {
@ -1033,8 +1034,8 @@ fun AttachmentMenu(
horizontalAlignment = Alignment.Start, horizontalAlignment = Alignment.Start,
) { ) {
AttachPill(KaizenIcons.Camera, stringResource(R.string.attach_camera), accent.primary, isDark, onCamera) AttachPill(KaizenIcons.Camera, stringResource(R.string.attach_camera), accent.primary, isDark, onCamera)
AttachPill(KaizenIcons.Image, stringResource(R.string.attach_gallery), Color(0xFF6366F1), isDark, onGallery) AttachPill(KaizenIcons.Image, stringResource(R.string.attach_gallery), KaizenSemanticColors.indigo, isDark, onGallery)
AttachPill(KaizenIcons.File, stringResource(R.string.attach_file), Color(0xFF10B981), isDark, onFile) AttachPill(KaizenIcons.File, stringResource(R.string.attach_file), KaizenSemanticColors.success, isDark, onFile)
} }
} }

View file

@ -59,6 +59,7 @@ import androidx.compose.ui.unit.sp
import dev.kaizen.app.ui.effect.GlassSurface import dev.kaizen.app.ui.effect.GlassSurface
import dev.kaizen.app.ui.effect.GlassTiers import dev.kaizen.app.ui.effect.GlassTiers
import dev.kaizen.app.ui.effect.KaizenShadows import dev.kaizen.app.ui.effect.KaizenShadows
import dev.kaizen.app.ui.theme.KaizenSemanticColors
import dev.kaizen.app.ui.shape.KaizenShapes import dev.kaizen.app.ui.shape.KaizenShapes
import dev.kaizen.app.R import dev.kaizen.app.R
import dev.kaizen.app.db.MessageEntity import dev.kaizen.app.db.MessageEntity
@ -1045,13 +1046,13 @@ fun ChatScreen(
.statusBarsPadding() .statusBarsPadding()
.padding(top = 62.dp, start = 24.dp, end = 24.dp) .padding(top = 62.dp, start = 24.dp, end = 24.dp)
.clip(KaizenShapes.sm) .clip(KaizenShapes.sm)
.background(Color(0xFFDC2626).copy(alpha = 0.15f)) .background(KaizenSemanticColors.errorDeep.copy(alpha = 0.15f))
.border(1.dp, Color(0xFFDC2626).copy(alpha = 0.3f), KaizenShapes.sm) .border(1.dp, KaizenSemanticColors.errorDeep.copy(alpha = 0.3f), KaizenShapes.sm)
.padding(horizontal = 14.dp, vertical = 8.dp), .padding(horizontal = 14.dp, vertical = 8.dp),
) { ) {
Text( Text(
loadError!!, loadError!!,
color = Color(0xFFDC2626), color = KaizenSemanticColors.errorDeep,
fontSize = 12.sp, fontSize = 12.sp,
fontWeight = FontWeight.Medium, fontWeight = FontWeight.Medium,
) )

View file

@ -36,6 +36,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import dev.kaizen.app.ui.theme.KaizenSemanticColors
import androidx.compose.ui.platform.LocalClipboard import androidx.compose.ui.platform.LocalClipboard
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.AnnotatedString
@ -446,7 +447,7 @@ fun MarkdownText(text: String, streaming: Boolean = false, modifier: Modifier =
val codeBorder = if (isDark) Color.White.copy(alpha = 0.08f) else Color.Black.copy(alpha = 0.06f) val codeBorder = if (isDark) Color.White.copy(alpha = 0.08f) else Color.Black.copy(alpha = 0.06f)
val inlineCodeBg = if (isDark) Color(0xFF1E2433) else Color(0xFFEBEDF0) val inlineCodeBg = if (isDark) Color(0xFF1E2433) else Color(0xFFEBEDF0)
val inlineCodeColor = if (isDark) Color(0xFFE06C75) else Color(0xFFD63384) val inlineCodeColor = if (isDark) Color(0xFFE06C75) else Color(0xFFD63384)
val linkColor = if (isDark) Color(0xFF60A5FA) else Color(0xFF2563EB) val linkColor = if (isDark) KaizenSemanticColors.linkDark else KaizenSemanticColors.linkLight
val langBadgeColor = cs.onSurfaceVariant.copy(alpha = 0.5f) val langBadgeColor = cs.onSurfaceVariant.copy(alpha = 0.5f)
val tableBorder = if (isDark) Color.White.copy(alpha = 0.10f) else Color.Black.copy(alpha = 0.08f) val tableBorder = if (isDark) Color.White.copy(alpha = 0.10f) else Color.Black.copy(alpha = 0.08f)
val tableHeaderBg = if (isDark) Color.White.copy(alpha = 0.05f) else Color.Black.copy(alpha = 0.03f) val tableHeaderBg = if (isDark) Color.White.copy(alpha = 0.05f) else Color.Black.copy(alpha = 0.03f)
@ -729,7 +730,7 @@ private fun CopyButton(code: String) {
Icon( Icon(
imageVector = if (copied) KaizenIcons.Check else KaizenIcons.Copy, imageVector = if (copied) KaizenIcons.Check else KaizenIcons.Copy,
contentDescription = "Kopieren", contentDescription = "Kopieren",
tint = if (copied) Color(0xFF22C55E) else cs.onSurfaceVariant.copy(alpha = 0.5f), tint = if (copied) KaizenSemanticColors.successBright else cs.onSurfaceVariant.copy(alpha = 0.5f),
modifier = Modifier.size(14.dp), modifier = Modifier.size(14.dp),
) )
} }

View file

@ -21,6 +21,7 @@ import androidx.compose.ui.unit.sp
import dev.kaizen.app.net.KaizenModel import dev.kaizen.app.net.KaizenModel
import dev.kaizen.app.R import dev.kaizen.app.R
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import dev.kaizen.app.ui.theme.KaizenSemanticColors
import dev.kaizen.app.ui.theme.LocalKaizenAccent import dev.kaizen.app.ui.theme.LocalKaizenAccent
import dev.kaizen.app.haptics.rememberHaptics import dev.kaizen.app.haptics.rememberHaptics
import dev.kaizen.app.ui.icon.KaizenIcons import dev.kaizen.app.ui.icon.KaizenIcons
@ -91,10 +92,10 @@ data class ProviderInfo(
fun getProviderInfo(modelId: String, provider: String?): ProviderInfo { fun getProviderInfo(modelId: String, provider: String?): ProviderInfo {
return when { return when {
provider == "vertex" || modelId.startsWith("vertex:") -> { provider == "vertex" || modelId.startsWith("vertex:") -> {
ProviderInfo("Vertex AI", Color(0xFF6366F1)) // Indigo for Vertex AI ProviderInfo("Vertex AI", KaizenSemanticColors.indigo)
} }
else -> { else -> {
ProviderInfo("OpenRouter", Color(0xFF10B981)) // Emerald Green for OpenRouter ProviderInfo("OpenRouter", KaizenSemanticColors.success)
} }
} }
} }

View file

@ -54,6 +54,7 @@ import dev.kaizen.app.ui.effect.kaizenShadow
import dev.kaizen.app.ui.effect.innerTopHighlight import dev.kaizen.app.ui.effect.innerTopHighlight
import dev.kaizen.app.ui.shape.KaizenShapes import dev.kaizen.app.ui.shape.KaizenShapes
import dev.kaizen.app.R import dev.kaizen.app.R
import dev.kaizen.app.ui.theme.KaizenSemanticColors
import dev.kaizen.app.ui.theme.LocalKaizenAccent import dev.kaizen.app.ui.theme.LocalKaizenAccent
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import java.time.Instant import java.time.Instant
@ -354,7 +355,7 @@ fun KaizenSidebar(
onAction(SidebarAction.Delete(target.id)) onAction(SidebarAction.Delete(target.id))
deleteTarget = null deleteTarget = null
}) { }) {
Text(stringResource(R.string.sidebar_confirm), color = Color(0xFFEF4444)) Text(stringResource(R.string.sidebar_confirm), color = KaizenSemanticColors.error)
} }
}, },
dismissButton = { dismissButton = {
@ -506,7 +507,7 @@ private fun HistoryItemRow(
androidx.compose.material3.DropdownMenu( androidx.compose.material3.DropdownMenu(
expanded = showMenu, expanded = showMenu,
onDismissRequest = { showMenu = false }, onDismissRequest = { showMenu = false },
containerColor = if (isDark) Color(0xFF1A2030) else Color(0xFFF8F9FB), containerColor = if (isDark) KaizenSemanticColors.dropdownDark else KaizenSemanticColors.dropdownLight,
shadowElevation = 16.dp, shadowElevation = 16.dp,
shape = KaizenShapes.md, shape = KaizenShapes.md,
) { ) {
@ -531,7 +532,7 @@ private fun HistoryItemRow(
.height(0.5.dp) .height(0.5.dp)
.background(if (isDark) Color.White.copy(alpha = 0.08f) else Color.Black.copy(alpha = 0.06f)) .background(if (isDark) Color.White.copy(alpha = 0.08f) else Color.Black.copy(alpha = 0.06f))
) )
MenuRow(KaizenIcons.Trash, stringResource(R.string.sidebar_delete), Color(0xFFEF4444)) { showMenu = false; onDelete() } MenuRow(KaizenIcons.Trash, stringResource(R.string.sidebar_delete), KaizenSemanticColors.error) { showMenu = false; onDelete() }
} }
} }
} }

View file

@ -38,6 +38,7 @@ import dev.kaizen.app.net.SearchSource
import dev.kaizen.app.net.ToolEvent import dev.kaizen.app.net.ToolEvent
import dev.kaizen.app.R import dev.kaizen.app.R
import dev.kaizen.app.ui.shape.KaizenShapes import dev.kaizen.app.ui.shape.KaizenShapes
import dev.kaizen.app.ui.theme.KaizenSemanticColors
import dev.kaizen.app.ui.theme.LocalKaizenAccent import dev.kaizen.app.ui.theme.LocalKaizenAccent
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
@ -148,7 +149,7 @@ fun ToolEventsBlock(tools: List<ToolEvent>, streaming: Boolean = false) {
completed.forEach { tool -> completed.forEach { tool ->
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {
val icon = if (tool.type == "error") KaizenIcons.AlertCircle else KaizenIcons.Check val icon = if (tool.type == "error") KaizenIcons.AlertCircle else KaizenIcons.Check
val tint = if (tool.type == "error") Color(0xFFEF4444) else Color(0xFF10B981) val tint = if (tool.type == "error") KaizenSemanticColors.error else KaizenSemanticColors.success
Icon(icon, null, tint = tint, modifier = Modifier.size(14.dp)) Icon(icon, null, tint = tint, modifier = Modifier.size(14.dp))
Spacer(Modifier.width(6.dp)) Spacer(Modifier.width(6.dp))
Text(tool.name, color = cs.onSurfaceVariant.copy(alpha = 0.6f), fontSize = 12.sp) Text(tool.name, color = cs.onSurfaceVariant.copy(alpha = 0.6f), fontSize = 12.sp)

View file

@ -52,6 +52,7 @@ import dev.kaizen.app.R
import dev.kaizen.app.net.AppDevice import dev.kaizen.app.net.AppDevice
import dev.kaizen.app.net.ServerConfig import dev.kaizen.app.net.ServerConfig
import dev.kaizen.app.ui.shape.KaizenShapes import dev.kaizen.app.ui.shape.KaizenShapes
import dev.kaizen.app.ui.theme.KaizenSemanticColors
import dev.kaizen.app.ui.theme.LocalKaizenAccent import dev.kaizen.app.ui.theme.LocalKaizenAccent
import dev.kaizen.app.ui.icon.KaizenIcons import dev.kaizen.app.ui.icon.KaizenIcons
@ -216,7 +217,7 @@ private fun DeviceRow(device: AppDevice, onRevoke: () -> Unit) {
if (!device.isCurrent) { if (!device.isCurrent) {
Text( Text(
stringResource(R.string.settings_device_revoke), stringResource(R.string.settings_device_revoke),
color = Color(0xFFEF4444), color = KaizenSemanticColors.error,
fontSize = 12.sp, fontSize = 12.sp,
fontWeight = FontWeight.Medium, fontWeight = FontWeight.Medium,
modifier = Modifier modifier = Modifier
@ -270,7 +271,7 @@ private fun PasswordChangeForm(
}) })
if (localError != null) { if (localError != null) {
Text(localError!!, color = Color(0xFFEF4444), fontSize = 12.sp) Text(localError!!, color = KaizenSemanticColors.error, fontSize = 12.sp)
} }
if (result == "ok") { if (result == "ok") {
Text(successMsg, color = accent.primary, fontSize = 12.sp, fontWeight = FontWeight.Medium) Text(successMsg, color = accent.primary, fontSize = 12.sp, fontWeight = FontWeight.Medium)

View file

@ -45,3 +45,19 @@ val BlobAmber = p3(0.992f, 0.767f, 0.282f) // oklch(0.85 0.15 83) gold
val BlobCoral = p3(1.000f, 0.562f, 0.230f) // oklch(0.78 0.18 50) coral val BlobCoral = p3(1.000f, 0.562f, 0.230f) // oklch(0.78 0.18 50) coral
val BlobHoney = p3(0.917f, 0.853f, 0.471f) // oklch(0.88 0.12 100) honey val BlobHoney = p3(0.917f, 0.853f, 0.471f) // oklch(0.88 0.12 100) honey
val BlobTeal = p3(0.461f, 0.885f, 0.908f) // oklch(0.85 0.10 200) teal accent val BlobTeal = p3(0.461f, 0.885f, 0.908f) // oklch(0.85 0.10 200) teal accent
// ── Semantic Colors (theme-independent) ───────────────────────────────────
// Used across the app for status, actions, and provider branding.
// Single source of truth — never use raw hex outside this file.
object KaizenSemanticColors {
val error = Color(0xFFEF4444) // destructive actions, stop, delete
val errorDeep = Color(0xFFDC2626) // error banners, stronger emphasis
val success = Color(0xFF10B981) // success confirmation, check marks
val successBright = Color(0xFF22C55E) // copy-confirmed flash
val indigo = Color(0xFF6366F1) // Vertex AI badge, gallery accent
val linkLight = Color(0xFF2563EB) // markdown links (light mode)
val linkDark = Color(0xFF60A5FA) // markdown links (dark mode)
val dropdownDark = Color(0xFF1A2030) // dropdown/menu bg (dark)
val dropdownLight = Color(0xFFF8F9FB) // dropdown/menu bg (light)
}