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

Commit 21d8199d authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Update messageListItem View 

- remove showContactImageInMessageList setting
- remove contact image view reference from messageList
- update messageListItem view's scale & colors according to mock-up
- move selection circle to right-side of the screen
- update selection mode item visibility according to mock-up
parent f2f6bdc2

app/k9mail/src/main/res/values-night/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<resources>

    <color name="color_default_background">#121212</color>

    <color name="color_message_list_unread_background">#2F2F2F</color>

    <color name="color_message_list_thread_count_background">#61FFFFFF</color>

    <color name="color_message_list_thread_count_background">#1FFFFFFF</color>

    <color name="color_default_primary_text">#DEFFFFFF</color>

    <color name="color_default_secondary_text">#99FFFFFF</color>

    <color name="color_default_ternary_text">#61FFFFFF</color>

app/k9mail/src/main/res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


    <color name="color_message_list_selected_background">@lineageos.platform:color/color_default_selector_background</color>

    <color name="color_message_list_unread_background">#DCDCDC</color>

    <color name="color_message_list_thread_count_background">#61000000</color>

    <color name="color_message_list_thread_count_background">#14212121</color>

    <color name="color_dialog_backgronund">@android:color/white</color>



    <color name="color_contact_token_background">#ededed</color>

app/k9mail/src/main/res/values/themes.xml

+6 −6
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
        <item name="iconFolderSent">@drawable/ic_send</item>

        <item name="iconFolderSpam">@drawable/ic_alert_octagon</item>

        <item name="iconFolderTrash">@drawable/ic_trash_can</item>

        <item name="iconActionAddAttachment">@drawable/ic_messagelist_attachment</item>

        <item name="iconActionAddAttachment">@drawable/ic_add_attachment</item>

        <item name="iconActionArchive">@drawable/ic_archive</item>

        <item name="iconActionCompose">@drawable/ic_pencil</item>

        <item name="iconActionDelete">@drawable/ic_trash_can</item>
@@ -99,10 +99,10 @@ 
        <item name="messageListSelectedBackgroundColor">@color/color_message_list_selected_background</item>

        <item name="messageListReadItemBackgroundColor">@color/color_default_background</item>

        <item name="messageListUnreadItemBackgroundColor">@color/color_message_list_unread_background</item>

        <item name="messageListThreadCountForegroundColor">?android:attr/colorBackground</item>

        <item name="messageListThreadCountForegroundColor">@color/color_default_primary_text</item>

        <item name="messageListThreadCountBackground">@drawable/thread_count_box_light</item>

        <item name="messageListActiveItemBackgroundColor">@color/color_default_accent</item>

        <item name="messageListPreviewTextColor">@color/color_default_secondary_text</item>

        <item name="messageListPreviewTextColor">@color/color_default_ternary_text</item>

        <item name="messageListDividerColor">@color/color_default_divider</item>

        <item name="messageListStateIconTint">@color/default_icon_color</item>

        <item name="messageListAttachment">@drawable/ic_messagelist_attachment</item>
@@ -169,7 +169,7 @@ 
        <item name="iconFolderSent">@drawable/ic_send</item>

        <item name="iconFolderSpam">@drawable/ic_alert_octagon</item>

        <item name="iconFolderTrash">@drawable/ic_trash_can</item>

        <item name="iconActionAddAttachment">@drawable/ic_messagelist_attachment</item>

        <item name="iconActionAddAttachment">@drawable/ic_add_attachment</item>

        <item name="iconActionArchive">@drawable/ic_archive</item>

        <item name="iconActionCompose">@drawable/ic_pencil</item>

        <item name="iconActionDelete">@drawable/ic_trash_can</item>
