From e74f39ee86f32b4e0324405af1f0c7be061fb372 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 12 May 2020 15:26:44 -0300 Subject: [wallet] separate history and transactions UI The history with its JSON payload is only shown in dev mode while the transactions are prepared to move to the new API. --- .../wallet/transactions/TransactionDetailFragment.kt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt') diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt index 909a7bf..bb70b5c 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt @@ -37,6 +37,11 @@ import net.taler.common.toAbsoluteTime import net.taler.wallet.MainViewModel import net.taler.wallet.R import net.taler.wallet.cleanExchange +import net.taler.wallet.history.JsonDialogFragment +import net.taler.wallet.history.OrderShortInfo +import net.taler.wallet.history.PaymentHistoryEvent +import net.taler.wallet.history.RefundHistoryEvent +import net.taler.wallet.history.WithdrawHistoryEvent class TransactionDetailFragment : Fragment() { @@ -65,9 +70,9 @@ class TransactionDetailFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { timeView.text = event.timestamp.ms.toAbsoluteTime(requireContext()) when (val e = event) { - is WithdrawTransaction -> bind(e) - is PaymentTransaction -> bind(e) - is RefundTransaction -> bind(e) + is WithdrawHistoryEvent -> bind(e) + is PaymentHistoryEvent -> bind(e) + is RefundHistoryEvent -> bind(e) else -> Toast.makeText( requireContext(), "event ${e.javaClass} not implement", @@ -90,7 +95,7 @@ class TransactionDetailFragment : Fragment() { } } - private fun bind(event: WithdrawTransaction) { + private fun bind(event: WithdrawHistoryEvent) { effectiveAmountLabel.text = getString(R.string.withdraw_total) effectiveAmountView.text = event.amountWithdrawnEffective.toString() chosenAmountLabel.text = getString(R.string.amount_chosen) @@ -101,13 +106,13 @@ class TransactionDetailFragment : Fragment() { exchangeView.text = cleanExchange(event.exchangeBaseUrl) } - private fun bind(event: PaymentTransaction) { + private fun bind(event: PaymentHistoryEvent) { amountPaidWithFeesView.text = event.amountPaidWithFees.toString() val fee = event.amountPaidWithFees - event.orderShortInfo.amount bindOrderAndFee(event.orderShortInfo, fee) } - private fun bind(event: RefundTransaction) { + private fun bind(event: RefundHistoryEvent) { amountPaidWithFeesLabel.text = getString(R.string.transaction_refund) amountPaidWithFeesView.setTextColor(getColor(requireContext(), R.color.green)) amountPaidWithFeesView.text = -- cgit v1.2.3