diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-30 14:42:33 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-30 14:43:56 +0200 |
| commit | d5cde431589ee4de8d3d1c019e65f4b9e609a301 (patch) | |
| tree | fd8eb20aa2d41e4954083cabc1b92b5efc2c90ad /app/src/main/res/drawable | |
| parent | 6493a9a1f2878f9c95472fc86052b8facab66341 (diff) | |
Replace hard-coded colors with theme colors
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/res/drawable')
| -rw-r--r-- | app/src/main/res/drawable/list_item_background.xml | 22 | ||||
| -rw-r--r-- | app/src/main/res/drawable/list_item_background_anim.xml | 6 |
2 files changed, 13 insertions, 15 deletions
diff --git a/app/src/main/res/drawable/list_item_background.xml b/app/src/main/res/drawable/list_item_background.xml index f82df249..f064676a 100644 --- a/app/src/main/res/drawable/list_item_background.xml +++ b/app/src/main/res/drawable/list_item_background.xml @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- TODO(msf): somehow make an additional activated color entry here (or elsewhere?) that - is in use only in multiselect mode, and one that's in use only in ordinary - select mode. In otherwords, we don't want to use the same background color - for both multiselect and normal select (on two column machines). - --> - <item android:drawable="@color/list_item_activated" android:state_activated="true" /> <!-- TODO(msf): get color from theme with ?android/attr: --> - <item android:drawable="@android:color/transparent" /> <!-- TODO(msf): get color from theme with ?android/attr: --> -</selector> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <selector> + <item android:state_activated="true"> + <color android:color="?android:attr/colorControlHighlight" /> + <!-- TODO(msf): depending on whether or not we are in multiselect mode, choose instead: + <color android:color="?android:attr/colorControlActivated" /> + --> + </item> + </selector> + </item> + <item android:drawable="?android:attr/selectableItemBackground" /> +</layer-list> diff --git a/app/src/main/res/drawable/list_item_background_anim.xml b/app/src/main/res/drawable/list_item_background_anim.xml deleted file mode 100644 index 8d9ffa42..00000000 --- a/app/src/main/res/drawable/list_item_background_anim.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="@color/list_item_ripple"> <!-- TODO(msf): get color from theme with ?android/attr: --> - <item android:drawable="@drawable/list_item_background" /> - <item android:id="@android:id/mask" android:drawable="@android:color/white" /> <!-- TODO(msf): get color from theme with ?android/attr: --> -</ripple> |