Browse Source

Tweak screens related to crypto.

pull/3649/head
Benoit Marty 1 week ago
parent
commit
3116c4535e
  1. 11
      features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt
  2. 2
      features/securebackup/impl/src/main/res/values/localazy.xml
  3. 4
      features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt

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

@ -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.Button
import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.Icon
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.ui.strings.CommonStrings
import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentListOf
@Composable @Composable
@ -50,7 +49,7 @@ fun ResetIdentityRootView(
buttons = { buttons = {
Button( Button(
modifier = Modifier.fillMaxWidth(), 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) }, onClick = { state.eventSink(ResetIdentityRootEvent.Continue) },
destructive = true, destructive = true,
) )
@ -98,9 +97,9 @@ private fun Content() {
iconComposable = { iconComposable = {
Icon( Icon(
modifier = Modifier.size(20.dp), modifier = Modifier.size(20.dp),
imageVector = CompoundIcons.Close(), imageVector = CompoundIcons.Info(),
contentDescription = null, contentDescription = null,
tint = ElementTheme.colors.iconCriticalPrimary, tint = ElementTheme.colors.iconSecondary,
) )
}, },
), ),
@ -109,9 +108,9 @@ private fun Content() {
iconComposable = { iconComposable = {
Icon( Icon(
modifier = Modifier.size(20.dp), modifier = Modifier.size(20.dp),
imageVector = CompoundIcons.Close(), imageVector = CompoundIcons.Info(),
contentDescription = null, contentDescription = null,
tint = ElementTheme.colors.iconCriticalPrimary, tint = ElementTheme.colors.iconSecondary,
) )
}, },
), ),

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

@ -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_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_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_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_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_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> <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

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

Loading…
Cancel
Save