Add style parameter to downloadSvg method in icon use cases, create MaterialSymbolsConfigUseCase with keepAlive option

egorikftp · egorikftp · commit 2127bdaff69b · 2026-05-04T13:41:49.000+03:00
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/common/StandardIconViewModel.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/common/StandardIconViewModel.kt
@@ -158,7 +158,7 @@ class StandardIconViewModel(
             val currentState = stateRecord.value.safeAs<StandardState.Success>() ?: return@launch
 
             runCatching {
-                val svgContent = provider.downloadSvg(icon, currentState.settings)
+                val svgContent = provider.downloadSvg(icon, currentState.settings, currentState.selectedStyle)
 
                 _events.send(
                     StandardIconEvent.IconDownloaded(
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/common/domain/StandardIconProvider.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/common/domain/StandardIconProvider.kt
@@ -38,7 +38,7 @@ interface StandardIconProvider {
 
     suspend fun loadConfig(): StandardIconConfig
     suspend fun loadFontBytes(style: IconStyle? = null): FontByteArray
-    suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String
+    suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle? = null): String
 
     companion object {
         /** Shared no-op StateFlow returned by the default [variableFontConfig] getter. */
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/bootstrap/domain/BootstrapUseCase.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/bootstrap/domain/BootstrapUseCase.kt
@@ -50,7 +50,7 @@ class BootstrapUseCase(
         return FontByteArray(repository.loadFontBytes())
     }
 
-    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String {
+    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {
         val rawSvg = repository.downloadSvg(icon.name)
         return SvgSizeCustomizer.applySettings(rawSvg, settings)
     }
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/boxicons/domain/BoxIconsUseCase.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/boxicons/domain/BoxIconsUseCase.kt
@@ -53,7 +53,7 @@ class BoxIconsUseCase(
         return FontByteArray(repository.loadFontBytes())
     }
 
-    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String {
+    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {
         val rawSvg = repository.downloadSvg(icon.name)
         return SvgSizeCustomizer.applySettings(rawSvg, settings)
     }
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/eva/domain/EvaUseCase.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/eva/domain/EvaUseCase.kt
@@ -47,7 +47,7 @@ class EvaUseCase(
 
     override suspend fun loadFontBytes(style: IconStyle?): FontByteArray = FontByteArray(repository.loadFontBytes())
 
-    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String = repository.downloadSvg(icon.name)
+    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String = repository.downloadSvg(icon.name)
 }
 
 internal fun String.toEvaStyle(): IconStyle {
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/feather/domain/FeatherUseCase.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/feather/domain/FeatherUseCase.kt
@@ -38,7 +38,7 @@ class FeatherUseCase(
         return FontByteArray(repository.loadFontBytes())
     }
 
-    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String {
+    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {
         val rawSvg = repository.downloadSvg(icon.name)
         return SvgSizeCustomizer.applySettings(rawSvg, settings)
     }
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/fontawesome/domain/FontAwesomeUseCase.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/fontawesome/domain/FontAwesomeUseCase.kt
@@ -67,7 +67,7 @@ class FontAwesomeUseCase(
         return FontByteArray(repository.loadFontBytes(styleId = styleId))
     }
 
-    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String {
+    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {
         val styleId = icon.style?.id ?: SOLID_STYLE_ID
         val rawSvg = repository.downloadSvg(iconName = icon.name, styleId = styleId)
         return SvgSizeCustomizer.applySettings(rawSvg, settings)
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/ionicons/domain/IoniconsUseCase.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/ionicons/domain/IoniconsUseCase.kt
@@ -38,7 +38,7 @@ class IoniconsUseCase(
         return FontByteArray(repository.loadFontBytes())
     }
 
-    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String {
+    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {
         val rawSvg = repository.downloadSvg(icon.name)
         return SvgSizeCustomizer.applySettings(rawSvg, settings)
     }
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/lucide/domain/LucideUseCase.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/lucide/domain/LucideUseCase.kt
@@ -52,7 +52,7 @@ class LucideUseCase(
         return FontByteArray(repository.loadFontBytes())
     }
 
-    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String {
+    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {
         val rawSvg = repository.downloadSvg(icon.name)
         return SvgSizeCustomizer.applySettings(rawSvg, settings)
     }
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/materialsymbols/di/MaterialSymbolsModule.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/materialsymbols/di/MaterialSymbolsModule.kt
@@ -21,7 +21,7 @@ object MaterialSymbolsModule : Leviathan() {
         MaterialFontRepository(httpClient = inject(NetworkModule.httpClient))
     }
 
-    val materialSymbolsConfigUseCase by instanceOf {
+    val materialSymbolsConfigUseCase by instanceOf(keepAlive = true) {
         MaterialSymbolsConfigUseCase(
             configRepository = inject(materialSymbolsConfigRepository),
             fontRepository = inject(materialFontRepository),
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/materialsymbols/domain/MaterialSymbolsConfigUseCase.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/materialsymbols/domain/MaterialSymbolsConfigUseCase.kt
@@ -29,8 +29,6 @@ class MaterialSymbolsConfigUseCase(
     private val inMemorySettings: InMemorySettings,
 ) : StandardIconProvider {
 
-    private var currentFontFamily: MaterialIconFontFamily = MaterialIconFontFamily.Outlined
-
     private val _fontSettingsFlow = MutableStateFlow(
         inMemorySettings.readState {
             MaterialFontSettings(
@@ -55,10 +53,6 @@ class MaterialSymbolsConfigUseCase(
 
     override fun resolveFontWeight(style: IconStyle?) = FontWeight(_fontSettingsFlow.value.weight)
 
-    override fun onStyleChanged(style: IconStyle?) {
-        currentFontFamily = FAMILY_BY_STYLE_ID[style?.id] ?: MaterialIconFontFamily.Outlined
-    }
-
     override suspend fun loadConfig(): StandardIconConfig {
         val result = configRepository.load()
 
@@ -104,11 +98,15 @@ class MaterialSymbolsConfigUseCase(
         return FontByteArray(bytes = fontRepository.loadFont(fontFamily))
     }
 
-    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String = fontRepository.downloadSvg(
-        name = icon.name,
-        fontFamily = currentFontFamily.fontFamily,
-        fontSettings = _fontSettingsFlow.value,
-    )
+    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {
+        val fontFamily = FAMILY_BY_STYLE_ID[style?.id] ?: MaterialIconFontFamily.Outlined
+
+        return fontRepository.downloadSvg(
+            name = icon.name,
+            fontFamily = fontFamily.fontFamily,
+            fontSettings = _fontSettingsFlow.value,
+        )
+    }
 
     fun updateFontSettings(settings: MaterialFontSettings) {
         _fontSettingsFlow.value = settings
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/remix/domain/RemixUseCase.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/remix/domain/RemixUseCase.kt
@@ -61,7 +61,7 @@ class RemixUseCase(
         return FontByteArray(repository.loadFontBytes())
     }
 
-    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String {
+    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {
         val rawSvg = repository.downloadSvg(icon.name)
         return SvgSizeCustomizer.applySettings(rawSvg, settings)
     }
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/tabler/domain/TablerUseCase.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/tabler/domain/TablerUseCase.kt
@@ -42,7 +42,7 @@ class TablerUseCase(
 
     override suspend fun loadFontBytes(style: IconStyle?): FontByteArray = FontByteArray(repository.loadFontBytes(style))
 
-    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String = repository.downloadSvg(
+    override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String = repository.downloadSvg(
         iconName = icon.name,
         style = icon.style ?: TABLER_OUTLINE_STYLE,
     )

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class BootstrapUseCase(`
`50`	`50`	`return FontByteArray(repository.loadFontBytes())`
`51`	`51`	`}`
`52`	`52`
`53`		`- override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String {`
	`53`	`+ override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {`
`54`	`54`	`val rawSvg = repository.downloadSvg(icon.name)`
`55`	`55`	`return SvgSizeCustomizer.applySettings(rawSvg, settings)`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class BoxIconsUseCase(`
`53`	`53`	`return FontByteArray(repository.loadFontBytes())`
`54`	`54`	`}`
`55`	`55`
`56`		`- override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String {`
	`56`	`+ override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {`
`57`	`57`	`val rawSvg = repository.downloadSvg(icon.name)`
`58`	`58`	`return SvgSizeCustomizer.applySettings(rawSvg, settings)`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class EvaUseCase(`
`47`	`47`
`48`	`48`	`override suspend fun loadFontBytes(style: IconStyle?): FontByteArray = FontByteArray(repository.loadFontBytes())`
`49`	`49`
`50`		`- override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String = repository.downloadSvg(icon.name)`
	`50`	`+ override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String = repository.downloadSvg(icon.name)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`internal fun String.toEvaStyle(): IconStyle {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class FeatherUseCase(`
`38`	`38`	`return FontByteArray(repository.loadFontBytes())`
`39`	`39`	`}`
`40`	`40`
`41`		`- override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String {`
	`41`	`+ override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {`
`42`	`42`	`val rawSvg = repository.downloadSvg(icon.name)`
`43`	`43`	`return SvgSizeCustomizer.applySettings(rawSvg, settings)`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class FontAwesomeUseCase(`
`67`	`67`	`return FontByteArray(repository.loadFontBytes(styleId = styleId))`
`68`	`68`	`}`
`69`	`69`
`70`		`- override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String {`
	`70`	`+ override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {`
`71`	`71`	`val styleId = icon.style?.id ?: SOLID_STYLE_ID`
`72`	`72`	`val rawSvg = repository.downloadSvg(iconName = icon.name, styleId = styleId)`
`73`	`73`	`return SvgSizeCustomizer.applySettings(rawSvg, settings)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class IoniconsUseCase(`
`38`	`38`	`return FontByteArray(repository.loadFontBytes())`
`39`	`39`	`}`
`40`	`40`
`41`		`- override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String {`
	`41`	`+ override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {`
`42`	`42`	`val rawSvg = repository.downloadSvg(icon.name)`
`43`	`43`	`return SvgSizeCustomizer.applySettings(rawSvg, settings)`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class LucideUseCase(`
`52`	`52`	`return FontByteArray(repository.loadFontBytes())`
`53`	`53`	`}`
`54`	`54`
`55`		`- override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings): String {`
	`55`	`+ override suspend fun downloadSvg(icon: StandardIcon, settings: SizeSettings, style: IconStyle?): String {`
`56`	`56`	`val rawSvg = repository.downloadSvg(icon.name)`
`57`	`57`	`return SvgSizeCustomizer.applySettings(rawSvg, settings)`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ object MaterialSymbolsModule : Leviathan() {`
`21`	`21`	`MaterialFontRepository(httpClient = inject(NetworkModule.httpClient))`
`22`	`22`	`}`
`23`	`23`
`24`		`- val materialSymbolsConfigUseCase by instanceOf {`
	`24`	`+ val materialSymbolsConfigUseCase by instanceOf(keepAlive = true) {`
`25`	`25`	`MaterialSymbolsConfigUseCase(`
`26`	`26`	`configRepository = inject(materialSymbolsConfigRepository),`
`27`	`27`	`fontRepository = inject(materialFontRepository),`