X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fnew_transaction_row.xml;h=795e38f9a14712731c65b16445877355164ea4e5;hb=36b27f8294f563effd27b01d3b20e9fcaebf7fb4;hp=90944e2c3d5f73260b272645d3d38c20fe0832b0;hpb=c0d1c10b6440db293b1781e7b14705e0c00ab10a;p=mobile-ledger.git

diff --git a/app/src/main/res/layout/new_transaction_row.xml b/app/src/main/res/layout/new_transaction_row.xml
index 90944e2c..795e38f9 100644
--- a/app/src/main/res/layout/new_transaction_row.xml
+++ b/app/src/main/res/layout/new_transaction_row.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2019 Damyan Ivanov.
+  ~ Copyright © 2021 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
@@ -20,21 +20,31 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:animateLayoutChanges="false"
-    android:orientation="vertical">
+    android:animateLayoutChanges="true"
+    android:orientation="vertical"
+    >
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/ntr_data"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:animateLayoutChanges="true"
+        android:orientation="horizontal"
+        >
 
+        <TextView
+            android:id="@+id/dummy_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            tools:ignore="MissingConstraints"
+            />
         <EditText
             android:id="@+id/new_transaction_date"
             android:layout_width="94dp"
             android:layout_height="wrap_content"
             android:accessibilityTraversalBefore="@+id/new_transaction_description"
             android:drawableStart="@drawable/ic_event_gray_24dp"
-            android:ems="10"
             android:enabled="true"
             android:focusable="false"
             android:gravity="bottom|center"
@@ -45,20 +55,19 @@
             android:textAlignment="gravity"
             android:textCursorDrawable="@android:color/transparent"
             app:layout_constrainedHeight="true"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintHorizontal_weight="8"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="TextFields" />
+            tools:ignore="TextFields"
+            />
 
         <net.ktnx.mobileledger.ui.AutoCompleteTextViewWithClear
             android:id="@+id/new_transaction_description"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:layout_marginStart="8dp"
             android:accessibilityTraversalAfter="@+id/new_transaction_date"
-            android:ems="10"
             android:foregroundGravity="bottom"
             android:gravity="bottom"
             android:hint="@string/new_transaction_description_hint"
@@ -68,18 +77,52 @@
             android:nextFocusUp="@+id/new_transaction_date"
             android:selectAllOnFocus="false"
             android:singleLine="true"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_weight="30"
-            app:layout_constraintStart_toEndOf="@+id/new_transaction_date"
-            app:layout_constraintTop_toTopOf="parent" />
-    </LinearLayout>
+            app:layout_constraintStart_toEndOf="@id/new_transaction_date"
+            app:layout_constraintTop_toTopOf="parent"
+            />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/transaction_comment_layout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/new_transaction_description"
+            >
+
+            <TextView
+                android:id="@+id/transaction_comment_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ic_comment_gray_24dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                />
+
+            <net.ktnx.mobileledger.ui.EditTextWithClear
+                android:id="@+id/transaction_comment"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionNext"
+                android:inputType="text"
+                android:visibility="invisible"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/transaction_comment_button"
+                app:layout_constraintTop_toTopOf="parent"
+                />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/ntr_account"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:animateLayoutChanges="true">
+        android:animateLayoutChanges="true"
+        >
 
         <net.ktnx.mobileledger.ui.AutoCompleteTextViewWithClear
             android:id="@+id/account_row_acc_name"
@@ -93,41 +136,60 @@
             android:selectAllOnFocus="false"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/comment_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/ic_comment_gray_24dp"
-            app:layout_constraintBottom_toBottomOf="@id/amount_layout"
-            app:layout_constraintStart_toStartOf="@+id/ntr_account"
-            app:layout_constraintTop_toBottomOf="@+id/account_row_acc_name" />
+            app:layout_constraintTop_toTopOf="parent"
+            />
 
-        <EditText
-            android:id="@+id/comment"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/comment_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:hint="@string/transaction_account_comment_hint"
-            android:imeOptions="actionNext"
-            android:inputType="text"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="@+id/ntr_account"
-            app:layout_constraintStart_toEndOf="@id/comment_button"
-            app:layout_constraintTop_toBottomOf="@id/account_row_acc_name" />
+            app:layout_constraintEnd_toStartOf="@id/amount_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/account_row_acc_name"
+            >
+
+            <TextView
+                android:id="@+id/account_comment_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ic_comment_gray_24dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                />
+
+            <net.ktnx.mobileledger.ui.EditTextWithClear
+                android:id="@+id/comment"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionNext"
+                android:inputType="text"
+                android:visibility="invisible"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/account_comment_button"
+                app:layout_constraintTop_toTopOf="parent"
+                />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/amount_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/comment">
+            app:layout_constraintTop_toBottomOf="@id/account_row_acc_name"
+            >
 
-            <EditText
-                app:layout_constraintTop_toTopOf="parent"
+            <TextView
+                android:id="@+id/currencyButton"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:minWidth="30dp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@id/currency"
+                app:layout_constraintEnd_toEndOf="@id/currency"
+                app:layout_constraintStart_toStartOf="@id/currency"
+                app:layout_constraintTop_toTopOf="parent"
+                />
+            <EditText
                 android:id="@+id/account_row_acc_amounts"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -138,36 +200,33 @@
                 android:gravity="bottom|end"
                 android:hint="@string/zero_amount"
                 android:imeOptions="actionNext"
-                android:inputType="numberSigned|numberDecimal|number"
-                android:minWidth="80sp"
+                android:inputType="number|numberSigned|numberDecimal"
+                android:minEms="4"
                 android:selectAllOnFocus="true"
                 android:textAlignment="viewEnd"
-                app:layout_constraintWidth_min="@dimen/text_margin"/>
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/currency"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintWidth_min="@dimen/text_margin"
+                />
 
             <TextView
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
                 android:id="@+id/currency"
+                style="@style/TextAppearance.AppCompat.Widget.Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:gravity="center_horizontal"
+                android:minWidth="30dp"
                 android:text="@string/currency_symbol"
-                style="@style/TextAppearance.AppCompat.Widget.Button"
                 android:textAllCaps="false"
-                android:visibility="gone"
-                android:minWidth="24dp"
-                android:gravity="center_horizontal"/>
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <FrameLayout
-        android:id="@+id/ntr_padding"
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:minHeight="80dp">
-
-    </FrameLayout>
-
 </LinearLayout>
\ No newline at end of file