From 1e28f600386f1f1dcd734363c932d5ccbd6267fb Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 10 May 2015 03:14:13 +0200
Subject: changed conversation red to material red

---
 art/ic_send_cancel_dnd.svg                            |   2 +-
 art/ic_send_location_dnd.svg                          |   2 +-
 art/ic_send_photo_dnd.svg                             |   4 ++--
 art/ic_send_text_dnd.svg                              |   2 +-
 art/ic_send_voice_dnd.svg                             |   2 +-
 .../java/eu/siacs/conversations/entities/Contact.java |   4 ++--
 src/main/res/drawable-hdpi/ic_send_cancel_dnd.png     | Bin 1559 -> 1587 bytes
 src/main/res/drawable-hdpi/ic_send_location_dnd.png   | Bin 1333 -> 1333 bytes
 src/main/res/drawable-hdpi/ic_send_photo_dnd.png      | Bin 1381 -> 1383 bytes
 src/main/res/drawable-hdpi/ic_send_text_dnd.png       | Bin 1126 -> 1128 bytes
 src/main/res/drawable-hdpi/ic_send_voice_dnd.png      | Bin 1149 -> 1161 bytes
 src/main/res/drawable-mdpi/ic_send_cancel_dnd.png     | Bin 1040 -> 1025 bytes
 src/main/res/drawable-mdpi/ic_send_location_dnd.png   | Bin 908 -> 917 bytes
 src/main/res/drawable-mdpi/ic_send_photo_dnd.png      | Bin 909 -> 915 bytes
 src/main/res/drawable-mdpi/ic_send_text_dnd.png       | Bin 769 -> 781 bytes
 src/main/res/drawable-mdpi/ic_send_voice_dnd.png      | Bin 774 -> 795 bytes
 src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png    | Bin 1940 -> 1958 bytes
 src/main/res/drawable-xhdpi/ic_send_location_dnd.png  | Bin 1721 -> 1753 bytes
 src/main/res/drawable-xhdpi/ic_send_photo_dnd.png     | Bin 1723 -> 1756 bytes
 src/main/res/drawable-xhdpi/ic_send_text_dnd.png      | Bin 1395 -> 1430 bytes
 src/main/res/drawable-xhdpi/ic_send_voice_dnd.png     | Bin 1426 -> 1419 bytes
 src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png   | Bin 2911 -> 2983 bytes
 src/main/res/drawable-xxhdpi/ic_send_location_dnd.png | Bin 2578 -> 2589 bytes
 src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png    | Bin 2588 -> 2618 bytes
 src/main/res/drawable-xxhdpi/ic_send_text_dnd.png     | Bin 2004 -> 2005 bytes
 src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png    | Bin 2152 -> 2200 bytes
 src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png  | Bin 3791 -> 3862 bytes
 .../res/drawable-xxxhdpi/ic_send_location_dnd.png     | Bin 3456 -> 3514 bytes
 src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png   | Bin 3544 -> 3569 bytes
 src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png    | Bin 2597 -> 2592 bytes
 src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png   | Bin 2811 -> 2849 bytes
 src/main/res/values/colors.xml                        |   2 +-
 32 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/art/ic_send_cancel_dnd.svg b/art/ic_send_cancel_dnd.svg
index 54e02a918..67a562b2f 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 d91fa9130..705cdb6f4 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 0e406edec..9ef8b7821 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 b594f3195..1b7ad51f4 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 372a2ca80..b1b7a7a97 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 4ad105b1d..9dbca59a1 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/res/drawable-hdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png
index cbfd8e76c..83a7b94b2 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png 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 3bcbe18af..a9c51317e 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_location_dnd.png and b/src/main/res/drawable-hdpi/ic_send_location_dnd.png 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 2eb856797..15b1eb7a0 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-hdpi/ic_send_photo_dnd.png 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 706b65054..b43428dec 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_text_dnd.png and b/src/main/res/drawable-hdpi/ic_send_text_dnd.png 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 50184ee8b..26a89e8e3 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-hdpi/ic_send_voice_dnd.png 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 e4fa38a3e..750064469 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png 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 92e68ee34..3f4d6aa45 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_location_dnd.png and b/src/main/res/drawable-mdpi/ic_send_location_dnd.png 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 7b6700d6f..08033f633 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-mdpi/ic_send_photo_dnd.png 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 92df9d3d0..c3d9e79a8 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_text_dnd.png and b/src/main/res/drawable-mdpi/ic_send_text_dnd.png 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 ef25b1c4d..aaf8ff32c 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-mdpi/ic_send_voice_dnd.png 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 276ad0242..dde1b7076 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png 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 90ce346cb..99c8ce36f 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_location_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_location_dnd.png 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 2c37db74a..fc69cb416 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png 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 0a749f8db..8b93ec109 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_text_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_text_dnd.png 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 cea4212a8..66b0c6771 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png 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 93fbc44d4..e68a912d7 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png 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 ea3d15026..1773e62d2 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png 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 09c11a817..fe33a1d0d 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png 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 0d7e7053f..32f5e29c7 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png 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 a5151331c..4a5b41040 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png 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 02ab1d0fb..307ca8a0f 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png 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 08e2b39bd..e7f6fde74 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png 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 fccb32dc3..8a9b07005 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png 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 929a33a47..b11cd6b62 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png 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 8ac667be2..4ad9d389e 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png differ
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index c21650a5d..753a56df9 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>
 
-- 
cgit v1.2.3