Merge pull request eu-digital-identity-wallet#444 from niscy-eudiw/main

feat: Update dependencies and add fixed color roles

Author: stzouvaras

gradle/libs.versions.toml

@@ -5,16 +5,16 @@ androidGradlePlugin = "8.13.0"
 androidxActivity = "1.11.0"
 androidxAppCompat = "1.7.1"
 androidxBrowser = "1.9.0"
-androidxComposeBom = "2025.09.00"
-androidxComposeRuntimeTracing = "1.9.1"
+androidxComposeBom = "2025.09.01"
+androidxComposeRuntimeTracing = "1.9.2"
 androidxCore = "1.17.0"
 androidxCoreSplashscreen = "1.0.1"
 androidxDataStore = "1.1.7"
 androidxEspresso = "3.7.0"
 androidxLifecycle = "2.9.4"
 androidxMacroBenchmark = "1.4.1"
-androidxMetrics = "1.0.0-beta04"
-androidxNavigation = "2.9.4"
+androidxMetrics = "1.0.0-rc01"
+androidxNavigation = "2.9.5"
 androidxProfileinstaller = "1.4.1"
 androidxTestCore = "1.7.0"
 androidxTestExt = "1.3.0"
@@ -23,8 +23,8 @@ androidxTestRunner = "1.7.0"
 androidxTestOrchestrator = "1.3.0"
 androidxTracing = "1.3.0"
 androidxUiAutomator = "2.3.0"
-androidxWindowManager = "1.4.0"
-androidxWork = "2.10.4"
+androidxWindowManager = "1.5.0"
+androidxWork = "2.10.5"
 androidxBiometric = "1.2.0-alpha05"
 androidxAppAuth = "1.0.0"
 coil = "3.3.0"
@@ -47,24 +47,24 @@ turbine = "1.2.1"
 koin = "4.1.1"
 koinAnnotations = "2.1.0"
 material = "1.13.0"
-mockito = "5.19.0"
-mockitoKotlin = "6.0.0"
+mockito = "5.20.0"
+mockitoKotlin = "6.1.0"
 ktor = "3.3.0"
 slf4j = "2.0.17"
 gson = "2.13.2"
-googlePhoneNumber = "9.0.14"
+googlePhoneNumber = "9.0.15"
 zxing = "3.5.3"
-eudiWalletCore = "0.20.0-SNAPSHOT"
+eudiWalletCore = "0.20.0"
 cameraCore = "1.5.0"
-owaspDependencyCheck = "12.1.3"
-material3 = "1.3.2"
+owaspDependencyCheck = "12.1.6"
+material3 = "1.4.0"
 kover = "0.9.2"
 sonar = "6.3.1.5724"
 baselineprofile = "1.4.1"
 timber = "5.0.1"
 treessence = "1.1.2"
 rqesUiSDK = "0.3.2"
-androidxRoom = "2.8.0"
+androidxRoom = "2.8.1"
 cloudy = "0.2.7"
 
 [libraries]

resources-logic/build.gradle.kts

