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

Unverified Commit a2867e1b authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #6455 from thundernest/hide_contact_picture_in_message_view 

Message View Redesign: Respect setting to hide contact picture
parents 60c29b6e b5b691e6

app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java

+10 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ import androidx.appcompat.widget.PopupMenu; 
import androidx.appcompat.widget.PopupMenu.OnMenuItemClickListener;

import com.fsck.k9.Account;

import com.fsck.k9.DI;

import com.fsck.k9.K9;

import com.fsck.k9.activity.misc.ContactPicture;

import com.fsck.k9.contacts.ContactPictureLoader;

import com.fsck.k9.helper.ClipboardManager;
@@ -148,12 +149,17 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo 
            fromAddress = fromAddresses[0];

        }



        if (K9.isShowContactPicture()) {

            contactPictureView.setVisibility(View.VISIBLE);

            if (fromAddress != null) {

                ContactPictureLoader contactsPictureLoader = ContactPicture.getContactPictureLoader();

                contactsPictureLoader.setContactPicture(contactPictureView, fromAddress);

            } else {

                contactPictureView.setImageResource(R.drawable.ic_contact_picture);

            }

        } else {

            contactPictureView.setVisibility(View.GONE);

        }



        CharSequence from = messageHelper.getSenderDisplayName(fromAddress);

        fromView.setText(from);

app/ui/legacy/src/main/res/layout/message_view_header.xml

+5 −1
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="16dp"

            android:layout_marginTop="16dp"

            android:layout_marginEnd="8dp"

            android:ellipsize="end"

            android:gravity="center_vertical"
@@ -110,7 +111,7 @@ 
            app:layout_constraintHorizontal_bias="0.0"

            app:layout_constraintHorizontal_chainStyle="packed"

            app:layout_constraintStart_toEndOf="@id/contact_picture"

            app:layout_constraintTop_toTopOf="@+id/contact_picture"

            app:layout_constraintTop_toTopOf="parent"

            tools:text="Sender name" />



        <TextView
@@ -144,17 +145,20 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="4dp"

            android:layout_marginBottom="16dp"

            android:ellipsize="end"

            android:maxLines="1"

            android:text="to me"

            android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"

            android:textColor="?android:attr/textColorSecondary"

            app:layout_constrainedWidth="true"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintEnd_toStartOf="@id/to_count"

            app:layout_constraintHorizontal_bias="0.0"

            app:layout_constraintHorizontal_chainStyle="packed"

            app:layout_constraintStart_toEndOf="@id/crypto_status_icon"

            app:layout_constraintTop_toBottomOf="@+id/from"

            app:layout_constraintVertical_bias="0.0"

            app:layout_goneMarginStart="16dp" />



        <TextView