diff options
author | Torsten Grote <t@grobox.de> | 2020-01-08 09:29:28 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-01-08 09:29:28 -0300 |
commit | 1ec5fbd1d342f42975dc8820efe697f332ea3c15 (patch) | |
tree | e2c8c7ded1a04e74c405c4068b1b1daba0f0d574 | |
parent | 14f218f44fa5ce7ad0bef164190d6d15a9ddb2fd (diff) | |
download | wallet-android-1ec5fbd1d342f42975dc8820efe697f332ea3c15.tar.gz wallet-android-1ec5fbd1d342f42975dc8820efe697f332ea3c15.tar.bz2 wallet-android-1ec5fbd1d342f42975dc8820efe697f332ea3c15.zip |
Show Refresh events to the user if there's a fee associated
3 files changed, 26 insertions, 4 deletions
diff --git a/app/src/main/java/net/taler/wallet/history/HistoryEvent.kt b/app/src/main/java/net/taler/wallet/history/HistoryEvent.kt index 24b7936..d866c72 100644 --- a/app/src/main/java/net/taler/wallet/history/HistoryEvent.kt +++ b/app/src/main/java/net/taler/wallet/history/HistoryEvent.kt @@ -24,6 +24,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY import com.fasterxml.jackson.annotation.JsonSubTypes.Type import com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY import com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME +import net.taler.wallet.ParsedAmount.Companion.parseAmount import net.taler.wallet.R enum class ReserveType { @@ -298,8 +299,11 @@ class HistoryRefreshedEvent( */ val refreshGroupId: String ) : HistoryEvent(timestamp) { - override val icon = R.drawable.ic_history_black_24dp + override val layout = R.layout.history_payment + override val icon = R.drawable.history_refresh override val title = R.string.history_event_refreshed + override val showToUser = + !(parseAmount(amountRefreshedRaw) - parseAmount(amountRefreshedEffective)).isZero() } @JsonTypeName("order-redirected") diff --git a/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt b/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt index 5781f4f..7bb8b33 100644 --- a/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt +++ b/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt @@ -109,9 +109,6 @@ internal class GenericHistoryEventViewHolder(v: View) : HistoryEventViewHolder(v is HistoryOrderAcceptedEvent -> event.orderShortInfo.summary is HistoryOrderRefusedEvent -> event.orderShortInfo.summary is HistoryOrderRedirectedEvent -> event.newOrderShortInfo.summary - is HistoryRefreshedEvent -> { - "${parseAmount(event.amountRefreshedRaw)} - ${parseAmount(event.amountRefreshedEffective)}" - } else -> "" } } @@ -199,6 +196,7 @@ internal class HistoryPaymentViewHolder(v: View) : HistoryEventViewHolder(v) { when(event) { is HistoryPaymentSentEvent -> bind(event) is HistoryPaymentAbortedEvent -> bind(event) + is HistoryRefreshedEvent -> bind(event) } } @@ -212,4 +210,12 @@ internal class HistoryPaymentViewHolder(v: View) : HistoryEventViewHolder(v) { amountPaidWithFees.text = "-${parseAmount(event.amountLost)}" } + private fun bind(event: HistoryRefreshedEvent) { + title.text = "" + val fee = + parseAmount(event.amountRefreshedRaw) - parseAmount(event.amountRefreshedEffective) + if (fee.isZero()) amountPaidWithFees.text = null + else amountPaidWithFees.text = "-$fee" + } + } diff --git a/app/src/main/res/drawable/history_refresh.xml b/app/src/main/res/drawable/history_refresh.xml new file mode 100644 index 0000000..58d11dd --- /dev/null +++ b/app/src/main/res/drawable/history_refresh.xml @@ -0,0 +1,12 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="#FF000000" + android:pathData="M14.97,11.62C14.86,10.28 13.58,8.97 12,9c-1.7,0.04 -3,1.3 -3,3 0,1.7 1.3,2.94 3,3 0.39,0 0.77,-0.08 1.14,-0.23 0.27,-1.1 0.72,-2.14 1.83,-3.15M13,16H7C7,14.9 6.1,14 5,14V10C6.1,10 7,9.1 7,8h10c0,1.1 0.9,2 2,2v0.05c0.67,0.01 1.34,0.13 2,0.35V6H3V18H13.32C13.1,17.33 13,16.66 13,16Z" /> + <path + android:fillColor="#FF000000" + android:pathData="M19,12 L16.75,14.25 19,16.5V15c1.38,0 2.5,1.12 2.5,2.5 0,0.4 -0.09,0.78 -0.26,1.12l1.09,1.09C22.75,19.08 23,18.32 23,17.5c0,-2.21 -1.79,-4 -4,-4V12m-3.33,3.29C15.25,15.92 15,16.68 15,17.5c0,2.21 1.79,4 4,4V23L21.25,20.75 19,18.5V20c-1.38,0 -2.5,-1.12 -2.5,-2.5 0,-0.4 0.09,-0.78 0.26,-1.12z" /> +</vector> |