From 92e8f9de0e3c9f70cd41fd0b6a45ff42f0d5832a Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 5 Jul 2021 09:52:17 +0200 Subject: [PATCH] Do not collapse list to hide only one entry. --- .../conversation/ConversationSettingsViewModel.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt index ff37d6aaa0..059aefedd0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt @@ -164,12 +164,13 @@ sealed class ConversationSettingsViewModel( repository.getGroupsInCommon(recipientId) { groupsInCommon -> store.update { state -> val recipientSettings = state.requireRecipientSettingsState() - val expanded = recipientSettings.groupsInCommonExpanded + val canShowMore = !recipientSettings.groupsInCommonExpanded && groupsInCommon.size > 6 + state.copy( specificSettingsState = recipientSettings.copy( allGroupsInCommon = groupsInCommon, - groupsInCommon = if (expanded) groupsInCommon else groupsInCommon.take(5), - canShowMoreGroupsInCommon = !expanded && groupsInCommon.size > 5 + groupsInCommon = if (!canShowMore) groupsInCommon else groupsInCommon.take(5), + canShowMoreGroupsInCommon = canShowMore ) ) } @@ -304,12 +305,13 @@ sealed class ConversationSettingsViewModel( store.update(liveGroup.fullMembers) { fullMembers, state -> val groupState = state.requireGroupSettingsState() + val canShowMore = !groupState.groupMembersExpanded && fullMembers.size > 6 state.copy( specificSettingsState = groupState.copy( allMembers = fullMembers, - members = if (groupState.groupMembersExpanded) fullMembers else fullMembers.take(5), - canShowMoreGroupMembers = !groupState.groupMembersExpanded && fullMembers.size > 5 + members = if (!canShowMore) fullMembers else fullMembers.take(5), + canShowMoreGroupMembers = canShowMore ) ) }