From ffffca10f0c3e399fbbcde200ea4758acc5ba03f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 13 Jul 2015 12:55:13 +0200
Subject: renamed colors

---
 src/main/res/values/colors.xml  | 28 +++++++++++++---------------
 src/main/res/values/strings.xml |  1 +
 src/main/res/values/styles.xml  |  2 +-
 src/main/res/values/themes.xml  |  4 ++--
 4 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 753a56df9..3a778a210 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <color name="primary" type="color">#ff259b24</color>
-    <color name="primarydark" type="color">#ff0a7e07</color>
-    <color name="accent">#ff0091ea</color>
-    <color name="primarytext" type="color">#de000000</color>
-    <color name="secondarytext" type="color">#8a000000</color>
-    <color name="ondarktext" type="color">#fffafafa</color>
-    <color name="primarybackground" type="color">#fffafafa</color>
-    <color name="secondarybackground" type="color">#ffeeeeee</color>
-    <color name="darkbackground" type="color">#ff323232</color>
-    <color name="divider">#1f000000</color>
-    <color name="red">#fff44336</color>
-    <color name="orange">#ffff9800</color>
-    <color name="green">#ff259b24</color>
-
+	<color name="green500">#ff259b24</color>
+	<color name="green700">#ff0a7e07</color>
+	<color name="accent">#ff0091ea</color>
+	<color name="black87">#de000000</color>
+	<color name="black54">#8a000000</color>
+	<color name="black12">#1f000000</color>
+	<color name="white">#ffffffff</color>
+	<color name="white70">#b2ffffff</color>
+	<color name="grey50">#fffafafa</color>
+	<color name="grey200">#ffeeeeee</color>
+	<color name="grey800">#ff424242</color>
+	<color name="red500">#fff44336</color>
+	<color name="orange500">#ffff9800</color>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 1af335878..d2dfb4f86 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -479,4 +479,5 @@
 	<string name="recently_used">Most recently used</string>
 	<string name="choose_quick_action">Choose quick action</string>
 	<string name="file_not_found_on_remote_host">File not found on remote server</string>
+	<string name="search_for_contacts_or_groups">Search for contacts or groups</string>
 </resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index b329eee44..b98a37fcb 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -2,7 +2,7 @@
     <style name="Divider">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1.5dp</item>
-        <item name="android:background">@color/divider</item>
+        <item name="android:background">@color/black12</item>
     </style>
     <style name="Tag">
 
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 80f2bfe65..5c67203be 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -38,8 +38,8 @@
     </style>
 
     <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
-        <item name="android:background">@color/primary</item>
-        <item name="android:backgroundStacked">@color/primarydark</item>
+        <item name="android:background">@color/green500</item>
+        <item name="android:backgroundStacked">@color/green700</item>
         <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
         <item name="android:icon">@android:color/transparent</item>
     </style>
-- 
cgit v1.2.3