Migrate Material symbols to standart StandardImport approach, move common files in new package

sdk/compose/foundation/src/commonMain/kotlin/io/github/composegears/valkyrie/sdk/compose/foundation/animation/RememberShimmer.kt

@@ -7,7 +7,9 @@ import androidx.compose.animation.core.infiniteRepeatable
 import androidx.compose.animation.core.rememberInfiniteTransition
 import androidx.compose.animation.core.tween
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.geometry.CornerRadius
@@ -18,6 +20,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
 /** Container holding shared shimmer animation state. */
+@Stable
 class Shimmer internal constructor(
     internal val translateState: State<Float>,
     internal val gradientWidthFactor: Float,
@@ -46,7 +49,9 @@ fun rememberShimmer(
         ),
         label = "RememberShimmerTranslate",
     )
-    return Shimmer(translateState, gradientWidthFactor)
+    return remember(gradientWidthFactor) {
+        Shimmer(translateState, gradientWidthFactor)
+    }
 }
 
 /** Apply a remembered shimmer to this modifier. */

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/service/PersistentSettings.kt

@@ -10,11 +10,11 @@ import io.github.composegears.valkyrie.jewel.tooling.GlobalPreviewState
 import io.github.composegears.valkyrie.sdk.shared.ValkyrieMode
 import io.github.composegears.valkyrie.service.PersistentSettings.ValkyrieState
 import io.github.composegears.valkyrie.ui.domain.model.PreviewType
