Skip to content

#885 fix usage of LocalSystemTheme on compose 1.12+ #888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ExNDY merged 1 commit into from
Sep 3, 2026
Merged

#885 fix usage of LocalSystemTheme on compose 1.12+ #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions ...urces-compose/src/commonJsMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions resources-compose/src/iosMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")

Expand Down
7 changes: 2 additions & 5 deletions resources-compose/src/jvmMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions resources-compose/src/macosMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")

Expand Down
Loading