Implement several pieces of UI polish for badges.

2026-04-23 10:20:25 +01:00 · 2021-10-28 13:59:05 -03:00
parent 186bd9db48
commit 755ec672c0
33 changed files with 364 additions and 113 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsText.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsText.kt
@@ -70,4 +70,10 @@ sealed class DSLSettingsText {
      return SpanUtil.textAppearance(context, textAppearance, charSequence)
    }
  }
+
+  object BoldModifier : Modifier {
+    override fun modify(context: Context, charSequence: CharSequence): CharSequence {
+      return SpanUtil.bold(charSequence)
+    }
+  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
@@ -24,6 +24,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.MappingAdapter
 import org.thoughtcrime.securesms.util.MappingViewHolder
+import org.thoughtcrime.securesms.util.PlayServicesUtil

 class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__menu_settings) {

@@ -143,7 +144,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
        }
      )

-      if (FeatureFlags.donorBadges()) {
+      if (FeatureFlags.donorBadges() && PlayServicesUtil.getPlayServicesStatus(requireContext()) == PlayServicesUtil.PlayServicesStatus.SUCCESS) {
        customPref(
          SubscriptionPreference(
            title = DSLSettingsText.from(R.string.preferences__subscription),
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
@@ -106,15 +106,10 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
    return Completable.create {
      stripeApi.confirmPaymentIntent(GooglePayPaymentSource(paymentData), paymentIntent).blockingSubscribe()

-      val jobIds = BoostReceiptRequestResponseJob.enqueueChain(paymentIntent)
-      val countDownLatch = CountDownLatch(2)
+      val jobId = BoostReceiptRequestResponseJob.enqueueChain(paymentIntent)
+      val countDownLatch = CountDownLatch(1)

-      ApplicationDependencies.getJobManager().addListener(jobIds.first()) { _, jobState ->
-        if (jobState.isComplete) {
-          countDownLatch.countDown()
-        }
-      }
-      ApplicationDependencies.getJobManager().addListener(jobIds.second()) { _, jobState ->
+      ApplicationDependencies.getJobManager().addListener(jobId) { _, jobState ->
        if (jobState.isComplete) {
          countDownLatch.countDown()
        }
@@ -146,15 +141,10 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
          SignalStore.donationsValues().clearLevelOperation(levelUpdateOperation)
          it.onComplete()
        }.andThen {
-          val jobIds = SubscriptionReceiptRequestResponseJob.enqueueSubscriptionContinuation()
-          val countDownLatch = CountDownLatch(2)
+          val jobId = SubscriptionReceiptRequestResponseJob.enqueueSubscriptionContinuation()
+          val countDownLatch = CountDownLatch(1)

-          ApplicationDependencies.getJobManager().addListener(jobIds.first()) { _, jobState ->
-            if (jobState.isComplete) {
-              countDownLatch.countDown()
-            }
-          }
-          ApplicationDependencies.getJobManager().addListener(jobIds.second()) { _, jobState ->
+          ApplicationDependencies.getJobManager().addListener(jobId) { _, jobState ->
            if (jobState.isComplete) {
              countDownLatch.countDown()
            }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt
@@ -119,6 +119,9 @@ data class Boost(

      if (model.isCustomAmountFocused && !custom.hasFocus()) {
        ViewUtil.focusAndShowKeyboard(custom)
+      } else if (!model.isCustomAmountFocused && custom.hasFocus()) {
+        ViewUtil.hideKeyboard(context, custom)
+        custom.clearFocus()
      }
    }
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt
@@ -146,7 +146,7 @@ class BoostFragment : DSLSettingsBottomSheetFragment(
        text = DSLSettingsText.from(R.string.SubscribeFragment__more_payment_options),
        icon = DSLSettingsIcon.from(R.drawable.ic_open_20, R.color.signal_accent_primary),
        onClick = {
-          // TODO
+          // TODO [alex] -- Where's this go?
        }
      )
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyFragment.kt
@@ -28,12 +28,12 @@ class SetCurrencyFragment : DSLSettingsBottomSheetFragment() {
  private fun getConfiguration(state: SetCurrencyState): DSLConfiguration {
    return configure {
      state.currencies.forEach { currency ->
-        radioPref(
+        clickPref(
          title = DSLSettingsText.from(currency.getDisplayName(Locale.getDefault())),
          summary = DSLSettingsText.from(currency.currencyCode),
-          isChecked = currency.currencyCode == state.selectedCurrencyCode,
          onClick = {
            viewModel.setSelectedCurrency(currency.currencyCode)
+            dismissAllowingStateLoss()
          }
        )
      }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyViewModel.kt
@@ -7,7 +7,10 @@ import androidx.lifecycle.ViewModelProvider
 import org.signal.donations.StripeApi
 import org.thoughtcrime.securesms.BuildConfig
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.storage.StorageSyncHelper
+import org.thoughtcrime.securesms.subscription.Subscriber
 import org.thoughtcrime.securesms.util.livedata.Store
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
 import java.util.Currency
 import java.util.Locale

@@ -43,7 +46,21 @@ class SetCurrencyViewModel(private val isBoost: Boolean) : ViewModel() {
    if (isBoost) {
      SignalStore.donationsValues().setBoostCurrency(Currency.getInstance(selectedCurrencyCode))
    } else {
-      SignalStore.donationsValues().setSubscriptionCurrency(Currency.getInstance(selectedCurrencyCode))
+      val currency = Currency.getInstance(selectedCurrencyCode)
+      val subscriber = SignalStore.donationsValues().getSubscriber(currency)
+
+      if (subscriber != null) {
+        SignalStore.donationsValues().setSubscriber(subscriber)
+      } else {
+        SignalStore.donationsValues().setSubscriber(
+          Subscriber(
+            subscriberId = SubscriberId.generate(),
+            currencyCode = currency.currencyCode
+          )
+        )
+      }
+
+      StorageSyncHelper.scheduleSyncForDataChange()
    }
  }

--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
@@ -7,6 +7,7 @@ import androidx.navigation.NavOptions
 import androidx.navigation.fragment.findNavController
 import org.signal.core.util.DimensionUnit
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.BadgePreview
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
@@ -59,6 +60,7 @@ class ManageDonationsFragment : DSLSettingsFragment() {

    ActiveSubscriptionPreference.register(adapter)
    IndeterminateLoadingCircle.register(adapter)
+    BadgePreview.register(adapter)

    viewModel.state.observe(viewLifecycleOwner) { state ->
      adapter.submitList(getConfiguration(state).toMappingModelList())
@@ -75,6 +77,14 @@ class ManageDonationsFragment : DSLSettingsFragment() {

  private fun getConfiguration(state: ManageDonationsState): DSLConfiguration {
    return configure {
+      customPref(
+        BadgePreview.Model(
+          badge = state.featuredBadge
+        )
+      )
+
+      space(DimensionUnit.DP.toPixels(8f).toInt())
+
      sectionHeaderPref(
        title = DSLSettingsText.from(
          R.string.SubscribeFragment__signal_is_powered_by_people_like_you,
@@ -82,10 +92,12 @@ class ManageDonationsFragment : DSLSettingsFragment() {
        )
      )

+      space(DimensionUnit.DP.toPixels(32f).toInt())
+
      noPadTextPref(
        title = DSLSettingsText.from(
          R.string.ManageDonationsFragment__my_support,
-          DSLSettingsText.Title2BoldModifier
+          DSLSettingsText.Body1BoldModifier, DSLSettingsText.BoldModifier
        )
      )

@@ -94,7 +106,7 @@ class ManageDonationsFragment : DSLSettingsFragment() {
        if (activeSubscription.isActive) {
          val subscription: Subscription? = state.availableSubscriptions.firstOrNull { activeSubscription.activeSubscription.level == it.level }
          if (subscription != null) {
-            space(DimensionUnit.DP.toPixels(16f).toInt())
+            space(DimensionUnit.DP.toPixels(12f).toInt())

            customPref(
              ActiveSubscriptionPreference.Model(
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt
@@ -124,6 +124,8 @@ class SubscribeFragment : DSLSettingsFragment(
        )
      )

+      space(DimensionUnit.DP.toPixels(4f).toInt())
+
      state.subscriptions.forEach {
        val isActive = state.activeSubscription?.activeSubscription?.level == it.level
        customPref(
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/AvatarPreference.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/AvatarPreference.kt
@@ -49,13 +49,19 @@ object AvatarPreference {
    }

    override fun bind(model: Model) {
-      badge.setBadgeFromRecipient(model.recipient)
-      badge.setOnClickListener {
-        val badge = model.recipient.badges.firstOrNull()
-        if (badge != null) {
-          model.onBadgeClick(badge)
+      if (model.recipient.isSelf) {
+        badge.setBadge(null)
+        badge.setOnClickListener(null)
+      } else {
+        badge.setBadgeFromRecipient(model.recipient)
+        badge.setOnClickListener {
+          val badge = model.recipient.badges.firstOrNull()
+          if (badge != null) {
+            model.onBadgeClick(badge)
+          }
        }
      }
+
      avatar.setAvatar(model.recipient)
      avatar.disableQuickContact()
      avatar.setOnClickListener { model.onAvatarClick(avatar) }