From 584c1e5e5cd680612dda30969c7acb3b92c75784 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 14 Apr 2022 21:10:55 +0530 Subject: [PATCH] common: remove unnecessary SVG resources Compose Desktop can actually parse Android Vector Drawables just fine, provided they do not reference external resources like theme attributes or colors which our drawables do not. --- common/build.gradle.kts | 5 ++++- .../kotlin/dev/msfjarvis/claw/common/res/drawable.kt | 8 ++++---- common/src/desktopMain/resources/comment_black_24dp.svg | 1 - common/src/desktopMain/resources/favorite_black_24dp.svg | 1 - .../desktopMain/resources/favorite_border_black_24dp.svg | 1 - common/src/desktopMain/resources/web_black_24dp.svg | 5 ----- 6 files changed, 8 insertions(+), 13 deletions(-) delete mode 100644 common/src/desktopMain/resources/comment_black_24dp.svg delete mode 100644 common/src/desktopMain/resources/favorite_black_24dp.svg delete mode 100644 common/src/desktopMain/resources/favorite_border_black_24dp.svg delete mode 100644 common/src/desktopMain/resources/web_black_24dp.svg diff --git a/common/build.gradle.kts b/common/build.gradle.kts index b4cdac92..31ea2513 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -37,7 +37,10 @@ kotlin { dependsOn(sourceSets["androidTestFixturesDebug"]) dependsOn(sourceSets["androidTestFixturesRelease"]) } - sourceSets["desktopMain"].apply { dependencies { implementation(libs.kamel.image) } } + sourceSets["desktopMain"].apply { + resources.srcDir("src/androidMain/res/drawable/") + dependencies { implementation(libs.kamel.image) } + } } android { diff --git a/common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/res/drawable.kt b/common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/res/drawable.kt index c7e1519e..141eaa56 100644 --- a/common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/res/drawable.kt +++ b/common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/res/drawable.kt @@ -4,10 +4,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.painterResource actual val commentIcon - @Composable get() = painterResource("comment_black_24dp.svg") + @Composable get() = painterResource("ic_insert_comment_24dp.xml") actual val heartIcon - @Composable get() = painterResource("favorite_black_24dp.svg") + @Composable get() = painterResource("ic_favorite_24dp.xml") actual val heartBorderIcon - @Composable get() = painterResource("favorite_border_black_24dp.svg") + @Composable get() = painterResource("ic_favorite_border_24dp.xml") actual val webIcon - @Composable get() = painterResource("web_black_24dp.svg") + @Composable get() = painterResource("ic_web_24dp.xml") diff --git a/common/src/desktopMain/resources/comment_black_24dp.svg b/common/src/desktopMain/resources/comment_black_24dp.svg deleted file mode 100644 index d471af34..00000000 --- a/common/src/desktopMain/resources/comment_black_24dp.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/common/src/desktopMain/resources/favorite_black_24dp.svg b/common/src/desktopMain/resources/favorite_black_24dp.svg deleted file mode 100644 index bd27ad60..00000000 --- a/common/src/desktopMain/resources/favorite_black_24dp.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/common/src/desktopMain/resources/favorite_border_black_24dp.svg b/common/src/desktopMain/resources/favorite_border_black_24dp.svg deleted file mode 100644 index a1d4ef85..00000000 --- a/common/src/desktopMain/resources/favorite_border_black_24dp.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/common/src/desktopMain/resources/web_black_24dp.svg b/common/src/desktopMain/resources/web_black_24dp.svg deleted file mode 100644 index ff472dea..00000000 --- a/common/src/desktopMain/resources/web_black_24dp.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - -