aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-08-12 17:09:07 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-08-12 17:09:07 +0200
commit0326bbce6b588d31064db9cf8479a622fb1ed14f (patch)
treeabd309e80e8627801a4daffb9991f77a97ffebb5 /OpenKeychain/src/main/res
parent65517f0d06c0b6fc4bb2fb828ae648c4652e7c00 (diff)
downloadopen-keychain-0326bbce6b588d31064db9cf8479a622fb1ed14f.tar.gz
open-keychain-0326bbce6b588d31064db9cf8479a622fb1ed14f.tar.bz2
open-keychain-0326bbce6b588d31064db9cf8479a622fb1ed14f.zip
Adpt official theme naming schema
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/values-v21/themes.xml4
-rw-r--r--OpenKeychain/src/main/res/values/themes.xml24
2 files changed, 14 insertions, 14 deletions
diff --git a/OpenKeychain/src/main/res/values-v21/themes.xml b/OpenKeychain/src/main/res/values-v21/themes.xml
index dab38f97a..a366e9ab2 100644
--- a/OpenKeychain/src/main/res/values-v21/themes.xml
+++ b/OpenKeychain/src/main/res/values-v21/themes.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="LightTheme" parent="LightBaseTheme">
+ <style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light">
<item name="android:windowTranslucentStatus">true</item>
<!-- enable window content transitions -->
@@ -13,7 +13,7 @@
</style>
- <style name="DarkTheme" parent="DarkBaseTheme">
+ <style name="Theme.Keychain.Dark" parent="Base.Theme.Keychain.Dark">
<item name="android:windowTranslucentStatus">true</item>
<!-- enable window content transitions -->
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 559563a54..08f9dd9ca 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="LightBaseTheme" parent="Theme.AppCompat.Light">
+ <style name="Base.Theme.Keychain.Light" parent="Theme.AppCompat.Light">
<item name="colorPrimary">#7bad45</item>
<item name="colorPrimaryDark">#6c983d</item>
<item name="colorAccent">#2196f3</item>
@@ -36,13 +36,13 @@
<item name="windowActionBar">false</item>
<!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 -->
<item name="windowActionModeOverlay">true</item>
- <item name="searchViewStyle">@style/MySearchViewStyle</item>
+ <item name="searchViewStyle">@style/Widget.Keychain.SearchView</item>
<!-- style dialogs -->
- <item name="alertDialogTheme">@style/KeychainTheme.LightDialog</item>
+ <item name="alertDialogTheme">@style/Theme.Keychain.Light.Dialog</item>
</style>
- <style name="DarkBaseTheme" parent="MaterialDrawerTheme.ActionBar">
+ <style name="Base.Theme.Keychain.Dark" parent="MaterialDrawerTheme.ActionBar">
<item name="colorPrimary">#268bd2</item>
<item name="colorPrimaryDark">#166bb2</item>
<item name="colorAccent">#2196f3</item>
@@ -79,20 +79,20 @@
<item name="windowActionBar">false</item>
<!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 -->
<item name="windowActionModeOverlay">true</item>
- <item name="searchViewStyle">@style/MySearchViewStyle</item>
+ <item name="searchViewStyle">@style/Widget.Keychain.SearchView</item>
<!-- style dialogs -->
- <item name="alertDialogTheme">@style/KeychainTheme.DarkDialog</item>
+ <item name="alertDialogTheme">@style/Theme.Keychain.Dark.Dialog</item>
</style>
- <style name="LightTheme" parent="LightBaseTheme">
+ <style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light">
</style>
- <style name="DarkTheme" parent="DarkBaseTheme">
+ <style name="Theme.Keychain.Dark" parent="Base.Theme.Keychain.Dark">
</style>
<!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html -->
- <style name="MySearchViewStyle" parent="Widget.AppCompat.SearchView">
+ <style name="Widget.Keychain.SearchView" parent="Widget.AppCompat.SearchView">
<!-- Background for the search query section (e.g. EditText) -->
<!--<item name="queryBackground">...</item>-->
<!-- Background for the actions section (e.g. voice, submit) -->
@@ -111,15 +111,15 @@
<!--<item name="suggestionRowLayout">...</item>-->
</style>
- <style name="KeychainTheme.LightDialog" parent="Base.Theme.AppCompat.Light.Dialog.Alert">
+ <style name="Theme.Keychain.Light.Dialog" parent="Base.Theme.AppCompat.Light.Dialog.Alert">
<item name="colorAccent">#7bad45</item>
</style>
- <style name="KeychainTheme.DarkDialog" parent="Base.Theme.AppCompat.Light.Dialog.Alert">
+ <style name="Theme.Keychain.Dark.Dialog" parent="Base.Theme.AppCompat.Light.Dialog.Alert">
<item name="colorAccent">#268bd2</item>
</style>
- <style name="KeychainTheme.LightSecurityTokenDialog" parent="Theme.AppCompat.Light.Dialog.MinWidth">
+ <style name="Theme.Keychain.Light.Dialog.SecurityToken" parent="Theme.AppCompat.Light.Dialog.MinWidth">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>