msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Replace report spam icon

Browse Source
pull/205/head
M66B 4 years ago
parent 77610b52f3
commit ee202dcb1a
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/eu/faircode/email/Core.java
Unescape View File

@ -4659,7 +4659,7 @@ class Core {
PendingIntent piJunk = PendingIntentCompat.getService( PendingIntent piJunk = PendingIntentCompat.getService(
context, ServiceUI.PI_JUNK, junk, PendingIntent.FLAG_UPDATE_CURRENT); context, ServiceUI.PI_JUNK, junk, PendingIntent.FLAG_UPDATE_CURRENT);
NotificationCompat.Action.Builder actionJunk = new NotificationCompat.Action.Builder( 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), context.getString(R.string.title_advanced_notify_action_junk),
piJunk) piJunk)
.setShowsUserInterface(false) .setShowsUserInterface(false)

2
app/src/main/java/eu/faircode/email/EntityFolder.java
Unescape View File

@ -346,7 +346,7 @@ public class EntityFolder extends EntityOrder implements Serializable {
if (EntityFolder.TRASH.equals(type)) if (EntityFolder.TRASH.equals(type))
return R.drawable.twotone_delete_24; return R.drawable.twotone_delete_24;
if (EntityFolder.JUNK.equals(type)) if (EntityFolder.JUNK.equals(type))
return R.drawable.twotone_report_problem_24; return R.drawable.twotone_report_24;
if (EntityFolder.SYSTEM.equals(type)) if (EntityFolder.SYSTEM.equals(type))
return R.drawable.twotone_folder_special_24; return R.drawable.twotone_folder_special_24;
return R.drawable.twotone_folder_24; return R.drawable.twotone_folder_24;

4
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -2146,7 +2146,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
else if (EntityMessage.SWIPE_ACTION_MOVE.equals(action)) else if (EntityMessage.SWIPE_ACTION_MOVE.equals(action))
icon = R.drawable.twotone_folder_24; icon = R.drawable.twotone_folder_24;
else if (EntityMessage.SWIPE_ACTION_JUNK.equals(action)) 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) || else if (EntityMessage.SWIPE_ACTION_DELETE.equals(action) ||
(action.equals(message.folder) && EntityFolder.TRASH.equals(message.folderType)) || (action.equals(message.folder) && EntityFolder.TRASH.equals(message.folderType)) ||
(EntityFolder.TRASH.equals(actionType) && EntityFolder.JUNK.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 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) 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 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) popupMenu.getMenu().add(Menu.FIRST, R.string.title_trash, order++, R.string.title_trash)

2
app/src/main/res/layout/dialog_buttons.xml
Unescape View File

@ -62,7 +62,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:drawableEnd="@drawable/twotone_report_problem_24" android:drawableEnd="@drawable/twotone_report_24"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:text="@string/title_spam" android:text="@string/title_spam"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"

2
app/src/main/res/layout/dialog_junk.xml
Unescape View File

@ -14,7 +14,7 @@
android:id="@+id/tvMessage" android:id="@+id/tvMessage"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableStart="@drawable/twotone_warning_24" android:drawableStart="@drawable/twotone_report_24"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:drawableTint="?attr/colorWarning" android:drawableTint="?attr/colorWarning"
android:text="@string/title_ask_spam_who" android:text="@string/title_ask_spam_who"

2
app/src/main/res/layout/fragment_legend_folders.xml
Unescape View File

@ -152,7 +152,7 @@
android:padding="12dp" android:padding="12dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivTrash" app:layout_constraintTop_toBottomOf="@id/ivTrash"
app:srcCompat="@drawable/twotone_report_problem_24" /> app:srcCompat="@drawable/twotone_report_24" />
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView
android:id="@+id/tvJunk" android:id="@+id/tvJunk"

2
app/src/main/res/layout/include_message_navigation.xml
Unescape View File

@ -84,7 +84,7 @@
android:padding="6dp" android:padding="6dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:tooltipText="@string/title_spam" android:tooltipText="@string/title_spam"
app:srcCompat="@drawable/twotone_report_problem_24" app:srcCompat="@drawable/twotone_report_24"
tools:ignore="MissingConstraints" /> tools:ignore="MissingConstraints" />
<ImageButton <ImageButton

Write Preview
Loading…
Cancel
Save