aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--art/ic_send_cancel_dnd.svg2
-rw-r--r--art/ic_send_location_dnd.svg2
-rw-r--r--art/ic_send_photo_dnd.svg4
-rw-r--r--art/ic_send_text_dnd.svg2
-rw-r--r--art/ic_send_voice_dnd.svg2
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Contact.java4
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Message.java72
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java26
-rw-r--r--src/main/java/eu/siacs/conversations/utils/UIHelper.java4
-rw-r--r--src/main/res/drawable-hdpi/ic_send_cancel_dnd.pngbin1559 -> 1587 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_location_dnd.pngbin1333 -> 1333 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_photo_dnd.pngbin1381 -> 1383 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_text_dnd.pngbin1126 -> 1128 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_voice_dnd.pngbin1149 -> 1161 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_cancel_dnd.pngbin1040 -> 1025 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_location_dnd.pngbin908 -> 917 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_photo_dnd.pngbin909 -> 915 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_text_dnd.pngbin769 -> 781 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_voice_dnd.pngbin774 -> 795 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_cancel_dnd.pngbin1940 -> 1958 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_location_dnd.pngbin1721 -> 1753 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_photo_dnd.pngbin1723 -> 1756 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_text_dnd.pngbin1395 -> 1430 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_voice_dnd.pngbin1426 -> 1419 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.pngbin2911 -> 2983 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_location_dnd.pngbin2578 -> 2589 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_photo_dnd.pngbin2588 -> 2618 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_text_dnd.pngbin2004 -> 2005 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_voice_dnd.pngbin2152 -> 2200 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.pngbin3791 -> 3862 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_location_dnd.pngbin3456 -> 3514 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.pngbin3544 -> 3569 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_text_dnd.pngbin2597 -> 2592 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.pngbin2811 -> 2849 bytes
-rw-r--r--src/main/res/values/colors.xml2
35 files changed, 75 insertions, 45 deletions
diff --git a/art/ic_send_cancel_dnd.svg b/art/ic_send_cancel_dnd.svg
index 54e02a91..67a562b2 100644
--- a/art/ic_send_cancel_dnd.svg
+++ b/art/ic_send_cancel_dnd.svg
@@ -50,5 +50,5 @@
<path
d="M24 4C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm10 27.17L31.17 34 24 26.83 16.83 34 14 31.17 21.17 24 14 16.83 16.83 14 24 21.17 31.17 14 34 16.83 26.83 24 34 31.17z"
id="path4"
- style="fill:#e51c23;fill-opacity:0.627451" />
+ style="fill:#f44336;fill-opacity:0.627451" />
</svg>
diff --git a/art/ic_send_location_dnd.svg b/art/ic_send_location_dnd.svg
index d91fa913..705cdb6f 100644
--- a/art/ic_send_location_dnd.svg
+++ b/art/ic_send_location_dnd.svg
@@ -50,5 +50,5 @@
<path
d="M24 4c-7.73 0-14 6.27-14 14 0 10.5 14 26 14 26s14-15.5 14-26c0-7.73-6.27-14-14-14zm0 19c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"
id="path4"
- style="fill:#e51c23;fill-opacity:0.627451" />
+ style="fill:#f44336;fill-opacity:0.627451" />
</svg>
diff --git a/art/ic_send_photo_dnd.svg b/art/ic_send_photo_dnd.svg
index 0e406ede..9ef8b782 100644
--- a/art/ic_send_photo_dnd.svg
+++ b/art/ic_send_photo_dnd.svg
@@ -52,9 +52,9 @@
cy="24"
r="6.4"
id="circle4"
- style="fill:#e51c23;fill-opacity:0.627451" />
+ style="fill:#f44336;fill-opacity:0.627451" />
<path
d="M18 4l-3.66 4H8c-2.21 0-4 1.79-4 4v24c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4V12c0-2.21-1.79-4-4-4h-6.34L30 4H18zm6 30c-5.52 0-10-4.48-10-10s4.48-10 10-10 10 4.48 10 10-4.48 10-10 10z"
id="path6"
- style="fill:#e51c23;fill-opacity:0.627451" />
+ style="fill:#f44336;fill-opacity:0.627451" />
</svg>
diff --git a/art/ic_send_text_dnd.svg b/art/ic_send_text_dnd.svg
index b594f319..1b7ad51f 100644
--- a/art/ic_send_text_dnd.svg
+++ b/art/ic_send_text_dnd.svg
@@ -58,7 +58,7 @@
id="grid3631" />
</sodipodi:namedview>
<path
- style="fill:#e51c23;fill-opacity:0.627451;stroke:none"
+ style="fill:#f44336;fill-opacity:0.627451;stroke:none"
d="M 3.887575,4.1549246 90.999747,47.676331 3.887575,91.286663 13.203552,52.344101 63.012683,47.720794 13.203552,43.008558 Z"
id="path3633"
inkscape:connector-curvature="0"
diff --git a/art/ic_send_voice_dnd.svg b/art/ic_send_voice_dnd.svg
index 372a2ca8..b1b7a7a9 100644
--- a/art/ic_send_voice_dnd.svg
+++ b/art/ic_send_voice_dnd.svg
@@ -50,5 +50,5 @@
<path
d="M24 30c3.31 0 5.98-2.69 5.98-6L30 12c0-3.32-2.68-6-6-6-3.31 0-6 2.68-6 6v12c0 3.31 2.69 6 6 6zm10.6-6c0 6-5.07 10.2-10.6 10.2-5.52 0-10.6-4.2-10.6-10.2H10c0 6.83 5.44 12.47 12 13.44V44h4v-6.56c6.56-.97 12-6.61 12-13.44h-3.4z"
id="path4"
- style="fill:#e51c23;fill-opacity:0.627451" />
+ style="fill:#f44336;fill-opacity:0.627451" />
</svg>
diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index 4ad105b1..9dbca59a 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -140,10 +140,10 @@ public class Contact implements ListItem, Blockable {
tags.add(new Tag("away", 0xffff9800));
break;
case Presences.XA:
- tags.add(new Tag("not available", 0xffe51c23));
+ tags.add(new Tag("not available", 0xfff44336));
break;
case Presences.DND:
- tags.add(new Tag("dnd", 0xffe51c23));
+ tags.add(new Tag("dnd", 0xfff44336));
break;
}
if (isBlocked()) {
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 7ea3d60b..95e27c79 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -9,6 +9,7 @@ import java.util.Arrays;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.utils.GeoHelper;
+import eu.siacs.conversations.utils.UIHelper;
import eu.siacs.conversations.xmpp.jid.InvalidJidException;
import eu.siacs.conversations.xmpp.jid.Jid;
@@ -95,9 +96,9 @@ public class Message extends AbstractEntity {
}
private Message(final String uuid, final String conversationUUid, final Jid counterpart,
- final Jid trueCounterpart, final String body, final long timeSent,
- final int encryption, final int status, final int type, final String remoteMsgId,
- final String relativeFilePath, final String serverMsgId) {
+ final Jid trueCounterpart, final String body, final long timeSent,
+ final int encryption, final int status, final int type, final String remoteMsgId,
+ final String relativeFilePath, final String serverMsgId) {
this.uuid = uuid;
this.conversationUuid = conversationUUid;
this.counterpart = counterpart;
@@ -179,7 +180,7 @@ public class Message extends AbstractEntity {
values.put(TYPE, type);
values.put(REMOTE_MSG_ID, remoteMsgId);
values.put(RELATIVE_FILE_PATH, relativeFilePath);
- values.put(SERVER_MSG_ID,serverMsgId);
+ values.put(SERVER_MSG_ID, serverMsgId);
return values;
}
@@ -211,7 +212,7 @@ public class Message extends AbstractEntity {
return null;
} else {
return this.conversation.getAccount().getRoster()
- .getContactFromRoster(this.trueCounterpart);
+ .getContactFromRoster(this.trueCounterpart);
}
}
}
@@ -359,34 +360,36 @@ public class Message extends AbstractEntity {
public boolean mergeable(final Message message) {
return message != null &&
- (message.getType() == Message.TYPE_TEXT &&
- this.getDownloadable() == null &&
- message.getDownloadable() == null &&
- message.getEncryption() != Message.ENCRYPTION_PGP &&
- this.getType() == message.getType() &&
- //this.getStatus() == message.getStatus() &&
- isStatusMergeable(this.getStatus(),message.getStatus()) &&
- this.getEncryption() == message.getEncryption() &&
- this.getCounterpart() != null &&
- this.getCounterpart().equals(message.getCounterpart()) &&
- (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) &&
- !GeoHelper.isGeoUri(message.getBody()) &&
- !GeoHelper.isGeoUri(this.body) &&
- !message.bodyContainsDownloadable() &&
- !this.bodyContainsDownloadable() &&
- !message.getBody().startsWith(ME_COMMAND) &&
- !this.getBody().startsWith(ME_COMMAND)
- );
+ (message.getType() == Message.TYPE_TEXT &&
+ this.getDownloadable() == null &&
+ message.getDownloadable() == null &&
+ message.getEncryption() != Message.ENCRYPTION_PGP &&
+ this.getType() == message.getType() &&
+ //this.getStatus() == message.getStatus() &&
+ isStatusMergeable(this.getStatus(), message.getStatus()) &&
+ this.getEncryption() == message.getEncryption() &&
+ this.getCounterpart() != null &&
+ this.getCounterpart().equals(message.getCounterpart()) &&
+ (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) &&
+ !GeoHelper.isGeoUri(message.getBody()) &&
+ !GeoHelper.isGeoUri(this.body) &&
+ !message.bodyContainsDownloadable() &&
+ !this.bodyContainsDownloadable() &&
+ !message.getBody().startsWith(ME_COMMAND) &&
+ !this.getBody().startsWith(ME_COMMAND) &&
+ !this.bodyIsHeart() &&
+ !message.bodyIsHeart()
+ );
}
private static boolean isStatusMergeable(int a, int b) {
return a == b || (
- ( a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_UNSEND)
- || (a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_SEND)
- || (a == Message.STATUS_UNSEND && b == Message.STATUS_SEND)
- || (a == Message.STATUS_UNSEND && b == Message.STATUS_SEND_RECEIVED)
- || (a == Message.STATUS_SEND && b == Message.STATUS_UNSEND)
- || (a == Message.STATUS_SEND && b == Message.STATUS_SEND_RECEIVED)
+ (a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_UNSEND)
+ || (a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_SEND)
+ || (a == Message.STATUS_UNSEND && b == Message.STATUS_SEND)
+ || (a == Message.STATUS_UNSEND && b == Message.STATUS_SEND_RECEIVED)
+ || (a == Message.STATUS_SEND && b == Message.STATUS_UNSEND)
+ || (a == Message.STATUS_SEND && b == Message.STATUS_SEND_RECEIVED)
);
}
@@ -443,7 +446,7 @@ public class Message extends AbstractEntity {
if (!url.getProtocol().equalsIgnoreCase("http")
&& !url.getProtocol().equalsIgnoreCase("https")) {
return false;
- }
+ }
String sUrlPath = url.getPath();
if (sUrlPath == null || sUrlPath.isEmpty()) {
@@ -457,14 +460,14 @@ public class Message extends AbstractEntity {
String[] extensionParts = sLastUrlPath.split("\\.");
if (extensionParts.length == 2
&& Arrays.asList(Downloadable.VALID_IMAGE_EXTENSIONS).contains(
- extensionParts[extensionParts.length - 1])) {
+ extensionParts[extensionParts.length - 1])) {
return true;
} else if (extensionParts.length == 3
&& Arrays
.asList(Downloadable.VALID_CRYPTO_EXTENSIONS)
.contains(extensionParts[extensionParts.length - 1])
&& Arrays.asList(Downloadable.VALID_IMAGE_EXTENSIONS).contains(
- extensionParts[extensionParts.length - 2])) {
+ extensionParts[extensionParts.length - 2])) {
return true;
} else {
return false;
@@ -474,6 +477,11 @@ public class Message extends AbstractEntity {
}
}
+ public boolean bodyIsHeart() {
+ return body != null &&
+ (body.trim().equals(UIHelper.BLACK_HEART_SUIT) || body.trim().equals(UIHelper.HEAVY_BLACK_HEART_SUIT));
+ }
+
public ImageParams getImageParams() {
ImageParams params = getLegacyImageParams();
if (params != null) {
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index da92fb18..89618dfc 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -7,7 +7,9 @@ import android.graphics.Typeface;
import android.net.Uri;
import android.text.Spannable;
import android.text.SpannableString;
+import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
+import android.text.style.RelativeSizeSpan;
import android.text.style.StyleSpan;
import android.util.DisplayMetrics;
import android.util.Log;
@@ -207,12 +209,24 @@ public class MessageAdapter extends ArrayAdapter<Message> {
viewHolder.image.setVisibility(View.GONE);
viewHolder.messageBody.setVisibility(View.VISIBLE);
viewHolder.messageBody.setText(getContext().getString(
- R.string.decryption_failed));
+ R.string.decryption_failed));
viewHolder.messageBody.setTextColor(activity.getWarningTextColor());
viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
viewHolder.messageBody.setTextIsSelectable(false);
}
+ private void displayHeartMesage(final ViewHolder viewHolder, final String body) {
+ if (viewHolder.download_button != null) {
+ viewHolder.download_button.setVisibility(View.GONE);
+ }
+ viewHolder.image.setVisibility(View.GONE);
+ viewHolder.messageBody.setVisibility(View.VISIBLE);
+ Spannable span = new SpannableString(body);
+ span.setSpan(new RelativeSizeSpan(4.0f),0,body.length(),Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ span.setSpan(new ForegroundColorSpan(activity.getWarningTextColor()),0,body.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ viewHolder.messageBody.setText(span);
+ }
+
private void displayTextMessage(final ViewHolder viewHolder, final Message message) {
if (viewHolder.download_button != null) {
viewHolder.download_button.setVisibility(View.GONE);
@@ -289,7 +303,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
viewHolder.image.setVisibility(View.GONE);
viewHolder.messageBody.setVisibility(View.GONE);
viewHolder.download_button.setVisibility(View.VISIBLE);
- viewHolder.download_button.setText(activity.getString(R.string.open_x_file, UIHelper.getFileDescriptionString(activity,message)));
+ viewHolder.download_button.setText(activity.getString(R.string.open_x_file, UIHelper.getFileDescriptionString(activity, message)));
viewHolder.download_button.setOnClickListener(new OnClickListener() {
@Override
@@ -334,7 +348,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
scalledH = (int) (params.height / ((double) params.width / target));
}
viewHolder.image.setLayoutParams(new LinearLayout.LayoutParams(
- scalledW, scalledH));
+ scalledW, scalledH));
activity.loadBitmap(message, viewHolder.image);
viewHolder.image.setOnClickListener(new OnClickListener() {
@@ -528,7 +542,11 @@ public class MessageAdapter extends ArrayAdapter<Message> {
if (GeoHelper.isGeoUri(message.getBody())) {
displayLocationMessage(viewHolder,message);
} else {
- displayTextMessage(viewHolder, message);
+ if (message.bodyIsHeart()) {
+ displayHeartMesage(viewHolder," "+message.getBody().trim()+" ");
+ } else {
+ displayTextMessage(viewHolder, message);
+ }
}
}
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index c3195d86..49354753 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -17,6 +17,10 @@ import android.text.format.DateUtils;
import android.util.Pair;
public class UIHelper {
+
+ public static String BLACK_HEART_SUIT = "\u2665";
+ public static String HEAVY_BLACK_HEART_SUIT = "\u2764";
+
private static final int SHORT_DATE_FLAGS = DateUtils.FORMAT_SHOW_DATE
| DateUtils.FORMAT_NO_YEAR | DateUtils.FORMAT_ABBREV_ALL;
private static final int FULL_DATE_FLAGS = DateUtils.FORMAT_SHOW_TIME
diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png
index cbfd8e76..83a7b94b 100644
--- a/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png
+++ b/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_location_dnd.png b/src/main/res/drawable-hdpi/ic_send_location_dnd.png
index 3bcbe18a..a9c51317 100644
--- a/src/main/res/drawable-hdpi/ic_send_location_dnd.png
+++ b/src/main/res/drawable-hdpi/ic_send_location_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_photo_dnd.png b/src/main/res/drawable-hdpi/ic_send_photo_dnd.png
index 2eb85679..15b1eb7a 100644
--- a/src/main/res/drawable-hdpi/ic_send_photo_dnd.png
+++ b/src/main/res/drawable-hdpi/ic_send_photo_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_text_dnd.png b/src/main/res/drawable-hdpi/ic_send_text_dnd.png
index 706b6505..b43428de 100644
--- a/src/main/res/drawable-hdpi/ic_send_text_dnd.png
+++ b/src/main/res/drawable-hdpi/ic_send_text_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_voice_dnd.png b/src/main/res/drawable-hdpi/ic_send_voice_dnd.png
index 50184ee8..26a89e8e 100644
--- a/src/main/res/drawable-hdpi/ic_send_voice_dnd.png
+++ b/src/main/res/drawable-hdpi/ic_send_voice_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png
index e4fa38a3..75006446 100644
--- a/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png
+++ b/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_location_dnd.png b/src/main/res/drawable-mdpi/ic_send_location_dnd.png
index 92e68ee3..3f4d6aa4 100644
--- a/src/main/res/drawable-mdpi/ic_send_location_dnd.png
+++ b/src/main/res/drawable-mdpi/ic_send_location_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_photo_dnd.png b/src/main/res/drawable-mdpi/ic_send_photo_dnd.png
index 7b6700d6..08033f63 100644
--- a/src/main/res/drawable-mdpi/ic_send_photo_dnd.png
+++ b/src/main/res/drawable-mdpi/ic_send_photo_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_text_dnd.png b/src/main/res/drawable-mdpi/ic_send_text_dnd.png
index 92df9d3d..c3d9e79a 100644
--- a/src/main/res/drawable-mdpi/ic_send_text_dnd.png
+++ b/src/main/res/drawable-mdpi/ic_send_text_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_voice_dnd.png b/src/main/res/drawable-mdpi/ic_send_voice_dnd.png
index ef25b1c4..aaf8ff32 100644
--- a/src/main/res/drawable-mdpi/ic_send_voice_dnd.png
+++ b/src/main/res/drawable-mdpi/ic_send_voice_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png
index 276ad024..dde1b707 100644
--- a/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png
+++ b/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_location_dnd.png b/src/main/res/drawable-xhdpi/ic_send_location_dnd.png
index 90ce346c..99c8ce36 100644
--- a/src/main/res/drawable-xhdpi/ic_send_location_dnd.png
+++ b/src/main/res/drawable-xhdpi/ic_send_location_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png b/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png
index 2c37db74..fc69cb41 100644
--- a/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png
+++ b/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_text_dnd.png b/src/main/res/drawable-xhdpi/ic_send_text_dnd.png
index 0a749f8d..8b93ec10 100644
--- a/src/main/res/drawable-xhdpi/ic_send_text_dnd.png
+++ b/src/main/res/drawable-xhdpi/ic_send_text_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png b/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png
index cea4212a..66b0c677 100644
--- a/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png
+++ b/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png
index 93fbc44d..e68a912d 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png
index ea3d1502..1773e62d 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png
index 09c11a81..fe33a1d0 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png
index 0d7e7053..32f5e29c 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png
index a5151331..4a5b4104 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png
index 02ab1d0f..307ca8a0 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png
index 08e2b39b..e7f6fde7 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png
index fccb32dc..8a9b0700 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png
index 929a33a4..b11cd6b6 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png
index 8ac667be..4ad9d389 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png
Binary files differ
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index c21650a5..753a56df 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -11,7 +11,7 @@
<color name="secondarybackground" type="color">#ffeeeeee</color>
<color name="darkbackground" type="color">#ff323232</color>
<color name="divider">#1f000000</color>
- <color name="red">#ffe51c23</color>
+ <color name="red">#fff44336</color>
<color name="orange">#ffff9800</color>
<color name="green">#ff259b24</color>