diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-06-06 03:12:29 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-06-06 03:12:29 +0200 |
| commit | ca7f4e5be959f322ca652208f97195d5df46e619 (patch) | |
| tree | 426d10fe961441bf75c2d1de3cc7381a55234a79 /app | |
| parent | ab95ac83c9cd29600b48d37cfc206313a24922b1 (diff) | |
FloatingActionMenu: 5.1 requires explicit text color
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/main/res/values-night/colors.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/colors.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 4374928c..cb948190 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <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_ripple">#a0808e95</color> + <color name="fab_label_text_color">#000000</color> <color name="fab_label_background_color">#bbbbbb</color> <color name="accent">#BBDEFB</color> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ba967e9d..87454a73 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <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_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="accent">#2196F3</color> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index fe00df6b..0f2685d3 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -11,6 +11,7 @@ <style name="fab_label" parent="TextAppearance.AppCompat.Inverse"> <item name="android:background">@drawable/fab_label_background</item> + <item name="android:textColor">@color/fab_label_text_color</item> </style> </resources> |