msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Distinguish menu title

Browse Source
pull/172/head
M66B 6 years ago
parent 08b1d59acb
commit 1b0e8d70a9
9 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File

6
app/src/main/java/eu/faircode/email/AdapterAccount.java
Unescape View File

@ -30,6 +30,8 @@ import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.text.SpannableString;
import android.text.style.StyleSpan;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -231,7 +233,9 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, view);
popupMenu.getMenu().add(Menu.NONE, 0, 0, account.name).setEnabled(false);
SpannableString ss = new SpannableString(account.name);
ss.setSpan(new StyleSpan(Typeface.ITALIC), 0, ss.length(), 0);
popupMenu.getMenu().add(Menu.NONE, 0, 0, ss).setEnabled(false);
popupMenu.getMenu().add(Menu.NONE, R.string.title_enabled, 1, R.string.title_enabled)
.setCheckable(true).setChecked(account.synchronize);

7
app/src/main/java/eu/faircode/email/AdapterAnswer.java
Unescape View File

@ -21,7 +21,10 @@ package eu.faircode.email;
import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
import android.os.Bundle;
import android.text.SpannableString;
import android.text.style.StyleSpan;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -107,7 +110,9 @@ public class AdapterAnswer extends RecyclerView.Adapter<AdapterAnswer.ViewHolder
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, view);
popupMenu.getMenu().add(Menu.NONE, 0, 0, answer.name).setEnabled(false);
SpannableString ss = new SpannableString(answer.name);
ss.setSpan(new StyleSpan(Typeface.ITALIC), 0, ss.length(), 0);
popupMenu.getMenu().add(Menu.NONE, 0, 0, ss).setEnabled(false);
if (composable)
popupMenu.getMenu().add(Menu.NONE, R.string.title_compose, 1, R.string.title_compose);

7
app/src/main/java/eu/faircode/email/AdapterCertificate.java
Unescape View File

@ -20,7 +20,10 @@ package eu.faircode.email;
*/
import android.content.Context;
import android.graphics.Typeface;
import android.os.Bundle;
import android.text.SpannableString;
import android.text.style.StyleSpan;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -81,7 +84,9 @@ public class AdapterCertificate extends RecyclerView.Adapter<AdapterCertificate.
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, view);
popupMenu.getMenu().add(Menu.NONE, 0, 0, certificate.email).setEnabled(false);
SpannableString ss = new SpannableString(certificate.email);
ss.setSpan(new StyleSpan(Typeface.ITALIC), 0, ss.length(), 0);
popupMenu.getMenu().add(Menu.NONE, 0, 0, ss).setEnabled(false);
popupMenu.getMenu().add(Menu.NONE, R.string.title_delete, 1, R.string.title_delete);

8
app/src/main/java/eu/faircode/email/AdapterContact.java
Unescape View File

@ -23,11 +23,14 @@ import android.Manifest;
import android.content.Context;
import android.content.Intent;
import android.content.res.ColorStateList;
import android.graphics.Typeface;
import android.net.Uri;
import android.os.Bundle;
import android.os.ParcelFileDescriptor;
import android.provider.ContactsContract;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.style.StyleSpan;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -223,7 +226,10 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, view);
popupMenu.getMenu().add(Menu.NONE, 0, 0, contact.email).setEnabled(false);
SpannableString ss = new SpannableString(contact.email);
ss.setSpan(new StyleSpan(Typeface.ITALIC), 0, ss.length(), 0);
popupMenu.getMenu().add(Menu.NONE, 0, 0, ss).setEnabled(false);
if (contact.state != EntityContact.STATE_IGNORE)
popupMenu.getMenu().add(Menu.NONE, R.string.title_advanced_never_favorite, 1, R.string.title_advanced_never_favorite);
if (share.resolveActivity(context.getPackageManager()) != null)

7
app/src/main/java/eu/faircode/email/AdapterFolder.java
Unescape View File

