diff --git a/art/ic_send_cancel_dnd.svg b/art/ic_send_cancel_dnd.svg index 54e02a918e7ed74c86e56ec1dbe109e3301dfd96..67a562b2f40fa8ce83303d2a43f95ce69cd8e293 100644 --- a/art/ic_send_cancel_dnd.svg +++ b/art/ic_send_cancel_dnd.svg @@ -50,5 +50,5 @@ + style="fill:#f44336;fill-opacity:0.627451" /> diff --git a/art/ic_send_location_dnd.svg b/art/ic_send_location_dnd.svg index d91fa913066143c8ff9734832c68de910229669e..705cdb6f4e62520f7878d8d8b3332a9a4a57adb2 100644 --- a/art/ic_send_location_dnd.svg +++ b/art/ic_send_location_dnd.svg @@ -50,5 +50,5 @@ + style="fill:#f44336;fill-opacity:0.627451" /> diff --git a/art/ic_send_photo_dnd.svg b/art/ic_send_photo_dnd.svg index 0e406edec8f326304760e645fa2a0a6dbd6f1f43..9ef8b7821b09808e8df898f43e5ec11f9d51c8f7 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" /> + style="fill:#f44336;fill-opacity:0.627451" /> diff --git a/art/ic_send_text_dnd.svg b/art/ic_send_text_dnd.svg index b594f31953a9ec066fa3121d11b5e01b37c015c9..1b7ad51f431d81ccae5a5500b6801f690a613b58 100644 --- a/art/ic_send_text_dnd.svg +++ b/art/ic_send_text_dnd.svg @@ -58,7 +58,7 @@ id="grid3631" /> + style="fill:#f44336;fill-opacity:0.627451" /> diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java index 4ad105b1de280f2c7830bdd163bf170a73ed6b89..9dbca59a184dddc3cd2e480924a7c2bad5e1e355 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 cbfd8e76c06a7800a253e3bc4485974bbd2f22fe..83a7b94b2e8db05b7a84926d9e623f0c75159d61 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 3bcbe18af2ba194e9b49dc3cab55a76a60af0c10..a9c51317e58f7ad921b2741e88a2770440d6f56d 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 2eb856797e265ebf053fca9381a038a5bc3dce36..15b1eb7a0af4acd4035f6b6f8d864676d4ef921c 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 706b65054521077810c58b1293e327d1d1af8aaf..b43428decb113910085882d65326a54c16af5cba 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 50184ee8beb86ea31880ae568fb715a8718f98b6..26a89e8e3d80832f131d681f48f3c05e4b609fa0 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 e4fa38a3ed1c9a3a6cb076ed0a7920e42154f930..75006446906ddb163dae01069789a243d58f8b03 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 92e68ee34c1dcf4d7f02f1ff24ad1d7d69df3fad..3f4d6aa45cd861113e01dbe633a945d8d09ecc33 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 7b6700d6fe15542aaf2219842608bf434aa50f54..08033f6331e02ee64168625f570f2391a55cbf8b 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 92df9d3d0804876dc752599dfb6b63f969b112e9..c3d9e79a84a82cf5200aec560b8ecb8ef1b2fef7 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 ef25b1c4d044532378f3ffb64b0591e73fcaf403..aaf8ff32c4e6267483f95ae1a45d677eb6609472 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 276ad02424f33eb25a8aa6492e6ab7870cbcf38e..dde1b7076d606ce0a44319cbaf55a68934f9b283 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 90ce346cba6998bac84fb5c14333932b053eb85a..99c8ce36f2da0664278836c893374c64723c7ef0 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 2c37db74aa1e32863db9313045076ebef2f18b45..fc69cb416fc817de7308661a4e65651d033b1e9e 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 0a749f8dbf91262210ece71c21f9fba65492f993..8b93ec10916509f90cc7045a92e75c2de3aa9fc6 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 cea4212a87ccdc744e68b8d530416c11b41c3c5a..66b0c67715d0fcb8f270c3b72a6f28f42722881f 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 93fbc44d4d11fdffce01ca12e674b233c7f76c3e..e68a912d75c1fab78a4ac903730c3fca5dc85406 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 ea3d15026a11ed86699ab6c7761bb6b9ebc72110..1773e62d22d3b429cdba9c02c72f81ee95821470 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 09c11a817a5f389811effd76d2a234dfa349bedf..fe33a1d0d4b56fb966e40faeb3ce0e7cfe685586 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 0d7e7053fef7cd9cc333b8208b2006a5f9a92da7..32f5e29c73b0d82538b938180e8cf3b028ebcc23 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 a5151331ca736f9caf0f63d2361bdfac1b8226fd..4a5b41040e42f41801189767953884ee495912e0 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 02ab1d0fbfc0707335625080bba510c83a889d80..307ca8a0fe5261265fce5c537d842b6f3c2921d3 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 08e2b39bd187449bf7f73b559f9defc94418e8c3..e7f6fde74b8264ef77012cdc28a2e173771fe43c 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 fccb32dc380bbd50e59d3a3d34128f4f85b2c341..8a9b07005395e40f26d54390894e1403900ae80e 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 929a33a474c09e4b1b9521a0f051abfdd79d51b0..b11cd6b62080446ee18d434ef7b8f1e52ef1f84f 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 8ac667be25560f35c5491f03bb892490560aa736..4ad9d389e3b5c73bf134653a925691e2ff1b9aab 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 c21650a5d025209688586b60763bca5b2c8a6779..753a56df97306b20d39aa17d46c9465dc56074ea 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -11,7 +11,7 @@ #ffeeeeee #ff323232 #1f000000 - #ffe51c23 + #fff44336 #ffff9800 #ff259b24