[taler-wallet-android] 05/10: Use +/- prefix for ammounts and hide 0 ammounts

[gnunet]

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 1e7ed72053dc5ad9a0f0264b3f154feee2cd7f35
Author: Torsten Grote <address@hidden>
AuthorDate: Fri Jan 3 08:55:52 2020 -0300

    Use +/- prefix for ammounts and hide 0 ammounts
---
 .idea/vcs.xml                                             |  6 ++++++
 app/src/main/java/net/taler/wallet/Amount.kt              |  4 ++++
 .../java/net/taler/wallet/history/WalletHistoryAdapter.kt | 15 ++++++++++++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/net/taler/wallet/Amount.kt 
b/app/src/main/java/net/taler/wallet/Amount.kt
index 656228f..2b41be1 100644
--- a/app/src/main/java/net/taler/wallet/Amount.kt
+++ b/app/src/main/java/net/taler/wallet/Amount.kt
@@ -105,6 +105,10 @@ class ParsedAmount(
         return ParsedAmount(currency, resultValue, resultFraction)
     }
 
+    fun isZero(): Boolean {
+        return value == 0u && fraction == 0.0
+    }
+
     fun toJSONString(): String {
         return "$currency:${getValueString()}"
     }
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 9d601e1..4cc35f7 100644
--- a/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt
+++ b/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt
@@ -116,6 +116,7 @@ internal class HistoryWithdrawnViewHolder(v: View) : 
HistoryEventViewHolder(v) {
 
     private val exchangeUrl: TextView = v.findViewById(R.id.exchangeUrl)
     private val amountWithdrawn: TextView = 
v.findViewById(R.id.amountWithdrawn)
+    private val feeLabel: TextView = v.findViewById(R.id.feeLabel)
     private val fee: TextView = v.findViewById(R.id.fee)
 
     override fun bind(event: HistoryEvent) {
@@ -125,8 +126,16 @@ internal class HistoryWithdrawnViewHolder(v: View) : 
HistoryEventViewHolder(v) {
         exchangeUrl.text = event.exchangeBaseUrl
         val parsedEffective = parseAmount(event.amountWithdrawnEffective)
         val parsedRaw = parseAmount(event.amountWithdrawnRaw)
-        amountWithdrawn.text = parsedRaw.toString()
-        fee.text = (parsedRaw - parsedEffective).toString()
+        amountWithdrawn.text = "+${parsedRaw.toString()}"
+        val calculatedFee = parsedRaw - parsedEffective
+        if (calculatedFee.isZero()) {
+            fee.visibility = View.GONE
+            feeLabel.visibility = View.GONE
+        } else {
+            fee.text = "-${calculatedFee.toString()}"
+            fee.visibility = View.VISIBLE
+            feeLabel.visibility = View.VISIBLE
+        }
     }
 
 }
@@ -142,7 +151,7 @@ internal class HistoryPaymentSentViewHolder(v: View) : 
HistoryEventViewHolder(v)
 
         title.text = event.orderShortInfo.summary
         summary.setText(event.title)
-        amountPaidWithFees.text = 
parseAmount(event.amountPaidWithFees).toString()
+        amountPaidWithFees.text = 
"-${parseAmount(event.amountPaidWithFees).toString()}"
     }
 
 }

-- 
To stop receiving notification emails like this one, please contact
address@hidden.