X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fnew_transaction_row.xml;h=da1d70cafd1a87b3689dbe9dc8534c6c9ccbaa5a;hp=2356e5ca1dca295d0a5c69a75c127c2d188b649d;hb=96b5e3772e7f0c13750c378ea788455d0f26cca6;hpb=865334093695e52f99d93ad9a255252b9d575053

diff --git a/app/src/main/res/layout/new_transaction_row.xml b/app/src/main/res/layout/new_transaction_row.xml
index 2356e5ca..da1d70ca 100644
--- a/app/src/main/res/layout/new_transaction_row.xml
+++ b/app/src/main/res/layout/new_transaction_row.xml
@@ -23,7 +23,7 @@
     android:animateLayoutChanges="false"
     android:orientation="vertical">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/ntr_data"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -31,44 +31,49 @@
         <EditText
             android:id="@+id/new_transaction_date"
             android:layout_width="94dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:accessibilityTraversalBefore="@+id/new_transaction_description"
+            android:drawableStart="@drawable/ic_event_gray_24dp"
             android:ems="10"
-            android:foregroundGravity="bottom"
-            android:gravity="bottom"
+            android:enabled="true"
+            android:focusable="false"
+            android:gravity="bottom|center"
             android:hint="@string/new_transaction_date_hint"
-            android:imeOptions="actionNext"
-            android:cursorVisible="false"
-            android:textCursorDrawable="@android:color/transparent"
-            android:inputType="date"
+            android:inputType="none"
             android:nextFocusDown="@+id/new_transaction_acc_1"
             android:nextFocusForward="@+id/new_transaction_description"
-            android:textAlignment="center"
-            android:enabled="true"
+            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" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="TextFields" />
 
         <net.ktnx.mobileledger.ui.AutoCompleteTextViewWithClear
             android:id="@+id/new_transaction_description"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             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"
             android:imeOptions="actionNext"
             android:inputType="text"
             android:nextFocusLeft="@+id/new_transaction_date"
             android:nextFocusUp="@+id/new_transaction_date"
+            android:selectAllOnFocus="true"
             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" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
     <LinearLayout
         android:id="@+id/ntr_account"
@@ -86,6 +91,7 @@
             android:inputType="text"
             android:imeOptions="actionNext"
             android:singleLine="true"
+            android:selectAllOnFocus="true"
             android:width="0dp" />
 
         <EditText
@@ -97,12 +103,11 @@
             android:width="0dp"
             android:foregroundGravity="bottom"
             android:gravity="bottom|end"
-            android:hint="0.00"
-            android:inputType="numberSigned|numberDecimal"
-            android:minWidth="60sp"
+            android:hint="@string/zero_amount"
+            android:inputType="numberSigned|numberDecimal|number"
+            android:minWidth="70sp"
             android:textAlignment="viewEnd"
             android:selectAllOnFocus="true"
-            tools:ignore="HardcodedText"
             android:imeOptions="actionNext"/>
 
     </LinearLayout>