apply styling helper to conversation overview

1 files changed, 20 insertions, 7 deletions

diff --git a/src/main/java/de/pixart/messenger/utils/UIHelper.java b/src/main/java/de/pixart/messenger/utils/UIHelper.java
index e167e8c84..e03f84189 100644
--- a/src/main/java/de/pixart/messenger/utils/UIHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/UIHelper.java
@@ -1,6 +1,8 @@
 package de.pixart.messenger.utils;
 
 import android.content.Context;
+import android.support.annotation.ColorInt;
+import android.text.SpannableStringBuilder;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.util.Pair;
@@ -239,7 +241,11 @@ public class UIHelper {
         }
     }
 
-    public static Pair<String, Boolean> getMessagePreview(final Context context, final Message message) {
+    public static Pair<CharSequence, Boolean> getMessagePreview(final Context context, final Message message) {
+        return getMessagePreview(context, message, 0);
+    }
+
+    public static Pair<CharSequence, Boolean> getMessagePreview(final Context context, final Message message, @ColorInt int textColor) {
         final Transferable d = message.getTransferable();
         if (d != null) {
             switch (d.getStatus()) {
@@ -289,14 +295,17 @@ public class UIHelper {
                 return new Pair<>(context.getString(R.string.x_file_offered_for_download,
                         getFileDescriptionString(context, message)), true);
             } else {
-                String[] lines = body.split("\n");
-                StringBuilder builder = new StringBuilder();
-                for(String l : lines) {
+                SpannableStringBuilder styledBody = new SpannableStringBuilder(body);
+                if (textColor != 0) {
+                    StylingHelper.format(styledBody, 0, styledBody.length() - 1, textColor);
+                }
+                SpannableStringBuilder builder = new SpannableStringBuilder();
+                for (CharSequence l : CharSequenceUtils.split(styledBody, '\n')) {
                     if (l.length() > 0) {
                         char first = l.charAt(0);
                         if ((first != '>' || !isPositionFollowedByQuoteableCharacter(l,0)) && first != '\u00bb') {
-                            String line = l.trim();
-                            if (line.isEmpty()) {
+                            CharSequence line = CharSequenceUtils.trim(l);
+                            if (line.length() == 0) {
                                 continue;
                             }
                             char last = line.charAt(line.length()-1);
@@ -313,11 +322,15 @@ public class UIHelper {
                 if (builder.length() == 0) {
                     builder.append(body.trim());
                 }
-                return new Pair<>(builder.length() > 256 ? builder.substring(0,256) : builder.toString(), false);
+                return new Pair<>(builder, false);
             }
         }
     }
 
+    public static CharSequence shorten(CharSequence input) {
+        return input.length() > 256 ? StylingHelper.subSequence(input, 0, 256) : input;
+    }
+
     public static boolean isPositionFollowedByQuoteableCharacter(CharSequence body, int pos) {
         return !isPositionFollowedByNumber(body, pos)
                 && !isPositionFollowedByEmoticon(body, pos)