From 0936fc851232c8c6c41ce4a0c479ba7a1e452137 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 28 Sep 2020 12:12:20 -0300 Subject: [wallet] implement exchange selection for withdrawals --- .../wallet/exchanges/SelectExchangeFragment.kt | 135 +++------------------ 1 file changed, 19 insertions(+), 116 deletions(-) (limited to 'wallet/src/main/java/net/taler/wallet/exchanges/SelectExchangeFragment.kt') diff --git a/wallet/src/main/java/net/taler/wallet/exchanges/SelectExchangeFragment.kt b/wallet/src/main/java/net/taler/wallet/exchanges/SelectExchangeFragment.kt index a95a51c..61e0db5 100644 --- a/wallet/src/main/java/net/taler/wallet/exchanges/SelectExchangeFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/exchanges/SelectExchangeFragment.kt @@ -16,130 +16,33 @@ package net.taler.wallet.exchanges -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.View.GONE -import android.view.ViewGroup -import android.widget.TextView -import androidx.core.content.ContextCompat.getColor -import androidx.fragment.app.Fragment -import androidx.fragment.app.activityViewModels -import androidx.recyclerview.widget.RecyclerView.Adapter -import androidx.recyclerview.widget.RecyclerView.ViewHolder -import net.taler.common.toRelativeTime -import net.taler.common.toShortDate -import net.taler.lib.common.Amount -import net.taler.wallet.MainViewModel -import net.taler.wallet.R -import net.taler.wallet.databinding.FragmentSelectExchangeBinding -import net.taler.wallet.exchanges.CoinFeeAdapter.CoinFeeViewHolder -import net.taler.wallet.exchanges.WireFeeAdapter.WireFeeViewHolder +import androidx.navigation.fragment.findNavController +import net.taler.common.fadeOut -class SelectExchangeFragment : Fragment() { +class SelectExchangeFragment : ExchangeListFragment() { - private val model: MainViewModel by activityViewModels() private val withdrawManager by lazy { model.withdrawManager } - private lateinit var ui: FragmentSelectExchangeBinding - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - ui = FragmentSelectExchangeBinding.inflate(inflater, container, false) - return ui.root - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - val fees = withdrawManager.exchangeFees ?: throw IllegalStateException() - if (fees.withdrawFee.isZero()) { - ui.withdrawFeeLabel.visibility = GONE - ui.withdrawFeeView.visibility = GONE - } else ui.withdrawFeeView.setAmount(fees.withdrawFee) - if (fees.overhead.isZero()) { - ui.overheadLabel.visibility = GONE - ui.overheadView.visibility = GONE - } else ui.overheadView.setAmount(fees.overhead) - ui.expirationView.text = fees.earliestDepositExpiration.ms.toRelativeTime(requireContext()) - ui.coinFeesList.adapter = CoinFeeAdapter(fees.coinFees) - ui.wireFeesList.adapter = WireFeeAdapter(fees.wireFees) - } - - private fun TextView.setAmount(amount: Amount) { - if (amount.isZero()) text = amount.toString() - else { - text = getString(R.string.amount_negative, amount) - setTextColor(getColor(context, R.color.red)) - } + override val isSelectOnly = true + private val exchangeSelection by lazy { + requireNotNull(withdrawManager.exchangeSelection.value?.getEvenIfConsumedAlready()) } -} - -private class CoinFeeAdapter(private val items: List) : Adapter() { - override fun getItemCount() = items.size - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CoinFeeViewHolder { - val v = - LayoutInflater.from(parent.context).inflate(R.layout.list_item_coin_fee, parent, false) - return CoinFeeViewHolder(v) + override fun onExchangeUpdate(exchanges: List) { + ui.progressBar.fadeOut() + super.onExchangeUpdate(exchanges.filter { exchangeItem -> + exchangeItem.currency == exchangeSelection.amount.currency + }) } - override fun onBindViewHolder(holder: CoinFeeViewHolder, position: Int) { - holder.bind(items[position]) + override fun onExchangeSelected(item: ExchangeItem) { + withdrawManager.getWithdrawalDetails( + exchangeBaseUrl = item.exchangeBaseUrl, + amount = exchangeSelection.amount, + showTosImmediately = true, + uri = exchangeSelection.talerWithdrawUri, + ) + findNavController().navigateUp() } - private class CoinFeeViewHolder(private val v: View) : ViewHolder(v) { - private val res = v.context.resources - private val coinView: TextView = v.findViewById(R.id.coinView) - private val withdrawFeeView: TextView = v.findViewById(R.id.withdrawFeeView) - private val depositFeeView: TextView = v.findViewById(R.id.depositFeeView) - private val refreshFeeView: TextView = v.findViewById(R.id.refreshFeeView) - private val refundFeeView: TextView = v.findViewById(R.id.refundFeeView) - fun bind(item: CoinFee) { - coinView.text = res.getQuantityString( - R.plurals.exchange_fee_coin, - item.quantity, - item.coin, - item.quantity - ) - withdrawFeeView.text = - v.context.getString(R.string.exchange_fee_withdraw_fee, item.feeWithdraw) - depositFeeView.text = - v.context.getString(R.string.exchange_fee_deposit_fee, item.feeDeposit) - refreshFeeView.text = - v.context.getString(R.string.exchange_fee_refresh_fee, item.feeRefresh) - refundFeeView.text = - v.context.getString(R.string.exchange_fee_refund_fee, item.feeRefresh) - } - } -} - -private class WireFeeAdapter(private val items: List) : Adapter() { - override fun getItemCount() = items.size - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WireFeeViewHolder { - val v = - LayoutInflater.from(parent.context).inflate(R.layout.list_item_wire_fee, parent, false) - return WireFeeViewHolder(v) - } - - override fun onBindViewHolder(holder: WireFeeViewHolder, position: Int) { - holder.bind(items[position]) - } - - private class WireFeeViewHolder(private val v: View) : ViewHolder(v) { - private val validityView: TextView = v.findViewById(R.id.validityView) - private val wireFeeView: TextView = v.findViewById(R.id.wireFeeView) - private val closingFeeView: TextView = v.findViewById(R.id.closingFeeView) - fun bind(item: WireFee) { - validityView.text = v.context.getString( - R.string.exchange_fee_wire_fee_timespan, - item.start.ms.toShortDate(v.context), - item.end.ms.toShortDate(v.context) - ) - wireFeeView.text = - v.context.getString(R.string.exchange_fee_wire_fee_wire_fee, item.wireFee) - closingFeeView.text = - v.context.getString(R.string.exchange_fee_wire_fee_closing_fee, item.closingFee) - } - } } -- cgit v1.2.3