[Android] Edit link with text + url

platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/LinkDialog.kt

@@ -29,11 +29,13 @@ fun LinkDialog(
     onRemoveLink: () -> Unit,
     onSetLink: (url: String) -> Unit,
     onInsertLink: (url: String, text: String) -> Unit,
+    onEditLink: (url: String, text: String) -> Unit,
     onDismissRequest: () -> Unit,
 ) {
-    val currentUrl = (linkAction as? LinkAction.SetLink)?.currentUrl
+    val currentUrl = (linkAction as? LinkAction.SetLink)?.currentUrl ?: (linkAction as? LinkAction.EditLink)?.currentUrl
+    val currentText = (linkAction as? LinkAction.EditLink)?.currentText
 
-    var newText by remember { mutableStateOf("") }
+    var newText by remember { mutableStateOf(currentText ?: "") }
     var newLink by remember { mutableStateOf(currentUrl ?: "") }
 
     Dialog(onDismissRequest = onDismissRequest) {
@@ -45,7 +47,7 @@ fun LinkDialog(
                 modifier = Modifier.padding(16.dp),
                 verticalArrangement = Arrangement.spacedBy(8.dp),
             ) {
-                if (linkAction is LinkAction.InsertLink) {
+                if (linkAction is LinkAction.InsertLink || linkAction is LinkAction.EditLink) {
                     OutlinedTextField(
                         value = newText, onValueChange = { newText = it }, placeholder = {
                             Text(text = stringResource(R.string.link_text))
@@ -71,6 +73,7 @@ fun LinkDialog(
                             when (linkAction) {
                                 LinkAction.InsertLink -> onInsertLink(newLink, newText)
                                 is LinkAction.SetLink -> onSetLink(newLink)
+                                is LinkAction.EditLink -> onEditLink(newLink, newText)
                             }
                             onDismissRequest()
                         }) {
@@ -80,6 +83,7 @@ fun LinkDialog(
                                 when (linkAction) {
                                     LinkAction.InsertLink -> R.string.link_insert
                                     is LinkAction.SetLink -> R.string.link_set
+                                    is LinkAction.EditLink -> R.string.link_edit
                                 }
                             )
                         )
@@ -98,6 +102,7 @@ fun PreviewSetLinkDialog() {
         onRemoveLink = {},
         onSetLink = {},
         onInsertLink = { _, _ -> },
+        onEditLink = { _, _ -> },
         onDismissRequest = {}
     )
 }
@@ -110,6 +115,7 @@ fun PreviewInsertLinkDialog() {
         onRemoveLink = {},
         onSetLink = {},
         onInsertLink = { _, _ -> },
+        onEditLink = { _, _ -> },
         onDismissRequest = {}
     )
 }

platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/MainActivity.kt

@@ -62,6 +62,13 @@ class MainActivity : ComponentActivity() {
                                 )
                             }
                         },
+                        onEditLink = { url, text ->
+                            coroutineScope.launch {
+                                state.editLink(
+                                    url, text
+                                )
+                            }
+                        },
                         onDismissRequest = { linkDialogAction = null })
                 }
                 Surface(

platforms/android/example-compose/src/main/res/values/strings.xml

@@ -5,4 +5,5 @@
     <string name="link_insert">Insert link</string>
     <string name="link_text">Text</string>
     <string name="link_url">Link</string>
+    <string name="link_edit">Edit link</string>
 </resources>

platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/MainActivity.kt

@@ -56,6 +56,26 @@ class MainActivity : AppCompatActivity() {
 
                 dialogBinding.link.performClick()
             }
+            override fun openEditLinkDialog(
+                currentText: String?,
+                currentLink: String?,
+                callback: (text: String, url: String) -> Unit
+            ) {
+                val dialogBinding = DialogSetLinkBinding.inflate(LayoutInflater.from(context))
+                val title = R.string.edit_link
+                dialogBinding.link.setText(currentLink)
+                dialogBinding.text.setText(currentText)
+                AlertDialog.Builder(context)
+                    .setTitle(title)
+                    .setView(dialogBinding.root)
+                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                        callback(dialogBinding.text.text.toString(), dialogBinding.link.text.toString())
+                    }
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .show()
+
+                dialogBinding.link.performClick()
+            }
         }
     }
 

platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/RichTextEditor.kt

@@ -89,6 +89,10 @@ class RichTextEditor : LinearLayout {
                         onSetLinkListener?.openSetLinkDialog(linkAction.currentUrl) { url ->
                             richTextEditText.setLink(url)
                         }
+                    is LinkAction.EditLink ->
+                        onSetLinkListener?.openEditLinkDialog(linkAction.currentText, linkAction.currentUrl) { text, url ->
+                            richTextEditText.editLink(url = url, text = text)
+                        }
                 }
             }
             undoButton.setOnClickListener {
@@ -199,4 +203,5 @@ class RichTextEditor : LinearLayout {
 interface OnSetLinkListener {
     fun openSetLinkDialog(currentLink: String?, callback: (url: String?) -> Unit)
     fun openInsertLinkDialog(callback: (text: String, url: String) -> Unit)
+    fun openEditLinkDialog(currentText: String?, currentLink: String?, callback: (text: String, url: String) -> Unit)
 }

platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditor.kt

@@ -123,6 +123,7 @@ private fun RealEditor(
                             is ViewAction.SetLink -> setLink(it.url)
                             is ViewAction.RemoveLink -> removeLink()
                             is ViewAction.InsertLink -> insertLink(it.url, it.text)
+                            is ViewAction.EditLink -> editLink(it.url, it.text)
                         }
                     }
                 }

platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditorState.kt

@@ -141,6 +141,16 @@ class RichTextEditorState(
         _viewActions.emit(ViewAction.InsertLink(url, text))
     }
 
+    /**
+     * Edit a link with new URL and text.
+     *
+     * @param url The link URL to set
+     * @param text The new text to insert
+     */
+    suspend fun  editLink(url: String, text: String) {
+        _viewActions.emit(ViewAction.EditLink(url, text))
+    }
+
     /**
      * The content of the editor as HTML formatted for sending as a message.
      */

platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/FakeViewConnection.kt

@@ -44,6 +44,7 @@ internal class FakeViewActionCollector(
             ViewAction.RequestFocus -> requestFocus()
             is ViewAction.SetHtml -> setHtml(value.html)
             is ViewAction.SetLink -> setLink(value.url)
+            is ViewAction.EditLink -> editLink(value.url, value.text)
             ViewAction.ToggleCodeBlock -> toggleCodeBlock()
             is ViewAction.ToggleInlineFormat -> toggleInlineFormat(value.inlineFormat)
             is ViewAction.ToggleList -> toggleList(value.ordered)
@@ -107,6 +108,10 @@ internal class FakeViewActionCollector(
         state.linkAction = url?.let { LinkAction.SetLink(it) } ?: LinkAction.InsertLink
     }
 
+    private fun editLink(url: String?, text: String?) {
+        state.linkAction = LinkAction.EditLink(currentText = text, currentUrl = url)
+    }
+
     private fun removeLink() {
         state.linkAction = LinkAction.InsertLink
     }

platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/ViewAction.kt

@@ -16,4 +16,5 @@ internal sealed class ViewAction {
     data class SetLink(val url: String?): ViewAction()
     data object RemoveLink: ViewAction()
     data class InsertLink(val url: String, val text: String): ViewAction()
+    data class EditLink(val url: String, val text: String): ViewAction()
 }

platforms/android/library/src/main/java/io/element/android/wysiwyg/EditorEditText.kt

@@ -366,6 +366,21 @@ class EditorEditText : AppCompatEditText {
         setSelectionFromComposerUpdate(result.selection.last)
     }
 
+    /**
+     * Edit text and url for selected link. This method does nothing if there is no link in selection.
+     *
+     * @param url The updated link URL
+     * @param text The updated link text
+     */
+    fun editLink(url: String, text: String) {
+        val result = viewModel.processInput(
+            EditorInputAction.EditLink(url, text)
+        ) ?: return
+
+        setTextFromComposerUpdate(result.text)
+        setSelectionFromComposerUpdate(result.selection.last)
+    }
+
     /**
      * Remove a link for the current selection. Convenience for setLink(null).
      *

platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/models/LinkActionExt.kt

@@ -6,7 +6,7 @@ import uniffi.wysiwyg_composer.LinkAction as InternalLinkAction
 
 internal fun InternalLinkAction.toApiModel(): LinkAction? =
     when (this) {
-        is InternalLinkAction.Edit -> LinkAction.SetLink(currentUrl = url)
+        is InternalLinkAction.Edit -> LinkAction.EditLink(currentUrl = url, currentText = text)
         is InternalLinkAction.Create -> LinkAction.SetLink(currentUrl = null)
         is InternalLinkAction.CreateWithText -> LinkAction.InsertLink
         is InternalLinkAction.Disabled -> null

platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/EditorInputAction.kt

@@ -77,6 +77,11 @@ internal sealed interface EditorInputAction {
      */
     data class SetLink(val url: String): EditorInputAction
 
+    /**
+     * Edit a link to the [url] and [text] in the current selection.
+     */
+    data class EditLink(val url: String, val text: String): EditorInputAction
+
     /**
      * Remove link on the current selection.
      */

platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/EditorViewModel.kt

@@ -94,6 +94,12 @@ internal class EditorViewModel(
                     attributes = emptyList()
                 )
 
+                is EditorInputAction.EditLink -> composer?.editLinkWithText(
+                    url = action.url,
+                    text = action.text,
+                    attributes = emptyList()
+                )
+
                 is EditorInputAction.RemoveLink -> composer?.removeLinks()
                 is EditorInputAction.SetLinkWithText -> composer?.setLinkWithText(
                     action.link,

platforms/android/library/src/main/java/io/element/android/wysiwyg/view/models/LinkAction.kt

@@ -13,4 +13,9 @@ sealed class LinkAction {
      * Add or change the link url for the current selection, without supplying text.
      */
     data class SetLink(val currentUrl: String?) : LinkAction()
+
+    /**
+     * Change the link url and text for the current selection.
+     */
+    data class EditLink(val currentUrl: String?, val currentText: String?) : LinkAction()
 }