Merge pull request #508 from icerockdev/develop

Release 0.23.0

Author: Alex009

README.md

@@ -62,7 +62,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "dev.icerock.moko:resources-generator:0.22.3"
+        classpath "dev.icerock.moko:resources-generator:0.23.0"
     }
 }
 
@@ -80,10 +80,10 @@ project build.gradle
 apply plugin: "dev.icerock.mobile.multiplatform-resources"
 
 dependencies {
-    commonMainApi("dev.icerock.moko:resources:0.22.3")
-    commonMainApi("dev.icerock.moko:resources-compose:0.22.3") // for compose multiplatform
+    commonMainApi("dev.icerock.moko:resources:0.23.0")
+    commonMainApi("dev.icerock.moko:resources-compose:0.23.0") // for compose multiplatform
 
-    commonTestImplementation("dev.icerock.moko:resources-test:0.22.3")
+    commonTestImplementation("dev.icerock.moko:resources-test:0.23.0")
 }
 
 multiplatformResources {
@@ -102,7 +102,7 @@ should [add `export` declarations](https://kotlinlang.org/docs/multiplatform-bui
 
 ```
 framework {
-    export("dev.icerock.moko:resources:0.22.3")
+    export("dev.icerock.moko:resources:0.23.0")
     export("dev.icerock.moko:graphics:0.9.0") // toUIColor here
 }
 ```
@@ -629,6 +629,15 @@ with compose you can just call in `commonMain`
 val fontFamily: FontFamily = fontFamilyResource(MR.fonts.Raleway.italic)
 ```
 
+or you can get `Font`
+
+```kotlin
+val font: Font = MR.fonts.Raleway.italic.asFont(
+  weight = FontWeight.Normal, // optional
+  style = FontStyle.Normal // optional
+)
+```
+
 ### Example 9 - pass colors
 
 Colors resources directory is `commonMain/resources/MR/colors`.  

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlinVersion = "1.8.10"
+kotlinVersion = "1.8.20"
 androidGradleVersion = "7.4.2"
 androidSdkCommonVersion = "31.0.0"
 

gradle/moko.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-resourcesVersion = "0.22.3"
+resourcesVersion = "0.23.0"
 
 [libraries]
 resources = { module = "dev.icerock.moko:resources", version.ref = "resourcesVersion" }

kotlin-js-store/yarn.lock

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.resources.compose
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import dev.icerock.moko.resources.FontResource
+
+@Composable
+actual fun FontResource.asFont(
+    weight: FontWeight,
+    style: FontStyle,
+): Font? = remember(fontResourceId) {
+    Font(
+        resId = fontResourceId,
+        weight = weight,
+        style = style,
+    )
+}

resources-compose/src/androidMain/kotlin/dev/icerock/moko/resources/compose/FontResource.android.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2023 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.resources.compose
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import dev.icerock.moko.resources.FontResource
+
+@Composable
+fun fontFamilyResource(fontResource: FontResource): FontFamily {
+    return fontResource.asFont()
+        ?.let { FontFamily(it) }
+        ?: FontFamily.Default
+}
+
+@Composable
+expect fun FontResource.asFont(
+    weight: FontWeight = FontWeight.Normal,
+    style: FontStyle = FontStyle.Normal,
+): Font?

resources-compose/src/androidMain/kotlin/dev/icerock/moko/resources/compose/FontResource.kt

@@ -6,19 +6,22 @@ package dev.icerock.moko.resources.compose
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.platform.Font
 import dev.icerock.moko.resources.FontResource
 import dev.icerock.moko.resources.compose.internal.toByteArray
 
 @Composable
-actual fun fontFamilyResource(fontResource: FontResource): FontFamily {
-    return remember(fontResource) {
-        val font = Font(
-            identity = fontResource.fontName,
-            data = fontResource.data.toByteArray()
-        )
-
-        FontFamily(font)
-    }
+actual fun FontResource.asFont(
+    weight: FontWeight,
+    style: FontStyle,
+): Font? = remember(filePath) {
+    Font(
+        identity = fontName,
+        data = data.toByteArray(),
+        weight = weight,
+        style = style,
+    )
 }

resources-compose/src/commonMain/kotlin/dev/icerock/moko/resources/compose/FontResource.common.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2023 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.resources.compose
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.platform.Font
+import dev.icerock.moko.resources.FontResource
+import dev.icerock.moko.resources.compose.internal.produceByteArray
+
+@Composable
+actual fun FontResource.asFont(
+    weight: FontWeight,
+    style: FontStyle,
+): Font? {
+    val bytes: ByteArray? by produceByteArray(url = fileUrl)
+
+    return remember(fileUrl, bytes?.size ?: 0) {
+        bytes?.let { b ->
+            Font(
+                identity = fontFamily,
+                data = b,
+                weight = weight,
+                style = style,
+            )
+        }
+    }
+}