Browse Source

[resources] Don't provide default environment for read bytes functions.

pull/4651/head
Konstantin Tskhovrebov 4 weeks ago
parent
commit
450b7e7974
  1. 4
      components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/FontResources.kt
  2. 4
      components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/ImageResources.kt
  3. 5
      components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.kt

4
components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/FontResources.kt

@ -38,13 +38,13 @@ expect fun Font(
/**
* Retrieves the byte array of the font resource.
*
* @param environment The optional resource environment.
* @param environment The resource environment.
* @param resource The font resource.
* @return The byte array representing the font resource.
*/
@ExperimentalResourceApi
suspend fun getFontResourceBytes(
environment: ResourceEnvironment = getSystemResourceEnvironment(),
environment: ResourceEnvironment,
resource: FontResource
): ByteArray {
val resourceItem = resource.getResourceItemByEnvironment(environment)

4
components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/ImageResources.kt

@ -112,13 +112,13 @@ private fun svgPainter(resource: DrawableResource): Painter {
/**
* Retrieves the byte array of the drawable resource.
*
* @param environment The optional resource environment.
* @param environment The resource environment.
* @param resource The drawable resource.
* @return The byte array representing the drawable resource.
*/
@ExperimentalResourceApi
suspend fun getDrawableResourceBytes(
environment: ResourceEnvironment = getSystemResourceEnvironment(),
environment: ResourceEnvironment,
resource: DrawableResource
): ByteArray {
val resourceItem = resource.getResourceItemByEnvironment(environment)

5
components/resources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.kt

@ -307,9 +307,10 @@ class ComposeResourceTest {
@OptIn(ExperimentalResourceApi::class)
@Test
fun testGetResourceBytes() = runTest {
val imageBytes = getDrawableResourceBytes(resource = TestDrawableResource("1.png"))
val env = getSystemEnvironment()
val imageBytes = getDrawableResourceBytes(env, TestDrawableResource("1.png"))
assertEquals(946, imageBytes.size)
val fontBytes = getFontResourceBytes(resource = TestFontResource("font_awesome.otf"))
val fontBytes = getFontResourceBytes(env, TestFontResource("font_awesome.otf"))
assertEquals(134808, fontBytes.size)
}

Loading…
Cancel
Save