Let all apps use the same Amount class

The wallet now also uses taler-kotlin-common

4 files changed, 6 insertions, 10 deletions

diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt
index fc3f93a..3aaf3a4 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt
@@ -42,7 +42,7 @@ data class HistoryItem(
     val timestamp: Timestamp
 ) {
     @get:JsonIgnore
-    val amount: Amount by lazy { Amount.fromString(amountStr) }
+    val amount: Amount by lazy { Amount.fromJSONString(amountStr) }
 
     @get:JsonIgnore
     val time = timestamp.ms
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/history/MerchantHistoryFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/history/MerchantHistoryFragment.kt
index afa925d..1099eda 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/history/MerchantHistoryFragment.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/history/MerchantHistoryFragment.kt
@@ -16,7 +16,6 @@
 
 package net.taler.merchantpos.history
 
-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -148,8 +147,7 @@ private class HistoryItemAdapter(private val listener: RefundClickListener) :
         fun bind(item: HistoryItem) {
             orderSummaryView.text = item.summary
             val amount = item.amount
-            @SuppressLint("SetTextI18n")
-            orderAmountView.text = "${amount.amount} ${amount.currency}"
+            orderAmountView.text = amount.toString()
             orderIdView.text = v.context.getString(R.string.history_ref_no, item.orderId)
             orderTimeView.text = item.time.toRelativeTime(v.context)
             refundButton.setOnClickListener { listener.onRefundClicked(item) }
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/history/RefundFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/history/RefundFragment.kt
index aa2489a..609eadd 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/history/RefundFragment.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/history/RefundFragment.kt
@@ -52,7 +52,7 @@ class RefundFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         val item = refundManager.toBeRefunded ?: throw IllegalStateException()
-        amountInputView.setText(item.amount.amount)
+        amountInputView.setText(item.amount.toString())
         currencyView.text = item.amount.currency
         abortButton.setOnClickListener { findNavController().navigateUp() }
         refundButton.setOnClickListener { onRefundButtonClicked(item) }
@@ -64,8 +64,8 @@ class RefundFragment : Fragment() {
 
     private fun onRefundButtonClicked(item: HistoryItem) {
         val inputAmount = amountInputView.text.toString().toDouble()
-        if (inputAmount > item.amount.amount.toDouble()) {
-            amountView.error = getString(R.string.refund_error_max_amount, item.amount.amount)
+        if (inputAmount > item.amountStr.toDouble()) {  // TODO real Amount comparision
+            amountView.error = getString(R.string.refund_error_max_amount, item.amountStr)
             return
         }
         if (inputAmount <= 0.0) {
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/history/RefundUriFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/history/RefundUriFragment.kt
index 6e5b96d..1bc4002 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/history/RefundUriFragment.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/history/RefundUriFragment.kt
@@ -16,7 +16,6 @@
 
 package net.taler.merchantpos.history
 
-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -53,8 +52,7 @@ class RefundUriFragment : Fragment() {
             if (hasNfc(requireContext())) R.string.refund_intro_nfc else R.string.refund_intro
         refundIntroView.setText(introRes)
 
-        @SuppressLint("SetTextI18n")
-        refundAmountView.text = "${result.amount} ${result.item.amount.currency}"
+        refundAmountView.text = result.amount.toString()
 
         refundRefView.text =
             getString(R.string.refund_order_ref, result.item.orderId, result.reason)