1 files changed, 30 insertions, 23 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/balances/BalanceAdapter.kt b/wallet/src/main/java/net/taler/wallet/balances/BalanceAdapter.kt
index 09ae353..aabef4b 100644
--- a/wallet/src/main/java/net/taler/wallet/balances/BalanceAdapter.kt
+++ b/wallet/src/main/java/net/taler/wallet/balances/BalanceAdapter.kt
@@ -24,20 +24,12 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.Adapter
-import kotlinx.serialization.Serializable
-import net.taler.lib.common.Amount
 import net.taler.wallet.R
 import net.taler.wallet.balances.BalanceAdapter.BalanceViewHolder
-
-@Serializable
-data class BalanceItem(
-    val available: Amount,
-    val pendingIncoming: Amount,
-    val pendingOutgoing: Amount
-) {
-    val currency: String get() = available.currency
-    val hasPending: Boolean get() = !pendingIncoming.isZero() || !pendingOutgoing.isZero()
-}
+import net.taler.wallet.balances.ScopeInfo.Auditor
+import net.taler.wallet.balances.ScopeInfo.Exchange
+import net.taler.wallet.balances.ScopeInfo.Global
+import net.taler.wallet.cleanExchange
 
 class BalanceAdapter(private val listener: BalanceClickListener) : Adapter<BalanceViewHolder>() {
 
@@ -66,28 +58,43 @@ class BalanceAdapter(private val listener: BalanceClickListener) : Adapter<Balan
     }
 
     inner class BalanceViewHolder(private val v: View) : RecyclerView.ViewHolder(v) {
-        private val currencyView: TextView = v.findViewById(R.id.balanceCurrencyView)
         private val amountView: TextView = v.findViewById(R.id.balanceAmountView)
+        private val scopeView: TextView = v.findViewById(R.id.scopeView)
         private val balanceInboundAmount: TextView = v.findViewById(R.id.balanceInboundAmount)
-        private val balanceInboundLabel: TextView = v.findViewById(R.id.balanceInboundLabel)
-        private val pendingView: TextView = v.findViewById(R.id.pendingView)
+        private val balanceOutboundAmount: TextView = v.findViewById(R.id.balanceOutboundAmount)
 
         fun bind(item: BalanceItem) {
-            v.setOnClickListener { listener.onBalanceClick(item.available.currency) }
-            currencyView.text = item.currency
-            amountView.text = item.available.amountStr
+            v.setOnClickListener { listener.onBalanceClick(item.scopeInfo) }
+            amountView.text = item.available.toString()
 
             val amountIncoming = item.pendingIncoming
             if (amountIncoming.isZero()) {
                 balanceInboundAmount.visibility = GONE
-                balanceInboundLabel.visibility = GONE
             } else {
                 balanceInboundAmount.visibility = VISIBLE
-                balanceInboundLabel.visibility = VISIBLE
-                balanceInboundAmount.text =
-                    v.context.getString(R.string.amount_positive, amountIncoming)
+                balanceInboundAmount.text = v.context.getString(R.string.balances_inbound_amount, amountIncoming.toString(showSymbol = false))
+            }
+
+            val amountOutgoing = item.pendingOutgoing
+            if (amountOutgoing.isZero()) {
+                balanceOutboundAmount.visibility = GONE
+            } else {
+                balanceOutboundAmount.visibility = VISIBLE
+                balanceOutboundAmount.text = v.context.getString(R.string.balances_outbound_amount, amountOutgoing.toString(showSymbol = false))
+            }
+
+            val scopeInfo = item.scopeInfo
+            scopeView.visibility = when (scopeInfo) {
+                is Global -> GONE
+                is Exchange -> {
+                    scopeView.text = v.context.getString(R.string.balance_scope_exchange, cleanExchange(scopeInfo.url))
+                    VISIBLE
+                }
+                is Auditor -> {
+                    scopeView.text = v.context.getString(R.string.balance_scope_auditor, cleanExchange(scopeInfo.url))
+                    VISIBLE
+                }
             }
-            pendingView.visibility = if (item.hasPending) VISIBLE else GONE
         }
     }