mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed default subject ellipsize

This commit is contained in:
M66B 2020-07-04 09:26:11 +02:00
parent bd4869e86b
commit fe7b30a6f2
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,8 +516,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvSubject.setEllipsize(TextUtils.TruncateAt.START);
else if ("end".equals(subject_ellipsize))
tvSubject.setEllipsize(TextUtils.TruncateAt.END);
else
else if ("middle".equals(subject_ellipsize))
tvSubject.setEllipsize(TextUtils.TruncateAt.MIDDLE);
else
tvSubject.setEllipsize(null);
}
}
@ -5001,7 +5003,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
font_size_subject = Helper.getTextSize(context, fz_subject);
this.subject_italic = prefs.getBoolean("subject_italic", true);
this.subject_ellipsize = prefs.getString("subject_ellipsize", "middle");
this.subject_ellipsize = prefs.getString("subject_ellipsize", "full");
this.keywords_header = prefs.getBoolean("keywords_header", false);
this.labels_header = prefs.getBoolean("labels_header", true);
this.flags = prefs.getBoolean("flags", true);

3
app/src/main/java/eu/faircode/email/ApplicationEx.java
View File

@ -284,6 +284,9 @@ public class ApplicationEx extends Application {
boolean monospaced = prefs.getBoolean("monospaced", false);
if (monospaced && !BuildConfig.DEBUG)
editor.putBoolean("text_font", false);
} else if (version < 1238) {
if (!prefs.contains("subject_ellipsize"))
editor.putString("subject_ellipsize", "middle");
}
if (version < BuildConfig.VERSION_CODE)

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

@ -848,7 +848,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
swSubjectItalic.setChecked(prefs.getBoolean("subject_italic", true));
swHighlightSubject.setChecked(prefs.getBoolean("highlight_subject", false));
String subject_ellipsize = prefs.getString("subject_ellipsize", "middle");
String subject_ellipsize = prefs.getString("subject_ellipsize", "full");
String[] ellipsizeValues = getResources().getStringArray(R.array.ellipsizeValues);
for (int pos = 0; pos < startupValues.length; pos++)
if (ellipsizeValues[pos].equals(subject_ellipsize)) {