From 31f11070e37636e9c47d74ad080c4786b14ff1b7 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 10 Sep 2014 17:59:57 +0200
Subject: IT'S CHRISTMAS ALREADY!

---
 res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 75ddbbc4..0ede2039 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -254,4 +254,6 @@
 	<string name="pref_expert_options_summary">Please be very careful with those</string>
 	<string name="pref_use_larger_font">Increase font size</string>
 	<string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
+	<string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
+	<string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate a contacs status</string>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From dee46f34536577f6b395f7fe62d3503ecf5cf7fc Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 11 Sep 2014 14:24:10 +0200
Subject: match color in contact details to the colors in the send button. also
 migrated some other colors from hard coding to using resources

---
 res/values/colors.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'res/values')

diff --git a/res/values/colors.xml b/res/values/colors.xml
index ed0a0ffb..fdaff5da 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -9,5 +9,7 @@
     <color name="secondarybackground" type="color">#ffeeeeee</color>
     <color name="darkbackground" type="color">#ff323232</color>
     <color name="divider">#1f000000</color>
-    <color name="warningtext">#ffe51c23</color>
+    <color name="red">#ffe51c23</color>
+    <color name="orange">#ffff9800</color>
+    <color name="green">#ff259b24</color>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 12b62adeca59e0f6dc2c04331fd65244dfc809f8 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 11 Sep 2014 16:22:33 +0200
Subject: added missing strings back. + formating

---
 res/values/arrays.xml |  5 ++++-
 res/values/attrs.xml  | 10 ++++++----
 res/values/themes.xml |  6 +++---
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'res/values')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1d2a5ac9..1a4fd25d 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="resources">
         <item>Mobile</item>
         <item>Phone</item>
@@ -26,6 +27,7 @@
         <item>8 hours</item>
         <item>until further notice</item>
     </string-array>
+
     <integer-array name="mute_options_durations">
         <item>1800</item>
         <item>3600</item>
@@ -33,4 +35,5 @@
         <item>28800</item>
         <item>-1</item>
     </integer-array>
-</resources>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 793b5604..2354a5e8 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="TextSizeInfo" format="dimension"/>
-    <attr name="TextSizeBody" format="dimension"/>
-    <attr name="TextSizeHeadline" format="dimension"/>
-</resources>
+
+    <attr name="TextSizeInfo" format="dimension" />
+    <attr name="TextSizeBody" format="dimension" />
+    <attr name="TextSizeHeadline" format="dimension" />
+
+</resources>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index e2d4dcbe..fa7973d2 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -9,7 +9,7 @@
         <item name="TextSizeBody">14sp</item>
         <item name="TextSizeHeadline">20sp</item>
     </style>
-    
+
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
         <item name="TextSizeInfo">14sp</item>
         <item name="TextSizeBody">16sp</item>
@@ -27,9 +27,9 @@
         <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
         <item name="android:dropDownListViewStyle">@android:style/Widget.Holo.Light.ListView.DropDown</item>
     </style>
-    
+
     <style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView">
-       <item name="android:background">@drawable/actionbar_tab_indicator</item>
+        <item name="android:background">@drawable/actionbar_tab_indicator</item>
     </style>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From c9a342fc6e9d42fbe7b07a9fd16297ff7b5e1613 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 11 Sep 2014 16:32:49 +0200
Subject: more formating

---
 res/values/colors.xml  |  2 ++
 res/values/strings.xml | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'res/values')

diff --git a/res/values/colors.xml b/res/values/colors.xml
index fdaff5da..908b8b89 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <color name="primary" type="color">#ff259b24</color>
     <color name="primarydark" type="color">#ff0a7e07</color>
     <color name="primarytext" type="color">#de000000</color>
@@ -12,4 +13,5 @@
     <color name="red">#ffe51c23</color>
     <color name="orange">#ffff9800</color>
     <color name="green">#ff259b24</color>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0ede2039..75eb3b4d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -250,10 +250,11 @@
     <string name="pref_force_encryption_summary">Always send messages encrypted (execpt for conferences)</string>
     <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
     <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
-	<string name="pref_expert_options">Expert options</string>
-	<string name="pref_expert_options_summary">Please be very careful with those</string>
-	<string name="pref_use_larger_font">Increase font size</string>
-	<string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
-	<string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
-	<string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate a contacs status</string>
+    <string name="pref_expert_options">Expert options</string>
+    <string name="pref_expert_options_summary">Please be very careful with those</string>
+    <string name="pref_use_larger_font">Increase font size</string>
+    <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
+    <string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate a contacs status</string>
+
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3