diff options
author | Torsten Grote <t@grobox.de> | 2023-01-03 10:24:35 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2023-01-03 10:24:35 -0300 |
commit | 3cf3abb25adf040ad8e4e30d0fc8f311b2b1f4ee (patch) | |
tree | 46af8263b0fa949bf3c5ae5464fbe06240932d14 /wallet | |
parent | 43ad014f54c50fc2fa1cda3e1d6e24229637ad02 (diff) | |
download | taler-android-3cf3abb25adf040ad8e4e30d0fc8f311b2b1f4ee.tar.gz taler-android-3cf3abb25adf040ad8e4e30d0fc8f311b2b1f4ee.tar.bz2 taler-android-3cf3abb25adf040ad8e4e30d0fc8f311b2b1f4ee.zip |
[wallet] change send money texts for Bitcoin
#0007495
Diffstat (limited to 'wallet')
4 files changed, 16 insertions, 3 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt b/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt index b16022d..640fbf7 100644 --- a/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt @@ -171,7 +171,11 @@ private fun SendFundsIntro( onClick = { onClickButton { amount -> onDeposit(amount) } }) { - Text(text = stringResource(R.string.send_deposit)) + Text(text = if (currency == CURRENCY_BTC) { + stringResource(R.string.send_deposit_bitcoin) + } else { + stringResource(R.string.send_deposit) + }) } Button( modifier = Modifier @@ -181,7 +185,11 @@ private fun SendFundsIntro( onClickButton { amount -> onPeerPush(amount) } }, ) { - Text(text = stringResource(R.string.send_peer)) + Text(text = if (currency == CURRENCY_BTC) { + stringResource(R.string.send_peer_bitcoin) + } else { + stringResource(R.string.send_peer) + }) } } } diff --git a/wallet/src/main/java/net/taler/wallet/Utils.kt b/wallet/src/main/java/net/taler/wallet/Utils.kt index b9abb31..5679f21 100644 --- a/wallet/src/main/java/net/taler/wallet/Utils.kt +++ b/wallet/src/main/java/net/taler/wallet/Utils.kt @@ -35,6 +35,8 @@ import com.google.accompanist.themeadapter.material.MdcTheme import net.taler.common.Amount import net.taler.common.AmountParserException +const val CURRENCY_BTC = "BITCOINBTC" + fun connectToWifi(context: Context, ssid: String) { if (SDK_INT >= 29) { connectToWifi29(context, ssid) 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 6820ba0..d6ed7df 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 @@ -40,6 +40,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.em import net.taler.common.Amount +import net.taler.wallet.CURRENCY_BTC import net.taler.wallet.R import net.taler.wallet.compose.CopyToClipboardButton import net.taler.wallet.withdraw.WithdrawStatus @@ -163,7 +164,7 @@ fun PreviewScreenBitcoin() { "bc1qsleagehks96u7jmqrzcf0fw80ea5g57qm3m84c" ), subject = "0ZSX8SH0M30KHX8K3Y1DAMVGDQV82XEF9DG1HC4QMQ3QWYT4AF00", - amountRaw = Amount("BITCOINBTC", 0, 14000000), + amountRaw = Amount(CURRENCY_BTC, 0, 14000000), transactionId = "", ), {}) {} } diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml index 472959d..eb15021 100644 --- a/wallet/src/main/res/values/strings.xml +++ b/wallet/src/main/res/values/strings.xml @@ -129,6 +129,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="send_amount">Amount to send</string> <string name="send_intro">Choose where to send money to:</string> <string name="send_deposit">To a bank account</string> + <string name="send_deposit_bitcoin">To a Bitcoin wallet</string> <string name="send_deposit_title">Deposit to a bank account</string> <string name="send_deposit_iban">IBAN</string> <string name="send_deposit_bic">BIC/SWIFT</string> @@ -137,6 +138,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="send_deposit_amount_effective">Effective Amount</string> <string name="send_deposit_create_button">Make deposit</string> <string name="send_peer">To another wallet</string> + <string name="send_peer_bitcoin">To another Taler wallet</string> <string name="send_peer_title">Send money to another wallet</string> <string name="send_peer_create_button">Send funds now</string> <string name="send_peer_warning">Warning: Funds will leave the wallet immediately.</string> |