diff options
| author | Torsten Grote <t@grobox.de> | 2023-02-23 11:35:22 -0300 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2023-02-23 11:35:22 -0300 |
| commit | 53eebba12ed084f797f4390c73048426db2f8294 (patch) | |
| tree | 3fb03f1bd6c3d826bce062854208af5da35db643 | |
| parent | 07928b55f1653507543a43653f157e6ef27283c1 (diff) | |
| download | taler-android-53eebba12ed084f797f4390c73048426db2f8294.tar.gz taler-android-53eebba12ed084f797f4390c73048426db2f8294.tar.bz2 taler-android-53eebba12ed084f797f4390c73048426db2f8294.zip | |
[wallet] close button for outgoing peer payments brings user to balance
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 |