X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Factivity_new_transaction.xml;h=c865fdcd9a1fa7ecc1a5770441d50b4756c85054;hp=51437cc4a5b7ff120a2b965f25eebafa5751911b;hb=2f03a65548a607c561263800a0dfe1f58be3efbc;hpb=09e26d2279484b4dfe0de218b05f075362fff4b5

diff --git a/app/src/main/res/layout/activity_new_transaction.xml b/app/src/main/res/layout/activity_new_transaction.xml
index 51437cc4..c865fdcd 100644
--- a/app/src/main/res/layout/activity_new_transaction.xml
+++ b/app/src/main/res/layout/activity_new_transaction.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2018 Damyan Ivanov.
+  ~ Copyright © 2019 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
@@ -22,25 +22,30 @@
     android:layout_height="match_parent"
     tools:context=".ui.activity.NewTransactionActivity">
 
-    <com.google.android.material.appbar.AppBarLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+            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"
+            >
 
-    </com.google.android.material.appbar.AppBarLayout>
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/colorPrimary"
+                app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    <include layout="@layout/content_new_transaction" />
+        </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        <include layout="@layout/new_transaction_accounts" />
 
         <ProgressBar
             android:id="@+id/save_transaction_progress"
@@ -48,6 +53,7 @@
             android:layout_height="80dp"
             android:layout_margin="4dp"
             android:indeterminate="true"
+            android:indeterminateTint="@color/colorPrimary"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
@@ -60,7 +66,7 @@
             android:padding="@dimen/fab_margin"
             android:tint="@android:color/white"
             android:visibility="gone"
-            app:backgroundTint="?colorPrimary"
+            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"