[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 07/11: [wallet] Make DD37 dialog data non-nullable
From: |
gnunet |
Subject: |
[taler-taler-android] 07/11: [wallet] Make DD37 dialog data non-nullable and rename callback |
Date: |
Tue, 11 Jul 2023 16:23:35 +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 048470385dfae7a950ae6a2d2eb8c2dfa30bf227
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Tue Jun 27 10:54:43 2023 -0600
[wallet] Make DD37 dialog data non-nullable and rename callback
---
.../transactions/TransactionDepositFragment.kt | 2 +-
.../wallet/transactions/TransactionDetailFragment.kt | 20 ++++++++++----------
.../transactions/TransactionPaymentFragment.kt | 2 +-
.../wallet/transactions/TransactionPeerFragment.kt | 2 +-
.../transactions/TransactionRefreshFragment.kt | 2 +-
.../wallet/transactions/TransactionRefundFragment.kt | 2 +-
.../wallet/transactions/TransactionTipFragment.kt | 2 +-
.../transactions/TransactionWithdrawalFragment.kt | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDepositFragment.kt
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDepositFragment.kt
index 2077f3e..59bcb9b 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDepositFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDepositFragment.kt
@@ -36,7 +36,7 @@ class TransactionDepositFragment :
TransactionDetailFragment() {
TalerSurface {
val t =
transactionManager.selectedTransaction.observeAsState().value
if (t is TransactionDeposit) TransactionDepositComposable(t,
devMode.value) {
- onTransitionButton(t, it)
+ onTransitionButtonClicked(t, it)
}
}
}
diff --git
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
index 8f618ed..103d8e6 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
@@ -65,37 +65,37 @@ abstract class TransactionDetailFragment : Fragment() {
}
}
- private fun dialogTitle(t: TransactionAction): Int? = when (t) {
+ private fun dialogTitle(t: TransactionAction): Int = when (t) {
Delete -> R.string.transactions_delete_dialog_title
Abort -> R.string.transactions_abort_dialog_title
Fail -> R.string.transactions_fail_dialog_title
- else -> null
+ else -> error("unsupported")
}
- private fun dialogMessage(t: TransactionAction): Int? = when (t) {
+ private fun dialogMessage(t: TransactionAction): Int = when (t) {
Delete -> R.string.transactions_delete_dialog_message
Abort -> R.string.transactions_abort_dialog_message
Fail -> R.string.transactions_fail_dialog_message
- else -> null
+ else -> error("unsupported")
}
- private fun dialogButton(t: TransactionAction): Int? = when (t) {
+ private fun dialogButton(t: TransactionAction): Int = when (t) {
Delete -> R.string.transactions_delete
Abort -> R.string.transactions_abort
Fail -> R.string.transactions_fail
- else -> null
+ else -> error("unsupported")
}
- protected fun onTransitionButton(t: Transaction, tt: TransactionAction) {
+ protected fun onTransitionButtonClicked(t: Transaction, tt:
TransactionAction) {
when (tt) {
Delete, Abort, Fail -> {
MaterialAlertDialogBuilder(requireContext(),
R.style.MaterialAlertDialog_Material3)
- .setTitle(dialogTitle(tt)!!)
- .setMessage(dialogMessage(tt)!!)
+ .setTitle(dialogTitle(tt))
+ .setMessage(dialogMessage(tt))
.setNeutralButton(R.string.cancel) { dialog, _ ->
dialog.cancel()
}
- .setNegativeButton(dialogButton(tt)!!) { dialog, _ ->
+ .setNegativeButton(dialogButton(tt)) { dialog, _ ->
when (tt) {
Delete -> deleteTransaction(t)
Abort -> abortTransaction(t)
diff --git
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPaymentFragment.kt
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPaymentFragment.kt
index 19a38fe..65cc0f4 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPaymentFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPaymentFragment.kt
@@ -42,7 +42,7 @@ class TransactionPaymentFragment :
TransactionDetailFragment() {
launchInAppBrowser(requireContext(), url)
},
onTransition = {
- onTransitionButton(t, it)
+ onTransitionButtonClicked(t, it)
}
)
}
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 8e8bcaf..d3fe7fd 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt
@@ -57,7 +57,7 @@ class TransactionPeerFragment : TransactionDetailFragment() {
TalerSurface {
val t =
transactionManager.selectedTransaction.observeAsState(null).value
if (t != null) TransactionPeerComposable(t, devMode.value) {
- onTransitionButton(t, it)
+ onTransitionButtonClicked(t, it)
}
}
}
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 79aca76..fce10e3 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
@@ -61,7 +61,7 @@ class TransactionRefreshFragment :
TransactionDetailFragment() {
val t =
transactionManager.selectedTransaction.observeAsState().value
val devMode = devMode.observeAsState().value ?: false
if (t is TransactionRefresh) TransactionRefreshComposable(t,
devMode) {
- onTransitionButton(t, it)
+ onTransitionButtonClicked(t, it)
}
}
}
diff --git
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefundFragment.kt
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefundFragment.kt
index bf026b2..a2fe223 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefundFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefundFragment.kt
@@ -42,7 +42,7 @@ class TransactionRefundFragment : TransactionDetailFragment()
{
launchInAppBrowser(requireContext(), url)
},
onTransition = {
- onTransitionButton(t, it)
+ onTransitionButtonClicked(t, it)
}
)
}
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 f7e3e9e..8e3e0ad 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
@@ -60,7 +60,7 @@ class TransactionTipFragment : TransactionDetailFragment() {
TalerSurface {
val t =
transactionManager.selectedTransaction.observeAsState(null).value
if (t is TransactionTip) TransactionTipComposable(t,
devMode.value) {
- onTransitionButton(t, it)
+ onTransitionButtonClicked(t, it)
}
}
}
diff --git
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt
index f23bc13..35207fa 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt
@@ -52,7 +52,7 @@ class TransactionWithdrawalFragment :
TransactionDetailFragment(), ActionListene
devMode = devMode,
actionListener = this@TransactionWithdrawalFragment,
) {
- onTransitionButton(t, it)
+ onTransitionButtonClicked(t, it)
}
}
}
--
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 <=
- [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, 2023/07/11
- [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