diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 85ef1daf0..bc658b127 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { sourceSets { androidMain.dependencies { implementation(project(":common")) - implementation("androidx.activity:activity-compose:1.8.2") + implementation("androidx.activity:activity-compose:1.9.3") } } } diff --git a/android/src/main/java/org/hisp/dhis/android/MainActivity.kt b/android/src/main/java/org/hisp/dhis/android/MainActivity.kt index 4e9416a17..787e94777 100644 --- a/android/src/main/java/org/hisp/dhis/android/MainActivity.kt +++ b/android/src/main/java/org/hisp/dhis/android/MainActivity.kt @@ -64,7 +64,6 @@ fun SetStatusBarColor() { WindowCompat.getInsetsController(it, it.decorView).apply { isAppearanceLightStatusBars = true } - it.statusBarColor = 0xFFE2F2FF.toInt() } } } diff --git a/build.gradle.kts b/build.gradle.kts index b34be8e40..9b1ac6c91 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + version = "0.4.1-SNAPSHOT" group = "org.hisp.dhis.mobile" @@ -8,7 +8,7 @@ plugins { id("com.android.application") apply false id("com.android.library") apply false id("org.jetbrains.compose") apply false - id("org.jlleitschuh.gradle.ktlint") version "11.5.1" + id("org.jlleitschuh.gradle.ktlint") version "12.1.2" id("org.jetbrains.dokka") version "1.9.20" id("io.github.gradle-nexus.publish-plugin") version "1.3.0" alias(libs.plugins.compose.compiler) @@ -33,8 +33,10 @@ allprojects { } } - tasks.withType().all { - kotlinOptions { freeCompilerArgs += "-Xexpect-actual-classes" } + tasks.withType>().all { + compilerOptions { + freeCompilerArgs.add("-Xexpect-actual-classes") + } } } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 1cd8290cc..eb7705a43 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -24,8 +24,8 @@ kotlin { implementation(kotlin("test")) } androidMain.dependencies { - api("androidx.appcompat:appcompat:1.6.1") - api("androidx.core:core-ktx:1.12.0") + api("androidx.appcompat:appcompat:1.7.0") + api("androidx.core:core-ktx:1.15.0") } val androidUnitTest by getting { dependencies { @@ -46,8 +46,8 @@ android { namespace = "org.hisp.dhis.mobile.ui.common" sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") - sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/resources") - sourceSets["main"].resources.srcDirs("src/commonMain/resources") + sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/composeResources") + sourceSets["main"].resources.srcDirs("src/commonMain/composeResources") defaultConfig { minSdk = (findProperty("android.minSdk") as String).toInt() diff --git a/designsystem/build.gradle.kts b/designsystem/build.gradle.kts index cae8c7f33..ca03df5c7 100644 --- a/designsystem/build.gradle.kts +++ b/designsystem/build.gradle.kts @@ -8,7 +8,7 @@ plugins { id("org.jetbrains.compose") id("com.android.library") id("convention.publication") - id("app.cash.paparazzi").version("1.3.3") + id("app.cash.paparazzi").version("1.3.5") alias(libs.plugins.compose.compiler) } @@ -34,9 +34,9 @@ kotlin { val androidMain by getting { dependencies { - api("androidx.activity:activity-compose:1.8.2") - api("androidx.appcompat:appcompat:1.6.1") - api("androidx.core:core-ktx:1.12.0") + api("androidx.activity:activity-compose:1.9.3") + api("androidx.appcompat:appcompat:1.7.0") + api("androidx.core:core-ktx:1.15.0") implementation("com.google.zxing:core:3.5.2") implementation("se.warting.signature:signature-pad:0.1.2") } @@ -69,8 +69,8 @@ android { namespace = "org.hisp.dhis.mobile.ui.designsystem" sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") - sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/resources") - sourceSets["main"].resources.srcDirs("src/commonMain/resources") + sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/composeResources") + sourceSets["main"].resources.srcDirs("src/commonMain/composeResources") defaultConfig { minSdk = (findProperty("android.minSdk") as String).toInt() diff --git a/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt b/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt deleted file mode 100644 index 3c3933e8c..000000000 --- a/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.hisp.dhis.mobile.ui.designsystem.resource - -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.text.font.Font -import androidx.compose.ui.text.font.FontFamily - -@Composable -actual fun provideFontResource(font: String): FontFamily { - val context = LocalContext.current - val name = font.substringBefore(".") - val fontRes = context.resources.getIdentifier(name, "font", context.packageName) - return FontFamily(Font(fontRes)) -} diff --git a/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt b/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt deleted file mode 100644 index f83a081af..000000000 --- a/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt +++ /dev/null @@ -1,28 +0,0 @@ -package org.hisp.dhis.mobile.ui.designsystem.resource - -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalContext - -@Composable -actual fun provideStringResource(id: String): String { - val context = LocalContext.current - val resourceId = context.resources.getIdentifier(id, "string", context.packageName) - if (resourceId == 0) return id - return context.getString(resourceId) -} - -@Composable -actual fun provideQuantityStringResource(id: String, quantity: Int): String { - val appendToId = when (quantity) { - 1 -> "one" - else -> "other" - } - return provideStringResource("${id}_$appendToId").format(quantity) -} - -@Composable -actual fun resourceExists(resourceName: String, resourceType: String): Boolean { - val context = LocalContext.current - val resourceId = context.resources.getIdentifier(resourceName, resourceType, context.packageName) - return resourceId != 0 -} diff --git a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ExpandableItemColumnSnapshotTest.kt b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ExpandableItemColumnSnapshotTest.kt index 6dab31887..b13a69868 100644 --- a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ExpandableItemColumnSnapshotTest.kt +++ b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ExpandableItemColumnSnapshotTest.kt @@ -6,8 +6,10 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Sync import androidx.compose.material.icons.outlined.SyncDisabled import androidx.compose.material3.Icon +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.platform.LocalInspectionMode import org.hisp.dhis.mobile.ui.designsystem.component.AdditionalInfoItem import org.hisp.dhis.mobile.ui.designsystem.component.Avatar import org.hisp.dhis.mobile.ui.designsystem.component.AvatarStyleData @@ -23,6 +25,9 @@ import org.hisp.dhis.mobile.ui.designsystem.component.state.rememberAdditionalIn import org.hisp.dhis.mobile.ui.designsystem.component.state.rememberListCardState import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.PreviewContextConfigurationEffect +import org.junit.Ignore import org.junit.Rule import org.junit.Test @@ -30,14 +35,25 @@ class ExpandableItemColumnSnapshotTest { @get:Rule val paparazzi = paparazzi() + @Ignore( + "This screen is performing layout calculations and does an 'animation effect'" + + "causing the screenshot to be taken before the final layout is displayed." + + "Paparazzi has an issue but as of version 1.3.5 it is not fixed." + + "https://github.com/cashapp/paparazzi/issues/1757", + ) + @OptIn(ExperimentalResourceApi::class) @Test fun launchAvatarTest() { paparazzi.snapshot { + CompositionLocalProvider(LocalInspectionMode provides true) { + PreviewContextConfigurationEffect() + } val items = listOf("Program number 1", "Program number 2") ExpandableItemColumn( modifier = Modifier.fillMaxSize().graphicsLayer { clip = false }, itemList = items, ) { item, verticalPadding, onSizeChanged -> + print("itemVerticalPadding: $verticalPadding") val index = items.indexOf(item) VerticalInfoListCard( listCardState = rememberListCardState( diff --git a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputAgeSnapshotTest.kt b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputAgeSnapshotTest.kt index c4b79d1ca..8a1870514 100644 --- a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputAgeSnapshotTest.kt +++ b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputAgeSnapshotTest.kt @@ -1,5 +1,7 @@ package org.hisp.dhis.mobile.ui.designsystem +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.platform.LocalInspectionMode import androidx.compose.ui.text.input.TextFieldValue import org.hisp.dhis.mobile.ui.designsystem.component.AgeInputType import org.hisp.dhis.mobile.ui.designsystem.component.ColumnScreenContainer @@ -9,6 +11,8 @@ import org.hisp.dhis.mobile.ui.designsystem.component.SubTitle import org.hisp.dhis.mobile.ui.designsystem.component.TimeUnitValues import org.hisp.dhis.mobile.ui.designsystem.component.state.InputAgeData import org.hisp.dhis.mobile.ui.designsystem.component.state.rememberInputAgeState +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.PreviewContextConfigurationEffect import org.junit.Rule import org.junit.Test @@ -17,9 +21,13 @@ class InputAgeSnapshotTest { @get:Rule val paparazzi = paparazzi() + @OptIn(ExperimentalResourceApi::class) @Test fun launchInputAgeSnapshot() { paparazzi.snapshot { + CompositionLocalProvider(LocalInspectionMode provides true) { + PreviewContextConfigurationEffect() + } ColumnScreenContainer { SubTitle("Input Age Component - Idle") InputAge( diff --git a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputDropDownSnapshotTest.kt b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputDropDownSnapshotTest.kt index 370446660..39856fe7b 100644 --- a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputDropDownSnapshotTest.kt +++ b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputDropDownSnapshotTest.kt @@ -2,6 +2,7 @@ package org.hisp.dhis.mobile.ui.designsystem import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.size +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -10,6 +11,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.platform.LocalInspectionMode import org.hisp.dhis.mobile.ui.designsystem.component.ColumnScreenContainer import org.hisp.dhis.mobile.ui.designsystem.component.DropdownItem import org.hisp.dhis.mobile.ui.designsystem.component.InputDropDown @@ -19,6 +21,8 @@ import org.hisp.dhis.mobile.ui.designsystem.component.SubTitle import org.hisp.dhis.mobile.ui.designsystem.component.Title import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.PreviewContextConfigurationEffect import org.junit.Rule import org.junit.Test @@ -27,9 +31,13 @@ class InputDropDownSnapshotTest { @get:Rule val paparazzi = paparazzi() + @OptIn(ExperimentalResourceApi::class) @Test fun launchInputDropDown() { paparazzi.snapshot { + CompositionLocalProvider(LocalInspectionMode provides true) { + PreviewContextConfigurationEffect() + } ColumnScreenContainer { val options = listOf( DropdownItem("Option 1"), diff --git a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputSequentialSnapshotTest.kt b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputSequentialSnapshotTest.kt index ec4c4e301..38ca725b9 100644 --- a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputSequentialSnapshotTest.kt +++ b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputSequentialSnapshotTest.kt @@ -2,17 +2,21 @@ package org.hisp.dhis.mobile.ui.designsystem import android.graphics.Bitmap import android.graphics.BitmapFactory +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.painter.BitmapPainter import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalInspectionMode import org.hisp.dhis.mobile.ui.designsystem.component.ColumnScreenContainer import org.hisp.dhis.mobile.ui.designsystem.component.ImageCardData import org.hisp.dhis.mobile.ui.designsystem.component.InputSequential import org.hisp.dhis.mobile.ui.designsystem.component.InputShellState import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.PreviewContextConfigurationEffect import org.junit.Rule import org.junit.Test @@ -21,9 +25,13 @@ class InputSequentialSnapshotTest { @get:Rule val paparazzi = paparazzi() + @OptIn(ExperimentalResourceApi::class) @Test fun launchMatrix() { paparazzi.snapshot { + CompositionLocalProvider(LocalInspectionMode provides true) { + PreviewContextConfigurationEffect() + } val res = LocalContext.current.resources val image = BitmapFactory.decodeResource( diff --git a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ListCardSelectableSnapshotTest.kt b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ListCardSelectableSnapshotTest.kt index ba0a5647a..fcf54a61b 100644 --- a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ListCardSelectableSnapshotTest.kt +++ b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ListCardSelectableSnapshotTest.kt @@ -6,7 +6,9 @@ import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Sync import androidx.compose.material3.Icon +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalInspectionMode import org.hisp.dhis.mobile.ui.designsystem.component.AdditionalInfoItem import org.hisp.dhis.mobile.ui.designsystem.component.Avatar import org.hisp.dhis.mobile.ui.designsystem.component.AvatarStyleData @@ -18,6 +20,8 @@ import org.hisp.dhis.mobile.ui.designsystem.component.state.rememberListCardStat import org.hisp.dhis.mobile.ui.designsystem.resource.provideDHIS2Icon import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.PreviewContextConfigurationEffect import org.junit.Rule import org.junit.Test @@ -26,9 +30,13 @@ class ListCardSelectableSnapshotTest { @get:Rule val paparazzi = paparazzi() + @OptIn(ExperimentalResourceApi::class) @Test fun launchListCard() { paparazzi.snapshot { + CompositionLocalProvider(LocalInspectionMode provides true) { + PreviewContextConfigurationEffect() + } Column( verticalArrangement = Arrangement.spacedBy(Spacing.Spacing4), modifier = Modifier.padding(horizontal = Spacing.Spacing8), diff --git a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/LocationBarSearchSnapshotTest.kt b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/LocationBarSearchSnapshotTest.kt index ccdb47055..09071bcf9 100644 --- a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/LocationBarSearchSnapshotTest.kt +++ b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/LocationBarSearchSnapshotTest.kt @@ -1,8 +1,12 @@ package org.hisp.dhis.mobile.ui.designsystem +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.platform.LocalInspectionMode import org.hisp.dhis.mobile.ui.designsystem.component.LocationBar import org.hisp.dhis.mobile.ui.designsystem.component.SearchBarMode import org.hisp.dhis.mobile.ui.designsystem.component.model.LocationItemModel +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.PreviewContextConfigurationEffect import org.junit.Rule import org.junit.Test @@ -10,9 +14,13 @@ class LocationBarSearchSnapshotTest { @get:Rule val paparazzi = paparazzi() + @OptIn(ExperimentalResourceApi::class) @Test fun launchSearchBarButtonTest() { paparazzi.snapshot { + CompositionLocalProvider(LocalInspectionMode provides true) { + PreviewContextConfigurationEffect() + } LocationBar( currentResults = listOf( LocationItemModel.StoredResult( diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_2g_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_2g_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_2g_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_2g_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_2g_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_2g_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_2g_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_2g_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_2g_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_2g_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_2g_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_2g_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_3g_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_3g_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_3g_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_3g_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_3g_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_3g_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_3g_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_3g_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_3g_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_3g_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_3g_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_3g_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_4x4_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_4x4_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_4x4_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_4x4_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_4x4_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_4x4_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_4x4_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_4x4_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_4x4_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_4x4_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_4x4_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_4x4_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_agriculture_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_agriculture_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_agriculture_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_agriculture_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_agriculture_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_agriculture_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_agriculture_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_agriculture_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_agriculture_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_agriculture_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_agriculture_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_agriculture_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_circle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_circle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_circle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_circle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_circle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_circle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_circle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_circle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_circle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_circle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_circle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_circle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_triangle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_triangle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_triangle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_triangle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_triangle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_triangle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_triangle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_triangle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_triangle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_triangle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_triangle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_triangle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ambulance_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ambulance_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ambulance_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ambulance_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ambulance_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ambulance_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ambulance_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ambulance_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ambulance_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ambulance_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ambulance_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ambulance_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ambulatory_clinic_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ambulatory_clinic_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ambulatory_clinic_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ambulatory_clinic_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ambulatory_clinic_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ambulatory_clinic_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ambulatory_clinic_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ambulatory_clinic_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ambulatory_clinic_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ambulatory_clinic_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ambulatory_clinic_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ambulatory_clinic_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ancv_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ancv_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ancv_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ancv_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ancv_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ancv_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ancv_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ancv_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ancv_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ancv_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ancv_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ancv_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0203m_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0203m_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0203m_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0203m_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0203m_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0203m_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0203m_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0203m_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0203m_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0203m_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0203m_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0203m_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0306m_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0306m_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0306m_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0306m_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0306m_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0306m_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0306m_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0306m_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0306m_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0306m_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0306m_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0306m_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0609m_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0609m_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0609m_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0609m_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0609m_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0609m_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0609m_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0609m_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0609m_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0609m_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0609m_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0609m_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0203m_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0203m_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0203m_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0203m_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0203m_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0203m_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0203m_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0203m_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0203m_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0203m_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0203m_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0203m_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0306m_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0306m_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0306m_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0306m_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0306m_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0306m_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0306m_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0306m_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0306m_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0306m_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0306m_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0306m_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0609m_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0609m_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0609m_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0609m_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0609m_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0609m_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0609m_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0609m_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0609m_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0609m_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0609m_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0609m_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_basic_motorcycle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_basic_motorcycle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_basic_motorcycle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_basic_motorcycle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_basic_motorcycle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_basic_motorcycle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_basic_motorcycle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_basic_motorcycle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_basic_motorcycle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_basic_motorcycle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_basic_motorcycle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_basic_motorcycle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_bike_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_bike_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_bike_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_bike_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_bike_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_bike_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_bike_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_bike_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_bike_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_bike_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_bike_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_bike_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_bills_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_bills_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_bills_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_bills_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_bills_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_bills_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_bills_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_bills_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_bills_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_bills_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_bills_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_bills_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x14_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x14_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x14_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x14_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x14_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x14_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x14_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x14_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x14_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x14_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x14_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x14_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x16_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x16_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x16_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x16_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x16_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x16_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x16_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x16_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x16_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x16_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x16_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x16_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x1_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x1_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x1_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x1_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x1_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x1_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x1_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x1_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x1_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x1_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x1_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x1_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x4_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x4_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x4_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x4_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x4_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x4_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x4_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x4_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x4_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x4_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x4_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x4_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x14_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x14_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x14_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x14_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x14_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x14_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x14_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x14_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x14_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x14_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x14_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x14_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x16_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x16_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x16_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x16_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x16_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x16_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x16_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x16_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x16_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x16_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x16_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x16_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x1_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x1_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x1_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x1_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x1_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x1_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x1_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x1_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x1_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x1_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x1_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x1_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x4_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x4_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x4_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x4_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x4_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x4_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x4_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x4_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x4_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x4_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x4_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x4_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_a_n_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_n_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_a_n_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_n_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_a_n_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_n_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_a_n_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_n_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_a_n_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_n_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_a_n_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_n_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_a_p_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_p_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_a_p_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_p_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_a_p_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_p_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_a_p_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_p_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_a_p_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_p_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_a_p_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_p_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_n_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_n_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_n_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_n_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_n_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_n_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_n_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_n_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_n_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_n_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_n_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_n_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_p_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_p_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_p_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_p_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_p_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_p_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_p_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_p_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_p_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_p_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_p_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_p_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_b_n_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_n_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_b_n_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_n_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_b_n_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_n_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_b_n_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_n_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_b_n_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_n_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_b_n_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_n_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_b_p_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_p_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_b_p_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_p_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_b_p_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_p_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_b_p_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_p_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_b_p_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_p_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_b_p_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_p_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_o_n_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_n_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_o_n_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_n_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_o_n_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_n_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_o_n_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_n_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_o_n_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_n_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_o_n_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_n_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_o_p_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_p_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_o_p_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_p_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_o_p_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_p_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_o_p_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_p_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_o_p_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_p_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_o_p_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_p_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_2_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_2_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_2_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_2_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_2_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_2_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_2_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_2_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_2_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_2_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_2_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_2_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_monitor_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_monitor_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_monitor_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_monitor_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_monitor_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_monitor_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_monitor_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_monitor_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_monitor_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_monitor_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_monitor_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_monitor_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_n_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_n_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_n_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_n_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_n_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_n_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_n_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_n_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_n_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_n_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_n_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_n_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_p_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_p_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_p_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_p_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_p_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_p_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_p_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_p_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_p_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_p_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_p_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_p_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_boy_0105y_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_boy_0105y_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_boy_0105y_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_boy_0105y_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_boy_0105y_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_boy_0105y_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_boy_0105y_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_boy_0105y_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_boy_0105y_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_boy_0105y_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_boy_0105y_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_boy_0105y_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_boy_1015y_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_boy_1015y_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_boy_1015y_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_boy_1015y_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_boy_1015y_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_boy_1015y_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_boy_1015y_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_boy_1015y_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_boy_1015y_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_boy_1015y_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_boy_1015y_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_boy_1015y_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_breeding_sites_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_breeding_sites_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_breeding_sites_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_breeding_sites_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_breeding_sites_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_breeding_sites_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_breeding_sites_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_breeding_sites_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_breeding_sites_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_breeding_sites_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_breeding_sites_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_breeding_sites_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_calendar_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_calendar_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_calendar_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_calendar_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_calendar_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_calendar_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_calendar_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_calendar_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_calendar_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_calendar_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_calendar_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_calendar_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_e_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_e_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_e_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_e_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_e_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_e_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_e_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_e_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_e_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_e_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_e_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_e_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cervical_cancer_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cervical_cancer_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cervical_cancer_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cervical_cancer_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cervical_cancer_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cervical_cancer_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cervical_cancer_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cervical_cancer_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cervical_cancer_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cervical_cancer_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cervical_cancer_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cervical_cancer_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_child_care_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_child_care_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_child_care_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_child_care_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_child_care_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_child_care_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_child_care_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_child_care_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_child_care_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_child_care_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_child_care_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_child_care_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_child_program_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_child_program_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_child_program_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_child_program_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_child_program_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_child_program_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_child_program_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_child_program_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_child_program_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_child_program_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_child_program_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_child_program_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_chills_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_chills_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_chills_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_chills_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_chills_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_chills_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_chills_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_chills_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_chills_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_chills_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_chills_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_chills_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cholera_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cholera_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cholera_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cholera_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cholera_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cholera_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cholera_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cholera_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cholera_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cholera_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cholera_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cholera_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_church_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_church_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_church_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_church_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_church_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_church_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_church_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_church_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_church_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_church_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_church_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_church_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_large_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_large_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_large_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_large_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_large_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_large_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_large_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_large_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_large_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_large_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_large_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_large_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_medium_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_medium_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_medium_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_medium_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_medium_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_medium_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_medium_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_medium_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_medium_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_medium_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_medium_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_medium_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_small_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_small_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_small_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_small_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_small_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_small_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_small_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_small_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_small_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_small_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_small_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_small_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_city_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_city_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_city_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_city_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_city_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_city_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_city_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_city_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_city_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_city_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_city_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_city_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_city_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_city_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_city_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_city_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_city_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_city_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_city_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_city_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_city_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_city_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_city_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_city_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clean_hands_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clean_hands_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clean_hands_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clean_hands_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clean_hands_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clean_hands_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clean_hands_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clean_hands_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clean_hands_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clean_hands_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clean_hands_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clean_hands_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_a_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_a_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_a_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_a_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_a_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_a_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_a_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_a_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_a_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_a_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_a_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_a_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_f_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_f_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_f_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_f_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_f_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_f_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_f_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_f_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_f_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_f_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_f_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_f_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_fe_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_fe_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_fe_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_fe_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_fe_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_fe_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_fe_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_fe_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_fe_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_fe_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_fe_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_fe_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_coins_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_coins_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_coins_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_coins_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_coins_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_coins_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_coins_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_coins_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_coins_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_coins_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_coins_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_coins_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cold_chain_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cold_chain_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cold_chain_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cold_chain_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cold_chain_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cold_chain_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cold_chain_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cold_chain_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cold_chain_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cold_chain_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cold_chain_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cold_chain_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_communication_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_communication_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_communication_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_communication_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_communication_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_communication_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_communication_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_communication_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_communication_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_communication_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_communication_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_communication_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_nets_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_nets_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_nets_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_nets_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_nets_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_nets_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_nets_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_nets_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_nets_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_nets_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_nets_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_nets_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_walls_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_walls_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_walls_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_walls_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_walls_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_walls_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_walls_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_walls_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_walls_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_walls_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_walls_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_walls_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_construction_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_construction_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_construction_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_construction_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_construction_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_construction_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_construction_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_construction_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_construction_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_construction_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_construction_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_construction_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_construction_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_construction_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_construction_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_construction_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_construction_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_construction_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_construction_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_construction_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_construction_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_construction_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_construction_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_construction_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contact_support_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contact_support_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contact_support_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contact_support_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contact_support_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contact_support_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contact_support_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contact_support_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contact_support_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contact_support_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contact_support_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contact_support_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_diaphragm_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_diaphragm_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_diaphragm_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_diaphragm_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_diaphragm_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_diaphragm_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_diaphragm_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_diaphragm_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_diaphragm_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_diaphragm_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_diaphragm_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_diaphragm_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_injection_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_injection_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_injection_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_injection_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_injection_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_injection_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_injection_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_injection_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_injection_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_injection_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_injection_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_injection_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_patch_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_patch_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_patch_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_patch_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_patch_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_patch_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_patch_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_patch_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_patch_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_patch_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_patch_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_patch_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_voucher_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_voucher_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_voucher_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_voucher_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_voucher_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_voucher_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_voucher_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_voucher_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_voucher_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_voucher_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_voucher_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_voucher_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_copper_iud_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_copper_iud_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_copper_iud_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_copper_iud_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_copper_iud_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_copper_iud_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_copper_iud_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_copper_iud_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_copper_iud_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_copper_iud_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_copper_iud_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_copper_iud_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_coughing_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_coughing_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_coughing_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_coughing_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_coughing_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_coughing_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_coughing_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_coughing_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_coughing_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_coughing_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_coughing_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_coughing_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_credit_card_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_credit_card_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_credit_card_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_credit_card_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_credit_card_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_credit_card_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_credit_card_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_credit_card_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_credit_card_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_credit_card_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_credit_card_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_credit_card_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cross_country_motorcycle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cross_country_motorcycle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cross_country_motorcycle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cross_country_motorcycle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cross_country_motorcycle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cross_country_motorcycle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cross_country_motorcycle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cross_country_motorcycle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cross_country_motorcycle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cross_country_motorcycle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cross_country_motorcycle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cross_country_motorcycle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_default_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_default_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_default_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_default_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_default_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_default_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_default_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_default_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_default_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_default_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_default_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_default_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_dhis2_logo_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_dhis2_logo_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_dhis2_logo_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_dhis2_logo_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_dhis2_logo_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_dhis2_logo_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_dhis2_logo_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_dhis2_logo_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_dhis2_logo_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_dhis2_logo_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_dhis2_logo_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_dhis2_logo_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_diarrhea_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_diarrhea_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_diarrhea_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_diarrhea_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_diarrhea_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_diarrhea_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_diarrhea_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_diarrhea_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_diarrhea_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_diarrhea_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_diarrhea_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_diarrhea_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_discriminating_concentration_bioassays_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_discriminating_concentration_bioassays_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_discriminating_concentration_bioassays_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_discriminating_concentration_bioassays_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_discriminating_concentration_bioassays_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_discriminating_concentration_bioassays_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_discriminating_concentration_bioassays_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_discriminating_concentration_bioassays_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_discriminating_concentration_bioassays_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_discriminating_concentration_bioassays_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_discriminating_concentration_bioassays_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_discriminating_concentration_bioassays_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_doctor_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_doctor_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_doctor_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_doctor_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_doctor_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_doctor_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_doctor_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_doctor_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_doctor_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_doctor_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_doctor_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_doctor_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_domestic_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_domestic_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_domestic_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_domestic_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_domestic_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_domestic_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_domestic_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_domestic_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_domestic_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_domestic_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_domestic_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_domestic_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_donkey_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_donkey_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_donkey_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_donkey_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_donkey_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_donkey_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_donkey_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_donkey_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_donkey_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_donkey_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_donkey_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_donkey_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_drone_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_drone_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_drone_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_drone_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_drone_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_drone_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_drone_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_drone_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_drone_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_drone_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_drone_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_drone_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_eco_care_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_eco_care_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_eco_care_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_eco_care_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_eco_care_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_eco_care_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_eco_care_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_eco_care_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_eco_care_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_eco_care_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_eco_care_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_eco_care_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_elderly_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_elderly_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_elderly_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_elderly_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_elderly_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_elderly_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_elderly_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_elderly_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_elderly_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_elderly_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_elderly_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_elderly_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_electricity_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_electricity_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_electricity_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_electricity_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_electricity_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_electricity_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_electricity_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_electricity_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_electricity_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_electricity_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_electricity_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_electricity_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_emergency_post_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_emergency_post_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_emergency_post_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_emergency_post_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_emergency_post_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_emergency_post_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_emergency_post_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_emergency_post_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_emergency_post_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_emergency_post_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_emergency_post_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_emergency_post_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_expectorate_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_expectorate_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_expectorate_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_expectorate_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_expectorate_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_expectorate_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_expectorate_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_expectorate_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_expectorate_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_expectorate_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_expectorate_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_expectorate_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_factory_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_factory_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_factory_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_factory_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_factory_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_factory_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_factory_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_factory_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_factory_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_factory_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_factory_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_factory_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_family_planning_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_family_planning_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_family_planning_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_family_planning_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_family_planning_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_family_planning_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_family_planning_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_family_planning_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_family_planning_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_family_planning_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_family_planning_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_family_planning_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_and_male_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_and_male_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_and_male_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_and_male_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_and_male_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_and_male_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_and_male_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_and_male_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_and_male_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_and_male_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_and_male_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_and_male_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_condom_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_condom_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_condom_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_condom_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_condom_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_condom_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_condom_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_condom_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_condom_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_condom_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_condom_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_condom_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_sex_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_sex_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_sex_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_sex_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_sex_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_sex_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_sex_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_sex_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_sex_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_sex_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_sex_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_sex_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fetus_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fetus_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fetus_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fetus_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fetus_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fetus_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fetus_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fetus_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fetus_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fetus_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fetus_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fetus_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_2_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_2_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_2_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_2_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_2_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_2_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_2_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_2_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_2_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_2_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_2_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_2_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_chills_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_chills_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_chills_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_chills_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_chills_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_chills_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_chills_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_chills_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_chills_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_chills_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_chills_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_chills_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forest_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forest_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forest_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forest_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forest_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forest_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forest_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forest_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forest_persons_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forest_persons_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forest_persons_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forest_persons_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forest_persons_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forest_persons_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forest_persons_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forest_persons_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forest_persons_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forest_persons_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forest_persons_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forest_persons_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forest_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forest_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forest_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forest_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forum_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forum_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forum_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forum_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forum_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forum_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forum_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forum_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forum_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forum_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forum_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forum_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_girl_0105y_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_girl_0105y_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_girl_0105y_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_girl_0105y_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_girl_0105y_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_girl_0105y_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_girl_0105y_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_girl_0105y_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_girl_0105y_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_girl_0105y_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_girl_0105y_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_girl_0105y_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_girl_1015y_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_girl_1015y_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_girl_1015y_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_girl_1015y_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_girl_1015y_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_girl_1015y_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_girl_1015y_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_girl_1015y_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_girl_1015y_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_girl_1015y_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_girl_1015y_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_girl_1015y_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meeting_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meeting_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meeting_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meeting_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meeting_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meeting_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meeting_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meeting_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meeting_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meeting_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meeting_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meeting_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meetingx3_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meetingx3_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meetingx3_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meetingx3_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meetingx3_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meetingx3_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meetingx3_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meetingx3_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meetingx3_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meetingx3_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meetingx3_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meetingx3_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_happy_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_happy_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_happy_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_happy_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_happy_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_happy_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_happy_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_happy_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_happy_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_happy_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_happy_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_happy_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hazardous_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hazardous_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hazardous_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hazardous_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hazardous_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hazardous_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hazardous_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hazardous_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hazardous_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hazardous_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hazardous_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hazardous_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_headache_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_headache_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_headache_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_headache_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_headache_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_headache_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_headache_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_headache_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_headache_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_headache_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_headache_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_headache_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_health_worker_form_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_form_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_health_worker_form_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_form_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_health_worker_form_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_form_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_health_worker_form_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_form_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_health_worker_form_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_form_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_health_worker_form_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_form_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_health_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_health_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_health_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_health_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_health_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_health_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_heart_cardiogram_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_heart_cardiogram_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_heart_cardiogram_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_heart_cardiogram_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_heart_cardiogram_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_heart_cardiogram_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_heart_cardiogram_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_heart_cardiogram_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_heart_cardiogram_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_heart_cardiogram_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_heart_cardiogram_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_heart_cardiogram_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_heart_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_heart_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_heart_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_heart_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_heart_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_heart_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_heart_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_heart_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_heart_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_heart_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_heart_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_heart_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_helicopter_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_helicopter_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_helicopter_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_helicopter_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_helicopter_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_helicopter_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_helicopter_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_helicopter_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_helicopter_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_helicopter_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_helicopter_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_helicopter_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_high_bars_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_high_bars_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_high_bars_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_high_bars_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_high_bars_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_high_bars_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_high_bars_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_high_bars_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_high_bars_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_high_bars_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_high_bars_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_high_bars_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_high_level_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_high_level_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_high_level_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_high_level_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_high_level_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_high_level_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_high_level_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_high_level_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_high_level_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_high_level_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_high_level_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_high_level_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_ind_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_ind_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_ind_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_ind_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_ind_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_ind_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_ind_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_ind_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_ind_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_ind_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_ind_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_ind_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_neg_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_neg_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_neg_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_neg_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_neg_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_neg_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_neg_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_neg_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_neg_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_neg_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_neg_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_neg_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_pos_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_pos_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_pos_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_pos_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_pos_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_pos_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_pos_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_pos_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_pos_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_pos_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_pos_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_pos_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_self_test_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_self_test_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_self_test_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_self_test_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_self_test_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_self_test_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_self_test_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_self_test_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_self_test_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_self_test_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_self_test_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_self_test_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_home_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_home_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_home_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_home_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_home_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_home_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_home_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_home_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_home_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_home_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_home_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_home_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hormonal_ring_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hormonal_ring_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hormonal_ring_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hormonal_ring_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hormonal_ring_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hormonal_ring_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hormonal_ring_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hormonal_ring_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hormonal_ring_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hormonal_ring_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hormonal_ring_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hormonal_ring_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hospital_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hospital_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hospital_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hospital_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hospital_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hospital_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hospital_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hospital_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hospital_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hospital_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hospital_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hospital_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hospitalized_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hospitalized_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hospitalized_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hospitalized_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hospitalized_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hospitalized_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hospitalized_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hospitalized_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hospitalized_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hospitalized_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hospitalized_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hospitalized_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hot_meal_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hot_meal_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hot_meal_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hot_meal_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hot_meal_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hot_meal_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hot_meal_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hot_meal_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hot_meal_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hot_meal_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hot_meal_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hot_meal_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hpv_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hpv_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hpv_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hpv_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hpv_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hpv_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hpv_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hpv_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hpv_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hpv_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hpv_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hpv_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_certificate_paper_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_certificate_paper_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_certificate_paper_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_certificate_paper_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_certificate_paper_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_certificate_paper_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_certificate_paper_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_certificate_paper_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_certificate_paper_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_certificate_paper_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_certificate_paper_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_certificate_paper_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_documents_accepted_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_accepted_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_documents_accepted_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_accepted_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_documents_accepted_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_accepted_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_documents_accepted_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_accepted_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_documents_accepted_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_accepted_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_documents_accepted_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_accepted_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_documents_denied_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_denied_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_documents_denied_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_denied_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_documents_denied_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_denied_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_documents_denied_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_denied_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_documents_denied_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_denied_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_documents_denied_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_denied_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_exam_multiple_choice_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_multiple_choice_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_exam_multiple_choice_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_multiple_choice_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_exam_multiple_choice_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_multiple_choice_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_exam_multiple_choice_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_multiple_choice_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_exam_multiple_choice_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_multiple_choice_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_exam_multiple_choice_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_multiple_choice_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_exam_qualification_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_qualification_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_exam_qualification_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_qualification_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_exam_qualification_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_qualification_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_exam_qualification_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_qualification_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_exam_qualification_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_qualification_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_exam_qualification_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_qualification_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_groups_perspective_crowd_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_groups_perspective_crowd_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_groups_perspective_crowd_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_groups_perspective_crowd_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_groups_perspective_crowd_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_groups_perspective_crowd_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_groups_perspective_crowd_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_groups_perspective_crowd_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_groups_perspective_crowd_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_groups_perspective_crowd_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_groups_perspective_crowd_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_groups_perspective_crowd_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_note_action_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_note_action_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_note_action_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_note_action_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_note_action_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_note_action_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_note_action_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_note_action_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_note_action_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_note_action_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_note_action_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_note_action_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_schedule_school_date_time_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_schedule_school_date_time_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_schedule_school_date_time_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_schedule_school_date_time_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_schedule_school_date_time_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_schedule_school_date_time_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_schedule_school_date_time_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_schedule_school_date_time_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_schedule_school_date_time_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_schedule_school_date_time_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_schedule_school_date_time_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_schedule_school_date_time_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_training_class_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_training_class_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_training_class_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_training_class_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_training_class_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_training_class_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_training_class_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_training_class_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_training_class_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_training_class_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_training_class_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_training_class_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_utensils_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_utensils_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_utensils_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_utensils_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_utensils_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_utensils_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_utensils_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_utensils_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_utensils_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_utensils_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_utensils_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_utensils_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_image_not_supported.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_image_not_supported.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_image_not_supported.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_image_not_supported.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_imm_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_imm_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_imm_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_imm_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_imm_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_imm_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_imm_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_imm_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_imm_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_imm_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_imm_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_imm_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_implant_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_implant_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_implant_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_implant_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_implant_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_implant_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_implant_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_implant_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_implant_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_implant_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_implant_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_implant_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_info_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_info_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_info_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_info_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_info_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_info_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_info_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_info_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_info_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_info_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_info_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_info_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_information_campaign_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_information_campaign_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_information_campaign_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_information_campaign_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_information_campaign_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_information_campaign_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_information_campaign_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_information_campaign_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_information_campaign_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_information_campaign_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_information_campaign_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_information_campaign_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_inpatient_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_inpatient_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_inpatient_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_inpatient_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_inpatient_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_inpatient_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_inpatient_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_inpatient_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_inpatient_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_inpatient_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_inpatient_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_inpatient_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_insecticide_resistance_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_insecticide_resistance_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_insecticide_resistance_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_insecticide_resistance_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_insecticide_resistance_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_insecticide_resistance_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_insecticide_resistance_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_insecticide_resistance_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_insecticide_resistance_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_insecticide_resistance_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_insecticide_resistance_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_insecticide_resistance_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_intensity_concentration_bioassays_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_intensity_concentration_bioassays_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_intensity_concentration_bioassays_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_intensity_concentration_bioassays_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_intensity_concentration_bioassays_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_intensity_concentration_bioassays_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_intensity_concentration_bioassays_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_intensity_concentration_bioassays_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_intensity_concentration_bioassays_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_intensity_concentration_bioassays_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_intensity_concentration_bioassays_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_intensity_concentration_bioassays_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_iud_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_iud_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_iud_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_iud_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_iud_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_iud_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_iud_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_iud_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_iud_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_iud_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_iud_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_iud_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_justice_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_justice_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_justice_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_justice_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_justice_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_justice_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_justice_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_justice_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_justice_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_justice_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_justice_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_justice_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_lactation_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_lactation_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_lactation_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_lactation_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_lactation_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_lactation_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_lactation_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_lactation_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_lactation_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_lactation_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_lactation_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_lactation_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_letrina_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_letrina_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_letrina_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_letrina_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_letrina_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_letrina_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_letrina_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_letrina_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_letrina_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_letrina_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_letrina_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_letrina_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_llin_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_llin_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_llin_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_llin_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_llin_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_llin_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_llin_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_llin_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_llin_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_llin_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_llin_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_llin_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_low_bars_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_low_bars_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_low_bars_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_low_bars_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_low_bars_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_low_bars_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_low_bars_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_low_bars_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_low_bars_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_low_bars_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_low_bars_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_low_bars_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_low_level_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_low_level_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_low_level_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_low_level_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_low_level_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_low_level_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_low_level_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_low_level_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_low_level_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_low_level_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_low_level_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_low_level_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_machinery_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_machinery_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_machinery_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_machinery_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_machinery_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_machinery_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_machinery_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_machinery_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_machinery_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_machinery_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_machinery_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_machinery_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_magnifying_glass_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_magnifying_glass_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_magnifying_glass_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_magnifying_glass_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_magnifying_glass_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_magnifying_glass_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_magnifying_glass_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_magnifying_glass_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_magnifying_glass_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_magnifying_glass_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_magnifying_glass_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_magnifying_glass_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_mixed_microscope_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_mixed_microscope_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_mixed_microscope_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_mixed_microscope_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_mixed_microscope_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_mixed_microscope_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_mixed_microscope_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_mixed_microscope_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_mixed_microscope_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_mixed_microscope_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_mixed_microscope_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_mixed_microscope_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_negative_microscope_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_negative_microscope_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_negative_microscope_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_negative_microscope_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_negative_microscope_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_negative_microscope_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_negative_microscope_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_negative_microscope_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_negative_microscope_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_negative_microscope_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_negative_microscope_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_negative_microscope_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_outbreak_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_outbreak_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_outbreak_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_outbreak_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_outbreak_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_outbreak_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_outbreak_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_outbreak_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_outbreak_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_outbreak_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_outbreak_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_outbreak_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_pf_microscope_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pf_microscope_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_pf_microscope_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pf_microscope_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_pf_microscope_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pf_microscope_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_pf_microscope_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pf_microscope_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_pf_microscope_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pf_microscope_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_pf_microscope_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pf_microscope_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_pv_microscope_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pv_microscope_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_pv_microscope_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pv_microscope_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_pv_microscope_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pv_microscope_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_pv_microscope_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pv_microscope_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_pv_microscope_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pv_microscope_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_pv_microscope_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pv_microscope_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_testing_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_testing_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_testing_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_testing_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_testing_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_testing_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_testing_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_testing_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_testing_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_testing_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_testing_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_testing_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_and_female_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_and_female_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_and_female_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_and_female_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_and_female_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_and_female_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_and_female_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_and_female_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_and_female_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_and_female_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_and_female_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_and_female_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_condom_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_condom_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_condom_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_condom_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_condom_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_condom_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_condom_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_condom_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_condom_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_condom_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_condom_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_condom_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_sex_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_sex_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_sex_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_sex_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_sex_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_sex_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_sex_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_sex_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_sex_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_sex_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_sex_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_sex_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_man_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_man_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_man_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_man_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_man_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_man_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_man_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_man_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_man_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_man_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_man_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_man_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_market_stall_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_market_stall_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_market_stall_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_market_stall_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_market_stall_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_market_stall_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_market_stall_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_market_stall_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_market_stall_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_market_stall_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_market_stall_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_market_stall_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mask_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mask_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mask_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mask_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mask_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mask_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mask_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mask_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mask_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mask_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mask_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mask_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_measles_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_measles_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_measles_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_measles_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_measles_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_measles_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_measles_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_measles_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_measles_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_measles_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_measles_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_measles_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medicines_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medicines_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medicines_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medicines_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medicines_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medicines_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medicines_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medicines_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medicines_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medicines_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medicines_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medicines_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medium_bars_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medium_bars_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medium_bars_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medium_bars_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medium_bars_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medium_bars_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medium_bars_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medium_bars_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medium_bars_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medium_bars_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medium_bars_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medium_bars_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medium_level_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medium_level_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medium_level_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medium_level_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medium_level_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medium_level_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medium_level_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medium_level_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medium_level_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medium_level_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medium_level_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medium_level_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_megaphone_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_megaphone_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_megaphone_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_megaphone_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_megaphone_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_megaphone_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_megaphone_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_megaphone_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_megaphone_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_megaphone_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_megaphone_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_megaphone_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mental_disorders_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mental_disorders_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mental_disorders_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mental_disorders_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mental_disorders_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mental_disorders_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mental_disorders_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mental_disorders_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mental_disorders_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mental_disorders_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mental_disorders_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mental_disorders_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_microscope_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_microscope_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_microscope_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_microscope_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_microscope_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_microscope_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_microscope_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_microscope_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_microscope_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_microscope_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_microscope_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_microscope_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_military_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_military_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_military_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_military_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_military_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_military_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_military_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_military_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_military_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_military_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_military_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_military_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_miner_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_miner_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_miner_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_miner_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_miner_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_miner_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_miner_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_miner_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_miner_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_miner_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_miner_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_miner_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mobile_clinic_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mobile_clinic_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mobile_clinic_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mobile_clinic_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mobile_clinic_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mobile_clinic_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mobile_clinic_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mobile_clinic_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mobile_clinic_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mobile_clinic_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mobile_clinic_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mobile_clinic_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_money_bag_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_money_bag_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_money_bag_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_money_bag_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_money_bag_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_money_bag_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_money_bag_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_money_bag_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_money_bag_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_money_bag_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_money_bag_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_money_bag_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mosquito_collection_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_collection_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mosquito_collection_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_collection_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mosquito_collection_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_collection_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mosquito_collection_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_collection_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mosquito_collection_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_collection_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mosquito_collection_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_collection_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mosquito_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mosquito_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mosquito_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mosquito_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mosquito_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mosquito_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_msm_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_msm_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_msm_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_msm_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_msm_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_msm_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_msm_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_msm_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_msm_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_msm_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_msm_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_msm_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_nausea_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_nausea_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_nausea_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_nausea_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_nausea_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_nausea_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_nausea_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_nausea_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_nausea_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_nausea_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_nausea_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_nausea_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_negative_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_negative_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_negative_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_negative_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_negative_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_negative_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_negative_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_negative_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_negative_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_negative_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_negative_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_negative_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_network_4g_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_network_4g_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_network_4g_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_network_4g_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_network_4g_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_network_4g_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_network_4g_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_network_4g_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_network_4g_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_network_4g_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_network_4g_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_network_4g_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_network_5g_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_network_5g_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_network_5g_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_network_5g_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_network_5g_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_network_5g_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_network_5g_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_network_5g_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_network_5g_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_network_5g_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_network_5g_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_network_5g_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_neurology_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_neurology_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_neurology_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_neurology_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_neurology_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_neurology_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_neurology_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_neurology_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_neurology_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_neurology_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_neurology_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_neurology_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_neutral_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_neutral_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_neutral_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_neutral_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_neutral_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_neutral_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_neutral_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_neutral_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_neutral_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_neutral_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_neutral_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_neutral_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_no_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_no_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_no_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_no_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_no_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_no_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_no_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_no_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_no_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_no_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_no_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_no_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_not_ok_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_not_ok_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_not_ok_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_not_ok_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_not_ok_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_not_ok_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_not_ok_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_not_ok_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_not_ok_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_not_ok_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_not_ok_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_not_ok_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_nurse_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_nurse_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_nurse_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_nurse_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_nurse_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_nurse_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_nurse_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_nurse_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_nurse_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_nurse_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_nurse_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_nurse_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_observation_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_observation_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_observation_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_observation_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_observation_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_observation_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_observation_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_observation_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_observation_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_observation_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_observation_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_observation_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_odontology_implant_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_implant_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_odontology_implant_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_implant_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_odontology_implant_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_implant_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_odontology_implant_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_implant_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_odontology_implant_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_implant_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_odontology_implant_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_implant_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_odontology_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_odontology_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_odontology_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_odontology_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_odontology_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_odontology_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_officer_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_officer_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_officer_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_officer_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_officer_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_officer_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_officer_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_officer_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_officer_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_officer_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_officer_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_officer_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ok_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ok_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ok_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ok_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ok_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ok_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ok_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ok_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ok_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ok_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ok_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ok_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_old_man_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_old_man_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_old_man_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_old_man_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_old_man_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_old_man_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_old_man_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_old_man_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_old_man_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_old_man_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_old_man_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_old_man_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_old_woman_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_old_woman_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_old_woman_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_old_woman_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_old_woman_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_old_woman_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_old_woman_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_old_woman_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_old_woman_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_old_woman_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_old_woman_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_old_woman_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx21_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx21_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx21_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx21_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx21_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx21_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx21_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx21_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx21_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx21_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx21_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx21_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx28_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx28_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx28_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx28_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx28_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx28_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx28_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx28_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx28_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx28_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx28_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx28_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_outpatient_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_outpatient_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_outpatient_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_outpatient_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_outpatient_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_outpatient_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_outpatient_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_outpatient_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_outpatient_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_outpatient_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_outpatient_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_outpatient_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_overweight_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_overweight_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_overweight_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_overweight_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_overweight_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_overweight_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_overweight_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_overweight_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_overweight_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_overweight_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_overweight_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_overweight_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_palm_branches_roof_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_palm_branches_roof_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_palm_branches_roof_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_palm_branches_roof_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_palm_branches_roof_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_palm_branches_roof_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_palm_branches_roof_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_palm_branches_roof_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_palm_branches_roof_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_palm_branches_roof_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_palm_branches_roof_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_palm_branches_roof_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pave_road_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pave_road_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pave_road_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pave_road_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pave_road_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pave_road_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pave_road_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pave_road_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pave_road_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pave_road_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pave_road_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pave_road_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_peace_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_peace_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_peace_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_peace_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_peace_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_peace_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_peace_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_peace_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_peace_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_peace_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_peace_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_peace_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_people_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_people_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_people_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_people_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_people_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_people_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_people_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_people_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_people_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_people_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_people_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_people_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_person_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_person_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_person_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_person_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_person_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_person_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_person_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_person_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_person_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_person_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_person_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_person_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_phone_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_phone_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_phone_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_phone_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_phone_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_phone_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_phone_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_phone_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_phone_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_phone_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_phone_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_phone_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pill_1_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pill_1_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pill_1_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pill_1_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pill_1_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pill_1_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pill_1_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pill_1_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pill_1_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pill_1_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pill_1_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pill_1_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_2_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_2_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_2_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_2_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_2_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_2_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_2_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_2_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_2_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_2_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_2_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_2_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_3_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_3_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_3_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_3_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_3_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_3_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_3_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_3_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_3_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_3_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_3_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_3_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_4_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_4_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_4_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_4_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_4_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_4_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_4_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_4_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_4_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_4_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_4_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_4_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_plantation_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_plantation_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_plantation_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_plantation_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_plantation_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_plantation_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_plantation_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_plantation_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_plantation_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_plantation_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_plantation_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_plantation_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_polygon_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_polygon_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_polygon_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_polygon_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_polygon_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_polygon_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_polygon_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_polygon_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_polygon_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_polygon_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_polygon_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_polygon_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_positive_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_positive_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_positive_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_positive_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_positive_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_positive_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_positive_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_positive_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_positive_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_positive_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_positive_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_positive_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_0812w_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_0812w_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_0812w_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_0812w_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_0812w_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_0812w_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_0812w_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_0812w_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_0812w_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_0812w_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_0812w_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_0812w_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_2426w_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_2426w_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_2426w_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_2426w_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_2426w_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_2426w_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_2426w_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_2426w_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_2426w_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_2426w_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_2426w_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_2426w_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_32w_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_32w_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_32w_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_32w_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_32w_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_32w_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_32w_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_32w_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_32w_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_32w_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_32w_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_32w_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_3638w_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_3638w_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_3638w_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_3638w_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_3638w_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_3638w_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_3638w_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_3638w_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_3638w_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_3638w_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_3638w_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_3638w_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_prisoner_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_prisoner_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_prisoner_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_prisoner_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_prisoner_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_prisoner_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_prisoner_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_prisoner_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_prisoner_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_prisoner_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_prisoner_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_prisoner_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_proper_roof_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_proper_roof_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_proper_roof_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_proper_roof_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_proper_roof_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_proper_roof_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_proper_roof_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_proper_roof_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_proper_roof_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_proper_roof_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_proper_roof_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_proper_roof_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_provider_fst_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_provider_fst_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_provider_fst_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_provider_fst_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_provider_fst_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_provider_fst_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_provider_fst_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_provider_fst_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_provider_fst_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_provider_fst_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_provider_fst_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_provider_fst_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pwid_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pwid_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pwid_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pwid_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pwid_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pwid_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pwid_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pwid_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pwid_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pwid_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pwid_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pwid_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_circle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_circle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_circle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_circle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_circle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_circle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_circle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_circle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_circle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_circle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_circle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_circle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_triangle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_triangle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_triangle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_triangle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_triangle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_triangle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_triangle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_triangle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_triangle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_triangle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_triangle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_triangle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_invalid_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_invalid_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_invalid_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_invalid_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_invalid_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_invalid_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_invalid_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_invalid_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_invalid_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_invalid_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_invalid_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_invalid_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_negative_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_negative_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_negative_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_negative_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_negative_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_negative_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_negative_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_negative_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_negative_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_negative_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_negative_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_negative_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_no_test_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_no_test_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_no_test_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_no_test_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_no_test_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_no_test_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_no_test_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_no_test_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_no_test_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_no_test_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_no_test_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_no_test_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_out_stock_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_out_stock_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_out_stock_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_out_stock_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_out_stock_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_out_stock_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_out_stock_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_out_stock_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_out_stock_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_out_stock_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_out_stock_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_out_stock_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_positive_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_positive_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_positive_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_positive_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_positive_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_positive_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_positive_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_positive_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_positive_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_positive_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_positive_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_positive_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_referral_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_referral_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_referral_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_referral_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_referral_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_referral_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_referral_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_referral_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_referral_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_referral_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_referral_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_referral_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_refused_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_refused_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_refused_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_refused_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_refused_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_refused_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_refused_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_refused_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_refused_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_refused_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_refused_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_refused_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ribbon_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ribbon_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ribbon_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ribbon_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ribbon_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ribbon_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ribbon_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ribbon_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ribbon_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ribbon_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ribbon_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ribbon_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rmnh_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rmnh_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rmnh_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rmnh_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rmnh_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rmnh_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rmnh_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rmnh_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rmnh_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rmnh_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rmnh_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rmnh_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_running_water_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_running_water_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_running_water_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_running_water_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_running_water_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_running_water_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_running_water_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_running_water_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_running_water_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_running_water_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_running_water_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_running_water_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rural_post_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rural_post_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rural_post_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rural_post_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rural_post_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rural_post_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rural_post_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rural_post_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rural_post_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rural_post_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rural_post_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rural_post_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sad_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sad_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sad_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sad_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sad_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sad_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sad_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sad_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sad_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sad_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sad_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sad_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sanitizer_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sanitizer_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sanitizer_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sanitizer_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sanitizer_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sanitizer_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sanitizer_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sanitizer_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sanitizer_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sanitizer_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sanitizer_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sanitizer_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sayana_press_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sayana_press_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sayana_press_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sayana_press_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sayana_press_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sayana_press_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sayana_press_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sayana_press_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sayana_press_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sayana_press_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sayana_press_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sayana_press_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_security_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_security_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_security_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_security_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_security_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_security_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_security_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_security_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_security_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_security_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_security_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_security_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sexual_reproductive_health_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sexual_reproductive_health_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sexual_reproductive_health_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sexual_reproductive_health_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sexual_reproductive_health_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sexual_reproductive_health_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sexual_reproductive_health_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sexual_reproductive_health_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sexual_reproductive_health_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sexual_reproductive_health_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sexual_reproductive_health_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sexual_reproductive_health_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_small_plane_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_small_plane_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_small_plane_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_small_plane_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_small_plane_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_small_plane_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_small_plane_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_small_plane_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_small_plane_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_small_plane_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_small_plane_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_small_plane_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_social_distancing_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_social_distancing_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_social_distancing_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_social_distancing_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_social_distancing_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_social_distancing_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_social_distancing_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_social_distancing_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_social_distancing_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_social_distancing_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_social_distancing_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_social_distancing_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_spraying_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_spraying_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_spraying_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_spraying_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_spraying_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_spraying_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_spraying_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_spraying_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_spraying_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_spraying_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_spraying_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_spraying_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_large_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_large_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_large_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_large_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_large_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_large_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_large_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_large_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_large_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_large_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_large_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_large_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_medium_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_medium_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_medium_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_medium_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_medium_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_medium_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_medium_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_medium_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_medium_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_medium_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_medium_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_medium_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_small_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_small_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_small_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_small_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_small_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_small_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_small_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_small_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_small_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_small_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_small_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_small_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_large_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_large_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_large_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_large_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_large_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_large_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_large_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_large_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_large_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_large_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_large_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_large_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_medium_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_medium_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_medium_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_medium_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_medium_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_medium_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_medium_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_medium_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_medium_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_medium_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_medium_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_medium_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_small_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_small_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_small_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_small_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_small_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_small_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_small_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_small_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_small_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_small_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_small_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_small_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stethoscope_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stethoscope_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stethoscope_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stethoscope_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stethoscope_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stethoscope_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stethoscope_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stethoscope_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stethoscope_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stethoscope_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stethoscope_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stethoscope_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sti_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sti_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sti_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sti_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sti_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sti_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sti_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sti_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sti_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sti_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sti_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sti_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stock_out_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stock_out_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stock_out_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stock_out_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stock_out_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stock_out_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stock_out_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stock_out_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stock_out_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stock_out_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stock_out_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stock_out_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stop_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stop_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stop_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stop_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stop_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stop_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stop_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stop_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stop_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stop_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stop_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stop_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_surgical_sterilization_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_surgical_sterilization_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_surgical_sterilization_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_surgical_sterilization_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_surgical_sterilization_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_surgical_sterilization_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_surgical_sterilization_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_surgical_sterilization_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_surgical_sterilization_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_surgical_sterilization_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_surgical_sterilization_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_surgical_sterilization_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sweating_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sweating_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sweating_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sweating_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sweating_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sweating_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sweating_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sweating_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sweating_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sweating_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sweating_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sweating_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_symptom_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_symptom_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_symptom_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_symptom_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_symptom_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_symptom_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_symptom_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_symptom_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_symptom_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_symptom_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_symptom_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_symptom_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_synergist_insecticide_bioassays_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_synergist_insecticide_bioassays_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_synergist_insecticide_bioassays_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_synergist_insecticide_bioassays_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_synergist_insecticide_bioassays_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_synergist_insecticide_bioassays_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_synergist_insecticide_bioassays_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_synergist_insecticide_bioassays_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_synergist_insecticide_bioassays_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_synergist_insecticide_bioassays_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_synergist_insecticide_bioassays_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_synergist_insecticide_bioassays_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_syringe_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_syringe_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_syringe_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_syringe_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_syringe_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_syringe_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_syringe_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_syringe_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_syringe_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_syringe_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_syringe_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_syringe_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_tac_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_tac_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_tac_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_tac_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_tac_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_tac_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_tac_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_tac_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_tac_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_tac_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_tac_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_tac_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_tb_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_tb_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_tb_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_tb_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_tb_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_tb_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_tb_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_tb_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_tb_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_tb_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_tb_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_tb_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_transgender_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_transgender_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_transgender_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_transgender_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_transgender_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_transgender_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_transgender_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_transgender_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_transgender_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_transgender_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_transgender_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_transgender_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_traumatism_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_traumatism_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_traumatism_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_traumatism_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_traumatism_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_traumatism_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_traumatism_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_traumatism_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_traumatism_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_traumatism_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_traumatism_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_traumatism_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_travel_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_travel_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_travel_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_travel_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_travel_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_travel_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_travel_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_travel_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_travel_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_travel_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_travel_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_travel_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_treated_water_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_treated_water_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_treated_water_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_treated_water_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_treated_water_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_treated_water_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_treated_water_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_treated_water_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_treated_water_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_treated_water_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_treated_water_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_treated_water_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_large_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_large_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_large_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_large_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_large_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_large_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_large_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_large_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_large_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_large_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_large_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_large_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_medium_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_medium_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_medium_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_medium_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_medium_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_medium_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_medium_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_medium_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_medium_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_medium_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_medium_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_medium_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_small_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_small_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_small_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_small_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_small_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_small_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_small_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_small_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_small_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_small_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_small_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_small_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_truck_driver_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_truck_driver_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_truck_driver_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_truck_driver_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_truck_driver_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_truck_driver_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_truck_driver_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_truck_driver_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_truck_driver_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_truck_driver_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_truck_driver_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_truck_driver_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_un_pave_road_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_un_pave_road_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_un_pave_road_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_un_pave_road_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_un_pave_road_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_un_pave_road_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_un_pave_road_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_un_pave_road_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_un_pave_road_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_un_pave_road_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_un_pave_road_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_un_pave_road_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_underweight_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_underweight_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_underweight_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_underweight_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_underweight_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_underweight_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_underweight_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_underweight_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_underweight_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_underweight_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_underweight_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_underweight_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vespa_motorcycle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vespa_motorcycle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vespa_motorcycle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vespa_motorcycle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vespa_motorcycle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vespa_motorcycle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vespa_motorcycle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vespa_motorcycle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vespa_motorcycle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vespa_motorcycle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vespa_motorcycle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vespa_motorcycle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vih_aids_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vih_aids_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vih_aids_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vih_aids_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vih_aids_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vih_aids_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vih_aids_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vih_aids_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vih_aids_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vih_aids_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vih_aids_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vih_aids_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_virus_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_virus_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_virus_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_virus_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_virus_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_virus_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_virus_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_virus_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_virus_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_virus_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_virus_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_virus_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vomiting_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vomiting_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vomiting_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vomiting_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vomiting_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vomiting_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vomiting_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vomiting_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vomiting_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vomiting_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vomiting_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vomiting_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_war_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_war_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_war_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_war_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_war_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_war_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_war_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_war_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_war_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_war_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_war_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_war_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_wash_hands_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_wash_hands_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_wash_hands_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_wash_hands_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_wash_hands_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_wash_hands_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_wash_hands_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_wash_hands_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_wash_hands_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_wash_hands_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_wash_hands_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_wash_hands_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_water_sanitation_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_water_sanitation_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_water_sanitation_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_water_sanitation_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_water_sanitation_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_water_sanitation_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_water_sanitation_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_water_sanitation_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_water_sanitation_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_water_sanitation_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_water_sanitation_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_water_sanitation_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_water_treatment_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_water_treatment_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_water_treatment_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_water_treatment_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_water_treatment_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_water_treatment_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_water_treatment_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_water_treatment_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_water_treatment_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_water_treatment_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_water_treatment_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_water_treatment_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_weight_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_weight_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_weight_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_weight_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_weight_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_weight_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_weight_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_weight_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_weight_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_weight_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_weight_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_weight_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_wold_care_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_wold_care_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_wold_care_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_wold_care_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_wold_care_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_wold_care_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_wold_care_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_wold_care_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_wold_care_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_wold_care_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_wold_care_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_wold_care_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_woman_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_woman_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_woman_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_woman_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_woman_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_woman_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_woman_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_woman_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_woman_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_woman_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_woman_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_woman_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_yes_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_yes_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_yes_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_yes_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_yes_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_yes_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_yes_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_yes_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_yes_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_yes_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_yes_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_yes_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_young_people_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_young_people_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_young_people_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_young_people_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_young_people_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_young_people_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_young_people_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_young_people_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_young_people_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_young_people_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_young_people_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_young_people_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/material_barcode.xml b/designsystem/src/commonMain/composeResources/drawable/material_barcode.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/material_barcode.xml rename to designsystem/src/commonMain/composeResources/drawable/material_barcode.xml diff --git a/designsystem/src/commonMain/resources/drawable/material_barcode_scanner.xml b/designsystem/src/commonMain/composeResources/drawable/material_barcode_scanner.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/material_barcode_scanner.xml rename to designsystem/src/commonMain/composeResources/drawable/material_barcode_scanner.xml diff --git a/designsystem/src/commonMain/resources/drawable/material_circle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/material_circle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/material_circle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/material_circle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/org_unit.xml b/designsystem/src/commonMain/composeResources/drawable/org_unit.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/org_unit.xml rename to designsystem/src/commonMain/composeResources/drawable/org_unit.xml diff --git a/designsystem/src/commonMain/resources/font/roboto_black.ttf b/designsystem/src/commonMain/composeResources/font/roboto_black.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_black.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_black.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_black_italic.ttf b/designsystem/src/commonMain/composeResources/font/roboto_black_italic.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_black_italic.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_black_italic.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_bold.ttf b/designsystem/src/commonMain/composeResources/font/roboto_bold.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_bold.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_bold.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_bold_italic.ttf b/designsystem/src/commonMain/composeResources/font/roboto_bold_italic.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_bold_italic.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_bold_italic.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_italic.ttf b/designsystem/src/commonMain/composeResources/font/roboto_italic.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_italic.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_italic.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_light.ttf b/designsystem/src/commonMain/composeResources/font/roboto_light.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_light.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_light.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_light_italic.ttf b/designsystem/src/commonMain/composeResources/font/roboto_light_italic.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_light_italic.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_light_italic.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_medium.ttf b/designsystem/src/commonMain/composeResources/font/roboto_medium.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_medium.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_medium.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_medium_italic.ttf b/designsystem/src/commonMain/composeResources/font/roboto_medium_italic.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_medium_italic.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_medium_italic.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_regular.ttf b/designsystem/src/commonMain/composeResources/font/roboto_regular.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_regular.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_regular.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_thin.ttf b/designsystem/src/commonMain/composeResources/font/roboto_thin.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_thin.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_thin.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_thin_italic.ttf b/designsystem/src/commonMain/composeResources/font/roboto_thin_italic.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_thin_italic.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_thin_italic.ttf diff --git a/designsystem/src/commonMain/resources/values-es/strings.xml b/designsystem/src/commonMain/composeResources/values-es/strings.xml similarity index 91% rename from designsystem/src/commonMain/resources/values-es/strings.xml rename to designsystem/src/commonMain/composeResources/values-es/strings.xml index e347b3ed5..1cbf4f325 100644 --- a/designsystem/src/commonMain/resources/values-es/strings.xml +++ b/designsystem/src/commonMain/composeResources/values-es/strings.xml @@ -8,10 +8,10 @@ Aรฑos Meses Dรญas - %d error - %d errores - %d advertencia - %d advertencias + %1$d error + %1$d errores + %1$d advertencia + %1$d advertencias Mostrar campos Ocultar campos Siguiente diff --git a/designsystem/src/commonMain/resources/values/strings.xml b/designsystem/src/commonMain/composeResources/values/strings.xml similarity index 91% rename from designsystem/src/commonMain/resources/values/strings.xml rename to designsystem/src/commonMain/composeResources/values/strings.xml index 523a10f8c..07c2d8db2 100644 --- a/designsystem/src/commonMain/resources/values/strings.xml +++ b/designsystem/src/commonMain/composeResources/values/strings.xml @@ -8,10 +8,10 @@ Years Months Days - %d error - %d errors - %d warning - %d warnings + %1$d error + %1$d errors + %1$d warning + %1$d warnings Show fields Hide fields Next diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AssistChip.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AssistChip.kt index 86252b2ab..5188375b7 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AssistChip.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AssistChip.kt @@ -4,9 +4,10 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsPressedAsState import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.offset -import androidx.compose.material.ripple.LocalRippleTheme import androidx.compose.material3.AssistChip import androidx.compose.material3.AssistChipDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -20,9 +21,9 @@ import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.platform.testTag import androidx.compose.ui.unit.IntOffset import org.hisp.dhis.mobile.ui.designsystem.theme.Outline -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration /** * DHIS2 [AssistChip] button with custom icon slot. @@ -36,6 +37,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor * @param onClick: Will be called when the user taps the chip. * @param badge: the text to be displayed within the badge. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun AssistChip( modifier: Modifier = Modifier, @@ -47,9 +49,10 @@ fun AssistChip( ) { val interactionSource = remember { MutableInteractionSource() } val isPressed by interactionSource.collectIsPressedAsState() + val rippleConfiguration = customRippleConfiguration() Box(modifier = Modifier) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides rippleConfiguration) { AssistChip( onClick = { onClick.invoke() }, label = { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BaseCard.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BaseCard.kt index c64b93ed1..1a93d1faf 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BaseCard.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BaseCard.kt @@ -24,10 +24,10 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.KeyboardArrowDown import androidx.compose.material.icons.filled.KeyboardArrowUp -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue @@ -87,7 +87,7 @@ fun BaseCard( .combinedClickable( role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), onClick = when { @@ -215,7 +215,7 @@ fun ToggleInfoTextButton( }, role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), ) diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicTextInput.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicTextInput.kt index 3ebaf8d6c..5e8e61104 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicTextInput.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicTextInput.kt @@ -12,6 +12,7 @@ import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.Icon +import androidx.compose.material3.MenuAnchorType import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -127,7 +128,7 @@ internal fun BasicTextInput( modifier = modifier .testTag("INPUT_$testTag") .focusRequester(focusRequester) - .menuAnchor(), + .menuAnchor(MenuAnchorType.PrimaryEditable), isRequiredField = isRequiredField, title = title, primaryButton = deleteButton, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Button.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Button.kt index 85c1eea75..5adffb3ba 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Button.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Button.kt @@ -13,11 +13,12 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material.ripple.LocalRippleTheme import androidx.compose.material3.Button import androidx.compose.material3.ButtonColors import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ElevatedButton +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text @@ -35,12 +36,12 @@ import androidx.compose.ui.unit.dp import org.hisp.dhis.mobile.ui.designsystem.theme.Border import org.hisp.dhis.mobile.ui.designsystem.theme.Outline import org.hisp.dhis.mobile.ui.designsystem.theme.Radius -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Shape import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor import org.hisp.dhis.mobile.ui.designsystem.theme.buttonShadow +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon /** @@ -58,6 +59,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon * @param modifier: optional [Modifier]. * @param onClick :Will be called when the user clicks the button. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun Button( enabled: Boolean = true, @@ -101,12 +103,12 @@ fun Button( ColorStyle.ERROR -> getErrorTextButtonColors(style, enabled) ColorStyle.WARNING -> getWarningTextButtonColors(style, enabled) } - val theme = when (colorStyle) { - ColorStyle.DEFAULT -> Ripple.CustomDHISRippleTheme() - ColorStyle.ERROR -> Ripple.CustomDHISRippleTheme(SurfaceColor.Error) - ColorStyle.WARNING -> Ripple.CustomDHISRippleTheme(SurfaceColor.Warning) + val rippleConfiguration = when (colorStyle) { + ColorStyle.DEFAULT -> customRippleConfiguration() + ColorStyle.ERROR -> customRippleConfiguration(SurfaceColor.Error) + ColorStyle.WARNING -> customRippleConfiguration(SurfaceColor.Warning) } - CompositionLocalProvider(LocalRippleTheme provides theme) { + CompositionLocalProvider(LocalRippleConfiguration provides rippleConfiguration) { OutlinedButton( modifier = modifier, onClick = { onClick() }, @@ -155,7 +157,7 @@ fun Button( } else { TextColor.OnDisabledSurface } - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { SimpleButton( modifier = modifier, onClick = { onClick() }, @@ -229,12 +231,12 @@ fun Button( ColorStyle.WARNING -> getWarningOutlinedButtonColors(enabled) } - val theme = when (colorStyle) { - ColorStyle.DEFAULT -> Ripple.CustomDHISRippleTheme() - ColorStyle.ERROR -> Ripple.CustomDHISRippleTheme(SurfaceColor.Error) - ColorStyle.WARNING -> Ripple.CustomDHISRippleTheme(SurfaceColor.Warning) + val rippleConfiguration = when (colorStyle) { + ColorStyle.DEFAULT -> customRippleConfiguration() + ColorStyle.ERROR -> customRippleConfiguration(SurfaceColor.Error) + ColorStyle.WARNING -> customRippleConfiguration(SurfaceColor.Warning) } - CompositionLocalProvider(LocalRippleTheme provides theme) { + CompositionLocalProvider(LocalRippleConfiguration provides rippleConfiguration) { OutlinedButton( modifier = modifier.hoverPointerIcon(enabled).height(Spacing.Spacing40), onClick = { onClick() }, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ButtonCarousel.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ButtonCarousel.kt index 6fe38b29d..3f2dfc411 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ButtonCarousel.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ButtonCarousel.kt @@ -14,8 +14,9 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.ripple.LocalRippleTheme -import androidx.compose.material.ripple.rememberRipple +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.remember @@ -23,12 +24,12 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import org.hisp.dhis.mobile.ui.designsystem.theme.Radius -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing.Spacing16 import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing.Spacing24 import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing.Spacing64 import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon /** @@ -36,12 +37,13 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon * @param buttonData: [CarouselButtonData] data model with all parameters for component. * @param modifier: optional [Modifier]. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun CarouselButton( buttonData: CarouselButtonData, modifier: Modifier = Modifier, ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Box( modifier = modifier .size(Spacing.Spacing80) @@ -51,7 +53,7 @@ fun CarouselButton( onClick = { buttonData.onClick.invoke() }, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), enabled = buttonData.enabled, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/CheckBox.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/CheckBox.kt index 9e79f959d..ff4b7fa18 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/CheckBox.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/CheckBox.kt @@ -7,9 +7,10 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material.ripple.LocalRippleTheme import androidx.compose.material3.Checkbox import androidx.compose.material3.CheckboxDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -21,10 +22,10 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.text.AnnotatedString import org.hisp.dhis.mobile.ui.designsystem.theme.InternalSizeValues import org.hisp.dhis.mobile.ui.designsystem.theme.Outline -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon /** @@ -36,6 +37,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon * @param modifier: optional modifier. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun CheckBox( checkBoxData: CheckBoxData, @@ -67,7 +69,7 @@ fun CheckBox( ) .hoverPointerIcon(checkBoxData.enabled), ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Checkbox( checked = checkBoxData.checked, onCheckedChange = { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/FilterChip.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/FilterChip.kt index 82bc9e0ad..ab969de6e 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/FilterChip.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/FilterChip.kt @@ -5,10 +5,11 @@ import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Done -import androidx.compose.material.ripple.LocalRippleTheme +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FilterChip import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.Icon +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -21,9 +22,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.unit.IntOffset import org.hisp.dhis.mobile.ui.designsystem.theme.Outline -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration /** * DHIS2 [FilterChip] button with generic icon slot. @@ -36,6 +37,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor * @param onSelected: Will be called when the user taps the chip. * @param badge: the text to be displayed within the badge. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun FilterChip( modifier: Modifier = Modifier, @@ -45,7 +47,7 @@ fun FilterChip( badge: String? = null, ) { Box(modifier = modifier) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { FilterChip( onClick = { onSelected?.invoke(!selected) }, label = { Text(label, color = TextColor.OnSurfaceVariant) }, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/IconButton.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/IconButton.kt index 601712d1d..cc505054a 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/IconButton.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/IconButton.kt @@ -11,12 +11,13 @@ import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.ripple.LocalRippleTheme import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ElevatedButton +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FilledIconButton import androidx.compose.material3.FilledTonalIconButton import androidx.compose.material3.IconButtonDefaults +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.OutlinedIconButton import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -37,11 +38,11 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.Border import org.hisp.dhis.mobile.ui.designsystem.theme.InternalSizeValues import org.hisp.dhis.mobile.ui.designsystem.theme.Outline import org.hisp.dhis.mobile.ui.designsystem.theme.Radius -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Shape import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon import org.hisp.dhis.mobile.ui.designsystem.theme.iconButtonshadow @@ -178,6 +179,7 @@ internal fun BottomSheetIconButton( * @param scope: coroutine scope to be used. * @param modifier: optional modifier. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable private fun StandardIconButton( enabled: Boolean = true, @@ -187,7 +189,7 @@ private fun StandardIconButton( scope: CoroutineScope = rememberCoroutineScope(), onClick: () -> Unit, ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Box( Modifier.size(InternalSizeValues.Size48).clickable( enabled = enabled, @@ -277,6 +279,7 @@ private fun FilledIconButton( * @param scope: Coroutine scope to be used. * @param modifier: optional modifier. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable private fun FilledTonalIconButton( enabled: Boolean = true, @@ -286,7 +289,7 @@ private fun FilledTonalIconButton( scope: CoroutineScope = rememberCoroutineScope(), onClick: () -> Unit, ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Box( Modifier.size(InternalSizeValues.Size48).clickable( enabled = enabled, @@ -331,6 +334,7 @@ private fun FilledTonalIconButton( * @param scope: coroutine scope to be used. * @param modifier: optional modifier. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable private fun OutlinedIconButton( enabled: Boolean = true, @@ -340,7 +344,7 @@ private fun OutlinedIconButton( scope: CoroutineScope = rememberCoroutineScope(), onClick: () -> Unit, ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Box( Modifier.size(InternalSizeValues.Size48).clickable( enabled = enabled, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InfoBar.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InfoBar.kt index 05ef5a352..cad7a307e 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InfoBar.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InfoBar.kt @@ -11,7 +11,8 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.ripple.LocalRippleTheme +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -22,9 +23,9 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import org.hisp.dhis.mobile.ui.designsystem.theme.Radius -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration /** * DHIS2 InfoBar. Wraps compose [Row]. @@ -33,6 +34,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor * parameters for component. * @param modifier: optional modifier. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun InfoBar( infoBarData: InfoBarData, @@ -53,7 +55,7 @@ fun InfoBar( Text(color = infoBarData.color, text = infoBarData.text, style = MaterialTheme.typography.bodyMedium) Spacer(Modifier.weight(1f)) if (infoBarData.onClick != null && infoBarData.actionText?.isNotEmpty() == true) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Column( Modifier .clip(shape = RoundedCornerShape(Radius.L)) diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputChip.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputChip.kt index 6e5f3e031..bf99c3d15 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputChip.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputChip.kt @@ -6,9 +6,10 @@ import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Close -import androidx.compose.material.ripple.LocalRippleTheme +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.Icon +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -23,9 +24,9 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.unit.IntOffset import org.hisp.dhis.mobile.ui.designsystem.theme.Outline -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration /** * DHIS2 Input Chip. Wraps material 3 ยท [InputChip]. @@ -41,6 +42,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor * @param focusRequester: component focus requester. * @param modifier: optional modifier. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun InputChip( modifier: Modifier = Modifier, @@ -67,7 +69,7 @@ fun InputChip( ) } - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { androidx.compose.material3.InputChip( enabled = enabled, onClick = { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputDropDown.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputDropDown.kt index a7e75b862..794aefb73 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputDropDown.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputDropDown.kt @@ -18,6 +18,7 @@ import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.MenuAnchorType import androidx.compose.material3.Shapes import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -218,7 +219,7 @@ fun InputDropDown( shape = RoundedCornerShape(Spacing8), ), ) { - inputField(Modifier.menuAnchor()) + inputField(Modifier.menuAnchor(MenuAnchorType.PrimaryEditable)) MaterialTheme( shapes = Shapes(extraSmall = RoundedCornerShape(Spacing8)), diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Legend.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Legend.kt index 44704373c..52d35c632 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Legend.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Legend.kt @@ -15,11 +15,11 @@ import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.outlined.HelpOutline import androidx.compose.material.icons.outlined.Info -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -63,7 +63,7 @@ fun Legend( }, role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), ) diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCard.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCard.kt index 28ad80f9c..fb8b31f9d 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCard.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCard.kt @@ -29,10 +29,10 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.KeyboardArrowDown import androidx.compose.material.icons.filled.KeyboardArrowUp import androidx.compose.material.icons.outlined.Sync -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue @@ -576,7 +576,7 @@ private fun ExpandShrinkButton( onClick = onClick, role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), ) @@ -673,7 +673,7 @@ fun ProvideKeyValueItem( clickable( role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), onClick = additionalInfoItem.action ?: {}, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/OrgBottomSheet.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/OrgBottomSheet.kt index 74fd87cd0..08525a5e1 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/OrgBottomSheet.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/OrgBottomSheet.kt @@ -17,10 +17,10 @@ import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.ClearAll import androidx.compose.material.icons.filled.KeyboardArrowDown -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue @@ -233,7 +233,7 @@ fun OrgUnitSelectorItem( interactionSource = remember { MutableInteractionSource() }, - indication = rememberRipple(bounded = true), + indication = ripple(bounded = true), ) { onItemClick(orgTreeItem.uid) } diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ProgressIndicator.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ProgressIndicator.kt index 8e312f0de..f8c18d89f 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ProgressIndicator.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ProgressIndicator.kt @@ -53,7 +53,7 @@ fun ProgressIndicator( @Composable internal fun LinearIndicator(modifier: Modifier, progress: Float?, hasError: Boolean) { val color = if (hasError) SurfaceColor.Error else SurfaceColor.Primary - val trackColor = if (hasError) SurfaceColor.ErrorContainer else SurfaceColor.ContainerHigh + val trackColor = if (hasError) SurfaceColor.ErrorContainer else SurfaceColor.Container if (progress != null) { LinearProgressIndicator( progress = { progress }, @@ -78,18 +78,21 @@ internal fun CircularIndicator( hasError: Boolean, ) { val color = if (hasError) SurfaceColor.Error else SurfaceColor.Primary + val trackColor = if (hasError) SurfaceColor.ErrorContainer else SurfaceColor.Container if (progress != null) { CircularProgressIndicator( progress = { progress }, modifier = modifier, strokeWidth = strokeWidth, color = color, + trackColor = trackColor, ) } else { CircularProgressIndicator( modifier = modifier, strokeWidth = strokeWidth, color = color, + trackColor = trackColor, ) } } diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/RadioButton.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/RadioButton.kt index daf89271c..70d83170f 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/RadioButton.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/RadioButton.kt @@ -7,7 +7,8 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material.ripple.LocalRippleTheme +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.MaterialTheme import androidx.compose.material3.RadioButton import androidx.compose.material3.RadioButtonDefaults @@ -21,10 +22,10 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.text.AnnotatedString import org.hisp.dhis.mobile.ui.designsystem.theme.InternalSizeValues import org.hisp.dhis.mobile.ui.designsystem.theme.Outline -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon /** @@ -36,6 +37,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon * @param onClick Will be called when the user clicks the button. * */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun RadioButton( radioButtonData: RadioButtonData, @@ -59,7 +61,7 @@ fun RadioButton( enabled = radioButtonData.enabled, ), ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { RadioButton( selected = radioButtonData.selected, onClick = { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SearchBar.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SearchBar.kt index 3998263a1..325a85943 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SearchBar.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SearchBar.kt @@ -13,13 +13,13 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Cancel import androidx.compose.material.icons.outlined.Search -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.SearchBarDefaults import androidx.compose.material3.Text import androidx.compose.material3.TextFieldDefaults +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -105,7 +105,7 @@ fun SearchBar( onClick = {}, role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( true, color = SurfaceColor.Primary, ), diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Sections.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Sections.kt index ecc7bba15..a036e5255 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Sections.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Sections.kt @@ -23,10 +23,10 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowForward import androidx.compose.material.icons.filled.KeyboardArrowDown import androidx.compose.material.icons.filled.KeyboardArrowUp -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue @@ -266,7 +266,7 @@ internal fun SectionHeader( it.clickable( role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), ) { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SupportingText.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SupportingText.kt index 3e9033eed..244bc8dc4 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SupportingText.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SupportingText.kt @@ -6,7 +6,9 @@ import androidx.compose.foundation.interaction.PressInteraction import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.ClickableText -import androidx.compose.material.ripple.LocalRippleTheme +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect @@ -18,18 +20,22 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.LinkAnnotation import androidx.compose.ui.text.ParagraphStyle import androidx.compose.ui.text.TextLayoutResult +import androidx.compose.ui.text.TextLinkStyles import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.withLink import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.sp import kotlinx.coroutines.launch import org.hisp.dhis.mobile.ui.designsystem.resource.provideStringResource import org.hisp.dhis.mobile.ui.designsystem.theme.DHIS2SCustomTextStyles -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration /** * DHIS2 SupportingText component, wraps Compose [ClickableText]. @@ -45,6 +51,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor * If the text to be shown has overflow the component will automatically add * the expand functionality. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun SupportingText( text: String, @@ -79,6 +86,29 @@ fun SupportingText( LaunchedEffect(textLayoutResult) { if (textLayoutResult == null) return@LaunchedEffect + val link = LinkAnnotation.Clickable( + tag = seeMoreTag, + styles = TextLinkStyles( + clickableTextStyle.copy(fontWeight = FontWeight.SemiBold), + ), + ) { + val link = it as LinkAnnotation.Clickable + if (link.tag == seeMoreTag) { + if (isClickable) { + isExpanded = !isExpanded + } + } else { + onNoInteraction?.invoke()?.let { (interactionSource, action) -> + scope.launch { + action.invoke() + val pressInteraction = PressInteraction.Press(Offset.Zero) + interactionSource.emit(pressInteraction) + interactionSource.emit(PressInteraction.Release(pressInteraction)) + } + } + } + } + when { !isExpanded && textLayoutResult.hasVisualOverflow -> { val lastCharIndex = textLayoutResult.getLineEnd(maxLines - 1) @@ -94,7 +124,7 @@ fun SupportingText( withStyle(style = nonClickableTextStyle) { append(unexpandedText) } - withStyle(style = clickableTextStyle) { + withLink(link) { append(showMoreText) } } @@ -118,9 +148,7 @@ fun SupportingText( ) { append(expandedText) } - withStyle( - style = clickableTextStyle, - ) { + withLink(link) { append(showLessText) } } @@ -135,27 +163,11 @@ fun SupportingText( } } - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { - ClickableText( + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { + Text( text = annotatedText, maxLines = if (isExpanded) Int.MAX_VALUE else maxLines, onTextLayout = { textLayoutResultState.value = it }, - onClick = { position -> - val annotations = - annotatedText.getStringAnnotations(seeMoreTag, start = position, end = position) - annotations.firstOrNull()?.let { - if (isClickable) { - isExpanded = !isExpanded - } - } ?: onNoInteraction?.invoke()?.let { (interactionSource, action) -> - scope.launch { - action.invoke() - val pressInteraction = PressInteraction.Press(Offset.Zero) - interactionSource.emit(pressInteraction) - interactionSource.emit(PressInteraction.Release(pressInteraction)) - } - } - }, modifier = modifier.padding(paddingValues).animateContentSize(), ) } diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Switch.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Switch.kt index f582f19b1..ae7bfa921 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Switch.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Switch.kt @@ -4,8 +4,9 @@ import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.outlined.Close -import androidx.compose.material.ripple.LocalRippleTheme +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.Switch import androidx.compose.material3.SwitchDefaults import androidx.compose.runtime.Composable @@ -13,9 +14,9 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import org.hisp.dhis.mobile.ui.designsystem.theme.Outline -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration /** * DHIS2 Switch wraps Material 3 [Switch]. @@ -25,6 +26,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor * clickable and will appear disabled to accessibility services. * @param onCheckedChange: access to the on checked changed event. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun Switch( modifier: Modifier = Modifier, @@ -32,7 +34,7 @@ fun Switch( enabled: Boolean = true, onCheckedChange: (Boolean) -> Unit, ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Switch( modifier = modifier.testTag("SWITCH"), checked = isChecked, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/modifiers/ClickableWithRipple.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/modifiers/ClickableWithRipple.kt index 44053c380..2c8d2ae5e 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/modifiers/ClickableWithRipple.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/modifiers/ClickableWithRipple.kt @@ -2,7 +2,7 @@ package org.hisp.dhis.mobile.ui.designsystem.component.internal.modifiers import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.material.ripple.rememberRipple +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier @@ -19,7 +19,7 @@ internal fun Modifier.clickableWithRipple( Modifier.clickable( role = role, interactionSource = remember { MutableInteractionSource() }, - indication = rememberRipple(color = color), + indication = ripple(color = color), onClick = onClick, ), ) diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/navigationBar/NavigationBar.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/navigationBar/NavigationBar.kt index d6c3ff291..39045bf5f 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/navigationBar/NavigationBar.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/navigationBar/NavigationBar.kt @@ -13,9 +13,12 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag +import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp +import org.hisp.dhis.mobile.designsystem.generated.resources.Res +import org.hisp.dhis.mobile.designsystem.generated.resources.roboto_bold import org.hisp.dhis.mobile.ui.designsystem.component.Badge import org.hisp.dhis.mobile.ui.designsystem.component.navigationBar.NavigationBarTestTags.NAVIGATION_BAR import org.hisp.dhis.mobile.ui.designsystem.component.navigationBar.NavigationBarTestTags.NAVIGATION_BAR_BORDER @@ -25,10 +28,10 @@ import org.hisp.dhis.mobile.ui.designsystem.component.navigationBar.NavigationBa import org.hisp.dhis.mobile.ui.designsystem.component.navigationBar.NavigationBarTestTags.NAVIGATION_BAR_ITEM_LABEL_PREFIX import org.hisp.dhis.mobile.ui.designsystem.component.navigationBar.NavigationBarTestTags.NAVIGATION_BAR_ITEM_PREFIX import org.hisp.dhis.mobile.ui.designsystem.component.navigationBar.NavigationBarTestTags.NAVIGATION_BAR_ITEM_SELECTED_ICON_SUFFIX -import org.hisp.dhis.mobile.ui.designsystem.resource.provideFontResource import org.hisp.dhis.mobile.ui.designsystem.theme.Outline import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.jetbrains.compose.resources.Font @Composable fun NavigationBar( @@ -61,7 +64,7 @@ fun NavigationBar( Text( style = if (selected) { MaterialTheme.typography.labelMedium.copy( - fontFamily = provideFontResource("roboto_bold"), + fontFamily = FontFamily(Font(Res.font.roboto_bold)), fontWeight = FontWeight.Bold, ) } else { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/parameter/ParameterSelector.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/parameter/ParameterSelector.kt index 533f3be36..78c10d2ec 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/parameter/ParameterSelector.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/parameter/ParameterSelector.kt @@ -15,10 +15,10 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.wrapContentWidth -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -75,7 +75,7 @@ private fun EmptyParameterField( .clickable( role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), onClick = onClick, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt deleted file mode 100644 index 886b7de50..000000000 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt +++ /dev/null @@ -1,7 +0,0 @@ -package org.hisp.dhis.mobile.ui.designsystem.resource - -import androidx.compose.runtime.Composable -import androidx.compose.ui.text.font.FontFamily - -@Composable -expect fun provideFontResource(font: String = "roboto_regular"): FontFamily diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Image.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Image.kt index 83b0abdfc..fa4cbf899 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Image.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Image.kt @@ -2,9 +2,10 @@ package org.hisp.dhis.mobile.ui.designsystem.resource import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.painter.Painter -import org.jetbrains.compose.resources.DrawableResource -import org.jetbrains.compose.resources.InternalResourceApi -import org.jetbrains.compose.resources.ResourceItem +import org.hisp.dhis.mobile.designsystem.generated.resources.Res +import org.hisp.dhis.mobile.designsystem.generated.resources.allDrawableResources +import org.hisp.dhis.mobile.designsystem.generated.resources.dhis2_default_outline +import org.jetbrains.compose.resources.ExperimentalResourceApi import org.jetbrains.compose.resources.painterResource /** @@ -13,34 +14,11 @@ import org.jetbrains.compose.resources.painterResource */ @Composable fun provideDHIS2Icon(resourceName: String): Painter { - val iconName = if (!resourceExists(resourceName)) { - "dhis2_default_outline" - } else { - resourceName - } return painterResource( - drawableResource(iconName, "xml"), + drawableResource(resourceName) ?: Res.drawable.dhis2_default_outline, ) } -@Composable -fun provideImage(resourceName: String): Painter = - painterResource( - drawableResource(resourceName, "jpg"), - ) - -@OptIn(InternalResourceApi::class) -fun drawableResource(resourceName: String, fileExtension: String): DrawableResource = - lazy { - DrawableResource( - resourceName, - setOf( - ResourceItem( - setOf(), - "drawable/$resourceName.$fileExtension", - -1, - -1, - ), - ), - ) - }.value +@OptIn(ExperimentalResourceApi::class) +internal fun drawableResource(resourceName: String) = + Res.allDrawableResources[resourceName] diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt index dc4501f4d..c6718dee4 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt @@ -1,12 +1,46 @@ package org.hisp.dhis.mobile.ui.designsystem.resource import androidx.compose.runtime.Composable +import org.hisp.dhis.mobile.designsystem.generated.resources.Res +import org.hisp.dhis.mobile.designsystem.generated.resources.allDrawableResources +import org.hisp.dhis.mobile.designsystem.generated.resources.allStringResources +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.stringResource +@OptIn(ExperimentalResourceApi::class) @Composable -expect fun provideStringResource(id: String): String +fun provideStringResource(resourceName: String): String { + return if (resourceExists(resourceName, ResourceType.STRING)) { + stringResource(Res.allStringResources[resourceName]!!) + } else { + "Key not found" + } +} +@OptIn(ExperimentalResourceApi::class) @Composable -expect fun provideQuantityStringResource(id: String, quantity: Int): String +fun provideQuantityStringResource(resourceName: String, quantity: Int): String { + val formattedName = when (quantity) { + 1 -> "${resourceName}_one" + else -> "${resourceName}_other" + } + return if (resourceExists(formattedName, ResourceType.STRING)) { + stringResource(Res.allStringResources[formattedName]!!, quantity) + } else { + "Key not found" + } +} +@OptIn(ExperimentalResourceApi::class) @Composable -expect fun resourceExists(resourceName: String, resourceType: String = "drawable"): Boolean +fun resourceExists(resourceName: String, resourceType: ResourceType = ResourceType.DRAWABLE): Boolean { + return when (resourceType) { + ResourceType.DRAWABLE -> Res.allDrawableResources.containsKey(resourceName) + ResourceType.STRING -> Res.allStringResources.containsKey(resourceName) + } +} + +enum class ResourceType { + DRAWABLE, + STRING, +} diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Ripple.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Ripple.kt index 0a97ff557..dcfdea2bd 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Ripple.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Ripple.kt @@ -1,26 +1,20 @@ package org.hisp.dhis.mobile.ui.designsystem.theme import androidx.compose.material.ripple.RippleAlpha -import androidx.compose.material.ripple.RippleTheme -import androidx.compose.runtime.Composable +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.RippleConfiguration import androidx.compose.ui.graphics.Color -object Ripple { - internal class CustomDHISRippleTheme( - private val color: Color = SurfaceColor.Primary, - ) : RippleTheme { - - private val alpha = RippleAlpha( - focusedAlpha = 0.16f, - draggedAlpha = 0.16f, - hoveredAlpha = 0.04f, - pressedAlpha = 0.16f, - ) - - @Composable - override fun defaultColor(): Color = color - - @Composable - override fun rippleAlpha(): RippleAlpha = alpha - } -} +@OptIn(ExperimentalMaterial3Api::class) +internal fun customRippleConfiguration( + color: Color = SurfaceColor.Primary, + alpha: RippleAlpha = RippleAlpha( + focusedAlpha = 0.16f, + draggedAlpha = 0.16f, + hoveredAlpha = 0.04f, + pressedAlpha = 0.16f, + ), +) = RippleConfiguration( + color, + alpha, +) diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt index 7739fa8dd..1034cccce 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt @@ -6,11 +6,15 @@ import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.LineHeightStyle import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.sp -import org.hisp.dhis.mobile.ui.designsystem.resource.provideFontResource +import org.hisp.dhis.mobile.designsystem.generated.resources.Res +import org.hisp.dhis.mobile.designsystem.generated.resources.roboto_medium +import org.hisp.dhis.mobile.designsystem.generated.resources.roboto_regular +import org.jetbrains.compose.resources.Font val DHIS2LightColorScheme = lightColorScheme( primary = SurfaceColor.Primary, @@ -41,7 +45,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 32.sp, lineHeight = 40.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_regular"), + fontFamily = FontFamily(Font(Res.font.roboto_regular)), fontWeight = FontWeight.Normal, color = TextColor.OnSurface, ), @@ -49,7 +53,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 28.sp, lineHeight = 36.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_regular"), + fontFamily = FontFamily(Font(Res.font.roboto_regular)), fontWeight = FontWeight.Normal, color = TextColor.OnSurface, ), @@ -57,7 +61,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 24.sp, lineHeight = 32.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_regular"), + fontFamily = FontFamily(Font(Res.font.roboto_regular)), fontWeight = FontWeight.Normal, color = TextColor.OnSurface, ), @@ -65,7 +69,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 20.sp, lineHeight = 28.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_medium"), + fontFamily = FontFamily(Font(Res.font.roboto_medium)), fontWeight = FontWeight.Medium, color = TextColor.OnSurface, ), @@ -73,7 +77,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 16.sp, lineHeight = 24.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_medium"), + fontFamily = FontFamily(Font(Res.font.roboto_medium)), fontWeight = FontWeight.Medium, color = TextColor.OnSurface, letterSpacing = 0.15.sp, @@ -83,7 +87,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 14.sp, lineHeight = 20.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_medium"), + fontFamily = FontFamily(Font(Res.font.roboto_medium)), fontWeight = FontWeight.Medium, color = TextColor.OnSurface, letterSpacing = 0.1.sp, @@ -92,7 +96,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 14.sp, lineHeight = 20.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_medium"), + fontFamily = FontFamily(Font(Res.font.roboto_medium)), fontWeight = FontWeight.Medium, color = TextColor.OnSurface, letterSpacing = 0.1.sp, @@ -101,7 +105,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 12.sp, lineHeight = 16.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_medium"), + fontFamily = FontFamily(Font(Res.font.roboto_medium)), fontWeight = FontWeight.Medium, color = TextColor.OnSurface, letterSpacing = 0.5.sp, @@ -110,7 +114,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 11.sp, lineHeight = 16.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_medium"), + fontFamily = FontFamily(Font(Res.font.roboto_medium)), fontWeight = FontWeight.Medium, color = TextColor.OnSurface, letterSpacing = 0.5.sp, @@ -119,7 +123,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 16.sp, lineHeight = 24.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_regular"), + fontFamily = FontFamily(Font(Res.font.roboto_regular)), fontWeight = FontWeight.Normal, color = TextColor.OnSurface, letterSpacing = 0.5.sp, @@ -128,7 +132,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 14.sp, lineHeight = 20.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_regular"), + fontFamily = FontFamily(Font(Res.font.roboto_regular)), fontWeight = FontWeight.Normal, color = TextColor.OnSurface, letterSpacing = 0.25.sp, @@ -137,7 +141,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 12.sp, lineHeight = 16.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_regular"), + fontFamily = FontFamily(Font(Res.font.roboto_regular)), fontWeight = FontWeight.Normal, color = TextColor.OnSurface, letterSpacing = 0.4.sp, diff --git a/designsystem/src/commonMain/resources/drawable/dog.jpg b/designsystem/src/commonMain/resources/drawable/dog.jpg deleted file mode 100644 index 800153d4f..000000000 Binary files a/designsystem/src/commonMain/resources/drawable/dog.jpg and /dev/null differ diff --git a/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt b/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt deleted file mode 100644 index 6e3b63476..000000000 --- a/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.hisp.dhis.mobile.ui.designsystem.resource - -import androidx.compose.runtime.Composable -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.platform.Font - -@Composable -actual fun provideFontResource( - font: String, -): FontFamily = FontFamily( - Font(resource = "font/$font.ttf"), -) diff --git a/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt b/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt deleted file mode 100644 index a5f33e329..000000000 --- a/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt +++ /dev/null @@ -1,72 +0,0 @@ -package org.hisp.dhis.mobile.ui.designsystem.resource - -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.ui.res.useResource -import androidx.compose.ui.text.intl.Locale - -@Composable -actual fun provideStringResource(id: String): String { - val res by remember { mutableStateOf(getResources()) } - return res[id] ?: "Key not found" -} - -@Composable -actual fun provideQuantityStringResource(id: String, quantity: Int): String { - val appendToId = when (quantity) { - 1 -> "one" - else -> "other" - } - return provideStringResource("${id}_$appendToId").format(quantity) -} - -private fun getResources(): Map { - val stringsResources = mutableMapOf() - val localePath = "values-${Locale.current.language}/strings.xml" - val defaultPath = "values/strings.xml" - - try { - useResource(localePath) { inputStream -> - - val regex = Regex("""(.+?)""") - - inputStream.bufferedReader().useLines { lines -> - lines.forEach { line -> - val matchResult = regex.find(line) - if (matchResult != null) { - val key = matchResult.groupValues[1] - val value = matchResult.groupValues[2] - stringsResources[key] = value - } - } - } - } - } catch (e: IllegalArgumentException) { - useResource(defaultPath) { inputStream -> - val regex = Regex("""(.+?)""") - - inputStream.bufferedReader().useLines { lines -> - lines.forEach { line -> - val matchResult = regex.find(line) - if (matchResult != null) { - val key = matchResult.groupValues[1] - val value = matchResult.groupValues[2] - stringsResources[key] = value - } - } - } - } - } - return stringsResources -} - -@Composable -actual fun resourceExists(resourceName: String, resourceType: String): Boolean { - return try { - ClassLoader.getSystemResource("$resourceType/$resourceName.xml") != null - } catch (e: Exception) { - false - } -} diff --git a/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_ProgressIndicatorSnapshotTest_launchChip.png b/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_ProgressIndicatorSnapshotTest_launchChip.png index 988d481c4..71f0cfd6d 100644 --- a/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_ProgressIndicatorSnapshotTest_launchChip.png +++ b/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_ProgressIndicatorSnapshotTest_launchChip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6321860e91ededc6c6e8a833c0799444edc92570b946994bf5822f2c0ebdc7c -size 8446 +oid sha256:00cf549cc409781e800e48687795403c23f76ab33ec22ad9d3139b583ecea78a +size 14759 diff --git a/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_TopBarSnapshotTest_launchTopBar.png b/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_TopBarSnapshotTest_launchTopBar.png index 88dcb99c6..bb91a4dbe 100644 --- a/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_TopBarSnapshotTest_launchTopBar.png +++ b/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_TopBarSnapshotTest_launchTopBar.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03c798becd02291a3829dcacdc715ed940d56bf5bdfd746b816b98978dc56e4c -size 15089 +oid sha256:30ac36051e0b5c2a4a957d613a2fa58b8cb8a3d7d97050627788b930bd475ddd +size 12928 diff --git a/gradle.properties b/gradle.properties index 7dfc47c20..0575ee64d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,11 +16,11 @@ kotlin.native.cacheKind=none #Android android.useAndroidX=true -android.compileSdk=34 -android.targetSdk=34 +android.compileSdk=35 +android.targetSdk=35 android.minSdk=21 #Versions -kotlin.version=2.0.0 -agp.version=8.4.1 -compose.version=1.6.11 \ No newline at end of file +kotlin.version=2.0.21 +agp.version=8.7.2 +compose.version=1.7.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 08085e25b..52663a93a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed May 22 17:58:24 IST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists