Merge pull request #264 from niscy-eudiw/feature/new_design_system

New UI/UX, Application Rework

Author: stzouvaras

Gemfile.lock

@@ -32,6 +32,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    csv (3.3.2)
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
@@ -110,7 +111,8 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.4.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-plugin-appcenter (2.1.2)
+    fastlane-plugin-appcenter (2.1.3)
+      csv
     fastlane-plugin-increment_version_code (0.4.3)
     fastlane-plugin-properties (1.1.2)
       java-properties

build-logic/convention/src/main/kotlin/project/convention/logic/AndroidCompose.kt

@@ -41,6 +41,7 @@ internal fun Project.configureAndroidCompose(
 
             add("implementation", libs.findLibrary("coil.kt").get())
             add("implementation", libs.findLibrary("coil.kt.compose").get())
+            add("implementation", libs.findLibrary("coil.kt.svg").get())
 
             add("implementation", libs.findLibrary("androidx-navigation-compose").get())
 

business-logic/src/main/java/eu/europa/ec/businesslogic/extension/StringExtensions.kt

@@ -85,4 +85,29 @@ fun String.splitToLines(lineLength: Int): String {
     }
 }
 
-fun String.firstPart(separator: String): String = this.split(separator).firstOrNull() ?: this
+fun String.firstPart(separator: String): String = this.split(separator).firstOrNull() ?: this
+
+/**
+ * Returns the current string if it is not `null`, empty, or blank.
+ * Otherwise, returns the specified default string.
+ *
+ * This function checks both nullability and blankness, meaning
+ * it treats strings containing only whitespace as invalid.
+ *
+ * @param default The string to return if the current string is `null`, empty, or blank.
+ * @return The current string if it is not `null`, empty, or blank; otherwise, the default string.
+ *
+ * Example usage:
+ * ```
+ * val str1: String? = null
+ * val str2: String? = "   "
+ * val str3: String? = "Hello, Kotlin!"
+ *
+ * println(str1.ifEmptyOrNull("Default")) // Output: Default
+ * println(str2.ifEmptyOrNull("Default")) // Output: Default
+ * println(str3.ifEmptyOrNull("Default")) // Output: Hello, Kotlin!
+ * ```
+ */
+fun String?.ifEmptyOrNull(default: String): String {
+    return if (this.isNullOrBlank()) default else this
+}

business-logic/src/main/java/eu/europa/ec/businesslogic/util/DateHelper.kt

@@ -18,7 +18,9 @@ package eu.europa.ec.businesslogic.util
 
 import java.text.DateFormat
 import java.text.SimpleDateFormat
+import java.time.Instant
 import java.time.LocalDate
+import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.Date
 import java.util.Locale
