From 266253564adb83def93765b03f93b1e78078f63f Mon Sep 17 00:00:00 2001 From: Nikita Lipsky Date: Fri, 17 Feb 2023 15:27:15 +0200 Subject: [PATCH] visual-effects experimental sample: use XML Vector Drawable for Compose logo and painterResource from resources library. (#2759) --- .../visual-effects/shared/build.gradle.kts | 2 +- .../src/commonMain/kotlin/RotatingWords.kt | 7 ++-- .../resources/compose-community-primary.xml | 36 +++++++++++++++++++ 3 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 experimental/examples/visual-effects/shared/src/commonMain/resources/compose-community-primary.xml diff --git a/experimental/examples/visual-effects/shared/build.gradle.kts b/experimental/examples/visual-effects/shared/build.gradle.kts index 15ddcbfcb9..55f9c1c67e 100644 --- a/experimental/examples/visual-effects/shared/build.gradle.kts +++ b/experimental/examples/visual-effects/shared/build.gradle.kts @@ -34,7 +34,7 @@ kotlin { implementation(compose.foundation) implementation(compose.material) implementation(compose.materialIconsExtended) - implementation("org.jetbrains.compose.components:components-resources:1.3.0-beta04-dev879") + implementation("org.jetbrains.compose.components:components-resources:1.4.0-alpha01-dev942") } } val androidMain by getting { diff --git a/experimental/examples/visual-effects/shared/src/commonMain/kotlin/RotatingWords.kt b/experimental/examples/visual-effects/shared/src/commonMain/kotlin/RotatingWords.kt index f9780bb783..591202ce42 100644 --- a/experimental/examples/visual-effects/shared/src/commonMain/kotlin/RotatingWords.kt +++ b/experimental/examples/visual-effects/shared/src/commonMain/kotlin/RotatingWords.kt @@ -20,12 +20,12 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp -import org.jetbrains.compose.resources.* +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.painterResource @OptIn(ExperimentalResourceApi::class) @Composable internal fun Words() { - val density = LocalDensity.current val duration = 5000 val infiniteTransition = rememberInfiniteTransition() @@ -46,8 +46,7 @@ internal fun Words() { ) ) - // TODO: use vector image (.svg or .xml) - val logoImg = resource("compose-community-primary.png").rememberImageBitmap().orEmpty() + val logoImg = painterResource("compose-community-primary.xml") val baseLogo = DpOffset(350.dp, 270.dp) diff --git a/experimental/examples/visual-effects/shared/src/commonMain/resources/compose-community-primary.xml b/experimental/examples/visual-effects/shared/src/commonMain/resources/compose-community-primary.xml new file mode 100644 index 0000000000..d7bf7955f4 --- /dev/null +++ b/experimental/examples/visual-effects/shared/src/commonMain/resources/compose-community-primary.xml @@ -0,0 +1,36 @@ + + + + + + + +