X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fcontent_new_transaction.xml;h=429d1b081fd9d71c7793be20b050696a0fc99f16;hb=7ec1c4772ff88e23ed826cc19c5a9a32e35ddf7e;hp=f6aa059f30b0e4c4a65d7861fcce4e3ebd7b6df3;hpb=24329a4f99378bc932cca2a085cd922d0608229e;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 f6aa059f..429d1b08 100644
--- a/app/src/main/res/layout/content_new_transaction.xml
+++ b/app/src/main/res/layout/content_new_transaction.xml
@@ -9,25 +9,51 @@
     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"
+        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" />
+                android:layout_height="match_parent">
+
+                <EditText
+                    android:id="@+id/new_transaction_date"
+                    android:layout_width="94dp"
+                    android:layout_height="wrap_content"
+                    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" />
+
+                <AutoCompleteTextView
+                    android:id="@+id/new_transaction_description"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:ems="10"
+                    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.support.constraint.ConstraintLayout>
 
             <TableLayout
+                android:id="@+id/new_transaction_accounts_table"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
@@ -36,23 +62,29 @@
                     android:layout_height="match_parent">
 
                     <AutoCompleteTextView
+                        android:id="@+id/new_transaction_acc_1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="bottom"
                         android:layout_weight="9"
                         android:width="0dp"
-                        android:hint="@string/new_transaction_account_label" />
+                        android:hint="@string/new_transaction_account_hint"
+                        android:nextFocusDown="@id/new_transaction_amt_1"
+                        android:nextFocusForward="@id/new_transaction_amt_1"
+                        android:text="This is a sample account name, deliberately long" />
 
                     <EditText
+                        android:id="@+id/new_transaction_amt_1"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="bottom"
                         android:layout_weight="1"
                         android:width="0dp"
-                        android:minWidth="36pt"
-                        android:ems="10"
-                        android:gravity="end"
                         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>
 
@@ -61,23 +93,26 @@
                     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_gravity="bottom"
                         android:layout_weight="9"
                         android:width="0dp"
-                        android:hint="@string/new_transaction_account_label" />
+                        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_gravity="end"
+                        android:layout_gravity="bottom"
                         android:layout_weight="1"
                         android:width="0dp"
-                        android:minWidth="36pt"
-                        android:ems="10"
-                        android:gravity="end"
                         android:hint="@string/new_transaction_amount_hint"
                         android:inputType="numberDecimal|numberSigned"
+                        android:minWidth="40dp"
                         android:textAlignment="viewEnd" />
                 </TableRow>