From 4c56833adad891ea9c33b23d87737cfac51f239b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 25 Aug 2026 09:55:46 +0200 Subject: [PATCH] `DeclineAndBlockEvents` -> `DeclineAndBlockEvent` --- ...BlockEvents.kt => DeclineAndBlockEvent.kt} | 12 +++++----- .../DeclineAndBlockPresenter.kt | 12 +++++----- .../declineandblock/DeclineAndBlockState.kt | 2 +- .../DeclineAndBlockStatePreviewParam.kt | 2 +- .../declineandblock/DeclineAndBlockView.kt | 12 +++++----- .../DeclineAndBlockPresenterTest.kt | 14 ++++++------ .../DeclineAndBlockViewTest.kt | 22 +++++++++---------- 7 files changed, 38 insertions(+), 38 deletions(-) rename features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/{DeclineAndBlockEvents.kt => DeclineAndBlockEvent.kt} (57%) diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockEvents.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockEvent.kt similarity index 57% rename from features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockEvents.kt rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockEvent.kt index 1fc160e530..f31b9d042f 100644 --- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockEvents.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockEvent.kt @@ -8,10 +8,10 @@ package io.element.android.features.invite.impl.declineandblock -sealed interface DeclineAndBlockEvents { - data class UpdateReportReason(val reason: String) : DeclineAndBlockEvents - data object ToggleReportRoom : DeclineAndBlockEvents - data object ToggleBlockUser : DeclineAndBlockEvents - data object Decline : DeclineAndBlockEvents - data object ClearDeclineAction : DeclineAndBlockEvents +sealed interface DeclineAndBlockEvent { + data class UpdateReportReason(val reason: String) : DeclineAndBlockEvent + data object ToggleReportRoom : DeclineAndBlockEvent + data object ToggleBlockUser : DeclineAndBlockEvent + data object Decline : DeclineAndBlockEvent + data object ClearDeclineAction : DeclineAndBlockEvent } diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenter.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenter.kt index af2a10cbfd..170d003bea 100644 --- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenter.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenter.kt @@ -49,13 +49,13 @@ class DeclineAndBlockPresenter( val coroutineScope = rememberCoroutineScope() - fun handleEvent(event: DeclineAndBlockEvents) { + fun handleEvent(event: DeclineAndBlockEvent) { when (event) { - DeclineAndBlockEvents.ClearDeclineAction -> declineAction.value = AsyncAction.Uninitialized - DeclineAndBlockEvents.Decline -> coroutineScope.decline(reportReason, blockUser, reportRoom, declineAction) - DeclineAndBlockEvents.ToggleBlockUser -> blockUser = !blockUser - DeclineAndBlockEvents.ToggleReportRoom -> reportRoom = !reportRoom - is DeclineAndBlockEvents.UpdateReportReason -> reportReason = event.reason + DeclineAndBlockEvent.ClearDeclineAction -> declineAction.value = AsyncAction.Uninitialized + DeclineAndBlockEvent.Decline -> coroutineScope.decline(reportReason, blockUser, reportRoom, declineAction) + DeclineAndBlockEvent.ToggleBlockUser -> blockUser = !blockUser + DeclineAndBlockEvent.ToggleReportRoom -> reportRoom = !reportRoom + is DeclineAndBlockEvent.UpdateReportReason -> reportReason = event.reason } } diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockState.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockState.kt index 7dbbbfd60e..057929ea42 100644 --- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockState.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockState.kt @@ -15,7 +15,7 @@ data class DeclineAndBlockState( val reportReason: String, val blockUser: Boolean, val declineAction: AsyncAction, - val eventSink: (DeclineAndBlockEvents) -> Unit + val eventSink: (DeclineAndBlockEvent) -> Unit ) { val canDecline = blockUser || reportRoom && reportReason.isNotEmpty() } diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockStatePreviewParam.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockStatePreviewParam.kt index 704fc9f045..6690a568dd 100644 --- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockStatePreviewParam.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockStatePreviewParam.kt @@ -36,7 +36,7 @@ fun aDeclineAndBlockState( reportReason: String = "", blockUser: Boolean = false, declineAction: AsyncAction = AsyncAction.Uninitialized, - eventSink: (DeclineAndBlockEvents) -> Unit = {}, + eventSink: (DeclineAndBlockEvent) -> Unit = {}, ) = DeclineAndBlockState( reportRoom = reportRoom, reportReason = reportReason, diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockView.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockView.kt index c30742de12..eaace62309 100644 --- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockView.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockView.kt @@ -56,8 +56,8 @@ fun DeclineAndBlockView( async = state.declineAction, onSuccess = { onDeclineSuccess() }, errorMessage = { stringResource(CommonStrings.error_unknown) }, - onRetry = { state.eventSink(DeclineAndBlockEvents.Decline) }, - onErrorDismiss = { state.eventSink(DeclineAndBlockEvents.ClearDeclineAction) } + onRetry = { state.eventSink(DeclineAndBlockEvent.Decline) }, + onErrorDismiss = { state.eventSink(DeclineAndBlockEvent.ClearDeclineAction) } ) Scaffold( @@ -89,7 +89,7 @@ fun DeclineAndBlockView( Text(text = stringResource(R.string.screen_decline_and_block_block_user_option_description)) }, onClick = { - state.eventSink(DeclineAndBlockEvents.ToggleBlockUser) + state.eventSink(DeclineAndBlockEvent.ToggleBlockUser) }, trailingContent = ListItemContent.Switch(checked = state.blockUser) ) @@ -104,7 +104,7 @@ fun DeclineAndBlockView( Text(text = stringResource(R.string.screen_decline_and_block_report_user_option_description)) }, onClick = { - state.eventSink(DeclineAndBlockEvents.ToggleReportRoom) + state.eventSink(DeclineAndBlockEvent.ToggleReportRoom) }, trailingContent = ListItemContent.Switch(checked = state.reportRoom) ) @@ -113,7 +113,7 @@ fun DeclineAndBlockView( Spacer(modifier = Modifier.height(24.dp)) TextField( value = state.reportReason, - onValueChange = { state.eventSink(DeclineAndBlockEvents.UpdateReportReason(it)) }, + onValueChange = { state.eventSink(DeclineAndBlockEvent.UpdateReportReason(it)) }, placeholder = stringResource(R.string.screen_decline_and_block_report_user_reason_placeholder), minLines = 3, enabled = !isDeclining, @@ -132,7 +132,7 @@ fun DeclineAndBlockView( enabled = !isDeclining && state.canDecline, onClick = { focusManager.clearFocus(force = true) - state.eventSink(DeclineAndBlockEvents.Decline) + state.eventSink(DeclineAndBlockEvent.Decline) }, modifier = Modifier .fillMaxWidth() diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenterTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenterTest.kt index 67c2d55490..61c67c34b3 100644 --- a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenterTest.kt +++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenterTest.kt @@ -53,21 +53,21 @@ class DeclineAndBlockPresenterTest { assertThat(state.blockUser).isTrue() assertThat(state.reportReason).isEmpty() assertThat(state.canDecline).isTrue() - state.eventSink(DeclineAndBlockEvents.ToggleBlockUser) + state.eventSink(DeclineAndBlockEvent.ToggleBlockUser) } awaitItem().also { state -> assertThat(state.reportRoom).isFalse() assertThat(state.blockUser).isFalse() assertThat(state.reportReason).isEmpty() assertThat(state.canDecline).isFalse() - state.eventSink(DeclineAndBlockEvents.ToggleReportRoom) + state.eventSink(DeclineAndBlockEvent.ToggleReportRoom) } awaitItem().also { state -> assertThat(state.reportRoom).isTrue() assertThat(state.blockUser).isFalse() assertThat(state.reportReason).isEmpty() assertThat(state.canDecline).isFalse() - state.eventSink(DeclineAndBlockEvents.UpdateReportReason("Spam")) + state.eventSink(DeclineAndBlockEvent.UpdateReportReason("Spam")) } awaitItem().also { state -> assertThat(state.reportRoom).isTrue() @@ -87,7 +87,7 @@ class DeclineAndBlockPresenterTest { ) presenter.test { awaitItem().also { state -> - state.eventSink(DeclineAndBlockEvents.Decline) + state.eventSink(DeclineAndBlockEvent.Decline) } assertThat(awaitItem().declineAction.isLoading()).isTrue() awaitItem().also { state -> @@ -110,12 +110,12 @@ class DeclineAndBlockPresenterTest { ) presenter.test { awaitItem().also { state -> - state.eventSink(DeclineAndBlockEvents.Decline) + state.eventSink(DeclineAndBlockEvent.Decline) } assertThat(awaitItem().declineAction.isLoading()).isTrue() awaitItem().also { state -> assertThat(state.declineAction).isInstanceOf(AsyncAction.Failure::class.java) - state.eventSink(DeclineAndBlockEvents.ClearDeclineAction) + state.eventSink(DeclineAndBlockEvent.ClearDeclineAction) } awaitItem().also { state -> assertThat(state.declineAction).isInstanceOf(AsyncAction.Uninitialized::class.java) @@ -137,7 +137,7 @@ class DeclineAndBlockPresenterTest { ) presenter.test { awaitItem().also { state -> - state.eventSink(DeclineAndBlockEvents.Decline) + state.eventSink(DeclineAndBlockEvent.Decline) } assertThat(awaitItem().declineAction.isLoading()).isTrue() awaitItem().also { state -> diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockViewTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockViewTest.kt index 5cfb091e82..d3505ae5b2 100644 --- a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockViewTest.kt +++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockViewTest.kt @@ -30,7 +30,7 @@ import org.junit.Test class DeclineAndBlockViewTest : RobolectricTest() { @Test fun `clicking on back invoke the expected callback`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder(expectEvents = false) + val eventsRecorder = EventsRecorder(expectEvents = false) ensureCalledOnce { setDeclineAndBlockView( aDeclineAndBlockState( @@ -44,7 +44,7 @@ class DeclineAndBlockViewTest : RobolectricTest() { @Test fun `a successful decline invokes the expected callback`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder(expectEvents = false) + val eventsRecorder = EventsRecorder(expectEvents = false) ensureCalledOnce { setDeclineAndBlockView( aDeclineAndBlockState( @@ -58,7 +58,7 @@ class DeclineAndBlockViewTest : RobolectricTest() { @Test fun `clicking on decline when enabled emits the expected event`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder() + val eventsRecorder = EventsRecorder() setDeclineAndBlockView( aDeclineAndBlockState( blockUser = true, @@ -66,12 +66,12 @@ class DeclineAndBlockViewTest : RobolectricTest() { ), ) clickOn(CommonStrings.action_decline) - eventsRecorder.assertSingle(DeclineAndBlockEvents.Decline) + eventsRecorder.assertSingle(DeclineAndBlockEvent.Decline) } @Test fun `clicking on decline when disabled does not emit event`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder(expectEvents = false) + val eventsRecorder = EventsRecorder(expectEvents = false) setDeclineAndBlockView( aDeclineAndBlockState( blockUser = false, @@ -85,7 +85,7 @@ class DeclineAndBlockViewTest : RobolectricTest() { @Test fun `clicking on block option emits the expected event`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder() + val eventsRecorder = EventsRecorder() setDeclineAndBlockView( aDeclineAndBlockState( blockUser = true, @@ -93,12 +93,12 @@ class DeclineAndBlockViewTest : RobolectricTest() { ), ) clickOn(R.string.screen_decline_and_block_block_user_option_title) - eventsRecorder.assertSingle(DeclineAndBlockEvents.ToggleBlockUser) + eventsRecorder.assertSingle(DeclineAndBlockEvent.ToggleBlockUser) } @Test fun `clicking on report room option emits the expected event`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder() + val eventsRecorder = EventsRecorder() setDeclineAndBlockView( aDeclineAndBlockState( reportRoom = true, @@ -106,12 +106,12 @@ class DeclineAndBlockViewTest : RobolectricTest() { ), ) clickOn(CommonStrings.action_report_room) - eventsRecorder.assertSingle(DeclineAndBlockEvents.ToggleReportRoom) + eventsRecorder.assertSingle(DeclineAndBlockEvent.ToggleReportRoom) } @Test fun `typing text in the reason field emits the expected Event`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder() + val eventsRecorder = EventsRecorder() setDeclineAndBlockView( aDeclineAndBlockState( reportRoom = true, @@ -120,7 +120,7 @@ class DeclineAndBlockViewTest : RobolectricTest() { ), ) onNodeWithText("").performTextInput("Spam!") - eventsRecorder.assertSingle(DeclineAndBlockEvents.UpdateReportReason("Spam!")) + eventsRecorder.assertSingle(DeclineAndBlockEvent.UpdateReportReason("Spam!")) } }