Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef2261cb authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Added one preview line to each message.

parent 2279dda2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ public class K9 extends Application
        messageListSenderAboveSubject = storage.getBoolean("messageListSenderAboveSubject", true);
        messageListCheckboxes = storage.getBoolean("messageListCheckboxes", false);
        messageListStars = storage.getBoolean("messageListStars", true);
        messageListPreviewLines = storage.getInt("messageListPreviewLines", 0);
        messageListPreviewLines = storage.getInt("messageListPreviewLines", 1);

        autofitWidth = storage.getBoolean("autofitWidth", true);

+16 −5
Original line number Diff line number Diff line
@@ -143,10 +143,6 @@ public class MessageListAdapter extends CursorAdapter
        }

        fontSizes.setViewTextSize(holder.date, fontSizes.getMessageListDate());


        // 1 preview line is needed even if it is set to 0, because subject is part of the same text view
        holder.preview.setLines(Math.max(fragment.previewLines, 1));
        fontSizes.setViewTextSize(holder.preview, fontSizes.getMessageListPreview());
        holder.threadCount = (TextView) view.findViewById(R.id.thread_count);
        fontSizes.setViewTextSize(holder.threadCount, fontSizes.getMessageListSubject()); // thread count is next to subject
@@ -232,11 +228,26 @@ public class MessageListAdapter extends CursorAdapter
        String sigil = recipientSigil(toMe, ccMe);
        SpannableStringBuilder messageStringBuilder = new SpannableStringBuilder(sigil)
                .append(beforePreviewText);

        if (fragment.previewLines > 0)
        {
            String preview = getPreview(cursor);
            messageStringBuilder.append(" ").append(preview);

            if (preview != null && !preview.equals(""))
            {
                holder.preview.setLines(fragment.previewLines + 1);
                messageStringBuilder.append("\n").append(preview);
            }
            else
            {
                holder.preview.setLines(1);
            }
        }
        else
        {
            holder.preview.setLines(1);
        }

        holder.preview.setText(messageStringBuilder, TextView.BufferType.SPANNABLE);

        formatPreviewText(holder.preview, beforePreviewText, sigil);