Remove package name from Simple conversion mode

Author: egorikftp

components/generator/jvm/imagevector/src/test/kotlin/io/github/composegears/valkyrie/generator/jvm/imagevector/CustomPackageTest.kt

@@ -109,4 +109,25 @@ class CustomPackageTest(
         assertThat(parserOutput.iconType).isEqualTo(XML)
         assertThat(output).isEqualTo(expected)
     }
+
+    @Test
+    fun `no package without icon pack`() {
+        val icon = getResourcePath("imagevector/xml/ic_flat_package.xml").toIOPath()
+        val parserOutput = SvgXmlParser.toIrImageVector(parser = ParserType.Jvm, path = icon)
+        val output = ImageVectorGenerator.convert(
+            vector = parserOutput.irImageVector,
+            iconName = parserOutput.iconName,
+            config = createConfig(
+                packageName = "",
+                outputFormat = outputFormat,
+            ),
+        ).content
+
+        val expected = outputFormat.toResourceText(
+            pathToBackingProperty = "imagevector/kt/backing/NoPackage.kt",
+            pathToLazyProperty = "imagevector/kt/lazy/NoPackage.kt",
+        )
+        assertThat(parserOutput.iconType).isEqualTo(XML)
+        assertThat(output).isEqualTo(expected)
+    }
 }

components/test/sharedTestResources/imagevector/kt/backing/NoPackage.kt

@@ -0,0 +1,21 @@
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.unit.dp
+
+val FlatPackage: ImageVector
+    get() {
+        if (_FlatPackage != null) {
+            return _FlatPackage!!
+        }
+        _FlatPackage = ImageVector.Builder(
+            name = "FlatPackage",
+            defaultWidth = 24.dp,
+            defaultHeight = 24.dp,
+            viewportWidth = 18f,
+            viewportHeight = 18f
+        ).build()
+
+        return _FlatPackage!!
+    }
+
+@Suppress("ObjectPropertyName")
+private var _FlatPackage: ImageVector? = null

components/test/sharedTestResources/imagevector/kt/lazy/NoPackage.kt

@@ -0,0 +1,12 @@
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.unit.dp
+
+val FlatPackage: ImageVector by lazy(LazyThreadSafetyMode.NONE) {
+    ImageVector.Builder(
+        name = "FlatPackage",
+        defaultWidth = 24.dp,
+        defaultHeight = 24.dp,
+        viewportWidth = 18f,
+        viewportHeight = 18f
+    ).build()
+}

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/ValkyriePlugin.kt

@@ -39,7 +39,6 @@ import io.github.composegears.valkyrie.ui.screen.intro.IntroScreen
 import io.github.composegears.valkyrie.ui.screen.mode.iconpack.conversion.IconPackConversionScreen
 import io.github.composegears.valkyrie.ui.screen.mode.iconpack.creation.IconPackCreationScreen
 import io.github.composegears.valkyrie.ui.screen.mode.simple.conversion.SimpleConversionScreen
-import io.github.composegears.valkyrie.ui.screen.mode.simple.setup.SimpleModeSetupScreen
 import io.github.composegears.valkyrie.ui.screen.preview.CodePreviewScreen
 import io.github.composegears.valkyrie.ui.screen.settings.SettingsScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.WebImportFlow
