From f502209d1a02e375432aab77d58890827e93c74d Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 23 Aug 2018 07:52:56 +0000 Subject: [PATCH] Move top nav bar to menu Fixes #5 --- .../eu/faircode/email/FragmentMessage.java | 96 +++++++++---------- app/src/main/res/layout/fragment_message.xml | 15 +-- app/src/main/res/menu/action_view_top.xml | 28 ------ app/src/main/res/menu/menu_view.xml | 24 +++++ app/src/main/res/values-af/strings.xml | 7 +- app/src/main/res/values-ar-rBH/strings.xml | 7 +- app/src/main/res/values-ar-rEG/strings.xml | 7 +- app/src/main/res/values-ar-rSA/strings.xml | 7 +- app/src/main/res/values-ar-rYE/strings.xml | 7 +- app/src/main/res/values-ar/strings.xml | 7 +- app/src/main/res/values-ca/strings.xml | 7 +- app/src/main/res/values-cs/strings.xml | 7 +- app/src/main/res/values-da/strings.xml | 7 +- app/src/main/res/values-de/strings.xml | 7 +- app/src/main/res/values-el/strings.xml | 7 +- app/src/main/res/values-en/strings.xml | 7 +- app/src/main/res/values-es-rES/strings.xml | 7 +- app/src/main/res/values-fi/strings.xml | 7 +- app/src/main/res/values-fr/strings.xml | 7 +- app/src/main/res/values-he/strings.xml | 7 +- app/src/main/res/values-hu/strings.xml | 7 +- app/src/main/res/values-it/strings.xml | 7 +- app/src/main/res/values-iw/strings.xml | 7 +- app/src/main/res/values-ja/strings.xml | 7 +- app/src/main/res/values-ko/strings.xml | 7 +- app/src/main/res/values-nb/strings.xml | 7 +- app/src/main/res/values-nl/strings.xml | 7 +- app/src/main/res/values-no/strings.xml | 7 +- app/src/main/res/values-pl/strings.xml | 7 +- app/src/main/res/values-pt-rBR/strings.xml | 7 +- app/src/main/res/values-pt-rPT/strings.xml | 7 +- app/src/main/res/values-ro/strings.xml | 7 +- app/src/main/res/values-ru/strings.xml | 7 +- app/src/main/res/values-sr/strings.xml | 7 +- app/src/main/res/values-sv-rSE/strings.xml | 7 +- app/src/main/res/values-tr/strings.xml | 7 +- app/src/main/res/values-uk/strings.xml | 7 +- app/src/main/res/values-vi/strings.xml | 7 +- app/src/main/res/values-zh-rCN/strings.xml | 7 +- app/src/main/res/values-zh-rTW/strings.xml | 7 +- app/src/main/res/values/strings.xml | 6 +- 41 files changed, 185 insertions(+), 236 deletions(-) delete mode 100644 app/src/main/res/menu/action_view_top.xml diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java index dd8df2e7..9308a286 100644 --- 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>() { - private boolean once = false; - @Override public void onChanged(@Nullable List 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)); diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml index b308e81c..d1e992ab 100644 --- 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" /> - + app:layout_constraintTop_toBottomOf="@id/tvError" /> + app:layout_constraintTop_toBottomOf="@id/vSeparatorBody"> - - - - - - - - - - diff --git a/app/src/main/res/menu/menu_view.xml b/app/src/main/res/menu/menu_view.xml index c1714cb8..4705b82d 100644 --- 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" /> + + + + + + + + diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml index 968fd816..8721d87d 100644 --- a/app/src/main/res/values-ar-rBH/strings.xml +++ b/app/src/main/res/values-ar-rBH/strings.xml @@ -120,10 +120,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml index 968fd816..8721d87d 100644 --- a/app/src/main/res/values-ar-rEG/strings.xml +++ b/app/src/main/res/values-ar-rEG/strings.xml @@ -120,10 +120,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index 968fd816..8721d87d 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -120,10 +120,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml index 968fd816..8721d87d 100644 --- a/app/src/main/res/values-ar-rYE/strings.xml +++ b/app/src/main/res/values-ar-rYE/strings.xml @@ -120,10 +120,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 968fd816..8721d87d 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -120,10 +120,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index f85fd53c..c8863674 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -112,10 +112,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 68dd124d..c976aba3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -104,10 +104,9 @@ Bild Re: %1$s Fwd: %1$s - Verlauf - Gelesen - Ungelesen - Bearbeiten + Show thread + Mark read + Mark unread Weiterleiten Antworten an alle Papierkorb diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index d81e308d..f0950270 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -112,10 +112,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index d81e308d..f0950270 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -112,10 +112,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e2e19c44..1c5a8604 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -100,10 +100,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e2e19c44..1c5a8604 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -100,10 +100,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f85fd53c..c8863674 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -112,10 +112,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 6656edf6..4d818c22 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -104,10 +104,9 @@ imagem Re: %1$s Enc: %1$s - Tópico - Lida - Não lida - Edit + Show thread + Mark read + Mark unread Encaminhar Responder a todos Lixeira diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index ed959626..e115ccd4 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -108,10 +108,9 @@ imagine Răsp: %1$s Redir: %1$s - Discuție - Citit - Necitit - Editare + Show thread + Mark read + Mark unread Redirecționează Răspunde tuturor Gunoi diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f85fd53c..c8863674 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -112,10 +112,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 9bcef0ef..922e5cac 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -108,10 +108,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 98d5ab01..25a7faaf 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -104,10 +104,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index f85fd53c..c8863674 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -112,10 +112,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index e2e19c44..1c5a8604 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -100,10 +100,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e2e19c44..1c5a8604 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -100,10 +100,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index e2e19c44..1c5a8604 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -100,10 +100,9 @@ image Re: %1$s Fwd: %1$s - Thread - Read - Unread - Edit + Show thread + Mark read + Mark unread Forward Reply to all Trash diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5fb96cff..b0fcd534 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -125,9 +125,9 @@ Re: %1$s Fwd: %1$s - Thread - Read - Unread + Show thread + Mark read + Mark unread Forward Reply to all