Use compose.components.resources for typography

app/common/designsystem/src/commonMain/kotlin/dev/sergiobelda/todometer/app/common/designsystem/theme/Typography.kt

@@ -17,77 +17,79 @@
 package dev.sergiobelda.todometer.app.common.designsystem.theme
 
 import androidx.compose.material3.Typography
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.BaselineShift
 import androidx.compose.ui.unit.sp
 import dev.sergiobelda.todometer.common.designsystem.resources.type.quickSandFontFamily
 
 internal object Typography {
-    val typography = Typography(
-        headlineLarge = TextStyle(
-            fontFamily = quickSandFontFamily,
-            fontWeight = FontWeight.Medium,
-            fontSize = 32.sp
-        ),
-        headlineMedium = TextStyle(
-            fontFamily = quickSandFontFamily,
-            fontWeight = FontWeight.Medium,
-            fontSize = 28.sp
-        ),
-        headlineSmall = TextStyle(
-            fontFamily = quickSandFontFamily,
-            fontWeight = FontWeight.Medium,
-            fontSize = 22.sp,
-            letterSpacing = 0.15.sp
-        ),
-        titleLarge = TextStyle(
-            fontFamily = quickSandFontFamily,
-            fontWeight = FontWeight.Medium,
-            fontSize = 20.sp
-        ),
-        titleMedium = TextStyle(
-            fontFamily = quickSandFontFamily,
-            fontWeight = FontWeight.Medium,
-            fontSize = 16.sp
-        ),
-        titleSmall = TextStyle(
-            fontFamily = quickSandFontFamily,
-            fontWeight = FontWeight.Medium,
-            fontSize = 14.sp
-        ),
-        bodyLarge = TextStyle(
-            fontFamily = quickSandFontFamily,
-            fontWeight = FontWeight.Medium,
-            fontSize = 16.sp,
-            baselineShift = BaselineShift(+0.1f)
-        ),
-        bodyMedium = TextStyle(
-            fontFamily = quickSandFontFamily,
-            fontWeight = FontWeight.Medium,
-            fontSize = 14.sp,
-            baselineShift = BaselineShift(+0.3f)
-        ),
-        bodySmall = TextStyle(
-            fontFamily = quickSandFontFamily,
-            fontWeight = FontWeight.Medium,
-            fontSize = 12.sp
-        ),
-        labelLarge = TextStyle(
-            fontFamily = quickSandFontFamily,
-            fontWeight = FontWeight.SemiBold,
-            fontSize = 12.sp
-        ),
-        labelMedium = TextStyle(
-            fontFamily = quickSandFontFamily,
-            fontWeight = FontWeight.Medium,
-            fontSize = 12.sp
-        ),
-        labelSmall = TextStyle(
-            fontFamily = quickSandFontFamily,
-            fontWeight = FontWeight.Medium,
-            fontSize = 10.sp,
-            letterSpacing = 1.5.sp
+    val typography
+        @Composable get() = Typography(
+            headlineLarge = TextStyle(
+                fontFamily = quickSandFontFamily,
+                fontWeight = FontWeight.Medium,
+                fontSize = 32.sp
+            ),
+            headlineMedium = TextStyle(
+                fontFamily = quickSandFontFamily,
+                fontWeight = FontWeight.Medium,
+                fontSize = 28.sp
+            ),
+            headlineSmall = TextStyle(
+                fontFamily = quickSandFontFamily,
+                fontWeight = FontWeight.Medium,
+                fontSize = 22.sp,
+                letterSpacing = 0.15.sp
+            ),
+            titleLarge = TextStyle(
+                fontFamily = quickSandFontFamily,
+                fontWeight = FontWeight.Medium,
+                fontSize = 20.sp
+            ),
+            titleMedium = TextStyle(
+                fontFamily = quickSandFontFamily,
+                fontWeight = FontWeight.Medium,
+                fontSize = 16.sp
+            ),
+            titleSmall = TextStyle(
+                fontFamily = quickSandFontFamily,
+                fontWeight = FontWeight.Medium,
+                fontSize = 14.sp
+            ),
+            bodyLarge = TextStyle(
+                fontFamily = quickSandFontFamily,
+                fontWeight = FontWeight.Medium,
+                fontSize = 16.sp,
+                baselineShift = BaselineShift(+0.1f)
+            ),
+            bodyMedium = TextStyle(
+                fontFamily = quickSandFontFamily,
+                fontWeight = FontWeight.Medium,
+                fontSize = 14.sp,
+                baselineShift = BaselineShift(+0.3f)
+            ),
+            bodySmall = TextStyle(
+                fontFamily = quickSandFontFamily,
+                fontWeight = FontWeight.Medium,
+                fontSize = 12.sp
+            ),
+            labelLarge = TextStyle(
+                fontFamily = quickSandFontFamily,
+                fontWeight = FontWeight.SemiBold,
+                fontSize = 12.sp
+            ),
+            labelMedium = TextStyle(
+                fontFamily = quickSandFontFamily,
+                fontWeight = FontWeight.Medium,
+                fontSize = 12.sp
+            ),
+            labelSmall = TextStyle(
+                fontFamily = quickSandFontFamily,
+                fontWeight = FontWeight.Medium,
+                fontSize = 10.sp,
+                letterSpacing = 1.5.sp
+            )
         )
-    )
 }

common/designsystem-resources/build.gradle.kts

@@ -17,8 +17,10 @@ kotlin {
 
     sourceSets {
         val commonMain by getting {
+            @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
             dependencies {
                 implementation(compose.ui)
+                implementation(compose.components.resources)
                 implementation(libs.composeVectorize.core)
             }
         }

common/designsystem-resources/src/commonMain/kotlin/dev/sergiobelda/todometer/common/designsystem/resources/type/Type.kt

@@ -1,5 +1,56 @@
 package dev.sergiobelda.todometer.common.designsystem.resources.type
 
+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 org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.Font
+import org.jetbrains.compose.resources.FontResource
+import org.jetbrains.compose.resources.ResourceItem
 
-expect val quickSandFontFamily: FontFamily
+val quickSandFontBold: Font
+    @Composable get() = resolveFont(
+        "quickSandFontBold",
+        "font/quicksand_bold.ttf",
+        FontWeight.Bold
+    )
+
+val quickSandFontMedium: Font
+    @Composable get() = resolveFont(
+        "quickSandFontMedium",
+        "font/quicksand_medium.ttf",
+        FontWeight.Medium
+    )
+
+val quickSandFontSemiBold: Font
+    @Composable get() = resolveFont(
+        "quickSandFontSemiBold",
+        "font/quicksand_semi_bold.ttf",
+        FontWeight.SemiBold
+    )
+
+val quickSandFontFamily: FontFamily
+    @Composable get() = FontFamily(
+        quickSandFontBold,
+        quickSandFontMedium,
+        quickSandFontSemiBold
+    )
+
+@OptIn(ExperimentalResourceApi::class)
+@Composable
+private fun resolveFont(
+    id: String,
+    path: String,
+    weight: FontWeight = FontWeight.Normal,
+    style: FontStyle = FontStyle.Normal
+): Font =
+    Font(
+        FontResource(
+            id,
+            setOf(ResourceItem(setOf(), path))
+        ),
+        weight,
+        style
+    )

wearapp-wearos/src/main/java/dev/sergiobelda/todometer/wearapp/wearos/ui/theme/Typography.kt

@@ -16,9 +16,11 @@
 
 package dev.sergiobelda.todometer.wearapp.wearos.ui.theme
 
+import androidx.compose.runtime.Composable
 import androidx.wear.compose.material.Typography
 import dev.sergiobelda.todometer.common.designsystem.resources.type.quickSandFontFamily
 
-internal val typography = Typography(
-    defaultFontFamily = quickSandFontFamily
-)
+internal val typography
+    @Composable get() = Typography(
+        defaultFontFamily = quickSandFontFamily
+    )