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

Tweak screens related to crypto.

Browse Source
This commit is contained in:
Benoit Marty
2024-10-10 16:44:11 +02:00
parent 7035222f35
commit afba74cb63
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt
View File

@@ -31,7 +31,6 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.designsystem.theme.components.Button
import io.element.android.libraries.designsystem.theme.components.Icon
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.ui.strings.CommonStrings
import kotlinx.collections.immutable.persistentListOf
@Composable
@@ -50,7 +49,7 @@ fun ResetIdentityRootView(
buttons = {
Button(
modifier = Modifier.fillMaxWidth(),
text = stringResource(id = CommonStrings.action_continue),
text = stringResource(id = R.string.screen_encryption_reset_action_continue_reset),
onClick = { state.eventSink(ResetIdentityRootEvent.Continue) },
destructive = true,
)
@@ -98,9 +97,9 @@ private fun Content() {
iconComposable = {
Icon(
modifier = Modifier.size(20.dp),
imageVector = CompoundIcons.Close(),
imageVector = CompoundIcons.Info(),
contentDescription = null,
tint = ElementTheme.colors.iconCriticalPrimary,
tint = ElementTheme.colors.iconSecondary,
)
},
),
@@ -109,9 +108,9 @@ private fun Content() {
iconComposable = {
Icon(
modifier = Modifier.size(20.dp),
imageVector = CompoundIcons.Close(),
imageVector = CompoundIcons.Info(),
contentDescription = null,
tint = ElementTheme.colors.iconCriticalPrimary,
tint = ElementTheme.colors.iconSecondary,
)
},
),

2
features/securebackup/impl/src/main/res/values/localazy.xml
View File

@@ -18,7 +18,7 @@
<string name="screen_create_new_recovery_key_title">"Reset the encryption for your account using another device"</string>
<string name="screen_encryption_reset_action_continue_reset">"Continue reset"</string>
<string name="screen_encryption_reset_bullet_1">"Your account details, contacts, preferences, and chat list will be kept"</string>
<string name="screen_encryption_reset_bullet_2">"You will lose your existing message history unless it is stored on another device"</string>
<string name="screen_encryption_reset_bullet_2">"You will lose any message history that’s stored only on the server"</string>
<string name="screen_encryption_reset_bullet_3">"You will need to verify all your existing devices and contacts again"</string>
<string name="screen_encryption_reset_footer">"Only reset your identity if you don’t have access to another signed-in device and you’ve lost your recovery key."</string>
<string name="screen_encryption_reset_title">"Can\'t confirm? You’ll need to reset your identity."</string>

4
features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt
View File

@@ -292,14 +292,14 @@ private fun BottomMenu(
text = stringResource(R.string.screen_identity_use_another_device),
onClick = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },
)
OutlinedButton(
Button(
modifier = Modifier.fillMaxWidth(),
text = stringResource(R.string.screen_session_verification_enter_recovery_key),
onClick = onEnterRecoveryKey,
)
}
// This option should always be displayed
TextButton(
OutlinedButton(
modifier = Modifier.fillMaxWidth(),
text = stringResource(R.string.screen_identity_confirmation_cannot_confirm),
onClick = onResetKey,