Move top nav bar to menu

Fixes #5
2018-08-23 07:52:56 +00:00 · 2018-08-23 07:52:56 +00:00 · f502209d1a
parent 4bdafd77d9
commit f502209d1a
41 changed files with 185 additions and 236 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@ -81,7 +81,7 @@ public class FragmentMessage extends FragmentEx {
    private TextView tvBcc;
    private RecyclerView rvAttachment;
    private TextView tvError;
-    private BottomNavigationView top_navigation;
+    private View vSeparatorBody;
    private TextView tvBody;
    private FloatingActionButton fab;
    private BottomNavigationView bottom_navigation;
@ -91,6 +91,7 @@ public class FragmentMessage extends FragmentEx {
    private Group grpAttachments;
    private Group grpMessage;

+    private TupleMessageEx message = null;
    private boolean free = false;
    private AdapterAttachment adapter;

@ -120,7 +121,7 @@ public class FragmentMessage extends FragmentEx {
        tvBcc = view.findViewById(R.id.tvBcc);
        rvAttachment = view.findViewById(R.id.rvAttachment);
        tvError = view.findViewById(R.id.tvError);
-        top_navigation = view.findViewById(R.id.top_navigation);
+        vSeparatorBody = view.findViewById(R.id.vSeparatorBody);
        tvBody = view.findViewById(R.id.tvBody);
        fab = view.findViewById(R.id.fab);
        bottom_navigation = view.findViewById(R.id.bottom_navigation);
@ -132,6 +133,13 @@ public class FragmentMessage extends FragmentEx {

        setHasOptionsMenu(true);

+        tvCount.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onMenuThread(message.id);
+            }
+        });
+
        tvBody.setMovementMethod(new LinkMovementMethod() {
            public boolean onTouchEvent(TextView widget, Spannable buffer, MotionEvent event) {
                if (event.getAction() != MotionEvent.ACTION_UP)
@ -179,27 +187,6 @@ public class FragmentMessage extends FragmentEx {

        // Wire controls

-        top_navigation.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
-            @Override
-            public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-                switch (item.getItemId()) {
-                    case R.id.action_thread:
-                        onActionThread(id);
-                        return true;
-                    case R.id.action_seen:
-                        onActionSeen(id);
-                        return true;
-                    case R.id.action_forward:
-                        onActionForward(id);
-                        return true;
-                    case R.id.action_reply_all:
-                        onActionReplyAll(id);
-                        return true;
-                }
-                return false;
-            }
-        });
-
        fab.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
@ -213,9 +200,9 @@ public class FragmentMessage extends FragmentEx {
                grpHeader.setVisibility(free ? View.GONE : View.VISIBLE);
                grpAddresses.setVisibility(View.GONE);
                grpAttachments.setVisibility(View.GONE);
-                top_navigation.setVisibility(View.GONE);
                tvCount.setVisibility(View.GONE);
                tvError.setVisibility(View.GONE);
+                vSeparatorBody.setVisibility(View.GONE);
                fab.setVisibility(View.GONE);
            }
        });
@ -229,9 +216,9 @@ public class FragmentMessage extends FragmentEx {
                    grpHeader.setVisibility(free ? View.GONE : View.VISIBLE);
                    grpAddresses.setVisibility((int) tvCc.getTag());
                    rvAttachment.setVisibility((int) rvAttachment.getTag());
-                    top_navigation.setVisibility(View.VISIBLE);
                    tvCount.setVisibility((int) tvCount.getTag());
                    tvError.setVisibility((int) tvError.getTag());
+                    vSeparatorBody.setVisibility(View.VISIBLE);
                    fab.setVisibility(View.VISIBLE);
                    return true;
                }
