Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-15 18:12:54 +00:00
Code Issues Releases Wiki Activity

Bug 1861732 - Split-out "terms of use" and "privacy policy" text links

Browse Source
This commit is contained in:
Noah Bond 2023-11-01 16:16:28 -07:00 committed by mergify[bot]
parent 6ab8aadd6b
commit 04e905825f
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt
View File

@ -57,9 +57,9 @@ fun ReviewQualityCheckContextualOnboarding(
val learnMoreText =
stringResource(id = R.string.review_quality_check_contextual_onboarding_learn_more_link)
val privacyPolicyText =
stringResource(id = R.string.review_quality_check_contextual_onboarding_privacy_policy)
stringResource(id = R.string.review_quality_check_contextual_onboarding_privacy_policy_2)
val termsOfUseText =
stringResource(id = R.string.review_quality_check_contextual_onboarding_terms_use)
stringResource(id = R.string.review_quality_check_contextual_onboarding_terms_use_2)
ReviewQualityCheckCard(modifier = Modifier.fillMaxWidth()) {
Text(
@ -76,7 +76,7 @@ fun ReviewQualityCheckContextualOnboarding(
style = FirefoxTheme.typography.body2,
)
Spacer(modifier = Modifier.height(12.dp))
Spacer(modifier = Modifier.height(16.dp))
LinkText(
text = stringResource(
@ -99,15 +99,21 @@ fun ReviewQualityCheckContextualOnboarding(
linkTextDecoration = TextDecoration.Underline,
)
Spacer(modifier = Modifier.height(12.dp))
Spacer(modifier = Modifier.height(16.dp))
Text(
text = stringResource(
id = R.string.review_quality_check_contextual_onboarding_caption_3,
stringResource(id = R.string.shopping_product_name),
),
color = FirefoxTheme.colors.textPrimary,
style = FirefoxTheme.typography.caption,
)
Spacer(modifier = Modifier.height(16.dp))
LinkText(
text = stringResource(
id = R.string.review_quality_check_contextual_onboarding_caption_2,
stringResource(id = R.string.shopping_product_name),
privacyPolicyText,
termsOfUseText,
),
text = privacyPolicyText,
linkTextStates = listOf(
LinkTextState(
text = privacyPolicyText,
@ -116,6 +122,16 @@ fun ReviewQualityCheckContextualOnboarding(
onPrivacyPolicyClick()
},
),
),
style = FirefoxTheme.typography.body2,
linkTextDecoration = TextDecoration.Underline,
)
Spacer(modifier = Modifier.height(24.dp))
LinkText(
text = termsOfUseText,
linkTextStates = listOf(
LinkTextState(
text = termsOfUseText,
url = PLACEHOLDER_URL,
@ -124,14 +140,11 @@ fun ReviewQualityCheckContextualOnboarding(
},
),
),
style = FirefoxTheme.typography.caption
.copy(
color = FirefoxTheme.colors.textSecondary,
),
style = FirefoxTheme.typography.body2,
linkTextDecoration = TextDecoration.Underline,
)
Spacer(modifier = Modifier.height(12.dp))
Spacer(modifier = Modifier.height(16.dp))
Image(
painter = painterResource(id = R.drawable.shopping_onboarding),
@ -142,7 +155,7 @@ fun ReviewQualityCheckContextualOnboarding(
.padding(all = 16.dp),
)
Spacer(modifier = Modifier.height(12.dp))
Spacer(modifier = Modifier.height(16.dp))
PrimaryButton(
text = stringResource(R.string.review_quality_check_contextual_onboarding_primary_button_text),

12
app/src/main/res/values/strings.xml
View File

@ -2212,11 +2212,17 @@
<!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
<string name="review_quality_check_contextual_onboarding_caption" moz:RemovedIn="121" tools:ignore="UnusedResources">By selecting “Yes, try it” you agree to %1$s by Mozilla’s %2$s and %3$s.</string>
<!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. -->
<string name="review_quality_check_contextual_onboarding_caption_2">By selecting “Yes, try it” you agree to %1$s’s %2$s and %3$s.</string>
<string name="review_quality_check_contextual_onboarding_caption_2" moz:RemovedIn="121" tools:ignore="UnusedResources">By selecting “Yes, try it” you agree to %1$s’s %2$s and %3$s.</string>
<!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. Parameter is the Fakespot product name. After the colon, what appears are two links, each on their own line. The first link is to a Privacy policy (review_quality_check_contextual_onboarding_privacy_policy_2). The second link is to Terms of use (review_quality_check_contextual_onboarding_terms_use_2). -->
<string name="review_quality_check_contextual_onboarding_caption_3">By selecting \"Yes, try it\" you agree to the following from %1$s:</string>
<!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
<string name="review_quality_check_contextual_onboarding_privacy_policy">privacy policy</string>
<string name="review_quality_check_contextual_onboarding_privacy_policy" moz:RemovedIn="121" tools:ignore="UnusedResources">privacy policy</string>
<!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
<string name="review_quality_check_contextual_onboarding_privacy_policy_2">Privacy policy</string>
<!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
<string name="review_quality_check_contextual_onboarding_terms_use">terms of use</string>
<string name="review_quality_check_contextual_onboarding_terms_use" moz:RemovedIn="121" tools:ignore="UnusedResources">terms of use</string>
<!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
<string name="review_quality_check_contextual_onboarding_terms_use_2">Terms of use</string>
<!-- Text for opt-in button from the review quality check contextual onboarding card. -->
<string name="review_quality_check_contextual_onboarding_primary_button_text">Yes, try it</string>
<!-- Text for opt-out button from the review quality check contextual onboarding card. -->