X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fcontent_new_transaction.xml;h=028ddcd3e435ffa728610c2ee63e96bc96a763ad;hb=b7f7df30bf96a995f165b3f7e4321655aac0132a;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..028ddcd3 100644
--- a/app/src/main/res/layout/content_new_transaction.xml
+++ b/app/src/main/res/layout/content_new_transaction.xml
@@ -1,33 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © 2018 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
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your opinion), any later version.
+  ~
+  ~ MoLe is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~ GNU General Public License terms for details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with MoLe. If not, see <https://www.gnu.org/licenses/>.
+  -->
+
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".NewTransactionActivity"
+    tools:context=".ui.activity.NewTransactionActivity"
     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="0dp"
+                    android:accessibilityTraversalBefore="@+id/new_transaction_description"
+                    android:ems="10"
+                    android:foregroundGravity="bottom"
+                    android:gravity="bottom"
+                    android:hint="@string/new_transaction_date_hint"
+                    android:imeOptions="actionNext"
+                    android:inputType="date"
+                    android:nextFocusDown="@+id/new_transaction_acc_1"
+                    android:nextFocusForward="@+id/new_transaction_description"
+                    android:onClick="pickTransactionDate"
+                    android:textAlignment="center"
+                    app:layout_constrainedHeight="true"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    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: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: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"
+                    android:singleLine="true"
+                    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 +95,41 @@
                     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:accessibilityTraversalAfter="@+id/new_transaction_description"
+                        android:accessibilityTraversalBefore="@+id/new_transaction_amt_1"
+                        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"
+                        android:singleLine="true" />
 
                     <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: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>
 
@@ -61,28 +138,49 @@
                     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:accessibilityTraversalAfter="@+id/new_transaction_amt_1"
+                        android:accessibilityTraversalBefore="@+id/new_transaction_amt_2"
+                        android:hint="@string/new_transaction_account_hint"
+                        android:imeOptions="actionNext"
+                        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"
+                        android:singleLine="true" />
 
                     <EditText
+                        android:id="@+id/new_transaction_amt_2"
                         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: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>
 
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:background="@android:color/transparent">
+
+            </FrameLayout>
+
         </LinearLayout>
     </ScrollView>