From 9a769748b9a14eb458e6369976faa8a193b6e5dc Mon Sep 17 00:00:00 2001 From: Mustafa Ozhan Date: Sat, 18 May 2024 21:10:32 +0200 Subject: [PATCH] [Oztechan/TraceFit#132] Move new setup of compose resources (#133) * [Oztechan/TraceFit#132] Move new setup of compose resources * [Oztechan/TraceFit#132] Move new setup of compose resources --- client/client.gradle.kts | 2 -- .../drawable}/compose-multiplatform.xml | 0 .../kotlin/com/oztechan/tracefit/client/MainView.kt | 5 +++-- 3 files changed, 3 insertions(+), 4 deletions(-) rename client/src/commonMain/{resources => composeResources/drawable}/compose-multiplatform.xml (100%) diff --git a/client/client.gradle.kts b/client/client.gradle.kts index 23b7006..e66f9c3 100644 --- a/client/client.gradle.kts +++ b/client/client.gradle.kts @@ -46,7 +46,5 @@ android { sourceCompatibility = JAVA_VERSION targetCompatibility = JAVA_VERSION } - - sourceSets["main"].resources.srcDirs("src/commonMain/resources") } } diff --git a/client/src/commonMain/resources/compose-multiplatform.xml b/client/src/commonMain/composeResources/drawable/compose-multiplatform.xml similarity index 100% rename from client/src/commonMain/resources/compose-multiplatform.xml rename to client/src/commonMain/composeResources/drawable/compose-multiplatform.xml diff --git a/client/src/commonMain/kotlin/com/oztechan/tracefit/client/MainView.kt b/client/src/commonMain/kotlin/com/oztechan/tracefit/client/MainView.kt index fb21a93..18e9cf5 100644 --- a/client/src/commonMain/kotlin/com/oztechan/tracefit/client/MainView.kt +++ b/client/src/commonMain/kotlin/com/oztechan/tracefit/client/MainView.kt @@ -14,9 +14,10 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.ExperimentalResourceApi import org.jetbrains.compose.resources.painterResource +import tracefit.client.generated.resources.Res +import tracefit.client.generated.resources.compose_multiplatform @OptIn(ExperimentalResourceApi::class) @Composable @@ -33,7 +34,7 @@ fun MainView() { } AnimatedVisibility(showImage) { Image( - painterResource(DrawableResource("compose-multiplatform")), + painterResource(Res.drawable.compose_multiplatform), null ) }