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

[fenix] For https://github.com/mozilla-mobile/fenix/issues/14011: Remove new line character and spaces from string.

Browse Source
This commit is contained in:
mcarare 2021-01-12 12:43:24 +02:00 committed by Mihai Adrian Carare
parent 1017c1b136
commit 2614789acf
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivacyNoticeViewHolder.kt
View File

@ -21,7 +21,7 @@ class OnboardingPrivacyNoticeViewHolder(
view.header_text.setOnboardingIcon(R.drawable.ic_onboarding_privacy_notice) view.header_text.setOnboardingIcon(R.drawable.ic_onboarding_privacy_notice)
val appName = view.context.getString(R.string.app_name) val appName = view.context.getString(R.string.app_name)
view.description_text.text = view.context.getString(R.string.onboarding_privacy_notice_description, appName) view.description_text.text = view.context.getString(R.string.onboarding_privacy_notice_description2, appName)
view.read_button.setOnClickListener { view.read_button.setOnClickListener {
it.context.components.analytics.metrics.track(Event.OnboardingPrivacyNotice) it.context.components.analytics.metrics.track(Event.OnboardingPrivacyNotice)

2
app/src/main/res/layout/onboarding_privacy_notice.xml
View File

@ -29,7 +29,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@style/Body14TextStyle" android:textAppearance="@style/Body14TextStyle"
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
tools:text="@string/onboarding_privacy_notice_description" tools:text="@string/onboarding_privacy_notice_description2"
app:layout_constraintTop_toBottomOf="@id/header_text" app:layout_constraintTop_toBottomOf="@id/header_text"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />

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

@ -1188,9 +1188,7 @@
<string name="onboarding_privacy_notice_header">Your privacy</string> <string name="onboarding_privacy_notice_header">Your privacy</string>
<!-- text for the privacy notice onboarding card description <!-- text for the privacy notice onboarding card description
The first parameter is the name of the app (e.g. Firefox Preview) --> The first parameter is the name of the app (e.g. Firefox Preview) -->
<string name="onboarding_privacy_notice_description">We’ve designed %s to give you control over what you share <string name="onboarding_privacy_notice_description2">We’ve designed %s to give you control over what you share online and what you share with us.</string>
online and what you share with us.
</string>
<!-- Text for the button to read the privacy notice --> <!-- Text for the button to read the privacy notice -->
<string name="onboarding_privacy_notice_read_button">Read our privacy notice</string> <string name="onboarding_privacy_notice_read_button">Read our privacy notice</string>
<!-- Content description (not visible, for screen readers etc.): Close onboarding screen --> <!-- Content description (not visible, for screen readers etc.): Close onboarding screen -->