Preview of message in messages channel changed

app/src/org/commcare/android/database/connect/models/ConnectMessagingChannelRecord.java

@@ -1,5 +1,7 @@
 package org.commcare.android.database.connect.models;
 
+import android.text.SpannableString;
+
 import org.commcare.android.storage.framework.Persisted;
 import org.commcare.models.framework.Persisting;
 import org.commcare.modern.database.Table;
@@ -62,7 +64,7 @@ public ConnectMessagingChannelRecord() {
     @MetaField(META_KEY)
     private String key;
 
-    private String preview;
+    private SpannableString preview;
 
     private List<ConnectMessagingMessageRecord> messages = new ArrayList<>();
 
@@ -153,11 +155,11 @@ public void setKey(String key) {
     }
     public List<ConnectMessagingMessageRecord> getMessages() { return messages; }
 
-    public void setPreview(String preview) {
+    public void setPreview(SpannableString preview) {
         this.preview = preview;
     }
 
-    public String getPreview() {
+    public SpannableString getPreview() {
         return preview;
     }
 }

app/src/org/commcare/connect/ConnectDatabaseHelper.java

@@ -1,9 +1,16 @@
 package org.commcare.connect;
 
+import static android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE;
+
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.text.SpannableString;
+import android.text.style.ImageSpan;
 import android.widget.Toast;
 
+import androidx.core.content.ContextCompat;
+
 import net.sqlcipher.database.SQLiteDatabase;
 
 import org.commcare.CommCareApplication;
@@ -29,6 +36,7 @@
 import org.commcare.models.database.user.UserSandboxUtils;
 import org.commcare.modern.database.Table;
 import org.commcare.util.Base64;
+import org.commcare.utils.DimensionUtils;
 import org.commcare.utils.EncryptionUtils;
 import org.javarosa.core.services.Logger;
 import org.javarosa.core.services.storage.Persistable;
@@ -852,22 +860,25 @@ public static List<ConnectMessagingChannelRecord> getMessagingChannels(Context c
             List<ConnectMessagingMessageRecord> messages = channel.getMessages();
             ConnectMessagingMessageRecord lastMessage = messages.size() > 0 ?
                     messages.get(messages.size() - 1) : null;
-            String preview = "";
+            SpannableString preview;
             if(!channel.getConsented()) {
-                preview = context.getString(R.string.connect_messaging_channel_list_unconsented);
+                preview = new SpannableString(context.getString(R.string.connect_messaging_channel_list_unconsented));
             } else if(lastMessage != null) {
-                int senderId = lastMessage.getIsOutgoing() ?
-                        R.string.connect_messaging_channel_preview_you :
-                        R.string.connect_messaging_channel_preview_them;
-                String sender = context.getString(senderId);
 
                 String trimmed = lastMessage.getMessage().split("\n")[0];
                 int maxLength = 25;
                 if(trimmed.length() > maxLength) {
                     trimmed = trimmed.substring(0, maxLength - 3) + "...";
                 }
-
-                preview = String.format("%s: %s", sender, trimmed);
+                preview = new SpannableString(lastMessage.getIsOutgoing()? "  "+trimmed:trimmed);
+                if(lastMessage.getIsOutgoing()){
+                    Drawable drawable = lastMessage.getConfirmed() ? ContextCompat.getDrawable(context, R.drawable.ic_connect_message_read) : ContextCompat.getDrawable(context, R.drawable.ic_connect_message_unread);
+                    float lineHeight = DimensionUtils.INSTANCE.convertDpToPixel(14);
+                    drawable.setBounds(0,0,(int) lineHeight, (int) lineHeight);
+                    preview.setSpan(new ImageSpan(drawable), 0, 1, SPAN_EXCLUSIVE_EXCLUSIVE);
+                }
+            } else {
+                preview = new SpannableString("");
             }
 
             channel.setPreview(preview);

app/src/org/commcare/utils/DimensionUtils.kt

@@ -0,0 +1,12 @@
+package org.commcare.utils
+
+import android.content.res.Resources
+
+object DimensionUtils {
+
+    fun convertDpToPixel(dp: Float): Float {
+        val metrics = Resources.getSystem().displayMetrics
+        val px = dp * (metrics.densityDpi / 160f)
+        return Math.round(px).toFloat()
+    }
+}