X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fcontent_new_transaction.xml;h=086609d708dcf8b9445ebe20a8efddedad6b3e1f;hb=1865d22b24c7494aa258b9624f7d3c17fc1905c6;hp=32756060f9209a6b7725b8879078c76f807abb46;hpb=48d2f79edc48f9aa504b5d0214429a8e5017bf3e;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 32756060..086609d7 100644
--- a/app/src/main/res/layout/content_new_transaction.xml
+++ b/app/src/main/res/layout/content_new_transaction.xml
@@ -31,7 +31,11 @@
                     android:layout_height="wrap_content"
                     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"
@@ -43,9 +47,17 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     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_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"
@@ -65,24 +77,37 @@
                         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:nextFocusDown="@id/new_transaction_amt_1"
-                        android:nextFocusForward="@id/new_transaction_amt_1"
-                        android:textColorLink="@android:color/background_light" />
+                        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="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:nextFocusDown="@id/new_transaction_acc_2"
-                        android:nextFocusForward="@id/new_transaction_acc_2"
+                        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>
 
@@ -94,21 +119,33 @@
                         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:nextFocusDown="@id/new_transaction_amt_2"
-                        android:nextFocusForward="@id/new_transaction_amt_2" />
+                        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="wrap_content"
+                        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>