Skip to content

Add new cooperation logo #339

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
martenrebane wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add new cooperation logo #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 22 additions & 54 deletions app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InfoScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
)
Expand All @@ -256,7 +224,7 @@ fun InfoScreen(
}
ElevatedButton(
modifier =
modifier
Modifier
.shadow(
elevation = MCornerRadius,
shape = buttonRoundCornerShape,
Expand Down Expand Up @@ -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,
Expand Down
Binary file added app/src/main/res/drawable/cofunded_eu.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.
4 changes: 1 addition & 3 deletions app/src/main/res/values-et/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,7 @@
<string name="main_accessibility_introduction_screen_magnification_tools_android">Magnification (Android, sisseehitatud) https://support.google.com/accessibility/android/answer/6006949?hl=en</string>

<!-- Main About -->
<string name="main_about_1_logo_text">Eesti tuleviku heaks</string>
<string name="main_about_2_logo_text">Euroopa Liit Euroopa Regionaalarengu Fond</string>
<string name="main_about_digidoc_and_el_logos">Projekti on toetatud Euroopa Liidu Regionaalarengu Fondist</string>
<string name="main_about_digidoc_and_el_logos">Projekti on kaasrahastanud Euroopa Liit</string>
<string name="main_about_ria_digidoc_title">RIA DigiDoc</string>
<string name="main_about_version_title">versioon %1$s</string>
<string name="main_about_info_title">Eesti ID-tarkvara on välja antud Riigi Infosüsteemi Ameti poolt. Küsimuste korral pöördu:</string>
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,7 @@
<string name="main_accessibility_introduction_screen_magnification_tools_android">Magnification (Android, built in) https://support.google.com/accessibility/android/answer/6006949?hl=en</string>

<!-- Main About -->
<string name="main_about_1_logo_text">Eesti tuleviku heaks</string>
<string name="main_about_2_logo_text">Euroopa Liit Euroopa Regionaalarengu Fond</string>
<string name="main_about_digidoc_and_el_logos">The project is supported by the European Regional Development Fund</string>
<string name="main_about_digidoc_and_el_logos">The project is co-funded by the European Union</string>
<string name="main_about_ria_digidoc_title">RIA DigiDoc</string>
<string name="main_about_version_title">version %1$s</string>
<string name="main_about_info_title">Estonian ID software is issued by the Estonian Information System Authority. If you have any questions, please contact:</string>
Expand Down
Loading