diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-12-26 15:02:14 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-12-26 15:02:14 -0800 |
| commit | af756408a09d85d07b84dcce32828056683512db (patch) | |
| tree | 9798f0c814927bb422aa42a6b6aa23e3eafcf63f /app/src/main/res | |
| parent | b72c6a9edd88c5aa8529bfbca2187eb63582679e (diff) | |
| download | dsub-af756408a09d85d07b84dcce32828056683512db.tar.gz dsub-af756408a09d85d07b84dcce32828056683512db.tar.bz2 dsub-af756408a09d85d07b84dcce32828056683512db.zip | |
Fix card background colors for other themes
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawable/card_rounded_corners.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values/themes.xml | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/app/src/main/res/drawable/card_rounded_corners.xml b/app/src/main/res/drawable/card_rounded_corners.xml index 5475c3d6..87e84c0d 100644 --- a/app/src/main/res/drawable/card_rounded_corners.xml +++ b/app/src/main/res/drawable/card_rounded_corners.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@android:color/white"/> + <solid android:color="?attr/cardBackgroundColor"/> <corners android:radius="@dimen/Card.Radius"/> <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" /> </shape>
\ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index c4f80478..e4fa4b5a 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -55,6 +55,7 @@ <attr name="actionbarBackgroundColor" format="reference"/> <attr name="drawerTitleStyle" format="reference"/> <attr name="drawerSubtitleStyle" format="reference"/> + <attr name="cardBackgroundColor" format="reference"/> <declare-styleable name="SeekBarPreference"> <attr name="min" format="integer"/> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 6321852f..8c6b1a59 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -62,6 +62,7 @@ <item name="drawerSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse</item> <item name="windowActionModeOverlay">true</item> <item name="actionModeBackground">?attr/colorPrimary</item> + <item name="cardBackgroundColor">@android:color/white</item> </style> <style name="Theme.DSub.Dark.Base" parent="@style/Theme.AppCompat"> <item name="offline_icon">@drawable/main_offline_dark</item> @@ -124,10 +125,12 @@ <item name="drawerSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle</item> <item name="windowActionModeOverlay">true</item> <item name="actionModeBackground">?attr/colorPrimary</item> + <item name="cardBackgroundColor">@color/background_material_dark</item> </style> <style name="Theme.DSub.Light" parent="Theme.DSub.Light.Base"> </style> <style name="Theme.DSub.Dark" parent="Theme.DSub.Dark.Base"> + <item name="cardBackgroundColor">@android:color/black</item> </style> <style name="Theme.DSub.Black" parent="Theme.DSub.Dark"> <item name="android:windowBackground">@android:color/black</item> |