Update donations strings.

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/ExpiredGiftSheetConfiguration.kt

@@ -30,14 +30,14 @@ object ExpiredGiftSheetConfiguration {
   private fun DSLConfiguration.expiredSheet(onMakeAMonthlyDonation: () -> Unit, onNotNow: () -> Unit) {
     textPref(
       title = DSLSettingsText.from(
-        stringId = R.string.ExpiredGiftSheetConfiguration__your_gift_badge_has_expired,
+        stringId = R.string.ExpiredGiftSheetConfiguration__your_badge_has_expired,
         DSLSettingsText.CenterModifier, DSLSettingsText.TitleLargeModifier
       )
     )
 
     textPref(
       title = DSLSettingsText.from(
-        stringId = R.string.ExpiredGiftSheetConfiguration__your_gift_badge_has_expired_and_is,
+        stringId = R.string.ExpiredGiftSheetConfiguration__your_badge_has_expired_and_is,
         DSLSettingsText.CenterModifier
       )
     )

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/GiftMessageView.kt

@@ -16,6 +16,7 @@ import org.thoughtcrime.securesms.badges.BadgeImageView
 import org.thoughtcrime.securesms.badges.gifts.Gifts.formatExpiry
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.recipients.Recipient
 
 /**
  * Displays a gift badge sent to or received from a user, and allows the user to
@@ -49,8 +50,7 @@ class GiftMessageView @JvmOverloads constructor(
     }
   }
 
-  fun setGiftBadge(glideRequests: GlideRequests, giftBadge: GiftBadge, isOutgoing: Boolean, callback: Callback) {
-    titleView.setText(R.string.GiftMessageView__gift_badge)
+  fun setGiftBadge(glideRequests: GlideRequests, giftBadge: GiftBadge, isOutgoing: Boolean, callback: Callback, recipient: Recipient) {
     descriptionView.text = giftBadge.formatExpiry(context)
     actionView.icon = null
     actionView.setOnClickListener { callback.onViewGiftBadgeClicked() }
@@ -58,7 +58,9 @@ class GiftMessageView @JvmOverloads constructor(
 
     if (isOutgoing) {
       actionView.setText(R.string.GiftMessageView__view)
+      titleView.text = context.getString(R.string.GiftMessageView__donation_to_s, recipient.getDisplayName(context))
     } else {
+      titleView.text = context.getString(R.string.GiftMessageView__s_donated_to_signal_on, recipient.getShortDisplayName(context))
       when (giftBadge.redemptionState) {
         GiftBadge.RedemptionState.REDEEMED -> {
           stopAnimationIfNeeded()

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowConfirmationFragment.kt

@@ -45,7 +45,7 @@ import org.thoughtcrime.securesms.util.navigation.safeNavigate
  */
 class GiftFlowConfirmationFragment :
   DSLSettingsFragment(
-    titleId = R.string.GiftFlowConfirmationFragment__confirm_gift,
+    titleId = R.string.GiftFlowConfirmationFragment__confirm_donation,
     layoutId = R.layout.gift_flow_confirmation_fragment
   ),
   EmojiKeyboardPageFragment.Callback,
@@ -221,7 +221,7 @@ class GiftFlowConfirmationFragment :
       )
 
       textPref(
-        summary = DSLSettingsText.from(R.string.GiftFlowConfirmationFragment__your_gift_will_be_sent_in)
+        summary = DSLSettingsText.from(R.string.GiftFlowConfirmationFragment__the_recipient_will_be_notified)
       )
     }
   }

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowStartFragment.kt

