X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fcontent_new_transaction.xml;h=2589d33ec131eba13efbac809e4e39aa1c3ffab9;hb=2160278e4658bd683ce2ad4cb577846aa5fac1f0;hp=f5cd330e72b28b1ba62f9568cebf09272e536c42;hpb=ba9027714e6181ce0f0e927bc8a43742470ef1e3;p=mobile-ledger.git

diff --git a/app/src/main/res/layout/content_new_transaction.xml b/app/src/main/res/layout/content_new_transaction.xml
index f5cd330e..2589d33e 100644
--- a/app/src/main/res/layout/content_new_transaction.xml
+++ b/app/src/main/res/layout/content_new_transaction.xml
@@ -9,71 +9,146 @@
     tools:showIn="@layout/activity_new_transaction">
 
     <ScrollView
+        android:id="@+id/transaction_details"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="0dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/constraintLayout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <EditText
-                android:id="@+id/new_transaction_date"
+            <android.support.constraint.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/new_transaction_date_hint"
-                android:inputType="date"
-                android:onClick="pickTransactionDate"
-                android:textAlignment="center" />
-
-            <LinearLayout
-                android:id="@+id/new_transaction_accounts"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:layout_height="match_parent">
 
-                <AutoCompleteTextView
-                    android:layout_width="match_parent"
+                <EditText
+                    android:id="@+id/new_transaction_date"
+                    android:layout_width="94dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:hint="@string/new_transaction_account_label"
-                    android:text="" />
+                    android:ems="10"
+                    android:hint="@string/new_transaction_date_hint"
+                    android:inputType="date"
+                    android:onClick="pickTransactionDate"
+                    android:textAlignment="center"
+                    app:layout_constraintHorizontal_weight="8"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <EditText
-                    android:layout_width="match_parent"
+                    android:id="@+id/new_transaction_description"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_marginStart="8dp"
                     android:ems="10"
-                    android:hint="@string/new_transaction_amount_hint"
-                    android:inputType="numberSigned|numberDecimal"
-                    android:textAlignment="viewEnd" />
-            </LinearLayout>
+                    android:hint="@string/new_transaction_description_hint"
+                    android:inputType="textPersonName"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_weight="30"
+                    app:layout_constraintStart_toEndOf="@+id/new_transaction_date"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:autofillHints="" />
+            </android.support.constraint.ConstraintLayout>
 
-            <LinearLayout
-                android:id="@+id/new_transaction_accounts"
+            <TableLayout
+                android:id="@+id/new_transaction_accounts_table"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:layout_height="match_parent">
 
-                <AutoCompleteTextView
+                <TableRow
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:hint="@string/new_transaction_account_label"
-                    android:text="" />
+                    android:layout_height="match_parent">
 
-                <EditText
+                    <AutoCompleteTextView
+                        android:id="@+id/new_transaction_acc_1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="9"
+                        android:width="0dp"
+                        android:hint="@string/new_transaction_account_hint"
+                        android:nextFocusDown="@id/new_transaction_amt_1"
+                        android:nextFocusForward="@id/new_transaction_amt_1" />
+
+                    <EditText
+                        android:id="@+id/new_transaction_amt_1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:width="0dp"
+                        android:hint="@string/new_transaction_amount_hint"
+                        android:inputType="numberDecimal|numberSigned"
+                        android:minWidth="40dp"
+                        android:nextFocusDown="@id/new_transaction_acc_2"
+                        android:nextFocusForward="@id/new_transaction_acc_2"
+                        android:textAlignment="viewEnd" />
+                </TableRow>
+
+                <TableRow
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:hint="@string/new_transaction_amount_hint"
-                    android:inputType="numberSigned|numberDecimal"
-                    android:textAlignment="viewEnd" />
-            </LinearLayout>
+                    android:layout_height="match_parent">
+
+                    <AutoCompleteTextView
+                        android:id="@+id/new_transaction_acc_2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="9"
+                        android:width="0dp"
+                        android:hint="@string/new_transaction_account_hint"
+                        android:nextFocusDown="@id/new_transaction_amt_2"
+                        android:nextFocusForward="@id/new_transaction_amt_2" />
+
+                    <EditText
+                        android:id="@+id/new_transaction_amt_2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:width="0dp"
+                        android:hint="@string/new_transaction_amount_hint"
+                        android:inputType="numberDecimal|numberSigned"
+                        android:minWidth="40dp"
+                        android:textAlignment="viewEnd" />
+                </TableRow>
+
+            </TableLayout>
 
         </LinearLayout>
     </ScrollView>
 
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/constraintLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <ProgressBar
+            android:id="@+id/progressBar3"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/textView3"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toEndOf="@+id/progressBar3"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.615" />
+    </android.support.constraint.ConstraintLayout>
+
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file