Light theme: porcelain greys with a petrol accent
The warm-paper light theme gives way to cool neutral greys (white panels on a porcelain ground, near-black ink) with a petrol accent, a muted blue-green that belongs on cool grey the way amber does on aubergine. The dark theme keeps its amber. Every text colour still passes 4.5:1 on bg, panel and raised, and the avatar initial now uses accent ink. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
2a36c8e1f3
commit
ac8358f302
5 files changed
+30
-30
No files matched your search
@@ -15,7 +15,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.tv.material3.Text
|
||||
@@ -163,7 +162,7 @@ private fun AccountCard(state: AppState) {
|
||||
horizontalArrangement = Arrangement.spacedBy(18.dp),
|
||||
) {
|
||||
Box(Modifier.size(64.dp).background(c.accent, CircleShape), contentAlignment = Alignment.Center) {
|
||||
Text(me.initial, style = MusyxTheme.type.section, color = Color(0xFF1C1A22))
|
||||
Text(me.initial, style = MusyxTheme.type.section, color = c.accentInk)
|
||||
}
|
||||
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(4.dp)) {
|
||||
Text(me.name, style = MusyxTheme.type.section, color = c.fg)
|
||||
|
||||
@@ -67,18 +67,18 @@ val DarkColors = MusyxColors(
|
||||
)
|
||||
|
||||
/**
|
||||
* Light is warm paper with aubergine ink: the dark theme's character in daylight, not its
|
||||
* inverse. Amber goes deeper so it still reads as text on paper.
|
||||
* Light is porcelain: cool neutral greys with near-black ink and a petrol accent, a muted
|
||||
* blue-green that belongs to the cool ground the way amber belongs to the dark one.
|
||||
*/
|
||||
val LightColors = MusyxColors(
|
||||
bg = Color(0xFFF4EEE4),
|
||||
panel = Color(0xFFFBF7F0),
|
||||
raised = Color(0xFFEAE2D4),
|
||||
line = Color(0xFFDCD2C1),
|
||||
fg = Color(0xFF231C2B),
|
||||
muted = Color(0xFF62586A),
|
||||
accent = Color(0xFF8E5A04),
|
||||
accentInk = Color(0xFFFFF7E6),
|
||||
bg = Color(0xFFF1F2F5),
|
||||
panel = Color(0xFFFFFFFF),
|
||||
raised = Color(0xFFE5E7EC),
|
||||
line = Color(0xFFD5D8DF),
|
||||
fg = Color(0xFF1B1C22),
|
||||
muted = Color(0xFF5C606C),
|
||||
accent = Color(0xFF1F5F7A),
|
||||
accentInk = Color(0xFFF2F8FA),
|
||||
like = Color(0xFFB5304B),
|
||||
ok = Color(0xFF24704A),
|
||||
isDark = false,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="bg">#F4EEE4</color>
|
||||
<color name="bg">#F1F2F5</color>
|
||||
</resources>
|
||||
@@ -12,7 +12,7 @@ class ThemeTest {
|
||||
@Test
|
||||
fun accentMatchesDesign() {
|
||||
assertEquals(Color(0xF0, 0xB2, 0x3E), DarkColors.accent)
|
||||
assertEquals(Color(0x8E, 0x5A, 0x04), LightColors.accent)
|
||||
assertEquals(Color(0x1F, 0x5F, 0x7A), LightColors.accent)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in new issue
Block a user