@@ -33,7 +35,7 @@ private val dtoDateFormatters = listOf(
 
 fun String.toDateFormatted(
     selectedLanguage: String = LocaleUtils.DEFAULT_LOCALE,
-    dateFormatStyle: Int = DateFormat.MEDIUM
+    dateFormatStyle: Int = DateFormat.MEDIUM,
 ): String? {
     var formattedDate: Date? = null
     val dateFormat = SimpleDateFormat.getDateInstance(
@@ -71,4 +73,13 @@ fun String.toLocalDate(
     }
 
     return result
+}
+
+fun Instant.formatInstant(
+    zoneId: ZoneId = ZoneId.systemDefault(),
+    locale: Locale = Locale.ENGLISH
+): String {
+    val formatter = DateTimeFormatter.ofPattern("dd MMM yyyy", locale)
+        .withZone(zoneId)
+    return formatter.format(this)
 }

common-feature/src/main/java/eu/europa/ec/commonfeature/config/BiometricUiConfig.kt

@@ -24,10 +24,22 @@ import eu.europa.ec.uilogic.serializer.UiSerializable
 import eu.europa.ec.uilogic.serializer.UiSerializableParser
 import eu.europa.ec.uilogic.serializer.adapter.SerializableTypeAdapter
 
+sealed interface BiometricMode {
+    data class Default(
+        val descriptionWhenBiometricsEnabled: String,
+        val descriptionWhenBiometricsNotEnabled: String,
+        val textAbovePin: String,
+    ) : BiometricMode
+
+    data class Login(
+        val title: String,
+        val subTitleWhenBiometricsEnabled: String,
+        val subTitleWhenBiometricsNotEnabled: String,
+    ) : BiometricMode
+}
+
 data class BiometricUiConfig(
-    val title: String,
-    val subTitle: String,
-    val quickPinOnlySubTitle: String,
+    val mode: BiometricMode,
     val isPreAuthorization: Boolean = false,
     val shouldInitializeBiometricAuthOnCreate: Boolean = true,
     val onSuccessNavigation: ConfigNavigation,
@@ -37,17 +49,23 @@ data class BiometricUiConfig(
     companion object Parser : UiSerializableParser {
         override val serializedKeyName = "biometricConfig"
         override fun provideParser(): Gson {
-            return GsonBuilder().registerTypeAdapter(
-                NavigationType::class.java,
-                SerializableTypeAdapter<NavigationType>()
-            ).create()
+            return GsonBuilder()
+                .registerTypeAdapter(
+                    NavigationType::class.java,
+                    SerializableTypeAdapter<NavigationType>()
+                )
+                .registerTypeAdapter(
+                    BiometricMode::class.java,
+                    SerializableTypeAdapter<BiometricMode>()
+                )
+                .create()
         }
     }
 }
 
 data class OnBackNavigationConfig(
     val onBackNavigation: ConfigNavigation?,
-    private val hasToolbarCancelIcon: Boolean
+    private val hasToolbarBackIcon: Boolean
 ) {
-    val isCancellable: Boolean get() = hasToolbarCancelIcon && onBackNavigation != null
+    val isBackable: Boolean get() = hasToolbarBackIcon && onBackNavigation != null
 }

common-feature/src/main/java/eu/europa/ec/commonfeature/config/IssuanceSuccessUiConfig.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023 European Commission
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European
+ * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work
+ * except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ * https://joinup.ec.europa.eu/software/page/eupl
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the Licence is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF
+ * ANY KIND, either express or implied. See the Licence for the specific language
+ * governing permissions and limitations under the Licence.
+ */
+
+package eu.europa.ec.commonfeature.config
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import eu.europa.ec.eudi.wallet.document.DocumentId
+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 IssuanceSuccessUiConfig(
+    val documentIds: List<DocumentId>,
+    val onSuccessNavigation: ConfigNavigation,
+) : UiSerializable {
+
+    companion object Parser : UiSerializableParser {
+        override val serializedKeyName = "issuanceSuccessConfig"
+        override fun provideParser(): Gson {
+            return GsonBuilder()
+                .registerTypeAdapter(
+                    NavigationType::class.java,
+                    SerializableTypeAdapter<NavigationType>()
+                ).create()
+        }
+    }
+}

common-feature/src/main/java/eu/europa/ec/commonfeature/config/OfferCodeUiConfig.kt

@@ -32,7 +32,7 @@ data class OfferCodeUiConfig(
 ) : UiSerializable {
 
     companion object Parser : UiSerializableParser {
-        override val serializedKeyName = "offerCodeUiConfig"
+        override val serializedKeyName = "offerCodeConfig"
         override fun provideParser(): Gson {
             return GsonBuilder().registerTypeAdapter(
                 NavigationType::class.java,

common-feature/src/main/java/eu/europa/ec/commonfeature/config/SuccessUIConfig.kt

@@ -16,33 +16,39 @@
 
 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.component.AppIconAndTextData
+import eu.europa.ec.uilogic.component.IconData
+import eu.europa.ec.uilogic.component.content.ContentHeaderConfig
+import eu.europa.ec.uilogic.component.utils.PERCENTAGE_60
 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 headerConfig: HeaderConfig?,
-    val content: String,
+    val textElementsConfig: TextElementsConfig,
+    val headerConfig: ContentHeaderConfig = ContentHeaderConfig(
+        appIconAndTextData = AppIconAndTextData(),
+        description = null,
+    ),
     val imageConfig: ImageConfig,
     val buttonConfig: List<ButtonConfig>,
     val onBackScreenToNavigate: ConfigNavigation
 ) : UiSerializable {
 
     data class ImageConfig(
-        val type: Type,
-        @DrawableRes val drawableRes: Int? = null,
-        val tint: Color = ThemeColors.success,
-        val contentDescription: String? = null
+        val type: Type = Type.Default,
+        val tint: Color? = ThemeColors.success,
+        val screenPercentageSize: Float = PERCENTAGE_60,
     ) {
-        enum class Type {
-            DRAWABLE, DEFAULT
+        sealed class Type {
+            data object Default : Type()
+            data class Drawable(val icon: IconData) : Type()
         }
     }
 
@@ -56,18 +62,25 @@ data class SuccessUIConfig(
         }
     }
 
-    data class HeaderConfig(
-        val title: String,
+    data class TextElementsConfig(
+        val text: String,
+        val description: String,
         val color: Color = ThemeColors.success
     )
 
     companion object Parser : UiSerializableParser {
         override val serializedKeyName = "successConfig"
         override fun provideParser(): Gson {
-            return GsonBuilder().registerTypeAdapter(
-                NavigationType::class.java,
-                SerializableTypeAdapter<NavigationType>()
-            ).create()
+            return GsonBuilder()
+                .registerTypeAdapter(
+                    NavigationType::class.java,
+                    SerializableTypeAdapter<NavigationType>()
+                )
+                .registerTypeAdapter(
+                    ImageConfig.Type::class.java,
+                    SerializableTypeAdapter<ImageConfig.Type>()
+                )
+                .create()
         }
     }
 }

common-feature/src/main/java/eu/europa/ec/commonfeature/model/AddDocumentUi.kt

@@ -16,11 +16,8 @@
 
 package eu.europa.ec.commonfeature.model
 
-import eu.europa.ec.uilogic.component.IconData
+import eu.europa.ec.uilogic.component.ListItemData
 
 data class DocumentOptionItemUi(
-    val configId: String,
-    val text: String,
-    val icon: IconData,
-    val available: Boolean,
+    val itemData: ListItemData,
 )

common-feature/src/main/java/eu/europa/ec/commonfeature/model/DocumentTypeUi.kt

@@ -16,12 +16,12 @@
 
 package eu.europa.ec.commonfeature.model
 
-import eu.europa.ec.commonfeature.ui.document_details.model.DocumentDetailsUi
 import eu.europa.ec.corelogic.model.DocumentIdentifier
 import eu.europa.ec.eudi.wallet.document.DocumentId
+import eu.europa.ec.uilogic.component.ListItemData
 
 enum class DocumentUiIssuanceState {
-    Issued, Pending, Failed
+    Issued, Pending, Failed, Expired
 }
 
 data class DocumentUi(
@@ -31,7 +31,7 @@ data class DocumentUi(
     val documentExpirationDateFormatted: String,
     val documentHasExpired: Boolean,
     val documentImage: String,
-    val documentDetails: List<DocumentDetailsUi>,
+    val documentDetails: List<ListItemData>,
     val userFullName: String? = null,
     val documentId: DocumentId,
 )