Skip to content

Commit 85048c7

Browse files
committed
CR fixes: official Catppuccin Mocha colors + DHC dialog fabConnectedColor
- Correct Catppuccin Mocha palette to official values: surface = mantle (#181825), surfaceVariant = surface0 (#313244), and primary_dark to a real palette color (sapphire #74C7EC) instead of a custom mauve tint. - Add the missing fabConnectedColor to the Dark High Contrast dialog styles (day + night) for consistency with the app variants and the other modern dialog themes. (CodeRabbit's 'missing theme styles' findings were false positives \u2014 all 12 styles exist and were verified building and on-device.)
1 parent 99d6c69 commit 85048c7

3 files changed

Lines changed: 13 additions & 11 deletions

File tree

app/src/main/res/values-night/themes.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,7 @@
451451
<item name="testFailColor">@color/dhc_red</item>
452452
<item name="speedTextColor">@color/dhc_accent</item>
453453
<item name="fabStoppedColor">@color/dhc_on_primary</item>
454+
<item name="fabConnectedColor">@color/dhc_on_primary</item>
454455
<item name="statusDetailColor">@color/dhc_accent</item>
455456
<item name="statusTestingColor">@color/dhc_yellow</item>
456457
<item name="routeProxyColor">@color/dhc_blue</item>

app/src/main/res/values/colors.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -489,25 +489,25 @@
489489
<color name="ayu_300">#FFA759</color>
490490
<color name="card_elevated_ayu">#232834</color>
491491

492-
<!-- Catppuccin Mocha (official palette). -->
492+
<!-- Catppuccin Mocha (official palette: https://catppuccin.com/palette). -->
493493
<color name="catppuccin_primary">#CBA6F7</color> <!-- mauve -->
494-
<color name="catppuccin_primary_dark">#B4A0E5</color>
495-
<color name="catppuccin_on_primary">#1E1E2E</color>
494+
<color name="catppuccin_primary_dark">#74C7EC</color> <!-- sapphire (status bar) -->
495+
<color name="catppuccin_on_primary">#1E1E2E</color> <!-- base -->
496496
<color name="catppuccin_accent">#89B4FA</color> <!-- blue -->
497497
<color name="catppuccin_blue">#89B4FA</color>
498-
<color name="catppuccin_background">#1E1E2E</color>
499-
<color name="catppuccin_surface">#28283D</color>
500-
<color name="catppuccin_surface_variant">#313244</color>
501-
<color name="catppuccin_container">#45475A</color>
502-
<color name="catppuccin_on_surface">#CDD6F4</color>
503-
<color name="catppuccin_on_surface_variant">#BAC2DE</color>
504-
<color name="catppuccin_outline">#6C7086</color>
498+
<color name="catppuccin_background">#1E1E2E</color> <!-- base -->
499+
<color name="catppuccin_surface">#181825</color> <!-- mantle -->
500+
<color name="catppuccin_surface_variant">#313244</color> <!-- surface0 -->
501+
<color name="catppuccin_container">#45475A</color> <!-- surface1 -->
502+
<color name="catppuccin_on_surface">#CDD6F4</color> <!-- text -->
503+
<color name="catppuccin_on_surface_variant">#BAC2DE</color> <!-- subtext1 -->
504+
<color name="catppuccin_outline">#6C7086</color> <!-- overlay0 -->
505505
<color name="catppuccin_outline_variant">#313244</color>
506506
<color name="catppuccin_green">#A6E3A1</color>
507507
<color name="catppuccin_red">#F38BA8</color>
508508
<color name="catppuccin_yellow">#F9E2AF</color>
509509
<color name="catppuccin_100">#45475A</color>
510510
<color name="catppuccin_300">#6C7086</color>
511-
<color name="card_elevated_catppuccin">#28283D</color>
511+
<color name="card_elevated_catppuccin">#181825</color>
512512

513513
</resources>

app/src/main/res/values/themes.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,6 +1241,7 @@
12411241
<item name="testFailColor">@color/dhc_red</item>
12421242
<item name="speedTextColor">@color/dhc_accent</item>
12431243
<item name="fabStoppedColor">@color/dhc_on_primary</item>
1244+
<item name="fabConnectedColor">@color/dhc_on_primary</item>
12441245
<item name="statusDetailColor">@color/dhc_accent</item>
12451246
<item name="statusTestingColor">@color/dhc_yellow</item>
12461247
<item name="routeProxyColor">@color/dhc_blue</item>

0 commit comments

Comments
 (0)