Revert "Ask save changes answer"

This reverts commit 49e50c7d33.

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

@@ -25,10 +25,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.Editable;
 import android.text.Spanned;
 import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -36,7 +34,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -57,16 +54,15 @@ public class FragmentAnswer extends FragmentBase {
     private CheckBox cbHide;
     private EditTextCompose etText;
     private BottomNavigationView style_bar;
+    private BottomNavigationView bottom_navigation;
     private ContentLoadingProgressBar pbWait;
     private Group grpReady;
 
     private long id = -1;
     private long copy = -1;
-    private boolean dirty = false;
 
     private static final int REQUEST_LINK = 1;
-    private final static int REQUEST_SAVE = 2;
+    private final static int REQUEST_DELETE = 2;
-    private final static int REQUEST_DELETE = 3;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -96,6 +92,7 @@ public class FragmentAnswer extends FragmentBase {
         etText = view.findViewById(R.id.etText);
 
         style_bar = view.findViewById(R.id.style_bar);
+        bottom_navigation = view.findViewById(R.id.bottom_navigation);
 
         pbWait = view.findViewById(R.id.pbWait);
         grpReady = view.findViewById(R.id.grpReady);
@@ -114,25 +111,19 @@ public class FragmentAnswer extends FragmentBase {
             }
         });
 
-        addKeyPressedListener(new ActivityBase.IKeyPressedListener() {
+        bottom_navigation.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
             @Override
-            public boolean onKeyPressed(int keyCode) {
+            public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
+                switch (menuItem.getItemId()) {
+                    case R.id.action_delete:
+                        onActionDelete();
+                        return true;
+                    case R.id.action_save:
+                        onActionSave();
+                        return true;
+                    default:
                         return false;
                 }
-
-            @Override
-            public boolean onBackPressed() {
-                if (dirty) {
-                    Bundle aargs = new Bundle();
-                    aargs.putString("question", getString(R.string.title_ask_save));
-
-                    FragmentDialogAsk fragment = new FragmentDialogAsk();
-                    fragment.setArguments(aargs);
-                    fragment.setTargetFragment(FragmentAnswer.this, REQUEST_SAVE);
-                    fragment.show(getParentFragmentManager(), "account:save");
-                    return true;
-                } else
-                    return false;
             }
         });
 
@@ -164,35 +155,7 @@ public class FragmentAnswer extends FragmentBase {
                 cbFavorite.setChecked(answer == null ? false : answer.favorite);
                 cbHide.setChecked(answer == null ? false : answer.hide);
                 etText.setText(answer == null ? null : HtmlHelper.fromHtml(answer.text));
-
+                bottom_navigation.findViewById(R.id.action_delete).setVisibility(answer == null ? View.GONE : View.VISIBLE);
-                TextWatcher watcher = new TextWatcher() {
-                    @Override
-                    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                        // Do nothing
-                    }
-
-                    @Override
-                    public void onTextChanged(CharSequence s, int start, int before, int count) {
-                        dirty = true;
-                    }
-
-                    @Override
-                    public void afterTextChanged(Editable s) {
-                        // Do nothing
-                    }
-                };
-
-                CompoundButton.OnCheckedChangeListener checker = new CompoundButton.OnCheckedChangeListener() {
-                    @Override
-                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                        dirty = true;
-                    }
-                };
-
-                etName.addTextChangedListener(watcher);
-                cbFavorite.setOnCheckedChangeListener(checker);
-                cbHide.setOnCheckedChangeListener(checker);
-                etText.addTextChangedListener(watcher);
 
                 pbWait.setVisibility(View.GONE);
                 grpReady.setVisibility(View.VISIBLE);
@@ -207,25 +170,16 @@ public class FragmentAnswer extends FragmentBase {
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_operations, menu);
+        inflater.inflate(R.menu.menu_answer, menu);
         super.onCreateOptionsMenu(menu, inflater);
     }
 
