From 0326bbce6b588d31064db9cf8479a622fb1ed14f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 12 Aug 2015 17:09:07 +0200
Subject: Adpt official theme naming schema

---
 OpenKeychain/src/main/AndroidManifest.xml          |  4 ++--
 .../keychain/ui/util/ThemeChanger.java             |  4 ++--
 OpenKeychain/src/main/res/values-v21/themes.xml    |  4 ++--
 OpenKeychain/src/main/res/values/themes.xml        | 24 +++++++++++-----------
 4 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'OpenKeychain/src')

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 6b84194fc..d422c3da1 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -73,7 +73,7 @@
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/LightTheme">
+        android:theme="@style/Theme.Keychain.Light">
         <activity
             android:name=".ui.MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
@@ -701,7 +701,7 @@
          -->
         <activity
             android:name=".ui.NfcOperationActivity"
-            android:theme="@style/KeychainTheme.LightSecurityTokenDialog"
+            android:theme="@style/Theme.Keychain.Light.Dialog.SecurityToken"
             android:allowTaskReparenting="true"
             android:launchMode="singleTop"
             android:taskAffinity=":Nfc" />
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java
index f53e43528..963f57e6b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java
@@ -59,9 +59,9 @@ public class ThemeChanger {
             return false;
         }
 
-        int themeId = R.style.LightTheme;
+        int themeId = R.style.Theme_Keychain_Light;
         if (Constants.Pref.Theme.DARK.equals(newTheme)) {
-            themeId = R.style.DarkTheme;
+            themeId = R.style.Theme_Keychain_Dark;
         }
 
         ContextThemeWrapper w = new ContextThemeWrapper(mContext, themeId);
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>
-- 
cgit v1.2.3