@ -267,7 +254,6 @@ public class FragmentMessage extends FragmentEx {
        grpHeader.setVisibility(View.GONE);
        grpAddresses.setVisibility(View.GONE);
        grpAttachments.setVisibility(View.GONE);
-        top_navigation.setVisibility(View.GONE);
        grpMessage.setVisibility(View.GONE);
        bottom_navigation.setVisibility(View.GONE);
        tvCount.setVisibility(View.GONE);
@ -313,6 +299,8 @@ public class FragmentMessage extends FragmentEx {
                    return;
                }

+                FragmentMessage.this.message = message;
+                getActivity().invalidateOptionsMenu();
                setSubtitle(Helper.localizeFolderName(getContext(), message.folderName));

                if (savedInstanceState == null) {
@ -364,32 +352,18 @@ public class FragmentMessage extends FragmentEx {
                tvFrom.setTextColor(colorUnseen);
                tvTime.setTextColor(colorUnseen);

-                MenuItem actionSeen = top_navigation.getMenu().findItem(R.id.action_seen);
-                actionSeen.setIcon(message.ui_seen
-                        ? R.drawable.baseline_visibility_off_24
-                        : R.drawable.baseline_visibility_24);
-                actionSeen.setTitle(message.ui_seen ? R.string.title_unseen : R.string.title_seen);
-
                db.folder().liveFolders(message.account).removeObservers(getViewLifecycleOwner());
                db.folder().liveFolders(message.account).observe(getViewLifecycleOwner(), new Observer<List<TupleFolderEx>>() {
-                    private boolean once = false;
-
                    @Override
                    public void onChanged(@Nullable List<TupleFolderEx> folders) {
                        if (folders == null)
                            folders = new ArrayList<>();

-                        if (once)
-                            return;
-                        once = true;
-
                        boolean inInbox = EntityFolder.INBOX.equals(message.folderType);
                        boolean inOutbox = EntityFolder.OUTBOX.equals(message.folderType);
                        boolean inArchive = EntityFolder.ARCHIVE.equals(message.folderType);
-                        //boolean inDafts = EntityFolder.DRAFTS.equals(message.folderType);
                        boolean inTrash = EntityFolder.TRASH.equals(message.folderType);
                        boolean inJunk = EntityFolder.JUNK.equals(message.folderType);
-                        //boolean inSent = EntityFolder.SENT.equals(message.folderType);

                        boolean hasTrash = false;
                        boolean hasJunk = false;
@ -409,13 +383,6 @@ public class FragmentMessage extends FragmentEx {

                        bottom_navigation.setTag(inTrash || !hasTrash);

-                        top_navigation.getMenu().findItem(R.id.action_thread).setVisible(message.count > 1);
-                        top_navigation.getMenu().findItem(R.id.action_seen).setVisible(!inOutbox);
-                        top_navigation.getMenu().findItem(R.id.action_forward).setVisible(!inOutbox);
-                        top_navigation.getMenu().findItem(R.id.action_reply_all).setVisible(!inOutbox && message.cc != null);
-                        if (!free)
-                            top_navigation.setVisibility(View.VISIBLE);
-
                        bottom_navigation.getMenu().findItem(R.id.action_spam).setVisible(message.uid != null && !inOutbox && !inArchive && !inJunk && hasJunk);
                        bottom_navigation.getMenu().findItem(R.id.action_trash).setVisible(message.uid != null && !inOutbox && hasTrash);
                        bottom_navigation.getMenu().findItem(R.id.action_move).setVisible(message.uid != null && !inOutbox && (!inInbox || hasUser));
@ -459,7 +426,22 @@ public class FragmentMessage extends FragmentEx {
    @Override
    public void onPrepareOptionsMenu(Menu menu) {
        super.onPrepareOptionsMenu(menu);
+
+        boolean inOutbox = (message != null && EntityFolder.OUTBOX.equals(message.folderType));
+
        menu.findItem(R.id.menu_addresses).setVisible(!free);
+        menu.findItem(R.id.menu_thread).setVisible(!free && message != null && message.count > 1);
+        menu.findItem(R.id.menu_seen).setVisible(!free && message != null && !inOutbox);
+        menu.findItem(R.id.menu_forward).setVisible(!free && message != null && !inOutbox);
+        menu.findItem(R.id.menu_reply_all).setVisible(!free && message != null && message.cc != null && !inOutbox);
+
+        if (message != null) {
+            MenuItem menuSeen = menu.findItem(R.id.menu_seen);
+            menuSeen.setIcon(message.ui_seen
+                    ? R.drawable.baseline_visibility_off_24
+                    : R.drawable.baseline_visibility_24);
+            menuSeen.setTitle(message.ui_seen ? R.string.title_unseen : R.string.title_seen);
+        }
    }

    @Override
@ -468,6 +450,18 @@ public class FragmentMessage extends FragmentEx {
            case R.id.menu_addresses:
                onMenuAddresses();
                return true;
+            case R.id.menu_thread:
+                onMenuThread(message.id);
+                return true;
+            case R.id.menu_seen:
+                onMenuSeen(message.id);
+                return true;
+            case R.id.menu_forward:
+                onMenuForward(message.id);
+                return true;
+            case R.id.menu_reply_all:
+                onMenuReplyAll(message.id);
+                return true;
            default:
                return super.onOptionsItemSelected(item);
        }
@ -477,7 +471,7 @@ public class FragmentMessage extends FragmentEx {
        grpAddresses.setVisibility(grpAddresses.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
    }

-    private void onActionThread(long id) {
+    private void onMenuThread(long id) {
        getFragmentManager().popBackStack("thread", FragmentManager.POP_BACK_STACK_INCLUSIVE);

        Bundle args = new Bundle();
@ -491,7 +485,7 @@ public class FragmentMessage extends FragmentEx {
        fragmentTransaction.commit();
    }

-    private void onActionSeen(long id) {
+    private void onMenuSeen(long id) {
        Helper.setViewsEnabled(view, false);

        Bundle args = new Bundle();
@ -536,13 +530,13 @@ public class FragmentMessage extends FragmentEx {
        }.load(this, args);
    }

-    private void onActionForward(long id) {
+    private void onMenuForward(long id) {
        startActivity(new Intent(getContext(), ActivityCompose.class)
                .putExtra("action", "forward")
                .putExtra("reference", id));
    }

-    private void onActionReplyAll(long id) {
+    private void onMenuReplyAll(long id) {
        startActivity(new Intent(getContext(), ActivityCompose.class)
                .putExtra("action", "reply_all")
                .putExtra("reference", id));
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@ -197,19 +197,14 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/rvAttachment" />

-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/top_navigation"
+    <View
+        android:id="@+id/vSeparatorBody"
        android:layout_width="match_parent"
-        android:layout_height="30dp"
+        android:layout_height="1dp"
        android:layout_marginTop="3dp"
        android:background="?attr/colorSeparator"
-        app:itemIconTint="@color/bottomnav_background"
-        app:itemTextColor="@color/bottomnav_background"
-        app:labelVisibilityMode="unlabeled"
-        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvError"
-        app:menu="@menu/action_view_top" />
+        app:layout_constraintTop_toBottomOf="@id/tvError" />

    <ScrollView
        android:id="@+id/scroll"
@ -221,7 +216,7 @@
        android:orientation="vertical"
        app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/top_navigation">
+        app:layout_constraintTop_toBottomOf="@id/vSeparatorBody">

        <TextView
            android:id="@+id/tvBody"
--- a/app/src/main/res/menu/action_view_top.xml
+++ b/app/src/main/res/menu/action_view_top.xml
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/action_thread"
-        android:icon="@drawable/baseline_message_24"
-        android:title="@string/title_thread"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_seen"
-        android:icon="@drawable/baseline_visibility_off_24"
-        android:title="@string/title_seen"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_forward"
-        android:icon="@drawable/baseline_forward_24"
-        android:title="@string/title_forward"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_reply_all"
-        android:icon="@drawable/baseline_reply_all_24"
-        android:title="@string/title_reply_all"
-        app:showAsAction="ifRoom" />
-</menu>
--- a/app/src/main/res/menu/menu_view.xml
+++ b/app/src/main/res/menu/menu_view.xml
@ -7,4 +7,28 @@
        android:icon="@drawable/baseline_people_24"
        android:title="@string/title_show_addresses"
        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/menu_thread"
+        android:icon="@drawable/baseline_message_24"
+        android:title="@string/title_thread"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_seen"
+        android:icon="@drawable/baseline_visibility_off_24"
+        android:title="@string/title_seen"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_forward"
+        android:icon="@drawable/baseline_forward_24"
+        android:title="@string/title_forward"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_reply_all"
+        android:icon="@drawable/baseline_reply_all_24"
+        android:title="@string/title_reply_all"
+        app:showAsAction="never" />
 </menu>
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@ -120,10 +120,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@ -120,10 +120,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@ -120,10 +120,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@ -120,10 +120,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -120,10 +120,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -112,10 +112,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">Bild</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Verlauf</string>
-  <string name="title_seen">Gelesen</string>
-  <string name="title_unseen">Ungelesen</string>
-  <string name="title_edit">Bearbeiten</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Weiterleiten</string>
  <string name="title_reply_all">Antworten an alle</string>
  <string name="title_trash">Papierkorb</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -112,10 +112,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@ -112,10 +112,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -100,10 +100,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -100,10 +100,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -112,10 +112,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">imagem</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Enc: %1$s</string>
-  <string name="title_thread">Tópico</string>
-  <string name="title_seen">Lida</string>
-  <string name="title_unseen">Não lida</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Encaminhar</string>
  <string name="title_reply_all">Responder a todos</string>
  <string name="title_trash">Lixeira</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -108,10 +108,9 @@
  <string name="title_image">imagine</string>
  <string name="title_subject_reply">Răsp: %1$s</string>
  <string name="title_subject_forward">Redir: %1$s</string>
-  <string name="title_thread">Discuție</string>
-  <string name="title_seen">Citit</string>
-  <string name="title_unseen">Necitit</string>
-  <string name="title_edit">Editare</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Redirecționează</string>
  <string name="title_reply_all">Răspunde tuturor</string>
  <string name="title_trash">Gunoi</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -112,10 +112,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@ -108,10 +108,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -104,10 +104,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -112,10 +112,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -100,10 +100,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -100,10 +100,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -100,10 +100,9 @@
  <string name="title_image">image</string>
  <string name="title_subject_reply">Re: %1$s</string>
  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_edit">Edit</string>
+  <string name="title_thread">Show thread</string>
+  <string name="title_seen">Mark read</string>
+  <string name="title_unseen">Mark unread</string>
  <string name="title_forward">Forward</string>
  <string name="title_reply_all">Reply to all</string>
  <string name="title_trash">Trash</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -125,9 +125,9 @@
    <string name="title_subject_reply">Re: %1$s</string>
    <string name="title_subject_forward">Fwd: %1$s</string>

-    <string name="title_thread">Thread</string>
-    <string name="title_seen">Read</string>
-    <string name="title_unseen">Unread</string>
+    <string name="title_thread">Show thread</string>
+    <string name="title_seen">Mark read</string>
+    <string name="title_unseen">Mark unread</string>
    <string name="title_forward">Forward</string>
    <string name="title_reply_all">Reply to all</string>