From 3800c9823909c41053e98a1c3015c0d1f4870673 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 25 Oct 2020 14:55:58 +0100
Subject: [PATCH] Ask with warning

---
 .../java/eu/faircode/email/AdapterFolder.java |  2 ++
 .../eu/faircode/email/AdapterMessage.java     |  2 ++
 .../eu/faircode/email/FragmentAccount.java    |  1 +
 .../eu/faircode/email/FragmentAnswer.java     |  1 +
 .../eu/faircode/email/FragmentCompose.java    |  1 +
 .../eu/faircode/email/FragmentDialogAsk.java  | 25 +++++++++++++++----
 .../eu/faircode/email/FragmentFolder.java     |  1 +
 .../eu/faircode/email/FragmentIdentity.java   |  1 +
 .../eu/faircode/email/FragmentMessages.java   |  4 +++
 .../java/eu/faircode/email/FragmentPop.java   |  1 +
 .../java/eu/faircode/email/FragmentRule.java  |  1 +
 11 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 033933b876..152373b356 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -732,6 +732,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                         aargs.putString("question", context.getString(R.string.title_empty_spam_ask));
                     else
                         throw new IllegalArgumentException("Invalid folder type=" + type);
+                    aargs.putBoolean("warning", true);
                     aargs.putString("remark", context.getString(R.string.title_empty_all));
                     aargs.putLong("folder", folder.id);
                     aargs.putString("type", type);
@@ -800,6 +801,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                     Bundle aargs = new Bundle();
                     aargs.putLong("id", folder.id);
                     aargs.putString("question", context.getString(R.string.title_folder_delete));
+                    aargs.putBoolean("warning", true);
 
                     FragmentDialogAsk ask = new FragmentDialogAsk();
                     ask.setArguments(aargs);
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 0d3bb36507..071db76c2d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3833,6 +3833,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             Bundle aargs = new Bundle();
             aargs.putString("question", context.getString(R.string.title_ask_delete));
             aargs.putLong("id", message.id);
+            aargs.putBoolean("warning", true);
 
             FragmentDialogAsk ask = new FragmentDialogAsk();
             ask.setArguments(aargs);
@@ -4402,6 +4403,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             Bundle aargs = new Bundle();
             aargs.putString("question", context.getString(R.string.title_ask_delete));
             aargs.putLong("id", message.id);
