Skip to content

Commit 4445172

Browse files
committed
Fix rebase issues
1 parent 79a8069 commit 4445172

File tree

5 files changed

+16
-7
lines changed

5 files changed

+16
-7
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ koverMerged {
200200
"*Node$*",
201201
// Exclude `:libraries:matrix:impl` module, it contains only wrappers to access the Rust Matrix SDK api, so it is not really relevant to unit test it: there is no logic to test.
202202
"io.element.android.libraries.matrix.impl.*",
203-
"*Presenter\$present\$*"
203+
"*Presenter\$present\$*",
204204
// Forked from compose
205205
"io.element.android.libraries.designsystem.theme.components.bottomsheet.*",
206206
)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ import androidx.compose.foundation.layout.size
3636
import androidx.compose.foundation.layout.statusBars
3737
import androidx.compose.foundation.layout.width
3838
import androidx.compose.material3.ButtonDefaults
39-
import androidx.compose.foundation.lazy.LazyColumn
40-
import androidx.compose.foundation.lazy.items
4139
import androidx.compose.material3.ExperimentalMaterial3Api
4240
import androidx.compose.material3.MaterialTheme
4341
import androidx.compose.runtime.Composable

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/mentions/MentionSuggestionsProcessor.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,22 @@ import io.element.android.libraries.matrix.api.room.roomMembers
2525
import io.element.android.libraries.textcomposer.model.Suggestion
2626
import io.element.android.libraries.textcomposer.model.SuggestionType
2727

28+
/**
29+
* This class is responsible for processing mention suggestions when `@`, `/` or `#` are type in the composer.
30+
*/
2831
object MentionSuggestionsProcessor {
2932

33+
// We don't want to retrieve thousands of members
3034
private const val MAX_BATCH_ITEMS = 100
3135

36+
/**
37+
* Process the mention suggestions.
38+
* @param suggestion The current suggestion input
39+
* @param roomMembersState The room members state, it contains the current users in the room
40+
* @param currentUserId The current user id
41+
* @param canSendRoomMention Should return true if the current user can send room mentions
42+
* @return The list of mentions to display
43+
*/
3244
suspend fun process(
3345
suggestion: Suggestion?,
3446
roomMembersState: MatrixRoomMembersState,

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,7 @@ class MessageComposerPresenter @Inject constructor(
297297
attachmentsState = attachmentsState.value,
298298
memberSuggestions = memberSuggestions.toPersistentList(),
299299
eventSink = { handleEvents(it) }
300-
).also {
301-
println(it)
302-
}
300+
)
303301
}
304302

305303
private fun CoroutineScope.sendMessage(

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ import io.element.android.features.messages.impl.voicemessages.composer.VoiceMes
2929
import io.element.android.features.messages.impl.voicemessages.composer.VoiceMessageComposerStateProvider
3030
import io.element.android.features.messages.impl.voicemessages.composer.aVoiceMessageComposerState
3131
import io.element.android.libraries.designsystem.preview.ElementPreview
32+
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
3233
import io.element.android.libraries.textcomposer.TextComposer
3334
import io.element.android.libraries.textcomposer.model.Message
3435
import io.element.android.libraries.textcomposer.model.PressEvent
35-
import io.element.android.libraries.textcomposer.model.VoiceMessagePlayerEvent
3636
import io.element.android.libraries.textcomposer.model.Suggestion
37+
import io.element.android.libraries.textcomposer.model.VoiceMessagePlayerEvent
3738
import kotlinx.coroutines.launch
3839

3940
@Composable

0 commit comments

Comments
 (0)