move new transaction UI into a fragment, have a clean saving progress

[mobile-ledger-staging.git] / app / src / main / res / layout / activity_new_transaction.xml

diff --git a/app/src/main/res/layout/activity_new_transaction.xml b/app/src/main/res/layout/activity_new_transaction.xml
index c865fdcd9a1fa7ecc1a5770441d50b4756c85054..6913a7707eea968915a07e4bcde37d195c722b4b 100644 (file)
--- a/app/src/main/res/layout/activity_new_transaction.xml
+++ b/app/src/main/res/layout/activity_new_transaction.xml
@@ -27,14 +27,13 @@
         android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/toolbar_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/toolbar_layout"
             android:theme="@style/AppTheme.AppBarOverlay"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            >
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
@@ -45,33 +44,16 @@
 
         </com.google.android.material.appbar.AppBarLayout>
 
-        <include layout="@layout/new_transaction_accounts" />
-
-        <ProgressBar
-            android:id="@+id/save_transaction_progress"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_margin="4dp"
-            android:indeterminate="true"
-            android:indeterminateTint="@color/colorPrimary"
-            android:visibility="invisible"
+        <fragment
+            android:id="@+id/new_transaction_nav"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:padding="@dimen/fab_margin"
-            android:tint="@android:color/white"
-            android:visibility="gone"
-            app:backgroundTint="?colorAccent"
-            app:layout_constraintBottom_toBottomOf="@id/save_transaction_progress"
-            app:layout_constraintEnd_toEndOf="@id/save_transaction_progress"
-            app:layout_constraintStart_toStartOf="@id/save_transaction_progress"
-            app:layout_constraintTop_toTopOf="@id/save_transaction_progress"
-            app:srcCompat="@drawable/ic_save_white_24dp" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/toolbar_layout"
+            app:navGraph="@navigation/new_transaction_navigation" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>