Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix in-chat payment view not updating properly.

Browse Source
This commit is contained in:
Cody Henthorne
2022-11-30 19:58:47 -05:00
committed by GitHub
parent 7945b3c971
commit e8f39e8f71
10 changed files with 89 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/org/thoughtcrime/securesms/conversation/ui/payment/PaymentMessageView.kt
View File

@@ -6,7 +6,11 @@ import android.text.style.TypefaceSpan
import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.FrameLayout
import androidx.annotation.ColorInt
import androidx.core.view.ViewCompat
import com.google.android.material.progressindicator.CircularProgressIndicatorSpec
import com.google.android.material.progressindicator.IndeterminateDrawable
import org.signal.core.util.dp
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.quotes.QuoteViewColorTheme
import org.thoughtcrime.securesms.conversation.colors.Colorizer
@@ -51,12 +55,33 @@ class PaymentMessageView @JvmOverloads constructor(
val quoteViewColorTheme = QuoteViewColorTheme.resolveTheme(outgoing, false, recipient.hasWallpaper())
binding.paymentAmount.setTextColor(quoteViewColorTheme.getForegroundColor(context))
binding.paymentAmount.setMoney(payment.amount, 0L, currencyTypefaceSpan)
if (payment.state.isInProgress) {
binding.paymentAmount.visible = false
binding.paymentInprogress.visible = true
binding.paymentInprogress.setImageDrawable(getInProgressDrawable(quoteViewColorTheme.getForegroundColor(context)))
} else {
binding.paymentAmount.visible = true
binding.paymentInprogress.visible = false
binding.paymentAmount.setTextColor(quoteViewColorTheme.getForegroundColor(context))
binding.paymentAmount.setMoney(payment.amount, 0L, currencyTypefaceSpan)
}
ViewCompat.setBackgroundTintList(binding.paymentAmountLayout, ColorStateList.valueOf(quoteViewColorTheme.getBackgroundColor(context)))
}
private fun getInProgressDrawable(@ColorInt color: Int): IndeterminateDrawable<CircularProgressIndicatorSpec> {
val spec = CircularProgressIndicatorSpec(context, null).apply {
indicatorInset = 0
indicatorColors = intArrayOf(color)
indicatorSize = 20.dp
trackThickness = 2.dp
}
val drawable = IndeterminateDrawable.createCircularDrawable(context, spec)
drawable.setBounds(0, 0, spec.indicatorSize, spec.indicatorSize)
return drawable
}
companion object {
private val currencyTypefaceSpan = TypefaceSpan("sans-serif-light")
}