Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-26 11:51:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not collapse list to hide only one entry.

Browse Source
This commit is contained in:
Christian Ascheberg
2020-07-29 12:02:12 +02:00
committed by Greyson Parrelli
parent e153b0ab78
commit 4271700046
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientViewModel.java
View File

@@ -45,7 +45,8 @@ import java.util.UUID;
public final class ManageRecipientViewModel extends ViewModel {
private static final int MAX_COLLAPSED_GROUPS = 5;
private static final int MAX_UNCOLLAPSED_GROUPS = 6;
private static final int SHOW_COLLAPSED_GROUPS = 5;
private final Context context;
private final ManageRecipientRepository manageRecipientRepository;
@@ -91,7 +92,7 @@ public final class ManageRecipientViewModel extends ViewModel {
});
this.canCollapseMemberList = LiveDataUtil.combineLatest(this.groupListCollapseState,
Transformations.map(allSharedGroups, m -> m.size() > MAX_COLLAPSED_GROUPS),
Transformations.map(allSharedGroups, m -> m.size() > MAX_UNCOLLAPSED_GROUPS),
(state, hasEnoughMembers) -> state != CollapseState.OPEN && hasEnoughMembers);
this.visibleSharedGroups = Transformations.map(LiveDataUtil.combineLatest(allSharedGroups,
this.groupListCollapseState,
@@ -210,8 +211,8 @@ public final class ManageRecipientViewModel extends ViewModel {
private static @NonNull List<Recipient> filterSharedGroupList(@NonNull List<Recipient> groups,
@NonNull CollapseState collapseState)
{
if (collapseState == CollapseState.COLLAPSED && groups.size() > MAX_COLLAPSED_GROUPS) {
return groups.subList(0, MAX_COLLAPSED_GROUPS);
if (collapseState == CollapseState.COLLAPSED && groups.size() > MAX_UNCOLLAPSED_GROUPS) {
return groups.subList(0, SHOW_COLLAPSED_GROUPS);
} else {
return groups;
}