From 5c0e3c232c38a404fb841efce740b6b8fe0e23fd Mon Sep 17 00:00:00 2001 From: Christos Kaitatzis Date: Wed, 5 Feb 2025 10:51:28 +0200 Subject: [PATCH] change: Imported VerifiedBadge icon to use in ContentHeader component, corrections in OptionsSelectionViewModel, removed unused localizable keys. Signed-off-by: Christos Kaitatzis --- .../entities/localization/LocalizableKey.kt | 16 +----------- .../presentation/ui/component/AppIcons.kt | 6 +++++ .../presentation/ui/component/RelyingParty.kt | 2 +- .../OptionsSelectionViewModel.kt | 6 ++--- .../main/res/drawable/ic_verified_badge.xml | 25 +++++++++++++++++++ .../ec/eudi/testrqes/TestRQESApplication.kt | 2 -- 6 files changed, 36 insertions(+), 21 deletions(-) create mode 100644 rqes-ui-sdk/src/main/res/drawable/ic_verified_badge.xml diff --git a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/domain/entities/localization/LocalizableKey.kt b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/domain/entities/localization/LocalizableKey.kt index 5aab783..8d50955 100644 --- a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/domain/entities/localization/LocalizableKey.kt +++ b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/domain/entities/localization/LocalizableKey.kt @@ -28,14 +28,10 @@ enum class LocalizableKey { CancelSignProcessPrimaryText, SelectDocumentTitle, SelectDocumentSubtitle, - SelectDocument, - Document, - ConfirmSelectionTitle, SelectSigningService, SelectSigningServiceSubtitle, SelectServiceTitle, SelectServiceSubtitle, - SelectCertificateTitle, SelectCertificateSubtitle, SelectSigningCertificateTitle, SelectSigningCertificateSubtitle, @@ -45,15 +41,12 @@ enum class LocalizableKey { Success, SuccessfullySignedDocument, SuccessDescription, - SignedBy, View, Close, Cancel, Continue, Done, - Save, Share, - Sign, SharingDocument, CloseSharingMessage, GenericErrorButtonRetry, @@ -76,31 +69,24 @@ enum class LocalizableKey { CancelSignProcessSubtitle -> "Cancel will redirect you back to the documents list without signing your document" CancelSignProcessSecondaryText -> "Cancel signing" CancelSignProcessPrimaryText -> "Continue signing" - SelectDocumentTitle -> "Select a document from your device to sign electronically." + SelectDocumentTitle -> "Document" SelectDocumentSubtitle -> "Choose a document from your device to sign electronically." - SelectDocument -> "Select document" - Document -> "Document" SigningService -> "Signing service" - ConfirmSelectionTitle -> "Please confirm signing of the following" SelectSigningService -> "Select signing service" SelectSigningServiceSubtitle -> "Remote Signing Service enables secure online document signing." SelectServiceTitle -> "Signing services" SelectServiceSubtitle -> "Select the Signing Service that will be used to issue a digital certificate" - SelectCertificateTitle -> "You have chosen to sign the following document:" SelectSigningCertificateTitle -> "Select signing certificate" SelectCertificateSubtitle -> "The signing certificate is used to verify your identity and is linked to your electronic signature." Success -> "Success!" SuccessfullySignedDocument -> "You successfully signed your document" SuccessDescription -> "You have successfully signed your document." - SignedBy -> "Signed by: $ARGUMENTS_SEPARATOR" View -> "VIEW" Close -> "Close" Cancel -> "Cancel" Continue -> "Continue" Done -> "Done" - Save -> "Save" Share -> "Share" - Sign -> "Sign" SharingDocument -> "Sharing document?" CloseSharingMessage -> "Closing will redirect you back to the dashboard without saving or sharing the document." GenericErrorButtonRetry -> "TRY AGAIN" diff --git a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/ui/component/AppIcons.kt b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/ui/component/AppIcons.kt index 2c9e87e..f3400bc 100644 --- a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/ui/component/AppIcons.kt +++ b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/ui/component/AppIcons.kt @@ -87,6 +87,12 @@ internal object AppIcons { imageVector = null ) + val VerifiedBadge: IconData = IconData( + resourceId = R.drawable.ic_verified_badge, + contentDescriptionId = R.string.content_description_verified_icon, + imageVector = null + ) + val VerticalMore: IconData = IconData( resourceId = null, contentDescriptionId = R.string.content_description_more_vert_icon, diff --git a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/ui/component/RelyingParty.kt b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/ui/component/RelyingParty.kt index f6ae3d1..ea57697 100644 --- a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/ui/component/RelyingParty.kt +++ b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/ui/component/RelyingParty.kt @@ -69,7 +69,7 @@ fun RelyingParty( if (isVerified) { WrapIcon( modifier = Modifier.size(20.dp), - iconData = AppIcons.Verified, + iconData = AppIcons.VerifiedBadge, customTint = MaterialTheme.colorScheme.success, ) } diff --git a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/ui/options_selection/OptionsSelectionViewModel.kt b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/ui/options_selection/OptionsSelectionViewModel.kt index 00bcd13..adef7e6 100644 --- a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/ui/options_selection/OptionsSelectionViewModel.kt +++ b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/ui/options_selection/OptionsSelectionViewModel.kt @@ -351,7 +351,7 @@ internal class OptionsSelectionViewModel( setState { copy( documentSelectionItem = SelectionOptionUi( - overlineText = resourceProvider.getLocalizedString(LocalizableKey.Document), + overlineText = resourceProvider.getLocalizedString(LocalizableKey.SelectDocumentTitle), mainText = response.file.documentName, subtitle = resourceProvider.getLocalizedString(LocalizableKey.SelectDocumentSubtitle), actionText = resourceProvider.getLocalizedString(LocalizableKey.View), @@ -492,8 +492,8 @@ internal class OptionsSelectionViewModel( setState { copy( certificateSelectionItem = SelectionOptionUi( - overlineText = resourceProvider.getLocalizedString(LocalizableKey.SelectSigningCertificateTitle), - mainText = null, + overlineText = null, + mainText = resourceProvider.getLocalizedString(LocalizableKey.SelectSigningCertificateTitle), subtitle = resourceProvider.getLocalizedString(LocalizableKey.SelectCertificateSubtitle), leadingIcon = AppIcons.StepThree, trailingIcon = AppIcons.KeyboardArrowRight, diff --git a/rqes-ui-sdk/src/main/res/drawable/ic_verified_badge.xml b/rqes-ui-sdk/src/main/res/drawable/ic_verified_badge.xml new file mode 100644 index 0000000..16b7d09 --- /dev/null +++ b/rqes-ui-sdk/src/main/res/drawable/ic_verified_badge.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/test-app/src/main/java/eu/europa/ec/eudi/testrqes/TestRQESApplication.kt b/test-app/src/main/java/eu/europa/ec/eudi/testrqes/TestRQESApplication.kt index 19eea1e..00283a5 100644 --- a/test-app/src/main/java/eu/europa/ec/eudi/testrqes/TestRQESApplication.kt +++ b/test-app/src/main/java/eu/europa/ec/eudi/testrqes/TestRQESApplication.kt @@ -19,7 +19,6 @@ package eu.europa.ec.eudi.testrqes import android.app.Application import eu.europa.ec.eudi.rqes.HashAlgorithmOID import eu.europa.ec.eudi.rqesui.domain.entities.localization.LocalizableKey -import eu.europa.ec.eudi.rqesui.domain.entities.localization.LocalizableKey.Companion.ARGUMENTS_SEPARATOR import eu.europa.ec.eudi.rqesui.domain.extension.toUri import eu.europa.ec.eudi.rqesui.infrastructure.EudiRQESUi import eu.europa.ec.eudi.rqesui.infrastructure.config.EudiRQESUiConfig @@ -63,7 +62,6 @@ private class DefaultConfig : EudiRQESUiConfig { return mapOf( "en" to mapOf( LocalizableKey.View to "VIEW", - LocalizableKey.SignedBy to "Signed by: $ARGUMENTS_SEPARATOR", ) ) }