mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-04 10:39:25 +00:00
Code Issues Releases Wiki Activity

Fixed collapsing/expanding folder selector

Browse source
This commit is contained in:
M66B 2019-06-06 10:14:49 +02:00
parent 3ac99725fd
commit 12f6fb2f37
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/AdapterFolder.java
View file

@ -78,6 +78,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
private int textColorSecondary; private int textColorSecondary;
private List<Long> disabledIds = new ArrayList<>(); private List<Long> disabledIds = new ArrayList<>();
private List<TupleFolderEx> all = new ArrayList<>();
private List<TupleFolderEx> items = new ArrayList<>(); private List<TupleFolderEx> items = new ArrayList<>();
private NumberFormat nf = NumberFormat.getNumberInstance(); private NumberFormat nf = NumberFormat.getNumberInstance();
@ -295,7 +296,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
private void onCollapse(TupleFolderEx folder) { private void onCollapse(TupleFolderEx folder) {
if (listener != null) { if (listener != null) {
folder.collapsed = !folder.collapsed; folder.collapsed = !folder.collapsed;
notifyDataSetChanged(); set(all);
return; return;
} }
@ -681,6 +682,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
public void set(@NonNull List<TupleFolderEx> folders) { public void set(@NonNull List<TupleFolderEx> folders) {
Log.i("Set folders=" + folders.size()); Log.i("Set folders=" + folders.size());
all = folders;
final Collator collator = Collator.getInstance(Locale.getDefault()); final Collator collator = Collator.getInstance(Locale.getDefault());
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
@ -718,7 +720,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
} }
} }
List<TupleFolderEx> hierarchical = getHierchical(parents, 0); List<TupleFolderEx> hierarchical = getHierarchical(parents, 0);
DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(items, hierarchical), false); DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(items, hierarchical), false);
@ -748,14 +750,14 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
diff.dispatchUpdatesTo(this); diff.dispatchUpdatesTo(this);
} }
List<TupleFolderEx> getHierchical(List<TupleFolderEx> parents, int indentation) { List<TupleFolderEx> getHierarchical(List<TupleFolderEx> parents, int indentation) {
List<TupleFolderEx> result = new ArrayList<>(); List<TupleFolderEx> result = new ArrayList<>();
for (TupleFolderEx parent : parents) { for (TupleFolderEx parent : parents) {
parent.indentation = indentation; parent.indentation = indentation;
result.add(parent); result.add(parent);
if (!parent.collapsed && parent.child_refs != null) if (!parent.collapsed && parent.child_refs != null)
result.addAll(getHierchical(parent.child_refs, indentation + 1)); result.addAll(getHierarchical(parent.child_refs, indentation + 1));
} }
return result; return result;