Skip to content

Commit 4f57386

Browse files
committed
feat: Update dependencies and add fixed color roles
This commit introduces several changes: - Adds new fixed accent color roles (primary, secondary, tertiary) to the theme for both light and dark modes. These colors are intended to look the same regardless of the selected theme. - Adds the `androidx.compose.material.iconsExtended` dependency. - Updates various AndroidX, testing, and other third-party library versions.
1 parent 5cd36fc commit 4f57386

File tree

4 files changed

+96
-15
lines changed

4 files changed

+96
-15
lines changed

gradle/libs.versions.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ androidGradlePlugin = "8.13.0"
55
androidxActivity = "1.11.0"
66
androidxAppCompat = "1.7.1"
77
androidxBrowser = "1.9.0"
8-
androidxComposeBom = "2025.09.00"
9-
androidxComposeRuntimeTracing = "1.9.1"
8+
androidxComposeBom = "2025.09.01"
9+
androidxComposeRuntimeTracing = "1.9.2"
1010
androidxCore = "1.17.0"
1111
androidxCoreSplashscreen = "1.0.1"
1212
androidxDataStore = "1.1.7"
1313
androidxEspresso = "3.7.0"
1414
androidxLifecycle = "2.9.4"
1515
androidxMacroBenchmark = "1.4.1"
16-
androidxMetrics = "1.0.0-beta04"
17-
androidxNavigation = "2.9.4"
16+
androidxMetrics = "1.0.0-rc01"
17+
androidxNavigation = "2.9.5"
1818
androidxProfileinstaller = "1.4.1"
1919
androidxTestCore = "1.7.0"
2020
androidxTestExt = "1.3.0"
@@ -23,8 +23,8 @@ androidxTestRunner = "1.7.0"
2323
androidxTestOrchestrator = "1.3.0"
2424
androidxTracing = "1.3.0"
2525
androidxUiAutomator = "2.3.0"
26-
androidxWindowManager = "1.4.0"
27-
androidxWork = "2.10.4"
26+
androidxWindowManager = "1.5.0"
27+
androidxWork = "2.10.5"
2828
androidxBiometric = "1.2.0-alpha05"
2929
androidxAppAuth = "1.0.0"
3030
coil = "3.3.0"
@@ -47,24 +47,24 @@ turbine = "1.2.1"
4747
koin = "4.1.1"
4848
koinAnnotations = "2.1.0"
4949
material = "1.13.0"
50-
mockito = "5.19.0"
51-
mockitoKotlin = "6.0.0"
50+
mockito = "5.20.0"
51+
mockitoKotlin = "6.1.0"
5252
ktor = "3.3.0"
5353
slf4j = "2.0.17"
5454
gson = "2.13.2"
55-
googlePhoneNumber = "9.0.14"
55+
googlePhoneNumber = "9.0.15"
5656
zxing = "3.5.3"
57-
eudiWalletCore = "0.20.0-SNAPSHOT"
57+
eudiWalletCore = "0.20.0"
5858
cameraCore = "1.5.0"
59-
owaspDependencyCheck = "12.1.3"
60-
material3 = "1.3.2"
59+
owaspDependencyCheck = "12.1.6"
60+
material3 = "1.4.0"
6161
kover = "0.9.2"
6262
sonar = "6.3.1.5724"
6363
baselineprofile = "1.4.1"
6464
timber = "5.0.1"
6565
treessence = "1.1.2"
6666
rqesUiSDK = "0.3.2"
67-
androidxRoom = "2.8.0"
67+
androidxRoom = "2.8.1"
6868
cloudy = "0.2.7"
6969

7070
[libraries]

