From a039fcd65572135d7949fd79842e0b7de18fb226 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 25 Aug 2026 10:04:23 +0200 Subject: [PATCH] `QrCodeScanEvents` -> `QrCodeScanEvent` --- .../qrcode/scan/{QrCodeScanEvents.kt => QrCodeScanEvent.kt} | 6 +++--- .../login/impl/screens/qrcode/scan/QrCodeScanPresenter.kt | 6 +++--- .../login/impl/screens/qrcode/scan/QrCodeScanState.kt | 2 +- .../impl/screens/qrcode/scan/QrCodeScanStatePreviewParam.kt | 2 +- .../login/impl/screens/qrcode/scan/QrCodeScanView.kt | 4 ++-- .../impl/screens/qrcode/scan/QrCodeScanPresenterTest.kt | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) rename features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/{QrCodeScanEvents.kt => QrCodeScanEvent.kt} (81%) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvent.kt similarity index 81% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvents.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvent.kt index f5804aceb0..d1c91b9b42 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvents.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvent.kt @@ -8,7 +8,7 @@ package io.element.android.features.login.impl.screens.qrcode.scan -sealed interface QrCodeScanEvents { - data class QrCodeScanned(val code: ByteArray) : QrCodeScanEvents - data object TryAgain : QrCodeScanEvents +sealed interface QrCodeScanEvent { + data class QrCodeScanned(val code: ByteArray) : QrCodeScanEvent + data object TryAgain : QrCodeScanEvent } diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenter.kt index 5e298604a4..4075a9d2cd 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenter.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenter.kt @@ -52,13 +52,13 @@ class QrCodeScanPresenter( authenticationAction.value = AsyncAction.Failure(it) } - fun handleEvent(event: QrCodeScanEvents) { + fun handleEvent(event: QrCodeScanEvent) { when (event) { - QrCodeScanEvents.TryAgain -> { + QrCodeScanEvent.TryAgain -> { isScanning = true authenticationAction.value = AsyncAction.Uninitialized } - is QrCodeScanEvents.QrCodeScanned -> { + is QrCodeScanEvent.QrCodeScanned -> { isScanning = false coroutineScope.getQrCodeData(authenticationAction, event.code) } diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanState.kt index 0e64bfc6a6..5d9fca2543 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanState.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanState.kt @@ -14,5 +14,5 @@ import io.element.android.libraries.matrix.api.auth.qrlogin.MatrixQrCodeLoginDat data class QrCodeScanState( val isScanning: Boolean, val authenticationAction: AsyncAction, - val eventSink: (QrCodeScanEvents) -> Unit + val eventSink: (QrCodeScanEvent) -> Unit ) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanStatePreviewParam.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanStatePreviewParam.kt index 19385b6df1..24164b94c9 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanStatePreviewParam.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanStatePreviewParam.kt @@ -46,7 +46,7 @@ open class QrCodeScanStatePreviewParam : PreviewParameterProvider = AsyncAction.Uninitialized, - eventSink: (QrCodeScanEvents) -> Unit = {}, + eventSink: (QrCodeScanEvent) -> Unit = {}, ) = QrCodeScanState( isScanning = isScanning, authenticationAction = authenticationAction, diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt index 72d624a921..372a46788b 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt @@ -105,7 +105,7 @@ private fun Content( ) { QrCodeCameraView( modifier = Modifier.fillMaxSize(), - onScanQrCode = { state.eventSink.invoke(QrCodeScanEvents.QrCodeScanned(it)) }, + onScanQrCode = { state.eventSink.invoke(QrCodeScanEvent.QrCodeScanned(it)) }, isScanning = state.isScanning, ) } @@ -125,7 +125,7 @@ private fun ColumnScope.Buttons( .fillMaxWidth() .padding(bottom = 16.dp), onClick = { - state.eventSink.invoke(QrCodeScanEvents.TryAgain) + state.eventSink.invoke(QrCodeScanEvent.TryAgain) } ) Column( diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenterTest.kt index d4f23a452c..a13590a1bc 100644 --- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenterTest.kt +++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenterTest.kt @@ -50,7 +50,7 @@ class QrCodeScanPresenterTest { ) presenter.test { val initialState = awaitItem() - initialState.eventSink(QrCodeScanEvents.QrCodeScanned(byteArrayOf())) + initialState.eventSink(QrCodeScanEvent.QrCodeScanned(byteArrayOf())) assertThat(awaitItem().isScanning).isFalse() assertThat(awaitItem().authenticationAction.isLoading()).isTrue() assertThat(awaitItem().authenticationAction.isSuccess()).isTrue() @@ -65,14 +65,14 @@ class QrCodeScanPresenterTest { val presenter = createQrCodeScanPresenter(qrCodeLoginDataFactory = qrCodeLoginDataFactory) presenter.test { val initialState = awaitItem() - initialState.eventSink(QrCodeScanEvents.QrCodeScanned(byteArrayOf())) + initialState.eventSink(QrCodeScanEvent.QrCodeScanned(byteArrayOf())) assertThat(awaitItem().isScanning).isFalse() assertThat(awaitItem().authenticationAction.isLoading()).isTrue() val errorState = awaitItem() assertThat(errorState.authenticationAction.isFailure()).isTrue() - errorState.eventSink(QrCodeScanEvents.TryAgain) + errorState.eventSink(QrCodeScanEvent.TryAgain) assertThat(awaitItem().isScanning).isTrue() assertThat(awaitItem().authenticationAction.isUninitialized()).isTrue() }