Revert "Colored letters for favorites"

This reverts commit df7bf8e285.

app/src/main/java/eu/faircode/email/EntityAnswer.java

@@ -209,29 +209,29 @@ public class EntityAnswer implements Serializable {
                 continue;
             order++;
 
-            SpannableStringBuilder ssb = new SpannableStringBuilder(answer.name);
+            SpannableStringBuilder name = new SpannableStringBuilder(answer.name);
 
             if (answer.name != null && answer.color != null) {
                 int first = answer.name.codePointAt(0);
                 int count = Character.charCount(first);
-                ssb.setSpan(new ForegroundColorSpan(answer.color), 0, count, 0);
+                name.setSpan(new ForegroundColorSpan(answer.color), 0, count, 0);
-                ssb.setSpan(new StyleSpan(Typeface.BOLD), 0, count, 0);
+                name.setSpan(new StyleSpan(Typeface.BOLD), 0, count, 0);
-                ssb.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_LARGE), 0, count, 0);
+                name.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_LARGE), 0, count, 0);
             }
 
             if (grouped && answer.applied > 0) {
-                ssb.append(" (").append(NF.format(answer.applied)).append(")");
+                name.append(" (").append(NF.format(answer.applied)).append(")");
-                ssb.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_SMALL),
+                name.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_SMALL),
-                        answer.name.length() + 1, ssb.length(), 0);
+                        answer.name.length() + 1, name.length(), 0);
             }
 
             MenuItem item;
             if (answer.group == null)
-                item = main.add(Menu.NONE, order, order++, ssb);
+                item = main.add(Menu.NONE, order, order++, name);
             else {
                 SubMenu smenu = map.get(answer.group);
                 item = smenu.add(answer.applied > 0 ? Menu.FIRST : Menu.NONE,
-                        smenu.size(), smenu.size() + 1, ssb);
+                        smenu.size(), smenu.size() + 1, name);
             }
             item.setIntent(new Intent().putExtra("id", answer.id));
         }
@@ -303,12 +303,6 @@ public class EntityAnswer implements Serializable {
         for (EntityAnswer answer : favorites) {
             SpannableStringBuilder ssb = new SpannableStringBuilder(answer.name);
 
-            int first = answer.name.codePointAt(0);
-            int count = Character.charCount(first);
-            ssb.setSpan(new ForegroundColorSpan(answer.color), 0, count, 0);
-            ssb.setSpan(new StyleSpan(Typeface.BOLD), 0, count, 0);
-            ssb.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_LARGE), 0, count, 0);
-
             ImageSpan imageSpan = new CenteredImageSpan(icon);
             ssb.insert(0, "\uFFFC\u2002"); // object replacement character, en space
             ssb.setSpan(imageSpan, 0, 1, 0);

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -2911,16 +2911,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 if (data.answers != null) {
                     int order = 100;
                     for (EntityAnswer answer : data.answers) {
-                        SpannableStringBuilder ssb = new SpannableStringBuilder(answer.name);
-
-                        int first = answer.name.codePointAt(0);
-                        int count = Character.charCount(first);
-                        ssb.setSpan(new ForegroundColorSpan(answer.color), 0, count, 0);
-                        ssb.setSpan(new StyleSpan(Typeface.BOLD), 0, count, 0);
-                        ssb.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_LARGE), 0, count, 0);
-
                         order++;
-                        popupMenu.getMenu().add(Menu.FIRST, order, order, ssb)
+                        popupMenu.getMenu().add(Menu.FIRST, order, order, answer.name)
                                 .setIcon(R.drawable.twotone_star_24)
                                 .setIntent(new Intent().putExtra("id", answer.id));
                     }