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=65814a79a3779d0008c7ed72a9fee04a041c23b7;hp=707c7b0d25a0f54ecd02a58ffab5f46b71c6edcb;hb=6d8645bc5ffd9ad56124ddc21b2477c687c15ff7;hpb=593d0307aeb6e151c4f693697d7746a3f4c929e8

diff --git a/app/src/main/res/layout/new_transaction_row.xml b/app/src/main/res/layout/new_transaction_row.xml
index 707c7b0d..65814a79 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
+    <LinearLayout
         android:id="@+id/ntr_data"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -31,82 +31,136 @@
         <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: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" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/ntr_account"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
+        android:animateLayoutChanges="true">
 
         <net.ktnx.mobileledger.ui.AutoCompleteTextViewWithClear
             android:id="@+id/account_row_acc_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="9"
+            android:width="0dp"
             android:hint="@string/new_transaction_account_hint"
-            android:inputType="text"
             android:imeOptions="actionNext"
-            android:singleLine="true"
-            android:selectAllOnFocus="true"
-            android:width="0dp" />
+            android:inputType="text"
+            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="parent"
+            app:layout_constraintStart_toStartOf="@+id/ntr_account"
+            app:layout_constraintTop_toBottomOf="@+id/account_row_acc_name" />
 
         <EditText
-            android:id="@+id/account_row_acc_amounts"
+            android:id="@+id/comment"
+            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" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/amount_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_weight="0"
-            android:width="0dp"
-            android:foregroundGravity="bottom"
-            android:gravity="bottom|end"
-            android:hint="@string/zero_amount"
-            android:inputType="numberSigned|numberDecimal|number"
-            android:minWidth="70sp"
-            android:textAlignment="viewEnd"
-            android:selectAllOnFocus="true"
-            android:imeOptions="actionNext"/>
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/comment">
 
-    </LinearLayout>
+            <EditText
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/currency"
+                android:id="@+id/account_row_acc_amounts"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|end"
+                android:layout_weight="0"
+                android:width="0dp"
+                android:foregroundGravity="bottom"
+                android:gravity="bottom|end"
+                android:hint="@string/zero_amount"
+                android:imeOptions="actionNext"
+                android:inputType="numberSigned|numberDecimal|number"
+                android:minWidth="80sp"
+                android:selectAllOnFocus="true"
+                android:textAlignment="viewEnd"
+                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"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/currency_symbol"
+                style="@style/TextAppearance.AppCompat.Widget.Button"
+                android:textAllCaps="false"
+                android:visibility="gone"
+                android:minWidth="24dp"
+                android:gravity="center_horizontal"/>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <FrameLayout
         android:id="@+id/ntr_padding"