aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-05-10 03:14:13 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-05-10 03:14:13 +0200
commit1e28f600386f1f1dcd734363c932d5ccbd6267fb (patch)
treec69e873653e8da7a1f8f08aaa7cd88785a889f85 /src/main
parent4c486f5e583ddfc1f53f296d8a6fa9672981440a (diff)
changed conversation red to material red
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Contact.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
27 files changed, 3 insertions, 3 deletions
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/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>