-import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_FILL
-import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_GRADE
-import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_OPTICAL_SIZE
-import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_WEIGHT
-import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.SizeSettings.Companion.DEFAULT_SIZE
+import io.github.composegears.valkyrie.ui.screen.webimport.common.domain.settings.SizeSettings.Companion.DEFAULT_SIZE
+import io.github.composegears.valkyrie.ui.screen.webimport.standard.materialsymbols.domain.model.MaterialFontSettings.Companion.DEFAULT_FILL
+import io.github.composegears.valkyrie.ui.screen.webimport.standard.materialsymbols.domain.model.MaterialFontSettings.Companion.DEFAULT_GRADE
+import io.github.composegears.valkyrie.ui.screen.webimport.standard.materialsymbols.domain.model.MaterialFontSettings.Companion.DEFAULT_OPTICAL_SIZE
+import io.github.composegears.valkyrie.ui.screen.webimport.standard.materialsymbols.domain.model.MaterialFontSettings.Companion.DEFAULT_WEIGHT
 
 @State(name = "Valkyrie.Settings", storages = [Storage("valkyrie_settings.xml")])
 class PersistentSettings : SimplePersistentStateComponent<ValkyrieState>(ValkyrieState()) {

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/settings/InMemorySettings.kt

@@ -9,11 +9,11 @@ import io.github.composegears.valkyrie.service.PersistentSettings.Companion.pers
 import io.github.composegears.valkyrie.ui.domain.model.PreviewType
 import io.github.composegears.valkyrie.ui.extension.or
 import io.github.composegears.valkyrie.ui.extension.updateState
-import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_FILL
-import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_GRADE
-import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_OPTICAL_SIZE
-import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_WEIGHT
-import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.SizeSettings.Companion.DEFAULT_SIZE
+import io.github.composegears.valkyrie.ui.screen.webimport.common.domain.settings.SizeSettings.Companion.DEFAULT_SIZE
+import io.github.composegears.valkyrie.ui.screen.webimport.standard.materialsymbols.domain.model.MaterialFontSettings.Companion.DEFAULT_FILL
+import io.github.composegears.valkyrie.ui.screen.webimport.standard.materialsymbols.domain.model.MaterialFontSettings.Companion.DEFAULT_GRADE
+import io.github.composegears.valkyrie.ui.screen.webimport.standard.materialsymbols.domain.model.MaterialFontSettings.Companion.DEFAULT_OPTICAL_SIZE
+import io.github.composegears.valkyrie.ui.screen.webimport.standard.materialsymbols.domain.model.MaterialFontSettings.Companion.DEFAULT_WEIGHT
 import java.util.Collections.emptyList
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/WebImportFlow.kt

@@ -6,14 +6,14 @@ import com.composegears.tiamat.compose.Navigation
 import com.composegears.tiamat.compose.navDestination
 import com.composegears.tiamat.compose.navigationSlideInOut
 import com.composegears.tiamat.compose.rememberNavController
-import io.github.composegears.valkyrie.ui.screen.webimport.material.MaterialSymbolsImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.bootstrap.BootstrapImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.boxicons.BoxIconsImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.eva.EvaImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.feather.FeatherImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.fontawesome.FontAwesomeImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.ionicons.IoniconsImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.lucide.LucideImportScreen
+import io.github.composegears.valkyrie.ui.screen.webimport.standard.materialsymbols.MaterialSymbolsImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.remix.RemixImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.tabler.TablerImportScreen
 

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/WebImportSelectorScreen.kt

@@ -42,14 +42,14 @@ import io.github.composegears.valkyrie.ui.screen.webimport.IconProviders.Ionicon
 import io.github.composegears.valkyrie.ui.screen.webimport.IconProviders.Lucide
 import io.github.composegears.valkyrie.ui.screen.webimport.IconProviders.Remix
 import io.github.composegears.valkyrie.ui.screen.webimport.IconProviders.Tabler
-import io.github.composegears.valkyrie.ui.screen.webimport.material.MaterialSymbolsImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.bootstrap.BootstrapImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.boxicons.BoxIconsImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.eva.EvaImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.feather.FeatherImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.fontawesome.FontAwesomeImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.ionicons.IoniconsImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.lucide.LucideImportScreen
+import io.github.composegears.valkyrie.ui.screen.webimport.standard.materialsymbols.MaterialSymbolsImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.remix.RemixImportScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.standard.tabler.TablerImportScreen
 import io.github.composegears.valkyrie.util.stringResource

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/common/StandardIconViewModel.kt → tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/common/StandardIconViewModel.kt

@@ -1,4 +1,4 @@
-package io.github.composegears.valkyrie.ui.screen.webimport.standard.common
+package io.github.composegears.valkyrie.ui.screen.webimport.common
 
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.ViewModel
@@ -8,21 +8,23 @@ import com.composegears.tiamat.navigation.asStateFlow
 import com.composegears.tiamat.navigation.recordOf
 import io.github.composegears.valkyrie.parser.unified.util.IconNameFormatter
 import io.github.composegears.valkyrie.sdk.core.extensions.safeAs
-import io.github.composegears.valkyrie.ui.screen.webimport.common.model.FontByteArray
-import io.github.composegears.valkyrie.ui.screen.webimport.common.model.GridItem
-import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.domain.StandardIconProvider
-import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.IconStyle
-import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.InferredCategory
-import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.SizeSettings
-import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.StandardIcon
-import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.StandardIconConfig
-import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.util.filterByCategory
+import io.github.composegears.valkyrie.ui.screen.webimport.common.domain.StandardIconProvider
+import io.github.composegears.valkyrie.ui.screen.webimport.common.domain.category.InferredCategory
+import io.github.composegears.valkyrie.ui.screen.webimport.common.domain.font.FontByteArray
+import io.github.composegears.valkyrie.ui.screen.webimport.common.domain.icon.GridItem
+import io.github.composegears.valkyrie.ui.screen.webimport.common.domain.icon.IconStyle
+import io.github.composegears.valkyrie.ui.screen.webimport.common.domain.icon.StandardIcon
+import io.github.composegears.valkyrie.ui.screen.webimport.common.domain.icon.StandardIconConfig
+import io.github.composegears.valkyrie.ui.screen.webimport.common.domain.settings.SizeSettings
+import io.github.composegears.valkyrie.ui.screen.webimport.common.util.filterByCategory
+import kotlin.coroutines.cancellation.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.yield
 
 class StandardIconViewModel(
     savedState: MutableSavedState,
@@ -67,6 +69,8 @@ class StandardIconViewModel(
                 val styleKey = normalizedSelectedStyle?.id
                 restoredFont?.let { fontCache[styleKey] = it }
 
+                provider.onStyleChanged(normalizedSelectedStyle)
+
                 if (restoredFont == null) {
                     downloadFont(normalizedSelectedStyle)
                 }
@@ -105,6 +109,7 @@ class StandardIconViewModel(
                     settings = SizeSettings(size = provider.persistentSize),
                     selectedStyle = selectedStyle,
                 )
+                provider.onStyleChanged(selectedStyle)
                 downloadFont(selectedStyle)
                 prefetchStyleFonts(
                     styles = config.styles,
@@ -128,10 +133,18 @@ class StandardIconViewModel(
 
             if (cachedFont == null) {
                 updateSuccess { it.copy(fontByteArray = null) }
+                // Yield so Compose renders the skeleton before font bytes arrive.
+                // Without this, providers with in-memory caches (suspendLazy) return
+                // instantly — both state updates are batched into one frame and the
+                // skeleton is never visible.
+                yield()
                 runCatching {
                     val bytes = provider.loadFontBytes(resolvedStyle)
                     fontCache[styleKey] = bytes
                     updateSuccess { it.copy(fontByteArray = bytes) }
+                }.onFailure { error ->
+                    if (error is CancellationException) throw error
+                    updateSuccess { it.copy(fontByteArray = null) }
                 }
             } else {
                 updateSuccess { it.copy(fontByteArray = cachedFont) }
@@ -145,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(
@@ -177,6 +190,7 @@ class StandardIconViewModel(
             val cachedFont = withContext(Dispatchers.Main.immediate) {
                 fontCache[style.id]
             }
+            provider.onStyleChanged(style)
             updateSuccess { state ->
                 state.copy(
                     selectedStyle = style,