Merge pull request #2639 from element-hq/feature/bma/hideCallMemberEvents

Hide call member events

libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt

@@ -63,6 +63,8 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.TransactionId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.api.permalink.PermalinkData
+import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.matrix.ui.components.A_BLUR_HASH
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnail
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
@@ -98,6 +100,7 @@ import kotlin.time.Duration.Companion.seconds
 fun TextComposer(
     state: RichTextEditorState,
     voiceMessageState: VoiceMessageState,
+    permalinkParser: PermalinkParser,
     composerMode: MessageComposerMode,
     enableTextFormatting: Boolean,
     enableVoiceMessages: Boolean,
@@ -152,7 +155,10 @@ fun TextComposer(
 
     val textInput: @Composable () -> Unit = remember(state, subcomposing, composerMode, onResetComposerMode, onError) {
         @Composable {
-            val mentionSpanProvider = rememberMentionSpanProvider(currentUserId)
+            val mentionSpanProvider = rememberMentionSpanProvider(
+                currentUserId = currentUserId,
+                permalinkParser = permalinkParser,
+            )
             TextInput(
                 state = state,
                 subcomposing = subcomposing,
@@ -907,6 +913,10 @@ private fun ATextComposer(
         state = richTextEditorState,
         showTextFormatting = showTextFormatting,
         voiceMessageState = voiceMessageState,
+        permalinkParser = object : PermalinkParser {
+            override fun parse(uriString: String): PermalinkData = TODO("Not yet implemented")
+            override fun parse(uri: Uri): PermalinkData = TODO("Not yet implemented")
+        },
         composerMode = composerMode,
         enableTextFormatting = enableTextFormatting,
         enableVoiceMessages = enableVoiceMessages,

libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanProvider.kt

@@ -18,6 +18,7 @@ package io.element.android.libraries.textcomposer.mentions
 
 import android.graphics.Color
 import android.graphics.Typeface
+import android.net.Uri
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.compose.foundation.layout.PaddingValues
@@ -42,10 +43,12 @@ import io.element.android.libraries.designsystem.theme.mentionPillText
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
+import kotlinx.collections.immutable.persistentListOf
 
 @Stable
 class MentionSpanProvider(
     private val currentSessionId: SessionId,
+    private val permalinkParser: PermalinkParser,
     private var currentUserTextColor: Int = 0,
     private var currentUserBackgroundColor: Int = Color.WHITE,
     private var otherTextColor: Int = 0,
@@ -73,7 +76,7 @@ class MentionSpanProvider(
     }
 
     fun getMentionSpanFor(text: String, url: String): MentionSpan {
-        val permalinkData = PermalinkParser.parse(url)
+        val permalinkData = permalinkParser.parse(url)
         val (startPaddingPx, endPaddingPx) = paddingValuesPx.value
         return when {
             permalinkData is PermalinkData.UserLink -> {
@@ -112,9 +115,15 @@ class MentionSpanProvider(
 }
 
 @Composable
-fun rememberMentionSpanProvider(currentUserId: SessionId): MentionSpanProvider {
+fun rememberMentionSpanProvider(
+    currentUserId: SessionId,
+    permalinkParser: PermalinkParser,
+): MentionSpanProvider {
     val provider = remember(currentUserId) {
-        MentionSpanProvider(currentUserId)
+        MentionSpanProvider(
+            currentSessionId = currentUserId,
+            permalinkParser = permalinkParser,
+        )
     }
     provider.setup()
     return provider
@@ -123,7 +132,26 @@ fun rememberMentionSpanProvider(currentUserId: SessionId): MentionSpanProvider {
 @PreviewsDayNight
 @Composable
 internal fun MentionSpanPreview() {
-    val provider = rememberMentionSpanProvider(SessionId("@me:matrix.org"))
+    val provider = rememberMentionSpanProvider(
+        currentUserId = SessionId("@me:matrix.org"),
+        permalinkParser = object : PermalinkParser {
+            override fun parse(uriString: String): PermalinkData {
+                return when (uriString) {
+                    "https://matrix.to/#/@me:matrix.org" -> PermalinkData.UserLink("@me:matrix.org")
+                    "https://matrix.to/#/@other:matrix.org" -> PermalinkData.UserLink("@other:matrix.org")
+                    "https://matrix.to/#/#room:matrix.org" -> PermalinkData.RoomLink(
+                        roomIdOrAlias = "#room:matrix.org",
+                        isRoomAlias = true,
+                        eventId = null,
+                        viaParameters = persistentListOf(),
+                    )
+                    else -> TODO()
+                }
+            }
+
+            override fun parse(uri: Uri): PermalinkData = TODO()
+        },
+    )
     ElementPreview {
         provider.setup()
 

libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/mentions/MentionSpanProviderTest.kt

@@ -18,9 +18,12 @@ package io.element.android.libraries.textcomposer.impl.mentions
 
 import android.graphics.Color
 import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
 import io.element.android.libraries.textcomposer.mentions.MentionSpanProvider
 import io.element.android.tests.testutils.WarmUpRule
+import kotlinx.collections.immutable.persistentListOf
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -35,8 +38,10 @@ class MentionSpanProviderTest {
     private val otherColor = Color.BLUE
     private val currentUserId = A_SESSION_ID
 
+    private val permalinkParser = FakePermalinkParser()
     private val mentionSpanProvider = MentionSpanProvider(
         currentSessionId = currentUserId,
+        permalinkParser = permalinkParser,
         currentUserBackgroundColor = myUserColor,
         currentUserTextColor = myUserColor,
         otherBackgroundColor = otherColor,
@@ -45,6 +50,7 @@ class MentionSpanProviderTest {
 
     @Test
     fun `getting mention span for current user should return a MentionSpan with custom colors`() {
+        permalinkParser.givenResult(PermalinkData.UserLink(currentUserId.value))
         val mentionSpan = mentionSpanProvider.getMentionSpanFor("@me:matrix.org", "https://matrix.to/#/${currentUserId.value}")
         assertThat(mentionSpan.backgroundColor).isEqualTo(myUserColor)
         assertThat(mentionSpan.textColor).isEqualTo(myUserColor)
@@ -52,6 +58,7 @@ class MentionSpanProviderTest {
 
     @Test
     fun `getting mention span for other user should return a MentionSpan with normal colors`() {
+        permalinkParser.givenResult(PermalinkData.UserLink("@other:matrix.org"))
         val mentionSpan = mentionSpanProvider.getMentionSpanFor("@other:matrix.org", "https://matrix.to/#/@other:matrix.org")
         assertThat(mentionSpan.backgroundColor).isEqualTo(otherColor)
         assertThat(mentionSpan.textColor).isEqualTo(otherColor)
@@ -59,6 +66,14 @@ class MentionSpanProviderTest {
 
     @Test
     fun `getting mention span for a room should return a MentionSpan with normal colors`() {
+        permalinkParser.givenResult(
+            PermalinkData.RoomLink(
+                roomIdOrAlias = "#room:matrix.org",
+                isRoomAlias = true,
+                eventId = null,
+                viaParameters = persistentListOf(),
+            )
+        )
         val mentionSpan = mentionSpanProvider.getMentionSpanFor("#room:matrix.org", "https://matrix.to/#/#room:matrix.org")
         assertThat(mentionSpan.backgroundColor).isEqualTo(otherColor)
         assertThat(mentionSpan.textColor).isEqualTo(otherColor)
@@ -66,6 +81,14 @@ class MentionSpanProviderTest {
 
     @Test
     fun `getting mention span for @room should return a MentionSpan with normal colors`() {
+        permalinkParser.givenResult(
+            PermalinkData.RoomLink(
+                roomIdOrAlias = "#",
+                isRoomAlias = true,
+                eventId = null,
+                viaParameters = persistentListOf(),
+            )
+        )
         val mentionSpan = mentionSpanProvider.getMentionSpanFor("@room", "#")
         assertThat(mentionSpan.backgroundColor).isEqualTo(otherColor)
         assertThat(mentionSpan.textColor).isEqualTo(otherColor)