GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2022-08-04 12:48:44 +04:00
parent facf309dc6
commit dc2b73c101
8 changed files with 37 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/assets/tangem-app-config

@ -1 +1 @@
Subproject commit 59ee0bff06ee54f3202421c28f7fb6e3d421dad8
Subproject commit f33f020823031f1c532cf5a9d5cf3fbecadcf050

4
app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreenState.kt
View file

@ -50,8 +50,8 @@ sealed class CardInfo(
)
object ResetToFactorySettings : CardInfo(
titleRes = TextReference.Res(R.string.details_row_title_reset_factory_settings),
subtitle = TextReference.Res(R.string.card_settings_reset_factory_footer),
titleRes = TextReference.Res(R.string.card_settings_reset_card_to_factory),
subtitle = TextReference.Res(R.string.card_settings_reset_card_to_factory_footer),
clickable = true,
)
}

8
app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt
View file

@ -36,7 +36,7 @@ fun ResetCardScreen(
content = { ResetCardView(state = state, modifier = modifier) },
background =
{ Image(painter = painterResource(id = R.drawable.ic_reset_background), contentDescription = "") },
titleRes = R.string.details_row_title_reset_factory_settings,
titleRes = R.string.reset_card_to_factory_navigation_title,
onBackClick = onBackPressed,
)
}
@ -62,7 +62,7 @@ fun ResetCardView(
Spacer(modifier = modifier.size(24.dp))
Text(
text = stringResource(id = R.string.reset_factory_warning),
text = stringResource(id = R.string.reset_card_to_factory_message),
modifier = modifier.padding(start = 20.dp, end = 20.dp),
style = TangemTypography.body1,
color = colorResource(id = R.color.text_secondary),
@ -96,7 +96,7 @@ fun ResetCardView(
)
}
Text(
text = stringResource(id = R.string.reset_factory_confirmation),
text = stringResource(id = R.string.reset_card_to_factory_warning_message),
style = TangemTypography.body2,
color = colorResource(id = R.color.text_secondary),
)
@ -108,7 +108,7 @@ fun ResetCardView(
.padding(start = 16.dp, end = 16.dp, bottom = 32.dp),
) {
DetailsMainButton(
title = stringResource(id = R.string.reset_factory_button),
title = stringResource(id = R.string.reset_card_to_factory_button_title),
onClick = state.onResetButtonClick,
enabled = state.resetButtonEnabled,
)

12
app/src/main/res/values-de/strings_final.xml
View file

@ -87,10 +87,10 @@
<string name="details_row_privacy_policy">Privacy policy</string>
<string name="reset_factory_warning">This action will lead to the complete removal of the wallet from the selected card and it will not be possible to restore the current wallet on it or use the card to recover the password</string>
<string name="reset_factory_confirmation">I understand that after performing this action, I will no longer have access to the current wallet</string>
<string name="reset_factory_button">Reset the card</string>
<string name="card_settings_reset_factory_footer">Factory Reset will completely delete the wallet from the selected card and you will not be able to restore the current wallet or use the card to recover the access code.</string>
<string name="reset_card_to_factory_navigation_title">Reset to factory settings</string>
<string name="reset_card_to_factory_message">This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
<string name="reset_card_to_factory_warning_message">I understand that after performing this action, I will no longer have access to the current wallet</string>
<string name="reset_card_to_factory_button_title">Reset the card</string>
<string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
<string name="card_settings_reset_card_to_factory_footer">Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
</resources>

11
app/src/main/res/values-fr/strings_final.xml
View file

@ -87,9 +87,10 @@
<string name="details_row_privacy_policy">Privacy policy</string>
<string name="reset_factory_warning">This action will lead to the complete removal of the wallet from the selected card and it will not be possible to restore the current wallet on it or use the card to recover the password</string>
<string name="reset_factory_confirmation">I understand that after performing this action, I will no longer have access to the current wallet</string>
<string name="reset_factory_button">Reset the card</string>
<string name="card_settings_reset_factory_footer">Factory Reset will completely delete the wallet from the selected card and you will not be able to restore the current wallet or use the card to recover the access code.</string>
<string name="reset_card_to_factory_navigation_title">Reset to factory settings</string>
<string name="reset_card_to_factory_message">This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
<string name="reset_card_to_factory_warning_message">I understand that after performing this action, I will no longer have access to the current wallet</string>
<string name="reset_card_to_factory_button_title">Reset the card</string>
<string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
<string name="card_settings_reset_card_to_factory_footer">Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
</resources>

11
app/src/main/res/values-it/strings_final.xml
View file

@ -88,9 +88,10 @@
<string name="details_row_privacy_policy">Privacy policy</string>
<string name="reset_factory_warning">This action will lead to the complete removal of the wallet from the selected card and it will not be possible to restore the current wallet on it or use the card to recover the password</string>
<string name="reset_factory_confirmation">I understand that after performing this action, I will no longer have access to the current wallet</string>
<string name="reset_factory_button">Reset the card</string>
<string name="card_settings_reset_factory_footer">Factory Reset will completely delete the wallet from the selected card and you will not be able to restore the current wallet or use the card to recover the access code.</string>
<string name="reset_card_to_factory_navigation_title">Reset to factory settings</string>
<string name="reset_card_to_factory_message">This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
<string name="reset_card_to_factory_warning_message">I understand that after performing this action, I will no longer have access to the current wallet</string>
<string name="reset_card_to_factory_button_title">Reset the card</string>
<string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
<string name="card_settings_reset_card_to_factory_footer">Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
</resources>

11
app/src/main/res/values-ru/strings_final.xml
View file

@ -104,9 +104,10 @@
<string name="details_row_privacy_policy">Privacy policy</string>
<string name="reset_factory_warning">Данное действие приведет к полному удалению кошелька с выбранной карты. Восстановить на ней текущий кошелек или использовать карту для восстановления пароля будет невозможно</string>
<string name="reset_factory_confirmation">Я понимаю, что после выполнения этого действия у меня больше не будет доступа к текущему кошельку</string>
<string name="reset_factory_button">Сбросить карту</string>
<string name="card_settings_reset_factory_footer">Сброс к заводским настройкам полностью удалит кошелек с выбранной карты, и вы не сможете восстановить текущий кошелек или использовать карту для восстановления кода доступа.</string>
<string name="reset_card_to_factory_navigation_title">Сброс к заводским настройкам</string>
<string name="reset_card_to_factory_message">Это действие приведет к полному удалению кошелька на этой карте. Кошелек невозможно будет восстановить или использовать данную карту для восстановления кода доступа</string>
<string name="reset_card_to_factory_warning_message">Я понимаю, что после выполнения этого действия у меня больше не будет доступа к текущему кошельку</string>
<string name="reset_card_to_factory_button_title">Сбросить карту</string>
<string name="card_settings_reset_card_to_factory">Сброс к заводским настройкам</string>
<string name="card_settings_reset_card_to_factory_footer">Сброс к заводским настройкам приведет к полному удалению кошелька с выбранной карты. Вы не сможете восстановить текущий кошелек или использовать эту карту для восстановления кода доступа.</string>
</resources>

12
app/src/main/res/values/strings_final.xml
View file

@ -106,10 +106,10 @@
<string name="details_row_privacy_policy">Privacy policy</string>
<string name="reset_factory_warning">This action will lead to the complete removal of the wallet from the selected card and it will not be possible to restore the current wallet on it or use the card to recover the password</string>
<string name="reset_factory_confirmation">I understand that after performing this action, I will no longer have access to the current wallet</string>
<string name="reset_factory_button">Reset the card</string>
<string name="card_settings_reset_factory_footer">Factory Reset will completely delete the wallet from the selected card and you will not be able to restore the current wallet or use the card to recover the access code.</string>
<string name="reset_card_to_factory_navigation_title">Reset to factory settings</string>
<string name="reset_card_to_factory_message">This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
<string name="reset_card_to_factory_warning_message">I understand that after performing this action, I will no longer have access to the current wallet</string>
<string name="reset_card_to_factory_button_title">Reset the card</string>
<string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
<string name="card_settings_reset_card_to_factory_footer">Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
</resources>