taler-android

commit a190a2d1f739fdee312a1b1ae2b835b709bb5bb2
parent 3ad4c9496fef62335fede7b1b816855f1e3ca9f4
Author: Iván Ávalos <avalos@disroot.org>
Date:   Thu, 26 Jan 2023 12:17:41 -0600

[wallet] Material3 adjustments after rebase

Diffstat:
M
wallet/src/main/java/net/taler/wallet/WalletApp.kt
 | 
3
+--
M
wallet/src/main/java/net/taler/wallet/transactions/DeleteTransactionComposable.kt
 | 
4
++--
M
wallet/src/main/res/layout/fragment_transaction_withdrawal.xml
 | 
4
++--
M
wallet/src/main/res/layout/list_item_transaction.xml
 | 
3
++-

4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/WalletApp.kt b/wallet/src/main/java/net/taler/wallet/WalletApp.kt
@@ -24,4 +24,4 @@ class WalletApp: Application() {
         super.onCreate()
         DynamicColors.applyToActivitiesIfAvailable(this)
     }
-}
-\ No newline at end of file
+}
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/DeleteTransactionComposable.kt b/wallet/src/main/java/net/taler/wallet/transactions/DeleteTransactionComposable.kt
@@ -42,12 +42,12 @@ fun DeleteTransactionComposable(onDelete: () -> Unit) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_delete),
                 contentDescription = null,
-                tint = MaterialTheme.colorScheme.onError
+                tint = MaterialTheme.colorScheme.onError,
             )
             Text(
                 modifier = Modifier.padding(start = 8.dp),
                 text = stringResource(R.string.transactions_delete),
-                color = MaterialTheme.colorScheme.onError
+                color = MaterialTheme.colorScheme.onError,
             )
         }
     }
diff --git a/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml b/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml
@@ -62,7 +62,6 @@
             android:text="@string/withdraw_button_confirm_bank"
             android:textColor="?colorOnPrimary"
             app:iconTint="?colorOnPrimary"
-            app:layout_constraintBottom_toTopOf="@+id/chosenAmountLabel"
             app:drawableTint="?attr/colorOnPrimarySurface"
             app:layout_constraintBottom_toTopOf="@+id/actionButton"
             app:layout_constraintEnd_toEndOf="parent"
@@ -75,7 +74,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginVertical="10dp"
-            android:backgroundTint="@color/colorAccent"
+            android:textColor="?colorOnTertiary"
+            android:backgroundTint="?colorTertiary"
             android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@id/chosenAmountLabel"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/wallet/src/main/res/layout/list_item_transaction.xml b/wallet/src/main/res/layout/list_item_transaction.xml
@@ -67,7 +67,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        app:backgroundTint="@color/colorAccent"
+        android:textColor="?colorOnTertiary"
+        app:backgroundTint="?colorTertiary"
         app:layout_constraintStart_toStartOf="@id/title"
         app:layout_constraintTop_toBottomOf="@id/extraInfoView"
         tools:text="Complete KYC"