kopia lustrzana https://github.com/ryukoposting/Signal-Android
Update donation strings.
Alex Hart
Cody Henthorne
rodzic
2b685ea89f
commit
65a4ef2f70
|
|
@ -42,8 +42,13 @@ data class LargeBadge(
|
|||
override fun bind(model: Model) {
|
||||
badge.setBadge(model.largeBadge.badge)
|
||||
|
||||
name.text = model.largeBadge.badge.name
|
||||
description.text = model.largeBadge.badge.resolveDescription(model.shortName)
|
||||
name.text = context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal, model.shortName)
|
||||
description.text = if (model.largeBadge.badge.isSubscription()) {
|
||||
context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_monthly, model.shortName)
|
||||
} else {
|
||||
context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_donation, model.shortName)
|
||||
}
|
||||
|
||||
description.setLines(model.maxLines)
|
||||
description.maxLines = model.maxLines
|
||||
description.minLines = model.maxLines
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ class DonateToSignalFragment : DSLSettingsFragment(
|
|||
private lateinit var donationPaymentComponent: DonationPaymentComponent
|
||||
|
||||
private val supportTechSummary: CharSequence by lazy {
|
||||
SpannableStringBuilder(SpanUtil.color(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant), requireContext().getString(R.string.DonateToSignalFragment__support_technology)))
|
||||
SpannableStringBuilder(SpanUtil.color(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant), requireContext().getString(R.string.DonateToSignalFragment__private_messaging)))
|
||||
.append(" ")
|
||||
.append(
|
||||
SpanUtil.readMore(requireContext(), ContextCompat.getColor(requireContext(), R.color.signal_colorPrimary)) {
|
||||
|
|
@ -254,7 +254,7 @@ class DonateToSignalFragment : DSLSettingsFragment(
|
|||
|
||||
noPadTextPref(
|
||||
title = DSLSettingsText.from(
|
||||
R.string.DonateToSignalFragment__powered_by,
|
||||
R.string.DonateToSignalFragment__privacy_over_profit,
|
||||
DSLSettingsText.CenterModifier,
|
||||
DSLSettingsText.TitleLargeModifier
|
||||
)
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ class ManageDonationsFragment :
|
|||
ExpiredGiftSheet.Callback {
|
||||
|
||||
private val supportTechSummary: CharSequence by lazy {
|
||||
SpannableStringBuilder(SpanUtil.color(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant), requireContext().getString(R.string.DonateToSignalFragment__support_technology)))
|
||||
SpannableStringBuilder(SpanUtil.color(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant), requireContext().getString(R.string.DonateToSignalFragment__private_messaging)))
|
||||
.append(" ")
|
||||
.append(
|
||||
SpanUtil.readMore(requireContext(), ContextCompat.getColor(requireContext(), R.color.signal_colorPrimary)) {
|
||||
|
|
@ -105,7 +105,7 @@ class ManageDonationsFragment :
|
|||
|
||||
noPadTextPref(
|
||||
title = DSLSettingsText.from(
|
||||
R.string.DonateToSignalFragment__powered_by,
|
||||
R.string.DonateToSignalFragment__privacy_over_profit,
|
||||
DSLSettingsText.CenterModifier, DSLSettingsText.TitleLargeModifier
|
||||
)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -65,9 +65,9 @@ class ThanksForYourSupportBottomSheetDialogFragment : FixedRoundedCornerBottomSh
|
|||
|
||||
if (args.badge.isBoost()) {
|
||||
if (Recipient.self().badges.any { !it.isBoost() }) {
|
||||
subhead.setText(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_display)
|
||||
subhead.setText(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_donor_badge)
|
||||
} else {
|
||||
subhead.text = SpannableStringBuilder(getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_display))
|
||||
subhead.text = SpannableStringBuilder(getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_donor_badge))
|
||||
.append(" ")
|
||||
.append(getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__you_can_also))
|
||||
.append(" ")
|
||||
|
|
@ -82,7 +82,7 @@ class ThanksForYourSupportBottomSheetDialogFragment : FixedRoundedCornerBottomSh
|
|||
)
|
||||
}
|
||||
} else {
|
||||
subhead.text = getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_s_badge_display, args.badge.name)
|
||||
subhead.text = getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_donor_badge)
|
||||
}
|
||||
|
||||
val otherBadges = Recipient.self().badges.filterNot { it.id == args.badge.id }
|
||||
|
|
@ -107,7 +107,6 @@ class ThanksForYourSupportBottomSheetDialogFragment : FixedRoundedCornerBottomSh
|
|||
}
|
||||
|
||||
if (args.isBoost) {
|
||||
presentBoostCopy()
|
||||
badgeView.visibility = View.INVISIBLE
|
||||
lottie.visible = true
|
||||
lottie.playAnimation()
|
||||
|
|
@ -122,7 +121,6 @@ class ThanksForYourSupportBottomSheetDialogFragment : FixedRoundedCornerBottomSh
|
|||
}
|
||||
})
|
||||
} else {
|
||||
presentSubscriptionCopy()
|
||||
lottie.visible = false
|
||||
}
|
||||
|
||||
|
|
@ -155,14 +153,6 @@ class ThanksForYourSupportBottomSheetDialogFragment : FixedRoundedCornerBottomSh
|
|||
}
|
||||
}
|
||||
|
||||
private fun presentBoostCopy() {
|
||||
heading.setText(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_the_boost)
|
||||
}
|
||||
|
||||
private fun presentSubscriptionCopy() {
|
||||
heading.setText(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_your_support)
|
||||
}
|
||||
|
||||
companion object {
|
||||
private val TAG = Log.tag(ThanksForYourSupportBottomSheetDialogFragment::class.java)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:viewBindingIgnore="true"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
android:orientation="vertical"
|
||||
tools:viewBindingIgnore="true">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/subscribe_bottom_sheet_handle"
|
||||
|
|
@ -44,8 +44,9 @@
|
|||
android:layout_marginStart="@dimen/dsl_settings_gutter"
|
||||
android:layout_marginTop="28dp"
|
||||
android:layout_marginEnd="@dimen/dsl_settings_gutter"
|
||||
android:text="@string/SubscribeFragment__support_technology_that_is_built_for_you"
|
||||
android:textAppearance="@style/TextAppearance.Signal.Title2"
|
||||
android:gravity="center"
|
||||
android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__signal_is_different"
|
||||
android:textAppearance="@style/Signal.Text.HeadlineMedium"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/subscribe_bottom_sheet_heart" />
|
||||
|
|
@ -57,25 +58,12 @@
|
|||
android:layout_marginStart="@dimen/dsl_settings_gutter"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="@dimen/dsl_settings_gutter"
|
||||
android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_nonprofit_with_no"
|
||||
android:textAppearance="@style/Signal.Text.Body"
|
||||
android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__private_messaging"
|
||||
android:textAppearance="@style/Signal.Text.BodyLarge"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/subscribe_bottom_sheet_headline" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/subscribe_bottom_why"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dsl_settings_gutter"
|
||||
android:layout_marginTop="36dp"
|
||||
android:layout_marginEnd="@dimen/dsl_settings_gutter"
|
||||
android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__why_donate"
|
||||
android:textAppearance="@style/TextAppearance.Signal.Title2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/subscribe_bottom_sheet_subhead" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/subscribe_bottom_sheet_the_team"
|
||||
android:layout_width="0dp"
|
||||
|
|
@ -83,11 +71,11 @@
|
|||
android:layout_marginStart="@dimen/dsl_settings_gutter"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="@dimen/dsl_settings_gutter"
|
||||
android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__signal_is_committed_to_developing"
|
||||
android:textAppearance="@style/Signal.Text.Body"
|
||||
android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__signal_is_supported_by"
|
||||
android:textAppearance="@style/Signal.Text.BodyLarge"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/subscribe_bottom_why" />
|
||||
app:layout_constraintTop_toBottomOf="@id/subscribe_bottom_sheet_subhead" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/subscribe_bottom_sheet_your_contribution"
|
||||
|
|
@ -97,8 +85,8 @@
|
|||
android:layout_marginTop="24dp"
|
||||
android:layout_marginEnd="@dimen/dsl_settings_gutter"
|
||||
android:paddingBottom="36dp"
|
||||
android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__your_donation"
|
||||
android:textAppearance="@style/Signal.Text.Body"
|
||||
android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__if_you_can"
|
||||
android:textAppearance="@style/Signal.Text.BodyLarge"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/subscribe_bottom_sheet_the_team" />
|
||||
|
|
|
|||
|
|
@ -4392,6 +4392,12 @@
|
|||
<string name="SelectFeaturedBadgeFragment__failed_to_update_profile">Failed to update profile</string>
|
||||
|
||||
<string name="ViewBadgeBottomSheetDialogFragment__become_a_sustainer">Become a sustainer</string>
|
||||
<!-- Title of a page in the bottom sheet. Placeholder is a user's short-name -->
|
||||
<string name="ViewBadgeBottomSheetDialogFragment__s_supports_signal">%1$s supports Signal</string>
|
||||
<!-- Description of a page in the bottom sheet of a monthly badge. Placeholder is a user's short-name -->
|
||||
<string name="ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_monthly">%1$s supports Signal with a monthly donation. Signal is a nonprofit with no advertisers or investors, supported only by people like you.</string>
|
||||
<!-- Description of a page in the bottom sheet of a one-time badge. Placeholder is a user's short-name -->
|
||||
<string name="ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_donation">%1$s supports Signal with a donation. Signal is a nonprofit with no advertisers or investors, supported only by people like you.</string>
|
||||
|
||||
<string name="ImageView__badge">Badge</string>
|
||||
|
||||
|
|
@ -4416,16 +4422,18 @@
|
|||
<!-- Shown when a subscription is active and is going to expire at the end of the term -->
|
||||
<string name="Subscription__expires_s">Expires %1$s</string>
|
||||
|
||||
<!-- Title of learn more sheet -->
|
||||
<string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_different">Signal is different.</string>
|
||||
<!-- First small text blurb on learn more sheet -->
|
||||
<string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_nonprofit_with_no">Signal is a nonprofit with no advertisers or investors, sustained only by the people who use and value it. Make a recurring monthly donation and receive a profile badge to share your support.</string>
|
||||
<string name="SubscribeLearnMoreBottomSheetDialogFragment__why_donate">Why Donate?</string>
|
||||
<string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_committed_to_developing">Signal is committed to developing open source privacy technology that protects free expression and enables secure global communication.</string>
|
||||
<string name="SubscribeLearnMoreBottomSheetDialogFragment__your_donation">Your donation fuels this cause and pays for the development and operations of an app used by millions for private communication. No ads. No trackers. No kidding.</string>
|
||||
<string name="SubscribeLearnMoreBottomSheetDialogFragment__private_messaging">Private messaging. No ads, no trackers, no surveillance.</string>
|
||||
<!-- Second small text blurb on learn more sheet -->
|
||||
<string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_supported_by">Signal is supported by donations, meaning that your privacy is at the center of everything we do. Signal is built for you; not your data and not for profit.</string>
|
||||
<!-- Third small text blurb on learn more sheet -->
|
||||
<string name="SubscribeLearnMoreBottomSheetDialogFragment__if_you_can">If you can, please donate today to keep Signal fun, dependable, and available for everyone.</string>
|
||||
|
||||
<string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_your_support">Thanks for your Support!</string>
|
||||
<string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_the_boost">Thanks for the Boost!</string>
|
||||
<string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_s_badge_display">You\'ve earned %s badge! Display this badge on your profile to build awareness for donating to Signal.</string>
|
||||
<string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_display">You\'ve earned a Boost badge! Display this badge on your profile to build awareness for donating to Signal.</string>
|
||||
<!-- Subtext underneath the dialog title on the thanks sheet -->
|
||||
<string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_donor_badge">You\'ve earned a donor badge from Signal! Display it on your profile to show off your support.</string>
|
||||
<string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__you_can_also">You can also</string>
|
||||
<string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__become_a_montly_sustainer">become a monthly Sustainer.</string>
|
||||
<string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile">Display on Profile</string>
|
||||
|
|
@ -5483,11 +5491,11 @@
|
|||
|
||||
<!-- DonateToSignalFragment -->
|
||||
<!-- Title below avatar -->
|
||||
<string name="DonateToSignalFragment__powered_by">Powered by people like you.</string>
|
||||
<string name="DonateToSignalFragment__privacy_over_profit">Privay over profit</string>
|
||||
<!-- Continue button label -->
|
||||
<string name="DonateToSignalFragment__continue">Continue</string>
|
||||
<!-- Description below title -->
|
||||
<string name="DonateToSignalFragment__support_technology">Support technology built for you, not your data, by joining the community that sustains Signal.</string>
|
||||
<string name="DonateToSignalFragment__private_messaging">Private messaging, funded by you. No ads, no tracking, no compromise. Donate now to support Signal.</string>
|
||||
<!-- Donation pill toggle monthly text -->
|
||||
<string name="DonationPillToggle__monthly">Monthly</string>
|
||||
<!-- Donation pill toggle one-time text -->
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue