Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-03 03:19:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed main page titles

Browse Source
This commit is contained in:
M66B
2019-08-18 10:03:14 +02:00
parent b68532cdfe
commit 2569d090d4
5 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/FragmentBase.java
View File

@@ -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);
}
}
}

4
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@@ -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("");

2
app/src/main/java/eu/faircode/email/FragmentFolders.java
View File

@@ -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

16
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -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;
}