@@ -31,6 +31,7 @@ moduleConfig {
 
 dependencies {
     api(libs.androidx.compose.material3)
+    api(libs.androidx.compose.material.iconsExtended)
     api(libs.androidx.compose.material3.windowSizeClass)
     api(libs.material)
 }

resources-logic/src/main/java/eu/europa/ec/resourceslogic/theme/templates/ThemeColorsTemplate.kt

@@ -60,6 +60,18 @@ data class ThemeColorsTemplate(
     val surfaceContainerHighest: Long,
     val surfaceContainerLow: Long,
     val surfaceContainerLowest: Long,
+    val primaryFixed: Long,
+    val primaryFixedDim: Long,
+    val onPrimaryFixed: Long,
+    val onPrimaryFixedVariant: Long,
+    val secondaryFixed: Long,
+    val secondaryFixedDim: Long,
+    val onSecondaryFixed: Long,
+    val onSecondaryFixedVariant: Long,
+    val tertiaryFixed: Long,
+    val tertiaryFixedDim: Long,
+    val onTertiaryFixed: Long,
+    val onTertiaryFixedVariant: Long
 ) {
     companion object {
         fun ThemeColorsTemplate.toColorScheme(): ColorScheme = ColorScheme(
@@ -98,7 +110,19 @@ data class ThemeColorsTemplate(
             surfaceContainerHigh = Color(surfaceContainerHigh),
             surfaceContainerHighest = Color(surfaceContainerHighest),
             surfaceContainerLow = Color(surfaceContainerLow),
-            surfaceContainerLowest = Color(surfaceContainerLowest)
+            surfaceContainerLowest = Color(surfaceContainerLowest),
+            primaryFixed = Color(primaryFixed),
+            primaryFixedDim = Color(primaryFixedDim),
+            onPrimaryFixed = Color(onPrimaryFixed),
+            onPrimaryFixedVariant = Color(onPrimaryFixedVariant),
+            secondaryFixed = Color(secondaryFixed),
+            secondaryFixedDim = Color(secondaryFixedDim),
+            onSecondaryFixed = Color(onSecondaryFixed),
+            onSecondaryFixedVariant = Color(onSecondaryFixedVariant),
+            tertiaryFixed = Color(tertiaryFixed),
+            tertiaryFixedDim = Color(tertiaryFixed),
+            onTertiaryFixed = Color(onTertiaryFixed),
+            onTertiaryFixedVariant = Color(onTertiaryFixedVariant)
         )
     }
 }

resources-logic/src/main/java/eu/europa/ec/resourceslogic/theme/values/ThemeColors.kt

@@ -72,6 +72,22 @@ class ThemeColors {
         private const val eudiw_theme_light_surfaceContainerHighest: Long = 0xFFE6E0E9
         private const val eudiw_theme_light_surfaceTint: Long = eudiw_theme_light_surface
 
+        // Light theme fixed accent roles (identical in dark as well).
+        private const val eudiw_theme_light_primaryFixed: Long = 0xFFD4DEF7
+        private const val eudiw_theme_light_primaryFixedDim: Long = 0xFFA8BEF0
+        private const val eudiw_theme_light_onPrimaryFixed: Long = 0xFF08122B
+        private const val eudiw_theme_light_onPrimaryFixedVariant: Long = 0xFF173782
+
+        private const val eudiw_theme_light_secondaryFixed: Long = 0xFFD3D6F8
+        private const val eudiw_theme_light_secondaryFixedDim: Long = 0xFFA6ADF2
+        private const val eudiw_theme_light_onSecondaryFixed: Long = 0xFF070A2C
+        private const val eudiw_theme_light_onSecondaryFixedVariant: Long = 0xFF141D85
+
+        private const val eudiw_theme_light_tertiaryFixed: Long = 0xFFE0EBE3
+        private const val eudiw_theme_light_tertiaryFixedDim: Long = 0xFFC0D8C7
+        private const val eudiw_theme_light_onTertiaryFixed: Long = 0xFF141F17
+        private const val eudiw_theme_light_onTertiaryFixedVariant: Long = 0xFF3B5E46
+
         // Light theme extra colors palette.
         internal const val eudiw_theme_light_success: Long = 0xFF55953B
         internal const val eudiw_theme_light_warning: Long = 0xFFF39626
@@ -116,6 +132,22 @@ class ThemeColors {
         private const val eudiw_theme_dark_surfaceContainerHighest: Long = 0xFF353535
         private const val eudiw_theme_dark_surfaceTint: Long = eudiw_theme_dark_surface
 
+        // NEW — Dark theme fixed accent roles (same values as light).
+        private const val eudiw_theme_dark_primaryFixed: Long = 0xFFD4DEF7
+        private const val eudiw_theme_dark_primaryFixedDim: Long = 0xFFA8BEF0
+        private const val eudiw_theme_dark_onPrimaryFixed: Long = 0xFF08122B
+        private const val eudiw_theme_dark_onPrimaryFixedVariant: Long = 0xFF173782
+
+        private const val eudiw_theme_dark_secondaryFixed: Long = 0xFFD3D6F8
+        private const val eudiw_theme_dark_secondaryFixedDim: Long = 0xFFA6ADF2
+        private const val eudiw_theme_dark_onSecondaryFixed: Long = 0xFF070A2C
+        private const val eudiw_theme_dark_onSecondaryFixedVariant: Long = 0xFF141D85
+
+        private const val eudiw_theme_dark_tertiaryFixed: Long = 0xFFE0EBE3
+        private const val eudiw_theme_dark_tertiaryFixedDim: Long = 0xFFC0D8C7
+        private const val eudiw_theme_dark_onTertiaryFixed: Long = 0xFF141F17
+        private const val eudiw_theme_dark_onTertiaryFixedVariant: Long = 0xFF3B5E46
+
         // Dark theme extra colors palette.
         internal const val eudiw_theme_dark_success: Long = 0xFF93D875
         internal const val eudiw_theme_dark_warning: Long = 0xFFFFB689
@@ -164,6 +196,18 @@ class ThemeColors {
             surfaceContainerHighest = eudiw_theme_light_surfaceContainerHighest,
             surfaceContainerLow = eudiw_theme_light_surfaceContainerLow,
             surfaceContainerLowest = eudiw_theme_light_surfaceContainerLowest,
+            primaryFixed = eudiw_theme_light_primaryFixed,
+            primaryFixedDim = eudiw_theme_light_primaryFixedDim,
+            onPrimaryFixed = eudiw_theme_light_onPrimaryFixed,
+            onPrimaryFixedVariant = eudiw_theme_light_onPrimaryFixedVariant,
+            secondaryFixed = eudiw_theme_light_secondaryFixed,
+            secondaryFixedDim = eudiw_theme_light_secondaryFixedDim,
+            onSecondaryFixed = eudiw_theme_light_onSecondaryFixed,
+            onSecondaryFixedVariant = eudiw_theme_light_onSecondaryFixedVariant,
+            tertiaryFixed = eudiw_theme_light_tertiaryFixed,
+            tertiaryFixedDim = eudiw_theme_light_tertiaryFixedDim,
+            onTertiaryFixed = eudiw_theme_light_onTertiaryFixed,
+            onTertiaryFixedVariant = eudiw_theme_light_onTertiaryFixedVariant,
         )
 
         internal val darkColors = ThemeColorsTemplate(
@@ -203,6 +247,18 @@ class ThemeColors {
             surfaceContainerHighest = eudiw_theme_dark_surfaceContainerHighest,
             surfaceContainerLow = eudiw_theme_dark_surfaceContainerLow,
             surfaceContainerLowest = eudiw_theme_dark_surfaceContainerLowest,
+            primaryFixed = eudiw_theme_dark_primaryFixed,
+            primaryFixedDim = eudiw_theme_dark_primaryFixedDim,
+            onPrimaryFixed = eudiw_theme_dark_onPrimaryFixed,
+            onPrimaryFixedVariant = eudiw_theme_dark_onPrimaryFixedVariant,
+            secondaryFixed = eudiw_theme_dark_secondaryFixed,
+            secondaryFixedDim = eudiw_theme_dark_secondaryFixedDim,
+            onSecondaryFixed = eudiw_theme_dark_onSecondaryFixed,
+            onSecondaryFixedVariant = eudiw_theme_dark_onSecondaryFixedVariant,
+            tertiaryFixed = eudiw_theme_dark_tertiaryFixed,
+            tertiaryFixedDim = eudiw_theme_dark_tertiaryFixedDim,
+            onTertiaryFixed = eudiw_theme_dark_onTertiaryFixed,
+            onTertiaryFixedVariant = eudiw_theme_dark_onTertiaryFixedVariant,
         )
 
         val primary: Color
@@ -275,4 +331,4 @@ val ColorScheme.divider: Color
         Color(ThemeColors.eudiw_theme_dark_divider)
     } else {
         Color(ThemeColors.eudiw_theme_light_divider)
-    }
+    }