Skip to content

Commit 1b9e4bd

Browse files
committed
Move fun and add private modifier.
1 parent 22c0d08 commit 1b9e4bd

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,9 @@ import androidx.compose.runtime.produceState
1313
import androidx.compose.runtime.rememberCoroutineScope
1414
import io.element.android.features.messages.impl.messagecomposer.observeRoomMemberIdentityStateChange
1515
import io.element.android.libraries.architecture.Presenter
16-
import io.element.android.libraries.designsystem.components.avatar.AvatarData
17-
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
1816
import io.element.android.libraries.matrix.api.core.UserId
1917
import io.element.android.libraries.matrix.api.encryption.EncryptionService
2018
import io.element.android.libraries.matrix.api.room.MatrixRoom
21-
import io.element.android.libraries.matrix.api.room.RoomMember
22-
import io.element.android.libraries.matrix.ui.model.getAvatarData
2319
import kotlinx.collections.immutable.persistentListOf
2420
import kotlinx.coroutines.CoroutineScope
2521
import kotlinx.coroutines.launch
@@ -68,20 +64,3 @@ class IdentityChangeStatePresenter @Inject constructor(
6864
}
6965
}
7066
}
71-
72-
fun RoomMember.toIdentityRoomMember() = IdentityRoomMember(
73-
userId = userId,
74-
displayNameOrDefault = displayNameOrDefault,
75-
avatarData = getAvatarData(AvatarSize.ComposerAlert),
76-
)
77-
78-
fun createDefaultRoomMemberForIdentityChange(userId: UserId) = IdentityRoomMember(
79-
userId = userId,
80-
displayNameOrDefault = userId.extractedDisplayName,
81-
avatarData = AvatarData(
82-
id = userId.value,
83-
name = null,
84-
url = null,
85-
size = AvatarSize.ComposerAlert,
86-
),
87-
)

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerUtils.kt

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@
88
package io.element.android.features.messages.impl.messagecomposer
99

1010
import androidx.compose.runtime.ProduceStateScope
11+
import io.element.android.features.messages.impl.crypto.identity.IdentityRoomMember
1112
import io.element.android.features.messages.impl.crypto.identity.RoomMemberIdentityStateChange
12-
import io.element.android.features.messages.impl.crypto.identity.createDefaultRoomMemberForIdentityChange
13-
import io.element.android.features.messages.impl.crypto.identity.toIdentityRoomMember
13+
import io.element.android.libraries.designsystem.components.avatar.AvatarData
14+
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
15+
import io.element.android.libraries.matrix.api.core.UserId
1416
import io.element.android.libraries.matrix.api.room.MatrixRoom
17+
import io.element.android.libraries.matrix.api.room.RoomMember
1518
import io.element.android.libraries.matrix.api.room.roomMembers
19+
import io.element.android.libraries.matrix.ui.model.getAvatarData
1620
import kotlinx.collections.immutable.PersistentList
1721
import kotlinx.collections.immutable.toPersistentList
1822
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -51,3 +55,20 @@ fun ProduceStateScope<PersistentList<RoomMemberIdentityStateChange>>.observeRoom
5155
}
5256
.launchIn(this)
5357
}
58+
59+
private fun RoomMember.toIdentityRoomMember() = IdentityRoomMember(
60+
userId = userId,
61+
displayNameOrDefault = displayNameOrDefault,
62+
avatarData = getAvatarData(AvatarSize.ComposerAlert),
63+
)
64+
65+
private fun createDefaultRoomMemberForIdentityChange(userId: UserId) = IdentityRoomMember(
66+
userId = userId,
67+
displayNameOrDefault = userId.extractedDisplayName,
68+
avatarData = AvatarData(
69+
id = userId.value,
70+
name = null,
71+
url = null,
72+
size = AvatarSize.ComposerAlert,
73+
),
74+
)

0 commit comments

Comments
 (0)