taler-android

commit 67bff1743d2b1c11cb0977583fed1093b34df533
parent 19e9dbb7b4414ec0ea6bdb80f22a64d8af5d0038
Author: Iván Ávalos <avalos@disroot.org>
Date:   Mon,  1 Jul 2024 13:38:37 -0600

[cashier] Make amount input wider

Diffstat:
M
cashier/src/main/res/layout-w550dp/fragment_balance.xml
 | 
78
+++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
cashier/src/main/res/layout/fragment_balance.xml
 | 
86
++++++++++++++++++++++++++++++++++++++++---------------------------------------

2 files changed, 87 insertions(+), 77 deletions(-)
diff --git a/cashier/src/main/res/layout-w550dp/fragment_balance.xml b/cashier/src/main/res/layout-w550dp/fragment_balance.xml
@@ -163,43 +163,51 @@
         tools:ignore="HardcodedText"
         tools:visibility="visible" />
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/amountView"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="32dp"
-        android:hint="@string/withdraw_input_amount"
-        android:visibility="invisible"
-        app:endIconDrawable="@drawable/ic_clear"
-        app:endIconMode="clear_text"
-        app:endIconTint="?attr/colorControlNormal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/guideline"
-        app:layout_constraintTop_toBottomOf="@+id/button5"
-        tools:visibility="visible">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="6"
-            android:imeOptions="actionGo"
-            android:inputType="number|numberDecimal"
-            android:maxLength="4" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <TextView
-        android:id="@+id/currencyView"
+    <LinearLayout
+        android:id="@+id/amountLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:visibility="invisible"
+        android:weightSum="2"
+        android:orientation="horizontal"
+        android:gravity="center_horizontal"
+        app:layout_constraintStart_toStartOf="@id/guideline"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/amountView"
-        app:layout_constraintTop_toTopOf="@+id/amountView"
-        tools:text="TESTKUDOS"
-        tools:visibility="visible" />
+        app:layout_constraintBottom_toTopOf="@id/confirmWithdrawalButton"
+        app:layout_constraintTop_toBottomOf="@id/button5">
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/amountView"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginStart="@dimen/default_margin"
+            android:layout_marginTop="@dimen/default_margin"
+            android:hint="@string/withdraw_input_amount"
+            android:visibility="invisible"
+            app:endIconDrawable="@drawable/ic_clear"
+            app:endIconMode="clear_text"
+            app:endIconTint="?attr/colorControlNormal"
+            tools:visibility="visible">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionGo"
+                android:inputType="number|numberDecimal"
+                android:maxLength="4" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <TextView
+            android:id="@+id/currencyView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/default_margin"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:visibility="invisible"
+            tools:text="TESTKUDOS"
+            tools:visibility="visible" />
+    </LinearLayout>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/confirmWithdrawalButton"
@@ -214,7 +222,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guideline"
-        app:layout_constraintTop_toBottomOf="@+id/amountView"
+        app:layout_constraintTop_toBottomOf="@+id/amountLayout"
         app:layout_constraintVertical_bias="1.0"
         tools:ignore="RtlHardcoded"
         tools:visibility="visible" />
diff --git a/cashier/src/main/res/layout/fragment_balance.xml b/cashier/src/main/res/layout/fragment_balance.xml
@@ -112,7 +112,7 @@
         android:layout_height="wrap_content"
         android:text="5"
         android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/amountView"
+        app:layout_constraintBottom_toTopOf="@+id/amountLayout"
         app:layout_constraintEnd_toStartOf="@+id/button10"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintHorizontal_chainStyle="packed"
@@ -160,49 +160,51 @@
         tools:ignore="HardcodedText"
         tools:visibility="visible" />
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/amountView"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/amountLayout"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginTop="@dimen/default_margin"
-        android:hint="@string/withdraw_input_amount"
-        android:visibility="invisible"
-        app:endIconDrawable="@drawable/ic_clear"
-        app:endIconMode="clear_text"
-        app:endIconTint="?attr/colorControlNormal"
-        app:layout_constraintBottom_toTopOf="@+id/confirmWithdrawalButton"
-        app:layout_constraintEnd_toStartOf="@+id/currencyView"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintHorizontal_chainStyle="packed"
+        android:weightSum="2"
+        android:orientation="horizontal"
+        android:gravity="center_horizontal"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/button5"
-        tools:visibility="visible">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="6"
-            android:imeOptions="actionGo"
-            android:inputType="number|numberDecimal"
-            android:maxLength="4" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <TextView
-        android:id="@+id/currencyView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_margin"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:visibility="invisible"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/amountView"
-        app:layout_constraintTop_toTopOf="@+id/amountView"
-        tools:text="TESTKUDOS"
-        tools:visibility="visible" />
+        app:layout_constraintBottom_toTopOf="@id/confirmWithdrawalButton"
+        app:layout_constraintTop_toBottomOf="@id/button5">
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/amountView"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginStart="@dimen/default_margin"
+            android:layout_marginTop="@dimen/default_margin"
+            android:hint="@string/withdraw_input_amount"
+            android:visibility="invisible"
+            app:endIconDrawable="@drawable/ic_clear"
+            app:endIconMode="clear_text"
+            app:endIconTint="?attr/colorControlNormal"
+            tools:visibility="visible">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionGo"
+                android:inputType="number|numberDecimal"
+                android:maxLength="4" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <TextView
+            android:id="@+id/currencyView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/default_margin"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:visibility="invisible"
+            tools:text="TESTKUDOS"
+            tools:visibility="visible" />
+    </LinearLayout>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/confirmWithdrawalButton"
@@ -218,7 +220,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/amountView"
+        app:layout_constraintTop_toBottomOf="@+id/amountLayout"
         tools:ignore="RtlHardcoded"
         tools:visibility="visible" />