@@ -91,7 +90,6 @@ fun ValkyriePlugin(
             navController = navController,
             destinations = arrayOf(
                 IntroScreen,
-                SimpleModeSetupScreen,
                 SimpleConversionScreen,
 
                 IconPackCreationScreen,

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

@@ -42,7 +42,7 @@ import io.github.composegears.valkyrie.ui.foundation.theme.PreviewTheme
 import io.github.composegears.valkyrie.ui.screen.editor.EditorSelectScreen
 import io.github.composegears.valkyrie.ui.screen.intro.util.rememberPluginVersion
 import io.github.composegears.valkyrie.ui.screen.mode.iconpack.creation.IconPackCreationScreen
-import io.github.composegears.valkyrie.ui.screen.mode.simple.setup.SimpleModeSetupScreen
+import io.github.composegears.valkyrie.ui.screen.mode.simple.conversion.SimpleConversionScreen
 import io.github.composegears.valkyrie.ui.screen.settings.SettingsScreen
 import io.github.composegears.valkyrie.ui.screen.webimport.WebImportFlow
 import io.github.composegears.valkyrie.util.stringResource
@@ -57,7 +57,7 @@ val IntroScreen: NavDestination<Unit> by navDestination {
         },
         onModeChange = {
             when (it) {
-                Simple -> navController.navigate(dest = SimpleModeSetupScreen)
+                Simple -> navController.navigate(dest = SimpleConversionScreen)
                 IconPack -> navController.navigate(dest = IconPackCreationScreen)
                 Editor -> navController.navigate(dest = EditorSelectScreen)
                 WebImport -> navController.navigate(dest = WebImportFlow)

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/simple/conversion/viewmodel/SimpleConversionViewModel.kt

@@ -92,6 +92,7 @@ class SimpleConversionViewModel(
                 iconContent = output,
             )
         }
+        saveCurrentMode()
     }
 
     fun reset() {
@@ -120,6 +121,8 @@ class SimpleConversionViewModel(
                 mode = mode,
             )
         }
+
+        saveCurrentMode()
     }
 
     fun changeIconName(name: String) = viewModelScope.launch(Dispatchers.Default) {
@@ -159,29 +162,14 @@ class SimpleConversionViewModel(
         path: Path,
         iconName: String? = null,
     ): IconContent? {
-        val valkyriesSettings = inMemorySettings.current
-
         return runCatching {
             val parserOutput = SvgXmlParser.toIrImageVector(parser = ParserType.Jvm, path.toIOPath())
             val name = iconName ?: parserOutput.iconName
 
             val output = ImageVectorGenerator.convert(
                 vector = parserOutput.irImageVector,
                 iconName = name,
-                config = ImageVectorGeneratorConfig(
-                    packageName = valkyriesSettings.packageName,
-                    iconPackPackage = valkyriesSettings.packageName,
-                    packName = "",
-                    nestedPackName = "",
-                    outputFormat = valkyriesSettings.outputFormat,
-                    useComposeColors = valkyriesSettings.useComposeColors,
-                    generatePreview = valkyriesSettings.generatePreview,
-                    previewAnnotationType = valkyriesSettings.previewAnnotationType,
-                    useFlatPackage = false,
-                    useExplicitMode = valkyriesSettings.useExplicitMode,
-                    addTrailingComma = valkyriesSettings.addTrailingComma,
-                    indentSize = valkyriesSettings.indentSize,
-                ),
+                config = createGeneratorConfig(),
             )
             IconContent(
                 name = name,
@@ -195,28 +183,13 @@ class SimpleConversionViewModel(
         text: String,
         iconName: String,
     ): IconContent? {
-        val valkyriesSettings = inMemorySettings.current
-
         return runCatching {
             val parserOutput = SvgXmlParser.toIrImageVector(parser = ParserType.Jvm, text, iconName)
 
             val output = ImageVectorGenerator.convert(
                 vector = parserOutput.irImageVector,
                 iconName = iconName,
-                config = ImageVectorGeneratorConfig(
-                    packageName = valkyriesSettings.packageName,
-                    iconPackPackage = valkyriesSettings.packageName,
-                    packName = "",
-                    nestedPackName = "",
-                    outputFormat = valkyriesSettings.outputFormat,
-                    useComposeColors = valkyriesSettings.useComposeColors,
-                    generatePreview = valkyriesSettings.generatePreview,
-                    previewAnnotationType = valkyriesSettings.previewAnnotationType,
-                    useFlatPackage = false,
-                    useExplicitMode = valkyriesSettings.useExplicitMode,
-                    addTrailingComma = valkyriesSettings.addTrailingComma,
-                    indentSize = valkyriesSettings.indentSize,
-                ),
+                config = createGeneratorConfig(),
             )
             IconContent(
                 name = iconName,
@@ -225,8 +198,35 @@ class SimpleConversionViewModel(
             )
         }.getOrNull()
     }
+
+    private fun createGeneratorConfig(): ImageVectorGeneratorConfig {
+        val valkyriesSettings = inMemorySettings.current
+
+        return ImageVectorGeneratorConfig(
+            // don't add package name for single icon conversion, let user decide where to put it
+            packageName = "",
+            iconPackPackage = "",
+            packName = "",
+            nestedPackName = "",
+            outputFormat = valkyriesSettings.outputFormat,
+            useComposeColors = valkyriesSettings.useComposeColors,
+            generatePreview = valkyriesSettings.generatePreview,
+            previewAnnotationType = valkyriesSettings.previewAnnotationType,
+            useFlatPackage = false,
+            useExplicitMode = valkyriesSettings.useExplicitMode,
+            addTrailingComma = valkyriesSettings.addTrailingComma,
+            indentSize = valkyriesSettings.indentSize,
+        )
+    }
+
+    private fun saveCurrentMode() {
+        inMemorySettings.update {
+            mode = io.github.composegears.valkyrie.shared.Mode.Simple
+        }
+    }
 }
 
+// TODO: split into separate screens
 enum class Mode {
     Picker,
     StringParse,