aboutsummaryrefslogtreecommitdiff
path: root/wallet/src/main/java
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-04-02 10:57:36 -0300
committerTorsten Grote <t@grobox.de>2020-04-02 10:57:36 -0300
commitc3f777e6154d33d26b2431fa886678edf029dd34 (patch)
treeadc7e00e835d46fd4fd57ea7391a3e0c67cbbd6f /wallet/src/main/java
parent5cd83038f5aed997010dd01fef7bf6467ef56b29 (diff)
downloadtaler-android-c3f777e6154d33d26b2431fa886678edf029dd34.tar.gz
taler-android-c3f777e6154d33d26b2431fa886678edf029dd34.tar.bz2
taler-android-c3f777e6154d33d26b2431fa886678edf029dd34.zip
[wallet] remove abort/cancel buttons
Diffstat (limited to 'wallet/src/main/java')
-rw-r--r--wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt5
-rw-r--r--wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt9
-rw-r--r--wallet/src/main/java/net/taler/wallet/withdraw/ReviewExchangeTosFragment.kt8
3 files changed, 6 insertions, 16 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt b/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
index 2eea59e..7fab695 100644
--- a/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
@@ -71,11 +71,6 @@ class PromptPaymentFragment : Fragment(), ProductImageClickListener {
adapter = this@PromptPaymentFragment.adapter
layoutManager = LinearLayoutManager(requireContext())
}
-
- abortButton.setOnClickListener {
- paymentManager.abortPay()
- findNavController().navigateUp()
- }
}
override fun onDestroy() {
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 8fb4cb8..61aed4a 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
@@ -48,12 +48,7 @@ class PromptWithdrawFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- button_cancel_withdraw.setOnClickListener {
- withdrawManager.cancelCurrentWithdraw()
- findNavController().navigateUp()
- }
-
- button_confirm_withdraw.setOnClickListener {
+ confirmWithdrawButton.setOnClickListener {
val status = withdrawManager.withdrawStatus.value
if (status !is WithdrawStatus.ReceivedDetails) throw AssertionError()
it.fadeOut()
@@ -80,7 +75,7 @@ class PromptWithdrawFragment : Fragment() {
withdrawExchangeUrl.text = status.suggestedExchange
withdrawExchangeUrl.fadeIn()
- button_confirm_withdraw.isEnabled = true
+ confirmWithdrawButton.isEnabled = true
}
is WithdrawStatus.Success -> {
model.showProgressBar.value = false
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/ReviewExchangeTosFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/ReviewExchangeTosFragment.kt
index eac9e13..d998e5d 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/ReviewExchangeTosFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/ReviewExchangeTosFragment.kt
@@ -50,10 +50,10 @@ class ReviewExchangeTosFragment : Fragment() {
acceptTosCheckBox.setOnCheckedChangeListener { _, isChecked ->
acceptTosButton.isEnabled = isChecked
}
- abortTosButton.setOnClickListener {
- withdrawManager.cancelCurrentWithdraw()
- findNavController().navigateUp()
- }
+// abortTosButton.setOnClickListener {
+// withdrawManager.cancelCurrentWithdraw()
+// findNavController().navigateUp()
+// }
acceptTosButton.setOnClickListener {
withdrawManager.acceptCurrentTermsOfService()
}