[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] branch master updated: [wallet] close button for o
From: |
gnunet |
Subject: |
[taler-taler-android] branch master updated: [wallet] close button for outgoing peer payments brings user to balance |
Date: |
Thu, 23 Feb 2023 15:43:23 +0100 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
The following commit(s) were added to refs/heads/master by this push:
new 53eebba [wallet] close button for outgoing peer payments brings user
to balance
53eebba is described below
commit 53eebba12ed084f797f4390c73048426db2f8294
Author: Torsten Grote <t@grobox.de>
AuthorDate: Thu Feb 23 11:35:22 2023 -0300
[wallet] close button for outgoing peer payments brings user to balance
---
.../src/main/java/net/taler/wallet/peer/OutgoingPullFragment.kt | 4 ++--
.../src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt | 4 ++--
wallet/src/main/res/navigation/nav_graph.xml | 8 ++++++++
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullFragment.kt
b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullFragment.kt
index cccae0f..79030f1 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullFragment.kt
@@ -57,7 +57,7 @@ class OutgoingPullFragment : Fragment() {
}
OutgoingCreating, is OutgoingResponse, is
OutgoingError -> {
OutgoingPullResultComposable(state) {
- findNavController().popBackStack()
+
findNavController().navigate(R.id.action_nav_peer_pull_to_nav_main)
}
}
}
@@ -68,7 +68,7 @@ class OutgoingPullFragment : Fragment() {
override fun onStart() {
super.onStart()
- activity?.setTitle(R.string.send_peer_title)
+ activity?.setTitle(R.string.receive_peer_title)
}
override fun onDestroy() {
diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
index a844b85..7019757 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
@@ -55,7 +55,7 @@ class OutgoingPushFragment : Fragment() {
}
OutgoingCreating, is OutgoingResponse, is
OutgoingError -> {
OutgoingPushResultComposable(state) {
- findNavController().popBackStack()
+
findNavController().navigate(R.id.action_nav_peer_push_to_nav_main)
}
}
}
@@ -66,7 +66,7 @@ class OutgoingPushFragment : Fragment() {
override fun onStart() {
super.onStart()
- activity?.setTitle(R.string.receive_peer_title)
+ activity?.setTitle(R.string.send_peer_title)
}
override fun onDestroy() {
diff --git a/wallet/src/main/res/navigation/nav_graph.xml
b/wallet/src/main/res/navigation/nav_graph.xml
index 1fc4504..2b9463b 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -181,6 +181,10 @@
android:defaultValue="@null"
app:argType="string"
app:nullable="true" />
+ <action
+ android:id="@+id/action_nav_peer_pull_to_nav_main"
+ app:destination="@id/nav_main"
+ app:popUpTo="@id/nav_main" />
</fragment>
<fragment
@@ -192,6 +196,10 @@
android:defaultValue="@null"
app:argType="string"
app:nullable="true" />
+ <action
+ android:id="@+id/action_nav_peer_push_to_nav_main"
+ app:destination="@id/nav_main"
+ app:popUpTo="@id/nav_main" />
</fragment>
<fragment
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-android] branch master updated: [wallet] close button for outgoing peer payments brings user to balance,
gnunet <=