From db8b71418b766258a7a4bda91e496b1b03cb28cd Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 20 Mar 2020 15:43:23 -0300
Subject: Let all apps use the same Amount class

The wallet now also uses taler-kotlin-common
---
 cashier/src/main/java/net/taler/cashier/BalanceFragment.kt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'cashier/src/main/java/net/taler/cashier/BalanceFragment.kt')

diff --git a/cashier/src/main/java/net/taler/cashier/BalanceFragment.kt b/cashier/src/main/java/net/taler/cashier/BalanceFragment.kt
index 2178a78..fffb21b 100644
--- a/cashier/src/main/java/net/taler/cashier/BalanceFragment.kt
+++ b/cashier/src/main/java/net/taler/cashier/BalanceFragment.kt
@@ -16,7 +16,6 @@
 
 package net.taler.cashier
 
-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
@@ -34,14 +33,14 @@ import kotlinx.android.synthetic.main.fragment_balance.*
 import net.taler.cashier.BalanceFragmentDirections.Companion.actionBalanceFragmentToTransactionFragment
 import net.taler.cashier.withdraw.LastTransaction
 import net.taler.cashier.withdraw.WithdrawStatus
-import net.taler.common.Amount
+import net.taler.common.SignedAmount
 import net.taler.common.fadeIn
 import net.taler.common.fadeOut
 
 sealed class BalanceResult {
     object Error : BalanceResult()
     object Offline : BalanceResult()
-    class Success(val amount: Amount) : BalanceResult()
+    class Success(val amount: SignedAmount) : BalanceResult()
 }
 
 class BalanceFragment : Fragment() {
@@ -121,7 +120,7 @@ class BalanceFragment : Fragment() {
         else -> super.onOptionsItemSelected(item)
     }
 
-    private fun onBalanceUpdated(amount: Amount?, isOffline: Boolean = false) {
+    private fun onBalanceUpdated(amount: SignedAmount?, isOffline: Boolean = false) {
         val uiList = listOf(
             introView,
             button5, button10, button20, button50,
@@ -132,8 +131,7 @@ class BalanceFragment : Fragment() {
                 getString(if (isOffline) R.string.balance_offline else R.string.balance_error)
             uiList.forEach { it.fadeOut() }
         } else {
-            @SuppressLint("SetTextI18n")
-            balanceView.text = "${amount.amount} ${amount.currency}"
+            balanceView.text = amount.toString()
             uiList.forEach { it.fadeIn() }
         }
         progressBar.fadeOut()
-- 
cgit v1.2.3