From e6cb12dfe414497b4317820497985c110cb81864 Mon Sep 17 00:00:00 2001
From: Raphael Pohl <eiszfuchs@eiszblu.me>
Date: Sun, 19 Jul 2015 14:26:03 +0200
Subject: changed message bubble appearance

---
 .../conversations/ui/adapter/MessageAdapter.java   | 37 ++++++++++++++++------
 1 file changed, 27 insertions(+), 10 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/ui')

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 08e0f298..679fb355 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -81,15 +81,31 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		return 3;
 	}
 
-	@Override
-	public int getItemViewType(int position) {
-		if (getItem(position).getType() == Message.TYPE_STATUS) {
+	public int getItemViewType(Message message) {
+		if (message.getType() == Message.TYPE_STATUS) {
 			return STATUS;
-		} else if (getItem(position).getStatus() <= Message.STATUS_RECEIVED) {
+		} else if (message.getStatus() <= Message.STATUS_RECEIVED) {
 			return RECEIVED;
-		} else {
-			return SENT;
 		}
+
+		return SENT;
+	}
+
+	@Override
+	public int getItemViewType(int position) {
+		return this.getItemViewType(getItem(position));
+	}
+
+	private int getMessageTextColor(Message message) {
+		int type = this.getItemViewType(message);
+
+		if (type == SENT) {
+			return activity.getResources().getColor(R.color.black87);
+		} else if (type == RECEIVED) {
+			return activity.getResources().getColor(R.color.white);
+		}
+
+		return activity.getPrimaryTextColor();
 	}
 
 	private void displayStatus(ViewHolder viewHolder, Message message) {
@@ -150,7 +166,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		if (error) {
 			viewHolder.time.setTextColor(activity.getWarningTextColor());
 		} else {
-			viewHolder.time.setTextColor(activity.getSecondaryTextColor());
+			viewHolder.time.setTextColor(this.getMessageTextColor(message));
 		}
 		if (message.getEncryption() == Message.ENCRYPTION_NONE) {
 			viewHolder.indicator.setVisibility(View.GONE);
@@ -294,7 +310,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		} else {
 			viewHolder.messageBody.setText("");
 		}
-		viewHolder.messageBody.setTextColor(activity.getPrimaryTextColor());
+		viewHolder.messageBody.setTextColor(this.getMessageTextColor(message));
 		viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
 		viewHolder.messageBody.setTextIsSelectable(true);
 	}
@@ -363,8 +379,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			scalledW = (int) target;
 			scalledH = (int) (params.height / ((double) params.width / target));
 		}
-		viewHolder.image.setLayoutParams(new LinearLayout.LayoutParams(
-				scalledW, scalledH));
+		LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(scalledW, scalledH);
+		layoutParams.setMargins(0, (int)(metrics.density * 4), 0, (int)(metrics.density * 4));
+		viewHolder.image.setLayoutParams(layoutParams);
 		activity.loadBitmap(message, viewHolder.image);
 		viewHolder.image.setOnClickListener(new OnClickListener() {
 
-- 
cgit v1.2.3