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

Unverified Commit 0fa385b6 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #9375 from joohnq/fix-issue-8446 

fix: resolve #8446 – In folders, contact pictures function as check boxes or toggle buttons
parents 92cefa2b d8c2e62f

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -371,6 +371,7 @@ class MessageListAdapter internal constructor( 
        val isActive = isActiveMessage(messageListItem)

        val isActive = isActiveMessage(messageListItem)





        if (appearance.showContactPicture) {

        if (appearance.showContactPicture) {

            holder.contactPictureClickArea.isSelected = isSelected

            if (isSelected) {

            if (isSelected) {

                holder.contactPicture.isVisible = false

                holder.contactPicture.isVisible = false

                holder.selected.isVisible = true

                holder.selected.isVisible = true
@@ -378,6 +379,11 @@ class MessageListAdapter internal constructor( 
                holder.selected.isVisible = false

                holder.selected.isVisible = false

                holder.contactPicture.isVisible = true

                holder.contactPicture.isVisible = true

            }

            }

            holder.contactPictureClickArea.contentDescription = if (isSelected) {

                res.getString(R.string.swipe_action_deselect)

            } else {

                res.getString(R.string.swipe_action_select)

            }

        }

        }





        with(messageListItem) {

        with(messageListItem) {

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewHolder.kt

+1 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ class MessageViewHolder(view: View) : MessageListViewHolder(view) { 




    val selected: View = view.findViewById(R.id.selected)

    val selected: View = view.findViewById(R.id.selected)

    val contactPicture: ImageView = view.findViewById(R.id.contact_picture)

    val contactPicture: ImageView = view.findViewById(R.id.contact_picture)

    val contactPictureClickArea: View = view.findViewById(R.id.contact_picture_click_area)

    val subject: MaterialTextView = view.findViewById(R.id.subject)

    val subject: MaterialTextView = view.findViewById(R.id.subject)

    val preview: MaterialTextView = view.findViewById(R.id.preview)

    val preview: MaterialTextView = view.findViewById(R.id.preview)

    val date: MaterialTextView = view.findViewById(R.id.date)

    val date: MaterialTextView = view.findViewById(R.id.date)