From 1be9d6a0210b0e616712eb4bddb8bf8f9444a465 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 4 Aug 2018 20:00:11 +0000
Subject: [PATCH] Made move action a main action

---
 .../java/eu/faircode/email/FragmentMessage.java    | 14 +++++++-------
 app/src/main/res/menu/action_view_bottom.xml       |  6 ++++++
 app/src/main/res/menu/action_view_top.xml          |  6 ------
 app/src/main/res/values/strings.xml                |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java
index 8a23721c30..711c054523 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@@ -157,9 +157,6 @@ public class FragmentMessage extends Fragment {
                     case R.id.action_thread:
                         onActionThread(id);
                         return true;
-                    case R.id.action_move:
-                        onActionMove(id);
-                        return true;
                     case R.id.action_forward:
                         onActionForward(id);
                         return true;
@@ -181,6 +178,9 @@ public class FragmentMessage extends Fragment {
                     case R.id.action_spam:
                         onActionSpam(id);
                         return true;
+                    case R.id.action_move:
+                        onActionMove(id);
+                        return true;
                     case R.id.action_archive:
                         onActionArchive(id);
                         return true;
@@ -324,10 +324,6 @@ public class FragmentMessage extends Fragment {
         fragmentTransaction.commit();
     }
 
-    private void onActionMove(final long id) {
-        Toast.makeText(getContext(), "Not implemented yet", Toast.LENGTH_LONG).show();
-    }
-
     private void onActionForward(long id) {
         startActivity(new Intent(getContext(), ActivityCompose.class)
                 .putExtra("id", id)
@@ -415,6 +411,10 @@ public class FragmentMessage extends Fragment {
                 .setNegativeButton(android.R.string.cancel, null).show();
     }
 
+    private void onActionMove(final long id) {
+        Toast.makeText(getContext(), "Not implemented yet", Toast.LENGTH_LONG).show();
+    }
+
     private void onActionArchive(final long id) {
         executor.submit(new Runnable() {
             @Override
diff --git a/app/src/main/res/menu/action_view_bottom.xml b/app/src/main/res/menu/action_view_bottom.xml
index f08f114680..7b146630be 100644
--- a/app/src/main/res/menu/action_view_bottom.xml
+++ b/app/src/main/res/menu/action_view_bottom.xml
@@ -14,6 +14,12 @@
         android:title="@string/title_spam"
         app:showAsAction="ifRoom" />
 
+    <item
+        android:id="@+id/action_move"
+        android:icon="@drawable/baseline_folder_24"
+        android:title="@string/title_move"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/action_archive"
         android:icon="@drawable/baseline_archive_24"
diff --git a/app/src/main/res/menu/action_view_top.xml b/app/src/main/res/menu/action_view_top.xml
index 815b1d4095..e322647fe0 100644
--- a/app/src/main/res/menu/action_view_top.xml
+++ b/app/src/main/res/menu/action_view_top.xml
@@ -14,12 +14,6 @@
         android:title="@string/title_seen"
         app:showAsAction="ifRoom" />
 
-    <item
-        android:id="@+id/action_move"
-        android:icon="@drawable/baseline_folder_24"
-        android:title="@string/title_move"
-        app:showAsAction="ifRoom" />
-
     <item
         android:id="@+id/action_forward"
         android:icon="@drawable/baseline_forward_24"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7f9fea969c..92fdf0c898 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,12 +85,12 @@
     <string name="title_thread">Thread</string>
     <string name="title_seen">Read</string>
     <string name="title_unseen">Unread</string>
-    <string name="title_move">Move</string>
     <string name="title_forward">Forward</string>
     <string name="title_reply_all">Reply to all</string>
 
     <string name="title_delete">Delete</string>
     <string name="title_spam">Spam</string>
+    <string name="title_move">Move</string>
     <string name="title_archive">Archive</string>
     <string name="title_reply">Reply</string>