Merge pull request #157 from niscy-eudiw/main

Deferred issuing implementation
eu-digital-identity-wallet · Jul 25, 2024 · 653c757 · 653c757
2 parents 97f4a09 + 201b035
commit 653c757
Show file tree

Hide file tree

Showing 47 changed files with 1,766 additions and 350 deletions.
diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/config/SuccessUIConfig.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/config/SuccessUIConfig.kt
@@ -17,16 +17,18 @@
 package eu.europa.ec.commonfeature.config
 
 import androidx.annotation.DrawableRes
+import androidx.compose.ui.graphics.Color
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
+import eu.europa.ec.resourceslogic.theme.values.ThemeColors
 import eu.europa.ec.uilogic.config.ConfigNavigation
 import eu.europa.ec.uilogic.config.NavigationType
 import eu.europa.ec.uilogic.serializer.UiSerializable
 import eu.europa.ec.uilogic.serializer.UiSerializableParser
 import eu.europa.ec.uilogic.serializer.adapter.SerializableTypeAdapter
 
 data class SuccessUIConfig(
-    val header: String?,
+    val headerConfig: HeaderConfig?,
     val content: String,
     val imageConfig: ImageConfig,
     val buttonConfig: List<ButtonConfig>,
@@ -36,6 +38,7 @@ data class SuccessUIConfig(
     data class ImageConfig(
         val type: Type,
         @DrawableRes val drawableRes: Int? = null,
+        val tint: Color = ThemeColors.success,
         val contentDescription: String? = null
     ) {
         enum class Type {
@@ -53,6 +56,11 @@ data class SuccessUIConfig(
         }
     }
 
+    data class HeaderConfig(
+        val title: String,
+        val color: Color = ThemeColors.success
+    )
+
     companion object Parser : UiSerializableParser {
         override val serializedKeyName = "successConfig"
         override fun provideParser(): Gson {

diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/model/DocumentTypeUi.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/model/DocumentTypeUi.kt
@@ -21,19 +21,25 @@ import eu.europa.ec.corelogic.model.DocumentIdentifier
 import eu.europa.ec.corelogic.model.isSupported
 import eu.europa.ec.corelogic.model.toDocumentIdentifier
 import eu.europa.ec.eudi.iso18013.transfer.RequestDocument
-import eu.europa.ec.eudi.wallet.document.IssuedDocument
+import eu.europa.ec.eudi.wallet.document.Document
+import eu.europa.ec.eudi.wallet.document.DocumentId
 import eu.europa.ec.resourceslogic.R
 import eu.europa.ec.resourceslogic.provider.ResourceProvider
 
+enum class DocumentUiIssuanceState {
+    Issued, Pending, Failed
+}
+
 data class DocumentUi(
-    val documentId: String,
+    val documentIssuanceState: DocumentUiIssuanceState,
     val documentName: String,
     val documentIdentifier: DocumentIdentifier,
     val documentExpirationDateFormatted: String,
     val documentHasExpired: Boolean,
     val documentImage: String,
     val documentDetails: List<DocumentDetailsUi>,
     val userFullName: String? = null,
+    val documentId: DocumentId,
 )
 
 fun DocumentIdentifier.toUiName(resourceProvider: ResourceProvider): String {
@@ -46,7 +52,7 @@ fun DocumentIdentifier.toUiName(resourceProvider: ResourceProvider): String {
     }
 }
 
-fun IssuedDocument.toUiName(resourceProvider: ResourceProvider): String {
+fun Document.toUiName(resourceProvider: ResourceProvider): String {
     val docIdentifier = this.toDocumentIdentifier()
     return docIdentifier.toUiName(
         fallbackDocName = this.name,

diff --git a/.../eu/europa/ec/commonfeature/ui/document_details/transformer/DocumentDetailsTransformer.kt b/.../eu/europa/ec/commonfeature/ui/document_details/transformer/DocumentDetailsTransformer.kt
@@ -19,6 +19,7 @@ package eu.europa.ec.commonfeature.ui.document_details.transformer
 import eu.europa.ec.businesslogic.util.toDateFormatted
 import eu.europa.ec.businesslogic.util.toList
 import eu.europa.ec.commonfeature.model.DocumentUi
+import eu.europa.ec.commonfeature.model.DocumentUiIssuanceState
 import eu.europa.ec.commonfeature.model.toUiName
 import eu.europa.ec.commonfeature.ui.document_details.model.DocumentDetailsUi
 import eu.europa.ec.commonfeature.ui.document_details.model.DocumentJsonKeys
@@ -92,7 +93,8 @@ object DocumentDetailsTransformer {
             documentHasExpired = docHasExpired,
             documentImage = documentImage,
             documentDetails = detailsItems,
-            userFullName = extractFullNameFromDocumentOrEmpty(document)
+            userFullName = extractFullNameFromDocumentOrEmpty(document),
+            documentIssuanceState = DocumentUiIssuanceState.Issued,
         )
     }
 

diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/pin/PinViewModel.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/pin/PinViewModel.kt
@@ -366,7 +366,9 @@ class PinViewModel(
                 mapOf(
                     SuccessUIConfig.serializedKeyName to uiSerializer.toBase64(
                         SuccessUIConfig(
-                            header = resourceProvider.getString(R.string.quick_pin_success_title),
+                            headerConfig = SuccessUIConfig.HeaderConfig(
+                                title = resourceProvider.getString(R.string.quick_pin_success_title),
+                            ),
                             content = when (pinFlow) {
                                 PinFlow.CREATE -> resourceProvider.getString(R.string.quick_pin_create_success_subtitle)
                                 PinFlow.UPDATE -> resourceProvider.getString(R.string.quick_pin_change_success_subtitle)

diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/success/SuccessScreen.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/success/SuccessScreen.kt
@@ -33,6 +33,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
@@ -41,7 +42,9 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import eu.europa.ec.commonfeature.config.SuccessUIConfig
+import eu.europa.ec.resourceslogic.theme.values.ThemeColors
 import eu.europa.ec.resourceslogic.theme.values.success
+import eu.europa.ec.uilogic.component.AppIcons
 import eu.europa.ec.uilogic.component.content.ContentScreen
 import eu.europa.ec.uilogic.component.content.ContentTitle
 import eu.europa.ec.uilogic.component.content.ScreenNavigateAction
@@ -127,9 +130,9 @@ private fun SuccessScreenView(
     ) {
         Column(modifier = Modifier.fillMaxWidth()) {
             ContentTitle(
-                title = state.successConfig.header,
+                title = state.successConfig.headerConfig?.title,
                 titleStyle = MaterialTheme.typography.headlineSmall.copy(
-                    color = MaterialTheme.colorScheme.success
+                    color = state.successConfig.headerConfig?.color ?: Color.Unspecified
                 ),
                 subtitle = state.successConfig.content,
             )
@@ -156,8 +159,11 @@ private fun SuccessScreenView(
                 // Image
                 imageConfig.type == SuccessUIConfig.ImageConfig.Type.DRAWABLE && imageConfig.drawableRes != null -> {
                     Image(
+                        modifier = Modifier.fillMaxWidth(0.25f),
                         painter = painterResource(id = imageConfig.drawableRes),
-                        contentDescription = imageConfig.contentDescription
+                        contentDescription = imageConfig.contentDescription,
+                        colorFilter = ColorFilter.tint(imageConfig.tint),
+                        contentScale = ContentScale.FillWidth
                     )
                 }
             }
@@ -225,13 +231,15 @@ private fun ButtonRow(text: String) {
 
 @ThemeModePreviews
 @Composable
-private fun SuccessPreview() {
+private fun SuccessDefaultPreview() {
     PreviewTheme {
         SuccessScreenView(
             state = State(
                 successConfig = SuccessUIConfig(
-                    header = "Success",
-                    content = "",
+                    headerConfig = SuccessUIConfig.HeaderConfig(
+                        title = "Success",
+                    ),
+                    content = "Subtitle",
                     imageConfig = SuccessUIConfig.ImageConfig(
                         type = SuccessUIConfig.ImageConfig.Type.DEFAULT
                     ),
@@ -255,4 +263,44 @@ private fun SuccessPreview() {
             paddingValues = PaddingValues(16.dp)
         )
     }
+}
+
+@ThemeModePreviews
+@Composable
+private fun SuccessDrawablePreview() {
+    PreviewTheme {
+        SuccessScreenView(
+            state = State(
+                successConfig = SuccessUIConfig(
+                    headerConfig = SuccessUIConfig.HeaderConfig(
+                        title = "In Progress",
+                        color = ThemeColors.warning
+                    ),
+                    content = "Subtitle",
+                    imageConfig = SuccessUIConfig.ImageConfig(
+                        type = SuccessUIConfig.ImageConfig.Type.DRAWABLE,
+                        drawableRes = AppIcons.ClockTimer.resourceId,
+                        tint = ThemeColors.warning,
+                        contentDescription = "contentDescription"
+                    ),
+                    buttonConfig = listOf(
+                        SuccessUIConfig.ButtonConfig(
+                            text = "back",
+                            style = SuccessUIConfig.ButtonConfig.Style.PRIMARY,
+                            navigation = ConfigNavigation(
+                                navigationType = NavigationType.PopTo(StartupScreens.Splash),
+                            )
+                        )
+                    ),
+                    onBackScreenToNavigate = ConfigNavigation(
+                        navigationType = NavigationType.PopTo(StartupScreens.Splash),
+                    ),
+                )
+            ),
+            effectFlow = Channel<Effect>().receiveAsFlow(),
+            onEventSent = {},
+            onNavigationRequested = {},
+            paddingValues = PaddingValues(16.dp)
+        )
+    }
 }
diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/util/TestsData.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/util/TestsData.kt
@@ -19,6 +19,7 @@ package eu.europa.ec.commonfeature.util
 import androidx.annotation.VisibleForTesting
 import eu.europa.ec.commonfeature.model.DocumentOptionItemUi
 import eu.europa.ec.commonfeature.model.DocumentUi
+import eu.europa.ec.commonfeature.model.DocumentUiIssuanceState
 import eu.europa.ec.commonfeature.ui.document_details.model.DocumentDetailsUi
 import eu.europa.ec.commonfeature.ui.request.Event
 import eu.europa.ec.commonfeature.ui.request.model.DocumentItemDomainPayload
@@ -222,6 +223,7 @@ object TestsData {
         documentHasExpired = mockedDocumentHasExpired,
         documentImage = "",
         documentDetails = emptyList(),
+        documentIssuanceState = DocumentUiIssuanceState.Issued,
     )
 
     val mockedBasicPidUi = mockedFullPidUi.copy(
@@ -294,6 +296,7 @@ object TestsData {
         documentHasExpired = mockedDocumentHasExpired,
         documentImage = "",
         documentDetails = emptyList(),
+        documentIssuanceState = DocumentUiIssuanceState.Issued,
     )
 
     val mockedBasicMdlUi = mockedFullMdlUi.copy(