diff options
author | Torsten Grote <t@grobox.de> | 2020-07-29 14:12:50 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-07-29 16:17:46 -0300 |
commit | e19ba096d57353db6b1f141da4bf170ef2d2d534 (patch) | |
tree | 8ce7d138757a73f999f8e270e69cef44aa2f781b /wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt | |
parent | bc35e8924e652c323001f62f6781657545fa378f (diff) | |
download | taler-android-e19ba096d57353db6b1f141da4bf170ef2d2d534.tar.gz taler-android-e19ba096d57353db6b1f141da4bf170ef2d2d534.tar.bz2 taler-android-e19ba096d57353db6b1f141da4bf170ef2d2d534.zip |
[wallet] update to new wallet-core with v8 exchange API
(except payments which are still buggy)
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt index 331554b..5a98a89 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt @@ -20,6 +20,8 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.Toast +import android.widget.Toast.LENGTH_SHORT import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer @@ -34,7 +36,7 @@ import net.taler.wallet.MainViewModel import net.taler.wallet.R import net.taler.wallet.cleanExchange import net.taler.wallet.withdraw.WithdrawStatus.Loading -import net.taler.wallet.withdraw.WithdrawStatus.TermsOfServiceReviewRequired +import net.taler.wallet.withdraw.WithdrawStatus.TosReviewRequired import net.taler.wallet.withdraw.WithdrawStatus.Withdrawing class PromptWithdrawFragment : Fragment() { @@ -59,17 +61,13 @@ class PromptWithdrawFragment : Fragment() { private fun showWithdrawStatus(status: WithdrawStatus?): Any = when (status) { is WithdrawStatus.ReceivedDetails -> { - showContent(status.amount, status.fee, status.exchange) + showContent(status.amountRaw, status.amountEffective, status.exchangeBaseUrl) confirmWithdrawButton.apply { text = getString(R.string.withdraw_button_confirm) setOnClickListener { it.fadeOut() confirmProgressBar.fadeIn() - withdrawManager.acceptWithdrawal( - status.talerWithdrawUri, - status.exchange, - status.amount.currency - ) + withdrawManager.acceptWithdrawal() } isEnabled = true } @@ -87,8 +85,8 @@ class PromptWithdrawFragment : Fragment() { is Withdrawing -> { model.showProgressBar.value = true } - is TermsOfServiceReviewRequired -> { - showContent(status.amount, status.fee, status.exchange) + is TosReviewRequired -> { + showContent(status.amountRaw, status.amountEffective, status.exchangeBaseUrl) confirmWithdrawButton.apply { text = getString(R.string.withdraw_button_tos) setOnClickListener { @@ -104,20 +102,20 @@ class PromptWithdrawFragment : Fragment() { null -> model.showProgressBar.value = false } - private fun showContent(amount: Amount, fee: Amount, exchange: String) { + private fun showContent(amountRaw: Amount, amountEffective: Amount, exchange: String) { model.showProgressBar.value = false progressBar.fadeOut() introView.fadeIn() - effectiveAmountView.text = (amount - fee).toString() + effectiveAmountView.text = amountEffective.toString() effectiveAmountView.fadeIn() chosenAmountLabel.fadeIn() - chosenAmountView.text = amount.toString() + chosenAmountView.text = amountRaw.toString() chosenAmountView.fadeIn() feeLabel.fadeIn() - feeView.text = getString(R.string.amount_negative, fee.toString()) + feeView.text = getString(R.string.amount_negative, (amountRaw - amountEffective).toString()) feeView.fadeIn() exchangeIntroView.fadeIn() @@ -125,7 +123,7 @@ class PromptWithdrawFragment : Fragment() { withdrawExchangeUrl.fadeIn() selectExchangeButton.fadeIn() selectExchangeButton.setOnClickListener { - findNavController().navigate(R.id.action_promptWithdraw_to_selectExchangeFragment) + Toast.makeText(context, "Not yet implemented", LENGTH_SHORT).show() } withdrawCard.fadeIn() |