Skip to content

Commit f902148

Browse files
authored
Merge pull request #33 from rawmain/minSDK_API29\
Fix: minSdk=29
2 parents bb49d69 + d16b1dd commit f902148

File tree

7 files changed

+27
-19
lines changed

7 files changed

+27
-19
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Whether you cloned or downloaded the 'zipped' sources you will either find the s
5050
In either case open a terminal pointing to the directory you put the sources in. The local build process is described [here](./docs/how_to_build.md) and the configuration options are described [here](./docs/configuration.md).
5151

5252
> [!NOTE]
53-
> The minimum device requirement for this application is Android API level 28.
53+
> The minimum device requirement for this application is Android API level 29.
5454
5555
### Testing
5656

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ internal fun Project.configureKotlinAndroid(
3737
compileSdk = 35
3838

3939
defaultConfig {
40-
minSdk = 31
40+
minSdk = 29
4141
}
4242

4343
buildFeatures {

gradle/libs.versions.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[versions]
22
accompanist = "0.36.0"
33
androidDesugarJdkLibs = "2.1.5"
4-
androidGradlePlugin = "8.10.1"
4+
androidGradlePlugin = "8.11.0"
55
androidxActivity = "1.10.1"
6-
androidxAppCompat = "1.7.0"
6+
androidxAppCompat = "1.7.1"
77
androidxBrowser = "1.8.0"
8-
androidxComposeBom = "2025.05.01"
8+
androidxComposeBom = "2025.06.01"
99
androidxComposeRuntimeTracing = "1.8.2"
1010
androidxCore = "1.16.0"
1111
androidxCoreSplashscreen = "1.0.1"
1212
androidxDataStore = "1.1.7"
1313
androidxEspresso = "3.6.1"
14-
androidxLifecycle = "2.9.0"
14+
androidxLifecycle = "2.9.1"
1515
androidxMacroBenchmark = "1.3.4"
1616
androidxMetrics = "1.0.0-beta02"
1717
androidxNavigation = "2.9.0"
@@ -31,21 +31,21 @@ coil = "3.2.0"
3131
constraintlayoutVersion = "1.1.1"
3232
gmsPlugin = "4.4.2"
3333
junit4 = "4.13.2"
34-
kotlin = "2.1.21"
34+
kotlin = "2.2.0"
3535
kotlinxCoroutines = "1.10.2"
3636
kotlinxDatetime = "0.6.2"
3737
kotlinxSerializationJson = "1.8.0"
38-
ksp = "2.1.21-2.0.1"
38+
ksp = "2.2.0-2.0.2"
3939
lint = "31.10.1"
4040
okhttp = "4.12.0"
4141
protobuf = "3.24.0"
4242
protobufPlugin = "0.9.4"
4343
retrofit = "3.0.0"
44-
robolectric = "4.14.1"
44+
robolectric = "4.15.1"
4545
secrets = "2.0.1"
46-
turbine = "1.2.0"
47-
koin = "4.0.4"
48-
koinAnnotations = "2.0.1-RC1"
46+
turbine = "1.2.1"
47+
koin = "4.1.0"
48+
koinAnnotations = "2.1.0"
4949
material = "1.12.0"
5050
mockito = "5.18.0"
5151
mockitoKotlin = "5.4.0"
@@ -56,14 +56,14 @@ googlePhoneNumber = "9.0.5"
5656
zxing = "3.5.3"
5757
eudiWalletCore = "0.18.0"
5858
cameraCore = "1.4.2"
59-
owaspDependencyCheck = "12.1.1"
59+
owaspDependencyCheck = "12.1.3"
6060
material3 = "1.3.2"
6161
kover = "0.9.1"
6262
sonar = "6.2.0.5505"
6363
baselineprofile = "1.3.4"
6464
timber = "5.0.1"
6565
treessence = "1.1.2"
66-
rqesUiSDK = "0.2.2"
66+
rqesUiSDK = "0.2.3"
6767
androidxRoom = "2.7.1"
6868

6969
[libraries]

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
#Sun Sep 17 23:01:33 EEST 2023
1818
distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
20-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
20+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
2121
zipStoreBase=GRADLE_USER_HOME
2222
zipStorePath=wrapper/dists

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
package eu.europa.ec.resourceslogic.theme
1717

1818
import android.app.Activity
19+
import android.os.Build
20+
import androidx.annotation.ChecksSdkIntAtLeast
1921
import androidx.compose.foundation.isSystemInDarkTheme
2022
import androidx.compose.material3.MaterialTheme
2123
import androidx.compose.material3.dynamicDarkColorScheme
@@ -45,6 +47,12 @@ class ThemeManager {
4547
lateinit var set: ThemeSet
4648
private set
4749

50+
/**
51+
* Defines if dynamic theming is supported. Notice that Dynamic color is available on Android 12+.
52+
*/
53+
@ChecksSdkIntAtLeast(api = Build.VERSION_CODES.S)
54+
val dynamicThemeSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
55+
4856
@Composable
4957
fun Theme(
5058
darkTheme: Boolean = isSystemInDarkTheme(),
@@ -56,7 +64,7 @@ class ThemeManager {
5664
val darkColorScheme = set.darkColors
5765

5866
val colorScheme = when {
59-
!disableDynamicTheming -> {
67+
!disableDynamicTheming && dynamicThemeSupported -> {
6068
when {
6169
darkTheme -> dynamicDarkColorScheme(LocalContext.current)
6270
else -> dynamicLightColorScheme(LocalContext.current)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import eu.europa.ec.resourceslogic.theme.templates.structures.ThemeFontStyle.Com
2222
import eu.europa.ec.resourceslogic.theme.templates.structures.ThemeFontWeight.Companion.toFontWeight
2323

2424
data class ThemeFont(
25-
@FontRes val res: Int,
25+
@param:FontRes val res: Int,
2626
val weight: ThemeFontWeight,
2727
val style: ThemeFontStyle
2828
) {

ui-logic/src/main/java/eu/europa/ec/uilogic/component/AppIcons.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ import eu.europa.ec.resourceslogic.R
3838
*/
3939
@Stable
4040
data class IconData(
41-
@DrawableRes val resourceId: Int?,
42-
@StringRes val contentDescriptionId: Int,
41+
@param:DrawableRes val resourceId: Int?,
42+
@param:StringRes val contentDescriptionId: Int,
4343
val imageVector: ImageVector? = null,
4444
) {
4545
init {

0 commit comments

Comments
 (0)