summaryrefslogtreecommitdiff
path: root/app/src/main/res/values-v21
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2016-09-19 12:38:29 +0200
committerkwadronaut <kwadronaut@leap.se>2016-09-19 12:38:29 +0200
commitf9c44da143a2d29baac6260c2e5caf9a96dacbc3 (patch)
treec2435766b6a8d7ddd70f2a0dcfc501a7d93c45f4 /app/src/main/res/values-v21
parent00ebc6d66ff9e8a0fa01b808ce7dbd0335933baf (diff)
parent56ba118a5713fe0e24120815cd28db141709a497 (diff)
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'app/src/main/res/values-v21')
-rw-r--r--app/src/main/res/values-v21/colours.xml2
-rw-r--r--app/src/main/res/values-v21/refs.xml5
-rw-r--r--app/src/main/res/values-v21/styles.xml20
3 files changed, 21 insertions, 6 deletions
diff --git a/app/src/main/res/values-v21/colours.xml b/app/src/main/res/values-v21/colours.xml
index 1fedf7b9..024e47eb 100644
--- a/app/src/main/res/values-v21/colours.xml
+++ b/app/src/main/res/values-v21/colours.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
diff --git a/app/src/main/res/values-v21/refs.xml b/app/src/main/res/values-v21/refs.xml
index 2a09271d..f3f43692 100644
--- a/app/src/main/res/values-v21/refs.xml
+++ b/app/src/main/res/values-v21/refs.xml
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
<resources>
<drawable name="ic_menu_close_clear_cancel">@drawable/ic_close_white_24dp</drawable>
+ <drawable name="ic_menu_play">@drawable/ic_play_arrow_white_24dp</drawable>
+ <drawable name="ic_menu_pause">@drawable/ic_pause_white_24dp</drawable>
<drawable name="ic_menu_share">@drawable/ic_share_white_24dp </drawable>
<drawable name="ic_menu_save">@drawable/ic_check_white_24dp</drawable>
<drawable name="ic_menu_view">@drawable/ic_filter_list_white_24dp</drawable>
<drawable name="ic_menu_delete">@drawable/ic_delete_white_24dp</drawable>
<drawable name="ic_menu_delete_grey">@drawable/ic_delete_grey600_24dp</drawable>
</resources>
+
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 4379dd6d..fa27ebe8 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,17 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2012-2014 Arne Schwabe
+ ~ Copyright (c) 2012-2016 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
<resources>
- <style name="blinkt.baseTheme" parent="android:Theme.Material.Light.DarkActionBar" />
+ <!-- http://www.google.de/design/spec/style/color.html#color-color-palette -->
+ <style name="blinkt.baseTheme" parent="android:Theme.Material.Light.DarkActionBar">
+ <item name="android:colorPrimary">@color/primary</item>
+ <item name="android:colorPrimaryDark">@color/primary_dark</item>
+ <item name="android:colorAccent">@color/accent</item>
+ <item name="android:alertDialogTheme">@style/blinkt.alertDialog</item>
+ </style>
+ <style name="blinkt.dialog" parent="android:Theme.Material.Light.Dialog">
+ <item name="android:colorPrimary">@color/primary</item>
+ <item name="android:colorPrimaryDark">@color/primary_dark</item>
+ <item name="android:colorAccent">@color/accent</item>
+ <item name="android:alertDialogTheme">@style/blinkt.alertDialog</item>
+ </style>
- <!-- http://www.google.de/design/spec/style/color.html#color-color-palette -->
- <style name="blinkt" parent="blinkt.common">
+ <style name="blinkt.alertDialog" parent="android:Theme.Material.Light.Dialog.Alert">
<item name="android:colorPrimary">@color/primary</item>
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorAccent">@color/accent</item>
</style>
+
</resources>