Some renaming for clarity, especially "RemoveFailed" was not clear, developer may think the that removing has failed.

bmarty · bmarty · commit 94eb1dac4f57 · 2024-04-04T15:08:25.000+02:00
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuEvents.kt
@@ -20,7 +20,7 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
 
 sealed interface RetrySendMenuEvents {
     data class EventSelected(val event: TimelineItem.Event) : RetrySendMenuEvents
-    data object RetrySend : RetrySendMenuEvents
-    data object RemoveFailed : RetrySendMenuEvents
+    data object Retry : RetrySendMenuEvents
+    data object Remove : RetrySendMenuEvents
     data object Dismiss : RetrySendMenuEvents
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenter.kt
@@ -41,15 +41,15 @@ class RetrySendMenuPresenter @Inject constructor(
                 is RetrySendMenuEvents.EventSelected -> {
                     selectedEvent = event.event
                 }
-                RetrySendMenuEvents.RetrySend -> {
+                RetrySendMenuEvents.Retry -> {
                     coroutineScope.launch {
                         selectedEvent?.transactionId?.let { transactionId ->
                             room.retrySendMessage(transactionId)
                         }
                         selectedEvent = null
                     }
                 }
-                RetrySendMenuEvents.RemoveFailed -> {
+                RetrySendMenuEvents.Remove -> {
                     coroutineScope.launch {
                         selectedEvent?.transactionId?.let { transactionId ->
                             room.cancelSend(transactionId)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMessageMenu.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMessageMenu.kt
@@ -53,18 +53,18 @@ internal fun RetrySendMessageMenu(
     }
 
     fun onRetry() {
-        state.eventSink(RetrySendMenuEvents.RetrySend)
+        state.eventSink(RetrySendMenuEvents.Retry)
     }
 
-    fun onRemoveFailed() {
-        state.eventSink(RetrySendMenuEvents.RemoveFailed)
+    fun onRemove() {
+        state.eventSink(RetrySendMenuEvents.Remove)
     }
 
     RetrySendMessageMenuBottomSheet(
         modifier = modifier,
         isVisible = isVisible,
         onRetry = ::onRetry,
-        onRemoveFailed = ::onRemoveFailed,
+        onRemove = ::onRemove,
         onDismiss = ::onDismiss
     )
 }
@@ -74,7 +74,7 @@ internal fun RetrySendMessageMenu(
 private fun RetrySendMessageMenuBottomSheet(
     isVisible: Boolean,
     onRetry: () -> Unit,
-    onRemoveFailed: () -> Unit,
+    onRemove: () -> Unit,
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -94,7 +94,10 @@ private fun RetrySendMessageMenuBottomSheet(
                 }
             }
         ) {
-            RetrySendMenuContents(onRetry = onRetry, onRemoveFailed = onRemoveFailed)
+            RetrySendMenuContents(
+                onRetry = onRetry,
+                onRemove = onRemove,
+            )
             // FIXME remove after https://issuetracker.google.com/issues/275849044
             Spacer(modifier = Modifier.height(32.dp))
         }
@@ -105,7 +108,7 @@ private fun RetrySendMessageMenuBottomSheet(
 @Composable
 private fun ColumnScope.RetrySendMenuContents(
     onRetry: () -> Unit,
-    onRemoveFailed: () -> Unit,
+    onRemove: () -> Unit,
     sheetState: SheetState = rememberModalBottomSheetState(),
 ) {
     val coroutineScope = rememberCoroutineScope()
@@ -141,7 +144,7 @@ private fun ColumnScope.RetrySendMenuContents(
         modifier = Modifier.clickable {
             coroutineScope.launch {
                 sheetState.hide()
-                onRemoveFailed()
+                onRemove()
             }
         }
     )
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenterTests.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenterTests.kt
@@ -73,7 +73,7 @@ class RetrySendMenuPresenterTests {
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
 
-            initialState.eventSink(RetrySendMenuEvents.RetrySend)
+            initialState.eventSink(RetrySendMenuEvents.Retry)
             assertThat(room.retrySendMessageCount).isEqualTo(1)
             assertThat(awaitItem().selectedEvent).isNull()
         }
@@ -89,7 +89,7 @@ class RetrySendMenuPresenterTests {
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
 
-            initialState.eventSink(RetrySendMenuEvents.RetrySend)
+            initialState.eventSink(RetrySendMenuEvents.Retry)
             assertThat(room.retrySendMessageCount).isEqualTo(0)
             assertThat(awaitItem().selectedEvent).isNull()
         }
@@ -106,7 +106,7 @@ class RetrySendMenuPresenterTests {
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
 
-            initialState.eventSink(RetrySendMenuEvents.RetrySend)
+            initialState.eventSink(RetrySendMenuEvents.Retry)
             assertThat(room.retrySendMessageCount).isEqualTo(1)
             assertThat(awaitItem().selectedEvent).isNull()
         }
@@ -122,7 +122,7 @@ class RetrySendMenuPresenterTests {
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
 
-            initialState.eventSink(RetrySendMenuEvents.RemoveFailed)
+            initialState.eventSink(RetrySendMenuEvents.Remove)
             assertThat(room.cancelSendCount).isEqualTo(1)
             assertThat(awaitItem().selectedEvent).isNull()
         }
@@ -138,7 +138,7 @@ class RetrySendMenuPresenterTests {
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
 
-            initialState.eventSink(RetrySendMenuEvents.RemoveFailed)
+            initialState.eventSink(RetrySendMenuEvents.Remove)
             assertThat(room.cancelSendCount).isEqualTo(0)
             assertThat(awaitItem().selectedEvent).isNull()
         }
@@ -155,7 +155,7 @@ class RetrySendMenuPresenterTests {
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
 
-            initialState.eventSink(RetrySendMenuEvents.RemoveFailed)
+            initialState.eventSink(RetrySendMenuEvents.Remove)
             assertThat(room.cancelSendCount).isEqualTo(1)
             assertThat(awaitItem().selectedEvent).isNull()
         }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem`
`20`	`20`
`21`	`21`	`sealed interface RetrySendMenuEvents {`
`22`	`22`	`data class EventSelected(val event: TimelineItem.Event) : RetrySendMenuEvents`
`23`		`- data object RetrySend : RetrySendMenuEvents`
`24`		`- data object RemoveFailed : RetrySendMenuEvents`
	`23`	`+ data object Retry : RetrySendMenuEvents`
	`24`	`+ data object Remove : RetrySendMenuEvents`
`25`	`25`	`data object Dismiss : RetrySendMenuEvents`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,15 +41,15 @@ class RetrySendMenuPresenter @Inject constructor(`
`41`	`41`	`is RetrySendMenuEvents.EventSelected -> {`
`42`	`42`	`selectedEvent = event.event`
`43`	`43`	`}`
`44`		`- RetrySendMenuEvents.RetrySend -> {`
	`44`	`+ RetrySendMenuEvents.Retry -> {`
`45`	`45`	`coroutineScope.launch {`
`46`	`46`	`selectedEvent?.transactionId?.let { transactionId ->`
`47`	`47`	`room.retrySendMessage(transactionId)`
`48`	`48`	`}`
`49`	`49`	`selectedEvent = null`
`50`	`50`	`}`
`51`	`51`	`}`
`52`		`- RetrySendMenuEvents.RemoveFailed -> {`
	`52`	`+ RetrySendMenuEvents.Remove -> {`
`53`	`53`	`coroutineScope.launch {`
`54`	`54`	`selectedEvent?.transactionId?.let { transactionId ->`
`55`	`55`	`room.cancelSend(transactionId)`
Original file line number	Diff line number	Diff line change
`@@ -53,18 +53,18 @@ internal fun RetrySendMessageMenu(`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`fun onRetry() {`
`56`		`- state.eventSink(RetrySendMenuEvents.RetrySend)`
	`56`	`+ state.eventSink(RetrySendMenuEvents.Retry)`
`57`	`57`	`}`
`58`	`58`
`59`		`- fun onRemoveFailed() {`
`60`		`- state.eventSink(RetrySendMenuEvents.RemoveFailed)`
	`59`	`+ fun onRemove() {`
	`60`	`+ state.eventSink(RetrySendMenuEvents.Remove)`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`RetrySendMessageMenuBottomSheet(`
`64`	`64`	`modifier = modifier,`
`65`	`65`	`isVisible = isVisible,`
`66`	`66`	`onRetry = ::onRetry,`
`67`		`- onRemoveFailed = ::onRemoveFailed,`
	`67`	`+ onRemove = ::onRemove,`
`68`	`68`	`onDismiss = ::onDismiss`
`69`	`69`	`)`
`70`	`70`	`}`
`@@ -74,7 +74,7 @@ internal fun RetrySendMessageMenu(`
`74`	`74`	`private fun RetrySendMessageMenuBottomSheet(`
`75`	`75`	`isVisible: Boolean,`
`76`	`76`	`onRetry: () -> Unit,`
`77`		`- onRemoveFailed: () -> Unit,`
	`77`	`+ onRemove: () -> Unit,`
`78`	`78`	`onDismiss: () -> Unit,`
`79`	`79`	`modifier: Modifier = Modifier,`
`80`	`80`	`) {`
`@@ -94,7 +94,10 @@ private fun RetrySendMessageMenuBottomSheet(`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`) {`
`97`		`- RetrySendMenuContents(onRetry = onRetry, onRemoveFailed = onRemoveFailed)`
	`97`	`+ RetrySendMenuContents(`
	`98`	`+ onRetry = onRetry,`
	`99`	`+ onRemove = onRemove,`
	`100`	`+ )`
`98`	`101`	`// FIXME remove after https://issuetracker.google.com/issues/275849044`
`99`	`102`	`Spacer(modifier = Modifier.height(32.dp))`
`100`	`103`	`}`
`@@ -105,7 +108,7 @@ private fun RetrySendMessageMenuBottomSheet(`
`105`	`108`	`@Composable`
`106`	`109`	`private fun ColumnScope.RetrySendMenuContents(`
`107`	`110`	`onRetry: () -> Unit,`
`108`		`- onRemoveFailed: () -> Unit,`
	`111`	`+ onRemove: () -> Unit,`
`109`	`112`	`sheetState: SheetState = rememberModalBottomSheetState(),`
`110`	`113`	`) {`
`111`	`114`	`val coroutineScope = rememberCoroutineScope()`
`@@ -141,7 +144,7 @@ private fun ColumnScope.RetrySendMenuContents(`
`141`	`144`	`modifier = Modifier.clickable {`
`142`	`145`	`coroutineScope.launch {`
`143`	`146`	`sheetState.hide()`
`144`		`- onRemoveFailed()`
	`147`	`+ onRemove()`
`145`	`148`	`}`
`146`	`149`	`}`
`147`	`150`	`)`