From 67fa9db8ddd96ff3885215669c6214a0eedc0169 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Mon, 27 Jul 2015 15:53:48 +0200
Subject: [PATCH] Add new colors/strings/style (in progress)

---
 res/values/color.xml   | 15 ++++++++++++++-
 res/values/strings.xml | 13 +++++++++++--
 res/values/styles.xml  |  6 +++---
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/res/values/color.xml b/res/values/color.xml
index eb868c090..985e533f5 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<!-- NEW COLORS -->
+	<color name="background">#ffffff</color>
+	<color name="background_splashscreen">#000000</color>
+	<color name="button_addContact">#e1e1e1</color>
+	<color name="button_addContactGrey">#c4c4c4</color>
+	<color name="footer_button">#444444</color>
+	<color name="footer_select">#ff5e00</color>
+	<color name="call_selected">#96c11f</color>
+	<color name="colorD">#808080</color>
+
+	<!-- end -->
+
+
     <color name="main_app_color">#ffcf4c29</color>
     
     <color name="text_selected">#ffcf4c29</color>
@@ -23,7 +36,7 @@
     <color name="missed_calls_background">#ffcf4c29</color>
     
     <color name="transparent">#00000000</color>
-    
+
     <color name="landscape_background">#CCCCCC</color>
     
     <color name="text_contrast">#ff000000</color> <!-- If background is white, set to black, else set to white -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index baf5f687c..302bc1fc9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,5 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+
+	<!-- NEW STRINGS -->
+
+	<!-- Setup -->
+	<string name="setup_title_assistant">Welcome</string>
+	<string name="setup_title">Assistant</string>
+	<string name="setup_create_account_part_1">1/2</string>
+	<string name="setup_create_account_part_2">2/2</string>
+
+
   <string name="pref_disable_account">Disable</string>
   <string name="pref_tunnel">Tunnel</string>
   <string name="pref_tunnel_host">Hostname</string>
@@ -289,7 +299,6 @@
   <string name="content_description_message_status">Message status</string>
   <string name="content_description_conference">Conference</string>
   <string name="content_description_mark"></string>
-  <string name="setup_title">Account Setup Assistant</string>
   <string name="setup_apply">Apply</string>
   <string name="setup_password_hint">password</string>
   <string name="setup_domain_hint">domain</string>
@@ -397,7 +406,7 @@
   <string name="setup_remote_provisioning_url_hint">provisioning url</string>
   <string name="setup_remote_provisioning_login_hint">The configuration you downloaded doesn\'t include your account. Please fill it in.</string>
   <string name="setup_confirm_username">Your username will be %s.\r\n\r\nIt may differ from what you entered to match some requierements.\r\nDo you accept ?</string>
-  <string name="setup_title_assistant">Account setup assistant</string>
+
   <string name="zrtp_accept">Accept</string>
   <string name="zrtp_deny">Deny</string>
   <string name="zrtp_help">You should only accept if you have the same code (see above) as your correspondent</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 423d948c3..c78ebd022 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Default" parent="android:Theme" />
-    <style name="NoTitle" parent="android:Theme.NoTitleBar" />
-    <style name="FullScreen" parent="android:Theme.NoTitleBar.Fullscreen" />
+    <style name="Default" parent="android:Theme.Holo.Light" />
+    <style name="NoTitle" parent="android:Theme.Holo.Light.NoActionBar" />
+    <style name="FullScreen" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen" />
 
 </resources>
\ No newline at end of file