From 9b5d3c2b673e838d8e1a06e81344879e314d56b4 Mon Sep 17 00:00:00 2001 From: Marten Rebane Date: Wed, 6 May 2026 16:23:49 +0300 Subject: [PATCH] Add new cooperation logo --- .../ria/DigiDoc/fragment/screen/InfoScreen.kt | 76 +++++------------- app/src/main/res/drawable/cofunded_eu.png | Bin 0 -> 23939 bytes app/src/main/res/values-et/strings.xml | 4 +- app/src/main/res/values/strings.xml | 4 +- 4 files changed, 24 insertions(+), 60 deletions(-) create mode 100644 app/src/main/res/drawable/cofunded_eu.png diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InfoScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InfoScreen.kt index 11b8e500a..90a05df17 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InfoScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InfoScreen.kt @@ -33,7 +33,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ButtonDefaults @@ -70,7 +69,6 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.sp import androidx.core.net.toUri import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.asFlow @@ -179,65 +177,35 @@ fun InfoScreen( horizontalAlignment = Alignment.CenterHorizontally, ) { Row( - modifier = - modifier - .padding(horizontal = XSPadding, vertical = SPadding), + modifier = Modifier + .padding(horizontal = XSPadding, vertical = SPadding), + verticalAlignment = Alignment.CenterVertically ) { + Image( + painter = painterResource(id = R.drawable.cofunded_eu), + contentDescription = stringResource(R.string.main_about_digidoc_and_el_logos), + modifier = Modifier + .weight(0.35f) + .padding(end = XSPadding) + ) + Column( - modifier = - modifier - .padding(end = XSPadding) - .weight(.35f), - horizontalAlignment = Alignment.CenterHorizontally, - ) { - Image( - painter = painterResource(id = R.drawable.eesti_flag), - alignment = Alignment.Center, - modifier = modifier.wrapContentSize(), - contentDescription = stringResource(id = R.string.main_about_1_logo_text), - ) - Text( - modifier = modifier.notAccessible(), - text = stringResource(id = R.string.main_about_1_logo_text), - style = MaterialTheme.typography.labelSmall, - fontSize = 9.sp, - textAlign = TextAlign.Center, - ) - Image( - painter = painterResource(id = R.drawable.eu_flag), - alignment = Alignment.Center, - modifier = modifier.wrapContentSize(), - contentDescription = stringResource(id = R.string.main_about_2_logo_text), - ) - Text( - modifier = modifier.notAccessible(), - text = stringResource(id = R.string.main_about_2_logo_text), - style = MaterialTheme.typography.labelSmall, - fontSize = 9.sp, - textAlign = TextAlign.Center, - ) - } - Column( - modifier = - modifier - .padding(start = XSPadding) - .weight(.65f), - horizontalAlignment = Alignment.Start, + modifier = Modifier.weight(0.65f), + horizontalAlignment = Alignment.Start ) { Text( text = stringResource(id = R.string.main_about_ria_digidoc_title), style = MaterialTheme.typography.titleLarge, ) Text( - text = - String.format( - stringResource(id = R.string.main_about_version_title), - BuildConfig.VERSION_NAME + '.' + BuildConfig.VERSION_CODE, - ), + text = String.format( + stringResource(id = R.string.main_about_version_title), + BuildConfig.VERSION_NAME + '.' + BuildConfig.VERSION_CODE, + ), style = MaterialTheme.typography.bodyMedium, ) Text( - modifier = modifier.padding(vertical = SPadding), + modifier = Modifier.padding(vertical = SPadding), text = stringResource(id = R.string.main_about_info_title), style = MaterialTheme.typography.labelMedium, ) @@ -256,7 +224,7 @@ fun InfoScreen( } ElevatedButton( modifier = - modifier + Modifier .shadow( elevation = MCornerRadius, shape = buttonRoundCornerShape, @@ -289,16 +257,16 @@ fun InfoScreen( }, ) { Icon( - modifier = modifier.size(iconSizeXXS), + modifier = Modifier.size(iconSizeXXS), imageVector = ImageVector.vectorResource( id = R.drawable.ic_m3_open_in_new_48dp_wght400, ), contentDescription = null, ) - Spacer(modifier = modifier.width(XSPadding)) + Spacer(modifier = Modifier.width(XSPadding)) Text( - modifier = modifier.notAccessible(), + modifier = Modifier.notAccessible(), text = stringResource(id = R.string.main_about_help_center), color = MaterialTheme.colorScheme.onPrimary, fontSize = MaterialTheme.typography.labelMedium.fontSize, diff --git a/app/src/main/res/drawable/cofunded_eu.png b/app/src/main/res/drawable/cofunded_eu.png new file mode 100644 index 0000000000000000000000000000000000000000..69176957c4388b0c051dde95fee79a4ce4935b81 GIT binary patch literal 23939 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 b?y=1_=Y2H$4q?&dY;5{^#*b=roWlPLS6wn@ literal 0 HcmV?d00001 diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 0164a1153..e5415f389 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -495,9 +495,7 @@ Magnification (Android, sisseehitatud) https://support.google.com/accessibility/android/answer/6006949?hl=en - Eesti tuleviku heaks - Euroopa Liit Euroopa Regionaalarengu Fond - Projekti on toetatud Euroopa Liidu Regionaalarengu Fondist + Projekti on kaasrahastanud Euroopa Liit RIA DigiDoc versioon %1$s Eesti ID-tarkvara on välja antud Riigi Infosüsteemi Ameti poolt. Küsimuste korral pöördu: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 37d811938..79dfee7ea 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -495,9 +495,7 @@ Magnification (Android, built in) https://support.google.com/accessibility/android/answer/6006949?hl=en - Eesti tuleviku heaks - Euroopa Liit Euroopa Regionaalarengu Fond - The project is supported by the European Regional Development Fund + The project is co-funded by the European Union RIA DigiDoc version %1$s Estonian ID software is issued by the Estonian Information System Authority. If you have any questions, please contact: