aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu
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/java/eu
parent4bf9a1e8092f682d3fc8db334f3aa0d666772826 (diff)
use darker green as background for chat bubbles in dark theme
Diffstat (limited to 'src/main/java/eu')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java7
1 files changed, 4 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);