aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHarsh Shandilya <harsh@prjkt.io>2018-06-01 17:20:36 +0530
committerHarsh Shandilya <harsh@prjkt.io>2018-06-01 18:42:20 +0530
commit86d0db6c30a17c60db94823864071f748243b46b (patch)
treee897a979d35b2ab8b2826c7d855119fa7849638e
parentFloatingActionButton: Cleanup declaration of TranslucentLayerDrawable class (diff)
downloadwireguard-android-86d0db6c30a17c60db94823864071f748243b46b.tar.xz
wireguard-android-86d0db6c30a17c60db94823864071f748243b46b.zip
fab: Make label responsive to night mode
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
-rw-r--r--app/src/main/res/drawable/fab_label_background.xml2
-rw-r--r--app/src/main/res/values-night/colors.xml5
-rw-r--r--app/src/main/res/values/colors.xml2
-rw-r--r--app/src/main/res/values/styles.xml2
4 files changed, 9 insertions, 2 deletions
diff --git a/app/src/main/res/drawable/fab_label_background.xml b/app/src/main/res/drawable/fab_label_background.xml
index d626f442..92c42569 100644
--- a/app/src/main/res/drawable/fab_label_background.xml
+++ b/app/src/main/res/drawable/fab_label_background.xml
@@ -6,5 +6,5 @@
android:left="8dp"
android:right="8dp"
android:top="4dp" />
- <solid android:color="#444444" /> <!-- TODO(msf): themeify this -->
+ <solid android:color="@color/fab_label_background_color" />
</shape>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..c890589a
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="fab_label_text_color">#000000</color>
+ <color name="fab_label_background_color">#bbbbbb</color>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 09be7e8f..85a98e12 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,4 +4,6 @@
<color name="list_item_activated">#cfd8dc</color> <!-- Blue Grey 200 -->
<color name="list_item_ripple">#808e95</color> <!-- Blue Grey 200 dark -->
<color name="accent">#2196F3</color>
+ <color name="fab_label_text_color">#ffffff</color>
+ <color name="fab_label_background_color">#444444</color>
</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ea2b1434..11696213 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -11,7 +11,7 @@
<style name="fab_label" parent="android:TextAppearance.DeviceDefault.Inverse">
<item name="android:background">@drawable/fab_label_background</item>
- <item name="android:textColor">#ffffff</item> <!-- TODO(msf): themeify this -->
+ <item name="android:textColor">@color/fab_label_text_color</item>
</style>
</resources>