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

Merge pull request #3409 from element-hq/feature/bma/recoveryKeyFormatting

Browse source 
Recovery key formatting and wording iteration
This commit is contained in:
Benoit Marty 2024-09-06 16:30:39 +02:00 • committed by GitHub
commit 9b791b651a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 49 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

5
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyView.kt
View file

@ -70,10 +70,7 @@ internal fun RecoveryKeyView(
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
Text(
text = when (state.recoveryKeyUserStory) {
RecoveryKeyUserStory.Enter -> stringResource(R.string.screen_recovery_key_confirm_key_label)
else -> stringResource(id = CommonStrings.common_recovery_key)
},
text = stringResource(id = CommonStrings.common_recovery_key),
modifier = Modifier.padding(start = 16.dp),
style = ElementTheme.typography.fontBodyMdRegular,
)

6
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyViewStateProvider.kt
View file

@ -27,9 +27,11 @@ open class RecoveryKeyViewStateProvider : PreviewParameterProvider<RecoveryKeyVi
aRecoveryKeyViewState(recoveryKeyUserStory = it, inProgress = true),
aRecoveryKeyViewState(recoveryKeyUserStory = it, formattedRecoveryKey = aFormattedRecoveryKey()),
aRecoveryKeyViewState(recoveryKeyUserStory = it, formattedRecoveryKey = aFormattedRecoveryKey(), inProgress = true),
// Add other states here
)
}
} + sequenceOf(
aRecoveryKeyViewState(recoveryKeyUserStory = RecoveryKeyUserStory.Enter, formattedRecoveryKey = aFormattedRecoveryKey().replace(" ", "")),
aRecoveryKeyViewState(recoveryKeyUserStory = RecoveryKeyUserStory.Enter, formattedRecoveryKey = "This is a passphrase with spaces"),
)
}
fun aRecoveryKeyViewState(