summaryrefslogtreecommitdiff
path: root/wallet/src/main/java/net/taler/wallet/peer
diff options
context:
space:
mode:
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/peer')
-rw-r--r--wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt26
-rw-r--r--wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt10
-rw-r--r--wallet/src/main/java/net/taler/wallet/peer/OutgoingPullResultComposable.kt16
-rw-r--r--wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt14
-rw-r--r--wallet/src/main/java/net/taler/wallet/peer/OutgoingPushResultComposable.kt16
-rw-r--r--wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt8
-rw-r--r--wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt2
-rw-r--r--wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt2
-rw-r--r--wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt8
9 files changed, 53 insertions, 49 deletions
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 70f36a2..4e54e7b 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt
@@ -27,13 +27,13 @@ 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.material.Button
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Card
-import androidx.compose.material.CircularProgressIndicator
-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.Card
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
import androidx.compose.runtime.mutableStateOf
@@ -116,7 +116,7 @@ fun ColumnScope.PeerPullTermsComposable(
.padding(16.dp)
.align(CenterHorizontally),
text = terms.contractTerms.summary,
- style = MaterialTheme.typography.h5,
+ style = MaterialTheme.typography.headlineSmall,
)
Spacer(modifier = Modifier.weight(1f))
Card(modifier = Modifier.fillMaxWidth()) {
@@ -128,12 +128,12 @@ fun ColumnScope.PeerPullTermsComposable(
) {
Text(
text = stringResource(id = R.string.payment_label_amount_total),
- style = MaterialTheme.typography.body1,
+ style = MaterialTheme.typography.bodyLarge,
)
Text(
modifier = Modifier.padding(start = 8.dp),
text = terms.contractTerms.amount.toString(),
- style = MaterialTheme.typography.body1,
+ style = MaterialTheme.typography.bodyLarge,
fontWeight = FontWeight.Bold,
)
}
@@ -143,7 +143,7 @@ fun ColumnScope.PeerPullTermsComposable(
Text(
modifier = Modifier.align(End),
text = stringResource(id = R.string.payment_fee, fee),
- style = MaterialTheme.typography.body1,
+ style = MaterialTheme.typography.bodyLarge,
)
}
if (terms is IncomingAccepting) {
@@ -158,7 +158,7 @@ fun ColumnScope.PeerPullTermsComposable(
.align(End)
.padding(top = 8.dp),
colors = ButtonDefaults.buttonColors(
- backgroundColor = colorResource(R.color.green),
+ containerColor = colorResource(R.color.green),
contentColor = Color.White,
),
onClick = { onAccept(terms) },
@@ -179,7 +179,7 @@ fun ColumnScope.PeerPullErrorComposable(s: IncomingError) {
.align(CenterHorizontally)
.padding(horizontal = 32.dp),
text = s.info.userFacingMsg,
- style = MaterialTheme.typography.h5,
+ style = MaterialTheme.typography.headlineSmall,
color = colorResource(id = R.color.red),
)
}
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 9af3f5d..69c9cea 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
@@ -22,10 +22,11 @@ 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.material.Button
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.State
@@ -50,6 +51,7 @@ import net.taler.wallet.R
import net.taler.wallet.cleanExchange
import net.taler.wallet.exchanges.ExchangeItem
+@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun OutgoingPullIntroComposable(
amount: Amount,
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 84d9415..131d83d 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullResultComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullResultComposable.kt
@@ -24,11 +24,11 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Button
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.Button
+import androidx.compose.material3.CircularProgressIndicator
+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.Companion.CenterHorizontally
import androidx.compose.ui.Modifier
@@ -55,7 +55,7 @@ fun OutgoingPullResultComposable(state: OutgoingState, onClose: () -> Unit) {
) {
Text(
modifier = Modifier.padding(top = 16.dp, start = 16.dp, end = 16.dp),
- style = MaterialTheme.typography.h6,
+ style = MaterialTheme.typography.titleLarge,
text = stringResource(id = R.string.receive_peer_invoice_instruction),
)
when (state) {
@@ -92,7 +92,7 @@ private fun ColumnScope.PeerPullResponseComposable(state: OutgoingResponse) {
) {
Text(
modifier = Modifier.padding(horizontal = 16.dp),
- style = MaterialTheme.typography.body1,
+ style = MaterialTheme.typography.bodyLarge,
text = stringResource(id = R.string.receive_peer_invoice_uri),
)
}
@@ -105,7 +105,7 @@ private fun ColumnScope.PeerPullErrorComposable(state: OutgoingError) {
.align(CenterHorizontally)
.padding(16.dp),
color = colorResource(R.color.red),
- style = MaterialTheme.typography.body1,
+ 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 a77cfb7..0d3030d 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
@@ -22,11 +22,12 @@ 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.material.Button
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -44,6 +45,7 @@ import androidx.compose.ui.unit.dp
import net.taler.common.Amount
import net.taler.wallet.R
+@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun OutgoingPushIntroComposable(
amount: Amount,
@@ -65,7 +67,7 @@ fun OutgoingPushIntroComposable(
modifier = Modifier,
text = amount.toString(),
softWrap = false,
- style = MaterialTheme.typography.h6,
+ style = MaterialTheme.typography.titleLarge,
)
}
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 27b04c8..bf7592d 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushResultComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushResultComposable.kt
@@ -24,11 +24,11 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Button
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.Button
+import androidx.compose.material3.CircularProgressIndicator
+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.Companion.CenterHorizontally
import androidx.compose.ui.Modifier
@@ -55,7 +55,7 @@ fun OutgoingPushResultComposable(state: OutgoingState, onClose: () -> Unit) {
) {
Text(
modifier = Modifier.padding(top = 16.dp, start = 16.dp, end = 16.dp),
- style = MaterialTheme.typography.h6,
+ style = MaterialTheme.typography.titleLarge,
text = stringResource(id = R.string.send_peer_payment_instruction),
)
when (state) {
@@ -92,7 +92,7 @@ private fun ColumnScope.PeerPushResponseComposable(state: OutgoingResponse) {
) {
Text(
modifier = Modifier.padding(horizontal = 16.dp),
- style = MaterialTheme.typography.body1,
+ style = MaterialTheme.typography.bodyLarge,
text = stringResource(id = R.string.receive_peer_invoice_uri),
)
}
@@ -105,7 +105,7 @@ private fun ColumnScope.PeerPushErrorComposable(state: OutgoingError) {
.align(CenterHorizontally)
.padding(16.dp),
color = colorResource(R.color.red),
- style = MaterialTheme.typography.body1,
+ style = MaterialTheme.typography.bodyLarge,
text = state.info.userFacingMsg,
)
}
diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
index 92264c7..c64f0d3 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
@@ -18,9 +18,9 @@ package net.taler.wallet.peer
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.padding
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
@@ -69,7 +69,7 @@ fun ColumnScope.TransactionPeerPullCreditComposable(t: TransactionPeerPullCredit
) {
Text(
modifier = Modifier.padding(horizontal = 16.dp),
- style = MaterialTheme.typography.body1,
+ style = MaterialTheme.typography.bodyLarge,
text = stringResource(id = R.string.receive_peer_invoice_uri),
)
}
diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
index d09a659..ccf0324 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
@@ -16,7 +16,7 @@
package net.taler.wallet.peer
-import androidx.compose.material.Surface
+import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
index e918c42..897d3fb 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
@@ -16,7 +16,7 @@
package net.taler.wallet.peer
-import androidx.compose.material.Surface
+import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
index 88c27fe..3e74d43 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
@@ -18,9 +18,9 @@ package net.taler.wallet.peer
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.padding
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
@@ -68,7 +68,7 @@ fun ColumnScope.TransactionPeerPushDebitComposable(t: TransactionPeerPushDebit)
) {
Text(
modifier = Modifier.padding(horizontal = 16.dp),
- style = MaterialTheme.typography.body1,
+ style = MaterialTheme.typography.bodyLarge,
text = stringResource(id = R.string.receive_peer_invoice_uri),
)
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 22:04:15 +0000