FloatingActionMenu: 5.1 requires explicit text color

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-06-06 03:12:29 +02:00
parent ab95ac83c9
commit ca7f4e5be9
3 changed files with 5 additions and 2 deletions

View File

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- TODO(msf): remove these 3 hard-coded colors and replace with theme colors --> <!-- TODO(msf): remove these 4 hard-coded colors and replace with theme colors -->
<color name="list_item_activated">#64cfd8dc</color> <color name="list_item_activated">#64cfd8dc</color>
<color name="list_item_ripple">#a0808e95</color> <color name="list_item_ripple">#a0808e95</color>
<color name="fab_label_text_color">#000000</color>
<color name="fab_label_background_color">#bbbbbb</color> <color name="fab_label_background_color">#bbbbbb</color>
<color name="accent">#BBDEFB</color> <color name="accent">#BBDEFB</color>

View File

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- TODO(msf): remove these 3 hard-coded colors and replace with theme colors --> <!-- TODO(msf): remove these 4 hard-coded colors and replace with theme colors -->
<color name="list_item_activated">#cfd8dc</color> <!-- Blue Grey 200 --> <color name="list_item_activated">#cfd8dc</color> <!-- Blue Grey 200 -->
<color name="list_item_ripple">#808e95</color> <!-- Blue Grey 200 dark --> <color name="list_item_ripple">#808e95</color> <!-- Blue Grey 200 dark -->
<color name="fab_label_text_color">#ffffff</color>
<color name="fab_label_background_color">#444444</color> <color name="fab_label_background_color">#444444</color>
<color name="accent">#2196F3</color> <color name="accent">#2196F3</color>

View File

@ -11,6 +11,7 @@
<style name="fab_label" parent="TextAppearance.AppCompat.Inverse"> <style name="fab_label" parent="TextAppearance.AppCompat.Inverse">
<item name="android:background">@drawable/fab_label_background</item> <item name="android:background">@drawable/fab_label_background</item>
<item name="android:textColor">@color/fab_label_text_color</item>
</style> </style>
</resources> </resources>