From 7568c9a912707358a1f001eacce079980ab48439 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 00:33:54 +0900 Subject: [PATCH 01/27] Replaced wildcard imports with the proper paths without abbreviations --- tutorials/UI_Testing/README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tutorials/UI_Testing/README.md b/tutorials/UI_Testing/README.md index 51daf01e060..ef363e27060 100644 --- a/tutorials/UI_Testing/README.md +++ b/tutorials/UI_Testing/README.md @@ -35,10 +35,16 @@ And the directory for tests will be `src/desktopTest/kotlin` In the tests directory, create a file named `ExampleTest.kt` and paste this code into it: ```kotlin -import androidx.compose.material.* -import androidx.compose.runtime.* +import androidx.compose.material.Button +import androidx.compose.material.Text +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.getValue +import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier -import androidx.compose.ui.test.* +import androidx.compose.ui.test.assertTextEquals +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.performClick import androidx.compose.ui.platform.testTag import androidx.compose.ui.test.junit4.createComposeRule import org.junit.Rule From 1b2f258cfd160b3cee431ea7525f997852694eb6 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 00:34:40 +0900 Subject: [PATCH 02/27] Removed duplicating blank lines in the end of the file --- tutorials/UI_Testing/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/tutorials/UI_Testing/README.md b/tutorials/UI_Testing/README.md index ef363e27060..57b5cf3ea20 100644 --- a/tutorials/UI_Testing/README.md +++ b/tutorials/UI_Testing/README.md @@ -81,4 +81,3 @@ Now you can run the test by either clicking ![run](https://github.com/JetBrains/ ``` ./gradlew test ``` - From ad904cbd11f2bfa234a60a505cab598c99fce44d Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 00:39:00 +0900 Subject: [PATCH 03/27] Replaced wildcard imports with the proper paths without abbreviations --- benchmarks/desktop/build.gradle.kts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/benchmarks/desktop/build.gradle.kts b/benchmarks/desktop/build.gradle.kts index ceda7f51d5e..6a00976698b 100644 --- a/benchmarks/desktop/build.gradle.kts +++ b/benchmarks/desktop/build.gradle.kts @@ -1,6 +1,7 @@ import org.jetbrains.compose.compose -import kotlinx.benchmark.gradle.* -import org.jetbrains.kotlin.allopen.gradle.* +import kotlinx.benchmark.gradle.BenchmarkExtension +import kotlinx.benchmark.gradle.JvmBenchmarkTarget +import org.jetbrains.kotlin.allopen.gradle.AllOpenExtension plugins { kotlin("jvm") version "1.4.20" From afe15d39e3b4a82c48827d6503d892fd5d8bf853 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 00:43:34 +0900 Subject: [PATCH 04/27] Replaced wildcard imports with the proper paths without abbreviations --- html/svg/src/jsTest/kotlin/svg/SvgTests.kt | 45 ++++++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/html/svg/src/jsTest/kotlin/svg/SvgTests.kt b/html/svg/src/jsTest/kotlin/svg/SvgTests.kt index 9ba368e4a08..81f7ed4bc3c 100644 --- a/html/svg/src/jsTest/kotlin/svg/SvgTests.kt +++ b/html/svg/src/jsTest/kotlin/svg/SvgTests.kt @@ -9,13 +9,52 @@ import org.jetbrains.compose.web.ExperimentalComposeWebSvgApi import org.jetbrains.compose.web.css.opacity import org.jetbrains.compose.web.css.percent import org.jetbrains.compose.web.css.px -import org.jetbrains.compose.web.svg.* -import org.jetbrains.compose.web.testutils.* +import org.jetbrains.compose.web.svg.Animate +import org.jetbrains.compose.web.svg.AnimateMotion +import org.jetbrains.compose.web.svg.AnimateTransform +import org.jetbrains.compose.web.svg.Circle +import org.jetbrains.compose.web.svg.ClipPath +import org.jetbrains.compose.web.svg.Defs +import org.jetbrains.compose.web.svg.Desc +import org.jetbrains.compose.web.svg.Ellipse +import org.jetbrains.compose.web.svg.Filter +import org.jetbrains.compose.web.svg.G +import org.jetbrains.compose.web.svg.Image +import org.jetbrains.compose.web.svg.Line +import org.jetbrains.compose.web.svg.LinearGradient +import org.jetbrains.compose.web.svg.Marker +import org.jetbrains.compose.web.svg.Mask +import org.jetbrains.compose.web.svg.Mpath +import org.jetbrains.compose.web.svg.Path +import org.jetbrains.compose.web.svg.Pattern +import org.jetbrains.compose.web.svg.Polygon +import org.jetbrains.compose.web.svg.Polyline +import org.jetbrains.compose.web.svg.RadialGradient +import org.jetbrains.compose.web.svg.Rect +import org.jetbrains.compose.web.svg.Set +import org.jetbrains.compose.web.svg.Stop +import org.jetbrains.compose.web.svg.Svg +import org.jetbrains.compose.web.svg.SvgA +import org.jetbrains.compose.web.svg.SvgElement +import org.jetbrains.compose.web.svg.SvgText +import org.jetbrains.compose.web.svg.Symbol +import org.jetbrains.compose.web.svg.TextPath +import org.jetbrains.compose.web.svg.Title +import org.jetbrains.compose.web.svg.Tspan +import org.jetbrains.compose.web.svg.Use +import org.jetbrains.compose.web.svg.View +import org.jetbrains.compose.web.svg.attr +import org.jetbrains.compose.web.testutils.assertContains +import org.jetbrains.compose.web.testutils.assertEquals +import org.jetbrains.compose.web.testutils.classes +import org.jetbrains.compose.web.testutils.composition +import org.jetbrains.compose.web.testutils.nextChild +import org.jetbrains.compose.web.testutils.runTest +import org.jetbrains.compose.web.testutils.style import org.w3c.dom.svg.SVGCircleElement import org.w3c.dom.svg.SVGElement import org.w3c.dom.svg.SVGTextElement import kotlin.test.Test -import kotlin.test.assertEquals @ExperimentalComposeWebSvgApi class SvgTests { From d9dcbfae6f627b5c84e44b072f5e93ecbf7edc3e Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 00:47:16 +0900 Subject: [PATCH 05/27] Replaced wildcard imports with the proper paths without abbreviations --- html/core/src/jsTest/kotlin/css/ColorTests.kt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/html/core/src/jsTest/kotlin/css/ColorTests.kt b/html/core/src/jsTest/kotlin/css/ColorTests.kt index f57581150b7..f5b72644d5b 100644 --- a/html/core/src/jsTest/kotlin/css/ColorTests.kt +++ b/html/core/src/jsTest/kotlin/css/ColorTests.kt @@ -5,14 +5,23 @@ package org.jetbrains.compose.web.core.tests.css -import org.jetbrains.compose.web.testutils.* -import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.testutils.assertContains +import org.jetbrains.compose.web.testutils.assertEquals +import org.jetbrains.compose.web.testutils.composition +import org.jetbrains.compose.web.testutils.nextChild +import org.jetbrains.compose.web.testutils.root +import org.jetbrains.compose.web.testutils.runTest +import org.jetbrains.compose.web.css.Color +import org.jetbrains.compose.web.css.color +import org.jetbrains.compose.web.css.hsl +import org.jetbrains.compose.web.css.hsla +import org.jetbrains.compose.web.css.rgb +import org.jetbrains.compose.web.css.rgba +import org.jetbrains.compose.web.css.style import org.jetbrains.compose.web.dom.Div import org.w3c.dom.HTMLElement import org.w3c.dom.get import kotlin.test.Test -import kotlin.test.assertEquals - class ColorTests { @Test From 2ff24ba7bb204aec5b780ef580ce5c26a58738bb Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 00:49:51 +0900 Subject: [PATCH 06/27] Replaced wildcard imports with the proper paths without abbreviations --- .../src/jsTest/kotlin/InlineStyleTests.kt | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/html/core/src/jsTest/kotlin/InlineStyleTests.kt b/html/core/src/jsTest/kotlin/InlineStyleTests.kt index 4dd01831c5c..177305a16ff 100644 --- a/html/core/src/jsTest/kotlin/InlineStyleTests.kt +++ b/html/core/src/jsTest/kotlin/InlineStyleTests.kt @@ -3,13 +3,26 @@ package org.jetbrains.compose.web.core.tests import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.css.Color +import org.jetbrains.compose.web.css.color +import org.jetbrains.compose.web.css.height import org.jetbrains.compose.web.css.keywords.auto +import org.jetbrains.compose.web.css.opacity +import org.jetbrains.compose.web.css.padding +import org.jetbrains.compose.web.css.px +import org.jetbrains.compose.web.css.style import org.jetbrains.compose.web.dom.Span import org.jetbrains.compose.web.dom.Text +import org.jetbrains.compose.web.testutils.assertEquals +import org.jetbrains.compose.web.testutils.getAttribute +import org.jetbrains.compose.web.testutils.getAttributeNames +import org.jetbrains.compose.web.testutils.composition +import org.jetbrains.compose.web.testutils.id +import org.jetbrains.compose.web.testutils.nextChild +import org.jetbrains.compose.web.testutils.root +import org.jetbrains.compose.web.testutils.runTest +import org.jetbrains.compose.web.testutils.waitForChanges import kotlin.test.Test -import kotlin.test.assertEquals -import org.jetbrains.compose.web.testutils.* class InlineStyleTests { From 68ea940501267595921101bb77e96caa1471060f Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 00:52:28 +0900 Subject: [PATCH 07/27] Replaced wildcard imports with the proper paths without abbreviations --- .../core/src/jsTest/kotlin/css/FilterTests.kt | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/html/core/src/jsTest/kotlin/css/FilterTests.kt b/html/core/src/jsTest/kotlin/css/FilterTests.kt index 89dae0b3f4d..545f9354cd6 100644 --- a/html/core/src/jsTest/kotlin/css/FilterTests.kt +++ b/html/core/src/jsTest/kotlin/css/FilterTests.kt @@ -6,12 +6,31 @@ package org.jetbrains.compose.web.core.tests.css import org.jetbrains.compose.web.ExperimentalComposeWebApi -import org.jetbrains.compose.web.testutils.* -import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.testutils.assertEquals +import org.jetbrains.compose.web.testutils.composition +import org.jetbrains.compose.web.testutils.nextChild +import org.jetbrains.compose.web.testutils.runTest +import org.jetbrains.compose.web.css.Color +import org.jetbrains.compose.web.css.blur +import org.jetbrains.compose.web.css.brightness +import org.jetbrains.compose.web.css.contrast +import org.jetbrains.compose.web.css.deg +import org.jetbrains.compose.web.css.dropShadow +import org.jetbrains.compose.web.css.em +import org.jetbrains.compose.web.css.filter +import org.jetbrains.compose.web.css.grayscale +import org.jetbrains.compose.web.css.hueRotate +import org.jetbrains.compose.web.css.invert +import org.jetbrains.compose.web.css.opacity +import org.jetbrains.compose.web.css.percent +import org.jetbrains.compose.web.css.px +import org.jetbrains.compose.web.css.saturate +import org.jetbrains.compose.web.css.sepia +import org.jetbrains.compose.web.css.style +import org.jetbrains.compose.web.css.turn import org.jetbrains.compose.web.dom.Div import org.jetbrains.compose.web.dom.Img import kotlin.test.Test -import kotlin.test.assertEquals @ExperimentalComposeWebApi class FilterTests { From f4172f04f77f74b206f2efd65977b696e35e5173 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 00:55:10 +0900 Subject: [PATCH 08/27] Replaced wildcard imports with the proper paths without abbreviations --- .../lwjgl-integration/src/main/kotlin/main.kt | 36 ++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/experimental/lwjgl-integration/src/main/kotlin/main.kt b/experimental/lwjgl-integration/src/main/kotlin/main.kt index feb92e63e21..7b10bcc77bc 100644 --- a/experimental/lwjgl-integration/src/main/kotlin/main.kt +++ b/experimental/lwjgl-integration/src/main/kotlin/main.kt @@ -1,14 +1,40 @@ import androidx.compose.ui.ComposeScene import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Density -import org.jetbrains.skia.* -import org.jetbrains.skia.FramebufferFormat.Companion.GR_GL_RGBA8 +import org.jetbrains.skia.BackendRenderTarget +import org.jetbrains.skia.Color +import org.jetbrains.skia.ColorSpace +import org.jetbrains.skia.DirectContext +import org.jetbrains.skia.FramebufferFormat +import org.jetbrains.skia.Surface +import org.jetbrains.skia.SurfaceColorFormat +import org.jetbrains.skia.SurfaceOrigin import org.jetbrains.skiko.FrameDispatcher -import org.lwjgl.glfw.GLFW.* +import org.jetbrains.skiko.GlfwCoroutineDispatcher +import org.lwjgl.glfw.GLFW.GLFW_FALSE +import org.lwjgl.glfw.GLFW.GLFW_RESIZABLE +import org.lwjgl.glfw.GLFW.GLFW_TRUE +import org.lwjgl.glfw.GLFW.GLFW_VISIBLE +import org.lwjgl.glfw.GLFW.glfwCreateWindow +import org.lwjgl.glfw.GLFW.glfwDestroyWindow +import org.lwjgl.glfw.GLFW.glfwGetWindowSize +import org.lwjgl.glfw.GLFW.glfwInit +import org.lwjgl.glfw.GLFW.glfwMakeContextCurrent +import org.lwjgl.glfw.GLFW.glfwPollEvents +import org.lwjgl.glfw.GLFW.glfwSetKeyCallback +import org.lwjgl.glfw.GLFW.glfwSetWindowCloseCallback +import org.lwjgl.glfw.GLFW.glfwSetWindowSizeCallback +import org.lwjgl.glfw.GLFW.glfwShowWindow +import org.lwjgl.glfw.GLFW.glfwSwapBuffers +import org.lwjgl.glfw.GLFW.glfwSwapInterval +import org.lwjgl.glfw.GLFW.glfwTerminate +import org.lwjgl.glfw.GLFW.glfwWaitEvents +import org.lwjgl.glfw.GLFW.glfwWindowHint +import org.lwjgl.glfw.GLFW.glfwWindowShouldClose import org.lwjgl.opengl.GL import org.lwjgl.opengl.GL11 -import org.lwjgl.opengl.GL30.GL_FRAMEBUFFER_BINDING -import org.lwjgl.system.MemoryUtil.NULL +import org.lwjgl.opengl.GL30 +import org.lwjgl.system.MemoryUtil import kotlin.system.exitProcess fun main() { From 225d52dcf373491868085bc883bb0407ba292e28 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 00:57:11 +0900 Subject: [PATCH 09/27] Replaced wildcard imports with the proper paths without abbreviations --- .../org/jetbrains/compose/resources/ImageResources.js.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/ImageResources.js.kt b/components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/ImageResources.js.kt index 725ffd532dd..f9c23a09738 100644 --- a/components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/ImageResources.js.kt +++ b/components/resources/library/src/jsMain/kotlin/org/jetbrains/compose/resources/ImageResources.js.kt @@ -1,6 +1,8 @@ package org.jetbrains.compose.resources -import org.jetbrains.compose.resources.vector.xmldom.* +import org.jetbrains.compose.resources.vector.xmldom.Element +import org.jetbrains.compose.resources.vector.xmldom.ElementImpl +import org.jetbrains.compose.resources.vector.xmldom.MalformedXMLException import org.w3c.dom.parsing.DOMParser internal actual fun ByteArray.toXmlElement(): Element { From eb1d230baddce9f948d1b376b0a8f47798395505 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 00:59:45 +0900 Subject: [PATCH 10/27] Replaced wildcard imports with the proper paths without abbreviations --- .../org/jetbrains/compose/web/internal/runtime/DomApplier.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/DomApplier.kt b/html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/DomApplier.kt index 16a3ce7be48..61bbc7d1257 100644 --- a/html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/DomApplier.kt +++ b/html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/DomApplier.kt @@ -2,8 +2,7 @@ package org.jetbrains.compose.web.internal.runtime import androidx.compose.runtime.AbstractApplier import kotlinx.dom.clear -import org.w3c.dom.* -import org.w3c.dom.css.CSSStyleDeclaration +import org.w3c.dom.Node import org.w3c.dom.events.EventListener @ComposeWebInternalApi From 28ceb971c226d9e0fecfa0d1d48fc3f37a3c914b Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 01:03:30 +0900 Subject: [PATCH 11/27] Replaced wildcard imports with the proper paths without abbreviations --- .../org/jetbrains/compose/ComposePlugin.kt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt index 41e9afd7efc..d841c3c336c 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt @@ -19,17 +19,27 @@ import org.jetbrains.compose.desktop.DesktopExtension import org.jetbrains.compose.desktop.application.internal.configureDesktop import org.jetbrains.compose.desktop.preview.internal.initializePreview import org.jetbrains.compose.experimental.dsl.ExperimentalExtension -import org.jetbrains.compose.experimental.internal.* -import org.jetbrains.compose.internal.* +import org.jetbrains.compose.experimental.internal.ComposeCompilerCompatibility +import org.jetbrains.compose.experimental.internal.ExperimentalComposeLibrary +import org.jetbrains.compose.internal.ComposeBuildConfig +import org.jetbrains.compose.internal.Dependencies +import org.jetbrains.compose.internal.ComposeExtension +import org.jetbrains.compose.internal.configureComposeCompilerPlugin +import org.jetbrains.compose.internal.configureExperimentalTargetsFlagsCheck +import org.jetbrains.compose.internal.getKotlinPluginVersion +import org.jetbrains.compose.internal.mppExt +import org.jetbrains.compose.internal.mppExtOrNull import org.jetbrains.compose.internal.utils.currentTarget import org.jetbrains.compose.resources.ResourcesExtension import org.jetbrains.compose.resources.configureComposeResources import org.jetbrains.compose.web.WebExtension import org.jetbrains.compose.web.internal.configureWeb -import org.jetbrains.kotlin.com.github.gundy.semver4j.SemVer import org.jetbrains.kotlin.gradle.dsl.KotlinCompile import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile -import org.jetbrains.kotlin.gradle.plugin.* +import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType +import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler +import org.jetbrains.kotlin.gradle.plugin.KOTLIN_MPP_PLUGIN_ID +import org.jetbrains.kotlin.gradle.plugin.mppExt internal val composeVersion get() = ComposeBuildConfig.composeVersion From bc56a48a29cef85a179d6fa2633a28ebf4386afb Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 01:05:06 +0900 Subject: [PATCH 12/27] Replaced wildcard imports with the proper paths without abbreviations --- .../src/macosMain/kotlin/main.macos.kt | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/benchmarks/kn-performance/src/macosMain/kotlin/main.macos.kt b/benchmarks/kn-performance/src/macosMain/kotlin/main.macos.kt index 73adc79d6b6..f274901c5fd 100644 --- a/benchmarks/kn-performance/src/macosMain/kotlin/main.macos.kt +++ b/benchmarks/kn-performance/src/macosMain/kotlin/main.macos.kt @@ -1,7 +1,21 @@ import kotlinx.cinterop.ExperimentalForeignApi import kotlinx.cinterop.objcPtr -import org.jetbrains.skia.* -import platform.Metal.* +import org.jetbrains.skia.BackendRenderTarget +import org.jetbrains.skia.ColorSpace +import org.jetbrains.skia.DirectContext +import org.jetbrains.skia.GraphicsContext +import org.jetbrains.skia.PixelGeometry +import org.jetbrains.skia.Surface +import org.jetbrains.skia.SurfaceColorFormat +import org.jetbrains.skia.SurfaceOrigin +import org.jetbrains.skia.SurfaceProps +import platform.Metal.MTLCreateSystemDefaultDevice +import platform.Metal.MTLPixelFormatBGRA8Unorm +import platform.Metal.MTLTextureDescriptor +import platform.Metal.MTLTextureType2D +import platform.Metal.MTLTextureUsageRenderTarget +import platform.Metal.MTLTextureUsageShaderRead +import platform.Metal.MTLTextureUsageShaderWrite import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine From 87d915556dd02add05151d77a13373197e547391 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 01:08:32 +0900 Subject: [PATCH 13/27] Replaced wildcard imports with the proper paths without abbreviations --- tutorials/HTML/Using_Effects/README.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tutorials/HTML/Using_Effects/README.md b/tutorials/HTML/Using_Effects/README.md index 11ff18f54ea..b0e698bf393 100644 --- a/tutorials/HTML/Using_Effects/README.md +++ b/tutorials/HTML/Using_Effects/README.md @@ -103,13 +103,23 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.setValue import androidx.compose.runtime.Composable import kotlinx.browser.document -import org.jetbrains.compose.web.css.* -import org.jetbrains.compose.web.dom.* +import org.jetbrains.compose.web.css.Color +import org.jetbrains.compose.web.css.backgroundColor +import org.jetbrains.compose.web.css.minHeight +import org.jetbrains.compose.web.css.padding +import org.jetbrains.compose.web.css.px +import org.jetbrains.compose.web.css.width +import org.jetbrains.compose.web.dom.Button +import org.jetbrains.compose.web.dom.CheckboxInput +import org.jetbrains.compose.web.dom.DisposableRefEffect +import org.jetbrains.compose.web.dom.Div +import org.jetbrains.compose.web.dom.DomSideEffect +import org.jetbrains.compose.web.dom.Label +import org.jetbrains.compose.web.dom.Text import org.jetbrains.compose.web.renderComposable import org.w3c.dom.HTMLElement import org.w3c.dom.HTMLParagraphElement - // Here we pretend that `RedBoldTextNotComposableRenderer` // wraps a UI logic provided by 3rd party library that doesn't use Compose From e430858c6273913d421856459854e6ec835ff246 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 01:32:53 +0900 Subject: [PATCH 14/27] Removed a duplicating blank line in the end of the file --- .../jetbrains/compose/resources/vector/xmldom/DomXmlParser.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/components/resources/library/src/nativeMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/DomXmlParser.kt b/components/resources/library/src/nativeMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/DomXmlParser.kt index ab6b51d30e2..35085f5c5c4 100644 --- a/components/resources/library/src/nativeMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/DomXmlParser.kt +++ b/components/resources/library/src/nativeMain/kotlin/org/jetbrains/compose/resources/vector/xmldom/DomXmlParser.kt @@ -129,4 +129,3 @@ private class DomXmlParser : NSObject(), NSXMLParserDelegateProtocol { throw MalformedXMLException("parse error occurred") } } - From 998c6b9ddf7798dab906bacd7dee35e5fa5e35fe Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 01:35:47 +0900 Subject: [PATCH 15/27] Replaced wildcard imports with the proper paths without abbreviations --- .../shared/src/commonMain/kotlin/minesweeper/Widgets.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/examples/graphics-2d/shared/src/commonMain/kotlin/minesweeper/Widgets.kt b/examples/graphics-2d/shared/src/commonMain/kotlin/minesweeper/Widgets.kt index df151d0fbb5..d6961000908 100644 --- a/examples/graphics-2d/shared/src/commonMain/kotlin/minesweeper/Widgets.kt +++ b/examples/graphics-2d/shared/src/commonMain/kotlin/minesweeper/Widgets.kt @@ -6,7 +6,11 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -17,7 +21,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import graphics_2d.shared.generated.resources.* +import graphics_2d.shared.generated.resources.Res import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.painterResource From 31e8a8f096631c2eb35e657e5b3de92a6f1284ec Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Tue, 25 Jun 2024 09:58:31 +0900 Subject: [PATCH 16/27] Replaced wildcard imports with the proper paths without abbreviations --- .../kotlin/visualeffects/RotatingWords.kt | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/examples/graphics-2d/shared/src/commonMain/kotlin/visualeffects/RotatingWords.kt b/examples/graphics-2d/shared/src/commonMain/kotlin/visualeffects/RotatingWords.kt index e896fafe854..5fc18c6774a 100644 --- a/examples/graphics-2d/shared/src/commonMain/kotlin/visualeffects/RotatingWords.kt +++ b/examples/graphics-2d/shared/src/commonMain/kotlin/visualeffects/RotatingWords.kt @@ -1,9 +1,21 @@ package visualeffects -import androidx.compose.animation.core.* +import androidx.compose.animation.core.FastOutSlowInEasing +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.RepeatMode +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween import androidx.compose.foundation.Image import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -20,8 +32,9 @@ 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 graphics_2d.shared.generated.resources.* +import graphics_2d.shared.generated.resources.Res import org.jetbrains.compose.resources.painterResource +import kotlin.random.Random.Default.nextFloat as random @Composable fun Words() { From cfd5bc8212d80849ec427b30c32f44f680f15d0f Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Thu, 27 Jun 2024 22:47:14 +0900 Subject: [PATCH 17/27] Replaced wildcard imports with the proper paths without abbreviations --- .../kotlin/org/jetbrains/compose/internal/utils/gradleUtils.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/utils/gradleUtils.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/utils/gradleUtils.kt index 4b418218910..73c8d9108f3 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/utils/gradleUtils.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/utils/gradleUtils.kt @@ -10,7 +10,8 @@ import org.gradle.api.Project import org.gradle.api.artifacts.Configuration import org.gradle.api.logging.Logger import org.jetbrains.compose.ComposeBuildConfig -import java.util.* +import java.io.File +import java.util.Properties internal inline fun Logger.info(fn: () -> String) { if (isInfoEnabled) { From 98350533444ac48fa79d7689c4fc1c46c2a434d5 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Thu, 27 Jun 2024 22:48:36 +0900 Subject: [PATCH 18/27] Replaced wildcard imports with the proper paths without abbreviations --- .../webApp/src/jsWasmMain/kotlin/Common.kt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/examples/imageviewer/webApp/src/jsWasmMain/kotlin/Common.kt b/examples/imageviewer/webApp/src/jsWasmMain/kotlin/Common.kt index 39ec721f29f..b6a6c40f8d5 100644 --- a/examples/imageviewer/webApp/src/jsWasmMain/kotlin/Common.kt +++ b/examples/imageviewer/webApp/src/jsWasmMain/kotlin/Common.kt @@ -1,12 +1,21 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material.Surface -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier -import example.imageviewer.* -import example.imageviewer.style.ImageViewerTheme +import example.imageviewer.Dependencies +import example.imageviewer.ImageViewerCommon +import example.imageviewer.ImageStorage +import example.imageviewer.WebImageStorage +import example.imageviewer.WebSharePicture import example.imageviewer.ioDispatcher +import example.imageviewer.style.ImageViewerTheme import example.imageviewer.view.Toast import example.imageviewer.view.ToastState +import example.imageviewer.view.WebPopupNotification import kotlinx.coroutines.CoroutineScope @Composable From 0a88a0ba1e37818c8736738039c73899cb35c943 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Thu, 27 Jun 2024 22:49:58 +0900 Subject: [PATCH 19/27] Replaced wildcard imports with the proper paths without abbreviations --- .../org/jetbrains/compose/resources/FontResources.android.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/FontResources.android.kt b/components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/FontResources.android.kt index 64f87e54403..acac31d1969 100644 --- a/components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/FontResources.android.kt +++ b/components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/FontResources.android.kt @@ -3,7 +3,9 @@ package org.jetbrains.compose.resources import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.text.font.* +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontStyle +import androidx.compose.ui.text.font.FontWeight @Composable actual fun Font(resource: FontResource, weight: FontWeight, style: FontStyle): Font { From 646bdd69b243c5194da3167b27e60824de046301 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Thu, 27 Jun 2024 22:54:09 +0900 Subject: [PATCH 20/27] Replaced wildcard imports with the proper paths without abbreviations --- .../compose/desktop/application/internal/files/fileUtils.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/files/fileUtils.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/files/fileUtils.kt index 64a314ad220..ed577ad068e 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/files/fileUtils.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/files/fileUtils.kt @@ -9,7 +9,10 @@ import org.gradle.api.tasks.Internal import org.jetbrains.compose.desktop.application.dsl.TargetFormat import org.jetbrains.compose.internal.utils.OS import org.jetbrains.compose.internal.utils.currentOS -import java.io.* +import java.io.File +import java.io.FileInputStream +import java.io.FileOutputStream +import java.io.InputStream import java.security.DigestInputStream import java.security.MessageDigest import java.util.zip.ZipEntry From 9aea5e36e3293a318b876d5ee093ab88728cc820 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Thu, 27 Jun 2024 22:57:19 +0900 Subject: [PATCH 21/27] Replaced wildcard imports with the proper paths without abbreviations --- .../content/AboutComposeWebLibsSection.kt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/examples/html/landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt b/examples/html/landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt index 60177c75336..3ba9321047c 100644 --- a/examples/html/landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt +++ b/examples/html/landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt @@ -3,11 +3,24 @@ package com.sample.content import androidx.compose.runtime.Composable import org.jetbrains.compose.web.css.px import org.jetbrains.compose.web.css.value -import org.jetbrains.compose.web.dom.* +import org.jetbrains.compose.web.dom.A +import org.jetbrains.compose.web.dom.Div +import org.jetbrains.compose.web.dom.H2 +import org.jetbrains.compose.web.dom.Img +import org.jetbrains.compose.web.dom.Li +import org.jetbrains.compose.web.dom.P +import org.jetbrains.compose.web.dom.Text +import org.jetbrains.compose.web.dom.Ul import com.sample.components.Card import com.sample.components.ContainerInSection import com.sample.components.LinkOnCard -import com.sample.style.* +import com.sample.style.WtButtonThemeLight +import com.sample.style.WtButtons +import com.sample.style.WtCols +import com.sample.style.WtOffsets +import com.sample.style.WtRows +import com.sample.style.WtSections +import com.sample.style.WtTexts import org.jetbrains.compose.web.attributes.ATarget import org.jetbrains.compose.web.attributes.target import org.jetbrains.compose.web.css.paddingTop From 2f0e3f9167b585978489c0c2caa04bee6e4f513b Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Thu, 27 Jun 2024 23:00:16 +0900 Subject: [PATCH 22/27] Replaced wildcard imports with the proper paths without abbreviations --- .../shared/src/iosMain/kotlin/main.ios.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/examples/interop/ios-uikit-in-compose/shared/src/iosMain/kotlin/main.ios.kt b/examples/interop/ios-uikit-in-compose/shared/src/iosMain/kotlin/main.ios.kt index aa2ff4b7ebc..313312064e9 100644 --- a/examples/interop/ios-uikit-in-compose/shared/src/iosMain/kotlin/main.ios.kt +++ b/examples/interop/ios-uikit-in-compose/shared/src/iosMain/kotlin/main.ios.kt @@ -1,5 +1,10 @@ import androidx.compose.foundation.border -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -8,6 +13,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.interop.UIKitView import androidx.compose.ui.unit.dp import androidx.compose.ui.window.ComposeUIViewController +import androidx.compose.ui.window.WindowInsets +import androidx.compose.ui.window.systemBars import kotlinx.cinterop.ExperimentalForeignApi import platform.MapKit.MKMapView import platform.UIKit.UIViewController From 79cd76b1061eba39e93bd1b9ee7ebab0a1eb4cd6 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Thu, 27 Jun 2024 23:02:26 +0900 Subject: [PATCH 23/27] Replaced wildcard imports with explicit imports --- .../compose/resources/ComposeResourceTest.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.kt b/components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.kt index bc7c7ddb85c..8ef1ffe7e70 100644 --- a/components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.kt +++ b/components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.kt @@ -2,11 +2,18 @@ package org.jetbrains.compose.resources import androidx.compose.foundation.Image import androidx.compose.material3.Text -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.InternalResourceApi +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.runComposeUiTest import kotlinx.coroutines.test.runTest -import kotlin.test.* +import kotlin.test.assertEquals +import kotlin.test.assertFailsWith +import kotlin.test.assertTrue @OptIn(ExperimentalTestApi::class, InternalResourceApi::class) class ComposeResourceTest { From 48cdfae1d42857b974ed6a0c5da3d5a0a1e05b61 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Thu, 27 Jun 2024 23:05:26 +0900 Subject: [PATCH 24/27] Replaced wildcard imports with explicit imports --- .../kotlin/org/jetbrains/compose/internal/utils/fileUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/utils/fileUtils.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/utils/fileUtils.kt index 46c3a2a1bdd..566ef82d0a1 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/utils/fileUtils.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/utils/fileUtils.kt @@ -12,7 +12,7 @@ import org.gradle.api.file.FileSystemOperations import org.gradle.api.file.RegularFile import org.gradle.api.provider.Provider import java.io.File -import java.util.* +import java.util.Properties internal fun Provider.toDir(project: Project): Provider = project.layout.dir(map { File(it) }) From 544684b38118c2b1fcf2a91bc9a1c93a7312bce3 Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Thu, 27 Jun 2024 23:14:01 +0900 Subject: [PATCH 25/27] Replaced wildcard imports with explicit imports --- .../org/jetbrains/compose/resources/StringResources.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/StringResources.kt b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/StringResources.kt index 6f44a23b89a..419a5ce8e81 100644 --- a/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/StringResources.kt +++ b/components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/StringResources.kt @@ -1,6 +1,10 @@ package org.jetbrains.compose.resources -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.Immutable +import androidx.compose.runtime.InternalResourceApi +import androidx.compose.runtime.getValue +import androidx.compose.runtime.rememberResourceState /** * Represents a string resource in the application. From 01fa9955f1e30b6e5df6bc6d2776d0c7a78e49de Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Thu, 27 Jun 2024 23:17:53 +0900 Subject: [PATCH 26/27] Replaced wildcard imports with explicit imports --- .../codeviewer/ui/filetree/FileTreeView.kt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt b/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt index 9bc690a7a51..6d0aec8f086 100644 --- a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt +++ b/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt @@ -4,7 +4,14 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.hoverable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsHoveredAsState -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material.Icon @@ -12,7 +19,15 @@ import androidx.compose.material.LocalContentColor import androidx.compose.material.Surface import androidx.compose.material.Text import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.* +import androidx.compose.material.icons.filled.Build +import androidx.compose.material.icons.filled.BrokenImage +import androidx.compose.material.icons.filled.Code +import androidx.compose.material.icons.filled.Description +import androidx.compose.material.icons.filled.KeyboardArrowDown +import androidx.compose.material.icons.filled.KeyboardArrowRight +import androidx.compose.material.icons.filled.Launch +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material.icons.filled.TextSnippet import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf From 3759a480faa22c0d0cc4551bce608cc8bd85341a Mon Sep 17 00:00:00 2001 From: "soleil.colza" Date: Thu, 27 Jun 2024 23:26:37 +0900 Subject: [PATCH 27/27] Replaced wildcard imports with explicit imports --- .../jetbrains/compose/resources/ResourceEnvironment.desktop.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/resources/library/src/desktopMain/kotlin/org/jetbrains/compose/resources/ResourceEnvironment.desktop.kt b/components/resources/library/src/desktopMain/kotlin/org/jetbrains/compose/resources/ResourceEnvironment.desktop.kt index 8c45734ebe1..4b9ffaf597a 100644 --- a/components/resources/library/src/desktopMain/kotlin/org/jetbrains/compose/resources/ResourceEnvironment.desktop.kt +++ b/components/resources/library/src/desktopMain/kotlin/org/jetbrains/compose/resources/ResourceEnvironment.desktop.kt @@ -3,7 +3,7 @@ package org.jetbrains.compose.resources import org.jetbrains.skiko.SystemTheme import org.jetbrains.skiko.currentSystemTheme import java.awt.Toolkit -import java.util.* +import java.util.Locale internal actual fun getSystemEnvironment(): ResourceEnvironment { val locale = Locale.getDefault()