diff options
author | Iván Ávalos <avalos@disroot.org> | 2023-01-11 21:08:11 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2023-01-26 12:18:54 -0600 |
commit | c1684e6c3f6f131136efebcb2724e681b79aef6c (patch) | |
tree | e19785eb69929b8c594e06c24197f8fdde865f4d /wallet/src/main/java/net/taler/wallet/withdraw | |
parent | c2a9681cd415e6d5b0a100b14624326a51d5a293 (diff) | |
download | taler-android-c1684e6c3f6f131136efebcb2724e681b79aef6c.tar.gz taler-android-c1684e6c3f6f131136efebcb2724e681b79aef6c.tar.bz2 taler-android-c1684e6c3f6f131136efebcb2724e681b79aef6c.zip |
[wallet] Experimental port to Material 3
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/withdraw')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenBitcoin.kt | 24 | ||||
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenIBAN.kt | 26 |
2 files changed, 25 insertions, 25 deletions
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 d6ed7df..65b3e21 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 @@ -23,11 +23,11 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.Button -import androidx.compose.material.ButtonDefaults -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment.Companion.End @@ -59,11 +59,11 @@ fun ScreenBitcoin( ) { Text( text = stringResource(R.string.withdraw_manual_bitcoin_title), - style = MaterialTheme.typography.h5, + style = MaterialTheme.typography.headlineSmall, ) Text( text = stringResource(R.string.withdraw_manual_bitcoin_intro), - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.bodyLarge, modifier = Modifier .padding(vertical = 8.dp) ) @@ -85,7 +85,7 @@ fun ScreenBitcoin( if (onCancelClick != null) { Button( onClick = onCancelClick, - colors = ButtonDefaults.buttonColors(backgroundColor = colorResource(R.color.red)), + colors = ButtonDefaults.buttonColors(containerColor = colorResource(R.color.red)), modifier = Modifier .padding(vertical = 16.dp) .align(End), @@ -111,13 +111,13 @@ fun BitcoinSegwitAddrs(amount: Amount, addr: String, segwitAddresses: List<Strin Column(modifier = Modifier.weight(0.3f)) { Text( text = addr, - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Normal, fontSize = 3.em ) Text( text = amount.withCurrency("BTC").toString(), - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Bold, ) } @@ -127,13 +127,13 @@ fun BitcoinSegwitAddrs(amount: Amount, addr: String, segwitAddresses: List<Strin Column(modifier = Modifier.weight(0.3f)) { Text( text = segwitAddress, - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Normal, fontSize = 3.em, ) Text( text = SEGWIT_MIN.toString(), - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Bold, ) } 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 79ca364..82e4040 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 @@ -26,13 +26,13 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.Button -import androidx.compose.material.ButtonDefaults -import androidx.compose.material.Icon -import androidx.compose.material.IconButton -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ContentCopy import androidx.compose.runtime.Composable @@ -65,12 +65,12 @@ fun ScreenIBAN( ) { Text( text = stringResource(R.string.withdraw_manual_ready_title), - style = MaterialTheme.typography.h5, + style = MaterialTheme.typography.headlineSmall, ) Text( text = stringResource(R.string.withdraw_manual_ready_intro, status.amountRaw.toString()), - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.bodyLarge, modifier = Modifier .padding(vertical = 8.dp) ) @@ -80,7 +80,7 @@ fun ScreenIBAN( DetailRow(stringResource(R.string.withdraw_exchange), status.exchangeBaseUrl, false) Text( text = stringResource(R.string.withdraw_manual_ready_warning), - style = MaterialTheme.typography.body2, + style = MaterialTheme.typography.bodyMedium, color = colorResource(R.color.notice_text), modifier = Modifier .align(Alignment.CenterHorizontally) @@ -102,7 +102,7 @@ fun ScreenIBAN( if (onCancelClick != null) { Button( onClick = onCancelClick, - colors = ButtonDefaults.buttonColors(backgroundColor = colorResource(R.color.red)), + colors = ButtonDefaults.buttonColors(containerColor = colorResource(R.color.red)), modifier = Modifier .padding(vertical = 16.dp) .align(Alignment.End), @@ -125,7 +125,7 @@ fun DetailRow(label: String, content: String, copy: Boolean = true) { .weight(0.3f)) { Text( text = label, - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.bodyLarge, fontWeight = if (copy) FontWeight.Bold else FontWeight.Normal, ) if (copy) { @@ -136,7 +136,7 @@ fun DetailRow(label: String, content: String, copy: Boolean = true) { } Text( text = content, - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.bodyLarge, modifier = Modifier .padding(bottom = 8.dp) .weight(0.7f) |