[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 08/11: [wallet] Show suspend/resume only in devMod
From: |
gnunet |
Subject: |
[taler-taler-android] 08/11: [wallet] Show suspend/resume only in devMode and rename "fail" to "cancel" in UI |
Date: |
Tue, 11 Jul 2023 16:23:36 +0200 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit d8c2ec321c1f7e2f10e0599244b8af7d20d6d8fb
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Wed Jun 28 21:08:42 2023 -0600
[wallet] Show suspend/resume only in devMode and rename "fail" to "cancel"
in UI
---
.../net/taler/wallet/deposit/TransactionDepositComposable.kt | 2 +-
.../net/taler/wallet/payment/TransactionPaymentComposable.kt | 2 +-
.../net/taler/wallet/refund/TransactionRefundComposable.kt | 2 +-
.../net/taler/wallet/transactions/TransactionPeerFragment.kt | 2 +-
.../taler/wallet/transactions/TransactionRefreshFragment.kt | 4 +---
.../net/taler/wallet/transactions/TransactionTipFragment.kt | 4 +---
.../net/taler/wallet/transactions/TransitionsComposable.kt | 12 +++++++-----
.../taler/wallet/withdraw/TransactionWithdrawalComposable.kt | 2 +-
wallet/src/main/res/values/strings.xml | 4 ++--
9 files changed, 16 insertions(+), 18 deletions(-)
diff --git
a/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt
b/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt
index 82bf121..39235a4 100644
---
a/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt
+++
b/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt
@@ -82,7 +82,7 @@ fun TransactionDepositComposable(t: TransactionDeposit,
devMode: Boolean?, onTra
amountType = AmountType.Negative,
)
}
- TransitionsComposable(t, onTransition)
+ TransitionsComposable(t, devMode == true, onTransition)
if (devMode == true && t.error != null) {
ErrorTransactionButton(error = t.error)
}
diff --git
a/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt
b/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt
index a3f18d7..19dd11d 100644
---
a/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt
+++
b/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt
@@ -92,7 +92,7 @@ fun TransactionPaymentComposable(
PurchaseDetails(info = t.info) {
onFulfill(t.info.fulfillmentUrl ?: "")
}
- TransitionsComposable(t, onTransition)
+ TransitionsComposable(t, devMode, onTransition)
if (devMode && t.error != null) {
ErrorTransactionButton(error = t.error)
}
diff --git
a/wallet/src/main/java/net/taler/wallet/refund/TransactionRefundComposable.kt
b/wallet/src/main/java/net/taler/wallet/refund/TransactionRefundComposable.kt
index c160dec..9dc6267 100644
---
a/wallet/src/main/java/net/taler/wallet/refund/TransactionRefundComposable.kt
+++
b/wallet/src/main/java/net/taler/wallet/refund/TransactionRefundComposable.kt
@@ -90,7 +90,7 @@ fun TransactionRefundComposable(
PurchaseDetails(info = t.info) {
onFulfill(t.info.fulfillmentUrl ?: "")
}
- TransitionsComposable(t, onTransition)
+ TransitionsComposable(t, devMode, onTransition)
if (devMode && t.error != null) {
ErrorTransactionButton(error = t.error)
}
diff --git
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt
index d3fe7fd..2d79d77 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt
@@ -86,7 +86,7 @@ fun TransactionPeerComposable(t: Transaction, devMode:
Boolean?, onTransition: (
is TransactionPeerPushDebit ->
TransactionPeerPushDebitComposable(t)
else -> error("unexpected transaction: ${t::class.simpleName}")
}
- TransitionsComposable(t, onTransition)
+ TransitionsComposable(t, devMode == true, onTransition)
if (devMode == true && t.error != null) {
ErrorTransactionButton(error = t.error!!)
}
diff --git
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
index fce10e3..f1f1ad7 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
@@ -92,9 +92,7 @@ private fun TransactionRefreshComposable(
amount = t.amountEffective,
amountType = AmountType.Negative,
)
- t.txActions.forEach {
- TransitionComposable(it, onTransition)
- }
+ TransitionsComposable(t, devMode, onTransition)
if (devMode && t.error != null) {
ErrorTransactionButton(error = t.error)
}
diff --git
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
index 8e3e0ad..0870281 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
@@ -105,9 +105,7 @@ fun TransactionTipComposable(t: TransactionTip, devMode:
Boolean?, onTransition:
label = stringResource(id = R.string.tip_merchant_url),
info = t.merchantBaseUrl,
)
- t.txActions.forEach {
- TransitionComposable(it, onTransition)
- }
+ TransitionsComposable(t, devMode == true, onTransition)
if (devMode == true && t.error != null) {
ErrorTransactionButton(error = t.error)
}
diff --git
a/wallet/src/main/java/net/taler/wallet/transactions/TransitionsComposable.kt
b/wallet/src/main/java/net/taler/wallet/transactions/TransitionsComposable.kt
index 3fb43fe..cead75d 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransitionsComposable.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransitionsComposable.kt
@@ -36,18 +36,20 @@ import net.taler.wallet.transactions.TransactionAction.*
@OptIn(ExperimentalLayoutApi::class)
@Composable
-fun TransitionsComposable(t: Transaction, onTransition: (t: TransactionAction)
-> Unit) {
+fun TransitionsComposable(t: Transaction, devMode: Boolean, onTransition: (t:
TransactionAction) -> Unit) {
FlowRow {
t.txActions.forEach {
- TransitionComposable(it, onTransition)
+ if (it in arrayOf(Resume, Suspend)) {
+ if(devMode) TransitionComposable(it, onTransition)
+ } else {
+ TransitionComposable(it, onTransition)
+ }
}
}
}
@Composable
fun TransitionComposable(t: TransactionAction, onClick: (t: TransactionAction)
-> Unit) {
- // TODO: handle more transitions!
- if (t !in arrayOf(Delete, Retry, Abort, Fail, Resume, Suspend)) return
Button(
modifier = Modifier.padding(16.dp),
colors = ButtonDefaults.buttonColors(containerColor = when(t) {
@@ -86,7 +88,7 @@ fun TransitionComposable(t: TransactionAction, onClick: (t:
TransactionAction) -
Delete -> stringResource(R.string.transactions_delete)
Retry -> stringResource(R.string.transactions_retry)
Abort -> stringResource(R.string.transactions_abort)
- Fail -> stringResource(id = R.string.transactions_fail)
+ Fail -> stringResource(R.string.transactions_fail)
Resume -> stringResource(R.string.transactions_resume)
Suspend -> stringResource(R.string.transactions_suspend)
},
diff --git
a/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt
b/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt
index 1dff2ae..79cfc5e 100644
---
a/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt
+++
b/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt
@@ -95,7 +95,7 @@ fun TransactionWithdrawalComposable(
label = stringResource(id = R.string.withdraw_exchange),
info = cleanExchange(t.exchangeBaseUrl),
)
- TransitionsComposable(t, onTransition)
+ TransitionsComposable(t, devMode, onTransition)
if (devMode && t.error != null) {
ErrorTransactionButton(error = t.error)
}
diff --git a/wallet/src/main/res/values/strings.xml
b/wallet/src/main/res/values/strings.xml
index d2ae879..b0a0647 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -87,7 +87,7 @@ GNU Taler is immune against many types of fraud, such as
phishing of credit card
<string name="transactions_delete">Delete</string>
<string name="transactions_retry">Retry</string>
<string name="transactions_abort">Abort</string>
- <string name="transactions_fail">Fail</string>
+ <string name="transactions_fail">Cancel</string>
<string name="transactions_suspend">Suspend</string>
<string name="transactions_resume">Resume</string>
<string name="transactions_select_all">Select All</string>
@@ -97,7 +97,7 @@ GNU Taler is immune against many types of fraud, such as
phishing of credit card
<string name="transactions_abort_dialog_title">Abort Transaction</string>
<string name="transactions_abort_dialog_message">Are you sure you want to
abort this transaction? Funds still in transit might get lost.</string>
<string name="transactions_fail_dialog_title">Fail Transaction</string>
- <string name="transactions_fail_dialog_message">Are you sure you want to
fail this transaction? Funds still in transit might get lost.</string>
+ <string name="transactions_fail_dialog_message">Are you sure you want to
cancel this transaction? Funds still in transit might get lost.</string>
<string name="transactions_cancel_dialog_message">Are you sure you want to
cancel this withdrawal? Funds still in transit might get lost.</string>
<!-- Transactions -->
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-android] branch master updated (e7959e8 -> ef51462), gnunet, 2023/07/11
- [taler-taler-android] 01/11: [wallet] Initial work for DD37 transitions, gnunet, 2023/07/11
- [taler-taler-android] 03/11: [wallet] Handle "fail" DD37 action and prevent non-deletable transactions from being deleted., gnunet, 2023/07/11
- [taler-taler-android] 04/11: [wallet] Better error handling for tx actions., gnunet, 2023/07/11
- [taler-taler-android] 02/11: [wallet] Implemented DD37 with the new txActions field, gnunet, 2023/07/11
- [taler-taler-android] 07/11: [wallet] Make DD37 dialog data non-nullable and rename callback, gnunet, 2023/07/11
- [taler-taler-android] 11/11: [wallet] release 0.9.3+p4, gnunet, 2023/07/11
- [taler-taler-android] 09/11: [wallet] Fully remove deprecated status fields, gnunet, 2023/07/11
- [taler-taler-android] 08/11: [wallet] Show suspend/resume only in devMode and rename "fail" to "cancel" in UI,
gnunet <=
- [taler-taler-android] 06/11: [wallet] Bump wallet-core to 0.9.3-dev.11, gnunet, 2023/07/11
- [taler-taler-android] 05/11: [wallet] DD37 fixes, gnunet, 2023/07/11
- [taler-taler-android] 10/11: [wallet] some dd37 fixes after merging, gnunet, 2023/07/11