mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Do not collapse list to hide only one entry.

fork-5.53.8
Christian 2021-07-05 09:52:17 +02:00 zatwierdzone przez Alex Hart
rodzic c3cf846a10
commit 92e8f9de0e
1 zmienionych plików z 7 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt
Wyświetl plik

@ -164,12 +164,13 @@ sealed class ConversationSettingsViewModel(
repository.getGroupsInCommon(recipientId) { groupsInCommon -> repository.getGroupsInCommon(recipientId) { groupsInCommon ->
store.update { state -> store.update { state ->
val recipientSettings = state.requireRecipientSettingsState() val recipientSettings = state.requireRecipientSettingsState()
val expanded = recipientSettings.groupsInCommonExpanded val canShowMore = !recipientSettings.groupsInCommonExpanded && groupsInCommon.size > 6
state.copy( state.copy(
specificSettingsState = recipientSettings.copy( specificSettingsState = recipientSettings.copy(
allGroupsInCommon = groupsInCommon, allGroupsInCommon = groupsInCommon,
groupsInCommon = if (expanded) groupsInCommon else groupsInCommon.take(5), groupsInCommon = if (!canShowMore) groupsInCommon else groupsInCommon.take(5),
canShowMoreGroupsInCommon = !expanded && groupsInCommon.size > 5 canShowMoreGroupsInCommon = canShowMore
) )
) )
} }
@ -304,12 +305,13 @@ sealed class ConversationSettingsViewModel(
store.update(liveGroup.fullMembers) { fullMembers, state -> store.update(liveGroup.fullMembers) { fullMembers, state ->
val groupState = state.requireGroupSettingsState() val groupState = state.requireGroupSettingsState()
val canShowMore = !groupState.groupMembersExpanded && fullMembers.size > 6
state.copy( state.copy(
specificSettingsState = groupState.copy( specificSettingsState = groupState.copy(
allMembers = fullMembers, allMembers = fullMembers,
members = if (groupState.groupMembersExpanded) fullMembers else fullMembers.take(5), members = if (!canShowMore) fullMembers else fullMembers.take(5),
canShowMoreGroupMembers = !groupState.groupMembersExpanded && fullMembers.size > 5 canShowMoreGroupMembers = canShowMore
) )
) )
} }