diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-06-05 16:01:38 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-06-05 16:01:38 +0200 |
| commit | 8ebeeb6d907241f7d11dc391dd9e2741a344139f (patch) | |
| tree | a980ba392206e1605a6c3b69a8a8bb5509816947 | |
| parent | MainActivity: collapse action menu on toolbar touch (diff) | |
| download | wireguard-android-8ebeeb6d907241f7d11dc391dd9e2741a344139f.tar.xz wireguard-android-8ebeeb6d907241f7d11dc391dd9e2741a344139f.zip | |
FloatingActionMenu: use appcompat theme
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -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 | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index cb948190..4374928c 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <!-- TODO(msf): remove these 4 hard-coded colors and replace with theme colors --> + <!-- TODO(msf): remove these 3 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 87454a73..ba967e9d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <!-- TODO(msf): remove these 4 hard-coded colors and replace with theme colors --> + <!-- TODO(msf): remove these 3 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 11696213..fe00df6b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -9,9 +9,8 @@ <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> </style> - <style name="fab_label" parent="android:TextAppearance.DeviceDefault.Inverse"> + <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> |