From 2527f22ed48993abbb4b931dba187e96ac8fbd3d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 28 Sep 2023 16:21:16 +0200 Subject: [PATCH] Use generic `action_continue` --- .../confirmaccountprovider/ConfirmAccountProviderView.kt | 3 ++- .../login/impl/screens/loginpassword/LoginPasswordView.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt index 04a4ccbb0e..22862c4467 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt @@ -43,6 +43,7 @@ import io.element.android.libraries.designsystem.theme.components.TextButton import io.element.android.libraries.matrix.api.auth.OidcDetails import io.element.android.libraries.testtags.TestTags import io.element.android.libraries.testtags.testTag +import io.element.android.libraries.ui.strings.CommonStrings @Composable fun ConfirmAccountProviderView( @@ -86,7 +87,7 @@ fun ConfirmAccountProviderView( footer = { ButtonColumnMolecule { Button( - text = stringResource(id = R.string.screen_account_provider_continue), + text = stringResource(id = CommonStrings.action_continue), showProgress = isLoading, onClick = { eventSink.invoke(ConfirmAccountProviderEvents.Continue) }, enabled = state.submitEnabled || isLoading, diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt index 1f25acc149..a95e90cf37 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt @@ -139,7 +139,7 @@ fun LoginPasswordView( Spacer(modifier = Modifier.weight(1f)) // Submit Button( - text = stringResource(R.string.screen_login_submit), + text = stringResource(CommonStrings.action_continue), showProgress = isLoading, onClick = ::submit, enabled = state.submitEnabled || isLoading,