aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-06-10 22:39:02 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-06-10 22:39:02 +0200
commita70f57358ed4f367787e39fa2ff3b235896f0107 (patch)
tree296ef1917191d0c0523d278ae2766281b0213530 /src/main
parent4bf9a1e8092f682d3fc8db334f3aa0d666772826 (diff)
use darker green as background for chat bubbles in dark theme
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java7
-rw-r--r--src/main/res/drawable-hdpi/message_bubble_received.9.pngbin765 -> 765 bytes
-rw-r--r--src/main/res/drawable-hdpi/message_bubble_received_dark.9.pngbin0 -> 779 bytes
-rw-r--r--src/main/res/drawable-hdpi/message_bubble_received_grey.9.pngbin750 -> 750 bytes
-rw-r--r--src/main/res/drawable-hdpi/message_bubble_received_warning.9.pngbin757 -> 757 bytes
-rw-r--r--src/main/res/drawable-hdpi/message_bubble_received_white.9.pngbin779 -> 779 bytes
-rw-r--r--src/main/res/drawable-hdpi/message_bubble_sent.9.pngbin687 -> 687 bytes
-rw-r--r--src/main/res/drawable-hdpi/message_bubble_sent_grey.9.pngbin707 -> 707 bytes
-rw-r--r--src/main/res/drawable-mdpi/message_bubble_received.9.pngbin594 -> 594 bytes
-rw-r--r--src/main/res/drawable-mdpi/message_bubble_received_dark.9.pngbin0 -> 606 bytes
-rw-r--r--src/main/res/drawable-mdpi/message_bubble_received_grey.9.pngbin595 -> 595 bytes
-rw-r--r--src/main/res/drawable-mdpi/message_bubble_received_warning.9.pngbin598 -> 598 bytes
-rw-r--r--src/main/res/drawable-mdpi/message_bubble_received_white.9.pngbin610 -> 610 bytes
-rw-r--r--src/main/res/drawable-mdpi/message_bubble_sent.9.pngbin558 -> 558 bytes
-rw-r--r--src/main/res/drawable-mdpi/message_bubble_sent_grey.9.pngbin568 -> 568 bytes
-rw-r--r--src/main/res/drawable-xhdpi/message_bubble_received.9.pngbin929 -> 929 bytes
-rw-r--r--src/main/res/drawable-xhdpi/message_bubble_received_dark.9.pngbin0 -> 928 bytes
-rw-r--r--src/main/res/drawable-xhdpi/message_bubble_received_grey.9.pngbin915 -> 915 bytes
-rw-r--r--src/main/res/drawable-xhdpi/message_bubble_received_warning.9.pngbin921 -> 921 bytes
-rw-r--r--src/main/res/drawable-xhdpi/message_bubble_received_white.9.pngbin935 -> 935 bytes
-rw-r--r--src/main/res/drawable-xhdpi/message_bubble_sent.9.pngbin857 -> 857 bytes
-rw-r--r--src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.pngbin842 -> 842 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/message_bubble_received.9.pngbin1334 -> 1334 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.pngbin0 -> 1321 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.pngbin1301 -> 1301 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.pngbin1308 -> 1308 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/message_bubble_received_white.9.pngbin1344 -> 1344 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/message_bubble_sent.9.pngbin1190 -> 1190 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.pngbin1173 -> 1173 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/message_bubble_received.9.pngbin1714 -> 1714 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.pngbin0 -> 1722 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.pngbin1670 -> 1670 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.pngbin1674 -> 1674 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.pngbin1705 -> 1705 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/message_bubble_sent.9.pngbin1499 -> 1499 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.pngbin1468 -> 1468 bytes
-rw-r--r--src/main/res/values-v21/themes.xml2
-rw-r--r--src/main/res/values/attrs.xml1
-rw-r--r--src/main/res/values/themes.xml2
39 files changed, 9 insertions, 3 deletions
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 1ea2c223..e174401d 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -678,12 +678,13 @@ public class MessageAdapter extends ArrayAdapter<Message> {
if (type == RECEIVED) {
if(isInValidSession) {
+ int bubble;
if (!mUseGreenBackground) {
- int bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome, R.drawable.message_bubble_received_white);
- viewHolder.message_box.setBackgroundResource(bubble);
+ bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome, R.drawable.message_bubble_received_white);
} else {
- viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received);
+ bubble = activity.getThemeResource(R.attr.message_bubble_received_green, R.drawable.message_bubble_received);
}
+ viewHolder.message_box.setBackgroundResource(bubble);
viewHolder.encryption.setVisibility(View.GONE);
} else {
viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning);
diff --git a/src/main/res/drawable-hdpi/message_bubble_received.9.png b/src/main/res/drawable-hdpi/message_bubble_received.9.png
index 9e6c9551..605d9a39 100644
--- a/src/main/res/drawable-hdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_received.9.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png
new file mode 100644
index 00000000..84d56bc8
--- /dev/null
+++ b/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png
index eaa1fd24..b6b40f91 100644
--- a/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
index 29cf4844..e0db0b1d 100644
--- a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png
index 45678001..48e3705e 100644
--- a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent.9.png b/src/main/res/drawable-hdpi/message_bubble_sent.9.png
index 627e3a78..b7971a42 100644
--- a/src/main/res/drawable-hdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_sent.9.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png
index a59c1236..ce6f3734 100644
--- a/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received.9.png b/src/main/res/drawable-mdpi/message_bubble_received.9.png
index d5efb931..e2f06355 100644
--- a/src/main/res/drawable-mdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_received.9.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png
new file mode 100644
index 00000000..eb768233
--- /dev/null
+++ b/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png
index 3cc08a8e..7cd4ca33 100644
--- a/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
index 97b49275..16d468b4 100644
--- a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png
index 73a99dd7..febb8bfb 100644
--- a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent.9.png b/src/main/res/drawable-mdpi/message_bubble_sent.9.png
index 5776b564..cd891b0f 100644
--- a/src/main/res/drawable-mdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_sent.9.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png
index 72a11f5e..240b1237 100644
--- a/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received.9.png b/src/main/res/drawable-xhdpi/message_bubble_received.9.png
index 732ec2f7..b950cb91 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_received.9.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png
new file mode 100644
index 00000000..f29649d8
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png
index 66f471ca..b9fb7957 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
index b957f614..18d36ed5 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png
index 68b56dbf..b005d170 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
index 018f642c..8f2fd571 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png
index a5d0eba0..af6c7608 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
index b2c3d0a8..3dd99562 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png
new file mode 100644
index 00000000..2cf9f699
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png
index f4c009c2..20ae5f18 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
index 2183ca99..10130239 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png
index 178fe1a1..e2bb6f80 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
index 906386b3..31c5fa13 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png
index 3f210ba5..2c486407 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
index 310e3803..1620e8bc 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png
new file mode 100644
index 00000000..a62faee5
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png
index dbeaef12..5e9b6b2d 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
index 336906ba..99ec1efa 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png
index 9ad50df9..333aaf68 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
index 1aa23141..f82c72a2 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png
index 473b1b0d..ff6e8349 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png
Binary files differ
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index 60880b3d..91a9c5e8 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -31,6 +31,7 @@
<item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_white</item>
<item name="attr/message_bubble_sent">@drawable/message_bubble_sent</item>
+ <item name="attr/message_bubble_received_green">@drawable/message_bubble_received</item>
<item name="attr/icon_alpha">0.54</item>
@@ -91,6 +92,7 @@
<item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_grey</item>
<item name="attr/message_bubble_sent">@drawable/message_bubble_sent_grey</item>
+ <item name="attr/message_bubble_received_green">@drawable/message_bubble_received_dark</item>
<item name="attr/icon_alpha">1.0</item>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index a0d962d4..175f3f2b 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -21,6 +21,7 @@
<attr name="message_bubble_received_monochrome" format="reference"/>
<attr name="message_bubble_sent" format="reference"/>
+ <attr name="message_bubble_received_green" format="reference"/>
<attr name="icon_alpha" format="float"/>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 82544e57..54e663a7 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -37,6 +37,7 @@
<item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_white</item>
<item name="attr/message_bubble_sent">@drawable/message_bubble_sent</item>
+ <item name="attr/message_bubble_received_green">@drawable/message_bubble_received</item>
<item name="attr/icon_alpha">1.0</item>
@@ -84,6 +85,7 @@
<item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_grey</item>
<item name="attr/message_bubble_sent">@drawable/message_bubble_sent_grey</item>
+ <item name="attr/message_bubble_received_green">@drawable/message_bubble_received_dark</item>
<item name="attr/icon_alpha">1.0</item>