diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InitScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InitScreen.kt index 1794a7d5..3ed0ebde 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InitScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InitScreen.kt @@ -41,7 +41,12 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTagsAsResourceId +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.TextUnit import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController import ee.ria.DigiDoc.R @@ -106,9 +111,14 @@ fun InitScreen( }, ) } - + val baseStyle = MaterialTheme.typography.displaySmall Text( - text = stringResource(id = R.string.ria), + text = + smallCapsText( + text = stringResource(id = R.string.ria), + normalSize = baseStyle.fontSize, + smallCapsSize = baseStyle.fontSize * 0.8f, + ), style = MaterialTheme.typography.displaySmall, modifier = modifier @@ -120,6 +130,29 @@ fun InitScreen( } } +fun smallCapsText( + text: String, + normalSize: TextUnit, + smallCapsSize: TextUnit, +): AnnotatedString = + buildAnnotatedString { + text.forEach { ch -> + if (ch.isLowerCase()) { + withStyle( + SpanStyle(fontSize = smallCapsSize), + ) { + append(ch.uppercaseChar()) + } + } else { + withStyle( + SpanStyle(fontSize = normalSize), + ) { + append(ch) + } + } + } + } + @Preview(showBackground = true) @Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES) @Composable diff --git a/app/src/main/res/drawable/ria_digidoc.png b/app/src/main/res/drawable/ria_digidoc.png index 4299221f..e722fe0c 100644 Binary files a/app/src/main/res/drawable/ria_digidoc.png and b/app/src/main/res/drawable/ria_digidoc.png differ diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 6007af78..bf5492b4 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -3,7 +3,7 @@ RIA DigiDoc RIA DIGIDOC RIA DigiDoc - Rɪɪɢɪ Iɴꜰᴏꜱüꜱᴛᴇᴇᴍɪ Aᴍᴇᴛ + Riigi Infosüsteemi Amet 372XXXXXXXX PIN1 @@ -11,8 +11,8 @@ Eesti English - Eesti keel - In English + Eesti + English Invisible element