summaryrefslogtreecommitdiff
path: root/wallet/src/main/res/layout
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2023-02-05 00:50:28 -0600
committerTorsten Grote <t@grobox.de>2023-02-14 16:12:09 -0300
commitc522bcca7b7bfbb2214b29af1b58cde92f1f2611 (patch)
tree7f7d985fd271db03f46948e4901e89ccaf87c4cd /wallet/src/main/res/layout
parent2731915faa8cfa57419fef8747ecab09a51ac991 (diff)
downloadtaler-android-c522bcca7b7bfbb2214b29af1b58cde92f1f2611.tar.gz
taler-android-c522bcca7b7bfbb2214b29af1b58cde92f1f2611.tar.bz2
taler-android-c522bcca7b7bfbb2214b29af1b58cde92f1f2611.zip
[wallet] Small Material 3 style fixes
Diffstat (limited to 'wallet/src/main/res/layout')
-rw-r--r--wallet/src/main/res/layout/fragment_transaction_payment.xml8
-rw-r--r--wallet/src/main/res/layout/fragment_uri_input.xml8
2 files changed, 10 insertions, 6 deletions
diff --git a/wallet/src/main/res/layout/fragment_transaction_payment.xml b/wallet/src/main/res/layout/fragment_transaction_payment.xml
index 71447dd..b57315f 100644
--- a/wallet/src/main/res/layout/fragment_transaction_payment.xml
+++ b/wallet/src/main/res/layout/fragment_transaction_payment.xml
@@ -47,7 +47,7 @@
<TextView
android:id="@+id/amountPaidWithFeesView"
style="@style/TransactionContent"
- android:textColor="@color/red"
+ android:textColor="?colorError"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/amountPaidWithFeesLabel"
@@ -80,7 +80,7 @@
<TextView
android:id="@+id/feeView"
style="@style/TransactionContent"
- android:textColor="@color/red"
+ android:textColor="?colorError"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/feeLabel"
@@ -118,8 +118,10 @@
android:layout_height="wrap_content"
android:layout_marginVertical="10dp"
android:text="@string/transactions_delete"
- app:backgroundTint="@color/red"
+ android:textColor="?colorOnError"
+ app:backgroundTint="?colorError"
app:icon="@drawable/ic_delete"
+ app:iconTint="?colorOnError"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/wallet/src/main/res/layout/fragment_uri_input.xml b/wallet/src/main/res/layout/fragment_uri_input.xml
index 6ea1a13..95c2297 100644
--- a/wallet/src/main/res/layout/fragment_uri_input.xml
+++ b/wallet/src/main/res/layout/fragment_uri_input.xml
@@ -42,7 +42,7 @@
</com.google.android.material.textfield.TextInputLayout>
- <Button
+ <com.google.android.material.button.MaterialButton
android:id="@+id/pasteButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -50,9 +50,10 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_weight="1"
- android:drawableLeft="@drawable/ic_content_paste"
android:text="@string/paste"
- app:drawableTint="?attr/colorOnPrimarySurface"
+ android:textColor="?colorOnPrimary"
+ app:icon="@drawable/ic_content_paste"
+ app:iconTint="?colorOnPrimary"
app:layout_constraintEnd_toStartOf="@+id/okButton"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="parent"
@@ -68,6 +69,7 @@
android:layout_marginEnd="16dp"
android:backgroundTint="@color/green"
android:text="@string/ok"
+ android:textColor="@android:color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/pasteButton"
app:layout_constraintTop_toBottomOf="@+id/uriLayout" />