diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java b/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java index d7fc0f3cc5..5f6fd68a73 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java @@ -28,7 +28,9 @@ import android.content.SharedPreferences; import android.content.res.ColorStateList; import android.os.Build; import android.os.Bundle; +import android.text.SpannableStringBuilder; import android.text.TextUtils; +import android.text.style.ForegroundColorSpan; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; @@ -334,9 +336,22 @@ public class FragmentDialogJunk extends FragmentDialogBase { } // Initialize - tvMessage.setText(inJunk - ? getString(R.string.title_folder_junk) - : getString(R.string.title_ask_spam_who, MessageHelper.formatAddresses(froms))); + if (inJunk) + tvMessage.setText(R.string.title_folder_junk); + else { + String who = MessageHelper.formatAddresses(froms); + String title = getString(R.string.title_ask_spam_who, who); + SpannableStringBuilder ssb = new SpannableStringBuilderEx(title); + if (who.length() > 0) { + int start = title.indexOf(who); + if (start > 0) { + int textColorPrimary = Helper.resolveColor(context, android.R.attr.textColorPrimary); + ssb.setSpan(new ForegroundColorSpan(textColorPrimary), start, start + who.length(), 0); + } + } + tvMessage.setText(ssb); + } + cbBlockSender.setEnabled(canBlock); cbBlockReturn.setEnabled(false); cbBlockDomain.setEnabled(false); diff --git a/app/src/main/res/layout/dialog_junk.xml b/app/src/main/res/layout/dialog_junk.xml index 996c3d9516..61571706c9 100644 --- a/app/src/main/res/layout/dialog_junk.xml +++ b/app/src/main/res/layout/dialog_junk.xml @@ -19,7 +19,6 @@ android:drawableTint="?attr/colorWarning" android:text="@string/title_ask_spam_who" android:textAppearance="@style/TextAppearance.AppCompat.Medium" - android:textColor="?android:attr/textColorPrimary" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />