Release 0.27.0

README.md

@@ -98,6 +98,37 @@ multiplatformResources {
 }
 ```
 
+#### Default resource source sets
+
+By default, resources for each Kotlin source set must be placed in
+`src/<sourceSetName>/moko-resources`. No additional `resourcesSourceSets` configuration is required.
+For example, common resources belong in `src/commonMain/moko-resources`, Android-only resources in
+`src/androidMain/moko-resources`, and common test resources in `src/commonTest/moko-resources`.
+
+The default common resource directory has the following structure:
+
+```
+projectDirectory
+└── src
+    └── commonMain
+        └── moko-resources
+            ├── base
+            │   ├── strings.xml
+            │   └── plurals.xml
+            ├── <languageCode>
+            │   ├── strings.xml
+            │   └── plurals.xml
+            ├── images
+            ├── fonts
+            ├── files
+            └── assets
+```
+
+This directory layout was introduced in moko-resources 0.24.0. When upgrading from 0.23.x, move
+resources from `src/commonMain/resources/MR` to `src/commonMain/moko-resources`; the directory
+structure inside the resource root remains unchanged. See the
+[0.24.0 changelog and migration guide](https://github.com/icerockdev/moko-resources/discussions/730).
+
 #### Custom resource sourceSet
 
 If you need custom path for source of resources, you need add in plugin configuration resourcesSourceSets option:
@@ -121,7 +152,7 @@ On next step, you must create inside of project directory folder with name: `cus
 -- customResources
 --- assets
 --- base
---- image
+--- images
 ```
 
 Example of custom sourceSet in: `resources-gallery` sample, inside `jvm-app`
@@ -134,7 +165,7 @@ should [add `export` declarations](https://kotlinlang.org/docs/multiplatform-bui
 ```
 framework {
     export("dev.icerock.moko:resources:0.26.4")
-    export("dev.icerock.moko:graphics:0.10.0") // toUIColor here
+    export("dev.icerock.moko:graphics:0.10.2") // toUIColor here
 }
 ```
 

gradle/libs.versions.toml

@@ -38,7 +38,7 @@ commonsCodecVersion = "1.15"
 batikVersion = "1.17"
 
 # moko
-mokoGraphicsVersion = "0.10.0"
+mokoGraphicsVersion = "0.10.2"
 mokoTestVersion = "0.6.1"
 mokoMultiplatformPluginVersion = "0.14.2"
 
@@ -81,4 +81,4 @@ composeJetBrainsPlugin = { module = "org.jetbrains.compose:compose-gradle-plugin
 nexusPublishing = { module = "io.github.gradle-nexus:publish-plugin", version = "2.0.0" }
 
 [plugins]
-composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinVersion" }
+composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinVersion" }

gradle/moko.versions.toml

@@ -1,7 +1,9 @@
 [versions]
-resourcesVersion = "0.26.4"
+graphicsVersion = "0.10.2"
+resourcesVersion = "0.27.0"
 
 [libraries]
+graphics = { module = "dev.icerock.moko:graphics", version.ref = "graphicsVersion" }
 resources = { module = "dev.icerock.moko:resources", version.ref = "resourcesVersion" }
 resourcesCompose = { module = "dev.icerock.moko:resources-compose", version.ref = "resourcesVersion" }
 resourcesTest = { module = "dev.icerock.moko:resources-test", version.ref = "resourcesVersion" }

resources-build-logic/src/main/kotlin/multiplatform-library-extended-convention.gradle.kts

@@ -10,6 +10,7 @@ kotlin {
     watchosX64()
     watchosArm32()
     watchosArm64()
+    watchosDeviceArm64()
     watchosSimulatorArm64()
 
     sourceSets {
@@ -27,9 +28,11 @@ kotlin {
         val watchosArm64Main by getting{
             dependsOn(watchosMain)
         }
+        val watchosDeviceArm64Main by getting {
+            dependsOn(watchosMain)
+        }
         val watchosSimulatorArm64Main by getting{
             dependsOn(watchosMain)
         }
     }
 }
-

resources-compose/src/commonJsMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt

@@ -4,12 +4,10 @@
 
 package dev.icerock.moko.resources.compose
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.compose.ui.InternalComposeUiApi
-import androidx.compose.ui.LocalSystemTheme
-import androidx.compose.ui.SystemTheme
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.painter.BitmapPainter
@@ -25,10 +23,9 @@ import org.jetbrains.skia.Data
 import org.jetbrains.skia.Image
 import org.jetbrains.skia.svg.SVGDOM
 
-@OptIn(InternalComposeUiApi::class)
 @Composable
 actual fun painterResource(imageResource: ImageResource): Painter {
-    val fileUrl: String = if (LocalSystemTheme.current == SystemTheme.Dark) {
+    val fileUrl: String = if (isSystemInDarkTheme()) {
         imageResource.darkFileUrl ?: imageResource.fileUrl
     } else {
         imageResource.fileUrl

resources-compose/src/iosMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt

@@ -4,10 +4,9 @@
 
 package dev.icerock.moko.resources.compose
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.compose.ui.InternalComposeUiApi
-import androidx.compose.ui.LocalSystemTheme
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.toComposeImageBitmap
@@ -18,10 +17,11 @@ import org.jetbrains.skia.Image
 import platform.CoreGraphics.CGImageRef
 import platform.UIKit.UIImage
 
-@OptIn(ExperimentalForeignApi::class, InternalComposeUiApi::class)
+@OptIn(ExperimentalForeignApi::class)
 @Composable
 actual fun painterResource(imageResource: ImageResource): Painter {
-    return remember(LocalSystemTheme.current, imageResource) {
+    val isDarkTheme: Boolean = isSystemInDarkTheme()
+    return remember(isDarkTheme, imageResource) {
         val uiImage: UIImage = imageResource.toUIImage()
             ?: throw IllegalArgumentException("can't read UIImage of $imageResource")
 

resources-compose/src/jvmMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt

@@ -4,18 +4,15 @@
 
 package dev.icerock.moko.resources.compose
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.InternalComposeUiApi
-import androidx.compose.ui.LocalSystemTheme
-import androidx.compose.ui.SystemTheme
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.painterResource
 import dev.icerock.moko.resources.ImageResource
 
-@OptIn(InternalComposeUiApi::class)
 @Composable
 actual fun painterResource(imageResource: ImageResource): Painter {
-    val filePath: String = if (LocalSystemTheme.current == SystemTheme.Dark) {
+    val filePath: String = if (isSystemInDarkTheme()) {
         imageResource.darkFilePath ?: imageResource.filePath
     } else {
         imageResource.filePath

resources-compose/src/macosMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt

@@ -4,10 +4,9 @@
 
 package dev.icerock.moko.resources.compose
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.compose.ui.InternalComposeUiApi
-import androidx.compose.ui.LocalSystemTheme
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.toComposeImageBitmap
@@ -19,10 +18,11 @@ import platform.AppKit.NSImage
 import platform.CoreGraphics.CGImageRef
 import platform.CoreGraphics.CGImageRelease
 
-@OptIn(ExperimentalForeignApi::class, InternalComposeUiApi::class)
+@OptIn(ExperimentalForeignApi::class)
 @Composable
 actual fun painterResource(imageResource: ImageResource): Painter {
-    return remember(LocalSystemTheme.current, imageResource) {
+    val isDarkTheme: Boolean = isSystemInDarkTheme()
+    return remember(isDarkTheme, imageResource) {
         val nsImage: NSImage = imageResource.toNSImage()
             ?: throw IllegalArgumentException("can't read NSImage of $imageResource")