From ee202dcb1a0e2ff2381f1283c97f796ecb6a720d Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 4 Sep 2021 16:24:22 +0200 Subject: [PATCH] Replace report spam icon --- app/src/main/java/eu/faircode/email/Core.java | 2 +- app/src/main/java/eu/faircode/email/EntityFolder.java | 2 +- app/src/main/java/eu/faircode/email/FragmentMessages.java | 4 ++-- app/src/main/res/layout/dialog_buttons.xml | 2 +- app/src/main/res/layout/dialog_junk.xml | 2 +- app/src/main/res/layout/fragment_legend_folders.xml | 2 +- app/src/main/res/layout/include_message_navigation.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 1202f640f8..86c3e48b5b 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -4659,7 +4659,7 @@ class Core { PendingIntent piJunk = PendingIntentCompat.getService( context, ServiceUI.PI_JUNK, junk, PendingIntent.FLAG_UPDATE_CURRENT); NotificationCompat.Action.Builder actionJunk = new NotificationCompat.Action.Builder( - R.drawable.twotone_report_problem_24, + R.drawable.twotone_report_24, context.getString(R.string.title_advanced_notify_action_junk), piJunk) .setShowsUserInterface(false) diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java index 8a30f96dba..2690463a2a 100644 --- a/app/src/main/java/eu/faircode/email/EntityFolder.java +++ b/app/src/main/java/eu/faircode/email/EntityFolder.java @@ -346,7 +346,7 @@ public class EntityFolder extends EntityOrder implements Serializable { if (EntityFolder.TRASH.equals(type)) return R.drawable.twotone_delete_24; if (EntityFolder.JUNK.equals(type)) - return R.drawable.twotone_report_problem_24; + return R.drawable.twotone_report_24; if (EntityFolder.SYSTEM.equals(type)) return R.drawable.twotone_folder_special_24; return R.drawable.twotone_folder_24; diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index e6ac64fb59..a64b5078b9 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -2146,7 +2146,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. else if (EntityMessage.SWIPE_ACTION_MOVE.equals(action)) icon = R.drawable.twotone_folder_24; else if (EntityMessage.SWIPE_ACTION_JUNK.equals(action)) - icon = R.drawable.twotone_report_problem_24; + icon = R.drawable.twotone_report_24; else if (EntityMessage.SWIPE_ACTION_DELETE.equals(action) || (action.equals(message.folder) && EntityFolder.TRASH.equals(message.folderType)) || (EntityFolder.TRASH.equals(actionType) && EntityFolder.JUNK.equals(message.folderType))) @@ -3082,7 +3082,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. if (result.hasJunk && !result.isJunk && !result.isDrafts) // has junk and not junk/drafts popupMenu.getMenu().add(Menu.FIRST, R.string.title_spam, order++, R.string.title_spam) - .setIcon(R.drawable.twotone_report_problem_24); + .setIcon(R.drawable.twotone_report_24); if (!result.isTrash && result.hasTrash && !result.isJunk) // not trash and has trash and not is junk popupMenu.getMenu().add(Menu.FIRST, R.string.title_trash, order++, R.string.title_trash) diff --git a/app/src/main/res/layout/dialog_buttons.xml b/app/src/main/res/layout/dialog_buttons.xml index 8d752671ae..995f6cb8dd 100644 --- a/app/src/main/res/layout/dialog_buttons.xml +++ b/app/src/main/res/layout/dialog_buttons.xml @@ -62,7 +62,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:drawableEnd="@drawable/twotone_report_problem_24" + android:drawableEnd="@drawable/twotone_report_24" android:drawablePadding="6dp" android:text="@string/title_spam" android:textAppearance="@style/TextAppearance.AppCompat.Small" diff --git a/app/src/main/res/layout/dialog_junk.xml b/app/src/main/res/layout/dialog_junk.xml index afe054fe8d..cf8b2748f6 100644 --- a/app/src/main/res/layout/dialog_junk.xml +++ b/app/src/main/res/layout/dialog_junk.xml @@ -14,7 +14,7 @@ android:id="@+id/tvMessage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:drawableStart="@drawable/twotone_warning_24" + android:drawableStart="@drawable/twotone_report_24" android:drawablePadding="6dp" android:drawableTint="?attr/colorWarning" android:text="@string/title_ask_spam_who" diff --git a/app/src/main/res/layout/fragment_legend_folders.xml b/app/src/main/res/layout/fragment_legend_folders.xml index 73c5134399..dcbd84918c 100644 --- a/app/src/main/res/layout/fragment_legend_folders.xml +++ b/app/src/main/res/layout/fragment_legend_folders.xml @@ -152,7 +152,7 @@ android:padding="12dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/ivTrash" - app:srcCompat="@drawable/twotone_report_problem_24" /> + app:srcCompat="@drawable/twotone_report_24" />