diff --git a/DESIGN.md b/DESIGN.md index fa0d3a9..f80d4bc 100644 --- a/DESIGN.md +++ b/DESIGN.md @@ -7,10 +7,11 @@ https://claude.ai/artifact/2gmswtceJM61fcE2F5uYYM). This file records its tokens ## Direction -The ground is aubergine graphite, with one amber accent taken from a tape deck's VU needle. -The app is dark-first, and the light theme follows the system setting. Light is warm paper -with aubergine ink: the same character in daylight rather than an inverted dark theme, with -the amber taken deeper so it reads as text on paper (every text colour passes 4.5:1 on `bg`, +In the dark theme the ground is aubergine graphite, with one amber accent taken from a tape +deck's VU needle. +The app is dark-first, and the light theme follows the system setting. Light is porcelain: +cool neutral greys and near-black ink, with a petrol accent (a muted blue-green) in place of +the amber, which reads warm and muddy on cool grey (every text colour passes 4.5:1 on `bg`, `panel` and `raised`). Everything stays quiet except the My Wave hero, which is the one animated, accent-heavy surface. @@ -18,14 +19,14 @@ except the My Wave hero, which is the one animated, accent-heavy surface. | Token | Dark | Light | Used for | |--------------|-----------|-----------|----------| -| `bg` | `#1C1A22` | `#F4EEE4` | Window and content background | -| `panel` | `#23202B` | `#FBF7F0` | Sidebar, player bar, drawer, cards that need separation | -| `raised` | `#2D2937` | `#EAE2D4` | Hover and selected rows, chip fills, progress track | -| `line` | `#3A3546` | `#DCD2C1` | 1px dividers and outlines | -| `fg` | `#EEEAF3` | `#231C2B` | Primary text, the play/pause disc | -| `muted` | `#A39CB0` | `#62586A` | Secondary text, idle icons | -| `accent` | `#F0B23E` | `#8E5A04` | Current track, progress fill, primary buttons, active nav icon | -| `accent_ink` | `#2A1D04` | `#FFF7E6` | Text and icons on `accent` | +| `bg` | `#1C1A22` | `#F1F2F5` | Window and content background | +| `panel` | `#23202B` | `#FFFFFF` | Sidebar, player bar, drawer, cards that need separation | +| `raised` | `#2D2937` | `#E5E7EC` | Hover and selected rows, chip fills, progress track | +| `line` | `#3A3546` | `#D5D8DF` | 1px dividers and outlines | +| `fg` | `#EEEAF3` | `#1B1C22` | Primary text, the play/pause disc | +| `muted` | `#A39CB0` | `#5C606C` | Secondary text, idle icons | +| `accent` | `#F0B23E` | `#1F5F7A` | Current track, progress fill, primary buttons, active nav icon | +| `accent_ink` | `#2A1D04` | `#F2F8FA` | Text and icons on `accent` | | `like` | `#F27286` | `#B5304B` | Filled heart, falling chart position | | `ok` | `#7FCB9B` | `#24704A` | Subscription status, rising chart position | @@ -37,7 +38,7 @@ the item id, painted as a diagonal gradient between them. | Role | Face | Size / weight | Where | |---------|----------------------|--------------------|-------| | Display | Unbounded SemiBold | 46 / 40 / 34 / 30 | My Wave hero, detail page titles, sign-in headline, screen titles | -| Wordmark| Unbounded SemiBold | 20 | `musyx` + amber dot | +| Wordmark| Unbounded SemiBold | 20 | `musyx` + accent dot | | Section | Onest SemiBold | 19 | Section headings ("Made for you") | | Body | Onest Regular/Medium | 14 (rows 14, meta 13, small 12.5) | Everything else | @@ -58,7 +59,7 @@ counts use tabular figures. There's no hover on a TV, and no outline around focus either. Two treatments, nothing else: - **Ink**: rows, buttons, chips, tabs and drawer items fill with `fg` while focused, and - everything on them (title, meta, icons, the playing amber) turns to `bg`. Amber buttons + everything on them (title, meta, icons, the playing accent) turns to `bg`. Accent buttons and the selected chip keep their fill. A selected chip also carries a check, so the choice still shows while focus is on it. - **Lift**: covers, cards and coloured tiles keep their own colours, grow 6–10% and cast @@ -68,11 +69,11 @@ There's no hover on a TV, and no outline around focus either. Two treatments, no - **Sidebar**: wordmark, five nav items (Home, My Wave, Search, Collection, Podcasts), a playlist list, and an account chip with sign-out. The active item sits on a `raised` fill - and has an amber icon. + and has an accent icon. - **Player bar**: shows cover, title/artist, like and dislike on the left. The centre has transport (shuffle, previous, play disc, next, repeat) over a progress bar with times. On the right are a quality badge, lyrics, queue and a volume bar. - **Track row**: index (or an equaliser when playing), cover, title/artist, album, like, - duration and a "more" button that appears on hover. The playing row is amber. + duration and a "more" button that appears on hover. The playing row is in the accent. - **Cards**: a cover with a hover play button, the title, and one muted subtitle line. - **Drawer**: Queue | Lyrics tabs, sliding in from the right over the content edge. diff --git a/app/src/main/java/it/panov/musyx/tv/ui/screens/Settings.kt b/app/src/main/java/it/panov/musyx/tv/ui/screens/Settings.kt index 06fcc0b..dacfd3c 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/screens/Settings.kt +++ b/app/src/main/java/it/panov/musyx/tv/ui/screens/Settings.kt @@ -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) diff --git a/app/src/main/java/it/panov/musyx/tv/ui/theme/Theme.kt b/app/src/main/java/it/panov/musyx/tv/ui/theme/Theme.kt index 76d5123..ab0c6a5 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/theme/Theme.kt +++ b/app/src/main/java/it/panov/musyx/tv/ui/theme/Theme.kt @@ -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, diff --git a/app/src/main/res/values-notnight/colors.xml b/app/src/main/res/values-notnight/colors.xml index aa2d63a..4327d57 100644 --- a/app/src/main/res/values-notnight/colors.xml +++ b/app/src/main/res/values-notnight/colors.xml @@ -1,4 +1,4 @@ - #F4EEE4 + #F1F2F5 diff --git a/app/src/test/java/it/panov/musyx/tv/ui/theme/ThemeTest.kt b/app/src/test/java/it/panov/musyx/tv/ui/theme/ThemeTest.kt index 7e5bd0f..0859577 100644 --- a/app/src/test/java/it/panov/musyx/tv/ui/theme/ThemeTest.kt +++ b/app/src/test/java/it/panov/musyx/tv/ui/theme/ThemeTest.kt @@ -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