Skip to content

Commit a547847

Browse files
committed
feat(card-browser): theme chip 'selected' state
Define a color which is better than the standard purple Calculation: colorSurfaceContainerHigh (HCT model) * +15 Chroma (light) * +10 Chroma (dark) * Choose a darker gray (plain) * Eyeball a light black (black) and set colorSurfaceContainerHigh Issue 18709
1 parent 129a548 commit a547847

7 files changed

Lines changed: 15 additions & 2 deletions

File tree

AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/Chip.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616

1717
package com.ichi2.anki.utils.ext
1818

19+
import com.google.android.material.R.attr.colorSecondaryContainer
1920
import com.google.android.material.chip.Chip
2021

2122
/**
2223
* Sets the 'filled/unfilled' background of a chip to show whether it's toggled on
2324
*
2425
* Like [Chip.isChecked], for a chip with [Chip.isCheckable] set to `false` so user taps do not
2526
* modify the visuals state
27+
*
28+
* The color is set to [colorSecondaryContainer]
2629
*/
2730
var Chip.hasCheckedBackground: Boolean
2831
get() = this.isChecked

AnkiDroid/src/main/res/layout/card_browser_searchview_fragment.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@
9191
android:ellipsize="middle"
9292

9393
tools:text="All Decks"
94+
tools:checkable="true"
95+
tools:checked="true"
9496
/>
9597

9698

AnkiDroid/src/main/res/layout/fragment_standard_search.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
xmlns:tools="http://schemas.android.com/tools"
2121
android:orientation="vertical"
2222
android:layout_height="match_parent"
23-
tools:ignore="HardcodedText">
23+
tools:ignore="HardcodedText"
24+
tools:background="?attr/colorSurfaceContainerHigh">
2425

2526
<HorizontalScrollView
2627
android:id="@+id/chip_group"
@@ -48,7 +49,9 @@
4849
android:maxLines="1"
4950
app:chipIcon="@drawable/ic_cards_star"
5051

51-
tools:text="Deck" />
52+
tools:text="Deck"
53+
tools:checkable="true"
54+
tools:checked="true" />
5255

5356
<com.google.android.material.chip.Chip
5457
android:id="@+id/flags_chip"

AnkiDroid/src/main/res/values/theme_black.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<item name="colorPrimary">@color/material_blue_400</item>
1212
<item name="colorPrimaryDark">@color/black</item>
1313
<item name="colorAccent">@color/material_blue_500</item>
14+
<item name="colorSecondaryContainer">#252525</item>
15+
<item name="colorSurfaceContainerHigh">#151515</item>
1416
<item name="android:textColor">@color/text_color_dark</item>
1517
<item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
1618
<item name="android:colorBackground">@color/theme_black_primary</item>

AnkiDroid/src/main/res/values/theme_dark.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
2525
<item name="android:colorBackground">@color/material_theme_grey</item>
2626
<item name="android:windowBackground">@color/material_theme_grey</item>
27+
<item name="colorSecondaryContainer">#3C5A6E</item>
2728

2829
<item name="colorSurfaceContainerHighest">?attr/colorSurfaceContainer</item>
2930
<item name="colorSurfaceContainerHigh">#424C54</item>

AnkiDroid/src/main/res/values/theme_light.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<item name="colorAccent">@color/material_blue_grey_700</item>
1111
<item name="colorPrimaryContainer">@color/white</item> <!-- Switch thumb color when disabled and being pressed -->
1212
<item name="colorOnPrimaryContainer">@color/white</item> <!-- FAB icons -->
13+
<item name="colorSecondaryContainer">#C1E7FF</item>
1314

1415
<item name="colorSurfaceContainerHighest">?attr/colorSurfaceContainer</item>
1516
<item name="colorSurfaceContainerHigh">#E4F5FD</item>

AnkiDroid/src/main/res/values/theme_plain.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<item name="colorPrimaryDark">@color/theme_plain_primary_dark</item>
1313
<item name="colorAccent">@color/theme_plain_accent</item>
1414
<item name="colorSurfaceContainer">#0F9E9E9E</item>
15+
<item name="colorSecondaryContainer">#DDDDDD</item>
1516
<item name="colorSurfaceContainerHigh">#F4F4F4</item>
1617
<item name="android:textColor">@color/text_color_light</item>
1718
<item name="android:textColorSecondary">@color/text_color_secondary_light</item>

0 commit comments

Comments
 (0)