X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fcontent_new_transaction.xml;h=b4ff8c66953d87ee981d90b4ff29d149e078b1ac;hb=d3c4d97302db96e1aeef4e31f49593cbb13acb3b;hp=429d1b081fd9d71c7793be20b050696a0fc99f16;hpb=7ec1c4772ff88e23ed826cc19c5a9a32e35ddf7e;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 429d1b08..b4ff8c66 100644
--- a/app/src/main/res/layout/content_new_transaction.xml
+++ b/app/src/main/res/layout/content_new_transaction.xml
@@ -1,11 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!--
+  ~ Copyright © 2019 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/>.
+  -->
+
+<androidx.constraintlayout.widget.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
@@ -21,104 +38,67 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <android.support.constraint.ConstraintLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
                 <EditText
                     android:id="@+id/new_transaction_date"
                     android:layout_width="94dp"
-                    android:layout_height="wrap_content"
+                    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
+                <net.ktnx.mobileledger.ui.AutoCompleteTextViewWithClear
                     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:inputType="textPersonName"
+                    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>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TableLayout
                 android:id="@+id/new_transaction_accounts_table"
+                android:animateLayoutChanges="true"
                 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: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" />
+                android:layout_height="match_parent"/>
 
-                    <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: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="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: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:inputType="numberDecimal|numberSigned"
-                        android:minWidth="40dp"
-                        android:textAlignment="viewEnd" />
-                </TableRow>
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:background="@android:color/transparent">
 
-            </TableLayout>
+            </FrameLayout>
 
         </LinearLayout>
     </ScrollView>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file