diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-12-29 17:34:40 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-12-29 17:34:40 -0800 |
| commit | 675ec2eaaa3f852d16f46d32309bc4d989e4e47b (patch) | |
| tree | d77b8d071445841f9eb92007f3f187a139144642 /app/src/main/res/values | |
| parent | 5ea1b72af8447c246bcce0bbfd11c24b2e949c8d (diff) | |
| parent | af756408a09d85d07b84dcce32828056683512db (diff) | |
| download | dsub-675ec2eaaa3f852d16f46d32309bc4d989e4e47b.tar.gz dsub-675ec2eaaa3f852d16f46d32309bc4d989e4e47b.tar.bz2 dsub-675ec2eaaa3f852d16f46d32309bc4d989e4e47b.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values/integers.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values/themes.xml | 3 |
3 files changed, 5 insertions, 0 deletions
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/integers.xml b/app/src/main/res/values/integers.xml index 05bcdb28..db45c591 100644 --- a/app/src/main/res/values/integers.xml +++ b/app/src/main/res/values/integers.xml @@ -3,4 +3,5 @@ <integer name="Grid.Columns">2</integer> <integer name="Grid.FullScreen.Columns">@integer/Grid.Columns</integer> <integer name="TextDescriptionLength">5</integer> + <integer name="Card.Elevation">10</integer> </resources>
\ No newline at end of file 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> |