[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 14/14: [wallet] Fix back navigation after template
From: |
gnunet |
Subject: |
[taler-taler-android] 14/14: [wallet] Fix back navigation after template prompt. |
Date: |
Tue, 26 Sep 2023 18:31:34 +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 e7e276369d31e71c6057f9f5a31a9e049af68bd7
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Fri Sep 22 17:37:07 2023 -0600
[wallet] Fix back navigation after template prompt.
---
wallet/src/main/java/net/taler/wallet/payment/PayTemplateFragment.kt | 2 +-
wallet/src/main/res/navigation/nav_graph.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git
a/wallet/src/main/java/net/taler/wallet/payment/PayTemplateFragment.kt
b/wallet/src/main/java/net/taler/wallet/payment/PayTemplateFragment.kt
index c902d65..64cb2c1 100644
--- a/wallet/src/main/java/net/taler/wallet/payment/PayTemplateFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/payment/PayTemplateFragment.kt
@@ -85,7 +85,7 @@ class PayTemplateFragment : Fragment() {
val navOptions = NavOptions.Builder()
.setPopUpTo(R.id.nav_main, true)
.build()
-
findNavController().navigate(R.id.action_global_promptPayment, null, navOptions)
+
findNavController().navigate(R.id.action_promptPayTemplate_to_promptPayment,
null, navOptions)
}
is PayStatus.Error -> {
diff --git a/wallet/src/main/res/navigation/nav_graph.xml
b/wallet/src/main/res/navigation/nav_graph.xml
index 8f94f8d..99f4895 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -218,6 +218,10 @@
android:id="@+id/promptPayTemplate"
android:name="net.taler.wallet.payment.PayTemplateFragment"
android:label="@string/payment_pay_template_title">
+ <action
+ android:id="@+id/action_promptPayTemplate_to_promptPayment"
+ app:destination="@+id/promptPayment"
+ app:popUpTo="@id/nav_main" />
<argument
android:name="uri"
app:argType="string" />
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-android] branch master updated (d7196a0 -> e7e2763), gnunet, 2023/09/26
- [taler-taler-android] 03/14: [wallet] first cleanup of payment template work, gnunet, 2023/09/26
- [taler-taler-android] 01/14: [wallet] Initial version of template support, gnunet, 2023/09/26
- [taler-taler-android] 10/14: [wallet] Improved AmountInputField with a VisualTransformation, gnunet, 2023/09/26
- [taler-taler-android] 11/14: [wallet] fix: AmountInputField reacts to external changes, gnunet, 2023/09/26
- [taler-taler-android] 05/14: [wallet] add some potential TODOs for pay templates, gnunet, 2023/09/26
- [taler-taler-android] 09/14: [wallet] Support 0.x fractions in AmountInputField, gnunet, 2023/09/26
- [taler-taler-android] 04/14: [wallet] Improve internal logic of templates, gnunet, 2023/09/26
- [taler-taler-android] 08/14: [wallet] Refactor amount input into single composable, gnunet, 2023/09/26
- [taler-taler-android] 02/14: [wallet] Improved templates UX and PoS confirmation codes, gnunet, 2023/09/26
- [taler-taler-android] 14/14: [wallet] Fix back navigation after template prompt.,
gnunet <=
- [taler-taler-android] 13/14: [wallet] simplify pay templates, gnunet, 2023/09/26
- [taler-taler-android] 12/14: [wallet] simplify AmountInputField, gnunet, 2023/09/26
- [taler-taler-android] 06/14: [wallet] Additional refactoring of pay templates, gnunet, 2023/09/26
- [taler-taler-android] 07/14: [wallet] fixes for templates parsing and UI, gnunet, 2023/09/26