From 5239e5ce81f477c1ad25af9c4626657ebe511fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Mon, 12 Aug 2024 12:41:04 +0200 Subject: [PATCH] Fix lint issues --- .../io/element/android/appnav/RootFlowNode.kt | 2 +- .../impl/reset/ResetIdentityFlowNode.kt | 2 +- .../reset/password/ResetIdentityPasswordNode.kt | 1 - .../reset/password/ResetIdentityPasswordView.kt | 14 +++++++++----- .../impl/reset/root/ResetIdentityRootNode.kt | 1 + .../impl/reset/root/ResetIdentityRootView.kt | 2 ++ ...rTests.kt => ResetIdentityRootPresenterTest.kt} | 2 +- .../android/libraries/matrix/api/MatrixClient.kt | 1 - .../libraries/oidc/impl/DefaultOidcEntryPoint.kt | 2 +- .../libraries/oidc/impl/webview/OidcPresenter.kt | 2 +- 10 files changed, 17 insertions(+), 12 deletions(-) rename features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/{ResetIdentityRootPresenterTests.kt => ResetIdentityRootPresenterTest.kt} (98%) diff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt index b651f4d77c..87e08b6bb9 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt @@ -56,9 +56,9 @@ import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService import io.element.android.libraries.matrix.api.core.SessionId import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias import io.element.android.libraries.matrix.api.permalink.PermalinkData -import io.element.android.libraries.sessionstorage.api.LoggedInState import io.element.android.libraries.oidc.api.OidcAction import io.element.android.libraries.oidc.api.OidcActionFlow +import io.element.android.libraries.sessionstorage.api.LoggedInState import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt index 0f0278cb66..be538a8665 100644 --- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt +++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt @@ -66,7 +66,7 @@ class ResetIdentityFlowNode @AssistedInject constructor( buildContext = buildContext, plugins = plugins, ) { - interface Callback: Plugin { + interface Callback : Plugin { fun onDone() } diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordNode.kt index 7397361b03..0f158e04c2 100644 --- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordNode.kt +++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordNode.kt @@ -36,7 +36,6 @@ class ResetIdentityPasswordNode @AssistedInject constructor( @Assisted plugins: List, private val coroutineDispatchers: CoroutineDispatchers, ) : Node(buildContext, plugins = plugins) { - data class Inputs(val handle: IdentityPasswordResetHandle) : NodeInputs private val presenter by lazy { diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt index d64e451a9f..a43ff8092f 100644 --- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt +++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt @@ -18,7 +18,6 @@ package io.element.android.features.securebackup.impl.reset.password import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable -import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember @@ -58,7 +57,12 @@ fun ResetIdentityPasswordView( title = stringResource(CommonStrings.screen_reset_encryption_password_title), subTitle = stringResource(CommonStrings.screen_reset_encryption_password_subtitle), onBackClick = onBack, - content = { Content(textFieldState = passwordState) }, + content = { + Content( + text = passwordState.value, + onTextChange = { passwordState.value = it } + ) + }, buttons = { Button( modifier = Modifier.fillMaxWidth(), @@ -80,14 +84,14 @@ fun ResetIdentityPasswordView( } @Composable -private fun Content(textFieldState: MutableState) { +private fun Content(text: String, onTextChange: (String) -> Unit) { var showPassword by remember { mutableStateOf(false) } OutlinedTextField( modifier = Modifier .fillMaxWidth() .onTabOrEnterKeyFocusNext(LocalFocusManager.current), - value = textFieldState.value, - onValueChange = { text -> textFieldState.value = text }, + value = text, + onValueChange = onTextChange, label = { Text(stringResource(CommonStrings.common_password)) }, placeholder = { Text(stringResource(CommonStrings.screen_reset_encryption_password_placeholder)) }, singleLine = true, diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootNode.kt index 9fc5061ae2..3dd9876fc0 100644 --- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootNode.kt +++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootNode.kt @@ -42,6 +42,7 @@ class ResetIdentityRootNode @AssistedInject constructor( override fun View(modifier: Modifier) { val state = presenter.present() ResetIdentityRootView( + modifier = modifier, state = state, onContinue = callback::onContinue, onBack = ::navigateUp, diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt index 8020aee5c6..4e0457836f 100644 --- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt +++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt @@ -47,8 +47,10 @@ fun ResetIdentityRootView( state: ResetIdentityRootState, onContinue: () -> Unit, onBack: () -> Unit, + modifier: Modifier = Modifier, ) { FlowStepPage( + modifier = modifier, iconStyle = BigIcon.Style.AlertSolid, title = stringResource(io.element.android.libraries.ui.strings.R.string.screen_encryption_reset_title), subTitle = stringResource(io.element.android.libraries.ui.strings.R.string.screen_encryption_reset_subtitle), diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenterTests.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenterTest.kt similarity index 98% rename from features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenterTests.kt rename to features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenterTest.kt index 5b669a0dc7..feb00bf4de 100644 --- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenterTests.kt +++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenterTest.kt @@ -23,7 +23,7 @@ import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.test.runTest import org.junit.Test -class ResetIdentityRootPresenterTests { +class ResetIdentityRootPresenterTest { @Test fun `present - initial state`() = runTest { val presenter = ResetIdentityRootPresenter() diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt index 0591e794ed..3209d49e03 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt @@ -41,7 +41,6 @@ import io.element.android.libraries.matrix.api.sync.SyncService import io.element.android.libraries.matrix.api.user.MatrixSearchUserResults import io.element.android.libraries.matrix.api.user.MatrixUser import io.element.android.libraries.matrix.api.verification.SessionVerificationService -import io.element.android.libraries.sessionstorage.api.LoginType import kotlinx.collections.immutable.ImmutableList import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow diff --git a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcEntryPoint.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcEntryPoint.kt index 1a8ce960c5..185c27bf19 100644 --- a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcEntryPoint.kt +++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcEntryPoint.kt @@ -24,8 +24,8 @@ import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTa import io.element.android.libraries.architecture.createNode import io.element.android.libraries.di.AppScope import io.element.android.libraries.matrix.api.auth.OidcDetails -import io.element.android.libraries.oidc.impl.webview.OidcNode import io.element.android.libraries.oidc.api.OidcEntryPoint +import io.element.android.libraries.oidc.impl.webview.OidcNode import javax.inject.Inject @ContributesBinding(AppScope::class) diff --git a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcPresenter.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcPresenter.kt index 853a9b584c..5e886644f6 100644 --- a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcPresenter.kt +++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcPresenter.kt @@ -25,11 +25,11 @@ import androidx.compose.runtime.setValue import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject -import io.element.android.libraries.oidc.api.OidcAction import io.element.android.libraries.architecture.AsyncAction import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService import io.element.android.libraries.matrix.api.auth.OidcDetails +import io.element.android.libraries.oidc.api.OidcAction import kotlinx.coroutines.launch class OidcPresenter @AssistedInject constructor(