diff options
| author | Iván Ávalos <avalos@disroot.org> | 2023-01-26 12:17:41 -0600 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2023-01-31 10:39:42 -0300 |
| commit | a190a2d1f739fdee312a1b1ae2b835b709bb5bb2 (patch) | |
| tree | ef92d19941f359fd0b3219cac20d6bd9a9b28c5e /wallet | |
| parent | 3ad4c9496fef62335fede7b1b816855f1e3ca9f4 (diff) | |
| download | taler-android-a190a2d1f739fdee312a1b1ae2b835b709bb5bb2.tar.gz taler-android-a190a2d1f739fdee312a1b1ae2b835b709bb5bb2.tar.bz2 taler-android-a190a2d1f739fdee312a1b1ae2b835b709bb5bb2.zip | |
[wallet] Material3 adjustments after rebase
Diffstat (limited to 'wallet')
4 files changed, 7 insertions, 6 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/WalletApp.kt b/wallet/src/main/java/net/taler/wallet/WalletApp.kt index e94b8fe..1076364 100644 --- 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 index caf6cd7..75ec599 100644 --- 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 index 5afd22b..100ddbc 100644 --- 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 index 232afb8..5dfdf14 100644 --- 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" |