Replaced insert template dialog by menu

app/src/main/java/eu/faircode/email/FragmentCompose.java

@@ -74,11 +74,11 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MotionEvent;
+import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
@@ -285,10 +285,9 @@ public class FragmentCompose extends FragmentBase {
     private static final int REQUEST_RECORD_AUDIO = 9;
     private static final int REQUEST_OPENPGP = 10;
     private static final int REQUEST_CONTACT_GROUP = 11;
-    private static final int REQUEST_ANSWER = 12;
+    private static final int REQUEST_LINK = 12;
-    private static final int REQUEST_LINK = 13;
+    private static final int REQUEST_DISCARD = 13;
-    private static final int REQUEST_DISCARD = 14;
+    private static final int REQUEST_SEND = 14;
-    private static final int REQUEST_SEND = 15;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -1569,15 +1568,81 @@ public class FragmentCompose extends FragmentBase {
     }
 
     private void onMenuAnswer() {
-        if (!ActivityBilling.isPro(getContext())) {
+        new SimpleTask<List<EntityAnswer>>() {
-            startActivity(new Intent(getContext(), ActivityBilling.class));
+            @Override
-            return;
+            protected List<EntityAnswer> onExecute(Context context, Bundle args) {
+                return DB.getInstance(context).answer().getAnswersByFavorite(false);
             }
 
-        FragmentDialogAnswer fragment = new FragmentDialogAnswer();
+            @Override
-        fragment.setArguments(new Bundle());
+            protected void onExecuted(Bundle args, final List<EntityAnswer> answers) {
-        fragment.setTargetFragment(this, REQUEST_ANSWER);
+                View vwAnchorMenu = view.findViewById(R.id.vwAnchorMenu);
-        fragment.show(getParentFragmentManager(), "compose:answer");
+                PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(getContext(), getViewLifecycleOwner(), vwAnchorMenu);
+                Menu main = popupMenu.getMenu();
+
+                Map<String, SubMenu> map = new HashMap<>();
+
+                int order = 0;
+                for (EntityAnswer answer : answers) {
+                    order++;
+                    if (answer.group == null)
+                        main.add(Menu.NONE, order, order++, answer.toString())
+                                .setIntent(new Intent().putExtra("id", answer.id));
+                    else {
+                        if (!map.containsKey(answer.group))
+                            map.put(answer.group, main.addSubMenu(Menu.NONE, order, order++, answer.group));
+                        SubMenu smenu = map.get(answer.group);
+                        smenu.add(Menu.NONE, smenu.size(), smenu.size() + 1, answer.toString())
+                                .setIntent(new Intent().putExtra("id", answer.id));
+                    }
+                }
+
+                popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                    @Override
+                    public boolean onMenuItemClick(MenuItem target) {
+                        if (!ActivityBilling.isPro(getContext())) {
+                            startActivity(new Intent(getContext(), ActivityBilling.class));
+                            return true;
+                        }
+
+                        long id = target.getIntent().getLongExtra("id", -1);
+                        for (EntityAnswer answer : answers)
+                            if (answer.id.equals(id)) {
+                                if (etSubject.getText().length() == 0)
+                                    etSubject.setText(answer.name);
+
+                                InternetAddress[] to = null;
+                                try {
+                                    to = InternetAddress.parseHeader(etTo.getText().toString(), false);
+                                } catch (AddressException ignored) {
+                                }
+
+                                String html = EntityAnswer.replacePlaceholders(answer.text, to);
+
+                                Spanned spanned = HtmlHelper.fromHtml(html, false, new Html.ImageGetter() {
+                                    @Override
+                                    public Drawable getDrawable(String source) {
+                                        return ImageHelper.decodeImage(getContext(), working, source, true, zoom, 1.0f, etBody);
+                                    }
+                                }, null, getContext());
+
+                                etBody.getText().insert(etBody.getSelectionStart(), spanned);
+
+                                return true;
+                            }
+
+                        return false;
+                    }
+                });
+
+                popupMenu.show();
+            }
+
+            @Override
+            protected void onException(Bundle args, Throwable ex) {
+                Log.unexpectedError(getParentFragmentManager(), ex);
+            }
+        }.execute(getContext(), getViewLifecycleOwner(), new Bundle(), "compose:answer");
     }
 
     private boolean onActionStyle(int action) {
@@ -1887,10 +1952,6 @@ public class FragmentCompose extends FragmentBase {
                     if (resultCode == RESULT_OK && data != null)
                         onContactGroupSelected(data.getBundleExtra("args"));
                     break;
-                case REQUEST_ANSWER:
-                    if (resultCode == RESULT_OK && data != null)
-                        onAnswerSelected(data.getBundleExtra("args"));
-                    break;
                 case REQUEST_LINK:
                     if (resultCode == RESULT_OK && data != null)
                         onLinkSelected(data.getBundleExtra("args"));
@@ -2885,31 +2946,6 @@ public class FragmentCompose extends FragmentBase {
         }.execute(this, args, "compose:picked");
     }
 
-    private void onAnswerSelected(Bundle args) {
-        String name = args.getString("name");
-        String answer = args.getString("answer");
-
-        if (etSubject.getText().length() == 0)
-            etSubject.setText(name);
-
-        InternetAddress[] to = null;
-        try {
-            to = InternetAddress.parseHeader(etTo.getText().toString(), false);
-        } catch (AddressException ignored) {
-        }
-
-        String html = EntityAnswer.replacePlaceholders(answer, to);
-
-        Spanned spanned = HtmlHelper.fromHtml(html, false, new Html.ImageGetter() {
-            @Override
-            public Drawable getDrawable(String source) {
-                return ImageHelper.decodeImage(getContext(), working, source, true, zoom, 1.0f, etBody);
-            }
-        }, null, getContext());
-
-        etBody.getText().insert(etBody.getSelectionStart(), spanned);
-    }
-
     private void onLinkSelected(Bundle args) {
         String link = args.getString("link");
         int start = args.getInt("start");
@@ -5155,49 +5191,6 @@ public class FragmentCompose extends FragmentBase {
         }
     }
 
-    public static class FragmentDialogAnswer extends FragmentDialogBase {
-        @NonNull
-        @Override
-        public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-            final ArrayAdapter<EntityAnswer> adapter =
-                    new ArrayAdapter<>(getContext(), R.layout.spinner_item1, android.R.id.text1);
-
-            // TODO: spinner
-            new SimpleTask<List<EntityAnswer>>() {
-                @Override
-                protected List<EntityAnswer> onExecute(Context context, Bundle args) {
-                    DB db = DB.getInstance(getContext());
-                    return db.answer().getAnswers(false);
-                }
-
-                @Override
-                protected void onExecuted(Bundle args, List<EntityAnswer> answers) {
-                    adapter.addAll(answers);
-                }
-
-                @Override
-                protected void onException(Bundle args, Throwable ex) {
-                    Log.unexpectedError(getParentFragmentManager(), ex);
-                }
-            }.execute(this, new Bundle(), "compose:answer");
-
-            return new AlertDialog.Builder(getContext())
-                    .setTitle(R.string.title_insert_template)
-                    .setAdapter(adapter, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            EntityAnswer answer = adapter.getItem(which);
-                            getArguments().putString("name", answer.name);
-                            getArguments().putString("answer", answer.text);
-
-                            sendResult(RESULT_OK);
-                        }
-                    })
-                    .setNegativeButton(android.R.string.cancel, null)
-                    .create();
-        }
-    }
-
     public static class FragmentDialogAddImage extends FragmentDialogBase {
         @NonNull
         @Override

app/src/main/res/layout/fragment_compose.xml

@@ -11,6 +11,13 @@
         android:layout_height="match_parent"
         app:layout_behavior="eu.faircode.email.BehaviorBottomPadding">
 
+        <View
+            android:id="@+id/vwAnchorMenu"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <eu.faircode.email.ScrollViewEx
             android:layout_width="match_parent"
             android:layout_height="0dp"

app/src/main/res/menu/menu_compose.xml

@@ -50,12 +50,16 @@
     <item
         android:id="@+id/menu_contact_group"
         android:title="@string/title_insert_contact_group"
-        app:showAsAction="never" />
+        app:showAsAction="never">
+        <menu />
+    </item>
 
     <item
         android:id="@+id/menu_answer"
         android:title="@string/title_insert_template"
-        app:showAsAction="never" />
+        app:showAsAction="never">
+        <menu />
+    </item>
 
     <item
         android:id="@+id/menu_clear"