Skip to content

Commit

Permalink
Updated styles
Browse files Browse the repository at this point in the history
Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me>
  • Loading branch information
ArnyminerZ committed May 23, 2023
1 parent 4f32e2d commit 5fa0874
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class TrustCertificateActivity : ComponentActivity() {

Text(
text = stringResource(R.string.trust_certificate_reset_info),
style = MaterialTheme.typography.body2,
style = MaterialTheme.typography.body1,
modifier = Modifier
.fillMaxWidth()
.padding(top = 16.dp),
Expand Down Expand Up @@ -126,7 +126,7 @@ class TrustCertificateActivity : ComponentActivity() {

Text(
text = stringResource(R.string.trust_certificate_x509_certificate_details),
style = MaterialTheme.typography.h3,
style = MaterialTheme.typography.h5,
modifier = Modifier
.fillMaxWidth()
.padding(bottom = 16.dp),
Expand All @@ -149,8 +149,8 @@ class TrustCertificateActivity : ComponentActivity() {
)

Text(
text = stringResource(R.string.trust_certificate_fingerprints),
style = MaterialTheme.typography.body1,
text = stringResource(R.string.trust_certificate_fingerprints).uppercase(),
style = MaterialTheme.typography.overline,
modifier = Modifier
.fillMaxWidth(),
)
Expand Down Expand Up @@ -184,6 +184,7 @@ class TrustCertificateActivity : ComponentActivity() {
modifier = Modifier
.weight(1f)
.padding(bottom = 8.dp),
style = MaterialTheme.typography.body2
)
}

Expand All @@ -200,15 +201,15 @@ class TrustCertificateActivity : ComponentActivity() {
modifier = Modifier
.weight(1f)
.padding(end = 16.dp)
) { Text(stringResource(R.string.trust_certificate_accept)) }
) { Text(stringResource(R.string.trust_certificate_accept).uppercase()) }
TextButton(
onClick = {
sendDecision(false)
finish()
},
modifier = Modifier
.weight(1f)
) { Text(stringResource(R.string.trust_certificate_reject)) }
) { Text(stringResource(R.string.trust_certificate_reject).uppercase()) }
}
}
}
Expand All @@ -217,14 +218,14 @@ class TrustCertificateActivity : ComponentActivity() {
@Composable
fun InfoPack(@StringRes labelStringRes: Int, text: String) {
Text(
text = stringResource(labelStringRes),
style = MaterialTheme.typography.body1,
text = stringResource(labelStringRes).uppercase(),
style = MaterialTheme.typography.overline,
modifier = Modifier
.fillMaxWidth(),
)
Text(
text = text,
style = MaterialTheme.typography.body2,
style = MaterialTheme.typography.body1,
modifier = Modifier
.fillMaxWidth()
.padding(bottom = 16.dp),
Expand Down

0 comments on commit 5fa0874

Please sign in to comment.