From 662497551427ba409a65119212e1db17a91c8047 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 26 Oct 2021 12:57:23 +0200
Subject: [PATCH] Dialog icons

---
 app/src/main/java/eu/faircode/email/ActivityEML.java           | 1 +
 app/src/main/java/eu/faircode/email/ActivitySignature.java     | 1 +
 app/src/main/java/eu/faircode/email/ActivityView.java          | 1 +
 app/src/main/java/eu/faircode/email/AdapterFolder.java         | 2 +-
 app/src/main/java/eu/faircode/email/AdapterMessage.java        | 2 ++
 app/src/main/java/eu/faircode/email/FragmentBase.java          | 1 +
 app/src/main/java/eu/faircode/email/FragmentContacts.java      | 1 +
 .../main/java/eu/faircode/email/FragmentDialogDuration.java    | 1 +
 app/src/main/java/eu/faircode/email/FragmentDialogFolder.java  | 1 +
 app/src/main/java/eu/faircode/email/FragmentDialogJunk.java    | 1 +
 .../java/eu/faircode/email/FragmentDialogSelectAccount.java    | 1 +
 app/src/main/java/eu/faircode/email/FragmentLogs.java          | 1 +
 app/src/main/java/eu/faircode/email/FragmentMessages.java      | 1 +
 .../main/java/eu/faircode/email/FragmentOptionsEncryption.java | 1 +
 app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java   | 3 +++
 app/src/main/java/eu/faircode/email/FragmentRule.java          | 1 +
 app/src/main/java/eu/faircode/email/FragmentSetup.java         | 3 +++
 17 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java