@ -30,7 +30,9 @@ import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.style.StyleSpan;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.Menu;
@ -407,7 +409,10 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, view);
if (folder.selectable) {
popupMenu.getMenu().add(Menu.NONE, 0, 0, folder.getDisplayName(context)).setEnabled(false);
SpannableString ss = new SpannableString(folder.getDisplayName(context));
ss.setSpan(new StyleSpan(Typeface.ITALIC), 0, ss.length(), 0);
popupMenu.getMenu().add(Menu.NONE, 0, 0, ss).setEnabled(false);
popupMenu.getMenu().add(Menu.NONE, R.string.title_synchronize_now, 1, R.string.title_synchronize_now);
if (folder.account != null && folder.accountProtocol == EntityAccount.TYPE_IMAP) {

7
app/src/main/java/eu/faircode/email/AdapterIdentity.java
Unescape View File

@ -22,7 +22,10 @@ package eu.faircode.email;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Bundle;
import android.text.SpannableString;
import android.text.style.StyleSpan;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -176,7 +179,9 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, view);
popupMenu.getMenu().add(Menu.NONE, 0, 0, identity.email).setEnabled(false);
SpannableString ss = new SpannableString(identity.email);
ss.setSpan(new StyleSpan(Typeface.ITALIC), 0, ss.length(), 0);
popupMenu.getMenu().add(Menu.NONE, 0, 0, ss).setEnabled(false);
popupMenu.getMenu().add(Menu.NONE, R.string.title_enabled, 1, R.string.title_enabled)
.setCheckable(true).setChecked(identity.synchronize);

9
app/src/main/java/eu/faircode/email/AdapterOperation.java
Unescape View File

@ -21,7 +21,10 @@ package eu.faircode.email;
import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
import android.os.Bundle;
import android.text.SpannableString;
import android.text.style.StyleSpan;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -188,8 +191,12 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
return false;
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, view);
popupMenu.getMenu().add(Menu.NONE, 0, 0, operation.name + ":" + operation.id)
SpannableString ss = new SpannableString(operation.name + ":" + operation.id);
ss.setSpan(new StyleSpan(Typeface.ITALIC), 0, ss.length(), 0);
popupMenu.getMenu().add(Menu.NONE, 0, 0, ss)
.setEnabled(false);
popupMenu.getMenu().add(Menu.NONE, R.string.title_delete, 1, R.string.title_delete);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {

7
app/src/main/java/eu/faircode/email/AdapterRule.java
Unescape View File

@ -21,8 +21,11 @@ package eu.faircode.email;
import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
import android.os.Bundle;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.style.StyleSpan;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -197,7 +200,9 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, view);
popupMenu.getMenu().add(Menu.NONE, 0, 0, rule.name).setEnabled(false);
SpannableString ss = new SpannableString(rule.name);
ss.setSpan(new StyleSpan(Typeface.ITALIC), 0, ss.length(), 0);
popupMenu.getMenu().add(Menu.NONE, 0, 0, ss).setEnabled(false);
popupMenu.getMenu().add(Menu.NONE, R.string.title_rule_enabled, 1, R.string.title_rule_enabled)
.setCheckable(true).setChecked(rule.enabled);

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

@ -36,6 +36,7 @@ import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.Rect;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.net.ConnectivityManager;
import android.net.Network;
@ -52,8 +53,10 @@ import android.print.PrintAttributes;
import android.print.PrintDocumentAdapter;
import android.print.PrintManager;
import android.security.KeyChain;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.text.style.StyleSpan;
import android.util.Base64;
import android.util.LongSparseArray;
import android.util.Pair;
@ -985,7 +988,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(getContext(), getViewLifecycleOwner(), fabSearch);
popupMenu.getMenu().add(Menu.NONE, 0, 0, R.string.title_search_server)
SpannableString ss = new SpannableString(getString(R.string.title_search_server));
ss.setSpan(new StyleSpan(Typeface.ITALIC), 0, ss.length(), 0);
popupMenu.getMenu().add(Menu.NONE, 0, 0, ss)
.setEnabled(false);
popupMenu.getMenu().add(Menu.NONE, 1, 1, R.string.title_search_text)
.setCheckable(true).setChecked(search_text);

Write Preview
Loading…
Cancel
Save