diff options
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/peer')
5 files changed, 8 insertions, 10 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 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, ) |