From 49b50857ebb87ec153ed5298a0524be45756badc Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 6 Sep 2022 22:05:55 +0200 Subject: [PATCH] Set folder selection icon --- app/src/main/java/eu/faircode/email/ActivityView.java | 1 + app/src/main/java/eu/faircode/email/AdapterMessage.java | 1 + app/src/main/java/eu/faircode/email/AdapterRule.java | 1 + app/src/main/java/eu/faircode/email/FragmentDialogFolder.java | 3 ++- app/src/main/java/eu/faircode/email/FragmentMessages.java | 4 ++++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index 96278532f2..365df7919a 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -1910,6 +1910,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB } private void onMenuRulesFolder(Bundle args) { + args.putInt("icon", R.drawable.twotone_filter_alt_24); args.putString("title", getString(R.string.title_edit_rules)); args.putLongArray("disabled", new long[0]); diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java index 1740485be8..22d625d57b 100644 --- a/app/src/main/java/eu/faircode/email/AdapterMessage.java +++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java @@ -5435,6 +5435,7 @@ public class AdapterMessage extends RecyclerView.Adapter { private void onActionMove() { Bundle args = new Bundle(); + args.putInt("icon", R.drawable.twotone_drive_file_move_24); args.putString("title", context.getString(R.string.title_move_to_folder)); args.putLong("account", rule.account); args.putLongArray("disabled", new long[]{rule.folder}); diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java index 0fee046350..3e373cf780 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java @@ -65,6 +65,7 @@ public class FragmentDialogFolder extends FragmentDialogBase { @Override public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { Bundle aargs = getArguments(); + final int icon = aargs.getInt("icon", R.drawable.twotone_folder_open_24); final String title = aargs.getString("title"); final long account = aargs.getLong("account"); final long[] disabled = aargs.getLongArray("disabled"); @@ -336,7 +337,7 @@ public class FragmentDialogFolder extends FragmentDialogBase { }.execute(this, args, "folder:select"); return new AlertDialog.Builder(context) - .setIcon(R.drawable.twotone_folder_open_24) + .setIcon(icon) .setTitle(title) .setView(dview) .setNegativeButton(android.R.string.cancel, null) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 5927ec4992..c64fdb0d52 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -1582,6 +1582,7 @@ public class FragmentMessages extends FragmentBase private void searchAccount(long account) { Bundle aargs = new Bundle(); + aargs.putInt("icon", R.drawable.twotone_search_24); aargs.putString("title", getString(R.string.title_search_in)); aargs.putLong("account", account); aargs.putLongArray("disabled", new long[]{}); @@ -1925,6 +1926,7 @@ public class FragmentMessages extends FragmentBase triggered = true; Bundle args = new Bundle(); + args.putInt("icon", R.drawable.twotone_drive_file_move_24); args.putString("title", getString(R.string.title_move_to_folder)); args.putLong("account", account); args.putString("thread", thread); @@ -2982,6 +2984,7 @@ public class FragmentMessages extends FragmentBase private void onSwipeMove(final @NonNull TupleMessageEx message) { Bundle args = new Bundle(); + args.putInt("icon", R.drawable.twotone_drive_file_move_24); args.putString("title", getString(R.string.title_move_to_folder)); args.putLong("account", message.account); args.putLongArray("disabled", new long[]{message.folder}); @@ -4140,6 +4143,7 @@ public class FragmentMessages extends FragmentBase private void onActionMoveSelectionAccount(long account, boolean copy, List disabled) { Bundle args = new Bundle(); + args.putInt("icon", copy ? R.drawable.twotone_file_copy_24 : R.drawable.twotone_drive_file_move_24); args.putString("title", getString(copy ? R.string.title_copy_to : R.string.title_move_to_folder)); args.putLong("account", account); args.putBoolean("copy", copy);