aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-06-06 03:12:29 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-06-06 03:12:29 +0200
commit4462497e689ffc645ab2fdc7f8d3ffebfedf75f7 (patch)
tree426d10fe961441bf75c2d1de3cc7381a55234a79
parentMainActivity: Fix style (diff)
downloadwireguard-android-4462497e689ffc645ab2fdc7f8d3ffebfedf75f7.tar.xz
wireguard-android-4462497e689ffc645ab2fdc7f8d3ffebfedf75f7.zip
FloatingActionMenu: 5.1 requires explicit text color
-rw-r--r--app/src/main/res/values-night/colors.xml3
-rw-r--r--app/src/main/res/values/colors.xml3
-rw-r--r--app/src/main/res/values/styles.xml1
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 4374928..cb94819 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 ba967e9..87454a7 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 fe00df6..0f2685d 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>