add a little bit of space between merged messages.

Daniel Gultsch created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Message.java          | 2 
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 8 
2 files changed, 8 insertions(+), 2 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Message.java

@@ -396,7 +396,7 @@ public class Message extends AbstractEntity {
 	public String getMergedBody() {
 		final Message next = this.next();
 		if (this.mergeable(next)) {
-			return getBody().trim() + '\n' + next.getMergedBody();
+			return getBody().trim() + "\n\n" + next.getMergedBody();
 		}
 		return getBody().trim();
 	}

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java

@@ -232,7 +232,13 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		viewHolder.messageBody.setIncludeFontPadding(true);
 		if (message.getBody() != null) {
 			final String nick = UIHelper.getMessageDisplayName(message);
-			final String formattedBody = message.getMergedBody().replaceAll("^" + Message.ME_COMMAND,nick + " ");
+			final String body = message.getMergedBody().replaceAll("^" + Message.ME_COMMAND,nick + " ");
+			final SpannableString formattedBody = new SpannableString(body);
+			int i = body.indexOf("\n\n");
+			while(i >= 0) {
+				formattedBody.setSpan(new RelativeSizeSpan(0.2f),i,i+2,Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+				i = body.indexOf("\n\n",i+2);
+			}
 			if (message.getType() != Message.TYPE_PRIVATE) {
 				if (message.hasMeCommand()) {
 					final Spannable span = new SpannableString(formattedBody);