diff options
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/deposit')
3 files changed, 11 insertions, 11 deletions
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) } } ) |