-    @Override
-    public void onPrepareOptionsMenu(@NonNull Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-        menu.findItem(R.id.menu_delete).setVisible(id > 0);
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.menu_help:
                 onMenuHelp();
                 return true;
-            case R.id.menu_delete:
-                onMenuDelete();
-                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -235,7 +189,7 @@ public class FragmentAnswer extends FragmentBase {
         new FragmentInfo().show(getParentFragmentManager(), "answer:info");
     }
 
-    private void onMenuDelete() {
+    private void onActionDelete() {
         Bundle args = new Bundle();
         args.putString("question", getString(R.string.title_ask_delete_answer));
 
@@ -245,38 +199,7 @@ public class FragmentAnswer extends FragmentBase {
         fragment.show(getParentFragmentManager(), "answer:delete");
     }
 
-    @Override
+    private void onActionSave() {
-    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        try {
-            switch (requestCode) {
-                case REQUEST_LINK:
-                    if (resultCode == RESULT_OK && data != null)
-                        onLinkSelected(data.getBundleExtra("args"));
-                    break;
-                case REQUEST_SAVE:
-                    if (resultCode == RESULT_OK)
-                        onSave();
-                    else
-                        finish();
-                    break;
-                case REQUEST_DELETE:
-                    if (resultCode == RESULT_OK)
-                        onDelete();
-                    break;
-            }
-        } catch (Throwable ex) {
-            Log.e(ex);
-        }
-    }
-
-    private void onLinkSelected(Bundle args) {
-        String link = args.getString("link");
-        StyleHelper.apply(R.id.menu_link, etText, link);
-    }
-
-    private void onSave() {
         etText.clearComposingText();
 
         Bundle args = new Bundle();
@@ -343,6 +266,31 @@ public class FragmentAnswer extends FragmentBase {
         }.execute(this, args, "answer:save");
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        try {
+            switch (requestCode) {
+                case REQUEST_LINK:
+                    if (resultCode == RESULT_OK && data != null)
+                        onLinkSelected(data.getBundleExtra("args"));
+                    break;
+                case REQUEST_DELETE:
+                    if (resultCode == RESULT_OK)
+                        onDelete();
+                    break;
+            }
+        } catch (Throwable ex) {
+            Log.e(ex);
+        }
+    }
+
+    private void onLinkSelected(Bundle args) {
+        String link = args.getString("link");
+        StyleHelper.apply(R.id.menu_link, etText, link);
+    }
+
     private void onDelete() {
         Bundle args = new Bundle();
         args.putLong("id", id);

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

@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="eu.faircode.email.ActivityView">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="eu.faircode.email.BehaviorBottomPadding">
+
         <EditText
             android:id="@+id/etName"
             android:layout_width="0dp"
@@ -76,11 +81,23 @@
             app:itemIconTint="@color/action_foreground"
             app:itemTextColor="@color/action_foreground"
             app:labelVisibilityMode="unlabeled"
+            app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:menu="@menu/action_answer_style" />
+
+        <com.google.android.material.bottomnavigation.BottomNavigationView
+            android:id="@+id/bottom_navigation"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:background="?attr/colorPrimary"
+            app:itemIconTint="@color/action_foreground"
+            app:itemTextColor="@color/action_foreground"
+            app:labelVisibilityMode="labeled"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/etText"
+            app:menu="@menu/action_answer" />
-        app:menu="@menu/action_answer_style" />
 
         <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbWait"
@@ -97,5 +114,6 @@
             android:id="@+id/grpReady"
             android:layout_width="0dp"
             android:layout_height="0dp"
-        app:constraint_referenced_ids="etName,cbFavorite,cbHide,vSeparator,etText" />
+            app:constraint_referenced_ids="etName,vSeparator,etText,bottom_navigation" />
     </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/action_delete"
+        android:icon="@drawable/baseline_delete_24"
+        android:title="@string/title_delete" />
+
+    <item
+        android:id="@+id/action_save"
+        android:icon="@drawable/baseline_save_alt_24"
+        android:title="@string/title_save" />
+</menu>

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

@@ -6,9 +6,4 @@
         android:icon="@drawable/baseline_help_24"
         android:title=""
         app:showAsAction="always" />
-
-    <item
-        android:id="@+id/menu_delete"
-        android:title="@string/title_delete"
-        app:showAsAction="never" />
 </menu>