diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvent.kt similarity index 79% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvents.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvent.kt index 11abd63683..a4471d8a92 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvents.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvent.kt @@ -8,6 +8,6 @@ package io.element.android.features.login.impl.screens.qrcode.intro -sealed interface QrCodeIntroEvents { - data object Continue : QrCodeIntroEvents +sealed interface QrCodeIntroEvent { + data object Continue : QrCodeIntroEvent } diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt index 13888fe23f..0781942216 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt @@ -40,9 +40,9 @@ class QrCodeIntroPresenter( } } - fun handleEvent(event: QrCodeIntroEvents) { + fun handleEvent(event: QrCodeIntroEvent) { when (event) { - QrCodeIntroEvents.Continue -> if (cameraPermissionState.permissionGranted) { + QrCodeIntroEvent.Continue -> if (cameraPermissionState.permissionGranted) { canContinue = true } else { pendingPermissionRequest = true diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt index d20a3f58d9..ab84743404 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt @@ -15,5 +15,5 @@ data class QrCodeIntroState( val desktopAppName: String, val cameraPermissionState: PermissionsState, val canContinue: Boolean, - val eventSink: (QrCodeIntroEvents) -> Unit + val eventSink: (QrCodeIntroEvent) -> Unit ) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStatePreviewParam.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStatePreviewParam.kt index b9c286dc16..5e5fbac8b1 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStatePreviewParam.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStatePreviewParam.kt @@ -30,7 +30,7 @@ fun aQrCodeIntroState( permission = Manifest.permission.CAMERA, ), canContinue: Boolean = false, - eventSink: (QrCodeIntroEvents) -> Unit = {}, + eventSink: (QrCodeIntroEvent) -> Unit = {}, ) = QrCodeIntroState( appName = appName, desktopAppName = desktopAppName, diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt index 08a40b63c5..2691c0cbf5 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt @@ -91,7 +91,7 @@ private fun ColumnScope.Buttons( text = stringResource(id = R.string.screen_qr_code_login_initial_state_button_title), modifier = Modifier.fillMaxWidth(), onClick = { - state.eventSink.invoke(QrCodeIntroEvents.Continue) + state.eventSink.invoke(QrCodeIntroEvent.Continue) } ) } diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenterTest.kt index aabcf12e25..02bace008e 100644 --- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenterTest.kt +++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenterTest.kt @@ -37,7 +37,7 @@ class QrCodeIntroPresenterTest { val permissionsPresenterFactory = FakePermissionsPresenterFactory(permissionsPresenter) val presenter = createQrCodeIntroPresenter(permissionsPresenterFactory = permissionsPresenterFactory) presenter.test { - awaitItem().eventSink(QrCodeIntroEvents.Continue) + awaitItem().eventSink(QrCodeIntroEvent.Continue) assertThat(awaitItem().canContinue).isTrue() } } @@ -48,7 +48,7 @@ class QrCodeIntroPresenterTest { val permissionsPresenterFactory = FakePermissionsPresenterFactory(permissionsPresenter) val presenter = createQrCodeIntroPresenter(permissionsPresenterFactory = permissionsPresenterFactory) presenter.test { - awaitItem().eventSink(QrCodeIntroEvents.Continue) + awaitItem().eventSink(QrCodeIntroEvent.Continue) assertThat(awaitItem().cameraPermissionState.showDialog).isTrue() } } diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroViewTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroViewTest.kt index 5720c68ab4..3bb600ae55 100644 --- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroViewTest.kt +++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroViewTest.kt @@ -59,12 +59,12 @@ class QrCodeIntroViewTest : RobolectricTest() { @Test fun `on submit button clicked - emits the Continue event`() = runAndroidComposeUiTest { - val eventRecorder = EventsRecorder() + val eventRecorder = EventsRecorder() setQrCodeIntroView( state = aQrCodeIntroState(eventSink = eventRecorder), ) clickOn(R.string.screen_qr_code_login_initial_state_button_title) - eventRecorder.assertSingle(QrCodeIntroEvents.Continue) + eventRecorder.assertSingle(QrCodeIntroEvent.Continue) } private fun AndroidComposeUiTest.setQrCodeIntroView(