Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-05 16:43:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bring back account categories for unified inbox

Browse Source
This commit is contained in:
M66B
2022-04-20 08:47:47 +02:00
parent efbcda3f50
commit a3c9b1738a
7 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,6 +313,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
private boolean cards;
private boolean dividers;
private boolean category;
private boolean date;
private boolean date_fixed;
private boolean date_bold;
@@ -448,6 +449,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
swipenav = prefs.getBoolean("swipenav", true);
cards = prefs.getBoolean("cards", true);
dividers = prefs.getBoolean("dividers", true);
category = prefs.getBoolean("group_category", false);
date = prefs.getBoolean("date", true);
date_fixed = (!date && prefs.getBoolean("date_fixed", false));
date_bold = prefs.getBoolean("date_bold", false);
@@ -843,9 +845,14 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (message == null)
return null;
boolean ch = (category &&
viewType == AdapterMessage.ViewType.UNIFIED &&
(pos == 0
? message.accountCategory != null
: !Objects.equals(prev.accountCategory, message.accountCategory)));
boolean dh = (date && !date_fixed && SORT_DATE_HEADER.contains(adapter.getSort()));
if (!dh)
if (!ch && !dh)
return null;
if (pos > 0) {
@@ -861,15 +868,21 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
dh = false;
}
if (!dh)
if (!ch && !dh)
return null;
View header = inflater.inflate(R.layout.item_group, parent, false);
TextView tvCategory = header.findViewById(R.id.tvCategory);
TextView tvDate = header.findViewById(R.id.tvDate);
tvCategory.setVisibility(View.GONE);
tvCategory.setVisibility(ch ? View.VISIBLE : View.GONE);
tvDate.setVisibility(dh ? View.VISIBLE : View.GONE);
if (ch) {
tvCategory.setText(message.accountCategory);
if (date_bold)
tvCategory.setTypeface(Typeface.DEFAULT_BOLD);
}
if (dh) {
int zoom = adapter.getZoom();
if (zoom > 0)