X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fnavigation%2Fnew_transaction_navigation.xml;h=1178f88cac9ca63a6bf944f4b02ad0b87f6948d3;hp=b68760c24e9f372924aa99007b419e2bf8c07f28;hb=9fad5003ac30c3e4f9d073e04f4569aeb31779b2;hpb=30d7068474c9a3c8b1d0763f23950fe75ac9ea03

diff --git a/app/src/main/res/navigation/new_transaction_navigation.xml b/app/src/main/res/navigation/new_transaction_navigation.xml
index b68760c2..1178f88c 100644
--- a/app/src/main/res/navigation/new_transaction_navigation.xml
+++ b/app/src/main/res/navigation/new_transaction_navigation.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright © 2019 Damyan Ivanov.
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2021 Damyan Ivanov.
   ~ This file is part of MoLe.
   ~ MoLe is free software: you can distribute it and/or modify it
   ~ under the term of the GNU General Public License as published by
@@ -18,42 +17,55 @@
 
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/new_transaction_navigation"
-    app:startDestination="@id/newTransactionFragment">
+    app:startDestination="@id/newTransactionFragment"
+    >
 
     <fragment
         android:id="@+id/newTransactionFragment"
-        android:name="net.ktnx.mobileledger.ui.activity.NewTransactionFragment"
-        android:label="NewTransactionFragment" >
+        android:name="net.ktnx.mobileledger.ui.new_transaction.NewTransactionFragment"
+        android:label="NewTransactionFragment"
+        >
         <action
             android:id="@+id/action_newTransactionFragment_to_newTransactionSavingFragment"
             app:destination="@id/newTransactionSavingFragment"
             app:enterAnim="@anim/slide_in_up"
-            app:exitAnim="@anim/slide_out_up" />
+            app:exitAnim="@anim/slide_out_up"
+            app:launchSingleTop="true"
+            app:popUpTo="@id/new_transaction_navigation"
+            app:popUpToInclusive="true"
+            />
         <argument
             android:name="error"
+            android:defaultValue="@null"
             app:argType="string"
             app:nullable="true"
-            android:defaultValue="@null"/>
+            />
     </fragment>
     <fragment
         android:id="@+id/newTransactionSavingFragment"
         android:name="net.ktnx.mobileledger.ui.NewTransactionSavingFragment"
-        android:label="fragment_new_transaction_saving" >
+        android:label="fragment_new_transaction_saving"
+        >
         <action
             android:id="@+id/action_newTransactionSavingFragment_Success"
             app:destination="@id/newTransactionFragment"
             app:enterAnim="@anim/slide_in_up"
             app:exitAnim="@anim/slide_out_up"
+            app:launchSingleTop="true"
             app:popExitAnim="@anim/slide_out_down"
+            app:popUpTo="@id/new_transaction_navigation"
+            app:popUpToInclusive="true"
             />
         <action
             android:id="@+id/action_newTransactionSavingFragment_Failure"
             app:destination="@id/newTransactionFragment"
             app:enterAnim="@anim/slide_in_down"
             app:exitAnim="@anim/slide_out_down"
+            app:launchSingleTop="true"
             app:popExitAnim="@anim/slide_out_up"
+            app:popUpTo="@id/new_transaction_navigation"
+            app:popUpToInclusive="true"
             />
     </fragment>
 </navigation>
\ No newline at end of file