app:layout_constraintTop_toTopOf="parent" />
</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:selectAllOnFocus="false"
- android:inputType="text"
android:imeOptions="actionNext"
- android:singleLine="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="@id/amount_layout"
+ 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"