From 061b87ead09cead3bd10b9e663705a1af61f1aaf Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Mon, 22 Nov 2021 20:58:31 -0500 Subject: [PATCH] Fix boosts buttons in RTL. --- .../settings/app/subscription/boost/Boost.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git 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 index 130defa04..8b9e6248a 100644 --- 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 @@ -122,6 +122,15 @@ data class Boost( private val boost6: MaterialButton = itemView.findViewById(R.id.boost_6) private val custom: AppCompatEditText = itemView.findViewById(R.id.boost_custom) + private val boostButtons: List + get() { + return if (ViewUtil.isLtr(context)) { + listOf(boost1, boost2, boost3, boost4, boost5, boost6) + } else { + listOf(boost3, boost2, boost1, boost6, boost5, boost4) + } + } + private var filter: MoneyFilter? = null init { @@ -131,7 +140,7 @@ data class Boost( override fun bind(model: SelectionModel) { itemView.isEnabled = model.isEnabled - model.boosts.zip(listOf(boost1, boost2, boost3, boost4, boost5, boost6)).forEach { (boost, button) -> + model.boosts.zip(boostButtons).forEach { (boost, button) -> button.isSelected = boost == model.selectedBoost && !model.isCustomAmountFocused button.text = FiatMoneyUtil.format( context.resources,