From 2569d090d42330a17f3db7bed8ce2a6e320882f4 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 18 Aug 2019 10:03:14 +0200
Subject: [PATCH] Changed main page titles

---
 .../java/eu/faircode/email/FragmentBase.java     | 14 +++++++++++++-
 .../java/eu/faircode/email/FragmentCompose.java  |  4 +++-
 .../java/eu/faircode/email/FragmentFolders.java  |  2 ++
 .../java/eu/faircode/email/FragmentMessages.java | 16 ++++++++++------
 app/src/main/res/values/strings.xml              |  3 +--
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index 1cc923b703..7e96997ecf 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -40,9 +40,19 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class FragmentBase extends Fragment {
+    private String title = null;
     private String subtitle = " ";
     private boolean finish = false;
 
+    protected void setTitle(int resid) {
+        setTitle(getString(resid));
+    }
+
+    protected void setTitle(String title) {
+        this.title = title;
+        updateSubtitle();
+    }
+
     protected void setSubtitle(int resid) {
         setSubtitle(getString(resid));
     }
@@ -182,8 +192,10 @@ public class FragmentBase extends Fragment {
         AppCompatActivity activity = (AppCompatActivity) getActivity();
         if (activity != null && !isPane()) {
             ActionBar actionbar = activity.getSupportActionBar();
-            if (actionbar != null)
+            if (actionbar != null) {
+                actionbar.setTitle(title == null ? getString(R.string.app_name) : title);
                 actionbar.setSubtitle(subtitle);
+            }
         }
     }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 9e3cbcd1af..8bcf23a16d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -232,6 +232,9 @@ public class FragmentCompose extends FragmentBase {
         prefix_once = prefs.getBoolean("prefix_once", true);
         monospaced = prefs.getBoolean("monospaced", false);
         style = prefs.getBoolean("style_toolbar", true);
+
+        setTitle(R.string.page_compose);
+        setSubtitle(R.string.page_compose_message);
     }
 
     @Override
@@ -409,7 +412,6 @@ public class FragmentCompose extends FragmentBase {
         addBackPressedListener(onBackPressedListener);
 
         // Initialize
-        setSubtitle(R.string.title_compose);
         setHasOptionsMenu(true);
 
         etExtra.setHint("");
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 67625736f2..06fefb14d1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -88,6 +88,8 @@ public class FragmentFolders extends FragmentBase {
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
         cards = prefs.getBoolean("cards", true);
+
+        setTitle(R.string.page_folders);
     }
 
     @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 1577c8f01e..e7f6a04bec 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -300,15 +300,20 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         connected = args.getBoolean("connected", false);
 
         if (TextUtils.isEmpty(query))
-            if (thread == null)
+            if (thread == null) {
                 if (folder < 0)
                     viewType = AdapterMessage.ViewType.UNIFIED;
                 else
                     viewType = AdapterMessage.ViewType.FOLDER;
-            else
+                setTitle(getResources().getQuantityString(R.plurals.page_conversation, 10));
+            } else {
                 viewType = AdapterMessage.ViewType.THREAD;
-        else
+                setTitle(getResources().getQuantityString(R.plurals.page_conversation, 1));
+            }
+        else {
             viewType = AdapterMessage.ViewType.SEARCH;
+            setTitle(R.string.title_search);
+        }
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
 
@@ -2193,8 +2198,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                     @Override
                     public void onChanged(TupleThreadStats stats) {
-                        setSubtitle(getString(R.string.title_folder_thread,
-                                stats == null || stats.accountName == null ? "" : stats.accountName));
+                        setSubtitle(stats == null || stats.accountName == null ? "" : stats.accountName);
 
                         if (stats != null && stats.count != null && stats.seen != null) {
                             int unseen = stats.count - stats.seen;
@@ -2224,7 +2228,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 break;
 
             case SEARCH:
-                setSubtitle(getString(R.string.title_searching, query));
+                setSubtitle(query);
                 break;
         }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d2655a897c..95eaa3b274 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,6 +25,7 @@
 
     <string name="page_folders">Folders</string>
     <string name="page_compose">Compose</string>
+    <string name="page_compose_message">Message</string>
 
     <string name="tile_synchronize">Synchronize</string>
     <string name="tile_unseen">New messages</string>
@@ -443,7 +444,6 @@
     <string name="title_folder_system">System</string>
     <string name="title_folder_user">User</string>
     <string name="title_folder_primary">Folders primary account</string>
-    <string name="title_folder_thread">Conversation %1$s</string>
     <string name="title_folders_unified">Unified inbox folders</string>
     <string name="title_no_messages">No messages</string>
     <string name="title_no_folders">No folders</string>
@@ -581,7 +581,6 @@
     <string name="title_search">Search</string>
     <string name="title_search_server">Search on server</string>
     <string name="title_search_in">Search in</string>
-    <string name="title_searching">Searching \'%1$s\'</string>
 
     <string name="title_sort_on">Sort on</string>
     <string name="title_sort_on_time">Time</string>