IT'S CHRISTMAS ALREADY!

21 files changed, 8 insertions, 1 deletions

diff --git a/res/drawable-hdpi/ic_action_send_now.png b/res/drawable-hdpi/ic_action_send_now.png
deleted file mode 100644
index ff0e369e..00000000
--- a/res/drawable-hdpi/ic_action_send_now.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_action_send_now_away.png b/res/drawable-hdpi/ic_action_send_now_away.png
new file mode 100644
index 00000000..505cbe63
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_send_now_away.png
diff --git a/res/drawable-hdpi/ic_action_send_now_dnd.png b/res/drawable-hdpi/ic_action_send_now_dnd.png
new file mode 100644
index 00000000..a376524d
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_send_now_dnd.png
diff --git a/res/drawable-hdpi/ic_action_send_now_offline.png b/res/drawable-hdpi/ic_action_send_now_offline.png
new file mode 100644
index 00000000..d4d2d510
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_send_now_offline.png
diff --git a/res/drawable-hdpi/ic_action_send_now_online.png b/res/drawable-hdpi/ic_action_send_now_online.png
new file mode 100644
index 00000000..48676f7b
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_send_now_online.png
diff --git a/res/drawable-mdpi/ic_action_send_now_away.png b/res/drawable-mdpi/ic_action_send_now_away.png
new file mode 100644
index 00000000..0fdca901
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_send_now_away.png
diff --git a/res/drawable-mdpi/ic_action_send_now_dnd.png b/res/drawable-mdpi/ic_action_send_now_dnd.png
new file mode 100644
index 00000000..c0aef36c
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_send_now_dnd.png
diff --git a/res/drawable-mdpi/ic_action_send_now_offline.png b/res/drawable-mdpi/ic_action_send_now_offline.png
new file mode 100644
index 00000000..7723f4aa
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_send_now_offline.png
diff --git a/res/drawable-mdpi/ic_action_send_now_online.png b/res/drawable-mdpi/ic_action_send_now_online.png
new file mode 100644
index 00000000..39d00ee4
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_send_now_online.png
diff --git a/res/drawable-xhdpi/ic_action_send_now.png b/res/drawable-xhdpi/ic_action_send_now.png
deleted file mode 100644
index 373dde23..00000000
--- a/res/drawable-xhdpi/ic_action_send_now.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_action_send_now_away.png b/res/drawable-xhdpi/ic_action_send_now_away.png
new file mode 100644
index 00000000..bb999d85
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_send_now_away.png
diff --git a/res/drawable-xhdpi/ic_action_send_now_dnd.png b/res/drawable-xhdpi/ic_action_send_now_dnd.png
new file mode 100644
index 00000000..a0bf5561
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_send_now_dnd.png
diff --git a/res/drawable-xhdpi/ic_action_send_now_offline.png b/res/drawable-xhdpi/ic_action_send_now_offline.png
new file mode 100644
index 00000000..6da9ff7b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_send_now_offline.png
diff --git a/res/drawable-xhdpi/ic_action_send_now_online.png b/res/drawable-xhdpi/ic_action_send_now_online.png
new file mode 100644
index 00000000..348ba657
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_send_now_online.png
diff --git a/res/drawable-xxhdpi/ic_action_send_now_away.png b/res/drawable-xxhdpi/ic_action_send_now_away.png
new file mode 100644
index 00000000..12ec4d33
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_send_now_away.png
diff --git a/res/drawable-xxhdpi/ic_action_send_now_dnd.png b/res/drawable-xxhdpi/ic_action_send_now_dnd.png
new file mode 100644
index 00000000..7719f81a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_send_now_dnd.png
diff --git a/res/drawable-xxhdpi/ic_action_send_now_offline.png b/res/drawable-xxhdpi/ic_action_send_now_offline.png
new file mode 100644
index 00000000..18895813
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_send_now_offline.png
diff --git a/res/drawable-xxhdpi/ic_action_send_now_online.png b/res/drawable-xxhdpi/ic_action_send_now_online.png
new file mode 100644
index 00000000..29bde36e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_send_now_online.png
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index b16e4113..91921fb5 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -58,7 +58,7 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:background="?android:selectableItemBackground"
-            android:src="@drawable/ic_action_send_now" />
+            android:src="@drawable/ic_action_send_now_offline" />
     </RelativeLayout>
 
          <RelativeLayout
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
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index f0d64e39..47508c9e 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -69,6 +69,11 @@
             android:key="use_larger_font"
             android:title="@string/pref_use_larger_font"
             android:summary="@string/pref_use_larger_font_summary"/>
+    <CheckBoxPreference 
+       		android:key="send_button_status"
+       		android:defaultValue="false"
+       		android:title="@string/pref_use_send_button_to_indicate_status"
+       		android:summary="@string/pref_use_send_button_to_indicate_status_summary"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_advanced_options" >
         <PreferenceScreen