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 000000000..69176957c
Binary files /dev/null and b/app/src/main/res/drawable/cofunded_eu.png differ
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: