From c3f777e6154d33d26b2431fa886678edf029dd34 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 2 Apr 2020 10:57:36 -0300
Subject: [wallet] remove abort/cancel buttons

---
 .../main/java/net/taler/wallet/payment/PromptPaymentFragment.kt  | 5 -----
 .../java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt     | 9 ++-------
 .../java/net/taler/wallet/withdraw/ReviewExchangeTosFragment.kt  | 8 ++++----
 3 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'wallet/src/main/java')

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()
         }
-- 
cgit v1.2.3