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

String screen_create_new_recovery_key_list_item_1 now needs the desktop application name.

Browse source
This commit is contained in:
Benoit Marty 2024-04-10 12:29:22 +02:00 • committed by Benoit Marty
parent 97e1c5e674
commit a258ddf9d8
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyNode.kt
View file

@ -24,16 +24,19 @@ import com.bumble.appyx.core.plugin.Plugin
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.anvilannotations.ContributesNode import io.element.android.anvilannotations.ContributesNode
import io.element.android.libraries.core.meta.BuildMeta
import io.element.android.libraries.di.SessionScope import io.element.android.libraries.di.SessionScope
@ContributesNode(SessionScope::class) @ContributesNode(SessionScope::class)
class CreateNewRecoveryKeyNode @AssistedInject constructor( class CreateNewRecoveryKeyNode @AssistedInject constructor(
@Assisted buildContext: BuildContext, @Assisted buildContext: BuildContext,
@Assisted plugins: List<Plugin>, @Assisted plugins: List<Plugin>,
private val buildMeta: BuildMeta,
) : Node(buildContext, plugins = plugins) { ) : Node(buildContext, plugins = plugins) {
@Composable @Composable
override fun View(modifier: Modifier) { override fun View(modifier: Modifier) {
CreateNewRecoveryKeyView( CreateNewRecoveryKeyView(
desktopApplicationName = buildMeta.desktopApplicationName,
modifier = modifier, modifier = modifier,
onBackClicked = ::navigateUp, onBackClicked = ::navigateUp,
) )

8
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyView.kt
View file

@ -49,6 +49,7 @@ import io.element.android.libraries.designsystem.theme.components.TopAppBar
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
fun CreateNewRecoveryKeyView( fun CreateNewRecoveryKeyView(
desktopApplicationName: String,
onBackClicked: () -> Unit, onBackClicked: () -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
@ -66,15 +67,15 @@ fun CreateNewRecoveryKeyView(
title = stringResource(R.string.screen_create_new_recovery_key_title), title = stringResource(R.string.screen_create_new_recovery_key_title),
iconStyle = BigIcon.Style.Default(CompoundIcons.Computer()) iconStyle = BigIcon.Style.Default(CompoundIcons.Computer())
) )
Content() Content(desktopApplicationName = desktopApplicationName)
} }
} }
} }
@Composable @Composable
private fun Content() { private fun Content(desktopApplicationName: String) {
Column(modifier = Modifier.padding(horizontal = 16.dp), verticalArrangement = Arrangement.spacedBy(24.dp)) { Column(modifier = Modifier.padding(horizontal = 16.dp), verticalArrangement = Arrangement.spacedBy(24.dp)) {
Item(index = 1, text = AnnotatedString(stringResource(R.string.screen_create_new_recovery_key_list_item_1))) Item(index = 1, text = AnnotatedString(stringResource(R.string.screen_create_new_recovery_key_list_item_1, desktopApplicationName)))
Item(index = 2, text = AnnotatedString(stringResource(R.string.screen_create_new_recovery_key_list_item_2))) Item(index = 2, text = AnnotatedString(stringResource(R.string.screen_create_new_recovery_key_list_item_2)))
Item( Item(
index = 3, index = 3,
@ -129,6 +130,7 @@ private fun ItemNumber(
internal fun CreateNewRecoveryKeyViewPreview() { internal fun CreateNewRecoveryKeyViewPreview() {
ElementPreview { ElementPreview {
CreateNewRecoveryKeyView( CreateNewRecoveryKeyView(
desktopApplicationName = "Element",
onBackClicked = {}, onBackClicked = {},
) )
} }