resources-logic/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ moduleConfig {
3131

3232
dependencies {
3333
api(libs.androidx.compose.material3)
34+
api(libs.androidx.compose.material.iconsExtended)
3435
api(libs.androidx.compose.material3.windowSizeClass)
3536
api(libs.material)
3637
}

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

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,18 @@ data class ThemeColorsTemplate(
6060
val surfaceContainerHighest: Long,
6161
val surfaceContainerLow: Long,
6262
val surfaceContainerLowest: Long,
63+
val primaryFixed: Long,
64+
val primaryFixedDim: Long,
65+
val onPrimaryFixed: Long,
66+
val onPrimaryFixedVariant: Long,
67+
val secondaryFixed: Long,
68+
val secondaryFixedDim: Long,
69+
val onSecondaryFixed: Long,
70+
val onSecondaryFixedVariant: Long,
71+
val tertiaryFixed: Long,
72+
val tertiaryFixedDim: Long,
73+
val onTertiaryFixed: Long,
74+
val onTertiaryFixedVariant: Long
6375
) {
6476
companion object {
6577
fun ThemeColorsTemplate.toColorScheme(): ColorScheme = ColorScheme(
@@ -98,7 +110,19 @@ data class ThemeColorsTemplate(
98110
surfaceContainerHigh = Color(surfaceContainerHigh),
99111
surfaceContainerHighest = Color(surfaceContainerHighest),
100112
surfaceContainerLow = Color(surfaceContainerLow),
101-
surfaceContainerLowest = Color(surfaceContainerLowest)
113+
surfaceContainerLowest = Color(surfaceContainerLowest),
114+
primaryFixed = Color(primaryFixed),
115+
primaryFixedDim = Color(primaryFixedDim),
116+
onPrimaryFixed = Color(onPrimaryFixed),
117+
onPrimaryFixedVariant = Color(onPrimaryFixedVariant),
118+
secondaryFixed = Color(secondaryFixed),
119+
secondaryFixedDim = Color(secondaryFixedDim),
120+
onSecondaryFixed = Color(onSecondaryFixed),
121+
onSecondaryFixedVariant = Color(onSecondaryFixedVariant),
122+
tertiaryFixed = Color(tertiaryFixed),
123+
tertiaryFixedDim = Color(tertiaryFixed),
124+
onTertiaryFixed = Color(onTertiaryFixed),
125+
onTertiaryFixedVariant = Color(onTertiaryFixedVariant)
102126
)
103127
}
104128
}

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

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,22 @@ class ThemeColors {
7272
private const val eudiw_theme_light_surfaceContainerHighest: Long = 0xFFE6E0E9
7373
private const val eudiw_theme_light_surfaceTint: Long = eudiw_theme_light_surface
7474

75+
// Light theme fixed accent roles (identical in dark as well).
76+
private const val eudiw_theme_light_primaryFixed: Long = 0xFFD4DEF7
77+
private const val eudiw_theme_light_primaryFixedDim: Long = 0xFFA8BEF0
78+
private const val eudiw_theme_light_onPrimaryFixed: Long = 0xFF08122B
79+
private const val eudiw_theme_light_onPrimaryFixedVariant: Long = 0xFF173782
80+
81+
private const val eudiw_theme_light_secondaryFixed: Long = 0xFFD3D6F8
82+
private const val eudiw_theme_light_secondaryFixedDim: Long = 0xFFA6ADF2
83+
private const val eudiw_theme_light_onSecondaryFixed: Long = 0xFF070A2C
84+
private const val eudiw_theme_light_onSecondaryFixedVariant: Long = 0xFF141D85
85+
86+
private const val eudiw_theme_light_tertiaryFixed: Long = 0xFFE0EBE3
87+
private const val eudiw_theme_light_tertiaryFixedDim: Long = 0xFFC0D8C7
88+
private const val eudiw_theme_light_onTertiaryFixed: Long = 0xFF141F17
89+
private const val eudiw_theme_light_onTertiaryFixedVariant: Long = 0xFF3B5E46
90+
7591
// Light theme extra colors palette.
7692
internal const val eudiw_theme_light_success: Long = 0xFF55953B
7793
internal const val eudiw_theme_light_warning: Long = 0xFFF39626
@@ -116,6 +132,22 @@ class ThemeColors {
116132
private const val eudiw_theme_dark_surfaceContainerHighest: Long = 0xFF353535
117133
private const val eudiw_theme_dark_surfaceTint: Long = eudiw_theme_dark_surface
118134

135+
// NEW — Dark theme fixed accent roles (same values as light).
136+
private const val eudiw_theme_dark_primaryFixed: Long = 0xFFD4DEF7
137+
private const val eudiw_theme_dark_primaryFixedDim: Long = 0xFFA8BEF0
138+
private const val eudiw_theme_dark_onPrimaryFixed: Long = 0xFF08122B
139+
private const val eudiw_theme_dark_onPrimaryFixedVariant: Long = 0xFF173782
140+
141+
private const val eudiw_theme_dark_secondaryFixed: Long = 0xFFD3D6F8
142+
private const val eudiw_theme_dark_secondaryFixedDim: Long = 0xFFA6ADF2
143+
private const val eudiw_theme_dark_onSecondaryFixed: Long = 0xFF070A2C
144+
private const val eudiw_theme_dark_onSecondaryFixedVariant: Long = 0xFF141D85
145+
146+
private const val eudiw_theme_dark_tertiaryFixed: Long = 0xFFE0EBE3
147+
private const val eudiw_theme_dark_tertiaryFixedDim: Long = 0xFFC0D8C7
148+
private const val eudiw_theme_dark_onTertiaryFixed: Long = 0xFF141F17
149+
private const val eudiw_theme_dark_onTertiaryFixedVariant: Long = 0xFF3B5E46
150+
119151
// Dark theme extra colors palette.
120152
internal const val eudiw_theme_dark_success: Long = 0xFF93D875
121153
internal const val eudiw_theme_dark_warning: Long = 0xFFFFB689
@@ -164,6 +196,18 @@ class ThemeColors {
164196
surfaceContainerHighest = eudiw_theme_light_surfaceContainerHighest,
165197
surfaceContainerLow = eudiw_theme_light_surfaceContainerLow,
166198
surfaceContainerLowest = eudiw_theme_light_surfaceContainerLowest,
199+
primaryFixed = eudiw_theme_light_primaryFixed,
200+
primaryFixedDim = eudiw_theme_light_primaryFixedDim,
201+
onPrimaryFixed = eudiw_theme_light_onPrimaryFixed,
202+
onPrimaryFixedVariant = eudiw_theme_light_onPrimaryFixedVariant,
203+
secondaryFixed = eudiw_theme_light_secondaryFixed,
204+
secondaryFixedDim = eudiw_theme_light_secondaryFixedDim,
205+
onSecondaryFixed = eudiw_theme_light_onSecondaryFixed,
206+
onSecondaryFixedVariant = eudiw_theme_light_onSecondaryFixedVariant,
207+
tertiaryFixed = eudiw_theme_light_tertiaryFixed,
208+
tertiaryFixedDim = eudiw_theme_light_tertiaryFixedDim,
209+
onTertiaryFixed = eudiw_theme_light_onTertiaryFixed,
210+
onTertiaryFixedVariant = eudiw_theme_light_onTertiaryFixedVariant,
167211
)
168212

169213
internal val darkColors = ThemeColorsTemplate(
@@ -203,6 +247,18 @@ class ThemeColors {
203247
surfaceContainerHighest = eudiw_theme_dark_surfaceContainerHighest,
204248
surfaceContainerLow = eudiw_theme_dark_surfaceContainerLow,
205249
surfaceContainerLowest = eudiw_theme_dark_surfaceContainerLowest,
250+
primaryFixed = eudiw_theme_dark_primaryFixed,
251+
primaryFixedDim = eudiw_theme_dark_primaryFixedDim,
252+
onPrimaryFixed = eudiw_theme_dark_onPrimaryFixed,
253+
onPrimaryFixedVariant = eudiw_theme_dark_onPrimaryFixedVariant,
254+
secondaryFixed = eudiw_theme_dark_secondaryFixed,
255+
secondaryFixedDim = eudiw_theme_dark_secondaryFixedDim,
256+
onSecondaryFixed = eudiw_theme_dark_onSecondaryFixed,
257+
onSecondaryFixedVariant = eudiw_theme_dark_onSecondaryFixedVariant,
258+
tertiaryFixed = eudiw_theme_dark_tertiaryFixed,
259+
tertiaryFixedDim = eudiw_theme_dark_tertiaryFixedDim,
260+
onTertiaryFixed = eudiw_theme_dark_onTertiaryFixed,
261+
onTertiaryFixedVariant = eudiw_theme_dark_onTertiaryFixedVariant,
206262
)
207263

208264
val primary: Color
@@ -275,4 +331,4 @@ val ColorScheme.divider: Color
275331
Color(ThemeColors.eudiw_theme_dark_divider)
276332
} else {
277333
Color(ThemeColors.eudiw_theme_light_divider)
278-
}
334+
}

0 commit comments

Comments
 (0)