Convert the comment editor to Compose and save via wordpress-rs

WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java

@@ -16,7 +16,6 @@
 import org.wordpress.android.ui.bloggingreminders.BloggingReminderBottomSheetFragment;
 import org.wordpress.android.ui.bloggingreminders.BloggingReminderTimePicker;
 import org.wordpress.android.ui.comments.CommentDetailFragment;
-import org.wordpress.android.ui.comments.unified.EditCancelDialogFragment;
 import org.wordpress.android.ui.comments.unified.UnifiedCommentDetailsFragment;
 import org.wordpress.android.ui.comments.unified.UnifiedCommentListAdapter;
 import org.wordpress.android.ui.comments.unified.UnifiedCommentListFragment;
@@ -489,8 +488,6 @@ public interface AppComponent {
 
     void inject(UnifiedCommentsEditFragment object);
 
-    void inject(EditCancelDialogFragment object);
-
     void inject(BloggingReminderBottomSheetFragment object);
 
     void inject(LocalePickerBottomSheet object);

WordPress/src/main/java/org/wordpress/android/ui/comments/unified/CommentEssentials.kt

@@ -5,8 +5,7 @@ data class CommentEssentials(
     val userName: String = "",
     val commentText: String = "",
     val userUrl: String = "",
-    val userEmail: String = "",
-    val isFromRegisteredUser: Boolean = true
+    val userEmail: String = ""
 ) {
     /**
      * Checks if this instance of CommentEssentials is valid. An invalid instance should not be used to display data.

WordPress/src/main/java/org/wordpress/android/ui/comments/unified/CommentsRsDataSource.kt

@@ -206,6 +206,63 @@ class CommentsRsDataSource @Inject constructor(
     suspend fun updateStatus(site: SiteModel, commentId: Long, status: CommentStatus): RsResult =
         write(site) { it.comments().update(commentId, CommentUpdateParams(status = status.toRsCommentStatus())) }
 
+    /** Editable author-identity fields, applied to the comment record for any comment. */
+    data class CommentAuthor(val name: String, val email: String, val url: String)
+
+    /**
+     * The server's post-save state of an edited comment. Mirroring this (rather than the values
+     * that were sent) into the FluxC cache keeps the cache faithful when the server normalises
+     * fields — e.g. content passes through KSES filtering.
+     */
+    data class RsEditedComment(
+        val authorName: String,
+        val authorEmail: String,
+        val authorUrl: String,
+        val contentRaw: String
+    )
+
+    /** Result of editing a comment, carrying the server's resulting state on success. */
+    sealed interface RsEditResult {
+        data class Success(val comment: RsEditedComment) : RsEditResult
+        data class Error(val message: String?) : RsEditResult
+    }
+
+    /** Edits a comment's body and author identity, returning the state the server stored. */
+    suspend fun updateComment(
+        site: SiteModel,
+        commentId: Long,
+        content: String,
+        author: CommentAuthor
+    ): RsEditResult = safe(errorValue = RsEditResult.Error(null)) {
+        val client = wpApiClientProvider.getWpApiClient(site)
+        val result = client.request {
+            it.comments().update(
+                commentId,
+                CommentUpdateParams(
+                    content = content,
+                    authorName = author.name,
+                    authorEmail = author.email,
+                    authorUrl = author.url
+                )
+            )
+        }
+        when (result) {
+            is WpRequestResult.Success -> {
+                val serverComment = result.response.data
+                RsEditResult.Success(
+                    RsEditedComment(
+                        authorName = serverComment.authorName,
+                        authorEmail = serverComment.authorEmail,
+                        authorUrl = serverComment.authorUrl,
+                        contentRaw = serverComment.content.raw
+                    )
+                )
+            }
+            is WpRequestResult.WpError -> RsEditResult.Error(result.errorMessage)
+            else -> RsEditResult.Error(null)
+        }
+    }
+
     suspend fun delete(site: SiteModel, commentId: Long): RsResult =
         write(site) { it.comments().delete(commentId, CommentDeleteParams()) }
 

WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentDetailsFragment.kt

@@ -11,9 +11,7 @@ import android.view.ViewGroup
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.SnackbarResult
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -24,8 +22,6 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import com.google.android.material.snackbar.BaseTransientBottomBar.BaseCallback
-import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -43,6 +39,7 @@ import org.wordpress.android.ui.comments.unified.UnifiedCommentDetailsViewModel.
 import org.wordpress.android.ui.comments.unified.compose.CommentDetailsActions
 import org.wordpress.android.ui.comments.unified.compose.UnifiedCommentDetailsScreen
 import org.wordpress.android.ui.compose.theme.AppThemeM3
+import org.wordpress.android.ui.compose.utils.showMessage
 import org.wordpress.android.ui.notifications.NotificationsListFragment
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
 import org.wordpress.android.ui.reader.ReaderActivityLauncher
@@ -287,40 +284,11 @@ class UnifiedCommentDetailsFragment : Fragment() {
 
     private fun showSnackbar(holder: SnackbarMessageHolder) {
         val context = context ?: return
-        val message = uiHelpers.getTextOfUiString(context, holder.message).toString()
-        val actionLabel = holder.buttonTitle?.let { uiHelpers.getTextOfUiString(context, it).toString() }
         viewLifecycleOwner.lifecycleScope.launch {
-            // MANUAL is reported when the view is torn down (e.g. rotation) while the snackbar is
-            // still showing: cancellation skips the try body, but the finally block still fires
-            // onDismissAction, matching the legacy Snackbar callback which fired on view detach.
-            // That matters for the load-error snackbar, whose dismiss action closes the screen.
-            var dismissEvent = BaseCallback.DISMISS_EVENT_MANUAL
-            try {
-                val result = snackbarHostState.showSnackbar(
-                    message = message,
-                    actionLabel = actionLabel,
-                    duration = holder.duration.toSnackbarDuration()
-                )
-                dismissEvent = if (result == SnackbarResult.ActionPerformed) {
-                    holder.buttonAction()
-                    BaseCallback.DISMISS_EVENT_ACTION
-                } else {
-                    BaseCallback.DISMISS_EVENT_TIMEOUT
-                }
-            } finally {
-                holder.onDismissAction(dismissEvent)
-            }
+            snackbarHostState.showMessage(holder, context, uiHelpers)
         }
     }
 
-    // Compose SnackbarDuration ignores the millisecond-style Snackbar length constants the holders
-    // carry, so map them explicitly to preserve the legacy LENGTH_LONG display time.
-    private fun Int.toSnackbarDuration(): SnackbarDuration = when (this) {
-        Snackbar.LENGTH_SHORT -> SnackbarDuration.Short
-        Snackbar.LENGTH_INDEFINITE -> SnackbarDuration.Indefinite
-        else -> SnackbarDuration.Long
-    }
-
     private fun copyLink(url: String) {
         if (url.isEmpty()) return
         val clipboard = requireContext().getSystemService(ClipboardManager::class.java)