letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

QrCode intro screen: add subtitle and fix button wording #3632

Browse Source
This commit is contained in:
Benoit Marty
2024-10-09 10:20:56 +02:00
parent fe3066f88d
commit ad5ef27f2b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt
View File

@@ -30,7 +30,6 @@ import io.element.android.libraries.designsystem.theme.components.Button
import io.element.android.libraries.designsystem.theme.components.Icon
import io.element.android.libraries.designsystem.utils.annotatedTextWithBold
import io.element.android.libraries.permissions.api.PermissionsView
import io.element.android.libraries.ui.strings.CommonStrings
import kotlinx.collections.immutable.persistentListOf
@Composable
@@ -51,6 +50,7 @@ fun QrCodeIntroView(
onBackClick = onBackClick,
iconStyle = BigIcon.Style.Default(CompoundIcons.Computer()),
title = stringResource(id = R.string.screen_qr_code_login_initial_state_title, state.desktopAppName),
subTitle = stringResource(id = R.string.screen_qr_code_login_initial_state_subtitle),
content = { Content(state = state) },
buttons = { Buttons(state = state) }
)
@@ -87,7 +87,7 @@ private fun ColumnScope.Buttons(
state: QrCodeIntroState,
) {
Button(
text = stringResource(id = CommonStrings.action_continue),
text = stringResource(id = R.string.screen_qr_code_login_initial_state_button_title),
modifier = Modifier.fillMaxWidth(),
onClick = {
state.eventSink.invoke(QrCodeIntroEvents.Continue)

1
features/login/impl/src/main/res/values/localazy.xml
View File

@@ -60,6 +60,7 @@ Try signing in manually, or scan the QR code with another device."</string>
<string name="screen_qr_code_login_initial_state_item_3">"Select %1$s"</string>
<string name="screen_qr_code_login_initial_state_item_3_action">"“Link new device”"</string>
<string name="screen_qr_code_login_initial_state_item_4">"Scan the QR code with this device"</string>
<string name="screen_qr_code_login_initial_state_subtitle">"Only available if your account provider supports it."</string>
<string name="screen_qr_code_login_initial_state_title">"Open %1$s on another device to get the QR code"</string>
<string name="screen_qr_code_login_invalid_scan_state_description">"Use the QR code shown on the other device."</string>
<string name="screen_qr_code_login_invalid_scan_state_retry_button">"Try again"</string>