@@ -70,7 +70,7 @@ class GiftFlowStartFragment : DSLSettingsFragment(
 
       noPadTextPref(
         title = DSLSettingsText.from(
-          R.string.GiftFlowStartFragment__gift_a_badge,
+          R.string.GiftFlowStartFragment__donate_for_a_friend,
           DSLSettingsText.CenterModifier,
           DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_Headline)
         )
@@ -79,7 +79,7 @@ class GiftFlowStartFragment : DSLSettingsFragment(
       space(DimensionUnit.DP.toPixels(16f).toInt())
 
       noPadTextPref(
-        title = DSLSettingsText.from(R.string.GiftFlowStartFragment__gift_someone_a_badge, DSLSettingsText.CenterModifier)
+        title = DSLSettingsText.from(resources.getQuantityString(R.plurals.GiftFlowStartFragment__support_signal_by, 30, 30), DSLSettingsText.CenterModifier)
       )
 
       space(DimensionUnit.DP.toPixels(16f).toInt())

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftRowItem.kt

@@ -34,7 +34,7 @@ object GiftRowItem {
     override fun bind(model: Model) {
       binding.check.visible = false
       binding.badge.setBadge(model.giftBadge)
-      binding.tagline.setText(R.string.GiftRowItem__send_a_gift_badge)
+      binding.tagline.visible = false
 
       val price = FiatMoneyUtil.format(
         context.resources,

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/thanks/GiftThanksSheet.kt

@@ -63,7 +63,7 @@ class GiftThanksSheet : DSLSettingsBottomSheetFragment() {
 
       noPadTextPref(
         title = DSLSettingsText.from(
-          getString(R.string.GiftThanksSheet__youve_gifted_a_badge_to_s, recipient.getDisplayName(requireContext())),
+          getString(R.string.GiftThanksSheet__youve_made_a_donation, recipient.getDisplayName(requireContext())),
           DSLSettingsText.CenterModifier
         )
       )

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt

@@ -157,7 +157,7 @@ class ViewReceivedGiftBottomSheet : DSLSettingsBottomSheetFragment() {
         if (state.recipient != null && !isGiftBadgeRedeemed(state.giftBadge)) {
           noPadTextPref(
             title = DSLSettingsText.from(
-              charSequence = requireContext().getString(R.string.ViewReceivedGiftBottomSheet__s_sent_you_a_gift, state.recipient.getShortDisplayName(requireContext())),
+              charSequence = requireContext().getString(R.string.ViewReceivedGiftBottomSheet__s_made_a_donation_for_you, state.recipient.getShortDisplayName(requireContext())),
               DSLSettingsText.CenterModifier, DSLSettingsText.TitleLargeModifier
             )
           )
@@ -179,7 +179,7 @@ class ViewReceivedGiftBottomSheet : DSLSettingsBottomSheetFragment() {
   private fun DSLConfiguration.presentSubheading(recipient: Recipient) {
     noPadTextPref(
       title = DSLSettingsText.from(
-        charSequence = requireContext().getString(R.string.ViewReceivedGiftBottomSheet__youve_received_a_gift_badge, recipient.getDisplayName(requireContext())),
+        charSequence = requireContext().getString(R.string.ViewReceivedGiftBottomSheet__s_made_a_donation_to_signal, recipient.getShortDisplayName(requireContext())),
         DSLSettingsText.CenterModifier
       )
     )
@@ -206,7 +206,8 @@ class ViewReceivedGiftBottomSheet : DSLSettingsBottomSheetFragment() {
       else -> {
         customPref(
           BadgeDisplay112.Model(
-            badge = badge
+            badge = badge,
+            withDisplayText = false
           )
         )
 

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt

@@ -75,7 +75,7 @@ class ViewSentGiftBottomSheet : DSLSettingsBottomSheetFragment() {
       if (state.recipient != null) {
         noPadTextPref(
           title = DSLSettingsText.from(
-            charSequence = getString(R.string.ViewSentGiftBottomSheet__youve_gifted_a_badge, state.recipient.getDisplayName(requireContext())),
+            charSequence = getString(R.string.ViewSentGiftBottomSheet__youve_made_a_donation_to_signal, state.recipient.getDisplayName(requireContext())),
             DSLSettingsText.CenterModifier
           )
         )