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

Allow selecting folders when hiding folders with read messages

This commit is contained in:
M66B 2023-02-13 15:12:18 +01:00
parent 828b153182
commit 2c4d1e96f3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,7 +245,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
p = dp3;
view.setPadding(p, p, p, p);
view.setActivated(folder.tbc != null || folder.rename != null || folder.tbd != null);
view.setAlpha(folder.hide || folder.isHidden() || disabled ? Helper.LOW_LIGHT : 1.0f);
view.setAlpha(folder.hide || folder.isHidden(listener != null) || disabled ? Helper.LOW_LIGHT : 1.0f);
if (listener == null && selectedModel != null)
itemView.setBackgroundColor(
@ -1378,7 +1378,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
if (account < 0 && !primary) {
List<TupleFolderEx> filtered = new ArrayList<>();
for (TupleFolderEx folder : folders)
if (show_hidden || !folder.isHidden())
if (show_hidden || !folder.isHidden(listener != null))
filtered.add(folder);
if (filtered.size() > 0)
@ -1590,7 +1590,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
(parent.subscribed != null && parent.subscribed) ||
(childs != null && childs.size() > 0)) {
parent.indentation = indentation;
if (show_hidden || !parent.isHidden()) {
if (show_hidden || !parent.isHidden(listener != null)) {
result.add(parent);
if (!parent.collapsed && childs != null)
result.addAll(childs);

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

@ -63,8 +63,8 @@ public class TupleFolderEx extends EntityFolder implements Serializable {
@Ignore
public int childs_unseen = 0;
boolean isHidden() {
return (this.hide_seen && this.unseen + this.childs_unseen == 0);
boolean isHidden(boolean selecting) {
return (!selecting && this.hide_seen && this.unseen + this.childs_unseen == 0);
}
@Override