+            aargs.putBoolean("warning", true);
 
             FragmentDialogAsk ask = new FragmentDialogAsk();
             ask.setArguments(aargs);
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index d7a37ca4e4..53aa2f6f1c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -1635,6 +1635,7 @@ public class FragmentAccount extends FragmentBase {
     private void onMenuDelete() {
         Bundle aargs = new Bundle();
         aargs.putString("question", getString(R.string.title_account_delete));
+        aargs.putBoolean("warning", true);
 
         FragmentDialogAsk fragment = new FragmentDialogAsk();
         fragment.setArguments(aargs);
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
index 8d67031296..37a8cd9fe6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
@@ -239,6 +239,7 @@ public class FragmentAnswer extends FragmentBase {
     private void onActionDelete() {
         Bundle args = new Bundle();
         args.putString("question", getString(R.string.title_ask_delete_answer));
+        args.putBoolean("warning", true);
 
         FragmentDialogAsk fragment = new FragmentDialogAsk();
         fragment.setArguments(args);
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 16fc27d0cc..16c6e1c0e5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1826,6 +1826,7 @@ public class FragmentCompose extends FragmentBase {
         else {
             Bundle args = new Bundle();
             args.putString("question", getString(R.string.title_ask_discard));
+            args.putBoolean("warning", true);
 
             FragmentDialogAsk fragment = new FragmentDialogAsk();
             fragment.setArguments(args);
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogAsk.java b/app/src/main/java/eu/faircode/email/FragmentDialogAsk.java
index 732e4009cc..9f1428a087 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogAsk.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogAsk.java
@@ -21,8 +21,10 @@ package eu.faircode.email;
 
 import android.app.Activity;
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -39,11 +41,16 @@ public class FragmentDialogAsk extends FragmentDialogBase {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-        String question = getArguments().getString("question");
-        String remark = getArguments().getString("remark");
-        String notagain = getArguments().getString("notagain");
+        Bundle args = getArguments();
+        String question = args.getString("question");
+        String remark = args.getString("remark");
+        String notagain = args.getString("notagain");
+        boolean warning = args.getBoolean("warning");
 
-        View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_ask_again, null);
+        final Context context = getContext();
+        final int colorError = Helper.resolveColor(context, R.attr.colorError);
+
+        View dview = LayoutInflater.from(context).inflate(R.layout.dialog_ask_again, null);
         TextView tvMessage = dview.findViewById(R.id.tvMessage);
         TextView tvRemark = dview.findViewById(R.id.tvRemark);
         CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
@@ -53,11 +60,19 @@ public class FragmentDialogAsk extends FragmentDialogBase {
         tvRemark.setVisibility(remark == null ? View.GONE : View.VISIBLE);
         cbNotAgain.setVisibility(notagain == null ? View.GONE : View.VISIBLE);
 
+        if (warning) {
+            Drawable w = context.getResources().getDrawable(R.drawable.twotone_warning_24, context.getTheme());
+            w.setBounds(0, 0, w.getIntrinsicWidth(), w.getIntrinsicHeight());
+            w.setTint(colorError);
+            tvMessage.setCompoundDrawablesRelative(w, null, null, null);
+            tvMessage.setCompoundDrawablePadding(Helper.dp2pixels(context, 12));
+        }
+
         if (notagain != null)
             cbNotAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 @Override
                 public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
                     prefs.edit().putBoolean(notagain, isChecked).apply();
                 }
             });
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index c91937b981..fe8e2e3b45 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -385,6 +385,7 @@ public class FragmentFolder extends FragmentBase {
     private void onMenuDelete() {
         Bundle aargs = new Bundle();
         aargs.putString("question", getString(R.string.title_folder_delete));
+        aargs.putBoolean("warning", true);
 
         FragmentDialogAsk ask = new FragmentDialogAsk();
         ask.setArguments(aargs);
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index e72b30d318..4fda477427 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -1295,6 +1295,7 @@ public class FragmentIdentity extends FragmentBase {
     private void onMenuDelete() {
         Bundle aargs = new Bundle();
         aargs.putString("question", getString(R.string.title_identity_delete));
+        aargs.putBoolean("warning", true);
 
         FragmentDialogAsk fragment = new FragmentDialogAsk();
         fragment.setArguments(aargs);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 6e292f0786..8665704bab 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2195,6 +2195,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             Bundle args = new Bundle();
             args.putString("question", getString(R.string.title_ask_delete));
             args.putLong("id", message.id);
+            args.putBoolean("warning", true);
 
             FragmentDialogAsk ask = new FragmentDialogAsk();
             ask.setArguments(args);
@@ -3097,6 +3098,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 aargs.putString("question", getResources()
                         .getQuantityString(R.plurals.title_deleting_messages, ids.size(), ids.size()));
                 aargs.putLongArray("ids", Helper.toLongArray(ids));
+                aargs.putBoolean("warning", true);
 
                 FragmentDialogAsk ask = new FragmentDialogAsk();
                 ask.setArguments(aargs);
@@ -3373,6 +3375,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 aargs.putString("question", getResources()
                         .getQuantityString(R.plurals.title_deleting_messages, ids.size(), ids.size()));
                 aargs.putLongArray("ids", Helper.toLongArray(ids));
+                aargs.putBoolean("warning", true);
 
                 FragmentDialogAsk ask = new FragmentDialogAsk();
                 ask.setArguments(aargs);
@@ -4132,6 +4135,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     account < 0 ? R.string.title_empty_spam_all_ask : R.string.title_empty_spam_ask));
         else
             throw new IllegalArgumentException("Invalid folder type=" + type);
+        aargs.putBoolean("warning", true);
         aargs.putString("remark", getString(R.string.title_empty_all));
         aargs.putLong("account", account);
         aargs.putString("type", type);
diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java
index 4e19b23912..506b1162f8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentPop.java
+++ b/app/src/main/java/eu/faircode/email/FragmentPop.java
@@ -701,6 +701,7 @@ public class FragmentPop extends FragmentBase {
     private void onMenuDelete() {
         Bundle aargs = new Bundle();
         aargs.putString("question", getString(R.string.title_account_delete));
+        aargs.putBoolean("warning", true);
 
         FragmentDialogAsk fragment = new FragmentDialogAsk();
         fragment.setArguments(aargs);
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index db20f371e4..2462c274fc 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -947,6 +947,7 @@ public class FragmentRule extends FragmentBase {
     private void onActionDelete() {
         Bundle args = new Bundle();
         args.putString("question", getString(R.string.title_ask_delete_rule));
+        args.putBoolean("warning", true);
 
         FragmentDialogAsk fragment = new FragmentDialogAsk();
         fragment.setArguments(args);