2.2.0: CuP 1.0.0-Beta-09, Kotlin 2.0.20, Compose 1.6.11

KodeinKoders · Sep 23, 2024 · 0ebe3e6 · 0ebe3e6
1 parent 43491bb
commit 0ebe3e6
Show file tree

Hide file tree

Showing 72 changed files with 92 additions and 152 deletions.
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
@@ -9,6 +9,7 @@ kotlin {
     explicitApi()
 
     jvm()
+    jvmToolchain(17)
 
     js(IR) {
         browser()

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = "net.kodein.themes"
-    version = "2.1.0"
+    version = "2.2.0"
 }
 
 subprojects {

diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
@@ -11,6 +11,7 @@ kotlin {
     explicitApi()
 
     jvm()
+    jvmToolchain(17)
 
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs {

diff --git a/compose/compose-m2/build.gradle.kts b/compose/compose-m2/build.gradle.kts
@@ -11,6 +11,7 @@ kotlin {
     explicitApi()
 
     jvm()
+    jvmToolchain(17)
 
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs {

diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-Bold.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-Bold.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-BoldItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-BoldItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-ExtraBold.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-ExtraBold.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-ExtraBoldItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-ExtraBoldItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-ExtraLight.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-ExtraLight.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-ExtraLightItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-ExtraLightItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-Italic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-Italic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-Light.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-Light.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-LightItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-LightItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-Medium.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-Medium.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-MediumItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-MediumItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-Regular.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-Regular.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-SemiBold.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-SemiBold.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-SemiBoldItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-SemiBoldItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-Thin.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-Thin.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMono-ThinItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMono-ThinItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-Bold.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-Bold.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-BoldItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-BoldItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-ExtraBold.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-ExtraBold.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-ExtraBoldItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-ExtraBoldItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-ExtraLight.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-ExtraLight.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-ExtraLightItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-ExtraLightItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-Italic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-Italic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-Light.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-Light.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-LightItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-LightItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-Medium.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-Medium.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-MediumItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-MediumItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-Regular.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-Regular.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-SemiBold.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-SemiBold.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-SemiBoldItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-SemiBoldItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-Thin.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-Thin.ttf
diff --git a/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-ThinItalic.ttf b/compose/src/commonMain/composeResources/font/JetBrainsMonoNL-ThinItalic.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-Black.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-Black.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-Bold.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-Bold.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-ExtraBold.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-ExtraBold.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-ExtraLight.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-ExtraLight.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-Light.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-Light.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-Medium.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-Medium.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-Normal.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-Normal.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-SemiBold.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-SemiBold.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-Thin.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Condensed-Thin.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Extended-Black.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Extended-Black.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Extended-Bold.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Extended-Bold.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Extended-ExtraBold.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Extended-ExtraBold.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Extended-ExtraLight.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Extended-ExtraLight.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Extended-Light.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Extended-Light.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Extended-Medium.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Extended-Medium.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Extended-Normal.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Extended-Normal.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Extended-SemiBold.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Extended-SemiBold.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Extended-Thin.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Extended-Thin.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Regular-Black.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Regular-Black.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Regular-Bold.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Regular-Bold.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Regular-ExtraBold.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Regular-ExtraBold.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Regular-ExtraLight.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Regular-ExtraLight.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Regular-Light.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Regular-Light.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Regular-Medium.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Regular-Medium.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Regular-Normal.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Regular-Normal.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Regular-SemiBold.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Regular-SemiBold.ttf
diff --git a/compose/src/commonMain/composeResources/font/LCTPicon-Regular-Thin.ttf b/compose/src/commonMain/composeResources/font/LCTPicon-Regular-Thin.ttf
diff --git a/compose/src/commonMain/kotlin/net/kodein/theme/compose/JetBrainsMono.kt b/compose/src/commonMain/kotlin/net/kodein/theme/compose/JetBrainsMono.kt
@@ -4,44 +4,29 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
+import net.kodein.themes.compose.generated.resources.*
+import net.kodein.themes.compose.generated.resources.JetBrainsMono_ExtraBold
+import net.kodein.themes.compose.generated.resources.JetBrainsMono_ExtraBoldItalic
+import net.kodein.themes.compose.generated.resources.JetBrainsMono_Thin
+import net.kodein.themes.compose.generated.resources.Res
 import org.jetbrains.compose.resources.*
 
 
-private object JetBrainsMonoResources {
-    val Thin: FontResource by lazy { FontResource("font/JetBrainsMono-Thin.ttf") }
-    val ThinItalic: FontResource by lazy { FontResource("font/JetBrainsMono-ThinItalic.ttf") }
-    val ExtraLight: FontResource by lazy { FontResource("font/JetBrainsMono-ExtraLight.ttf") }
-    val ExtraLightItalic: FontResource by lazy { FontResource("font/JetBrainsMono-ExtraLightItalic.ttf") }
-    val Light: FontResource by lazy { FontResource("font/JetBrainsMono-Light.ttf") }
-    val LightItalic: FontResource by lazy { FontResource("font/JetBrainsMono-LightItalic.ttf") }
-    val Regular: FontResource by lazy { FontResource("font/JetBrainsMono-Regular.ttf") }
-    val Italic: FontResource by lazy { FontResource("font/JetBrainsMono-Italic.ttf") }
-    val Medium: FontResource by lazy { FontResource("font/JetBrainsMono-Medium.ttf") }
-    val MediumItalic: FontResource by lazy { FontResource("font/JetBrainsMono-MediumItalic.ttf") }
-    val SemiBold: FontResource by lazy { FontResource("font/JetBrainsMono-SemiBold.ttf") }
-    val SemiBoldItalic: FontResource by lazy { FontResource("font/JetBrainsMono-SemiBoldItalic.ttf") }
-    val Bold: FontResource by lazy { FontResource("font/JetBrainsMono-Bold.ttf") }
-    val BoldItalic: FontResource by lazy { FontResource("font/JetBrainsMono-BoldItalic.ttf") }
-    val ExtraBold: FontResource by lazy { FontResource("font/JetBrainsMono-ExtraBold.ttf") }
-    val ExtraBoldItalic: FontResource by lazy { FontResource("font/JetBrainsMono-ExtraBoldItalic.ttf") }
-}
-
-@OptIn(ExperimentalResourceApi::class)
 public val JetBrainsMono: FontFamily @Composable get() = FontFamily(
-    Font(resource = JetBrainsMonoResources.Thin, weight = FontWeight.Thin, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoResources.ThinItalic, weight = FontWeight.Thin, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoResources.ExtraLight, weight = FontWeight.ExtraLight, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoResources.ExtraLightItalic, weight = FontWeight.ExtraLight, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoResources.Light, weight = FontWeight.Light, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoResources.LightItalic, weight = FontWeight.Light, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoResources.Regular, weight = FontWeight.Normal, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoResources.Italic, weight = FontWeight.Normal, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoResources.Medium, weight = FontWeight.Medium, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoResources.MediumItalic, weight = FontWeight.Medium, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoResources.SemiBold, weight = FontWeight.SemiBold, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoResources.SemiBoldItalic, weight = FontWeight.SemiBold, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoResources.Bold, weight = FontWeight.Bold, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoResources.BoldItalic, weight = FontWeight.Bold, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoResources.ExtraBold, weight = FontWeight.ExtraBold, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoResources.ExtraBoldItalic, weight = FontWeight.ExtraBold, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMono_Thin, weight = FontWeight.Thin, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMono_ThinItalic, weight = FontWeight.Thin, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMono_ExtraLight, weight = FontWeight.ExtraLight, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMono_ExtraLightItalic, weight = FontWeight.ExtraLight, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMono_Light, weight = FontWeight.Light, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMono_LightItalic, weight = FontWeight.Light, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMono_Regular, weight = FontWeight.Normal, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMono_Italic, weight = FontWeight.Normal, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMono_Medium, weight = FontWeight.Medium, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMono_MediumItalic, weight = FontWeight.Medium, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMono_SemiBold, weight = FontWeight.SemiBold, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMono_SemiBoldItalic, weight = FontWeight.SemiBold, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMono_Bold, weight = FontWeight.Bold, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMono_BoldItalic, weight = FontWeight.Bold, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMono_ExtraBold, weight = FontWeight.ExtraBold, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMono_ExtraBoldItalic, weight = FontWeight.ExtraBold, style = FontStyle.Italic),
 )
diff --git a/compose/src/commonMain/kotlin/net/kodein/theme/compose/JetBrainsMonoNL.kt b/compose/src/commonMain/kotlin/net/kodein/theme/compose/JetBrainsMonoNL.kt
@@ -4,47 +4,25 @@ import androidx.compose.runtime.Composable
 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 net.kodein.themes.compose.generated.resources.*
 import org.jetbrains.compose.resources.Font
-import org.jetbrains.compose.resources.FontResource
 
 
-@OptIn(ExperimentalResourceApi::class)
-private object JetBrainsMonoNLResources {
-    val Thin: FontResource by lazy { FontResource("font/JetBrainsMonoNL-Thin.ttf") }
-    val ThinItalic: FontResource by lazy { FontResource("font/JetBrainsMonoNL-ThinItalic.ttf") }
-    val ExtraLight: FontResource by lazy { FontResource("font/JetBrainsMonoNL-ExtraLight.ttf") }
-    val ExtraLightItalic: FontResource by lazy { FontResource("font/JetBrainsMonoNL-ExtraLightItalic.ttf") }
-    val Light: FontResource by lazy { FontResource("font/JetBrainsMonoNL-Light.ttf") }
-    val LightItalic: FontResource by lazy { FontResource("font/JetBrainsMonoNL-LightItalic.ttf") }
-    val Regular: FontResource by lazy { FontResource("font/JetBrainsMonoNL-Regular.ttf") }
-    val Italic: FontResource by lazy { FontResource("font/JetBrainsMonoNL-Italic.ttf") }
-    val Medium: FontResource by lazy { FontResource("font/JetBrainsMonoNL-Medium.ttf") }
-    val MediumItalic: FontResource by lazy { FontResource("font/JetBrainsMonoNL-MediumItalic.ttf") }
-    val SemiBold: FontResource by lazy { FontResource("font/JetBrainsMonoNL-SemiBold.ttf") }
-    val SemiBoldItalic: FontResource by lazy { FontResource("font/JetBrainsMonoNL-SemiBoldItalic.ttf") }
-    val Bold: FontResource by lazy { FontResource("font/JetBrainsMonoNL-Bold.ttf") }
-    val BoldItalic: FontResource by lazy { FontResource("font/JetBrainsMonoNL-BoldItalic.ttf") }
-    val ExtraBold: FontResource by lazy { FontResource("font/JetBrainsMonoNL-ExtraBold.ttf") }
-    val ExtraBoldItalic: FontResource by lazy { FontResource("font/JetBrainsMonoNL-ExtraBoldItalic.ttf") }
-}
-
-@OptIn(ExperimentalResourceApi::class)
 public val JetBrainsMonoNL: FontFamily @Composable get() = FontFamily(
-    Font(resource = JetBrainsMonoNLResources.Thin, weight = FontWeight.Thin, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoNLResources.ThinItalic, weight = FontWeight.Thin, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoNLResources.ExtraLight, weight = FontWeight.ExtraLight, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoNLResources.ExtraLightItalic, weight = FontWeight.ExtraLight, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoNLResources.Light, weight = FontWeight.Light, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoNLResources.LightItalic, weight = FontWeight.Light, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoNLResources.Regular, weight = FontWeight.Normal, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoNLResources.Italic, weight = FontWeight.Normal, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoNLResources.Medium, weight = FontWeight.Medium, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoNLResources.MediumItalic, weight = FontWeight.Medium, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoNLResources.SemiBold, weight = FontWeight.SemiBold, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoNLResources.SemiBoldItalic, weight = FontWeight.SemiBold, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoNLResources.Bold, weight = FontWeight.Bold, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoNLResources.BoldItalic, weight = FontWeight.Bold, style = FontStyle.Italic),
-    Font(resource = JetBrainsMonoNLResources.ExtraBold, weight = FontWeight.ExtraBold, style = FontStyle.Normal),
-    Font(resource = JetBrainsMonoNLResources.ExtraBoldItalic, weight = FontWeight.ExtraBold, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMonoNL_Thin, weight = FontWeight.Thin, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMonoNL_ThinItalic, weight = FontWeight.Thin, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMonoNL_ExtraLight, weight = FontWeight.ExtraLight, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMonoNL_ExtraLightItalic, weight = FontWeight.ExtraLight, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMonoNL_Light, weight = FontWeight.Light, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMonoNL_LightItalic, weight = FontWeight.Light, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMonoNL_Regular, weight = FontWeight.Normal, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMonoNL_Italic, weight = FontWeight.Normal, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMonoNL_Medium, weight = FontWeight.Medium, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMonoNL_MediumItalic, weight = FontWeight.Medium, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMonoNL_SemiBold, weight = FontWeight.SemiBold, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMonoNL_SemiBoldItalic, weight = FontWeight.SemiBold, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMonoNL_Bold, weight = FontWeight.Bold, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMonoNL_BoldItalic, weight = FontWeight.Bold, style = FontStyle.Italic),
+    Font(resource = Res.font.JetBrainsMonoNL_ExtraBold, weight = FontWeight.ExtraBold, style = FontStyle.Normal),
+    Font(resource = Res.font.JetBrainsMonoNL_ExtraBoldItalic, weight = FontWeight.ExtraBold, style = FontStyle.Italic),
 )