Fix review comments

matrix-org · Nov 6, 2023 · 3cc816c · 3cc816c
1 parent 8bfa70a
commit 3cc816c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/MainActivity.kt b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/MainActivity.kt
@@ -66,8 +66,6 @@ class MainActivity : ComponentActivity() {
 
                 val state = rememberRichTextEditorState(initialFocus = true)
 
-                Timber.d("Mentions state: ${state.mentionsState}")
-
                 LaunchedEffect(state.menuAction) {
                     processMenuAction(state.menuAction, roomMemberSuggestions)
                 }
@@ -130,7 +128,7 @@ class MainActivity : ComponentActivity() {
                         SuggestionView(
                             modifier = Modifier.heightIn(max = 320.dp),
                             roomMemberSuggestions = roomMemberSuggestions,
-                            onReplaceSuggestionText = { text ->
+                            onReplaceSuggestion = { text ->
                                 coroutineScope.launch {
                                     state.replaceSuggestion(text)
                                 }

diff --git a/...forms/android/example-compose/src/main/java/io/element/wysiwyg/compose/SuggestionsView.kt b/...forms/android/example-compose/src/main/java/io/element/wysiwyg/compose/SuggestionsView.kt
@@ -20,7 +20,7 @@ import uniffi.wysiwyg_composer.PatternKey
 fun SuggestionView(
     modifier: Modifier = Modifier,
     roomMemberSuggestions: SnapshotStateList<Mention>,
-    onReplaceSuggestionText: (String) -> Unit,
+    onReplaceSuggestion: (String) -> Unit,
     onInsertMentionAtSuggestion: (text: String, link: String) -> Unit,
     onInsertAtRoomMentionAtSuggestion: () -> Unit,
 ) {
@@ -38,8 +38,8 @@ fun SuggestionView(
                                 Mention.NotifyEveryone -> {
                                     onInsertAtRoomMentionAtSuggestion()
                                 }
-                                is Mention.Command -> {
-                                    onReplaceSuggestionText(item.text)
+                                is Mention.SlashCommand -> {
+                                    onReplaceSuggestion(item.text)
                                 }
                                 is Mention.Room -> {
                                     // TODO Handle room mention
@@ -75,12 +75,12 @@ private fun processSuggestion(suggestion: MenuAction.Suggestion, roomMemberSugge
     val text = suggestion.suggestionPattern.text
     val people = listOf("alice", "bob", "carol", "dan").map(Mention::User)
     val rooms = listOf("matrix", "element").map(Mention::Room)
-    val commands = listOf("leave", "shrug").map(Mention::Command)
+    val slashCommands = listOf("leave", "shrug").map(Mention::SlashCommand)
     val everyone = Mention.NotifyEveryone
     val names = when (suggestion.suggestionPattern.key) {
         PatternKey.AT -> people + everyone
         PatternKey.HASH -> rooms
-        PatternKey.SLASH -> commands
+        PatternKey.SLASH -> slashCommands
     }
     val suggestions = names
         .filter { it.display.contains(text) }

diff --git a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/matrix/Mention.kt b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/matrix/Mention.kt
@@ -23,7 +23,7 @@ sealed class Mention(
         override val key: String = "@"
     }
 
-    class Command(
+    class SlashCommand(
         display: String
     ): Mention(display) {
         override val key: String = "/"

diff --git a/...forms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/RichTextEditor.kt b/...forms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/RichTextEditor.kt
@@ -176,7 +176,6 @@ class RichTextEditor : LinearLayout {
                                 item.link, item.text
                             )
                         }
-                        Timber.d("Mentions state: ${binding.richTextEditText.getMentionsState()}}")
                     }
             }
         }

diff --git a/...ndroid/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditor.kt b/...ndroid/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditor.kt
@@ -22,7 +22,6 @@ import io.element.android.wysiwyg.display.TextDisplay
 import io.element.android.wysiwyg.utils.RustErrorCollector
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import timber.log.Timber
 
 
 /**
@@ -174,7 +173,6 @@ private fun RealEditor(
         // more than it's strictly necessary. To avoid this, we can use a `remember` block to cache the `update` lambda, and only update it when needed.
         update = remember(style, typeface, mentionDisplayHandler, onError) {
             { view ->
-                Timber.d("RealEditor's update block called, recomposing!")
                 view.applyStyleInCompose(style)
                 view.typeface = typeface
                 view.updateStyle(style.toStyleConfig(view.context), mentionDisplayHandler)
-Original file line number
+Diff line change
@@ Expand Up / @@ -176,7 +176,6 @@ class RichTextEditor : LinearLayout { @@
                                     item.link, item.text
                                 )
                             }
-                            Timber.d("Mentions state: ${binding.richTextEditText.getMentionsState()}}")
                         }
                 }
             }
@@ Expand Down @@