Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Use produceState

Browse source
This commit is contained in:
Benoit Marty 2024-10-08 14:15:23 +02:00
parent a0205cf1e9
commit 2b9899063c
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenter.kt
View file

@ -9,10 +9,11 @@ package io.element.android.features.messages.impl.typing
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.MutableState import androidx.compose.runtime.ProduceStateScope
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.produceState
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.Presenter
@ -22,8 +23,9 @@ import io.element.android.libraries.matrix.api.room.RoomMember
import io.element.android.libraries.matrix.api.room.RoomMembershipState import io.element.android.libraries.matrix.api.room.RoomMembershipState
import io.element.android.libraries.matrix.api.room.roomMembers import io.element.android.libraries.matrix.api.room.roomMembers
import io.element.android.libraries.preferences.api.store.SessionPreferencesStore import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
@ -36,33 +38,29 @@ class TypingNotificationPresenter @Inject constructor(
) : Presenter<TypingNotificationState> { ) : Presenter<TypingNotificationState> {
@Composable @Composable
override fun present(): TypingNotificationState { override fun present(): TypingNotificationState {
val typingMembersState = remember { mutableStateOf(emptyList<RoomMember>()) }
val renderTypingNotifications by sessionPreferencesStore.isRenderTypingNotificationsEnabled().collectAsState(initial = true) val renderTypingNotifications by sessionPreferencesStore.isRenderTypingNotificationsEnabled().collectAsState(initial = true)
val typingMembersState by produceState(initialValue = persistentListOf(), key1 = renderTypingNotifications) {
LaunchedEffect(renderTypingNotifications) {
if (renderTypingNotifications) { if (renderTypingNotifications) {
observeRoomTypingMembers(typingMembersState) observeRoomTypingMembers()
} else {
typingMembersState.value = emptyList()
} }
} }
// This will keep the space reserved for the typing notifications after the first one is displayed // This will keep the space reserved for the typing notifications after the first one is displayed
var reserveSpace by remember { mutableStateOf(false) } var reserveSpace by remember { mutableStateOf(false) }
LaunchedEffect(renderTypingNotifications, typingMembersState.value) { LaunchedEffect(renderTypingNotifications, typingMembersState) {
if (renderTypingNotifications && typingMembersState.value.isNotEmpty()) { if (renderTypingNotifications && typingMembersState.isNotEmpty()) {
reserveSpace = true reserveSpace = true
} }
} }
return TypingNotificationState( return TypingNotificationState(
renderTypingNotifications = renderTypingNotifications, renderTypingNotifications = renderTypingNotifications,
typingMembers = typingMembersState.value.toImmutableList(), typingMembers = typingMembersState,
reserveSpace = reserveSpace, reserveSpace = reserveSpace,
) )
} }
private fun CoroutineScope.observeRoomTypingMembers(typingMembersState: MutableState<List<RoomMember>>) { private fun ProduceStateScope<ImmutableList<RoomMember>>.observeRoomTypingMembers() {
combine(room.roomTypingMembersFlow, room.membersStateFlow) { typingMembers, membersState -> combine(room.roomTypingMembersFlow, room.membersStateFlow) { typingMembers, membersState ->
typingMembers typingMembers
.map { userId -> .map { userId ->
@ -73,7 +71,7 @@ class TypingNotificationPresenter @Inject constructor(
} }
.distinctUntilChanged() .distinctUntilChanged()
.onEach { members -> .onEach { members ->
typingMembersState.value = members value = members.toImmutableList()
} }
.launchIn(this) .launchIn(this)
} }