Skip to content

Splash screen logo and language choice texts update. #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ambrose40 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Splash screen logo and language choice texts update. #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18be9f0
MOPPAND-1750 Splash screen logo and language choice texts update.
ambrose40 Jan 27, 2026
5d6745b
MOPPAND-1750 Another option to create smallCaps text with Android Jet…
ambrose40 Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 35 additions & 2 deletions app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InitScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Binary file modified app/src/main/res/drawable/ria_digidoc.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions app/src/main/res/values/donottranslate.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<string name="app_name">RIA DigiDoc</string>
<string name="digidoc_all_caps">RIA DIGIDOC</string>
<string name="digidoc">RIA DigiDoc</string>
<string name="ria">Rɪɪɢɪ Iɴꜰᴏꜱüꜱᴛᴇᴇᴍɪ Aᴍᴇᴛ</string>
<string name="ria">Riigi Infosüsteemi Amet</string>

<string name="mobile_id_country_code_and_phone_number_placeholder">372XXXXXXXX</string>
<string name="signature_id_card_pin1">PIN1</string>
<string name="signature_id_card_pin2">PIN2</string>
<string name="main_home_menu_locale_et">Eesti</string>
<string name="main_home_menu_locale_en">English</string>

<string name="init_lang_locale_et">Eesti keel</string>
<string name="init_lang_locale_en">In English</string>
<string name="init_lang_locale_et">Eesti</string>
<string name="init_lang_locale_en">English</string>

<string name="last_invisible_element_name">Invisible element</string>

Expand Down
Loading