index 999e5b1092..499e358525 100644
--- a/app/src/main/java/eu/faircode/email/ActivityEML.java
+++ b/app/src/main/java/eu/faircode/email/ActivityEML.java
@@ -571,6 +571,7 @@ public class ActivityEML extends ActivityBase {
                         adapter.add(account);
 
                 new AlertDialog.Builder(ActivityEML.this)
+                        .setIcon(R.drawable.twotone_save_alt_24)
                         .setTitle(R.string.title_save_eml)
                         .setAdapter(adapter, new DialogInterface.OnClickListener() {
                             @Override
diff --git a/app/src/main/java/eu/faircode/email/ActivitySignature.java b/app/src/main/java/eu/faircode/email/ActivitySignature.java
index df497e7e50..267fdf61d7 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySignature.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySignature.java
@@ -154,6 +154,7 @@ public class ActivitySignature extends ActivityBase {
 
                 if (dirty)
                     new AlertDialog.Builder(ActivitySignature.this)
+                            .setIcon(R.drawable.twotone_save_alt_24)
                             .setTitle(R.string.title_ask_save)
                             .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                                 @Override
diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 97e016209e..de37c664e0 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -1965,6 +1965,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             return new AlertDialog.Builder(getContext())
+                    .setIcon(R.drawable.twotone_help_24)
                     .setMessage(R.string.title_issue)
                     .setPositiveButton(R.string.title_yes, new DialogInterface.OnClickListener() {
                         @Override
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 855c538b2e..9e1474dbac 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -953,7 +953,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
                 private void onActionExpunge() {
                     new AlertDialog.Builder(view.getContext())
-                            .setIcon(R.drawable.twotone_help_24)
+                            .setIcon(R.drawable.twotone_warning_24)
                             .setTitle(R.string.title_expunge)
                             .setMessage(R.string.title_expunge_remark)
                             .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 74b3c321fe..868f618935 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -7170,6 +7170,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             });
 
             return new AlertDialog.Builder(getContext())
+                    .setIcon(R.drawable.twotone_label_important_24)
                     .setTitle(R.string.title_manage_keywords)
                     .setView(dview)
                     .setPositiveButton(android.R.string.ok, null)
@@ -7274,6 +7275,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     checked[i] = true;
 
             return new AlertDialog.Builder(getContext())
+                    .setIcon(R.drawable.twotone_label_24)
                     .setTitle(R.string.title_manage_labels)
                     .setMultiChoiceItems(folders, checked, new DialogInterface.OnMultiChoiceClickListener() {
                         @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index 8ac26e1e93..834553fe8f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -632,6 +632,7 @@ public class FragmentBase extends Fragment {
     @RequiresApi(api = Build.VERSION_CODES.Q)
     private void handle(RecoverableSecurityException ex) {
         new AlertDialog.Builder(getContext())
+                .setIcon(R.drawable.twotone_help_24)
                 .setMessage(ex.getMessage())
                 .setPositiveButton(ex.getUserAction().getTitle(), new DialogInterface.OnClickListener() {
                     @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentContacts.java b/app/src/main/java/eu/faircode/email/FragmentContacts.java
index e37ef834d2..dd61625b84 100644
--- a/app/src/main/java/eu/faircode/email/FragmentContacts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentContacts.java
@@ -457,6 +457,7 @@ public class FragmentContacts extends FragmentBase {
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             return new AlertDialog.Builder(getContext())
+                    .setIcon(R.drawable.twotone_warning_24)
                     .setMessage(getString(R.string.title_delete_contacts))
                     .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                         @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
index 0d69ca2171..4f8d9aa3b6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
@@ -101,6 +101,7 @@ public class FragmentDialogDuration extends FragmentDialogBase {
         }
 
         Dialog dialog = new AlertDialog.Builder(context)
+                .setIcon(R.drawable.twotone_timelapse_24)
                 .setTitle(title)
                 .setView(dview)
                 .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
index bcff4cde06..7bba97b549 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
@@ -332,6 +332,7 @@ public class FragmentDialogFolder extends FragmentDialogBase {
         }.execute(this, args, "folder:select");
 
         return new AlertDialog.Builder(context)
+                .setIcon(R.drawable.twotone_folder_24)
                 .setTitle(title)
                 .setView(dview)
                 .setNegativeButton(android.R.string.cancel, null)
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java b/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
index be2d584099..3359d10872 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
@@ -206,6 +206,7 @@ public class FragmentDialogJunk extends FragmentDialogBase {
             @Override
             public void onClick(View v) {
                 new AlertDialog.Builder(v.getContext())
+                        .setIcon(R.drawable.twotone_warning_24)
                         .setTitle(R.string.title_junk_clear)
                         .setMessage(R.string.title_junk_clear_hint)
                         .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogSelectAccount.java b/app/src/main/java/eu/faircode/email/FragmentDialogSelectAccount.java
index 03992c6d1b..19ac1117cb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogSelectAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogSelectAccount.java
@@ -59,6 +59,7 @@ public class FragmentDialogSelectAccount extends FragmentDialogBase {
         }.execute(this, new Bundle(), "messages:accounts");
 
         return new AlertDialog.Builder(getContext())
+                .setIcon(R.drawable.twotone_account_circle_24)
                 .setTitle(R.string.title_list_accounts)
                 .setAdapter(adapter, new DialogInterface.OnClickListener() {
                     @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentLogs.java b/app/src/main/java/eu/faircode/email/FragmentLogs.java
index e7e2236855..9185b2824f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentLogs.java
+++ b/app/src/main/java/eu/faircode/email/FragmentLogs.java
@@ -200,6 +200,7 @@ public class FragmentLogs extends FragmentBase {
         }
 
         new AlertDialog.Builder(getContext())
+                .setIcon(R.drawable.twotone_visibility_24)
                 .setTitle(R.string.title_unhide)
                 .setMultiChoiceItems(titles, states, new DialogInterface.OnMultiChoiceClickListener() {
                     @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 6e7317be61..6a9d6f7f1f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -7631,6 +7631,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                         }
 
                                         new AlertDialog.Builder(getContext())
+                                                .setIcon(R.drawable.twotone_info_24)
                                                 .setMessage(sb.toString())
                                                 .show();
                                     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
index be30785528..8bea0f401c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
@@ -362,6 +362,7 @@ public class FragmentOptionsEncryption extends FragmentBase implements SharedPre
                     @Override
                     protected void onExecuted(Bundle args, List<String> issuers) {
                         new AlertDialog.Builder(getContext())
+                                .setIcon(R.drawable.twotone_info_24)
                                 .setTitle(R.string.title_advanced_ca)
                                 .setMessage(TextUtils.join("\r\n", issuers))
                                 .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index b6bac8b9e0..d4eab9e9e2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -926,6 +926,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
                         for (String key : charsets.keySet())
                             sb.append(charsets.get(key).displayName()).append("\r\n");
                         new AlertDialog.Builder(getContext())
+                                .setIcon(R.drawable.twotone_info_24)
                                 .setTitle(R.string.title_advanced_charsets)
                                 .setMessage(sb.toString())
                                 .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@@ -984,6 +985,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
                 }
 
                 new AlertDialog.Builder(getContext())
+                        .setIcon(R.drawable.twotone_info_24)
                         .setTitle(R.string.title_advanced_ciphers)
                         .setMessage(sb.toString())
                         .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@@ -1069,6 +1071,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
                                     .append("\r\n");
 
                         new AlertDialog.Builder(context)
+                                .setIcon(R.drawable.twotone_info_24)
                                 .setTitle(title)
                                 .setMessage(sb.toString())
                                 .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index f77b97f1eb..b1a4269d55 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -1533,6 +1533,7 @@ public class FragmentRule extends FragmentBase {
             }.execute(this, args, "rule:check");
 
             return new AlertDialog.Builder(getContext())
+                    .setIcon(R.drawable.baseline_mail_outline_24)
                     .setTitle(R.string.title_rule_matched)
                     .setView(dview)
                     .setNegativeButton(android.R.string.cancel, null)
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 2431599b49..a8d05a2584 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -278,6 +278,7 @@ public class FragmentSetup extends FragmentBase {
                                 lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_GMAIL));
                             else
                                 new AlertDialog.Builder(getContext())
+                                        .setIcon(R.drawable.twotone_info_24)
                                         .setTitle(item.getTitle())
                                         .setMessage(R.string.title_setup_gmail_support)
                                         .setNeutralButton(R.string.title_info, new DialogInterface.OnClickListener() {
@@ -323,6 +324,7 @@ public class FragmentSetup extends FragmentBase {
                                 lbm.sendBroadcast(item.getIntent());
                             else
                                 new AlertDialog.Builder(getContext())
+                                        .setIcon(R.drawable.twotone_info_24)
                                         .setTitle(item.getTitle())
                                         .setMessage(R.string.title_setup_oauth_permission)
                                         .setNeutralButton(R.string.title_info, new DialogInterface.OnClickListener() {
@@ -776,6 +778,7 @@ public class FragmentSetup extends FragmentBase {
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             return new AlertDialog.Builder(getContext())
+                    .setIcon(R.drawable.twotone_info_24)
                     .setMessage(R.string.title_setup_doze_instructions)
                     .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                         @Override