diff options
23 files changed, 59 insertions, 55 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt b/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt index 730faae..4fbb09b 100644 --- a/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt @@ -44,7 +44,6 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.KeyboardType.Companion.Decimal @@ -148,7 +147,7 @@ private fun ReceiveFundsIntro( if (isError) { Text( stringResource(R.string.receive_amount_invalid), - color = Color.Red, + color = MaterialTheme.colorScheme.error, ) } else { Text(stringResource(R.string.receive_amount)) diff --git a/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt b/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt index daf1898..7ae7773 100644 --- a/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt @@ -42,7 +42,6 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.KeyboardType @@ -138,12 +137,12 @@ private fun SendFundsIntro( if (isError) { Text( stringResource(R.string.receive_amount_invalid), - color = Color.Red, + color = MaterialTheme.colorScheme.error, ) } else if (insufficientBalance) { Text( stringResource(R.string.payment_balance_insufficient), - color = Color.Red, + color = MaterialTheme.colorScheme.error, ) } else { Text(stringResource(R.string.send_amount)) diff --git a/wallet/src/main/java/net/taler/wallet/compose/QrCodeUriComposable.kt b/wallet/src/main/java/net/taler/wallet/compose/QrCodeUriComposable.kt index 0157f90..2d7ffa1 100644 --- a/wallet/src/main/java/net/taler/wallet/compose/QrCodeUriComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/compose/QrCodeUriComposable.kt @@ -42,7 +42,6 @@ import androidx.compose.runtime.produceState import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment.Companion.CenterHorizontally import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalContext @@ -100,11 +99,17 @@ fun ColumnScope.QrCodeUriComposable( label = clipBoardLabel, content = talerUri, buttonText = buttonText, - colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent) + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primaryContainer, + contentColor = MaterialTheme.colorScheme.onPrimaryContainer + ) ) ShareButton( content = talerUri, - colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent) + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primaryContainer, + contentColor = MaterialTheme.colorScheme.onPrimaryContainer + ) ) } } diff --git a/wallet/src/main/java/net/taler/wallet/deposit/MakeBitcoinDepositComposable.kt b/wallet/src/main/java/net/taler/wallet/deposit/MakeBitcoinDepositComposable.kt index 94899c5..e022ed3 100644 --- a/wallet/src/main/java/net/taler/wallet/deposit/MakeBitcoinDepositComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/deposit/MakeBitcoinDepositComposable.kt @@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Button import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.OutlinedTextField @@ -40,7 +41,6 @@ import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalFocusManager -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -82,7 +82,7 @@ fun MakeBitcoinDepositComposable( Text( stringResource(R.string.send_deposit_bitcoin_address), color = if (address.isBlank()) { - colorResource(R.color.red) + MaterialTheme.colorScheme.error } else Color.Unspecified, ) } @@ -122,7 +122,7 @@ fun MakeBitcoinDepositComposable( Text( modifier = Modifier.padding(16.dp), fontSize = 18.sp, - color = colorResource(R.color.red), + color = MaterialTheme.colorScheme.error, text = (state as? DepositState.Error)?.msg ?: "", ) } diff --git a/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt b/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt index 9e14514..47c2322 100644 --- a/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt @@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Button import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.OutlinedTextField @@ -82,7 +83,7 @@ fun MakeDepositComposable( Text( stringResource(R.string.send_deposit_name), color = if (name.isBlank()) { - colorResource(R.color.red) + MaterialTheme.colorScheme.error } else Color.Unspecified, ) } @@ -103,7 +104,7 @@ fun MakeDepositComposable( Text( text = stringResource(R.string.send_deposit_iban), color = if (iban.isBlank()) { - colorResource(R.color.red) + MaterialTheme.colorScheme.error } else Color.Unspecified, ) } @@ -153,7 +154,7 @@ fun MakeDepositComposable( Text( modifier = Modifier.padding(16.dp), fontSize = 24.sp, - color = colorResource(if (fee.isZero()) R.color.green else R.color.red), + color = if (fee.isZero()) colorResource(R.color.green) else MaterialTheme.colorScheme.error, text = if (fee.isZero()) { fee.toString() } else { @@ -176,7 +177,7 @@ fun MakeDepositComposable( Text( modifier = Modifier.padding(16.dp), fontSize = 18.sp, - color = colorResource(R.color.red), + color = MaterialTheme.colorScheme.error, text = (state as? DepositState.Error)?.msg ?: "", ) } diff --git a/wallet/src/main/java/net/taler/wallet/deposit/PayToUriFragment.kt b/wallet/src/main/java/net/taler/wallet/deposit/PayToUriFragment.kt index d004f71..c8b5b6e 100644 --- a/wallet/src/main/java/net/taler/wallet/deposit/PayToUriFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/deposit/PayToUriFragment.kt @@ -54,7 +54,6 @@ import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.LocalFocusManager -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.Preview @@ -86,7 +85,7 @@ class PayToUriFragment : Fragment() { TalerSurface { if (currencies.isEmpty()) Text( text = stringResource(id = R.string.payment_balance_insufficient), - color = colorResource(id = R.color.red), + color = MaterialTheme.colorScheme.error, ) else if (depositManager.isSupportedPayToUri(uri)) PayToComposable( currencies = model.getCurrencies(), getAmount = model::createAmount, @@ -102,7 +101,7 @@ class PayToUriFragment : Fragment() { }, ) else Text( text = stringResource(id = R.string.uri_invalid), - color = colorResource(id = R.color.red), + color = MaterialTheme.colorScheme.error, ) } } @@ -151,7 +150,7 @@ private fun PayToComposable( if (amountError.isBlank()) { Text(stringResource(R.string.send_amount)) } else { - Text(amountError, color = colorResource(R.color.red)) + Text(amountError, color = MaterialTheme.colorScheme.error) } } ) diff --git a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeFeesFragment.kt b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeFeesFragment.kt index d8242f3..5ba204c 100644 --- a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeFeesFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeFeesFragment.kt @@ -17,12 +17,12 @@ package net.taler.wallet.exchanges import android.os.Bundle +import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.View.GONE import android.view.ViewGroup import android.widget.TextView -import androidx.core.content.ContextCompat.getColor import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.RecyclerView.Adapter @@ -71,7 +71,9 @@ class ExchangeFeesFragment : Fragment() { if (amount.isZero()) text = amount.toString() else { text = getString(R.string.amount_negative, amount) - setTextColor(getColor(context, R.color.red)) + val value = TypedValue() + requireContext().theme.resolveAttribute(R.attr.colorError, value, true) + setTextColor(value.data) } } diff --git a/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt index 4e54e7b..98f1edd 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt @@ -180,7 +180,7 @@ fun ColumnScope.PeerPullErrorComposable(s: IncomingError) { .padding(horizontal = 32.dp), text = s.info.userFacingMsg, style = MaterialTheme.typography.headlineSmall, - color = colorResource(id = R.color.red), + color = MaterialTheme.colorScheme.error, ) } diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt index 69c9cea..7fd01f5 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt @@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Button import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.OutlinedTextField @@ -84,7 +85,7 @@ fun OutgoingPullIntroComposable( Text( stringResource(R.string.send_peer_purpose), color = if (subject.isBlank()) { - colorResource(R.color.red) + MaterialTheme.colorScheme.error } else Color.Unspecified, ) } @@ -96,7 +97,7 @@ fun OutgoingPullIntroComposable( modifier = Modifier .fillMaxWidth() .padding(top = 5.dp, end = 16.dp), - color = if (subject.isBlank()) colorResource(R.color.red) else Color.Unspecified, + color = if (subject.isBlank()) MaterialTheme.colorScheme.error else Color.Unspecified, text = stringResource(R.string.char_count, subject.length, MAX_LENGTH_SUBJECT), textAlign = TextAlign.End, ) diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullResultComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullResultComposable.kt index 131d83d..a68ae16 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullResultComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullResultComposable.kt @@ -32,7 +32,6 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment.Companion.CenterHorizontally import androidx.compose.ui.Modifier -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -104,7 +103,7 @@ private fun ColumnScope.PeerPullErrorComposable(state: OutgoingError) { modifier = Modifier .align(CenterHorizontally) .padding(16.dp), - color = colorResource(R.color.red), + color = MaterialTheme.colorScheme.error, style = MaterialTheme.typography.bodyLarge, text = state.info.userFacingMsg, ) diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt index 0d3030d..0f30081 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt @@ -37,7 +37,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment.Companion.CenterHorizontally import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview @@ -87,7 +86,7 @@ fun OutgoingPushIntroComposable( Text( stringResource(R.string.send_peer_purpose), color = if (subject.isBlank()) { - colorResource(R.color.red) + MaterialTheme.colorScheme.error } else Color.Unspecified, ) } @@ -96,7 +95,7 @@ fun OutgoingPushIntroComposable( modifier = Modifier .fillMaxWidth() .padding(top = 5.dp, end = 16.dp), - color = if (subject.isBlank()) colorResource(R.color.red) else Color.Unspecified, + color = if (subject.isBlank()) MaterialTheme.colorScheme.error else Color.Unspecified, text = stringResource(R.string.char_count, subject.length, MAX_LENGTH_SUBJECT), textAlign = TextAlign.End, ) diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushResultComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushResultComposable.kt index bf7592d..d81ec64 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushResultComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushResultComposable.kt @@ -32,7 +32,6 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment.Companion.CenterHorizontally import androidx.compose.ui.Modifier -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -104,7 +103,7 @@ private fun ColumnScope.PeerPushErrorComposable(state: OutgoingError) { modifier = Modifier .align(CenterHorizontally) .padding(16.dp), - color = colorResource(R.color.red), + color = MaterialTheme.colorScheme.error, style = MaterialTheme.typography.bodyLarge, text = state.info.userFacingMsg, ) 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 d2fd15e..caf6cd7 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/DeleteTransactionComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/DeleteTransactionComposable.kt @@ -21,12 +21,11 @@ import androidx.compose.foundation.layout.padding import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -36,19 +35,19 @@ import net.taler.wallet.R fun DeleteTransactionComposable(onDelete: () -> Unit) { Button( modifier = Modifier.padding(16.dp), - colors = ButtonDefaults.buttonColors(containerColor = colorResource(R.color.red)), + colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error), onClick = onDelete, ) { Row(verticalAlignment = Alignment.CenterVertically) { Icon( painter = painterResource(id = R.drawable.ic_delete), contentDescription = null, - tint = Color.White + tint = MaterialTheme.colorScheme.onError ) Text( modifier = Modifier.padding(start = 8.dp), text = stringResource(R.string.transactions_delete), - color = Color.White + color = MaterialTheme.colorScheme.onError ) } } diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt index 9054f73..f6be5c8 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt @@ -102,7 +102,7 @@ fun TransactionAmountComposable(label: String, amount: Amount, amountType: Amoun fontSize = 24.sp, color = when (amountType) { AmountType.Positive -> colorResource(R.color.green) - AmountType.Negative -> colorResource(R.color.red) + AmountType.Negative -> MaterialTheme.colorScheme.error AmountType.Neutral -> Color.Unspecified }, ) diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenBitcoin.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenBitcoin.kt index 65b3e21..fa20072 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenBitcoin.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenBitcoin.kt @@ -32,8 +32,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment.Companion.End import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview @@ -85,14 +83,14 @@ fun ScreenBitcoin( if (onCancelClick != null) { Button( onClick = onCancelClick, - colors = ButtonDefaults.buttonColors(containerColor = colorResource(R.color.red)), + colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error), modifier = Modifier .padding(vertical = 16.dp) .align(End), ) { Text( text = stringResource(R.string.withdraw_manual_ready_cancel), - color = Color.White, + color = MaterialTheme.colorScheme.onError, ) } } diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenIBAN.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenIBAN.kt index 82e4040..537f3ad 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenIBAN.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenIBAN.kt @@ -39,7 +39,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.stringResource @@ -102,14 +101,14 @@ fun ScreenIBAN( if (onCancelClick != null) { Button( onClick = onCancelClick, - colors = ButtonDefaults.buttonColors(containerColor = colorResource(R.color.red)), + colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error), modifier = Modifier .padding(vertical = 16.dp) .align(Alignment.End), ) { Text( text = stringResource(R.string.withdraw_manual_ready_cancel), - color = Color.White, + color = MaterialTheme.colorScheme.onError, ) } } diff --git a/wallet/src/main/res/layout/fragment_error.xml b/wallet/src/main/res/layout/fragment_error.xml index c8c4913..2af166a 100644 --- a/wallet/src/main/res/layout/fragment_error.xml +++ b/wallet/src/main/res/layout/fragment_error.xml @@ -29,13 +29,13 @@ android:alpha="0.56" android:src="@drawable/ic_error" app:layout_constraintBottom_toTopOf="@+id/errorTitle" - app:layout_constraintDimensionRatio="1:1" + app:layout_constraintDimensionRatio="1.5:1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" app:layout_constraintVertical_chainStyle="packed" - app:tint="@color/red" + app:tint="?colorError" tools:ignore="ContentDescription" /> <TextView @@ -45,7 +45,7 @@ android:layout_margin="16dp" android:gravity="center_horizontal|top" android:minHeight="64dp" - android:textColor="@color/red" + android:textColor="?colorError" app:autoSizeMaxTextSize="40sp" app:autoSizeTextType="uniform" app:layout_constraintBottom_toTopOf="@+id/errorMessage" @@ -74,7 +74,7 @@ android:layout_margin="16dp" android:fontFamily="monospace" android:gravity="center" - android:textColor="@color/red" + android:textColor="?colorError" android:textIsSelectable="true" android:visibility="gone" app:layout_constraintBottom_toTopOf="@+id/backButton" diff --git a/wallet/src/main/res/layout/fragment_exchange_fees.xml b/wallet/src/main/res/layout/fragment_exchange_fees.xml index 6f8814f..03d69f5 100644 --- a/wallet/src/main/res/layout/fragment_exchange_fees.xml +++ b/wallet/src/main/res/layout/fragment_exchange_fees.xml @@ -44,7 +44,7 @@ app:layout_constraintStart_toEndOf="@+id/withdrawFeeLabel" app:layout_constraintTop_toTopOf="@+id/withdrawFeeLabel" tools:text="-0.23 TESTKUDOS" - tools:textColor="@color/red" /> + tools:textColor="?colorError" /> <TextView android:id="@+id/overheadLabel" @@ -64,7 +64,7 @@ app:layout_constraintStart_toEndOf="@+id/overheadLabel" app:layout_constraintTop_toTopOf="@+id/overheadLabel" tools:text="-0.42 TESTKUDOS" - tools:textColor="@color/red" /> + tools:textColor="?colorError" /> <TextView android:id="@+id/expirationLabel" diff --git a/wallet/src/main/res/layout/fragment_prompt_tip.xml b/wallet/src/main/res/layout/fragment_prompt_tip.xml index 941274f..e3b32cd 100644 --- a/wallet/src/main/res/layout/fragment_prompt_tip.xml +++ b/wallet/src/main/res/layout/fragment_prompt_tip.xml @@ -114,7 +114,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="16dp" android:gravity="center" - android:textColor="@color/red" + android:textColor="?colorError" android:textSize="20sp" android:visibility="invisible" app:layout_constraintBottom_toTopOf="@+id/exchangeIntroView" diff --git a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml index 03e7d1a..7b63d1b 100644 --- a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml +++ b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml @@ -114,7 +114,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="16dp" android:gravity="center" - android:textColor="@color/red" + android:textColor="?colorError" android:textSize="20sp" android:visibility="invisible" app:layout_constraintBottom_toTopOf="@+id/exchangeIntroView" diff --git a/wallet/src/main/res/layout/fragment_review_exchange_tos.xml b/wallet/src/main/res/layout/fragment_review_exchange_tos.xml index ec8d996..20c1013 100644 --- a/wallet/src/main/res/layout/fragment_review_exchange_tos.xml +++ b/wallet/src/main/res/layout/fragment_review_exchange_tos.xml @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:layout_margin="16dp" android:gravity="center" - android:textColor="@color/red" + android:textColor="?colorError" android:textSize="16sp" android:visibility="invisible" app:layout_constraintBottom_toBottomOf="parent" diff --git a/wallet/src/main/res/layout/fragment_transaction_payment.xml b/wallet/src/main/res/layout/fragment_transaction_payment.xml index c5f5f81..71447dd 100644 --- a/wallet/src/main/res/layout/fragment_transaction_payment.xml +++ b/wallet/src/main/res/layout/fragment_transaction_payment.xml @@ -39,6 +39,7 @@ android:id="@+id/amountPaidWithFeesLabel" style="@style/TransactionLabel" android:text="@string/transaction_paid" + app:layout_constraintBottom_toTopOf="@+id/amountPaidWithFeesView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/timeView" /> @@ -119,6 +120,7 @@ android:text="@string/transactions_delete" app:backgroundTint="@color/red" app:icon="@drawable/ic_delete" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/orderIdView" /> diff --git a/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml b/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml index 47dbafb..9c1dbda 100644 --- a/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml +++ b/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml @@ -111,7 +111,7 @@ <TextView android:id="@+id/feeView" style="@style/TransactionContent" - android:textColor="@color/red" + android:textColor="?colorError" app:layout_constraintBottom_toTopOf="@+id/exchangeLabel" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -142,8 +142,11 @@ android:layout_height="wrap_content" android:layout_marginVertical="10dp" android:text="@string/transactions_delete" - app:backgroundTint="@color/red" + app:backgroundTint="?colorError" app:icon="@drawable/ic_delete" + android:textColor="?colorOnError" + app:iconTint="?colorOnError" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/exchangeView" /> |