@@ -225,10 +225,10 @@ 
        <item name="messageListSelectedBackgroundColor">@color/color_message_list_selected_background</item>

        <item name="messageListReadItemBackgroundColor">#c0cdcdcd</item>

        <item name="messageListUnreadItemBackgroundColor">@color/color_message_list_unread_background</item>

        <item name="messageListThreadCountForegroundColor">?android:attr/colorBackground</item>

        <item name="messageListThreadCountForegroundColor">@color/color_default_primary_text</item>

        <item name="messageListThreadCountBackground">@drawable/thread_count_box_light</item>

        <item name="messageListActiveItemBackgroundColor">@color/color_default_accent</item>

        <item name="messageListPreviewTextColor">@color/color_default_secondary_text</item>

        <item name="messageListPreviewTextColor">@color/color_default_ternary_text</item>

        <item name="messageListDividerColor">@color/color_default_divider</item>

        <item name="messageListStateIconTint">#bbbbbb</item>

        <item name="messageListAttachment">@drawable/ic_messagelist_attachment</item>

app/ui/base/src/main/res/values/colors.xml

+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <color name="default_icon_color">@color/color_default_secondary_text</color>

    <color name="color_icon_background_blue">@lineageos.platform:color/color_default_blue3</color>



    <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>

    <color name="color_default_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>

app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt

+18 −22
Original line number Diff line number Diff line
@@ -3,10 +3,8 @@ package com.fsck.k9.fragment 
import android.content.Context

import android.content.res.Resources

import android.content.res.Resources.Theme

import android.graphics.Color

import android.graphics.Typeface

import android.graphics.drawable.Drawable

import android.opengl.Visibility

import android.text.Spannable

import android.text.style.AbsoluteSizeSpan

import android.text.style.StyleSpan
@@ -21,7 +19,6 @@ import android.widget.BaseAdapter 
import android.widget.ImageView

import android.widget.TextView

import androidx.core.content.ContextCompat

import androidx.core.graphics.drawable.DrawableCompat

import androidx.core.view.isVisible

import com.fsck.k9.FontSizes

import com.fsck.k9.contacts.ContactPictureLoader
@@ -115,9 +112,6 @@ class MessageListAdapter internal constructor( 


        val holder = MessageViewHolder(view)



        view.findViewById<View>(R.id.contact_picture_container).isVisible = appearance.showContactPicture

        holder.contactPicture.setOnClickListener(contactPictureClickListener)



        appearance.fontSizes.setViewTextSize(holder.subject, subjectViewFontSize)



        appearance.fontSizes.setViewTextSize(holder.date, appearance.fontSizes.messageListDate)
@@ -153,19 +147,21 @@ class MessageListAdapter internal constructor( 


        val holder = view.tag as MessageViewHolder



        if (appearance.showContactPicture) {

        if (isInSelectionMode) {

                holder.contactPicture.isVisible = false

            if (isSelected) {

                holder.selected.setImageResource(R.drawable.ic_check_circle_large)

            } else {

                holder.selected.setImageResource(R.drawable.ic_non_check_circle_large)

            }

            holder.selected.isVisible = true

            holder.date.visibility = INVISIBLE

            holder.rightCheveron.visibility = INVISIBLE

            holder.threadCount.isVisible = false

            holder.attachment.isVisible = false

        } else {

            holder.selected.isVisible = false

                holder.contactPicture.isVisible = true

            }

            holder.date.visibility = VISIBLE

            holder.rightCheveron.visibility = VISIBLE

        }



        with(message) {
@@ -180,12 +176,9 @@ class MessageListAdapter internal constructor( 
                holder.flagged.isVisible = false

            }

            holder.position = position

            if (appearance.showContactPicture && holder.contactPicture.isVisible) {

                setContactPicture(holder.contactPicture, displayAddress)

            }



            setBackgroundColor(view, isSelected, isActive)

            holder.unreadMessageIndicator.visibility = if (isRead) INVISIBLE else VISIBLE

            updateWithThreadCount(holder, displayThreadCount)

            val beforePreviewText = if (appearance.senderAboveSubject) subject else displayName

            holder.displayName.setText(beforePreviewText, TextView.BufferType.SPANNABLE)

            formatDisplayText(holder.displayName, isRead)
@@ -204,7 +197,10 @@ class MessageListAdapter internal constructor( 
            }



            holder.date.text = displayDate

            if (!isInSelectionMode) {

                holder.attachment.isVisible = hasAttachments

                updateWithThreadCount(holder, displayThreadCount)

            }



            val statusHolder = buildStatusHolder(isForwarded, isAnswered)

            if (statusHolder != null) {