[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-android] 08/10: Show Refresh events to the user if there's
From: |
gnunet |
Subject: |
[taler-wallet-android] 08/10: Show Refresh events to the user if there's a fee associated |
Date: |
Thu, 30 Jan 2020 18:40:16 +0100 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository wallet-android.
commit 1ec5fbd1d342f42975dc8820efe697f332ea3c15
Author: Torsten Grote <address@hidden>
AuthorDate: Wed Jan 8 09:29:28 2020 -0300
Show Refresh events to the user if there's a fee associated
---
app/src/main/java/net/taler/wallet/history/HistoryEvent.kt | 6 +++++-
.../java/net/taler/wallet/history/WalletHistoryAdapter.kt | 12 +++++++++---
app/src/main/res/drawable/history_refresh.xml | 12 ++++++++++++
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>
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-wallet-android] branch master updated (b1ae959 -> c20a794), gnunet, 2020/01/30
- [taler-wallet-android] 05/10: Use +/- prefix for ammounts and hide 0 ammounts, gnunet, 2020/01/30
- [taler-wallet-android] 07/10: Use official User-Facing Terminology, gnunet, 2020/01/30
- [taler-wallet-android] 10/10: Don't crash on and show unknown events, gnunet, 2020/01/30
- [taler-wallet-android] 08/10: Show Refresh events to the user if there's a fee associated,
gnunet <=
- [taler-wallet-android] 01/10: De-serialize first history events using Jackson, gnunet, 2020/01/30
- [taler-wallet-android] 02/10: Use special layout for withdraw event in wallet history, gnunet, 2020/01/30
- [taler-wallet-android] 09/10: Show history event JSON in debug builds, gnunet, 2020/01/30
- [taler-wallet-android] 04/10: Hide detailed history events by default, gnunet, 2020/01/30
- [taler-wallet-android] 06/10: Implement more events and make ViewHolders more generic, gnunet, 2020/01/30
- [taler-wallet-android] 03/10: Deserialize and render more wallet history events, gnunet, 2020/01/30