Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Use generic action_continue

Browse source
This commit is contained in:
Benoit Marty 2023-09-28 16:21:16 +02:00
parent aba7714c0d
commit 2527f22ed4
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
View file

@ -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.matrix.api.auth.OidcDetails
import io.element.android.libraries.testtags.TestTags import io.element.android.libraries.testtags.TestTags
import io.element.android.libraries.testtags.testTag import io.element.android.libraries.testtags.testTag
import io.element.android.libraries.ui.strings.CommonStrings
@Composable @Composable
fun ConfirmAccountProviderView( fun ConfirmAccountProviderView(
@ -86,7 +87,7 @@ fun ConfirmAccountProviderView(
footer = { footer = {
ButtonColumnMolecule { ButtonColumnMolecule {
Button( Button(
text = stringResource(id = R.string.screen_account_provider_continue), text = stringResource(id = CommonStrings.action_continue),
showProgress = isLoading, showProgress = isLoading,
onClick = { eventSink.invoke(ConfirmAccountProviderEvents.Continue) }, onClick = { eventSink.invoke(ConfirmAccountProviderEvents.Continue) },
enabled = state.submitEnabled || isLoading, enabled = state.submitEnabled || isLoading,

2
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt
View file

@ -139,7 +139,7 @@ fun LoginPasswordView(
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))
// Submit // Submit
Button( Button(
text = stringResource(R.string.screen_login_submit), text = stringResource(CommonStrings.action_continue),
showProgress = isLoading, showProgress = isLoading,
onClick = ::submit, onClick = ::submit,
enabled = state.submitEnabled || isLoading, enabled = state.submitEnabled || isLoading,