Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions app/src/main/java/to/bitkit/ui/onboarding/TermsOfUseScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,14 @@ fun TermsOfUseScreen(
) {
TermsText(
title = stringResource(R.string.onboarding__tos_checkbox),
htmlText = stringResource(R.string.onboarding__tos_checkbox_value)
.withAccentLink(Env.TERMS_OF_USE_URL),
bodyText = AnnotatedString(stringResource(R.string.onboarding__tos_checkbox_value)),
modifier = Modifier
.padding(horizontal = horizontalPadding)
.testTag("Check1")
)
TermsText(
title = stringResource(R.string.onboarding__pp_checkbox),
htmlText = stringResource(R.string.onboarding__pp_checkbox_value)
bodyText = stringResource(R.string.onboarding__pp_checkbox_value)
.withAccentLink(Env.PRIVACY_POLICY_URL),
modifier = Modifier
.padding(horizontal = horizontalPadding)
Expand All @@ -118,7 +117,7 @@ fun TermsOfUseScreen(
@Composable
private fun TermsText(
title: String,
htmlText: AnnotatedString,
bodyText: AnnotatedString,
modifier: Modifier = Modifier,
) {
Column(
Expand All @@ -129,7 +128,7 @@ private fun TermsText(
VerticalSpacer(14.dp)
BodyMSB(title)
VerticalSpacer(4.dp)
BodySSB(text = htmlText, color = Colors.White64)
BodySSB(text = bodyText, color = Colors.White64)
VerticalSpacer(14.dp)
HorizontalDivider()
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-b+es+419/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
<string name="lightning__wait_text_bottom">Conectado y sincronizando...</string>
<string name="onboarding__tos_header">Bitkit\n&lt;accent&gt;términos de uso&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox">Términos de uso</string>
<string name="onboarding__tos_checkbox_value">Declaro que he leído y acepto las &lt;accent&gt;condiciones de uso.&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox_value">Declaro que he leído y acepto las condiciones de uso.</string>
<string name="onboarding__pp_checkbox">Política de privacidad</string>
<string name="onboarding__pp_checkbox_value">Declaro que he leído y acepto la &lt;accent&gt;política de privacidad.&lt;/accent&gt;</string>
<string name="onboarding__welcome_title">Tú puedes ser &lt;accent&gt;el cam₿io&lt;/accent&gt;</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
<string name="lightning__wait_text_bottom">Připojování &amp; synchronizace...</string>
<string name="onboarding__tos_header">Bitkit\n&lt;accent&gt;podmínky používání&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox">Podmínky použití</string>
<string name="onboarding__tos_checkbox_value">Prohlašuji, že jsem si přečetl/a &lt;accent&gt;podmínky používání&lt;/accent&gt; a souhlasím s nimi.</string>
<string name="onboarding__tos_checkbox_value">Prohlašuji, že jsem si přečetl/a podmínky používání a souhlasím s nimi.</string>
<string name="onboarding__pp_checkbox">Zásady ochrany osobních údajů</string>
<string name="onboarding__pp_checkbox_value">Prohlašuji, že jsem si přečetl/a &lt;accent&gt;zásady ochrany osobních údajů&lt;/accent&gt; a souhlasím s nimi.</string>
<string name="onboarding__welcome_title">Můžete ₿ \n&lt;accent&gt;změna&lt;/accent&gt;</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
<string name="lightning__wait_text_bottom">Verbinden &amp; Synchronisieren…</string>
<string name="onboarding__tos_header">Bitkit\n&lt;accent&gt;Nutzungs-bedingungen&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox">Nutzungsbedingungen</string>
<string name="onboarding__tos_checkbox_value">Ich erkläre, dass ich die &lt;accent&gt;Nutzungsbedingungen&lt;/accent&gt; gelesen und akzeptiert habe.</string>
<string name="onboarding__tos_checkbox_value">Ich erkläre, dass ich die Nutzungsbedingungen gelesen und akzeptiert habe.</string>
<string name="onboarding__pp_checkbox">Datenschutzerklärung</string>
<string name="onboarding__pp_checkbox_value">Ich erkläre, dass ich die &lt;accent&gt;Datenschutzerklärung&lt;/accent&gt; gelesen und akzeptiert habe.</string>
<string name="onboarding__welcome_title">You can ₿ \n&lt;accent&gt;the change&lt;/accent&gt;</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<string name="lightning__wait_text_top">Por favor, espere a que Bitkit se conecte a la red de pagos (±10 segundos).</string>
<string name="lightning__wait_text_bottom">Conectando y Sincronizando...</string>
<string name="onboarding__tos_checkbox">Condiciones de uso</string>
<string name="onboarding__tos_checkbox_value">Declaro que he leído y acepto los &lt;accent&gt;términos de uso.&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox_value">Declaro que he leído y acepto los términos de uso.</string>
<string name="onboarding__pp_checkbox">Política de privacidad</string>
<string name="onboarding__pp_checkbox_value">Declaro que he leído y acepto la &lt;accent&gt;política de privacidad.&lt;/accent&gt;</string>
<string name="onboarding__welcome_text">Use Bitkit para pagar a cualquiera, en cualquier sitio, en cualquier momento, y gaste su bitcoin en las cosa que valora en la vida.</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
<string name="lightning__wait_text_bottom">Connexion et synchronisation...</string>
<string name="onboarding__tos_header">Bitkit \n&lt;accent&gt;Conditions d\'utilisation&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox">Conditions d\'utilisation</string>
<string name="onboarding__tos_checkbox_value">Je déclare avoir lu et accepté les &lt;accent&gt;conditions d\'utilisation&lt;/accent&gt;.</string>
<string name="onboarding__tos_checkbox_value">Je déclare avoir lu et accepté les conditions d\'utilisation.</string>
<string name="onboarding__pp_checkbox">Politique de confidentialité</string>
<string name="onboarding__pp_checkbox_value">Je déclare avoir lu et accepté la &lt;accent&gt;politique de confidentialité&lt;/accent&gt;.</string>
<string name="onboarding__welcome_title">Soyez \n&lt;accent&gt;le changement&lt;/accent&gt;</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
<string name="lightning__wait_text_bottom">Connessione e sincronizzazione...</string>
<string name="onboarding__tos_header">Bitkit\n&lt;accent&gt;termini di utilizzo&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox">Termini di Utilizzo</string>
<string name="onboarding__tos_checkbox_value">Dichiaro di aver letto e di accettare i &lt;accent&gt;termini di utilizzo.&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox_value">Dichiaro di aver letto e di accettare i termini di utilizzo.</string>
<string name="onboarding__pp_checkbox">Informativa Privacy</string>
<string name="onboarding__pp_checkbox_value">Dichiaro di aver letto e di accettare &lt;accent&gt;l\'informativa sulla privacy.&lt;/accent&gt;</string>
<string name="onboarding__welcome_title">Puoi essere \n&lt;accent&gt;il cambiamento&lt;/accent&gt;</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
<string name="lightning__wait_text_bottom">Podłączanie i synchronizacja...</string>
<string name="onboarding__tos_header">Bitkit\n&lt;accent&gt;warunki użytkowania&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox">Warunki użytkowania</string>
<string name="onboarding__tos_checkbox_value">Oświadczam, że zapoznałem się i akceptuję &lt;accent&gt;warunki użytkowania.&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox_value">Oświadczam, że zapoznałem się i akceptuję warunki użytkowania.</string>
<string name="onboarding__pp_checkbox">Polityka prywatności</string>
<string name="onboarding__pp_checkbox_value">Oświadczam, że zapoznałem się i akceptuję &lt;accent&gt;politykę prywatności.&lt;/accent&gt;</string>
<string name="onboarding__welcome_title">Możesz ₿yć \n&lt;accent&gt;zmianą&lt;/accent&gt;</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
<string name="lightning__wait_text_bottom">Conectando e Sincronizando...</string>
<string name="onboarding__tos_header">Bitkit\n&lt;accent&gt;termos de uso&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox">Termos de uso</string>
<string name="onboarding__tos_checkbox_value">Declaro que li e aceito os &lt;accent&gt;termos de uso.&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox_value">Declaro que li e aceito os termos de uso.</string>
<string name="onboarding__pp_checkbox">Política de Privacidade</string>
<string name="onboarding__pp_checkbox_value">Declaro que li e aceito a &lt;accent&gt;política de privacidade.&lt;/accent&gt;</string>
<string name="onboarding__welcome_title">Você pode ser \n&lt;accent&gt;a mudança&lt;/accent&gt;</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
<string name="lightning__wait_text_bottom">Подключение и Синхронизация...</string>
<string name="onboarding__tos_header">Bitkit\n&lt;accent&gt;Условия использования&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox">Условия использования</string>
<string name="onboarding__tos_checkbox_value">Я подтверждаю, что прочитал и принимаю &lt;accent&gt;Условия использования.&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox_value">Я подтверждаю, что прочитал и принимаю Условия использования.</string>
<string name="onboarding__pp_checkbox">Политика Конфиденциальности</string>
<string name="onboarding__pp_checkbox_value">Я подтверждаю, что прочитал и принимаю &lt;accent&gt;Политику Конфиденциальности.&lt;/accent&gt;</string>
<string name="onboarding__welcome_title">С вами начинается &lt;accent&gt;изменение&lt;/accent&gt;</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
<string name="lightning__wait_text_bottom">Connecting &amp; Syncing...</string>
<string name="onboarding__tos_header">Bitkit\n&lt;accent&gt;terms of use&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox">Terms of use</string>
<string name="onboarding__tos_checkbox_value">I declare that I have read and accept the &lt;accent&gt;terms of use.&lt;/accent&gt;</string>
<string name="onboarding__tos_checkbox_value">I declare that I have read and accept the terms of use.</string>
<string name="onboarding__pp_checkbox">Privacy Policy</string>
<string name="onboarding__pp_checkbox_value">I declare that I have read and accept the &lt;accent&gt;privacy policy.&lt;/accent&gt;</string>
<string name="onboarding__welcome_title">You can ₿ \n&lt;accent&gt;the change&lt;/accent&gt;</string>
Expand Down
Loading