X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fcontent_new_transaction.xml;h=0cbfc203638fc3906b5111313eee2ef35c990c71;hp=58ce717035c3badf47941b2c256c6f8a419e01e6;hb=d2fba190c9c1b6eabfa12d65ac47c1c0a9a0a901;hpb=b3fff85cf8314bb335eab4e9e9aa0fa9681ad12b

diff --git a/app/src/main/res/layout/content_new_transaction.xml b/app/src/main/res/layout/content_new_transaction.xml
index 58ce7170..0cbfc203 100644
--- a/app/src/main/res/layout/content_new_transaction.xml
+++ b/app/src/main/res/layout/content_new_transaction.xml
@@ -9,47 +9,147 @@
     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" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:layout_height="match_parent">
 
-                <AutoCompleteTextView
-                    android:id="@+id/autoCompleteTextView2"
-                    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:imeOptions="actionNext"
+                    android:inputType="date"
+                    android:accessibilityTraversalBefore="@+id/new_transaction_description"
+                    android:nextFocusDown="@+id/new_transaction_acc_1"
+                    android:nextFocusForward="@+id/new_transaction_description"
+                    android:onClick="pickTransactionDate"
+                    android:textAlignment="center"
+                    app:layout_constraintHorizontal_weight="8"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-                <EditText
-                    android:id="@+id/editText4"
-                    android:layout_width="match_parent"
+                <AutoCompleteTextView
+                    android:id="@+id/new_transaction_description"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_marginStart="8dp"
+                    android:accessibilityTraversalAfter="@+id/new_transaction_date"
+                    android:accessibilityTraversalBefore="@+id/new_transaction_acc_1"
                     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:imeOptions="actionNext"
+                    android:inputType="textPersonName"
+                    android:nextFocusLeft="@+id/new_transaction_date"
+                    android:nextFocusRight="@+id/new_transaction_acc_1"
+                    android:nextFocusUp="@+id/new_transaction_date"
+                    android:nextFocusDown="@+id/new_transaction_acc_1"
+                    android:nextFocusForward="@+id/new_transaction_acc_1"
+                    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">
+
+                <TableRow
+                    android:layout_width="match_parent"
+                    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:accessibilityTraversalAfter="@+id/new_transaction_description"
+                        android:accessibilityTraversalBefore="@+id/new_transaction_amt_2"
+                        android:hint="@string/new_transaction_account_hint"
+                        android:imeOptions="actionNext"
+                        android:nextFocusLeft="@+id/new_transaction_description"
+                        android:nextFocusRight="@+id/new_transaction_amt_1"
+                        android:nextFocusUp="@+id/new_transaction_description"
+                        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="match_parent"
+                        android:layout_gravity="bottom"
+                        android:layout_weight="1"
+                        android:width="0dp"
+                        android:hint="@string/new_transaction_amount_hint"
+                        android:imeOptions="actionNext"
+                        android:inputType="numberDecimal|numberSigned"
+                        android:minWidth="40dp"
+                        android:accessibilityTraversalAfter="@+id/new_transaction_acc_1"
+                        android:accessibilityTraversalBefore="@+id/new_transaction_acc_2"
+                        android:nextFocusLeft="@+id/new_transaction_acc_1"
+                        android:nextFocusRight="@+id/new_transaction_acc_2"
+                        android:nextFocusUp="@+id/new_transaction_acc_1"
+                        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="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_hint"
+                        android:imeOptions="actionNext"
+                        android:accessibilityTraversalAfter="@+id/new_transaction_amt_1"
+                        android:accessibilityTraversalBefore="@+id/new_transaction_amt_2"
+                        android:nextFocusLeft="@+id/new_transaction_amt_1"
+                        android:nextFocusRight="@+id/new_transaction_amt_2"
+                        android:nextFocusUp="@+id/new_transaction_acc_1"
+                        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="match_parent"
+                        android:layout_gravity="bottom"
+                        android:layout_weight="1"
+                        android:width="0dp"
+                        android:hint="@string/new_transaction_amount_hint"
+                        android:imeOptions="actionDone"
+                        android:inputType="numberDecimal|numberSigned"
+                        android:minWidth="40dp"
+                        android:accessibilityTraversalAfter="@+id/new_transaction_acc_1"
+                        android:nextFocusLeft="@+id/new_transaction_acc_2"
+                        android:nextFocusUp="@+id/new_transaction_amt_1"
+                        android:textAlignment="viewEnd" />
+                </TableRow>
+
+            </TableLayout>
 
         </LinearLayout>
     </ScrollView>